one 1.17.11 → 1.18.1

package/src/vite/plugins/environmentGuardPlugin.ts

@@ -7,10 +7,16 @@
  *
  * | import          | allowed in       | throws in                  |
  * |-----------------|------------------|----------------------------|
- * | server-only     | ssr              | client, ios, android       |
- * | client-only     | client           | ssr, ios, android          |
- * | native-only     | ios, android     | client, ssr                |
+ * | server-only     | any server env   | any client env             |
+ * | client-only     | any client env   | any server env             |
+ * | native-only     | ios, android     | other names                |
  * | web-only        | client, ssr      | ios, android               |
+ *
+ * server-only / client-only key off `env.config.consumer` so they work
+ * uniformly across `ssr`, custom names like `worker` (cloudflare deploy),
+ * or any other consumer-tagged environment a downstream framework defines.
+ * native-only / web-only stay name-based because they discriminate by
+ * platform, not by consumer type.
  */
 
 import type { Plugin } from 'vite'
@@ -27,13 +33,16 @@ const GUARD_SPECIFIERS = [
 type GuardSpecifier = (typeof GUARD_SPECIFIERS)[number]
 type ViteEnvironment = 'client' | 'ssr' | 'ios' | 'android'
 
-const ALLOWED_ENVIRONMENTS: Record<GuardSpecifier, readonly ViteEnvironment[]> = {
-  'server-only': ['ssr'],
-  'client-only': ['client'],
+const ALLOWED_BY_NAME: Partial<Record<GuardSpecifier, readonly ViteEnvironment[]>> = {
   'native-only': ['ios', 'android'],
   'web-only': ['client', 'ssr'],
 }
 
+const ALLOWED_BY_CONSUMER: Partial<Record<GuardSpecifier, 'server' | 'client'>> = {
+  'server-only': 'server',
+  'client-only': 'client',
+}
+
 export type EnvironmentGuardOptions = {
   /**
    * Disable all environment guard checks. When true, all guard imports
@@ -55,10 +64,17 @@ export type EnvironmentGuardOptions = {
 /**
  * returns a virtual module id if the specifier is a guard, otherwise null.
  * pure function extracted for testing.
+ *
+ * `consumer` is vite's environment.config.consumer ('server' | 'client').
+ * encoded into the virtual id so loadEnvironmentGuard can decide whether
+ * server-only / client-only fire without re-deriving it. callers that
+ * don't have access to a consumer (legacy callsites, tests) may pass
+ * undefined; load will then fall back to name-based matching.
  */
 export function resolveEnvironmentGuard(
   specifier: string,
   envName: string,
+  consumer?: 'server' | 'client',
   options?: EnvironmentGuardOptions
 ): string | null {
   if (!GUARD_SPECIFIERS.includes(specifier as GuardSpecifier)) {
@@ -73,7 +89,7 @@ export function resolveEnvironmentGuard(
     return `${VIRTUAL_PREFIX}${specifier}:disabled`
   }
 
-  return `${VIRTUAL_PREFIX}${specifier}:${envName}`
+  return `${VIRTUAL_PREFIX}${specifier}:${envName}:${consumer ?? 'unknown'}`
 }
 
 /**
@@ -86,24 +102,37 @@ export function loadEnvironmentGuard(id: string): string | null {
   }
 
   const rest = id.slice(VIRTUAL_PREFIX.length)
-  const lastColon = rest.lastIndexOf(':')
-  if (lastColon === -1) return null
+  const parts = rest.split(':')
 
-  const specifier = rest.slice(0, lastColon) as GuardSpecifier
-  const envName = rest.slice(lastColon + 1)
-
-  // disabled guards always pass
-  if (envName === 'disabled') {
+  // legacy 2-part form: `${specifier}:disabled` always passes
+  if (parts.length === 2 && parts[1] === 'disabled') {
     return 'export {}'
   }
 
-  const allowed = ALLOWED_ENVIRONMENTS[specifier]
-  if (!allowed) return null
-
-  if (allowed.includes(envName as ViteEnvironment)) {
-    return 'export {}'
+  const specifier = parts[0] as GuardSpecifier
+  const envName = parts[1]
+  const consumer = parts[2] as 'server' | 'client' | 'unknown' | undefined
+
+  // server-only / client-only: consumer-based. works for any env name a
+  // framework defines (ssr, worker, edge, custom) — the test is "what
+  // does vite consider this environment to be consumed by?"
+  const requiredConsumer = ALLOWED_BY_CONSUMER[specifier]
+  if (requiredConsumer) {
+    if (consumer === requiredConsumer) return 'export {}'
+    // if consumer wasn't recorded (legacy 2-part form or `unknown`),
+    // fall back to the historical name-based behaviour so existing tests
+    // keep working without modification.
+    if (!consumer || consumer === 'unknown') {
+      const legacyAllowed = requiredConsumer === 'server' ? ['ssr'] : ['client']
+      if (legacyAllowed.includes(envName)) return 'export {}'
+    }
+    return `throw new Error("${specifier} cannot be imported in the \\"${envName}\\" environment")`
   }
 
+  // native-only / web-only: name-based.
+  const allowedNames = ALLOWED_BY_NAME[specifier]
+  if (!allowedNames) return null
+  if (allowedNames.includes(envName as ViteEnvironment)) return 'export {}'
   return `throw new Error("${specifier} cannot be imported in the \\"${envName}\\" environment")`
 }
 
@@ -115,7 +144,8 @@ export function environmentGuardPlugin(options?: EnvironmentGuardOptions): Plugi
     resolveId(source) {
       const envName = this.environment?.name
       if (!envName) return null
-      return resolveEnvironmentGuard(source, envName, options)
+      const consumer = this.environment?.config?.consumer
+      return resolveEnvironmentGuard(source, envName, consumer, options)
     },
 
     load(id) {

package/src/vite/plugins/fileSystemRouterPlugin.tsx

@@ -16,7 +16,6 @@ import { isStatusRedirect } from '../../utils/isStatus'
 import { promiseWithResolvers } from '../../utils/promiseWithResolvers'
 import { isRouteFileWatchEvent } from '../../utils/routeFileWatch'
 import { trackLoaderDependencies } from '../../utils/trackLoaderDependencies'
-import { LoaderDataCache } from '../../vite/constants'
 import { replaceLoader } from '../../vite/replaceLoader'
 import type { One } from '../../vite/types'
 import { setServerContext } from '../one-server-only'
@@ -41,6 +40,13 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
   let runner: ModuleRunner
   let server: ViteDevServer
 
+  // Only clear the SSR module runner cache when a file actually changed, not on
+  // every request. Clearing per-request forces a full re-evaluation of the whole
+  // server module tree (new AsyncFunction per module) on each page render, which
+  // leaks heap unboundedly under sustained navigation (→ 5-8GB RSS / OOM) and also
+  // re-transforms every module. The file watcher below flips this back to true.
+  let needsCacheClear = true
+
   // Track file dependencies from loaders for hot reload
   // Maps file path -> set of route paths that depend on it
   // Track file dependencies from loaders for hot reload.
@@ -147,7 +153,10 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
             // so we must branch on route.file, not the joined path.
             const isGeneratedNotFound = route.file === ''
             const routeFile = isGeneratedNotFound ? '' : path.join(routerRoot, route.file)
-            runner.clearCache()
+            if (needsCacheClear) {
+              runner.clearCache()
+              needsCacheClear = false
+            }
 
             globalThis['__vxrnresetState']?.()
 
@@ -270,8 +279,6 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
               matches,
             })
 
-            LoaderDataCache[route.file] = loaderData
-
             // detect 404: not-found routes, missing page exports, or ssg dynamic routes with invalid slugs
             const isDynamicRoute = Object.keys(route.routeKeys || {}).length > 0
 
@@ -610,6 +617,13 @@ export function createFileSystemRouterPlugin(options: One.PluginOptions): Plugin
 
       const appDir = path.resolve(process.cwd(), getRouterRootFromOneOptions(options))
 
+      // any watched file change means the SSR runner may be serving stale module
+      // code — mark the cache dirty so the next render re-evaluates once (set
+      // immediately/undebounced so it can't race ahead of a render)
+      server.watcher.on('all', () => {
+        needsCacheClear = true
+      })
+
       // on change ./app stuff lets reload this to pick up any route changes
       const fileWatcherChangeListener = debounce((type: string, changedPath: string) => {
         if (

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

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AA6UA,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;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,iBAkvCA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AA0XA,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;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,iBA8vCA"}

package/types/getURL.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getURL.native.d.ts","sourceRoot":"","sources":["../src/getURL.native.ts"],"names":[],"mappings":"AAIA,wBAAgB,MAAM,WAwBrB"}
+{"version":3,"file":"getURL.native.d.ts","sourceRoot":"","sources":["../src/getURL.native.ts"],"names":[],"mappings":"AAIA,wBAAgB,MAAM,WA0BrB"}

package/types/getURL.native.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=getURL.native.test.d.ts.map

package/types/getURL.native.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getURL.native.test.d.ts","sourceRoot":"","sources":["../src/getURL.native.test.ts"],"names":[],"mappings":""}

package/types/vite/constants.d.ts

@@ -1,5 +1,4 @@
 export declare const EMPTY_LOADER_STRING = "export function loader() {return \"__vxrn__loader__\"};";
 export declare function makeLoaderRouteIdStub(routeId: string): string;
-export declare const LoaderDataCache: {};
 export declare const SERVER_CONTEXT_POST_RENDER_STRING = "_one_post_render_data_";
 //# sourceMappingURL=constants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/vite/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,4DAA0D,CAAA;AAE1F,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,eAAO,MAAM,eAAe,IAAK,CAAA;AAEjC,eAAO,MAAM,iCAAiC,2BAA2B,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/vite/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,4DAA0D,CAAA;AAE1F,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,eAAO,MAAM,iCAAiC,2BAA2B,CAAA"}

package/types/vite/plugins/environmentGuardPlugin.d.ts

@@ -7,10 +7,16 @@
  *
  * | import          | allowed in       | throws in                  |
  * |-----------------|------------------|----------------------------|
- * | server-only     | ssr              | client, ios, android       |
- * | client-only     | client           | ssr, ios, android          |
- * | native-only     | ios, android     | client, ssr                |
+ * | server-only     | any server env   | any client env             |
+ * | client-only     | any client env   | any server env             |
+ * | native-only     | ios, android     | other names                |
  * | web-only        | client, ssr      | ios, android               |
+ *
+ * server-only / client-only key off `env.config.consumer` so they work
+ * uniformly across `ssr`, custom names like `worker` (cloudflare deploy),
+ * or any other consumer-tagged environment a downstream framework defines.
+ * native-only / web-only stay name-based because they discriminate by
+ * platform, not by consumer type.
  */
 import type { Plugin } from 'vite';
 declare const GUARD_SPECIFIERS: readonly ["server-only", "client-only", "native-only", "web-only"];
@@ -34,8 +40,14 @@ export type EnvironmentGuardOptions = {
 /**
  * returns a virtual module id if the specifier is a guard, otherwise null.
  * pure function extracted for testing.
+ *
+ * `consumer` is vite's environment.config.consumer ('server' | 'client').
+ * encoded into the virtual id so loadEnvironmentGuard can decide whether
+ * server-only / client-only fire without re-deriving it. callers that
+ * don't have access to a consumer (legacy callsites, tests) may pass
+ * undefined; load will then fall back to name-based matching.
  */
-export declare function resolveEnvironmentGuard(specifier: string, envName: string, options?: EnvironmentGuardOptions): string | null;
+export declare function resolveEnvironmentGuard(specifier: string, envName: string, consumer?: 'server' | 'client', options?: EnvironmentGuardOptions): string | null;
 /**
  * returns the module source for a virtual guard id.
  * pure function extracted for testing.

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

@@ -1 +1 @@
-{"version":3,"file":"environmentGuardPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/environmentGuardPlugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC,QAAA,MAAM,gBAAgB,oEAKZ,CAAA;AAEV,KAAK,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAA;AAUvD,MAAM,MAAM,uBAAuB,GAAG;IACpC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAElB;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,cAAc,EAAE,CAAA;CACjC,CAAA;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,uBAAuB,GAChC,MAAM,GAAG,IAAI,CAcf;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAyB9D;AAED,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,uBAAuB,GAAG,MAAM,CAehF"}
+{"version":3,"file":"environmentGuardPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/environmentGuardPlugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC,QAAA,MAAM,gBAAgB,oEAKZ,CAAA;AAEV,KAAK,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAA;AAavD,MAAM,MAAM,uBAAuB,GAAG;IACpC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAElB;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,cAAc,EAAE,CAAA;CACjC,CAAA;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,QAAQ,GAAG,QAAQ,EAC9B,OAAO,CAAC,EAAE,uBAAuB,GAChC,MAAM,GAAG,IAAI,CAcf;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAsC9D;AAED,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,uBAAuB,GAAG,MAAM,CAgBhF"}

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

@@ -1 +1 @@
-{"version":3,"file":"fileSystemRouterPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAW,MAAM,EAAiB,MAAM,MAAM,CAAA;AAgB1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAiB3C,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,GAAG,CAAC,aAAa,GAAG,MAAM,CAmvB/E"}
+{"version":3,"file":"fileSystemRouterPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/fileSystemRouterPlugin.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAW,MAAM,EAAiB,MAAM,MAAM,CAAA;AAe1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAiB3C,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,GAAG,CAAC,aAAa,GAAG,MAAM,CAkwB/E"}