Skip to content

Commit 573e824

Browse files
authored
Merge pull request Expensify#64155 from software-mansion-labs/bump/react-navigation-7
Bump: `@react-navigation` and `react-native-screens` to the newest versions
2 parents 312508a + 68c11c4 commit 573e824

57 files changed

Lines changed: 1833 additions & 2938 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

__mocks__/@react-navigation/native/index.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const realReactNavigation = isJestEnv ? jest.requireActual<typeof ReactNavigatio
88

99
const useIsFocused = isJestEnv ? realReactNavigation.useIsFocused : () => true;
1010
const useTheme = isJestEnv ? realReactNavigation.useTheme : () => ({});
11+
const useLocale = isJestEnv ? realReactNavigation.useTheme : () => ({});
1112

1213
const {triggerTransitionEnd, addListener} = isJestEnv
1314
? createAddListenerMock()
@@ -44,14 +45,14 @@ const useLinkTo = isJestEnv ? realReactNavigation.useLinkTo : () => null;
4445
const useScrollToTop = isJestEnv ? realReactNavigation.useScrollToTop : () => null;
4546
const useRoute = isJestEnv ? realReactNavigation.useRoute : () => ({params: {}});
4647
const useFocusEffect = isJestEnv ? realReactNavigation.useFocusEffect : (callback: () => void) => callback();
47-
// eslint-disable-next-line @typescript-eslint/naming-convention
48-
const UNSTABLE_usePreventRemove = isJestEnv ? jest.fn() : () => {};
48+
const usePreventRemove = isJestEnv ? jest.fn() : () => {};
4949

5050
export {
5151
// Overridden modules
5252
useIsFocused,
5353
useTheme,
5454
useNavigation,
55+
useLocale,
5556
triggerTransitionEnd,
5657

5758
// Theme modules are left alone
@@ -68,7 +69,7 @@ export {
6869
useScrollToTop,
6970
useRoute,
7071
useFocusEffect,
71-
UNSTABLE_usePreventRemove,
72+
usePreventRemove,
7273
};
7374

7475
export type {NativeNavigationMock};

config/webpack/webpack.common.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ const includeModules = [
3333
'react-native-web',
3434
'react-native-webview',
3535
'@react-native-picker',
36+
'@react-navigation/material-top-tabs',
37+
'@react-navigation/native',
38+
'@react-navigation/native-stack',
39+
'@react-navigation/stack',
3640
'react-native-modal',
3741
'react-native-gesture-handler',
3842
'react-native-google-places-autocomplete',
@@ -160,6 +164,12 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
160164
],
161165
module: {
162166
rules: [
167+
{
168+
test: /\.m?js$/,
169+
resolve: {
170+
fullySpecified: false,
171+
},
172+
},
163173
// Transpiles and lints all the JS
164174
{
165175
test: /\.(js|ts)x?$/,

0 commit comments

Comments
 (0)