Skip to content

Commit

Permalink
Merge branch 'main' into v13
Browse files Browse the repository at this point in the history
# Conflicts:
#	examples/basic/jest-setup.ts
#	examples/basic/package.json
#	examples/basic/yarn.lock
#	examples/cookbook/package.json
#	examples/cookbook/yarn.lock
#	package.json
  • Loading branch information
mdjastrzebski committed Nov 27, 2024
2 parents 9ed7549 + 47b2477 commit 83716c2
Show file tree
Hide file tree
Showing 71 changed files with 4,644 additions and 6,363 deletions.
925 changes: 0 additions & 925 deletions .yarn/releases/yarn-4.4.0.cjs

This file was deleted.

934 changes: 934 additions & 0 deletions .yarn/releases/yarn-4.5.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ enableGlobalCache: true

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.4.0.cjs
yarnPath: .yarn/releases/yarn-4.5.3.cjs
4 changes: 0 additions & 4 deletions examples/basic/jest-setup.ts
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
import { configure } from '@testing-library/react-native';

// Silence the warning: Animated: `useNativeDriver` is not supported because the native animated module is missing
jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');
16 changes: 8 additions & 8 deletions examples/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"expo": "^51.0.26",
"expo-status-bar": "~1.12.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.74.5",
"react-native-web": "~0.19.6"
"expo": "^52.0.11",
"expo-status-bar": "~2.0.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-native": "0.76.3",
"react-native-web": "~0.19.13"
},
"devDependencies": {
"@babel/core": "^7.24.0",
"@testing-library/react-native": "^13.0.0-alpha.1",
"@testing-library/react-native": "^13.0.0-beta.0",
"@types/eslint": "^8.56.10",
"@types/jest": "^29.5.12",
"@types/react": "~18.2.79",
"@types/react": "~18.3.12",
"eslint": "^8.57.0",
"jest": "^29.7.0",
"react-test-renderer": "18.2.0",
Expand Down
4,106 changes: 1,505 additions & 2,601 deletions examples/basic/yarn.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion examples/cookbook/app/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export default function RootLayout() {
headerTitleStyle: {
fontWeight: 'bold',
},
headerBackTitleVisible: false,
}}
>
<Stack.Screen name="index" options={{ headerTitle: '' }} />
Expand Down
3 changes: 0 additions & 3 deletions examples/cookbook/jest-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ import { configure } from '@testing-library/react-native';

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

// Silence the warning: Animated: `useNativeDriver` is not supported because the native animated module is missing
jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper');

// Enable API mocking via Mock Service Worker (MSW)
beforeAll(() => server.listen());

Expand Down
30 changes: 15 additions & 15 deletions examples/cookbook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"expo": "~51.0.31",
"expo-constants": "~16.0.2",
"expo-linking": "~6.3.1",
"expo-router": "~3.5.23",
"expo-splash-screen": "~0.27.5",
"expo-status-bar": "~1.12.1",
"expo": "^52.0.11",
"expo-constants": "~17.0.3",
"expo-linking": "~7.0.3",
"expo-router": "~4.0.9",
"expo-splash-screen": "~0.29.13",
"expo-status-bar": "~2.0.0",
"jotai": "^2.8.4",
"nanoid": "^3.3.7",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.74.5",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-native": "0.76.3",
"react-native-get-random-values": "~1.11.0",
"react-native-safe-area-context": "4.10.5",
"react-native-screens": "3.31.1",
"react-native-web": "~0.19.6"
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "~4.1.0",
"react-native-web": "~0.19.13"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@expo/metro-runtime": "~3.2.3",
"@testing-library/react-native": "^13.0.0-alpha.1",
"@expo/metro-runtime": "~4.0.0",
"@testing-library/react-native": "^13.0.0-beta.0",
"@types/eslint": "^8.56.10",
"@types/jest": "^29.5.12",
"@types/react": "~18.2.45",
"@types/react": "~18.3.12",
"@types/react-native-get-random-values": "^1",
"eslint": "^8.57.0",
"jest": "^29.7.0",
Expand Down
Loading

0 comments on commit 83716c2

Please sign in to comment.