Merge remote-tracking branch 'origin/master' into gs-master

2018-03-27 10:44:12 -05:00
parent 49c957bc3b 3523aa440b
commit d2cdc2b5a3
18 changed files with 261 additions and 111 deletions
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -90,7 +90,7 @@ module.exports = merge(sharedConfig, {
        '**/*.woff',
      ],
      ServiceWorker: {
-        entry: path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'),
+        entry: `imports-loader?process.env=>${encodeURIComponent(JSON.stringify(process.env))}!${encodeURI(path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'))}`,
        cacheName: 'mastodon',
        output: '../assets/sw.js',
        publicPath: '/sw.js',