Set tamagui target per platform in dev & CI/CD (was deleted in anothe…

…r PR) Bumped expo version Added expo tools to vs code extensions
timothymiller · Jul 25, 2023 · f57578b · f57578b · github-actions · Jul 25, 2023
1 parent f02a889
commit f57578b
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 267 deletions.
diff --git a/.github/workflows/expo.yml b/.github/workflows/expo.yml
@@ -44,6 +44,7 @@ jobs:
         id: build
         continue-on-error: true
         run: |
+          export TAMAGUI_TARGET=native
           cd apps/expo && build_json=$(eas build --profile $BUILD_PROFILE --platform all --non-interactive --json)
           android_link=$(echo $build_json | jq -r '.[] | select(.platform=="ANDROID") | .artifacts.applicationArchiveUrl')
           ios_link=$(echo $build_json | jq -r '.[] | select(.platform=="IOS") | .artifacts.applicationArchiveUrl')

diff --git a/.github/workflows/next.yml b/.github/workflows/next.yml
@@ -38,6 +38,7 @@ jobs:
       - name: Build
         run: |
           cd apps/next
+          export TAMAGUI_TARGET=web
           export NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }}
           export NEXT_PUBLIC_APP_URL=${{ secrets.NEXT_PUBLIC_APP_URL }}
           export NEXT_PUBLIC_SUPABASE_URL=${{ secrets.NEXT_PUBLIC_SUPABASE_URL }}

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -17,6 +17,7 @@
     "wilsonsio.color-vision",
     "bungcip.better-toml",
     "formulahendry.auto-rename-tag",
-    "dbaeumer.vscode-eslint"
+    "dbaeumer.vscode-eslint",
+    "expo.vscode-expo-tools"
   ]
 }
diff --git a/apps/expo/app.config.ts b/apps/expo/app.config.ts
@@ -7,10 +7,10 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   ...config,
   extra: {
     eas: {
-      projectId: process.env.EAS_PROJECT_ID ?? 'timothymiller',
+      projectId: process.env.EAS_PROJECT_ID || 'timothymiller',
     },
   },
-  owner: process.env.EAS_OWNER ?? '85fc6ccd-0ce1-4e4d-804c-b15df989f97e',
+  owner: process.env.EAS_OWNER || '85fc6ccd-0ce1-4e4d-804c-b15df989f97e',
   plugins: ['expo-router'],
   experiments: {
     tsconfigPaths: true,

diff --git a/apps/expo/package.json b/apps/expo/package.json
@@ -17,7 +17,7 @@
     "app": "*",
     "babel-plugin-module-resolver": "^4.1.0",
     "burnt": "^0.11.7",
-    "expo": "^49.0.3",
+    "expo": "^49.0.5",
     "expo-constants": "~14.4.2",
     "expo-dev-client": "~2.4.6",
     "expo-font": "~11.4.0",

diff --git a/apps/next/package.json b/apps/next/package.json
@@ -3,9 +3,9 @@
   "version": "2.0.0",
   "private": true,
   "scripts": {
-    "dev": "pnpm with-env next dev",
-    "build": "pnpm with-env next build",
-    "start": "pnpm with-env next start",
+    "dev": "TAMAGUI_TARGET=web pnpm with-env next dev",
+    "build": "TAMAGUI_TARGET=web pnpm with-env next build",
+    "start": "TAMAGUI_TARGET=web pnpm with-env next start",
     "lint": "next lint",
     "with-env": "dotenv -e ../../.env.local --",
     "clean": "git clean -xdf .next node_modules .tamagui"