Merge branch 'master' into fix/polka

README.md

@@ -13,6 +13,7 @@ Open up [localhost:3000](http://localhost:3000) and start clicking around.
 
 Consult [sapper.svelte.technology](https://sapper.svelte.technology) for help getting started.
 
+*[Click here for the Rollup version of this template](https://github.com/sveltejs/sapper-template/tree/rollup)*
 
 ## Structure
 

app/server.js

@@ -4,12 +4,15 @@ import sapper from 'sapper';
 import compression from 'compression';
 import { manifest } from './manifest/server.js';
 
+const { PORT, NODE_ENV } = process.env;
+const dev = NODE_ENV === 'development';
+
 polka() // You can also use Express
 	.use(
 		compression({ threshold: 0 }),
-		sirv('assets'),
+		sirv('assets', { dev }),
 		sapper({ manifest })
 	)
-	.listen(process.env.PORT, err => {
+	.listen(PORT, err => {
 		if (err) console.log('error', err);
-	});
+	})

package.json

@@ -14,8 +14,8 @@
   "dependencies": {
     "compression": "^1.7.1",
     "polka": "^0.4.0",
-    "sapper": "^0.17.0",
-    "sirv": "^0.1.1"
+    "sapper": "^0.20.0",
+    "sirv": "^0.2.0"
   },
   "devDependencies": {
     "npm-run-all": "^4.1.2",

webpack/client.config.js

@@ -1,8 +1,8 @@
 const webpack = require('webpack');
-const config = require('sapper/webpack/config.js');
+const config = require('sapper/config/webpack.js');
 
 const mode = process.env.NODE_ENV;
-const isDev = mode === 'development';
+const dev = mode === 'development';
 
 module.exports = {
 	entry: config.client.entry(),
@@ -18,7 +18,7 @@ module.exports = {
 				use: {
 					loader: 'svelte-loader',
 					options: {
-						dev: isDev,
+						dev,
 						hydratable: true,
 						hotReload: true
 					}
@@ -28,11 +28,11 @@ module.exports = {
 	},
 	mode,
 	plugins: [
-		isDev && new webpack.HotModuleReplacementPlugin(),
+		dev && new webpack.HotModuleReplacementPlugin(),
 		new webpack.DefinePlugin({
 			'process.browser': true,
 			'process.env.NODE_ENV': JSON.stringify(mode)
 		}),
 	].filter(Boolean),
-	devtool: isDev && 'inline-source-map'
+	devtool: dev && 'inline-source-map'
 };

webpack/server.config.js

@@ -1,6 +1,8 @@
-const config = require('sapper/webpack/config.js');
+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(),
@@ -18,7 +20,8 @@ module.exports = {
 					loader: 'svelte-loader',
 					options: {
 						css: false,
-						generate: 'ssr'
+						generate: 'ssr',
+						dev
 					}
 				}
 			}

webpack/service-worker.config.js

@@ -1,4 +1,4 @@
-const config = require('sapper/webpack/config.js');
+const config = require('sapper/config/webpack.js');
 
 module.exports = {
 	entry: config.serviceworker.entry(),