one 1.1.312 → 1.1.313

package/src/serve.ts

@@ -2,17 +2,11 @@ import './polyfills-server'
 
 import FSExtra from 'fs-extra'
 import type { Hono } from 'hono'
-import Path, { join } from 'node:path'
+import { join } from 'node:path'
 import type { VXRNOptions } from 'vxrn'
 import { getServerEntry, loadEnv, serve as vxrnServe } from 'vxrn'
-import { labelProcess } from './cli/label-process'
-import { createHandleRequest } from './createHandleRequest'
 import type { RenderAppProps } from './types'
-import { isResponse } from './utils/isResponse'
-import { isStatusRedirect } from './utils/isStatus'
-import { removeUndefined } from './utils/removeUndefined'
-import { loadUserOneOptions } from './vite/one'
-import { resolveAPIRequest } from './vite/resolveAPIRequest'
+
 import type { One } from './vite/types'
 
 process.on('uncaughtException', (err) => {
@@ -20,6 +14,16 @@ process.on('uncaughtException', (err) => {
 })
 
 export async function serve(args: VXRNOptions['server'] = {}) {
+  const buildInfo = (await FSExtra.readJSON(`dist/buildInfo.json`)) as One.BuildInfo
+
+  // ensure cache key matches build
+  process.env.ONE_CACHE_KEY = buildInfo.constants.CACHE_KEY
+
+  // to avoid loading the CACHE_KEY before we set it use async imports:
+  const { labelProcess } = await import('./cli/label-process')
+  const { removeUndefined } = await import('./utils/removeUndefined')
+  const { loadUserOneOptions } = await import('./vite/one')
+
   labelProcess('serve')
   loadEnv('production')
 
@@ -43,16 +47,25 @@ export async function serve(args: VXRNOptions['server'] = {}) {
 
       async beforeStart(options, app) {
         await oneOptions.server?.beforeStart?.(options, app)
-        await oneServe(oneOptions, options, app)
+        await oneServe(oneOptions, options, buildInfo, app)
       },
     },
   })
 }
 
-async function oneServe(options: One.Options, vxrnOptions: VXRNOptions, app: Hono) {
-  const root = options.root || vxrnOptions.root || '.'
+async function oneServe(
+  options: One.PluginOptions,
+  vxrnOptions: VXRNOptions,
+  buildInfo: One.BuildInfo,
+  app: Hono
+) {
+  const { createHandleRequest } = await import('./createHandleRequest')
+  const { isResponse } = await import('./utils/isResponse')
+  const { isStatusRedirect } = await import('./utils/isStatus')
+  const { resolveAPIRequest } = await import('./vite/resolveAPIRequest')
+
   const isAPIRequest = new WeakMap<any, boolean>()
-  const toAbsolute = (p: string) => Path.resolve(root, p)
+  const root = vxrnOptions.root || '.'
 
   // add redirects
   const redirects = options.web?.redirects
@@ -68,8 +81,6 @@ async function oneServe(options: One.Options, vxrnOptions: VXRNOptions, app: Hon
     }
   }
 
-  const buildInfo = await FSExtra.readJSON(toAbsolute(`dist/buildInfo.json`))
-
   if (!buildInfo) {
     throw new Error(`No build info found, have you run build?`)
   }
@@ -132,7 +143,9 @@ async function oneServe(options: One.Options, vxrnOptions: VXRNOptions, app: Hon
         if (route.type === 'ssr') {
           const buildInfo = routeToBuildInfo[route.page]
           if (!buildInfo) {
-            throw new Error(`No buildinfo found for ${url}, route: ${route.page}`)
+            throw new Error(
+              `No buildinfo found for ${url}, route: ${route.page}, in keys: ${Object.keys(routeToBuildInfo)}`
+            )
           }
 
           try {

package/src/vite/build.ts

@@ -1,3 +1,4 @@
+import * as constants from '../constants'
 import FSExtra from 'fs-extra'
 import MicroMatch from 'micromatch'
 import { createRequire } from 'node:module'
@@ -509,6 +510,7 @@ ${JSON.stringify(params || null, null, 2)}`
   const buildInfoForWriting = {
     routeMap,
     builtRoutes,
+    constants: JSON.parse(JSON.stringify({ ...constants })),
   }
 
   const buildInfo = {

package/src/vite/types.ts

@@ -139,7 +139,11 @@ export namespace One {
     permanent: boolean
   }
 
-  export type BuildInfo = Pick<AfterBuildProps, 'routeMap' | 'builtRoutes'>
+  export type BuildInfo = Pick<AfterBuildProps, 'routeMap' | 'builtRoutes'> & {
+    constants: {
+      CACHE_KEY: string
+    }
+  }
 
   export type AfterBuildProps = VXRNAfterBuildProps & {
     routeMap: Record<string, string>

package/types/serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAA;AAK3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAgBvC,wBAAsB,KAAK,CAAC,IAAI,GAAE,WAAW,CAAC,QAAQ,CAAM;mDAfJ,YACvD;+CAC+C,YAChD;gDAEK,YAAY;iDAEV,YAAY;+CAEX,YAAY;mDAGkB,YAAY;GA+BjD"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAA;AAK3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAUvC,wBAAsB,KAAK,CAAC,IAAI,GAAE,WAAW,CAAC,QAAQ,CAAM;mDATE,YACvD;+CAIU,YAAY;gDAIX,YAAY;iDACoC,YAAY;+CAGxB,YAEjD;mDAC8B,YAAY;GA+B9C"}

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

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/vite/build.ts"],"names":[],"mappings":"AA6BA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,iBAugBA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/vite/build.ts"],"names":[],"mappings":"AA8BA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,iBAwgBA"}

package/types/vite/types.d.ts

@@ -112,7 +112,11 @@ export declare namespace One {
         destination: string;
         permanent: boolean;
     };
-    type BuildInfo = Pick<AfterBuildProps, 'routeMap' | 'builtRoutes'>;
+    type BuildInfo = Pick<AfterBuildProps, 'routeMap' | 'builtRoutes'> & {
+        constants: {
+            CACHE_KEY: string;
+        };
+    };
     type AfterBuildProps = VXRNAfterBuildProps & {
         routeMap: Record<string, string>;
         builtRoutes: RouteBuildInfo[];

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

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