cleanup tamagui example

onejs · Jan 8, 2025 · 6c0560b · 6c0560b
1 parent 2a553b4
commit 6c0560b
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 24 deletions.
diff --git a/apps/onestack.dev/package.json b/apps/onestack.dev/package.json
@@ -13,8 +13,8 @@
     "serve:railway": "one serve --host 0.0.0.0",
     "subset-font-pn": "tsx ./helpers/subset-font.ts",
     "test": "yarn test:dev && yarn test:prod",
-    "test:dev": "TEST_ONLY=dev vitest run --mode dev",
-    "test:prod": "TEST_ONLY=prod vitest run --mode prod"
+    "test:dev": "TEST_ONLY=dev yarn vitest run --mode dev",
+    "test:prod": "TEST_ONLY=prod yarn vitest run --mode prod"
   },
   "dependencies": {
     "@docsearch/react": "^3.6.1",

diff --git a/examples/one-tamagui/app/_layout.tsx b/examples/one-tamagui/app/_layout.tsx
@@ -1,10 +1,10 @@
 import './_layout.css'
 import '~/tamagui/tamagui.css'
 
-import { SchemeProvider, useColorScheme } from '@vxrn/color-scheme'
+import { SchemeProvider } from '@vxrn/color-scheme'
 import { LoadProgressBar, Slot } from 'one'
-import { isWeb, TamaguiProvider } from 'tamagui'
-import config from '~/tamagui/tamagui.config'
+import { isWeb, View } from 'tamagui'
+import { TamaguiRootProvider } from '../src/tamagui/TamaguiRootProvider'
 
 export default function Layout() {
   return (
@@ -14,25 +14,19 @@ export default function Layout() {
         <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5" />
         <link rel="icon" href="/favicon.svg" />
+
+        <title>👋</title>
       </head>
 
-      <LoadProgressBar />
+      <body>
+        <LoadProgressBar />
 
-      <SchemeProvider>
-        <TamaguiRootProvider>
-          <Slot />
-        </TamaguiRootProvider>
-      </SchemeProvider>
+        <SchemeProvider>
+          <TamaguiRootProvider>
+            <Slot />
+          </TamaguiRootProvider>
+        </SchemeProvider>
+      </body>
     </html>
   )
 }
-
-const TamaguiRootProvider = ({ children }: { children: React.ReactNode }) => {
-  const [scheme] = useColorScheme()
-
-  return (
-    <TamaguiProvider disableInjectCSS config={config} defaultTheme={scheme} disableRootThemeClass>
-      {children}
-    </TamaguiProvider>
-  )
-}
diff --git a/examples/one-tamagui/routes.d.ts b/examples/one-tamagui/routes.d.ts
@@ -3,7 +3,7 @@ import type { OneRouter } from 'one'
 declare module 'one' {
   export namespace OneRouter {
     export interface __routes<T extends string = string> extends Record<string, unknown> {
-      StaticRoutes: `/` | `/_sitemap`
+      StaticRoutes: `/` | `/TamaguiRootProvider` | `/_sitemap`
       DynamicRoutes: never
       DynamicRouteTemplate: never
       IsTyped: true

diff --git a/examples/one-tamagui/src/tamagui/TamaguiRootProvider.tsx b/examples/one-tamagui/src/tamagui/TamaguiRootProvider.tsx
@@ -0,0 +1,13 @@
+import { useColorScheme } from '@vxrn/color-scheme'
+import { TamaguiProvider } from 'tamagui'
+import config from './tamagui.config'
+
+export const TamaguiRootProvider = ({ children }: { children: React.ReactNode }) => {
+  const [scheme] = useColorScheme()
+
+  return (
+    <TamaguiProvider disableInjectCSS config={config} defaultTheme={scheme} disableRootThemeClass>
+      {children}
+    </TamaguiProvider>
+  )
+}
diff --git a/next.md b/next.md
@@ -1,5 +1,8 @@
 1.0:
 
+  - root layout doesnt HMR
+  - hmr native tamagui example gives:
+    Error: [vite] cannot find entry point module 'virtual:one-entry'.
   - react-native-safe-area-context
     - were using Compat version from react-navigation seems to not work directly on web, need to fix/document
   - restore GestureHandlerRootView

diff --git a/tests/test/package.json b/tests/test/package.json
@@ -4,8 +4,8 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "test:dev": "TEST_ONLY=dev vitest --run --reporter=dot --color=false",
-    "test:prod": "TEST_ONLY=prod vitest --run --reporter=dot --color=false",
+    "test:dev": "TEST_ONLY=dev yarn vitest --run --reporter=dot --color=false",
+    "test:prod": "TEST_ONLY=prod yarn vitest --run --reporter=dot --color=false",
     "test": "yarn test:dev && yarn test:prod",
     "build:web": "one build",
     "clean": "one clean",