Merge pull request #6 from BrickworkSoftware/release/1.2

Release/1.2

Author: wilsonyhlee

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,

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)

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",