one 1.1.401 → 1.1.403

package/src/cli/build.ts

@@ -21,6 +21,7 @@ import { loadUserOneOptions } from '../vite/loadConfig'
 import type { One } from '../vite/types'
 import { buildPage } from './buildPage'
 import { labelProcess } from './label-process'
+import { checkNodeVersion } from './checkNodeVersion'
 
 const { ensureDir, readFile, outputFile } = FSExtra
 
@@ -34,6 +35,7 @@ export async function build(args: {
   platform?: 'ios' | 'web' | 'android'
 }) {
   labelProcess('build')
+  checkNodeVersion()
   await loadEnv('production')
 
   if (!process.env.ONE_SERVER_URL) {
@@ -407,13 +409,11 @@ export async function build(args: {
       console.info(`paramsList`, JSON.stringify(paramsList, null, 2))
     }
 
-    const built: One.RouteBuildInfo[] = []
-
     for (const params of paramsList) {
       const cleanId = relativeId.replace(/\+(spa|ssg|ssr)\.tsx?$/, '')
       const path = getPathnameFromFilePath(cleanId, params, foundRoute.type === 'ssg')
       console.info(`  ↦ route ${path}`)
-      built.push(
+      builtRoutes.push(
         await buildPage(
           vxrnOutput.serverEntry,
           path,
@@ -430,10 +430,6 @@ export async function build(args: {
         )
       )
     }
-
-    for (const info of built) {
-      builtRoutes.push(info)
-    }
   }
 
   // once done building static we can move it to client dir:

package/src/cli/checkNodeVersion.ts

@@ -0,0 +1,13 @@
+export function checkNodeVersion() {
+  const [major, minor] = process.version.split('.')
+
+  if (+major < 20) {
+    console.error(`One requires Node >= 20.11 (for import.meta.dirname support)`)
+    process.exit(1)
+  }
+
+  if (+major === 20 && +minor < 12) {
+    console.error(`One requires Node >= 20.11 (for import.meta.dirname support)`)
+    process.exit(1)
+  }
+}

package/src/cli/dev.ts

@@ -1,4 +1,5 @@
 import { virtualEntryIdNative } from '../vite/plugins/virtualEntryConstants'
+import { checkNodeVersion } from './checkNodeVersion'
 import { labelProcess } from './label-process'
 
 export async function dev(args: {
@@ -11,6 +12,7 @@ export async function dev(args: {
   debug?: string
 }) {
   labelProcess('dev')
+  checkNodeVersion()
 
   const { dev } = await import('vxrn/dev')
 

package/src/fork/getStateFromPath.ts

@@ -138,7 +138,7 @@ export function getStateFromPath<ParamList extends {}>(
     if (routes.length) {
       // @modified - start
       // return createNestedStateObject(path, routes, initialRoutes)
-      return createNestedStateObject(pathData, routes, initialRoutes, [], pathData.url.hash)
+      return createNestedStateObject(pathData, routes, initialRoutes, [])
       // @modified - end
     }
 
@@ -676,8 +676,7 @@ const createNestedStateObject = (
   // @modified - end
   routes: ParsedRoute[],
   initialRoutes: InitialRouteConfig[],
-  flatConfig?: RouteConfig[],
-  hash?: string // @modified: added
+  flatConfig?: RouteConfig[]
 ) => {
   let route = routes.shift() as ParsedRoute
   const parentScreens: string[] = []
@@ -725,7 +724,7 @@ const createNestedStateObject = (
     path,
     route,
     flatConfig ? findParseConfigForRoute(route.name, flatConfig) : undefined,
-    hash
+    restPathData.url.hash
   )
   // @modified - end
 

package/src/typed-routes/getTypedRoutesDeclarationFile.ts

@@ -26,7 +26,9 @@ export function getTypedRoutesDeclarationFile(ctx: One.RouteContext) {
     dynamicRouteContextKeys
   )
 
-  return `
+  return `// deno-lint-ignore-file
+/* eslint-disable */
+// biome-ignore: needed import
 import type { OneRouter } from 'one'
 
 declare module 'one' {

package/src/vite/one.ts

@@ -235,6 +235,7 @@ export function one(options: One.PluginOptions = {}): PluginOption {
             client: {
               define: {
                 'process.env.VITE_ENVIRONMENT': '"client"',
+                'process.env.TAMAGUI_ENVIRONMENT': '"client"',
                 'import.meta.env.VITE_ENVIRONMENT': '"client"',
                 'process.env.EXPO_OS': '"web"',
               },
@@ -243,6 +244,7 @@ export function one(options: One.PluginOptions = {}): PluginOption {
             ssr: {
               define: {
                 'process.env.VITE_ENVIRONMENT': '"ssr"',
+                'process.env.TAMAGUI_ENVIRONMENT': '"ssr"',
                 'import.meta.env.VITE_ENVIRONMENT': '"ssr"',
                 'process.env.EXPO_OS': '"web"',
               },
@@ -251,6 +253,7 @@ export function one(options: One.PluginOptions = {}): PluginOption {
             ios: {
               define: {
                 'process.env.VITE_ENVIRONMENT': '"ios"',
+                'process.env.TAMAGUI_ENVIRONMENT': '"ios"',
                 'import.meta.env.VITE_ENVIRONMENT': '"ios"',
                 'process.env.EXPO_OS': '"ios"',
               },
@@ -259,6 +262,7 @@ export function one(options: One.PluginOptions = {}): PluginOption {
             android: {
               define: {
                 'process.env.VITE_ENVIRONMENT': '"android"',
+                'process.env.TAMAGUI_ENVIRONMENT': '"android"',
                 'import.meta.env.VITE_ENVIRONMENT': '"android"',
                 'process.env.EXPO_OS': '"android"',
               },
@@ -269,12 +273,32 @@ export function one(options: One.PluginOptions = {}): PluginOption {
     } satisfies Plugin,
 
     {
-      name: 'tamagui-react-19',
+      name: 'one:tamagui',
       config() {
         return {
           define: {
             // safe to set because it only affects web in tamagui, and one is always react 19
             'process.env.TAMAGUI_REACT_19': '"1"',
+            'process.env.TAMAGUI_SKIP_THEME_OPTIMIZATION': '"1"',
+          },
+
+          environments: {
+            ssr: {
+              define: {
+                'process.env.TAMAGUI_IS_SERVER': '"1"',
+                'process.env.TAMAGUI_KEEP_THEMES': '"1"',
+              },
+            },
+            ios: {
+              define: {
+                'process.env.TAMAGUI_KEEP_THEMES': '"1"',
+              },
+            },
+            android: {
+              define: {
+                'process.env.TAMAGUI_KEEP_THEMES': '"1"',
+              },
+            },
           },
         }
       },
@@ -300,6 +324,26 @@ export function one(options: One.PluginOptions = {}): PluginOption {
         })
       },
     } satisfies Plugin,
+
+    // Plugins may transform the source code and add imports of `react/jsx-dev-runtime`, which won't be discovered by Vite's initial `scanImports` since the implementation is using ESbuild where such plugins are not executed.
+    // Thus, if the project has a valid `react/jsx-dev-runtime` import, we tell Vite to optimize it, so Vite won't only discover it on the next page load and trigger a full reload.
+    {
+      name: 'one:optimize-react-dev-runtime',
+
+      config() {
+        try {
+          resolvePath('react/jsx-dev-runtime', root)
+
+          return {
+            optimizeDeps: {
+              include: ['react/jsx-dev-runtime'],
+            },
+          }
+        } catch {
+          return {}
+        }
+      },
+    } satisfies Plugin
   ] satisfies Plugin[]
 
   // react scan

package/types/cli/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AA8BA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;CACrC,iBAwfA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AA+BA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;CACrC,iBAqfA"}

package/types/cli/checkNodeVersion.d.ts

@@ -0,0 +1,2 @@
+export declare function checkNodeVersion(): void;
+//# sourceMappingURL=checkNodeVersion.d.ts.map

package/types/cli/checkNodeVersion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkNodeVersion.d.ts","sourceRoot":"","sources":["../../src/cli/checkNodeVersion.ts"],"names":[],"mappings":"AAAA,wBAAgB,gBAAgB,SAY/B"}

package/types/cli/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"AAGA,wBAAsB,GAAG,CAAC,IAAI,EAAE;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,aAAa,GAAG,YAAY,CAAA;IACnC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,iBAmCA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"AAIA,wBAAsB,GAAG,CAAC,IAAI,EAAE;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,aAAa,GAAG,YAAY,CAAA;IACnC,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,iBAoCA"}

package/types/typed-routes/getTypedRoutesDeclarationFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTypedRoutesDeclarationFile.d.ts","sourceRoot":"","sources":["../../src/typed-routes/getTypedRoutesDeclarationFile.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAOxC,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,UAgClE"}
+{"version":3,"file":"getTypedRoutesDeclarationFile.d.ts","sourceRoot":"","sources":["../../src/typed-routes/getTypedRoutesDeclarationFile.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAOxC,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,UAkClE"}

package/types/vite/one.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"one.d.ts","sourceRoot":"","sources":["../../src/vite/one.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAU,YAAY,EAAc,MAAM,MAAM,CAAA;AAW5D,OAAO,qBAAqB,CAAA;AAW5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAkBlC,wBAAgB,GAAG,CAAC,OAAO,GAAE,GAAG,CAAC,aAAkB,GAAG,YAAY,CA2ZjE"}
+{"version":3,"file":"one.d.ts","sourceRoot":"","sources":["../../src/vite/one.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAU,YAAY,EAAc,MAAM,MAAM,CAAA;AAW5D,OAAO,qBAAqB,CAAA;AAW5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAkBlC,wBAAgB,GAAG,CAAC,OAAO,GAAE,GAAG,CAAC,aAAkB,GAAG,YAAY,CAucjE"}