Skip to content

Commit f4f44ae

Browse files
committed
replace rnw fork with latest upstream
1 parent a2096c8 commit f4f44ae

File tree

4 files changed

+41
-74
lines changed

4 files changed

+41
-74
lines changed

.storybook/webpack.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ const custom = require('../config/webpack/webpack.common')({
2424
module.exports = ({config}) => {
2525
config.resolve.alias = {
2626
'react-native-config': 'react-web-config',
27-
'react-native$': '@expensify/react-native-web',
28-
'react-native-web': '@expensify/react-native-web',
27+
'react-native$': 'react-native-web',
28+
'react-native-web': 'react-native-web',
2929
'@react-native-community/netinfo': path.resolve(__dirname, '../__mocks__/@react-native-community/netinfo.js'),
3030
'@react-navigation/native': path.resolve(__dirname, '../__mocks__/@react-navigation/native'),
3131
};

config/webpack/webpack.common.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const includeModules = [
1313
'react-native-animatable',
1414
'react-native-reanimated',
1515
'react-native-picker-select',
16-
'@expensify/react-native-web',
16+
'react-native-web',
1717
'react-native-webview',
1818
'@react-native-picker',
1919
'react-native-modal',
@@ -183,8 +183,8 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
183183
resolve: {
184184
alias: {
185185
'react-native-config': 'react-web-config',
186-
'react-native$': '@expensify/react-native-web',
187-
'react-native-web': '@expensify/react-native-web',
186+
'react-native$': 'react-native-web',
187+
'react-native-web': 'react-native-web',
188188
'react-content-loader/native': 'react-content-loader',
189189
'lottie-react-native': 'react-native-web-lottie',
190190
},

package-lock.json

Lines changed: 35 additions & 68 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
"test:e2e": "node tests/e2e/testRunner.js --development"
5050
},
5151
"dependencies": {
52-
"@expensify/react-native-web": "0.18.15",
5352
"@formatjs/intl-getcanonicallocales": "^2.2.0",
5453
"@formatjs/intl-listformat": "^7.2.2",
5554
"@formatjs/intl-locale": "^3.3.0",
@@ -137,6 +136,7 @@
137136
"react-native-tab-view": "^3.5.2",
138137
"react-native-view-shot": "^3.6.0",
139138
"react-native-vision-camera": "^2.15.4",
139+
"react-native-web": "^0.19.7",
140140
"react-native-web-linear-gradient": "^1.1.2",
141141
"react-native-web-lottie": "^1.4.4",
142142
"react-native-webview": "^11.17.2",

0 commit comments

Comments
 (0)