one 1.17.11 → 1.18.0

package/src/vite/plugins/environmentGuardPlugin.test.ts

@@ -9,24 +9,29 @@ describe('environmentGuardPlugin', () => {
       expect(resolveEnvironmentGuard('some-other-pkg', 'ios')).toBeNull()
     })
 
-    it('returns virtual id for server-only', () => {
-      const id = resolveEnvironmentGuard('server-only', 'ssr')
-      expect(id).toBe('\0one-env-guard:server-only:ssr')
+    it('returns virtual id for server-only (with consumer)', () => {
+      const id = resolveEnvironmentGuard('server-only', 'ssr', 'server')
+      expect(id).toBe('\0one-env-guard:server-only:ssr:server')
     })
 
-    it('returns virtual id for client-only', () => {
-      const id = resolveEnvironmentGuard('client-only', 'client')
-      expect(id).toBe('\0one-env-guard:client-only:client')
+    it('returns virtual id for client-only (with consumer)', () => {
+      const id = resolveEnvironmentGuard('client-only', 'client', 'client')
+      expect(id).toBe('\0one-env-guard:client-only:client:client')
     })
 
     it('returns virtual id for native-only', () => {
       const id = resolveEnvironmentGuard('native-only', 'ios')
-      expect(id).toBe('\0one-env-guard:native-only:ios')
+      expect(id).toBe('\0one-env-guard:native-only:ios:unknown')
     })
 
     it('returns virtual id for web-only', () => {
       const id = resolveEnvironmentGuard('web-only', 'client')
-      expect(id).toBe('\0one-env-guard:web-only:client')
+      expect(id).toBe('\0one-env-guard:web-only:client:unknown')
+    })
+
+    it('encodes worker consumer for cloudflare deploy', () => {
+      const id = resolveEnvironmentGuard('server-only', 'worker', 'server')
+      expect(id).toBe('\0one-env-guard:server-only:worker:server')
     })
   })
 
@@ -36,89 +41,107 @@ describe('environmentGuardPlugin', () => {
       expect(loadEnvironmentGuard('/some/path.ts')).toBeNull()
     })
 
-    // server-only: allowed in ssr, forbidden in client/ios/android
-    it('server-only: allowed in ssr', () => {
+    // server-only: allowed in any server-consumer env (legacy 2-part form
+    // still allowed in 'ssr' for back-compat)
+    it('server-only: allowed in any server-consumer env', () => {
+      expect(loadEnvironmentGuard('\0one-env-guard:server-only:ssr:server')).toBe(
+        'export {}'
+      )
+      expect(loadEnvironmentGuard('\0one-env-guard:server-only:worker:server')).toBe(
+        'export {}'
+      )
+      expect(loadEnvironmentGuard('\0one-env-guard:server-only:edge:server')).toBe(
+        'export {}'
+      )
+    })
+
+    it('server-only: legacy 2-part form still allowed in ssr', () => {
       const result = loadEnvironmentGuard('\0one-env-guard:server-only:ssr')
       expect(result).toBe('export {}')
     })
 
     it('server-only: forbidden in client', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:server-only:client')
+      const result = loadEnvironmentGuard('\0one-env-guard:server-only:client:client')
       expect(result).toContain('throw new Error')
       expect(result).toContain('server-only')
       expect(result).toContain('client')
     })
 
     it('server-only: forbidden in ios', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:server-only:ios')
+      const result = loadEnvironmentGuard('\0one-env-guard:server-only:ios:client')
       expect(result).toContain('throw new Error')
     })
 
     it('server-only: forbidden in android', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:server-only:android')
+      const result = loadEnvironmentGuard('\0one-env-guard:server-only:android:client')
       expect(result).toContain('throw new Error')
     })
 
-    // client-only: allowed in client, forbidden in ssr/ios/android
+    // client-only: allowed in any client-consumer env
     it('client-only: allowed in client', () => {
+      const result = loadEnvironmentGuard('\0one-env-guard:client-only:client:client')
+      expect(result).toBe('export {}')
+    })
+
+    it('client-only: legacy 2-part form still allowed in client', () => {
       const result = loadEnvironmentGuard('\0one-env-guard:client-only:client')
       expect(result).toBe('export {}')
     })
 
     it('client-only: forbidden in ssr', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:client-only:ssr')
+      const result = loadEnvironmentGuard('\0one-env-guard:client-only:ssr:server')
       expect(result).toContain('throw new Error')
     })
 
     it('client-only: forbidden in ios', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:client-only:ios')
+      const result = loadEnvironmentGuard('\0one-env-guard:client-only:ios:server')
       expect(result).toContain('throw new Error')
     })
 
     it('client-only: forbidden in android', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:client-only:android')
+      const result = loadEnvironmentGuard('\0one-env-guard:client-only:android:server')
       expect(result).toContain('throw new Error')
     })
 
     // native-only: allowed in ios/android, forbidden in client/ssr
     it('native-only: allowed in ios', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:native-only:ios')
+      const result = loadEnvironmentGuard('\0one-env-guard:native-only:ios:unknown')
       expect(result).toBe('export {}')
     })
 
     it('native-only: allowed in android', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:native-only:android')
+      const result = loadEnvironmentGuard('\0one-env-guard:native-only:android:unknown')
       expect(result).toBe('export {}')
     })
 
     it('native-only: forbidden in client', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:native-only:client')
+      const result = loadEnvironmentGuard('\0one-env-guard:native-only:client:client')
       expect(result).toContain('throw new Error')
     })
 
     it('native-only: forbidden in ssr', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:native-only:ssr')
+      const result = loadEnvironmentGuard('\0one-env-guard:native-only:ssr:server')
       expect(result).toContain('throw new Error')
     })
 
     // web-only: allowed in client/ssr, forbidden in ios/android
     it('web-only: allowed in client', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:web-only:client')
+      const result = loadEnvironmentGuard('\0one-env-guard:web-only:client:client')
       expect(result).toBe('export {}')
     })
 
     it('web-only: allowed in ssr', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:web-only:ssr')
+      const result = loadEnvironmentGuard('\0one-env-guard:web-only:ssr:server')
       expect(result).toBe('export {}')
     })
 
     it('web-only: forbidden in ios', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:web-only:ios')
+      const result = loadEnvironmentGuard('\0one-env-guard:web-only:ios:unknown')
       expect(result).toContain('throw new Error')
     })
 
     it('web-only: forbidden in android', () => {
-      const result = loadEnvironmentGuard('\0one-env-guard:web-only:android')
+      const result = loadEnvironmentGuard('\0one-env-guard:web-only:android:unknown')
       expect(result).toContain('throw new Error')
     })
 
@@ -130,7 +153,9 @@ describe('environmentGuardPlugin', () => {
 
   describe('options', () => {
     it('disabled: true makes all guards no-ops', () => {
-      const id = resolveEnvironmentGuard('client-only', 'ssr', { disabled: true })
+      const id = resolveEnvironmentGuard('client-only', 'ssr', 'server', {
+        disabled: true,
+      })
       expect(id).toBe('\0one-env-guard:client-only:disabled')
       // and it should pass when loaded
       expect(loadEnvironmentGuard(id!)).toBe('export {}')
@@ -138,35 +163,35 @@ describe('environmentGuardPlugin', () => {
 
     it('disableGuards: disables specific guard types', () => {
       // client-only disabled
-      const id1 = resolveEnvironmentGuard('client-only', 'ssr', {
+      const id1 = resolveEnvironmentGuard('client-only', 'ssr', 'server', {
         disableGuards: ['client-only'],
       })
       expect(id1).toBe('\0one-env-guard:client-only:disabled')
 
       // server-only still works normally
-      const id2 = resolveEnvironmentGuard('server-only', 'client', {
+      const id2 = resolveEnvironmentGuard('server-only', 'client', 'client', {
         disableGuards: ['client-only'],
       })
-      expect(id2).toBe('\0one-env-guard:server-only:client')
+      expect(id2).toBe('\0one-env-guard:server-only:client:client')
       expect(loadEnvironmentGuard(id2!)).toContain('throw new Error')
     })
 
     it('disableGuards: can disable multiple guards', () => {
-      const id1 = resolveEnvironmentGuard('client-only', 'ssr', {
+      const id1 = resolveEnvironmentGuard('client-only', 'ssr', 'server', {
         disableGuards: ['client-only', 'server-only'],
       })
       expect(id1).toBe('\0one-env-guard:client-only:disabled')
 
-      const id2 = resolveEnvironmentGuard('server-only', 'client', {
+      const id2 = resolveEnvironmentGuard('server-only', 'client', 'client', {
         disableGuards: ['client-only', 'server-only'],
       })
       expect(id2).toBe('\0one-env-guard:server-only:disabled')
 
       // native-only still enforced
-      const id3 = resolveEnvironmentGuard('native-only', 'client', {
+      const id3 = resolveEnvironmentGuard('native-only', 'client', 'client', {
         disableGuards: ['client-only', 'server-only'],
       })
-      expect(id3).toBe('\0one-env-guard:native-only:client')
+      expect(id3).toBe('\0one-env-guard:native-only:client:client')
     })
   })
 })

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/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/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"}