Skip to content

Commit

Permalink
Merge pull request #6 from BrickworkSoftware/release/1.2
Browse files Browse the repository at this point in the history
Release/1.2
  • Loading branch information
wilsonyhlee authored Sep 5, 2017
2 parents 4578256 + e3a7033 commit 2ad6e00
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions packages/react-scripts/config/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 4 additions & 3 deletions packages/react-scripts/config/webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion packages/react-scripts/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 2ad6e00

Please sign in to comment.