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

merge master -> gh-381

Browse Source
This commit is contained in:
Rich Harris
2018-08-30 19:49:28 -04:00
parent 54da524467 ee95240ca6
commit 3d69d483d7
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/build.ts
View File

@@ -55,7 +55,7 @@ async function execute(emitter: EventEmitter, {
const route_objects = create_routes();
// create app/manifest/client.js and app/manifest/server.js
create_main_manifests({ routes: route_objects });
create_main_manifests({ bundler, routes: route_objects });
const { client, server, serviceworker } = create_compilers(validate_bundler(bundler), { webpack, rollup });
@@ -69,7 +69,7 @@ async function execute(emitter: EventEmitter, {
fs.writeFileSync(path.join(dest, 'build.json'), JSON.stringify({
bundler,
shimport: bundler === 'rollup' && require('shimport/package.json').version,
assets: client_result.assetsByChunkName
assets: client_result.assets
}));
const server_stats = await server.compile();
@@ -84,7 +84,7 @@ async function execute(emitter: EventEmitter, {
if (serviceworker) {
create_serviceworker_manifest({
routes: route_objects,
client_files: client_result.assets.map((file: string) => `client/${file}`)
client_files: client_result.chunks.map((file: string) => `client/${file}`)
});
serviceworker_stats = await serviceworker.compile();

8
src/api/dev.ts
View File

@@ -129,7 +129,7 @@ class Watcher extends EventEmitter {
try {
const routes = create_routes();
create_main_manifests({ routes, dev_port: this.dev_port });
create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
} catch (err) {
this.emit('fatal', <events.FatalEvent>{
message: err.message
@@ -150,11 +150,11 @@ class Watcher extends EventEmitter {
},
() => {
const routes = create_routes();
create_main_manifests({ routes, dev_port: this.dev_port });
create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
try {
const routes = create_routes();
create_main_manifests({ routes, dev_port: this.dev_port });
create_main_manifests({ bundler: this.bundler, routes, dev_port: this.dev_port });
} catch (err) {
this.emit('error', <events.ErrorEvent>{
message: err.message
@@ -285,7 +285,7 @@ class Watcher extends EventEmitter {
fs.writeFileSync(path.join(dest, 'build.json'), JSON.stringify({
bundler: this.bundler,
shimport: this.bundler === 'rollup' && require('shimport/package.json').version,
assets: result.assetsByChunkName
assets: result.assets
}, null, ' '));
const client_files = result.assets.map((file: string) => `client/${file}`);