totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-15 12:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

small tidy up

Browse Source
This commit is contained in:
Rich Harris
2018-07-15 22:12:47 -04:00
parent 1af0f13799
commit 5b024f2c8d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/create_manifests.ts
View File

@@ -54,10 +54,6 @@ function generate_client(routes: Route[], path_to_routes: string, dev_port?: num
${pages.map(page => { ${pages.map(page => {
const file = posixify(`${path_to_routes}/${page.file}`); const file = posixify(`${path_to_routes}/${page.file}`);
if (page.id === '_error') {
return `{ error: true, load: () => import(/* webpackChunkName: "${page.id}" */ '${file}') }`;
}
const params = page.params.length === 0 const params = page.params.length === 0
? '{}' ? '{}'
: `{ ${page.params.map((part, i) => `${part}: match[${i + 1}]`).join(', ')} }`; : `{ ${page.params.map((part, i) => `${part}: match[${i + 1}]`).join(', ')} }`;
@@ -87,12 +83,13 @@ function generate_client(routes: Route[], path_to_routes: string, dev_port?: num
} }
function generate_server(routes: Route[], path_to_routes: string) { function generate_server(routes: Route[], path_to_routes: string) {
const pages = routes.pages.filter(page => page.id !== '_error');
const error_route = routes.pages.find(page => page.id === '_error'); const error_route = routes.pages.find(page => page.id === '_error');
const imports = [].concat( const imports = [].concat(
routes.server_routes.map(route => routes.server_routes.map(route =>
`import * as route_${route.id} from '${posixify(`${path_to_routes}/${route.file}`)}';`), `import * as route_${route.id} from '${posixify(`${path_to_routes}/${route.file}`)}';`),
routes.pages.map(page => pages.map(page =>
`import page_${page.id} from '${posixify(`${path_to_routes}/${page.file}`)}';`), `import page_${page.id} from '${posixify(`${path_to_routes}/${page.file}`)}';`),
`import error from '${posixify(`${path_to_routes}/${error_route.file}`)}';` `import error from '${posixify(`${path_to_routes}/${error_route.file}`)}';`
); );
@@ -113,7 +110,7 @@ function generate_server(routes: Route[], path_to_routes: string) {
], ],
pages: [ pages: [
${routes.pages.map(page => { ${pages.map(page => {
const params = page.params.length === 0 const params = page.params.length === 0
? '{}' ? '{}'
: `{ ${page.params.map((part, i) => `${part}: match[${i + 1}]`).join(', ')} }`; : `{ ${page.params.map((part, i) => `${part}: match[${i + 1}]`).join(', ')} }`;