prep for 0.21

.gitignore

@@ -7,4 +7,4 @@ yarn-error.log
 /templates/.*
 /export/
 /build/
-/app/manifest/
+/src/manifest/

src/server.js

@@ -10,7 +10,7 @@ const dev = NODE_ENV === 'development';
 polka() // You can also use Express
 	.use(
 		compression({ threshold: 0 }),
-		sirv('assets', { dev }),
+		sirv('static', { dev }),
 		sapper({ manifest })
 	)
 	.listen(PORT, err => {

webpack.config.js

@@ -0,0 +1,77 @@
+const webpack = require('webpack');
+const config = require('sapper/config/webpack.js');
+const pkg = require('./package.json');
+
+const mode = process.env.NODE_ENV;
+const dev = mode === 'development';
+
+module.exports = {
+	client: {
+		entry: config.client.entry(),
+		output: config.client.output(),
+		resolve: {
+			extensions: ['.js', '.json', '.html'],
+			mainFields: ['svelte', 'module', 'browser', 'main']
+		},
+		module: {
+			rules: [
+				{
+					test: /\.html$/,
+					use: {
+						loader: 'svelte-loader',
+						options: {
+							dev,
+							hydratable: true,
+							hotReload: true
+						}
+					}
+				}
+			]
+		},
+		mode,
+		plugins: [
+			dev && new webpack.HotModuleReplacementPlugin(),
+			new webpack.DefinePlugin({
+				'process.browser': true,
+				'process.env.NODE_ENV': JSON.stringify(mode)
+			}),
+		].filter(Boolean),
+		devtool: dev && 'inline-source-map'
+	},
+
+	server: {
+		entry: config.server.entry(),
+		output: config.server.output(),
+		target: 'node',
+		resolve: {
+			extensions: ['.js', '.json', '.html'],
+			mainFields: ['svelte', 'module', 'browser', 'main']
+		},
+		externals: Object.keys(pkg.dependencies),
+		module: {
+			rules: [
+				{
+					test: /\.html$/,
+					use: {
+						loader: 'svelte-loader',
+						options: {
+							css: false,
+							generate: 'ssr',
+							dev
+						}
+					}
+				}
+			]
+		},
+		mode: process.env.NODE_ENV,
+		performance: {
+			hints: false // it doesn't matter if server.js is large
+		}
+	},
+
+	serviceworker: {
+		entry: config.serviceworker.entry(),
+		output: config.serviceworker.output(),
+		mode: process.env.NODE_ENV
+	}
+};

webpack/client.config.js

@@ -1,38 +0,0 @@
-const webpack = require('webpack');
-const config = require('sapper/config/webpack.js');
-
-const mode = process.env.NODE_ENV;
-const dev = mode === 'development';
-
-module.exports = {
-	entry: config.client.entry(),
-	output: config.client.output(),
-	resolve: {
-		extensions: ['.js', '.json', '.html'],
-		mainFields: ['svelte', 'module', 'browser', 'main']
-	},
-	module: {
-		rules: [
-			{
-				test: /\.html$/,
-				use: {
-					loader: 'svelte-loader',
-					options: {
-						dev,
-						hydratable: true,
-						hotReload: true
-					}
-				}
-			}
-		]
-	},
-	mode,
-	plugins: [
-		dev && new webpack.HotModuleReplacementPlugin(),
-		new webpack.DefinePlugin({
-			'process.browser': true,
-			'process.env.NODE_ENV': JSON.stringify(mode)
-		}),
-	].filter(Boolean),
-	devtool: dev && 'inline-source-map'
-};

webpack/server.config.js

@@ -1,34 +0,0 @@
-const config = require('sapper/config/webpack.js');
-const pkg = require('../package.json');
-
-const dev = process.env.NODE_ENV === 'development';
-
-module.exports = {
-	entry: config.server.entry(),
-	output: config.server.output(),
-	target: 'node',
-	resolve: {
-		extensions: ['.js', '.json', '.html'],
-		mainFields: ['svelte', 'module', 'browser', 'main']
-	},
-	externals: Object.keys(pkg.dependencies),
-	module: {
-		rules: [
-			{
-				test: /\.html$/,
-				use: {
-					loader: 'svelte-loader',
-					options: {
-						css: false,
-						generate: 'ssr',
-						dev
-					}
-				}
-			}
-		]
-	},
-	mode: process.env.NODE_ENV,
-	performance: {
-		hints: false // it doesn't matter if server.js is large
-	}
-};

webpack/service-worker.config.js

@@ -1,7 +0,0 @@
-const config = require('sapper/config/webpack.js');
-
-module.exports = {
-	entry: config.serviceworker.entry(),
-	output: config.serviceworker.output(),
-	mode: process.env.NODE_ENV
-};