From e5b026d63c76d0f678bf374bae4c0e520c4a5157 Mon Sep 17 00:00:00 2001
From: Evan Jones <evanjones4040@gmail.com>
Date: Sat, 10 Jun 2017 09:14:29 -0700
Subject: [PATCH 1/2] Better React Native Web support

---
 packages/react-scripts/config/webpack.config.dev.js  | 4 +++-
 packages/react-scripts/config/webpack.config.prod.js | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index 55d3b6ad74c..b188f579642 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -94,7 +94,9 @@ module.exports = {
     // We also include JSX as a common component filename extension to support
     // some tools, although we do not recommend using it, see:
     // https://github.com/facebookincubator/create-react-app/issues/290
-    extensions: ['.js', '.json', '.jsx'],
+    // `web` extension prefixes have been added for better support
+    // for React Native Web.
+    extensions: ['.web.js', '.js', '.json', '.web.jsx', '.jsx'],
     alias: {
       // @remove-on-eject-begin
       // Resolve Babel runtime relative to react-scripts.
diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index 5943c14502c..4edc75d826b 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -92,7 +92,9 @@ module.exports = {
     // We also include JSX as a common component filename extension to support
     // some tools, although we do not recommend using it, see:
     // https://github.com/facebookincubator/create-react-app/issues/290
-    extensions: ['.js', '.json', '.jsx'],
+    // `web` extension prefixes have been added for better support
+    // for React Native Web.
+    extensions: ['.web.js', '.js', '.json', '.web.jsx', '.jsx'],
     alias: {
       // @remove-on-eject-begin
       // Resolve Babel runtime relative to react-scripts.

From 4467fd4d613a29502aa0c548af351cd4fa139247 Mon Sep 17 00:00:00 2001
From: Evan Jones <evanjones4040@gmail.com>
Date: Tue, 27 Jun 2017 18:51:12 -0700
Subject: [PATCH 2/2] Adding better react-native-web support for jest testing

---
 packages/react-scripts/scripts/utils/createJestConfig.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js
index 13ae8b30411..de74958efad 100644
--- a/packages/react-scripts/scripts/utils/createJestConfig.js
+++ b/packages/react-scripts/scripts/utils/createJestConfig.js
@@ -43,6 +43,7 @@ module.exports = (resolve, rootDir, isEjecting) => {
     moduleNameMapper: {
       '^react-native$': 'react-native-web',
     },
+    moduleFileExtensions: ['web.js', 'js', 'json', 'web.jsx', 'jsx'],
   };
   if (rootDir) {
     config.rootDir = rootDir;