a few small tweaks

This commit is contained in:
Rich Harris
2018-03-11 12:54:35 -04:00
parent 0d0e4d664e
commit 8ec433581a
9 changed files with 48 additions and 66 deletions

View File

@@ -3,8 +3,8 @@ import * as path from 'path';
import * as clorox from 'clorox';
import mkdirp from 'mkdirp';
import rimraf from 'rimraf';
import { create_compilers, create_app, create_routes, create_serviceworker } from '../core'
import { src, dest, dev } from '../config';
import { create_compilers, create_main_manifests, create_routes, create_serviceworker_manifest } from '../core'
import { dest } from '../config';
export async function build() {
const output = dest();
@@ -15,7 +15,7 @@ export async function build() {
const routes = create_routes();
// create app/manifest/client.js and app/manifest/server.js
create_app({ routes, src, dev });
create_main_manifests({ routes });
const { client, server, serviceworker } = create_compilers();
@@ -31,10 +31,9 @@ export async function build() {
let serviceworker_stats;
if (serviceworker) {
create_serviceworker({
create_serviceworker_manifest({
routes,
client_files: client_stats.toJson().assets.map((chunk: { name: string }) => `/client/${chunk.name}`),
src
client_files: client_stats.toJson().assets.map((chunk: { name: string }) => `/client/${chunk.name}`)
});
serviceworker_stats = await compile(serviceworker);

View File

@@ -10,7 +10,7 @@ import format_messages from 'webpack-format-messages';
import prettyMs from 'pretty-ms';
import * as ports from 'port-authority';
import { dest } from '../config';
import { create_compilers, create_app, create_routes, create_serviceworker } from '../core';
import { create_compilers, create_main_manifests, create_routes, create_serviceworker_manifest } from '../core';
type Deferred = {
promise?: Promise<any>;
@@ -91,13 +91,13 @@ export async function dev(opts: { port: number }) {
const dev_port = await ports.find(10000);
const routes = create_routes();
create_app({ routes, dev_port });
create_main_manifests({ routes, dev_port });
const hot_update_server = create_hot_update_server(dev_port);
watch_files('routes/**/*', ['add', 'unlink'], () => {
const routes = create_routes();
create_app({ routes, dev_port });
create_main_manifests({ routes, dev_port });
});
watch_files('app/template.html', ['change'], () => {
@@ -265,7 +265,7 @@ export async function dev(opts: { port: number }) {
});
});
create_serviceworker({
create_serviceworker_manifest({
routes: create_routes(),
client_files
});