diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:07:43 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:20:29 -0700 |
| commit | 8150689b48716bb016d492d28cef08600a4b315e (patch) | |
| tree | a05a2539e894c79ef17698dce0da5a6af0c25bf6 /config/webpack | |
| parent | b61e3daf983d87c6d2de7e54d420c2e8f5a531e6 (diff) | |
| parent | 7ef848256871454a790a9b7cc725053c67ba3da4 (diff) | |
Merge upstream (#111)
Diffstat (limited to 'config/webpack')
| -rw-r--r-- | config/webpack/production.js | 8 | ||||
| -rw-r--r-- | config/webpack/shared.js | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/config/webpack/production.js b/config/webpack/production.js index 4592db89e..cd1dd91dc 100644 --- a/config/webpack/production.js +++ b/config/webpack/production.js @@ -10,7 +10,11 @@ const { publicPath } = require('./configuration.js'); const path = require('path'); module.exports = merge(sharedConfig, { - output: { filename: '[name]-[chunkhash].js' }, + output: { + filename: '[name]-[chunkhash].js', + chunkFilename: '[name]-[chunkhash].js', + }, + devtool: 'source-map', // separate sourcemap file, suitable for production stats: 'normal', @@ -48,7 +52,7 @@ module.exports = merge(sharedConfig, { ServiceWorker: { entry: path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'), cacheName: 'mastodon', - output: '../sw.js', + output: '../assets/sw.js', publicPath: '/sw.js', minify: true, }, diff --git a/config/webpack/shared.js b/config/webpack/shared.js index 425918d66..be1b49421 100644 --- a/config/webpack/shared.js +++ b/config/webpack/shared.js @@ -33,7 +33,7 @@ module.exports = { output: { filename: '[name].js', - chunkFilename: '[name]-[chunkhash].js', + chunkFilename: '[name].js', path: output.path, publicPath: output.publicPath, }, |