From d23c7e24f00db66eadd5114c051c5e0a54798f7e Mon Sep 17 00:00:00 2001 From: Morgan Intrator Date: Tue, 5 Sep 2017 11:59:35 -0400 Subject: [PATCH 1/2] 1.2.4 --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index f69a1fbaf63..a29cf4dc8ec 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@brickwork-software/react-scripts", - "version": "1.2.3", + "version": "1.2.4", "description": "Configuration and scripts for Brickwork react apps", "repository": "brickworksoftware/create-react-app", "license": "BSD-3-Clause", From e3a70335e7aa77691d814a7fe3a6eb65934ac1f5 Mon Sep 17 00:00:00 2001 From: Morgan Intrator Date: Tue, 5 Sep 2017 12:28:32 -0400 Subject: [PATCH 2/2] Fix module resolution issue --- packages/react-scripts/config/paths.js | 1 + packages/react-scripts/config/webpack.config.dev.js | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/react-scripts/config/paths.js b/packages/react-scripts/config/paths.js index f5311e20ee3..cb70e464478 100644 --- a/packages/react-scripts/config/paths.js +++ b/packages/react-scripts/config/paths.js @@ -66,6 +66,7 @@ module.exports = { appIndexJs: resolveApp('src/index.js'), asiagoPath: asiagoDirectory, asiagoNodeModules: asiagoNodeModules, + ownNodeModules: resolveOwn('../node_modules'), appPackageJson: resolveApp('package.json'), appSrc: resolveApp('src'), appPath: appDirectory, diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js index 3442ef5953e..71e9b2110af 100644 --- a/packages/react-scripts/config/webpack.config.dev.js +++ b/packages/react-scripts/config/webpack.config.dev.js @@ -113,10 +113,11 @@ module.exports = { // if there are any conflicts. This matches Node resolution mechanism. // https://github.com/facebookincubator/create-react-app/issues/253 modules: [ - paths.appPath, - path.resolve(paths.asiagoPath), - paths.asiagoNodeModules, 'node_modules', + paths.appNodeModules, + paths.asiagoNodeModules, + paths.appPath, + paths.asiagoPath, ].concat( // It is guaranteed to exist because we tweak it in `env.js` process.env.NODE_PATH.split(path.delimiter).filter(Boolean)