Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

chore(app): bump to expo 49 #69

Merged
merged 3 commits into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
"matchPackagePatterns": ["^metro$", "^metro-.+"],
"groupName": "facebook/metro"
},
{
"matchPackageNames": ["expo", "@babel/core", "@types/react", "typescript"],
"groupName": "yarn expo-cli upgrade",
"enabled": false
},
{
"matchPackageNames": [
"@babel/core",
"@types/react",
"typescript",
"@expo/vector-icons",
"@react-native-async-storage/async-storage",
"@react-native-community/datetimepicker",
Expand Down Expand Up @@ -86,6 +84,7 @@
"expo-permissions",
"expo-print",
"expo-random",
"expo-router",
"expo-screen-capture",
"expo-screen-orientation",
"expo-secure-store",
Expand Down Expand Up @@ -127,7 +126,7 @@
"@shopify/flash-list",
"@sentry/react-native"
],
"groupName": "https://github.com/expo/expo/blob/main/packages/expo/bundledNativeModules.json",
"groupName": "expo/expo",
"enabled": false
}
]
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,24 @@ jobs:

- run: yarn turbo run lint

drift_expo_install_check:
name: Drift [expo install --check]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

- run: corepack enable yarn

- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version-file: '.nvmrc'
cache: yarn

- run: yarn install --frozen-lockfile

- run: yarn expo install --check
working-directory: ./app

export:
name: Export
runs-on: ubuntu-latest
Expand Down
49 changes: 0 additions & 49 deletions .github/workflows/expo-dependencies.yml

This file was deleted.

3 changes: 2 additions & 1 deletion app/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"projectId": "538ec1e8-a11b-4465-acfa-26b5df238331"
}
},
"owner": "levain"
"owner": "levain",
"plugins": ["expo-router"]
}
}
23 changes: 9 additions & 14 deletions app/app/_layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DarkTheme, ThemeProvider } from '@react-navigation/native';
import { useFonts } from 'expo-font';
import { SplashScreen, Stack } from 'expo-router';
import { StatusBar } from 'expo-status-bar';
import { setStatusBarStyle } from 'expo-status-bar';
import { useEffect } from 'react';
import { Platform, View } from 'react-native';
import { SafeAreaProvider } from 'react-native-safe-area-context';
Expand Down Expand Up @@ -43,33 +43,28 @@ function AppContainer(): JSX.Element | null {
AntDesign: require('../assets/fonts/AntDesign.ttf'),
});

useEffect(() => {
if (error) throw error;
}, [error]);

useEffect(() => {
if (loaded) {
SplashScreen.hideAsync();
setStatusBarStyle('light');
}
if (error) {
throw error;
}
}, [loaded]);

if (!loaded) {
return null;
}

return (
<SafeAreaProvider>
<HapticFeedbackProvider>
<ThemeProvider value={DarkTheme}>
<ThemeProvider value={DarkTheme}>
<HapticFeedbackProvider>
<ExternalLinkProvider>
<StatusBar style="light" />
<Stack>
<Stack.Screen name="keychain" options={{ headerShown: false }} />
<Stack.Screen name="signing" options={{ presentation: 'modal' }} />
</Stack>
</ExternalLinkProvider>
</ThemeProvider>
</HapticFeedbackProvider>
</HapticFeedbackProvider>
</ThemeProvider>
</SafeAreaProvider>
);
}
30 changes: 15 additions & 15 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@
"@babel/core": "^7.20.0",
"@expo/vector-icons": "^13.0.0",
"@gorhom/bottom-sheet": "^4.4.7",
"@react-native-async-storage/async-storage": "1.17.11",
"expo": "~48.0.18",
"expo-checkbox": "~2.3.1",
"expo-constants": "~14.2.1",
"expo-haptics": "~12.2.1",
"expo-linking": "~4.0.1",
"expo-router": "^1.7.7",
"expo-status-bar": "~1.4.4",
"@react-native-async-storage/async-storage": "1.18.2",
"expo": "^49.0.0",
"expo-checkbox": "~2.4.0",
"expo-constants": "~14.4.2",
"expo-haptics": "~12.4.0",
"expo-linking": "~5.0.2",
"expo-router": "2.0.0",
"expo-status-bar": "~1.6.0",
"react": "18.2.0",
"react-dom": "^18.2.0",
"react-native": "0.71.8",
"react-native-gesture-handler": "~2.9.0",
"react-native-reanimated": "~2.14.4",
"react-native-safe-area-context": "4.5.0",
"react-native-screens": "~3.20.0",
"react-native-web": "~0.18.11",
"react-native": "0.72.1",
"react-native-gesture-handler": "~2.12.0",
"react-native-reanimated": "~3.3.0",
"react-native-safe-area-context": "4.6.3",
"react-native-screens": "~3.22.0",
"react-native-web": "~0.19.6",
"tailwind-rn": "^4.2.0",
"typescript": "4.9.5"
"typescript": "^5.1.3"
},
"devDependencies": {
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
Expand Down
6 changes: 3 additions & 3 deletions app/playwright.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ export default defineConfig({

webServer: {
command: 'yarn run start',
// http://localhost:19000/ isn't reliable to determine if the server is ready.
// http://localhost:8081/ isn't reliable to determine if the server is ready.
// However, AppEntry.bundle will only be available after the "Web Bundling complete" message.
url: 'http://localhost:19000/AppEntry.bundle?platform=web&hot=false',
url: 'http://localhost:8081/AppEntry.bundle?platform=web&hot=false',
reuseExistingServer: !process.env.CI,
timeout: 180 * 1000,
stdout: 'pipe',
Expand Down Expand Up @@ -38,7 +38,7 @@ export default defineConfig({

use: {
// Base URL to use in actions like `await page.goto('/')`.
baseURL: 'http://localhost:19000',
baseURL: 'http://localhost:8081',
// Collect trace when retrying the failed test.
trace: 'on',
// equivalent to cypress: macbook-16
Expand Down
Loading
Loading