diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2018-05-15 00:45:37 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-14 17:45:37 +0200 |
| commit | d8b3f5fb9a6d394257cedd1fda3f86ff64f21e5b (patch) | |
| tree | 7d4c20126e51583988b297a9f51878e92edbe378 /config | |
| parent | d75b63e4fbe3a516378150f58ac348cf87aba226 (diff) | |
Limit environment variables to expose to webpack (#7480)
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack/configuration.js | 5 | ||||
| -rw-r--r-- | config/webpack/production.js | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index c06570944..cf8c0c7e1 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -33,7 +33,10 @@ const output = { module.exports = { settings, themes, - env, + env: { + CDN_HOST: env.CDN_HOST, + NODE_ENV: env.NODE_ENV, + }, loadersDir, output, }; diff --git a/config/webpack/production.js b/config/webpack/production.js index e1c681232..a82330791 100644 --- a/config/webpack/production.js +++ b/config/webpack/production.js @@ -6,7 +6,7 @@ const CompressionPlugin = require('compression-webpack-plugin'); const sharedConfig = require('./shared.js'); const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; const OfflinePlugin = require('offline-plugin'); -const { publicPath } = require('./configuration.js'); +const { env, publicPath } = require('./configuration.js'); const path = require('path'); let compressionAlgorithm; @@ -90,7 +90,7 @@ module.exports = merge(sharedConfig, { '**/*.woff', ], ServiceWorker: { - entry: `imports-loader?process.env=>${encodeURIComponent(JSON.stringify(process.env))}!${encodeURI(path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'))}`, + entry: `imports-loader?process.env=>${encodeURIComponent(JSON.stringify(env))}!${encodeURI(path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'))}`, cacheName: 'mastodon', output: '../assets/sw.js', publicPath: '/sw.js', |