From 313cd70102073df5b291bf7fe4f56aeab898c4b1 Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunohplemos@gmail.com>
Date: Sun, 4 Jun 2017 06:37:24 -0300
Subject: [PATCH] [WEB] Look web node_modules before looking mobile
 node_modules

---
 web/cra.config.js | 12 ++++++++++--
 web/package.json  |  2 +-
 web/yarn.lock     |  6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/web/cra.config.js b/web/cra.config.js
index 13258922..a34066b9 100644
--- a/web/cra.config.js
+++ b/web/cra.config.js
@@ -7,10 +7,14 @@ module.exports = {
       resolvePath('../node_modules/react-native-tab-view/src'),
     ])
 
-    return Object.assign({}, paths, { sourcesToCompile })
+    return Object.assign({}, paths, {
+      webNodeModules: resolvePath('node_modules'),
+      mobileNodeModules: resolvePath('../node_modules'),
+      sourcesToCompile,
+    })
   },
 
-  webpack: (oldConfig, { isDevelopment }) => {
+  webpack: (oldConfig, { isDevelopment, paths }) => {
     const babelLoader = require.resolve('babel-loader')
     const webpack = require('webpack')
 
@@ -40,6 +44,10 @@ module.exports = {
         }),
         extensions: ['.web.js'].concat(oldConfig.resolve.extensions),
         // prettier-ignore
+        modules: [paths.webNodeModules, paths.mobileNodeModules].concat(
+          oldConfig.resolve.modules
+        ),
+        // prettier-ignore
         plugins: oldConfig.resolve.plugins.filter(
           plugin => plugin.constructor.name !== 'ModuleScopePlugin'
         ),
diff --git a/web/package.json b/web/package.json
index 6be0faef..9677b32c 100644
--- a/web/package.json
+++ b/web/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "extensible-react-scripts": "^1.0.6-9",
+    "extensible-react-scripts": "^1.0.6-10",
     "gh-pages": "^1.0.0",
     "react-dev-utils": "^3.0.0",
     "serve": "^5.2.1",
diff --git a/web/yarn.lock b/web/yarn.lock
index 9d282ee9..a5a84cce 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -2481,9 +2481,9 @@ extend@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-extensible-react-scripts@^1.0.6-9:
-  version "1.0.6-9"
-  resolved "https://registry.yarnpkg.com/extensible-react-scripts/-/extensible-react-scripts-1.0.6-9.tgz#23e992f6593f5d3a6175187d4c364998a1d0f626"
+extensible-react-scripts@^1.0.6-10:
+  version "1.0.6-10"
+  resolved "https://registry.yarnpkg.com/extensible-react-scripts/-/extensible-react-scripts-1.0.6-10.tgz#a3cbc3ac5ac976af1aa6a28b381185b9cf900dc5"
   dependencies:
     autoprefixer "7.1.0"
     babel-core "6.24.1"