cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Limit environment variables to expose to webpack (#7480)

This commit is contained in:
Akihiko Odaki 2018-05-15 00:45:37 +09:00 committed by Eugen Rochko
parent d75b63e4fb
commit d8b3f5fb9a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/webpack/configuration.js
View File

@ -33,7 +33,10 @@ const output = {
module.exports = { module.exports = {
settings, settings,
themes, themes,
env, env: {
CDN_HOST: env.CDN_HOST,
NODE_ENV: env.NODE_ENV,
},
loadersDir, loadersDir,
output, output,
}; };

4
config/webpack/production.js
View File

@ -6,7 +6,7 @@ const CompressionPlugin = require('compression-webpack-plugin');
const sharedConfig = require('./shared.js'); const sharedConfig = require('./shared.js');
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const OfflinePlugin = require('offline-plugin'); const OfflinePlugin = require('offline-plugin');
const { publicPath } = require('./configuration.js'); const { env, publicPath } = require('./configuration.js');
const path = require('path'); const path = require('path');
let compressionAlgorithm; let compressionAlgorithm;
@ -90,7 +90,7 @@ module.exports = merge(sharedConfig, {
'**/*.woff', '**/*.woff',
], ],
ServiceWorker: { 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', cacheName: 'mastodon',
output: '../assets/sw.js', output: '../assets/sw.js',
publicPath: '/sw.js', publicPath: '/sw.js',