PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #17003 from vector-im/jryans/node-env-develop

Browse source 
Fix `NODE_ENV` value for CI environments
This commit is contained in:
J. Ryan Stinnett 2021-04-19 16:04:10 +01:00 committed by GitHub
commit dd303b292a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/ci_package.sh
View file

@ -14,4 +14,4 @@ JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
CI_PACKAGE=true DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA scripts/package.sh -d CI_PACKAGE=true DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA scripts/package.sh

14
webpack.config.js
View file

@ -13,6 +13,7 @@ const additionalPlugins = [
]; ];
module.exports = (env, argv) => { module.exports = (env, argv) => {
let nodeEnv = argv.mode;
if (process.env.CI_PACKAGE) { if (process.env.CI_PACKAGE) {
// Don't run minification for CI builds (this is only set for runs on develop) // Don't run minification for CI builds (this is only set for runs on develop)
// We override this via environment variable to avoid duplicating the scripts // We override this via environment variable to avoid duplicating the scripts
@ -24,14 +25,7 @@ module.exports = (env, argv) => {
// when working on the app but adds significant runtime overhead // when working on the app but adds significant runtime overhead
// We want to use the React production build but not compile the whole // We want to use the React production build but not compile the whole
// application to productions standards // application to productions standards
additionalPlugins.concat([ nodeEnv = "production";
new webpack.EnvironmentPlugin({
"NODE_ENV": "production",
}),
new webpack.DefinePlugin({
"process.env.NODE_ENV": "production",
}),
]);
} }
const development = {}; const development = {};
@ -94,6 +88,10 @@ module.exports = (env, argv) => {
// we use a CSS optimizer too and need to manage it ourselves. // we use a CSS optimizer too and need to manage it ourselves.
minimize: argv.mode === 'production', minimize: argv.mode === 'production',
minimizer: argv.mode === 'production' ? [new TerserPlugin({}), new OptimizeCSSAssetsPlugin({})] : [], minimizer: argv.mode === 'production' ? [new TerserPlugin({}), new OptimizeCSSAssetsPlugin({})] : [],
// Set the value of `process.env.NODE_ENV` for libraries like React
// See also https://v4.webpack.js.org/configuration/optimization/#optimizationnodeenv
nodeEnv,
}, },
resolve: { resolve: {