Fixed dotenv

nanlabs · Jun 28, 2022 · e323760 · e323760
1 parent ba1916d
commit e323760
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -93,6 +93,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.1",
     "danger": "^11.0.7",
+    "dotenv": "^16.0.1",
     "dotenv-webpack": "^7.1.0",
     "esbuild-jest": "^0.5.0",
     "esbuild-loader": "^2.19.0",

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,6 +1,8 @@
+const path = require('path');
 const { merge } = require('webpack-merge');
 
 const commonConfig = require('./config/webpack.common.js');
+require('dotenv').config();
 
 /**
  * getAddons is a function that returns valid addon modules
@@ -15,7 +17,10 @@ const getAddons = (addons = '') =>
     .map((name) => require(`./config/addons/webpack.${name}.js`));
 
 module.exports = ({ env, addon }) => {
-  const envConfig = require(`./config/webpack.${env || 'production'}.js`);
+  const targetEnv = env || 'production';
+
+  require('dotenv').config({ path: path.resolve(process.cwd(), `.env.${targetEnv}`) });
+  const envConfig = require(`./config/webpack.${targetEnv}.js`);
 
   return merge(commonConfig, envConfig, ...getAddons(addon));
 };