stop overriding process.env

egoist · Sep 5, 2017 · db30e42 · db30e42
1 parent cfaab2e
commit db30e42
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/packages/poi/lib/create-config.js b/packages/poi/lib/create-config.js
@@ -15,7 +15,8 @@ const {
   getPublicPath,
   ownDir,
   inferProductionValue,
-  stringifyObject
+  stringifyObject,
+  getFullEnvString
 } = require('./utils')
 const logger = require('./logger')
 const cssLoaders = require('./webpack/css-loaders')
@@ -193,9 +194,13 @@ module.exports = function ({
     .use(PathsCaseSensitivePlugin)
 
   config.plugin('constants')
-    .use(webpack.DefinePlugin, [merge({
-      'process.env': env
-    }, define && stringifyObject(define))])
+    .use(webpack.DefinePlugin, [
+      merge(
+        // { foo: '"foo"' } => { 'process.env.foo': '"foo"' }
+        getFullEnvString(env),
+        define && stringifyObject(define)
+      )
+    ])
 
   config.plugin('fancy-log')
     .use(FancyLogPlugin, [

diff --git a/packages/poi/lib/utils.js b/packages/poi/lib/utils.js
@@ -95,3 +95,10 @@ exports.createSet = function (value) {
 exports.unspecifiedAddress = function (host) {
   return host === '0.0.0.0' || host === '::'
 }
+
+exports.getFullEnvString = function (env) {
+  return Object.keys(env).reduce((res, key) => {
+    res[`process.env.${key}`] = env[key]
+    return res
+  }, {})
+}