Skip to content

Release/1.2 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 5, 2017
Merged

Release/1.2 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d23c7e2
1.2.4
morgs32 Sep 5, 2017
e3a7033
Fix module resolution issue
morgs32 Sep 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react-scripts/config/paths.js
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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