work in progress

src/cli/build.ts

@@ -2,14 +2,9 @@ import * as fs from 'fs';
 import * as path from 'path';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
-import { create_compilers, create_app, create_assets } from 'sapper/core.js';
+import { create_compilers, create_app, create_routes, create_serviceworker } from 'sapper/core.js';
 
-export default function build({
-	src,
-	dest,
-	dev,
-	entry
-}: {
+export default async function build({ src, dest, dev, entry }: {
 	src: string;
 	dest: string;
 	dev: boolean;
@@ -18,11 +13,32 @@ export default function build({
 	mkdirp.sync(dest);
 	rimraf.sync(path.join(dest, '**/*'));
 
-	// create main.js and server-routes.js
-	create_app({ dev, entry, src });
+	const routes = create_routes({ src });
 
+	// create app/manifest/client.js and app/manifest/server.js
+	create_app({ routes, src, dev });
+
+	const { client, server, serviceworker } = create_compilers();
+
+	const client_stats = await compile(client);
+	fs.writeFileSync(path.join(dest, 'client_info.json'), JSON.stringify(client_stats.toJson()));
+
+	await compile(server);
+
+	if (serviceworker) {
+		create_serviceworker({
+			routes,
+			client_files: client_stats.toJson().assets.map((chunk: { name: string }) => `/client/${chunk.name}`),
+			src
+		});
+
+		await compile(serviceworker);
+	}
+}
+
+function compile(compiler: any) {
 	return new Promise((fulfil, reject) => {
-		function handleErrors(err, stats) {
+		compiler.run((err: Error, stats: any) => {
 			if (err) {
 				reject(err);
 				process.exit(1);
@@ -32,29 +48,10 @@ export default function build({
 				console.error(stats.toString({ colors: true }));
 				reject(new Error(`Encountered errors while building app`));
 			}
-		}
 
-		const { client, server } = create_compilers();
-
-		client.run((err, client_stats) => {
-			handleErrors(err, client_stats);
-			const client_info = client_stats.toJson();
-			fs.writeFileSync(
-				path.join(dest, 'stats.client.json'),
-				JSON.stringify(client_info, null, '  ')
-			);
-
-			server.run((err, server_stats) => {
-				handleErrors(err, server_stats);
-				const server_info = server_stats.toJson();
-				fs.writeFileSync(
-					path.join(dest, 'stats.server.json'),
-					JSON.stringify(server_info, null, '  ')
-				);
-
-				create_assets({ src, dest, dev, client_info, server_info });
-				fulfil();
-			});
+			else {
+				fulfil(stats);
+			}
 		});
 	});
-}
+}

src/cli/export.ts

@@ -1,3 +1,4 @@
+import * as child_process from 'child_process';
 import * as path from 'path';
 import * as sander from 'sander';
 import express from 'express';
@@ -6,30 +7,20 @@ import fetch from 'node-fetch';
 import URL from 'url-parse';
 import { create_assets } from 'sapper/core.js';
 
-const { PORT = 3000, OUTPUT_DIR = 'dist' } = process.env;
-
-const origin = `http://localhost:${PORT}`;
+const { OUTPUT_DIR = 'dist' } = process.env;
 
 const app = express();
 
-function read_json(file) {
+function read_json(file: string) {
 	return JSON.parse(sander.readFileSync(file, { encoding: 'utf-8' }));
 }
 
-export default function exporter({ src, dest }) { // TODO dest is a terrible name in this context
+export default async function exporter({ src, dest }) { // TODO dest is a terrible name in this context
 	// Prep output directory
 	sander.rimrafSync(OUTPUT_DIR);
 
-	const { service_worker } = create_assets({
-		src, dest,
-		dev: false,
-		client_info: read_json(path.join(dest, 'stats.client.json')),
-		server_info: read_json(path.join(dest, 'stats.server.json'))
-	});
-
 	sander.copydirSync('assets').to(OUTPUT_DIR);
 	sander.copydirSync(dest, 'client').to(OUTPUT_DIR, 'client');
-	sander.writeFileSync(OUTPUT_DIR, 'service-worker.js', service_worker);
 
 	// Intercept server route fetches
 	function save(res) {
@@ -48,9 +39,13 @@ export default function exporter({ src, dest }) { // TODO dest is a terrible nam
 		});
 	}
 
+	const port = await require('get-port')(3000);
+
+	const origin = `http://localhost:${port}`;
+
 	global.fetch = (url, opts) => {
 		if (url[0] === '/') {
-			url = `http://localhost:${PORT}${url}`;
+			url = `http://localhost:${port}${url}`;
 
 			return fetch(url, opts)
 				.then(r => {
@@ -62,9 +57,15 @@ export default function exporter({ src, dest }) { // TODO dest is a terrible nam
 		return fetch(url, opts);
 	};
 
-	const middleware = require('./middleware')({ dev: false }); // TODO this is filthy
-	app.use(middleware);
-	const server = app.listen(PORT);
+	const proc = child_process.fork(path.resolve(`${dest}/server.js`), [], {
+		cwd: process.cwd(),
+		env: {
+			PORT: port,
+			NODE_ENV: 'production'
+		}
+	});
+
+	await require('wait-port')({ port });
 
 	const seen = new Set();
 
@@ -99,5 +100,5 @@ export default function exporter({ src, dest }) { // TODO dest is a terrible nam
 	}
 
 	return handle(new URL(origin)) // TODO all static routes
-		.then(() => server.close());
+		.then(() => proc.kill());
 }