From abd64081c2d5471cebba280ae05b7d7f1b6807c5 Mon Sep 17 00:00:00 2001 From: Aman Varshney Date: Thu, 11 Sep 2025 14:36:16 +0530 Subject: [PATCH 1/5] feat(cli): upgrade to expo 54 --- .../native/native-base/lib/auth-client.ts.hbs | 2 +- .../backend/server/next/package.json.hbs | 6 +- .../frontend/native/nativewind/app-env.d.ts | 2 - .../nativewind/{app.json => app.json.hbs} | 0 .../(tabs)/{_layout.tsx => _layout.tsx.hbs} | 6 +- .../(tabs)/{index.tsx => index.tsx.hbs} | 0 .../(drawer)/(tabs)/{two.tsx => two.tsx.hbs} | 0 .../frontend/native/nativewind/app/+html.tsx | 47 --------------- .../{+not-found.tsx => +not-found.tsx.hbs} | 2 +- .../app/{modal.tsx => modal.tsx.hbs} | 0 .../native/nativewind/babel.config.js | 11 ---- .../native/nativewind/babel.config.js.hbs | 14 +++++ .../{container.tsx => container.tsx.hbs} | 2 +- ...eader-button.tsx => header-button.tsx.hbs} | 2 +- .../{tabbar-icon.tsx => tabbar-icon.tsx.hbs} | 2 +- ...bar.tsx => android-navigation-bar.tsx.hbs} | 0 .../lib/{constants.ts => constants.ts.hbs} | 0 ...olor-scheme.ts => use-color-scheme.ts.hbs} | 0 .../{metro.config.js => metro.config.js.hbs} | 0 .../native/nativewind/package.json.hbs | 43 +++++++------- .../native/nativewind/tailwind.config.js | 59 ------------------- .../native/nativewind/tailwind.config.js.hbs | 59 +++++++++++++++++++ .../unistyles/{app.json => app.json.hbs} | 0 .../(tabs)/{_layout.tsx => _layout.tsx.hbs} | 6 +- .../(tabs)/{index.tsx => index.tsx.hbs} | 0 .../(drawer)/(tabs)/{two.tsx => two.tsx.hbs} | 0 .../frontend/native/unistyles/app/+html.tsx | 48 --------------- .../{+not-found.tsx => +not-found.tsx.hbs} | 2 +- .../native/unistyles/app/_layout.tsx.hbs | 4 +- .../app/{modal.tsx => modal.tsx.hbs} | 0 .../frontend/native/unistyles/babel.config.js | 21 ------- .../native/unistyles/babel.config.js.hbs | 21 +++++++ .../{breakpoints.ts => breakpoints.ts.hbs} | 0 .../{container.tsx => container.tsx.hbs} | 2 +- ...eader-button.tsx => header-button.tsx.hbs} | 2 +- .../{tabbar-icon.tsx => tabbar-icon.tsx.hbs} | 2 +- .../frontend/native/unistyles/expo-env.d.ts | 3 - .../native/unistyles/package.json.hbs | 47 +++++++-------- .../frontend/react/next/package.json.hbs | 6 +- .../react/react-router/package.json.hbs | 6 +- .../react/tanstack-router/package.json.hbs | 6 +- .../react/tanstack-start/package.json.hbs | 6 +- 42 files changed, 172 insertions(+), 267 deletions(-) delete mode 100644 apps/cli/templates/frontend/native/nativewind/app-env.d.ts rename apps/cli/templates/frontend/native/nativewind/{app.json => app.json.hbs} (100%) rename apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/{_layout.tsx => _layout.tsx.hbs} (94%) rename apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/{index.tsx => index.tsx.hbs} (100%) rename apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/{two.tsx => two.tsx.hbs} (100%) delete mode 100644 apps/cli/templates/frontend/native/nativewind/app/+html.tsx rename apps/cli/templates/frontend/native/nativewind/app/{+not-found.tsx => +not-found.tsx.hbs} (94%) rename apps/cli/templates/frontend/native/nativewind/app/{modal.tsx => modal.tsx.hbs} (100%) delete mode 100644 apps/cli/templates/frontend/native/nativewind/babel.config.js create mode 100644 apps/cli/templates/frontend/native/nativewind/babel.config.js.hbs rename apps/cli/templates/frontend/native/nativewind/components/{container.tsx => container.tsx.hbs} (76%) rename apps/cli/templates/frontend/native/nativewind/components/{header-button.tsx => header-button.tsx.hbs} (96%) rename apps/cli/templates/frontend/native/nativewind/components/{tabbar-icon.tsx => tabbar-icon.tsx.hbs} (70%) rename apps/cli/templates/frontend/native/nativewind/lib/{android-navigation-bar.tsx => android-navigation-bar.tsx.hbs} (100%) rename apps/cli/templates/frontend/native/nativewind/lib/{constants.ts => constants.ts.hbs} (100%) rename apps/cli/templates/frontend/native/nativewind/lib/{use-color-scheme.ts => use-color-scheme.ts.hbs} (100%) rename apps/cli/templates/frontend/native/nativewind/{metro.config.js => metro.config.js.hbs} (100%) delete mode 100644 apps/cli/templates/frontend/native/nativewind/tailwind.config.js create mode 100644 apps/cli/templates/frontend/native/nativewind/tailwind.config.js.hbs rename apps/cli/templates/frontend/native/unistyles/{app.json => app.json.hbs} (100%) rename apps/cli/templates/frontend/native/unistyles/app/(drawer)/(tabs)/{_layout.tsx => _layout.tsx.hbs} (93%) rename apps/cli/templates/frontend/native/unistyles/app/(drawer)/(tabs)/{index.tsx => index.tsx.hbs} (100%) rename apps/cli/templates/frontend/native/unistyles/app/(drawer)/(tabs)/{two.tsx => two.tsx.hbs} (100%) delete mode 100644 apps/cli/templates/frontend/native/unistyles/app/+html.tsx rename apps/cli/templates/frontend/native/unistyles/app/{+not-found.tsx => +not-found.tsx.hbs} (96%) rename apps/cli/templates/frontend/native/unistyles/app/{modal.tsx => modal.tsx.hbs} (100%) delete mode 100644 apps/cli/templates/frontend/native/unistyles/babel.config.js create mode 100644 apps/cli/templates/frontend/native/unistyles/babel.config.js.hbs rename apps/cli/templates/frontend/native/unistyles/{breakpoints.ts => breakpoints.ts.hbs} (100%) rename apps/cli/templates/frontend/native/unistyles/components/{container.tsx => container.tsx.hbs} (86%) rename apps/cli/templates/frontend/native/unistyles/components/{header-button.tsx => header-button.tsx.hbs} (97%) rename apps/cli/templates/frontend/native/unistyles/components/{tabbar-icon.tsx => tabbar-icon.tsx.hbs} (70%) delete mode 100644 apps/cli/templates/frontend/native/unistyles/expo-env.d.ts diff --git a/apps/cli/templates/auth/better-auth/native/native-base/lib/auth-client.ts.hbs b/apps/cli/templates/auth/better-auth/native/native-base/lib/auth-client.ts.hbs index 8d1b7bd82..0fa2e0dda 100644 --- a/apps/cli/templates/auth/better-auth/native/native-base/lib/auth-client.ts.hbs +++ b/apps/cli/templates/auth/better-auth/native/native-base/lib/auth-client.ts.hbs @@ -1,5 +1,5 @@ -import { createAuthClient } from "better-auth/react"; import { expoClient } from "@better-auth/expo/client"; +import { createAuthClient } from "better-auth/react"; import * as SecureStore from "expo-secure-store"; export const authClient = createAuthClient({ diff --git a/apps/cli/templates/backend/server/next/package.json.hbs b/apps/cli/templates/backend/server/next/package.json.hbs index 885cb31da..7c9860590 100644 --- a/apps/cli/templates/backend/server/next/package.json.hbs +++ b/apps/cli/templates/backend/server/next/package.json.hbs @@ -9,8 +9,8 @@ }, "dependencies": { "next": "15.5.0", - "react": "^19.0.0", - "react-dom": "^19.0.0", + "react": "19.1.0", + "react-dom": "19.1.0", "dotenv": "^17.2.1" }, {{#if (eq dbSetup 'supabase')}} @@ -20,7 +20,7 @@ {{/if}} "devDependencies": { "@types/node": "^20", - "@types/react": "^19", + "@types/react": "~19.1.10", "zod": "^4.0.13", "typescript": "^5" } diff --git a/apps/cli/templates/frontend/native/nativewind/app-env.d.ts b/apps/cli/templates/frontend/native/nativewind/app-env.d.ts deleted file mode 100644 index 88dc403ea..000000000 --- a/apps/cli/templates/frontend/native/nativewind/app-env.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -// @ts-ignore -/// diff --git a/apps/cli/templates/frontend/native/nativewind/app.json b/apps/cli/templates/frontend/native/nativewind/app.json.hbs similarity index 100% rename from apps/cli/templates/frontend/native/nativewind/app.json rename to apps/cli/templates/frontend/native/nativewind/app.json.hbs diff --git a/apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/_layout.tsx b/apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/_layout.tsx.hbs similarity index 94% rename from apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/_layout.tsx rename to apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/_layout.tsx.hbs index 617283cef..a1a1f04ad 100644 --- a/apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/_layout.tsx +++ b/apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/_layout.tsx.hbs @@ -7,7 +7,7 @@ export default function TabLayout() { return ( , }} /> ( diff --git a/apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/index.tsx b/apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/index.tsx.hbs similarity index 100% rename from apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/index.tsx rename to apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/index.tsx.hbs diff --git a/apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/two.tsx b/apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/two.tsx.hbs similarity index 100% rename from apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/two.tsx rename to apps/cli/templates/frontend/native/nativewind/app/(drawer)/(tabs)/two.tsx.hbs diff --git a/apps/cli/templates/frontend/native/nativewind/app/+html.tsx b/apps/cli/templates/frontend/native/nativewind/app/+html.tsx deleted file mode 100644 index 7dfb9333c..000000000 --- a/apps/cli/templates/frontend/native/nativewind/app/+html.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import { ScrollViewStyleReset } from 'expo-router/html'; -import { ReactNode } from 'react'; - -// This file is web-only and used to configure the root HTML for every -// web page during static rendering. -// The contents of this function only run in Node.js environments and -// do not have access to the DOM or browser APIs. -export default function Root({ children }: { children: ReactNode }) { - return ( - - - - - - {/* - This viewport disables scaling which makes the mobile website act more like a native app. - However this does reduce built-in accessibility. If you want to enable scaling, use this instead: - - */} - - {/* - Disable body scrolling on web. This makes ScrollView components work closer to how they do on native. - However, body scrolling is often nice to have for mobile web. If you want to enable it, remove this line. - */} - - - {/* Using raw CSS styles as an escape-hatch to ensure the background color never flickers in dark-mode. */} -