Skip to content

Commit 480e046

Browse files
authored
Merge pull request #262 from flexbox/feature/bump-sdk-52
Feature/bump sdk 52
2 parents 7147b61 + a45c49a commit 480e046

36 files changed

+3135
-4163
lines changed

hackathon/spacecraft/App.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
import { AuthenticationProvider } from "@/context/Authentication";
2+
import { NetworkProvider } from "@/context/Network";
3+
import { useAppearanceTheme } from "@/hooks/useAppearanceTheme";
4+
import { Navigator } from "@/navigation/Navigator";
15
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
26
import Constants from "expo-constants";
37
import { Provider as PaperProvider } from "react-native-paper";
48

5-
import { AuthenticationProvider } from "~/context/Authentication";
6-
import { NetworkProvider } from "~/context/Network";
7-
import { useAppearanceTheme } from "~/hooks/useAppearanceTheme";
8-
import { Navigator } from "~/navigation/Navigator";
9-
109
const queryClient = new QueryClient();
1110

1211
const App = () => {

hackathon/spacecraft/app.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
android: {
33
adaptiveIcon: {
4-
backgroundColor: "#FFFFFF",
4+
backgroundColor: "#ffffff",
55
foregroundImage: "./assets/adaptive-icon.png",
66
},
77
package: "weshipit.today.spacecraft",
@@ -24,6 +24,7 @@ module.exports = {
2424
supportsTablet: true,
2525
},
2626
name: "spacecraft",
27+
newArchEnabled: true,
2728
orientation: "portrait",
2829
owner: "weshipit",
2930
plugins: [

hackathon/spacecraft/jest.setup.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,5 @@ jest.mock("react-native-reanimated", () => {
1414
return Reanimated;
1515
});
1616

17-
// Silence the warning: Animated: `useNativeDriver` is not supported because the native animated module is missing
18-
jest.mock("react-native/Libraries/Animated/NativeAnimatedHelper");
19-
2017
// fixing `ReferenceError: You are trying to `import` a file after the Jest environment has been torn down.`
2118
jest.useFakeTimers();

hackathon/spacecraft/package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
},
2727
"dependencies": {
2828
"@dev-plugins/react-navigation": "^0.0.6",
29-
"@expo/metro-runtime": "~3.2.1",
29+
"@expo/metro-runtime": "~4.0.1",
3030
"@expo/vector-icons": "^14.0.0",
3131
"@react-native-async-storage/async-storage": "1.23.1",
3232
"@react-native-community/masked-view": "0.1.11",
33-
"@react-native-community/netinfo": "11.3.1",
33+
"@react-native-community/netinfo": "11.4.1",
3434
"@react-navigation/bottom-tabs": "^6.5.5",
3535
"@react-navigation/native": "^6.1.1",
3636
"@react-navigation/native-stack": "^6.9.7",
@@ -39,34 +39,34 @@
3939
"babel-core": "^7.0.0-bridge.0",
4040
"babel-jest": "^29.5.0",
4141
"deepmerge": "^4.3.1",
42-
"expo": "^51.0.0",
43-
"expo-application": "~5.9.1",
44-
"expo-constants": "~16.0.1",
45-
"expo-image": "~1.12.9",
46-
"expo-linking": "~6.3.1",
47-
"expo-status-bar": "~1.12.1",
48-
"expo-store-review": "~7.0.2",
49-
"expo-updates": "~0.25.14",
50-
"expo-web-browser": "~13.0.3",
51-
"react": "18.2.0",
42+
"expo": "^52.0.27",
43+
"expo-application": "~6.0.2",
44+
"expo-constants": "~17.0.4",
45+
"expo-image": "~2.0.4",
46+
"expo-linking": "~7.0.4",
47+
"expo-status-bar": "~2.0.1",
48+
"expo-store-review": "~8.0.1",
49+
"expo-updates": "~0.26.13",
50+
"expo-web-browser": "~14.0.2",
51+
"react": "18.3.1",
5252
"react-currency-format": "^1.1.0",
53-
"react-dom": "18.2.0",
54-
"react-native": "0.74.5",
55-
"react-native-gesture-handler": "~2.16.1",
53+
"react-dom": "18.3.1",
54+
"react-native": "0.76.6",
55+
"react-native-gesture-handler": "~2.20.2",
5656
"react-native-offline": "^6.0.0",
5757
"react-native-paper": "^5.12.2",
58-
"react-native-reanimated": "~3.10.1",
59-
"react-native-safe-area-context": "4.10.5",
60-
"react-native-screens": "3.31.1",
58+
"react-native-reanimated": "~3.16.1",
59+
"react-native-safe-area-context": "4.12.0",
60+
"react-native-screens": "~4.4.0",
6161
"react-native-vector-icons": "^10.0.3",
6262
"react-native-web": "~0.19.10",
6363
"rn-placeholder": "^3.0.3"
6464
},
6565
"devDependencies": {
6666
"@babel/core": "^7.24.0",
6767
"@babel/preset-typescript": "^7.18.6",
68-
"@react-native-community/datetimepicker": "8.0.1",
69-
"@react-native-community/slider": "4.5.2",
68+
"@react-native-community/datetimepicker": "8.2.0",
69+
"@react-native-community/slider": "4.5.5",
7070
"@storybook/addon-controls": "^7.6.10",
7171
"@storybook/addon-ondevice-actions": "^7.6.15",
7272
"@storybook/addon-ondevice-backgrounds": "^7.6.15",
@@ -80,16 +80,16 @@
8080
"@testing-library/jest-native": "^5.4.3",
8181
"@testing-library/react-native": "^12.4.3",
8282
"@types/jest": "^29.5.4",
83-
"@types/react": "~18.2.79",
84-
"@types/react-dom": "~18.2.25",
83+
"@types/react": "~18.3.12",
84+
"@types/react-dom": "~18.3.1",
8585
"@typescript-eslint/eslint-plugin": "^7.11.0",
8686
"@typescript-eslint/parser": "^7.11.0",
87-
"app-icon-badge": "^0.0.15",
87+
"app-icon-badge": "^0.1.2",
8888
"babel-loader": "^9.1.3",
8989
"babel-plugin-module-resolver": "^5.0.0",
9090
"babel-plugin-transform-remove-console": "^6.9.4",
9191
"eslint": "^8.56.0",
92-
"eslint-config-expo": "^7.0.0",
92+
"eslint-config-expo": "~8.0.1",
9393
"eslint-config-prettier": "^9.1.0",
9494
"eslint-config-react-native-wcandillon": "^3.9.0",
9595
"eslint-plugin-perfectionist": "^3.3.0",
@@ -99,7 +99,7 @@
9999
"eslint-plugin-react-native": "^4.1.0",
100100
"eslint-plugin-testing-library": "^6.3.0",
101101
"jest": "^29.6.4",
102-
"jest-expo": "~51.0.2",
102+
"jest-expo": "~52.0.3",
103103
"prettier": "^3.2.5",
104104
"typescript": "~5.3.3"
105105
}

hackathon/spacecraft/src/components/Card.stories.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import type { StarshipProps } from "api/types";
22

3+
import { StarshipCard } from "@/components/StarshipCard";
34
import { NavigationContainer } from "@react-navigation/native";
45

5-
import { StarshipCard } from "~/components/StarshipCard";
6-
76
const shipFixture = {
87
model: "YT-1300 light freighter",
98
name: "Millennium Falcon",

hackathon/spacecraft/src/components/FromInput.test.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1+
import { FormInput } from "@/components/FromInput";
12
import { fireEvent, render, screen } from "@testing-library/react-native";
23

3-
import { FormInput } from "~/components/FromInput";
4-
54
describe("FormInput", () => {
65
const mock = jest.fn();
76
it("renders correctly", () => {

hackathon/spacecraft/src/components/Offline.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { useNetwork } from "@/context/Network";
2+
import React from "react";
13
import { StyleSheet, Text, View } from "react-native";
24
import { ActivityIndicator, useTheme } from "react-native-paper";
35

4-
import { useNetwork } from "~/context/Network";
5-
66
export const Offline = () => {
77
const { isConnected } = useNetwork();
88
const { colors } = useTheme();

hackathon/spacecraft/src/components/PeopleItem.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import type { PeopleProps } from "api/types";
22

3+
import { Routes } from "@/navigation/Routes";
34
import { useNavigation } from "@react-navigation/native";
45
import { List } from "react-native-paper";
56

6-
import { Routes } from "~/navigation/Routes";
7-
87
interface PeopleItemProps {
98
people: PeopleProps;
109
}

hackathon/spacecraft/src/components/ScreenContainer.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import type { ReactNode } from "react";
22

3+
import { Offline } from "@/components/Offline";
34
import { useNavigation } from "@react-navigation/native";
45
import { ScrollView, StyleSheet, View } from "react-native";
56
import { IconButton, Text, useTheme } from "react-native-paper";
67

7-
import { Offline } from "~/components/Offline";
8-
98
interface ScreenContainerProps {
109
accessoryFooter?: ReactNode;
1110
children?: ReactNode;

hackathon/spacecraft/src/components/SkeletonList.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { SkeletonList } from "~/components/SkeletonList";
1+
import { SkeletonList } from "@/components/SkeletonList";
22

33
export default {
44
title: "SkeletonList",

0 commit comments

Comments
 (0)