one 1.1.398 → 1.1.400

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.398",
+  "version": "1.1.400",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -107,15 +107,15 @@
     "@react-navigation/routers": "~7",
     "@swc/core": "^1.10.4",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/compiler": "1.1.398",
-    "@vxrn/resolve": "1.1.398",
-    "@vxrn/tslib-lite": "1.1.398",
-    "@vxrn/universal-color-scheme": "1.1.398",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.398",
+    "@vxrn/compiler": "1.1.400",
+    "@vxrn/resolve": "1.1.400",
+    "@vxrn/tslib-lite": "1.1.400",
+    "@vxrn/universal-color-scheme": "1.1.400",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.400",
     "babel-dead-code-elimination": "^1.0.6",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.1.398",
+    "create-vxrn": "1.1.400",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
     "expo-modules-core": "2.1.2",
@@ -142,12 +142,12 @@
     "vite": "^6.0.6",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.398",
+    "vxrn": "1.1.400",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.121.10",
+    "@tamagui/build": "^1.121.11",
     "@types/node": "^22.1.0",
     "@types/react-dom": "^18.2.25",
     "@types/xxhashjs": "^0.2.4",

package/src/cli/build.ts

@@ -15,13 +15,11 @@ import {
 } from 'vxrn'
 import * as constants from '../constants'
 import type { RouteInfo } from '../server/createRoutesManifest'
-import type { LoaderProps, RenderApp } from '../types'
-import { getLoaderPath, getPreloadPath } from '../utils/cleanUrl'
 import { toAbsolute } from '../utils/toAbsolute'
 import { getManifest } from '../vite/getManifest'
 import { loadUserOneOptions } from '../vite/loadConfig'
-import { replaceLoader } from '../vite/replaceLoader'
 import type { One } from '../vite/types'
+import { buildPage } from './buildPage'
 import { labelProcess } from './label-process'
 
 const { ensureDir, readFile, outputFile } = FSExtra
@@ -213,33 +211,14 @@ export async function build(args: {
 
   console.info(`\n 🔨 build static routes\n`)
 
-  let render: RenderApp | null = null
-  const entryServer = vxrnOutput.serverEntry
-
-  try {
-    const serverImport = await import(entryServer)
-
-    render =
-      serverImport.default.render ||
-      // for an unknown reason this is necessary
-      serverImport.default.default?.render
-
-    if (typeof render !== 'function') {
-      console.error(`❌ Error: didn't find render function in entry`, serverImport)
-      process.exit(1)
-    }
-  } catch (err) {
-    console.error(`❌ Error importing the root entry:`)
-    console.error(`  This error happened in the built file: ${entryServer}`)
-    // @ts-expect-error
-    console.error(err['stack'])
-    process.exit(1)
-  }
-
   const staticDir = join(`dist/static`)
   const clientDir = join(`dist/client`)
   await ensureDir(staticDir)
 
+  if (!vxrnOutput.serverOutput) {
+    throw new Error(`No server output`)
+  }
+
   const outputEntries = [...vxrnOutput.serverOutput.entries()]
 
   for (const [index, output] of outputEntries) {
@@ -428,113 +407,30 @@ export async function build(args: {
       console.info(`paramsList`, JSON.stringify(paramsList, null, 2))
     }
 
-    for (const params of paramsList) {
-      const cleanId = relativeId.replace(/\+(spa|ssg|ssr)\.tsx?$/, '')
-      const path = getPathnameFromFilePath(cleanId, params, foundRoute.type === 'ssg')
-      const htmlPath = `${path.endsWith('/') ? `${removeTrailingSlash(path)}/index` : path}.html`
-      const clientJsPath = join(`dist/client`, clientManifestEntry.file)
-      const htmlOutPath = toAbsolute(join(staticDir, htmlPath))
-
-      let loaderData = {}
-
-      try {
+    const built = await Promise.all(
+      paramsList.map((params) => {
+        const cleanId = relativeId.replace(/\+(spa|ssg|ssr)\.tsx?$/, '')
+        const path = getPathnameFromFilePath(cleanId, params, foundRoute.type === 'ssg')
         console.info(`  ↦ route ${path}`)
-
-        const cleanPath = path === '/' ? path : removeTrailingSlash(path)
-
-        const preloadPath = getPreloadPath(path)
-
-        // todo await optimize
-        await FSExtra.writeFile(
-          join(clientDir, preloadPath),
-          preloads.map((preload) => `import "${preload}"`).join('\n')
-        )
-
-        const middlewares = (foundRoute.middlewares || []).map(
-          (x) => builtMiddlewares[x.contextKey]
-        )
-
-        builtRoutes.push({
-          type: foundRoute.type,
-          routeFile: foundRoute.file,
-          middlewares,
-          cleanPath,
-          preloadPath,
-          clientJsPath,
-          serverJsPath,
-          htmlPath,
-          loaderData,
-          params,
+        return buildPage(
+          vxrnOutput.serverEntry,
           path,
+          relativeId,
+          params,
+          foundRoute,
+          clientManifestEntry,
+          staticDir,
+          clientDir,
+          builtMiddlewares,
+          serverJsPath,
           preloads,
-        })
-
-        if (exported.loader) {
-          loaderData = (await exported.loader?.({ path, params })) ?? null
-          const code = await readFile(clientJsPath, 'utf-8')
-          const withLoader =
-            // super dirty to quickly make ssr loaders work until we have better
-            `
-if (typeof document === 'undefined') globalThis.document = {}
-` +
-            replaceLoader({
-              code,
-              loaderData,
-            })
-          const loaderPartialPath = join(clientDir, getLoaderPath(path))
-          await outputFile(loaderPartialPath, withLoader)
-        }
-
-        // ssr, we basically skip at build-time and just compile it the js we need
-        if (foundRoute.type !== 'ssr') {
-          const loaderProps: LoaderProps = { path, params }
-          // importing resetState causes issues :/
-          globalThis['__vxrnresetState']?.()
-
-          if (foundRoute.type === 'ssg') {
-            const html = await render({
-              path,
-              preloads,
-              loaderProps,
-              loaderData,
-              css: allCSS,
-              mode: 'ssg',
-            })
-            await outputFile(htmlOutPath, html)
-            continue
-          }
-
-          if (foundRoute.type === 'spa') {
-            await outputFile(
-              htmlOutPath,
-              `<html><head>
-              ${constants.getSpaHeaderElements({ serverContext: { loaderProps, loaderData } })}
-              ${preloads
-                .map((preload) => `   <script type="module" src="${preload}"></script>`)
-                .join('\n')}
-              ${allCSS.map((file) => `    <link rel="stylesheet" href=${file} />`).join('\n')}
-            </head></html>`
-            )
-          }
-        }
-      } catch (err) {
-        const errMsg = err instanceof Error ? `${err.message}\n${err.stack}` : `${err}`
-
-        console.error(
-          `Error building static page at ${path} with id ${relativeId}:
-
-${errMsg}
-
-  loaderData:
-
-${JSON.stringify(loaderData || null, null, 2)}
-  params:
-
-${JSON.stringify(params || null, null, 2)}`
+          allCSS
         )
-        console.error(err)
-        process.exit(1)
-      }
+      })
+    )
+
+    for (const info of built) {
+      builtRoutes.push(info)
     }
   }
 
@@ -642,10 +538,6 @@ compatibility_date = "2024-12-05"
   console.info(`\n\n  💛 build complete\n\n`)
 }
 
-function removeTrailingSlash(path: string) {
-  return path.endsWith('/') ? path.slice(0, path.length - 1) : path
-}
-
 async function moveAllFiles(src: string, dest: string) {
   try {
     await FSExtra.copy(src, dest, { overwrite: true, errorOnExist: false })

package/src/cli/buildPage.ts

@@ -0,0 +1,152 @@
+import FSExtra from 'fs-extra'
+import { join } from 'node:path'
+import * as constants from '../constants'
+import type { RouteInfo } from '../server/createRoutesManifest'
+import type { LoaderProps, RenderApp } from '../types'
+import { getLoaderPath, getPreloadPath } from '../utils/cleanUrl'
+import { toAbsolute } from '../utils/toAbsolute'
+import { replaceLoader } from '../vite/replaceLoader'
+import type { One } from '../vite/types'
+
+const { readFile, outputFile } = FSExtra
+
+export async function buildPage(
+  serverEntry: string,
+  path: string,
+  relativeId: string,
+  params: any,
+  foundRoute: RouteInfo<string>,
+  clientManifestEntry: any,
+  staticDir: string,
+  clientDir: string,
+  builtMiddlewares: Record<string, string>,
+  serverJsPath: string,
+  preloads: string[],
+  allCSS: string[]
+): Promise<One.RouteBuildInfo> {
+  const render = await getRender(serverEntry)
+  const htmlPath = `${path.endsWith('/') ? `${removeTrailingSlash(path)}/index` : path}.html`
+  const clientJsPath = join(`dist/client`, clientManifestEntry.file)
+  const htmlOutPath = toAbsolute(join(staticDir, htmlPath))
+  const preloadPath = getPreloadPath(path)
+
+  let loaderData = {}
+
+  try {
+    // todo await optimize
+    await FSExtra.writeFile(
+      join(clientDir, preloadPath),
+      preloads.map((preload) => `import "${preload}"`).join('\n')
+    )
+
+    const exported = await import(toAbsolute(serverJsPath))
+
+    if (exported.loader) {
+      loaderData = (await exported.loader?.({ path, params })) ?? null
+      const code = await readFile(clientJsPath, 'utf-8')
+      const withLoader =
+        // super dirty to quickly make ssr loaders work until we have better
+        `
+if (typeof document === 'undefined') globalThis.document = {}
+` +
+        replaceLoader({
+          code,
+          loaderData,
+        })
+      const loaderPartialPath = join(clientDir, getLoaderPath(path))
+      await outputFile(loaderPartialPath, withLoader)
+    }
+
+    // ssr, we basically skip at build-time and just compile it the js we need
+    if (foundRoute.type !== 'ssr') {
+      const loaderProps: LoaderProps = { path, params }
+      // importing resetState causes issues :/
+      globalThis['__vxrnresetState']?.()
+
+      if (foundRoute.type === 'ssg') {
+        const html = await render({
+          path,
+          preloads,
+          loaderProps,
+          loaderData,
+          css: allCSS,
+          mode: 'ssg',
+        })
+        await outputFile(htmlOutPath, html)
+      } else if (foundRoute.type === 'spa') {
+        await outputFile(
+          htmlOutPath,
+          `<html><head>
+          ${constants.getSpaHeaderElements({ serverContext: { loaderProps, loaderData } })}
+          ${preloads
+            .map((preload) => `   <script type="module" src="${preload}"></script>`)
+            .join('\n')}
+          ${allCSS.map((file) => `    <link rel="stylesheet" href=${file} />`).join('\n')}
+        </head></html>`
+        )
+      }
+    }
+  } catch (err) {
+    const errMsg = err instanceof Error ? `${err.message}\n${err.stack}` : `${err}`
+
+    console.error(
+      `Error building static page at ${path} with id ${relativeId}:
+
+${errMsg}
+
+loaderData:\n\n${JSON.stringify(loaderData || null, null, 2)}
+params:\n\n${JSON.stringify(params || null, null, 2)}`
+    )
+    console.error(err)
+    process.exit(1)
+  }
+
+  const middlewares = (foundRoute.middlewares || []).map((x) => builtMiddlewares[x.contextKey])
+
+  const cleanPath = path === '/' ? path : removeTrailingSlash(path)
+
+  return {
+    type: foundRoute.type,
+    routeFile: foundRoute.file,
+    middlewares,
+    cleanPath,
+    preloadPath,
+    clientJsPath,
+    serverJsPath,
+    htmlPath,
+    loaderData,
+    params,
+    path,
+    preloads,
+  }
+}
+
+async function getRender(serverEntry: string) {
+  let render: RenderApp | null = null
+
+  try {
+    const serverImport = await import(serverEntry)
+
+    render =
+      serverImport.default.render ||
+      // for an unknown reason this is necessary
+      serverImport.default.default?.render
+
+    if (typeof render !== 'function') {
+      console.error(`❌ Error: didn't find render function in entry`, serverImport)
+      process.exit(1)
+    }
+  } catch (err) {
+    console.error(`❌ Error importing the root entry:`)
+    console.error(`  This error happened in the built file: ${serverEntry}`)
+    // @ts-expect-error
+    console.error(err['stack'])
+    process.exit(1)
+  }
+
+  return render
+}
+
+function removeTrailingSlash(path: string) {
+  return path.endsWith('/') ? path.slice(0, path.length - 1) : path
+}

package/src/cli/dev.ts

@@ -7,7 +7,7 @@ export async function dev(args: {
   port?: string
   https?: boolean
   mode?: 'development' | 'production'
-  debugBundle?: boolean
+  debugBundle?: string
   debug?: string
 }) {
   labelProcess('dev')

package/src/cli.ts

@@ -59,7 +59,7 @@ const dev = defineCommand({
         'If set to "production" you can run the development server but serve the production bundle',
     },
     'debug-bundle': {
-      type: 'boolean',
+      type: 'string',
       description: `Will output the bundle to a temp file and then serve it from there afterwards allowing you to easily edit the bundle to debug problems.`,
     },
     debug: {
@@ -71,7 +71,7 @@ const dev = defineCommand({
     const { dev } = await import('./cli/dev')
     await dev({
       ...args,
-      debugBundle: !!args['debug-bundle'],
+      debugBundle: args['debug-bundle'],
       mode: modes[args.mode],
     })
   },

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

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AAgCA,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,iBA8lBA"}
+{"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"}

package/types/cli/buildPage.d.ts

@@ -0,0 +1,4 @@
+import type { RouteInfo } from '../server/createRoutesManifest';
+import type { One } from '../vite/types';
+export declare function buildPage(serverEntry: string, path: string, relativeId: string, params: any, foundRoute: RouteInfo<string>, clientManifestEntry: any, staticDir: string, clientDir: string, builtMiddlewares: Record<string, string>, serverJsPath: string, preloads: string[], allCSS: string[]): Promise<One.RouteBuildInfo>;
+//# sourceMappingURL=buildPage.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"buildPage.d.ts","sourceRoot":"","sources":["../../src/cli/buildPage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAA;AAK/D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAIxC,wBAAsB,SAAS,CAC7B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAC7B,mBAAmB,EAAE,GAAG,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAgG7B"}

package/types/cli/dev.d.ts

@@ -4,7 +4,7 @@ export declare function dev(args: {
     port?: string;
     https?: boolean;
     mode?: 'development' | 'production';
-    debugBundle?: boolean;
+    debugBundle?: string;
     debug?: string;
 }): Promise<void>;
 //# sourceMappingURL=dev.d.ts.map

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,OAAO,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,iBAmCA"}
+{"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"}