one 1.1.470 → 1.1.472

package/src/render.tsx

@@ -3,7 +3,12 @@ import { hydrateRoot, createRoot } from 'react-dom/client'
 
 globalThis['__vxrnVersion'] ||= 0
 
+const listeners = new Set<Function>()
+let didRender = false
+
 export function render(element: React.ReactNode) {
+  console.warn('element', element)
+
   if (typeof document === 'undefined') return
 
   if (globalThis['__vxrnRoot']) {
@@ -11,9 +16,15 @@ export function render(element: React.ReactNode) {
     globalThis['__vxrnRoot'].render(element)
   } else {
     startTransition(() => {
-      const rootElement = document as any
+      // TODO this feels like it should be document.documentElement
+      // but that causes really bad issues - it will totally freeze pages that need to suspend for example
+      // and will log very strange things on routing
+      // seems like a legit react 19 bug, this fixes it, and i remember i found a reason why when i originally ran into this
+      // but be warned that this also blows away document.body and that can cause all sorts of issues with extensions.
+      const rootElement = document
+
       if (globalThis['__vxrnIsSPA']) {
-        const root = createRoot(rootElement)
+        const root = createRoot(rootElement as any)
         globalThis['__vxrnRoot'] = root
         root.render(element)
       } else {
@@ -36,4 +47,19 @@ export function render(element: React.ReactNode) {
       }
     })
   }
+
+  listeners.forEach((cb) => cb())
+  didRender = true
+}
+
+export function afterClientRender(listener: Function) {
+  if (didRender) {
+    listener()
+    return
+  }
+
+  listeners.add(listener)
+  return () => {
+    listeners.delete(listener)
+  }
 }

package/src/setup.ts

@@ -1,7 +1,11 @@
+import { afterClientRender } from './render'
+
 if (process.env.ONE_ENABLE_REACT_SCAN) {
-  // @ts-expect-error
+  // @ts-ignore (react-scan can be undefined or not depending on if the monorepo uses it)
   import('react-scan').then(({ scan }) => {
-    scan(JSON.parse(`${process.env.ONE_ENABLE_REACT_SCAN}`))
+    afterClientRender(() => {
+      scan(JSON.parse(`${process.env.ONE_ENABLE_REACT_SCAN}`))
+    })
   })
 }
 

package/src/utils/redirect.ts

@@ -1,7 +1,8 @@
+import type { OneRouter } from '../interfaces/router'
 import { getURL } from '../getURL'
 import { router } from '../router/imperative-api'
 
-export const redirect = (path: string, status?: number) => {
+export const redirect = (path: OneRouter.Href & string, status?: number) => {
   if (process.env.VITE_ENVIRONMENT === 'client') {
     router.navigate(path)
     return

package/src/vercel/build/buildVercelOutputDirectory.ts

@@ -61,7 +61,7 @@ export const buildVercelOutputDirectory = async ({
     }
   }
 
-  const vercelOutputFunctionsDir = join(oneOptionsRoot, 'dist', `.vercel/output/functions`)
+  const vercelOutputFunctionsDir = join(oneOptionsRoot, '.vercel/output/functions')
   await ensureDir(vercelOutputFunctionsDir)
 
   for (const route of buildInfoForWriting.manifest.pageRoutes) {
@@ -92,7 +92,7 @@ export const buildVercelOutputDirectory = async ({
   const distMiddlewareDir = resolve(join(oneOptionsRoot, 'dist', 'middlewares'))
   if (existsSync(distMiddlewareDir)) {
     const vercelMiddlewareDir = resolve(
-      join(oneOptionsRoot, 'dist', '.vercel/output/functions/_middleware')
+      join(oneOptionsRoot, '.vercel/output/functions/_middleware')
     )
     await ensureDir(vercelMiddlewareDir)
     postBuildLogs.push(
@@ -114,7 +114,7 @@ export const buildVercelOutputDirectory = async ({
     })
   }
 
-  const vercelOutputStaticDir = resolve(join(oneOptionsRoot, 'dist', '.vercel/output/static'))
+  const vercelOutputStaticDir = resolve(join(oneOptionsRoot, '.vercel/output/static'))
   await ensureDir(vercelOutputStaticDir)
 
   postBuildLogs.push(
@@ -124,9 +124,7 @@ export const buildVercelOutputDirectory = async ({
 
   // Documentation - Vercel Build Output v3 config.json
   //   https://vercel.com/docs/build-output-api/v3/configuration#config.json-supported-properties
-  const vercelConfigFilePath = resolve(
-    join(oneOptionsRoot, 'dist', '.vercel/output', 'config.json')
-  )
+  const vercelConfigFilePath = resolve(join(oneOptionsRoot, '.vercel/output', 'config.json'))
   await writeJSON(vercelConfigFilePath, vercelBuildOutputConfig)
   postBuildLogs.push(`[one.build] wrote vercel config to: ${vercelConfigFilePath}`)
 }

package/src/vercel/build/generate/createApiServerlessFunction.ts

@@ -16,7 +16,7 @@ export async function createApiServerlessFunction(
   try {
     postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`)
 
-    const funcFolder = join(oneOptionsRoot, 'dist', `.vercel/output/functions/${pageName}.func`)
+    const funcFolder = join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`)
     await fs.ensureDir(funcFolder)
 
     if (code.includes('react')) {

package/src/vercel/build/generate/createSsrServerlessFunction.ts

@@ -16,9 +16,7 @@ export async function createSsrServerlessFunction(
     postBuildLogs.push(`[one.build][vercel.createSsrServerlessFunction] pageName: ${pageName}`)
 
     const buildInfoAsString = JSON.stringify(buildInfo)
-    const funcFolder = resolve(
-      join(oneOptionsRoot, 'dist', `.vercel/output/functions/${pageName}.func`)
-    )
+    const funcFolder = resolve(join(oneOptionsRoot, `.vercel/output/functions/${pageName}.func`))
     await fs.ensureDir(funcFolder)
 
     const distServerFrom = resolve(join(oneOptionsRoot, 'dist', 'server'))

package/types/Root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Root.d.ts","sourceRoot":"","sources":["../src/Root.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAOL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACf,MAAM,OAAO,CAAA;AAOd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAKlD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;IAC7C,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;CAChC,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,GAAG,CAAC,YAAY,CAAA;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC,CAAA;IACpD,wBAAwB,CAAC,EAAE,wBAAwB,GAAG;QACpD,KAAK,CAAC,EAAE;YACN,IAAI,EAAE,OAAO,CAAA;YACb,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAA;gBACf,UAAU,EAAE,MAAM,CAAA;gBAClB,IAAI,EAAE,MAAM,CAAA;gBACZ,IAAI,EAAE,MAAM,CAAA;gBACZ,MAAM,EAAE,MAAM,CAAA;gBACd,YAAY,EAAE,MAAM,CAAA;aACrB,CAAA;SACF,CAAA;KACF,CAAA;CACF,CAAA;AAOD,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,kDAwFpC"}
+{"version":3,"file":"Root.d.ts","sourceRoot":"","sources":["../src/Root.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,wBAAwB,EAC9B,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAQL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACf,MAAM,OAAO,CAAA;AAOd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAKlD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG;IAC7C,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,mBAAmB,CAAA;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC,YAAY,CAAA;CAChC,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,OAAO,EAAE,GAAG,CAAC,YAAY,CAAA;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAA;IACd,OAAO,CAAC,EAAE,iBAAiB,CAAC;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE,CAAC,CAAA;IACpD,wBAAwB,CAAC,EAAE,wBAAwB,GAAG;QACpD,KAAK,CAAC,EAAE;YACN,IAAI,EAAE,OAAO,CAAA;YACb,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAA;gBACf,UAAU,EAAE,MAAM,CAAA;gBAClB,IAAI,EAAE,MAAM,CAAA;gBACZ,IAAI,EAAE,MAAM,CAAA;gBACZ,MAAM,EAAE,MAAM,CAAA;gBACd,YAAY,EAAE,MAAM,CAAA;aACrB,CAAA;SACF,CAAA;KACF,CAAA;CACF,CAAA;AAOD,wBAAgB,IAAI,CAAC,KAAK,EAAE,SAAS,kDAyFpC"}

package/types/render.d.ts

@@ -1,2 +1,3 @@
 export declare function render(element: React.ReactNode): void;
+export declare function afterClientRender(listener: Function): (() => void) | undefined;
 //# sourceMappingURL=render.d.ts.map

package/types/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"AAKA,wBAAgB,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,QAiC9C"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"AAQA,wBAAgB,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,QAsC9C;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,4BAUnD"}

package/types/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"AAUA,OAAO,wCAAwC,CAAA"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"AAcA,OAAO,wCAAwC,CAAA"}

package/types/utils/redirect.d.ts

@@ -1,2 +1,3 @@
-export declare const redirect: (path: string, status?: number) => Response | undefined;
+import type { OneRouter } from '../interfaces/router';
+export declare const redirect: (path: OneRouter.Href & string, status?: number) => Response | undefined;
 //# sourceMappingURL=redirect.d.ts.map

package/types/utils/redirect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redirect.d.ts","sourceRoot":"","sources":["../../src/utils/redirect.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ,SAAU,MAAM,WAAW,MAAM,yBAOrD,CAAA"}
+{"version":3,"file":"redirect.d.ts","sourceRoot":"","sources":["../../src/utils/redirect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAIrD,eAAO,MAAM,QAAQ,SAAU,SAAS,CAAC,IAAI,GAAG,MAAM,WAAW,MAAM,yBAOtE,CAAA"}

package/types/vercel/build/buildVercelOutputDirectory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildVercelOutputDirectory.d.ts","sourceRoot":"","sources":["../../../src/vercel/build/buildVercelOutputDirectory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAS1C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAY3C,eAAO,MAAM,0BAA0B,kFAMpC;IACD,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;IAC9B,mBAAmB,EAAE,GAAG,CAAC,SAAS,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,kBA+FA,CAAA"}
+{"version":3,"file":"buildVercelOutputDirectory.d.ts","sourceRoot":"","sources":["../../../src/vercel/build/buildVercelOutputDirectory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAS1C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAY3C,eAAO,MAAM,0BAA0B,kFAMpC;IACD,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;IAC9B,mBAAmB,EAAE,GAAG,CAAC,SAAS,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,kBA6FA,CAAA"}

package/types/vercel/build/generate/createSsrServerlessFunction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSsrServerlessFunction.d.ts","sourceRoot":"","sources":["../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAI9C,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,CAAC,SAAS,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,iBA+FxB"}
+{"version":3,"file":"createSsrServerlessFunction.d.ts","sourceRoot":"","sources":["../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAI9C,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,GAAG,CAAC,SAAS,EACxB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,EAAE,iBA6FxB"}