Skip to content

Commit 85a3138

Browse files
authored
Merge pull request #10434 from Expensify/Rory-RNWFork
2 parents 9ad3142 + 09f8ee7 commit 85a3138

File tree

6 files changed

+155
-147
lines changed

6 files changed

+155
-147
lines changed

.storybook/webpack.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ const env = dotenv.config({path: path.resolve(__dirname, '../.env.staging')}).pa
1212
module.exports = ({config}) => {
1313
config.resolve.alias = {
1414
'react-native-config': 'react-web-config',
15-
'react-native$': 'react-native-web',
15+
'react-native$': '@expensify/react-native-web',
16+
'react-native-web': '@expensify/react-native-web',
1617
'@react-native-community/netinfo': path.resolve(__dirname, '../__mocks__/@react-native-community/netinfo.js'),
1718
};
1819

config/webpack/webpack.common.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const includeModules = [
1111
'react-native-animatable',
1212
'react-native-reanimated',
1313
'react-native-picker-select',
14-
'react-native-web',
14+
'@expensify/react-native-web',
1515
'react-native-webview',
1616
'@react-native-picker',
1717
'react-native-modal',
@@ -151,7 +151,8 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
151151
resolve: {
152152
alias: {
153153
'react-native-config': 'react-web-config',
154-
'react-native$': 'react-native-web',
154+
'react-native$': '@expensify/react-native-web',
155+
'react-native-web': '@expensify/react-native-web',
155156
'react-content-loader/native': 'react-content-loader',
156157
},
157158

0 commit comments

Comments
 (0)