Merge branch 'master' into fix/polka

This commit is contained in:
Luke Edwards
2018-09-18 14:16:18 -07:00
committed by GitHub
7 changed files with 4292 additions and 13 deletions

View File

@@ -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. 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 ## Structure

View File

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

4272
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@@ -1,6 +1,8 @@
const config = require('sapper/webpack/config.js'); const config = require('sapper/config/webpack.js');
const pkg = require('../package.json'); const pkg = require('../package.json');
const dev = process.env.NODE_ENV === 'development';
module.exports = { module.exports = {
entry: config.server.entry(), entry: config.server.entry(),
output: config.server.output(), output: config.server.output(),
@@ -18,7 +20,8 @@ module.exports = {
loader: 'svelte-loader', loader: 'svelte-loader',
options: { options: {
css: false, css: false,
generate: 'ssr' generate: 'ssr',
dev
} }
} }
} }

View File

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