Skip to content

Commit 74aed75

Browse files
authored
Merge pull request #116 from flexbox/expo/bump
bump expo
2 parents 24c267b + cca325c commit 74aed75

File tree

7 files changed

+1066
-5348
lines changed

7 files changed

+1066
-5348
lines changed

hackathon/spacecraft/package.json

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"dependencies": {
2020
"@expo/vector-icons": "^13.0.0",
2121
"@react-native-community/masked-view": "0.1.11",
22-
"@react-native-community/netinfo": "8.2.0",
22+
"@react-native-community/netinfo": "9.3.0",
2323
"@react-navigation/material-bottom-tabs": "^6.2.2",
2424
"@react-navigation/native": "^6.0.11",
2525
"@react-navigation/native-stack": "^6.7.0",
@@ -28,39 +28,38 @@
2828
"@types/jest": "^27.5.1",
2929
"babel-core": "^7.0.0-bridge.0",
3030
"babel-jest": "^27.4.6",
31-
"expo": "^45.0.4",
32-
"expo-cli": "^5.4.4",
33-
"expo-constants": "~13.1.1",
34-
"expo-status-bar": "~1.3.0",
31+
"expo": "^46.0.16",
32+
"expo-constants": "~13.2.4",
33+
"expo-status-bar": "~1.4.0",
3534
"jest": "^26.6.3",
36-
"jest-expo": "^45.0.0",
37-
"react": "17.0.2",
38-
"react-dom": "17.0.2",
39-
"react-native": "0.68.2",
40-
"react-native-gesture-handler": "~2.2.1",
35+
"jest-expo": "^46.0.0",
36+
"react": "18.0.0",
37+
"react-dom": "18.0.0",
38+
"react-native": "0.69.6",
39+
"react-native-gesture-handler": "~2.5.0",
4140
"react-native-offline": "^6.0.0",
4241
"react-native-paper": "^4.12.2",
43-
"react-native-reanimated": "~2.8.0",
44-
"react-native-safe-area-context": "4.2.4",
45-
"react-native-screens": "~3.11.1",
42+
"react-native-reanimated": "~2.9.1",
43+
"react-native-safe-area-context": "4.3.1",
44+
"react-native-screens": "~3.15.0",
4645
"react-native-vector-icons": "^8.1.0",
47-
"react-native-web": "0.17.7"
46+
"react-native-web": "~0.18.7"
4847
},
4948
"devDependencies": {
50-
"@babel/core": "^7.12.9",
49+
"@babel/core": "^7.18.6",
5150
"@babel/preset-typescript": "^7.16.7",
5251
"@testing-library/react-native": "^10.1.1",
53-
"@types/react": "~17.0.21",
54-
"@types/react-dom": "~17.0.11",
55-
"@types/react-native": "~0.67.6",
52+
"@types/react": "~18.0.0",
53+
"@types/react-dom": "~18.0.0",
54+
"@types/react-native": "~0.69.1",
5655
"babel-plugin-module-resolver": "^4.1.0",
5756
"babel-plugin-root-import": "^6.6.0",
5857
"babel-plugin-transform-remove-console": "^6.9.4",
5958
"eslint": "^7.29.0",
6059
"eslint-config-react-native-wcandillon": "^3.6.1",
6160
"eslint-import-resolver-babel-plugin-root-import": "^1.1.1",
6261
"eslint-plugin-import": "^2.25.3",
63-
"typescript": "~4.3.5"
62+
"typescript": "^4.6.3"
6463
},
6564
"private": false
6665
}

hackathon/spacecraft/src/components/Offline.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react";
22
import { StyleSheet, View, Text } from "react-native";
33
import { ActivityIndicator, Colors } from "react-native-paper";
4-
import { useIsConnected } from 'react-native-offline';
4+
import { useIsConnected } from "react-native-offline";
55

66
export const Offline = () => {
77
const isConnected = useIsConnected();

hackathon/spacecraft/src/components/PeopleItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useNavigation } from "@react-navigation/native";
2-
import { PeopleProps } from "api/types";
2+
import type { PeopleProps } from "api/types";
33
import React from "react";
44
import { List, Colors } from "react-native-paper";
55

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from "react";
22
import { render } from "@testing-library/react-native";
33
import { NavigationContainer } from "@react-navigation/native";
44

5-
import StarshipCard from "~/components/StarshipCard";
5+
import { StarshipCard } from "~/components/StarshipCard";
66

77
const shipFixture = {
88
name: "Millennium Falcon",

hackathon/spacecraft/src/components/StarshipCard.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ interface StarshipDetailsScreenParams {
1616
navigate: any;
1717
}
1818

19-
const StarshipCard = ({ ship }: StarshipCardProps) => {
19+
export const StarshipCard = ({ ship }: StarshipCardProps) => {
2020
const title = ship.name;
2121
const price = ship.cost_in_credits;
2222
const { manufacturer } = ship;
@@ -57,5 +57,3 @@ const styles = StyleSheet.create({
5757
marginBottom: 32,
5858
},
5959
});
60-
61-
export default StarshipCard;

hackathon/spacecraft/src/screens/StarshipFeedScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FlatList } from "react-native";
44
import { Button } from "react-native-paper";
55

66
import { ScreenContainer } from "../components/ScreenContainer";
7-
import StarshipCard from "../components/StarshipCard";
7+
import { StarshipCard } from "../components/StarshipCard";
88

99
import { fetchStarships } from "~/hooks/useStarships";
1010

0 commit comments

Comments
 (0)