Skip to content

Commit f04ed9e

Browse files
committed
Resolve asiago node_modules before local node_modules in implementation or example
1 parent f9da284 commit f04ed9e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

packages/react-scripts/config/paths.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const asiagoLocation = fs.existsSync(resolveApp('node_modules/@brickwork-softwar
2626
? resolveApp('node_modules/@brickwork-software/asiago')
2727
: resolveApp('..');
2828
const asiagoDirectory = fs.realpathSync(asiagoLocation)
29+
const asiagoNodeModules = path.resolve(asiagoDirectory, 'node_modules')
2930

3031
const resolveOwn = relativePath => path.resolve(__dirname, '..', relativePath);
3132

@@ -64,13 +65,13 @@ module.exports = {
6465
appHtml: resolveApp('public/index.html'),
6566
appIndexJs: resolveApp('src/index.js'),
6667
asiagoPath: asiagoDirectory,
68+
asiagoNodeModules: asiagoNodeModules,
6769
appPackageJson: resolveApp('package.json'),
6870
appSrc: resolveApp('src'),
6971
appPath: appDirectory,
7072
yarnLockFile: resolveApp('yarn.lock'),
7173
testsSetup: resolveApp('src/setupTests.js'),
7274
appNodeModules: resolveApp('node_modules'),
73-
ownNodeModules: resolveOwn('../node_modules'),
7475
publicUrl: getPublicUrl(resolveApp('package.json')),
7576
servedPath: getServedPath(resolveApp('package.json')),
7677
};

packages/react-scripts/config/webpack.config.dev.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ module.exports = {
114114
// https://github.com/facebookincubator/create-react-app/issues/253
115115
modules: [
116116
paths.appPath,
117-
// paths.appNodeModules,
118117
path.resolve(paths.asiagoPath),
118+
paths.asiagoNodeModules,
119119
'node_modules',
120120
].concat(
121121
// It is guaranteed to exist because we tweak it in `env.js`

0 commit comments

Comments
 (0)