From 4cebd67f4640c3299e9cf55cd8563c9ce013ba62 Mon Sep 17 00:00:00 2001 From: Cedric van Putten Date: Wed, 22 Apr 2020 18:04:32 +0200 Subject: [PATCH] refactor(with-react-router): upgrade to sdk 37 --- with-react-router/.gitignore | 14 -------------- with-react-router/App.js | 11 ++--------- with-react-router/README.md | 5 +++++ with-react-router/app.json | 11 ++++------- with-react-router/package.json | 11 +++++------ 5 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 with-react-router/.gitignore diff --git a/with-react-router/.gitignore b/with-react-router/.gitignore deleted file mode 100644 index c409cf6..0000000 --- a/with-react-router/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -node_modules/**/* -.expo/* -npm-debug.* -*.jks -*.p8 -*.p12 -*.key -*.mobileprovision -*.orig.* -web-build/ -web-report/ - -# macOS -.DS_Store diff --git a/with-react-router/App.js b/with-react-router/App.js index e384e10..b137217 100644 --- a/with-react-router/App.js +++ b/with-react-router/App.js @@ -1,12 +1,6 @@ import React from "react"; import { StyleSheet, Text, View, Platform } from "react-native"; - -import { - Router, - Switch, - Route, - Link - } from "./react-router"; +import { Router, Route, Link } from "./react-router"; const Home = () => Home; @@ -38,8 +32,7 @@ const styles = StyleSheet.create({ nav:{ flexDirection: 'row', justifyContent: 'space-around', - } - + }, }); export default App; diff --git a/with-react-router/README.md b/with-react-router/README.md index 05a00bd..0dc1e55 100644 --- a/with-react-router/README.md +++ b/with-react-router/README.md @@ -1,5 +1,10 @@ # [React Router Example](https://reacttraining.com/react-router/web/guides/quick-start) +

+ + Supports Expo Web +

+ React Router is a universal routing solution that you can use with Expo! This demo shows you how to setup your universal application to switch between web and native routers. diff --git a/with-react-router/app.json b/with-react-router/app.json index 0e9b6d2..03168c4 100644 --- a/with-react-router/app.json +++ b/with-react-router/app.json @@ -1,15 +1,12 @@ { "expo": { "name": "with-react-router", - "platforms": [ - "ios", - "android", - "web" - ], "version": "1.0.0", - "icon": "https://d1wp6m56sqw74a.cloudfront.net/~assets/c9aa1be8a6a6fe81e20c3ac4106a2ebc", + "icon": "https://github.com/expo/expo/blob/master/templates/expo-template-blank/assets/icon.png?raw=true", "splash": { - "image": "https://d1wp6m56sqw74a.cloudfront.net/~assets/c9aa1be8a6a6fe81e20c3ac4106a2ebc" + "image": "https://github.com/expo/expo/blob/master/templates/expo-template-blank/assets/splash.png?raw=true", + "resizeMode": "contain", + "backgroundColor": "#ffffff" } } } diff --git a/with-react-router/package.json b/with-react-router/package.json index 944a723..4104988 100644 --- a/with-react-router/package.json +++ b/with-react-router/package.json @@ -5,17 +5,16 @@ "deploy": "npx netlify deploy --dir web-build" }, "dependencies": { - "expo": "36.0.0", + "expo": "37.0.7", "react": "16.9.0", "react-dom": "16.9.0", - "react-native": "https://github.com/expo/react-native/archive/sdk-36.0.0.tar.gz", + "react-native": "https://github.com/expo/react-native/archive/sdk-37.0.1.tar.gz", "react-native-web": "0.11.7", "react-router-dom": "5.1.2", "react-router-native": "5.1.2" }, "devDependencies": { - "@babel/core": "7.0.0", - "babel-preset-expo": "8.0.0" - }, - "license": "ISC" + "@babel/core": "7.9.0", + "babel-preset-expo": "8.1.0" + } }