Commit 2759f6c

committed

feat: map client env values in webpack config instead of root config

1 parent c1fdf9d commit 2759f6cCopy full SHA for 2759f6c

File tree

-11

lines changed

-11

lines changed

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-const { mapValues, keyBy } = require('lodash');`
`2`		`-`
`3`	`1`	`module.exports = {`
`4`	`2`	`// Enable or disable server-side rendering`
`5`	`3`	`enableSSR: true,`
`@@ -12,13 +10,10 @@ module.exports = {`
`12`	`10`	`// in node.js.`
`13`	`11`	`//`
`14`	`12`	`// WARNING: Be careful not to expose any secrets here!`
`15`		`- clientEnv: mapValues(`
`16`		`- keyBy([`
`17`		`- 'NODE_ENV',`
`18`		`- 'APPLICATION_BASE_URL'`
`19`		`- ]),`
`20`		`- (env) => JSON.stringify(process.env[env])`
`21`		`- ),`
	`13`	`+ clientEnvVars: [`
	`14`	`+ 'NODE_ENV',`
	`15`	`+ 'APPLICATION_BASE_URL'`
	`16`	`+ ],`
`22`	`17`
`23`	`18`	`/* The identifier to use for css-modules.`
`24`	`19`	`*/`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@ if (isDev) require('dotenv').load();`
`4`	`4`	`import yn from 'yn';`
`5`	`5`	`import path from 'path';`
`6`	`6`	`import webpack from 'webpack';`
`7`		`-import mapValues from 'lodash/mapValues';`
`8`	`7`	`import IsoPlugin from 'webpack-isomorphic-tools/plugin';`
`9`	`8`	`import ExtractTextPlugin from 'extract-text-webpack-plugin';`
`10`	`9`	`import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';`
`11`	`10`	`import { ReactLoadablePlugin } from 'react-loadable/webpack';`
	`11`	`+import { mapValues, keyBy } from 'lodash';`
`12`	`12`	`import config from '../config';`
`13`	`13`
`14`	`14`	`let ssr = yn(process.env.SSR) \|\| false;`
`@@ -24,7 +24,9 @@ let plugins = [`
`24`	`24`	`extractTextPlugin,`
`25`	`25`	`new webpack.ContextReplacementPlugin(/moment[/\\]locale$/, /en\|es/),`
`26`	`26`	`new webpack.DefinePlugin({`
`27`		`- 'process.env': config.clientEnv`
	`27`	`+ 'process.env': mapValues(keyBy(config.clientEnvVars), (env) => {`
	`28`	`+ return JSON.stringify(process.env[env]);`
	`29`	`+ })`
`28`	`30`	`})`
`29`	`31`	`];`
`30`	`32`

Comments

(0)