Skip to content

Commit 8ec3199

Browse files
authored
Merge pull request #2288 from FormidableLabs/jp-upgrade-rn-demo
[Demo]: Upgrade React Native demo app
2 parents e79942c + 2256c77 commit 8ec3199

File tree

7 files changed

+3491
-2716
lines changed

7 files changed

+3491
-2716
lines changed

demo/rn/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
node_modules/
22
.expo/
3+
dist/
34
npm-debug.*
45
*.jks
56
*.p8

demo/rn/App.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import React from "react";
2+
import { LogBox } from "react-native";
23
import { NavigationContainer } from "@react-navigation/native";
34
import { RootNavigator } from "./src/screens/root-navigator";
45

6+
LogBox.ignoreLogs(["Require cycle: ../../packages/victory"]);
7+
58
export default function App() {
69
return (
710
<NavigationContainer>

demo/rn/app.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"version": "1.0.0",
66
"orientation": "portrait",
77
"icon": "./assets/icon.png",
8+
"userInterfaceStyle": "light",
89
"splash": {
910
"image": "./assets/splash.png",
1011
"resizeMode": "contain",

demo/rn/assets/splash.png

-1.11 KB
Loading

demo/rn/metro.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const path = require("path");
2-
const { getDefaultConfig } = require("@expo/metro-config");
3-
const blacklist = require("metro-config/src/defaults/blacklist");
2+
const { getDefaultConfig } = require("expo/metro-config");
3+
const blacklist = require("metro-config/src/defaults/exclusionList");
44
const escape = require("escape-string-regexp");
55

66
/**

demo/rn/package.json

+19-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"name": "rn-demo",
3+
"version": "1.0.0",
24
"main": "node_modules/expo/AppEntry.js",
35
"scripts": {
46
"start": "expo start",
@@ -8,27 +10,26 @@
810
"eject": "expo eject"
911
},
1012
"dependencies": {
11-
"@expo/metro-config": "^0.2.0",
12-
"@react-navigation/native": "^6.0.4",
13-
"@react-navigation/native-stack": "^6.2.2",
14-
"expo": "~42.0.1",
15-
"expo-status-bar": "~1.0.4",
13+
"@react-navigation/native": "^6.0.10",
14+
"@react-navigation/native-stack": "^6.6.2",
15+
"expo": "~45.0.0",
16+
"expo-status-bar": "~1.3.0",
1617
"lodash": "^4.17.21",
17-
"react": "16.13.1",
18-
"react-dom": "16.13.1",
19-
"react-native": "https://github.com/expo/react-native/archive/sdk-42.0.0.tar.gz",
20-
"react-native-gesture-handler": "~1.10.2",
21-
"react-native-safe-area-context": "3.2.0",
22-
"react-native-screens": "~3.4.0",
23-
"react-native-svg": "12.1.1",
24-
"react-native-web": "~0.13.12"
18+
"react": "17.0.2",
19+
"react-dom": "17.0.2",
20+
"react-native": "0.68.2",
21+
"react-native-gesture-handler": "~2.2.1",
22+
"react-native-safe-area-context": "4.2.4",
23+
"react-native-screens": "~3.11.1",
24+
"react-native-svg": "12.3.0",
25+
"react-native-web": "0.17.7"
2526
},
2627
"devDependencies": {
27-
"@babel/core": "^7.9.0",
28-
"@types/lodash": "^4.14.175",
29-
"@types/react": "~16.9.35",
30-
"@types/react-native": "~0.63.2",
31-
"typescript": "~4.0.0"
28+
"@babel/core": "^7.12.9",
29+
"@types/lodash": "^4.14.182",
30+
"@types/react": "~17.0.21",
31+
"@types/react-native": "~0.66.13",
32+
"typescript": "~4.3.5"
3233
},
3334
"private": true
3435
}

demo/rn/yarn.lock

+3,465-2,696
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)