Load paths config before webpack config. (#456)

timarney · Apr 29, 2020 · b6f727d · b6f727d
1 parent 3602879
commit b6f727d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/scripts/build.js b/scripts/build.js
@@ -6,6 +6,13 @@ const { scriptVersion } = require('./utils/paths');
 const overrides = require('../config-overrides');
 const scriptPkg = require(`${scriptVersion}/package.json`);
 
+const pathsConfigPath = `${scriptVersion}/config/paths.js`;
+const pathsConfig = require(pathsConfigPath);
+
+// override paths in memory
+require.cache[require.resolve(pathsConfigPath)].exports =
+  overrides.paths(pathsConfig, process.env.NODE_ENV);
+
 // CRA 2.1.2 switched to using a webpack config factory
 // https://github.com/facebook/create-react-app/pull/5722
 // https://github.com/facebook/create-react-app/releases/tag/v2.1.2
@@ -19,12 +26,5 @@ require.cache[require.resolve(webpackConfigPath)].exports = isWebpackFactory
   ? (env) => overrides.webpack(webpackConfig(env), env)
   : overrides.webpack(webpackConfig, process.env.NODE_ENV);
 
-const pathsConfigPath = `${scriptVersion}/config/paths.js`;
-const pathsConfig = require(pathsConfigPath);
-
-// override paths in memory
-require.cache[require.resolve(pathsConfigPath)].exports =
-  overrides.paths(pathsConfig, process.env.NODE_ENV);
-
 // run original script
 require(`${scriptVersion}/scripts/build`);
diff --git a/scripts/start.js b/scripts/start.js
@@ -6,6 +6,13 @@ const { scriptVersion } = require('./utils/paths');
 const overrides = require('../config-overrides');
 const scriptPkg = require(`${scriptVersion}/package.json`);
 
+const pathsConfigPath = `${scriptVersion}/config/paths.js`;
+const pathsConfig = require(pathsConfigPath);
+
+// override paths in memory
+require.cache[require.resolve(pathsConfigPath)].exports =
+  overrides.paths(pathsConfig, process.env.NODE_ENV);
+
 // CRA 2.1.2 switched to using a webpack config factory
 // https://github.com/facebook/create-react-app/pull/5722
 // https://github.com/facebook/create-react-app/releases/tag/v2.1.2
@@ -24,12 +31,5 @@ require.cache[require.resolve(webpackConfigPath)].exports = isWebpackFactory
 require.cache[require.resolve(devServerConfigPath)].exports =
   overrides.devServer(devServerConfig, process.env.NODE_ENV);
 
-const pathsConfigPath = `${scriptVersion}/config/paths.js`;
-const pathsConfig = require(pathsConfigPath);
-
-// override paths in memory
-require.cache[require.resolve(pathsConfigPath)].exports =
-  overrides.paths(pathsConfig, process.env.NODE_ENV);
-
 // run original script
 require(`${scriptVersion}/scripts/start`);