From 2a7c42b3d0110caedf4347a2e9da763d2836c663 Mon Sep 17 00:00:00 2001 From: Brody McKee Date: Fri, 21 Dec 2018 15:57:11 +0200 Subject: [PATCH] Fix error with new CRA Webpack config --- app/react/src/server/cra-config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/react/src/server/cra-config.js b/app/react/src/server/cra-config.js index d67b6fffda8..5d46a8066dc 100644 --- a/app/react/src/server/cra-config.js +++ b/app/react/src/server/cra-config.js @@ -68,12 +68,12 @@ export function getCraWebpackConfig(mode) { const pathToReactScripts = getReactScriptsPath(); const craWebpackConfig = - mode === 'production' ? 'config/webpack.config.prod' : 'config/webpack.config.dev'; + mode === 'production' ? 'config/webpack.config.prod.js' : 'config/webpack.config.dev.js'; - let pathToWebpackConfig = require.resolve(path.join(pathToReactScripts, craWebpackConfig)); + let pathToWebpackConfig = path.join(pathToReactScripts, craWebpackConfig); if (!fs.existsSync(pathToWebpackConfig)) { - pathToWebpackConfig = path.join(pathToReactScripts, 'config/webpack.config'); + pathToWebpackConfig = path.join(pathToReactScripts, 'config/webpack.config.js'); } // eslint-disable-next-line import/no-dynamic-require,global-require