Skip to content

Commit

Permalink
Merge pull request #2288 from FormidableLabs/jp-upgrade-rn-demo
Browse files Browse the repository at this point in the history
[Demo]: Upgrade React Native demo app
  • Loading branch information
jpdriver authored Jun 6, 2022
2 parents e79942c + 2256c77 commit 8ec3199
Show file tree
Hide file tree
Showing 7 changed files with 3,491 additions and 2,716 deletions.
1 change: 1 addition & 0 deletions demo/rn/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
node_modules/
.expo/
dist/
npm-debug.*
*.jks
*.p8
Expand Down
3 changes: 3 additions & 0 deletions demo/rn/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import React from "react";
import { LogBox } from "react-native";
import { NavigationContainer } from "@react-navigation/native";
import { RootNavigator } from "./src/screens/root-navigator";

LogBox.ignoreLogs(["Require cycle: ../../packages/victory"]);

export default function App() {
return (
<NavigationContainer>
Expand Down
1 change: 1 addition & 0 deletions demo/rn/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/icon.png",
"userInterfaceStyle": "light",
"splash": {
"image": "./assets/splash.png",
"resizeMode": "contain",
Expand Down
Binary file modified demo/rn/assets/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions demo/rn/metro.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require("path");
const { getDefaultConfig } = require("@expo/metro-config");
const blacklist = require("metro-config/src/defaults/blacklist");
const { getDefaultConfig } = require("expo/metro-config");
const blacklist = require("metro-config/src/defaults/exclusionList");
const escape = require("escape-string-regexp");

/**
Expand Down
37 changes: 19 additions & 18 deletions demo/rn/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"name": "rn-demo",
"version": "1.0.0",
"main": "node_modules/expo/AppEntry.js",
"scripts": {
"start": "expo start",
Expand All @@ -8,27 +10,26 @@
"eject": "expo eject"
},
"dependencies": {
"@expo/metro-config": "^0.2.0",
"@react-navigation/native": "^6.0.4",
"@react-navigation/native-stack": "^6.2.2",
"expo": "~42.0.1",
"expo-status-bar": "~1.0.4",
"@react-navigation/native": "^6.0.10",
"@react-navigation/native-stack": "^6.6.2",
"expo": "~45.0.0",
"expo-status-bar": "~1.3.0",
"lodash": "^4.17.21",
"react": "16.13.1",
"react-dom": "16.13.1",
"react-native": "https://github.com/expo/react-native/archive/sdk-42.0.0.tar.gz",
"react-native-gesture-handler": "~1.10.2",
"react-native-safe-area-context": "3.2.0",
"react-native-screens": "~3.4.0",
"react-native-svg": "12.1.1",
"react-native-web": "~0.13.12"
"react": "17.0.2",
"react-dom": "17.0.2",
"react-native": "0.68.2",
"react-native-gesture-handler": "~2.2.1",
"react-native-safe-area-context": "4.2.4",
"react-native-screens": "~3.11.1",
"react-native-svg": "12.3.0",
"react-native-web": "0.17.7"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@types/lodash": "^4.14.175",
"@types/react": "~16.9.35",
"@types/react-native": "~0.63.2",
"typescript": "~4.0.0"
"@babel/core": "^7.12.9",
"@types/lodash": "^4.14.182",
"@types/react": "~17.0.21",
"@types/react-native": "~0.66.13",
"typescript": "~4.3.5"
},
"private": true
}
6,161 changes: 3,465 additions & 2,696 deletions demo/rn/yarn.lock

Large diffs are not rendered by default.

0 comments on commit 8ec3199

Please sign in to comment.