From fff62bfb2daba9b26052fae53c89120bcb05606c Mon Sep 17 00:00:00 2001 From: James Date: Wed, 26 Feb 2020 11:42:13 -0500 Subject: [PATCH] revises properly loading modules from both local node modules and payload node modules --- src/client/config/getWebpackDevConfig.js | 2 +- src/client/config/getWebpackProdConfig.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/client/config/getWebpackDevConfig.js b/src/client/config/getWebpackDevConfig.js index 6a2f16348d..c08e16daf0 100644 --- a/src/client/config/getWebpackDevConfig.js +++ b/src/client/config/getWebpackDevConfig.js @@ -100,7 +100,7 @@ module.exports = (config) => { new webpack.HotModuleReplacementPlugin(), ], resolve: { - modules: [path.resolve(__dirname, '../../../node_modules')], + modules: ['node_modules', path.resolve(__dirname, '../../../node_modules')], alias: { 'payload-scss-overrides': config.paths.scssOverrides, 'payload-custom-components': config.paths.components, diff --git a/src/client/config/getWebpackProdConfig.js b/src/client/config/getWebpackProdConfig.js index 3a15c97ad1..e1abcc85bc 100644 --- a/src/client/config/getWebpackProdConfig.js +++ b/src/client/config/getWebpackProdConfig.js @@ -94,9 +94,8 @@ module.exports = (config) => { }), ], resolve: { - modules: [path.resolve(__dirname, '../../../node_modules')], + modules: ['node_modules', path.resolve(__dirname, '../../../node_modules')], alias: { - payload: path.resolve(__dirname, '../../'), 'payload-scss-overrides': config.paths.scssOverrides, 'payload-custom-components': config.paths.components, 'payload-config': config.paths.config,