fix cannot load the advanced configurations

htdangkhoa · Jan 23, 2022 · b66c8df · b66c8df
1 parent 3b1bd12
commit b66c8df
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/webpack/plugins/dotenv-webpack-plugin.js b/webpack/plugins/dotenv-webpack-plugin.js
@@ -11,6 +11,28 @@ const NODE_ENV = process.env.NODE_ENV;
 
 const envPath = path.resolve(process.cwd(), `.env`);
 
+const loadEnv = (...paths) => {
+  const envFiles = [
+    `${envPath}.${NODE_ENV}.local`,
+    /**
+     * Don't include `.env.local` for `test` environment
+     * since normally you expect tests to produce the same
+     * results for everyone
+     */
+    NODE_ENV !== 'test' && `${envPath}.local`,
+    `${envPath}.${NODE_ENV}`,
+    envPath,
+    ...paths,
+  ].filter(Boolean);
+
+  envFiles.forEach((file) => {
+    if (fs.existsSync(file)) {
+      dotenvExpand(dotenv.config({ path: file }));
+    }
+  });
+};
+exports.loadEnv = loadEnv;
+
 class DotenvWebpackPlugin {
   /**
    * @param {Object} [options]
@@ -22,23 +44,7 @@ class DotenvWebpackPlugin {
 
     this.options = { ...options };
 
-    const envFiles = [
-      `${envPath}.${NODE_ENV}.local`,
-      /**
-       * Don't include `.env.local` for `test` environment
-       * since normally you expect tests to produce the same
-       * results for everyone
-       */
-      NODE_ENV !== 'test' && `${envPath}.local`,
-      `${envPath}.${NODE_ENV}`,
-      this.options.path || envPath,
-    ].filter(Boolean);
-
-    envFiles.forEach((file) => {
-      if (fs.existsSync(file)) {
-        dotenvExpand(dotenv.config({ path: file }));
-      }
-    });
+    loadEnv(this.options.path);
   }
 
   /**
@@ -84,4 +90,4 @@ class DotenvWebpackPlugin {
   }
 }
 
-module.exports = DotenvWebpackPlugin;
+exports.DotenvWebpackPlugin = DotenvWebpackPlugin;
diff --git a/webpack/webpack.config.base.js b/webpack/webpack.config.base.js
@@ -9,8 +9,10 @@ const ESLintPlugin = require('eslint-webpack-plugin');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const eslintFormatter = require('react-dev-utils/eslintFormatter');
 
-const DotenvWebpackPlugin = require('./plugins/dotenv-webpack-plugin');
+const { DotenvWebpackPlugin, loadEnv } = require('./plugins/dotenv-webpack-plugin');
 
+// load default env
+loadEnv();
 const emitErrorsAsWarnings = process.env.ESLINT_NO_DEV_ERRORS === 'true';
 const disableESLintPlugin = process.env.DISABLE_ESLINT_PLUGIN === 'true';