Skip to content

Commit 83716c2

Browse files
committed
Merge branch 'main' into v13
# Conflicts: # examples/basic/jest-setup.ts # examples/basic/package.json # examples/basic/yarn.lock # examples/cookbook/package.json # examples/cookbook/yarn.lock # package.json
2 parents 9ed7549 + 47b2477 commit 83716c2

Some content is hidden

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

71 files changed

+4644
-6363
lines changed

.yarn/releases/yarn-4.4.0.cjs

-925
This file was deleted.

.yarn/releases/yarn-4.5.3.cjs

+934
Large diffs are not rendered by default.

.yarnrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ enableGlobalCache: true
22

33
nodeLinker: node-modules
44

5-
yarnPath: .yarn/releases/yarn-4.4.0.cjs
5+
yarnPath: .yarn/releases/yarn-4.5.3.cjs

examples/basic/jest-setup.ts

-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
import { configure } from '@testing-library/react-native';
2-
3-
// Silence the warning: Animated: `useNativeDriver` is not supported because the native animated module is missing
4-
jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');

examples/basic/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
"typecheck": "tsc --noEmit"
1212
},
1313
"dependencies": {
14-
"expo": "^51.0.26",
15-
"expo-status-bar": "~1.12.1",
16-
"react": "18.2.0",
17-
"react-dom": "18.2.0",
18-
"react-native": "0.74.5",
19-
"react-native-web": "~0.19.6"
14+
"expo": "^52.0.11",
15+
"expo-status-bar": "~2.0.0",
16+
"react": "18.3.1",
17+
"react-dom": "18.3.1",
18+
"react-native": "0.76.3",
19+
"react-native-web": "~0.19.13"
2020
},
2121
"devDependencies": {
2222
"@babel/core": "^7.24.0",
23-
"@testing-library/react-native": "^13.0.0-alpha.1",
23+
"@testing-library/react-native": "^13.0.0-beta.0",
2424
"@types/eslint": "^8.56.10",
2525
"@types/jest": "^29.5.12",
26-
"@types/react": "~18.2.79",
26+
"@types/react": "~18.3.12",
2727
"eslint": "^8.57.0",
2828
"jest": "^29.7.0",
2929
"react-test-renderer": "18.2.0",

examples/basic/yarn.lock

+1,505-2,601
Large diffs are not rendered by default.

examples/cookbook/app/_layout.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export default function RootLayout() {
1313
headerTitleStyle: {
1414
fontWeight: 'bold',
1515
},
16-
headerBackTitleVisible: false,
1716
}}
1817
>
1918
<Stack.Screen name="index" options={{ headerTitle: '' }} />

examples/cookbook/jest-setup.ts

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ import { configure } from '@testing-library/react-native';
22

33
import { server } from './app/network-requests/__tests__/test-utils';
44

5-
// Silence the warning: Animated: `useNativeDriver` is not supported because the native animated module is missing
6-
jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
7-
85
// Enable API mocking via Mock Service Worker (MSW)
96
beforeAll(() => server.listen());
107

examples/cookbook/package.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,29 @@
1111
"typecheck": "tsc --noEmit"
1212
},
1313
"dependencies": {
14-
"expo": "~51.0.31",
15-
"expo-constants": "~16.0.2",
16-
"expo-linking": "~6.3.1",
17-
"expo-router": "~3.5.23",
18-
"expo-splash-screen": "~0.27.5",
19-
"expo-status-bar": "~1.12.1",
14+
"expo": "^52.0.11",
15+
"expo-constants": "~17.0.3",
16+
"expo-linking": "~7.0.3",
17+
"expo-router": "~4.0.9",
18+
"expo-splash-screen": "~0.29.13",
19+
"expo-status-bar": "~2.0.0",
2020
"jotai": "^2.8.4",
2121
"nanoid": "^3.3.7",
22-
"react": "18.2.0",
23-
"react-dom": "18.2.0",
24-
"react-native": "0.74.5",
22+
"react": "18.3.1",
23+
"react-dom": "18.3.1",
24+
"react-native": "0.76.3",
2525
"react-native-get-random-values": "~1.11.0",
26-
"react-native-safe-area-context": "4.10.5",
27-
"react-native-screens": "3.31.1",
28-
"react-native-web": "~0.19.6"
26+
"react-native-safe-area-context": "4.12.0",
27+
"react-native-screens": "~4.1.0",
28+
"react-native-web": "~0.19.13"
2929
},
3030
"devDependencies": {
3131
"@babel/core": "^7.20.0",
32-
"@expo/metro-runtime": "~3.2.3",
33-
"@testing-library/react-native": "^13.0.0-alpha.1",
32+
"@expo/metro-runtime": "~4.0.0",
33+
"@testing-library/react-native": "^13.0.0-beta.0",
3434
"@types/eslint": "^8.56.10",
3535
"@types/jest": "^29.5.12",
36-
"@types/react": "~18.2.45",
36+
"@types/react": "~18.3.12",
3737
"@types/react-native-get-random-values": "^1",
3838
"eslint": "^8.57.0",
3939
"jest": "^29.7.0",

0 commit comments

Comments
 (0)