Merge pull request Expensify#10434 from Expensify/Rory-RNWFork

NorthroomZA · Aug 17, 2022 · 85a3138 · 85a3138
2 parents 9ad3142 + 09f8ee7
commit 85a3138
Show file tree

Hide file tree

Showing 6 changed files with 155 additions and 147 deletions.
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
@@ -12,7 +12,8 @@ const env = dotenv.config({path: path.resolve(__dirname, '../.env.staging')}).pa
 module.exports = ({config}) => {
     config.resolve.alias = {
         'react-native-config': 'react-web-config',
-        'react-native$': 'react-native-web',
+        'react-native$': '@expensify/react-native-web',
+        'react-native-web': '@expensify/react-native-web',
         '@react-native-community/netinfo': path.resolve(__dirname, '../__mocks__/@react-native-community/netinfo.js'),
     };
 

diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -11,7 +11,7 @@ const includeModules = [
     'react-native-animatable',
     'react-native-reanimated',
     'react-native-picker-select',
-    'react-native-web',
+    '@expensify/react-native-web',
     'react-native-webview',
     '@react-native-picker',
     'react-native-modal',
@@ -151,7 +151,8 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
     resolve: {
         alias: {
             'react-native-config': 'react-web-config',
-            'react-native$': 'react-native-web',
+            'react-native$': '@expensify/react-native-web',
+            'react-native-web': '@expensify/react-native-web',
             'react-content-loader/native': 'react-content-loader',
         },