one 1.17.11 → 1.18.0

package/dist/esm/vite/plugins/environmentGuardPlugin.test.mjs

@@ -7,21 +7,25 @@ describe("environmentGuardPlugin", () => {
       expect(resolveEnvironmentGuard("vite", "ssr")).toBeNull();
       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");
     });
   });
   describe("loadEnvironmentGuard", () => {
@@ -29,70 +33,79 @@ describe("environmentGuardPlugin", () => {
       expect(loadEnvironmentGuard("react")).toBeNull();
       expect(loadEnvironmentGuard("/some/path.ts")).toBeNull();
     });
-    it("server-only: allowed in ssr", () => {
+    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");
     });
     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");
     });
     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");
     });
     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");
     });
     it("disabled guards always pass", () => {
@@ -102,36 +115,36 @@ describe("environmentGuardPlugin", () => {
   });
   describe("options", () => {
     it("disabled: true makes all guards no-ops", () => {
-      const id = resolveEnvironmentGuard("client-only", "ssr", {
+      const id = resolveEnvironmentGuard("client-only", "ssr", "server", {
         disabled: true
       });
       expect(id).toBe("\0one-env-guard:client-only:disabled");
       expect(loadEnvironmentGuard(id)).toBe("export {}");
     });
     it("disableGuards: disables specific guard types", () => {
-      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");
-      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");
-      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/dist/esm/vite/plugins/environmentGuardPlugin.test.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["describe","expect","it","resolveEnvironmentGuard","loadEnvironmentGuard","toBeNull","id","toBe","result","toContain","disabled","id1","disableGuards","id2","id3"],"sources":["../../../../src/vite/plugins/environmentGuardPlugin.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["describe","expect","it","resolveEnvironmentGuard","loadEnvironmentGuard","toBeNull","id","toBe","result","toContain","disabled","id1","disableGuards","id2","id3"],"sources":["../../../../src/vite/plugins/environmentGuardPlugin.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/vite/plugins/environmentGuardPlugin.test.native.js

@@ -7,21 +7,25 @@ describe("environmentGuardPlugin", function () {
       expect(resolveEnvironmentGuard("vite", "ssr")).toBeNull();
       expect(resolveEnvironmentGuard("some-other-pkg", "ios")).toBeNull();
     });
-    it("returns virtual id for server-only", function () {
-      var id = resolveEnvironmentGuard("server-only", "ssr");
-      expect(id).toBe("\0one-env-guard:server-only:ssr");
+    it("returns virtual id for server-only (with consumer)", function () {
+      var id = resolveEnvironmentGuard("server-only", "ssr", "server");
+      expect(id).toBe("\0one-env-guard:server-only:ssr:server");
     });
-    it("returns virtual id for client-only", function () {
-      var id = resolveEnvironmentGuard("client-only", "client");
-      expect(id).toBe("\0one-env-guard:client-only:client");
+    it("returns virtual id for client-only (with consumer)", function () {
+      var id = resolveEnvironmentGuard("client-only", "client", "client");
+      expect(id).toBe("\0one-env-guard:client-only:client:client");
     });
     it("returns virtual id for native-only", function () {
       var 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", function () {
       var 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", function () {
+      var id = resolveEnvironmentGuard("server-only", "worker", "server");
+      expect(id).toBe("\0one-env-guard:server-only:worker:server");
     });
   });
   describe("loadEnvironmentGuard", function () {
@@ -29,70 +33,79 @@ describe("environmentGuardPlugin", function () {
       expect(loadEnvironmentGuard("react")).toBeNull();
       expect(loadEnvironmentGuard("/some/path.ts")).toBeNull();
     });
-    it("server-only: allowed in ssr", function () {
+    it("server-only: allowed in any server-consumer env", function () {
+      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", function () {
       var result = loadEnvironmentGuard("\0one-env-guard:server-only:ssr");
       expect(result).toBe("export {}");
     });
     it("server-only: forbidden in client", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:server-only:client");
+      var 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", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:server-only:ios");
+      var result = loadEnvironmentGuard("\0one-env-guard:server-only:ios:client");
       expect(result).toContain("throw new Error");
     });
     it("server-only: forbidden in android", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:server-only:android");
+      var result = loadEnvironmentGuard("\0one-env-guard:server-only:android:client");
       expect(result).toContain("throw new Error");
     });
     it("client-only: allowed in client", function () {
+      var result = loadEnvironmentGuard("\0one-env-guard:client-only:client:client");
+      expect(result).toBe("export {}");
+    });
+    it("client-only: legacy 2-part form still allowed in client", function () {
       var result = loadEnvironmentGuard("\0one-env-guard:client-only:client");
       expect(result).toBe("export {}");
     });
     it("client-only: forbidden in ssr", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:client-only:ssr");
+      var result = loadEnvironmentGuard("\0one-env-guard:client-only:ssr:server");
       expect(result).toContain("throw new Error");
     });
     it("client-only: forbidden in ios", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:client-only:ios");
+      var result = loadEnvironmentGuard("\0one-env-guard:client-only:ios:server");
       expect(result).toContain("throw new Error");
     });
     it("client-only: forbidden in android", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:client-only:android");
+      var result = loadEnvironmentGuard("\0one-env-guard:client-only:android:server");
       expect(result).toContain("throw new Error");
     });
     it("native-only: allowed in ios", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:native-only:ios");
+      var result = loadEnvironmentGuard("\0one-env-guard:native-only:ios:unknown");
       expect(result).toBe("export {}");
     });
     it("native-only: allowed in android", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:native-only:android");
+      var result = loadEnvironmentGuard("\0one-env-guard:native-only:android:unknown");
       expect(result).toBe("export {}");
     });
     it("native-only: forbidden in client", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:native-only:client");
+      var result = loadEnvironmentGuard("\0one-env-guard:native-only:client:client");
       expect(result).toContain("throw new Error");
     });
     it("native-only: forbidden in ssr", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:native-only:ssr");
+      var result = loadEnvironmentGuard("\0one-env-guard:native-only:ssr:server");
       expect(result).toContain("throw new Error");
     });
     it("web-only: allowed in client", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:web-only:client");
+      var result = loadEnvironmentGuard("\0one-env-guard:web-only:client:client");
       expect(result).toBe("export {}");
     });
     it("web-only: allowed in ssr", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:web-only:ssr");
+      var result = loadEnvironmentGuard("\0one-env-guard:web-only:ssr:server");
       expect(result).toBe("export {}");
     });
     it("web-only: forbidden in ios", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:web-only:ios");
+      var result = loadEnvironmentGuard("\0one-env-guard:web-only:ios:unknown");
       expect(result).toContain("throw new Error");
     });
     it("web-only: forbidden in android", function () {
-      var result = loadEnvironmentGuard("\0one-env-guard:web-only:android");
+      var result = loadEnvironmentGuard("\0one-env-guard:web-only:android:unknown");
       expect(result).toContain("throw new Error");
     });
     it("disabled guards always pass", function () {
@@ -102,36 +115,36 @@ describe("environmentGuardPlugin", function () {
   });
   describe("options", function () {
     it("disabled: true makes all guards no-ops", function () {
-      var id = resolveEnvironmentGuard("client-only", "ssr", {
+      var id = resolveEnvironmentGuard("client-only", "ssr", "server", {
         disabled: true
       });
       expect(id).toBe("\0one-env-guard:client-only:disabled");
       expect(loadEnvironmentGuard(id)).toBe("export {}");
     });
     it("disableGuards: disables specific guard types", function () {
-      var id1 = resolveEnvironmentGuard("client-only", "ssr", {
+      var id1 = resolveEnvironmentGuard("client-only", "ssr", "server", {
         disableGuards: ["client-only"]
       });
       expect(id1).toBe("\0one-env-guard:client-only:disabled");
-      var id2 = resolveEnvironmentGuard("server-only", "client", {
+      var 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", function () {
-      var id1 = resolveEnvironmentGuard("client-only", "ssr", {
+      var id1 = resolveEnvironmentGuard("client-only", "ssr", "server", {
         disableGuards: ["client-only", "server-only"]
       });
       expect(id1).toBe("\0one-env-guard:client-only:disabled");
-      var id2 = resolveEnvironmentGuard("server-only", "client", {
+      var id2 = resolveEnvironmentGuard("server-only", "client", "client", {
         disableGuards: ["client-only", "server-only"]
       });
       expect(id2).toBe("\0one-env-guard:server-only:disabled");
-      var id3 = resolveEnvironmentGuard("native-only", "client", {
+      var 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/dist/esm/vite/plugins/environmentGuardPlugin.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["describe","expect","it","resolveEnvironmentGuard","loadEnvironmentGuard","toBeNull","id","toBe","result","toContain","disabled","id1","disableGuards","id2"],"sources":["../../../../src/vite/plugins/environmentGuardPlugin.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["describe","expect","it","resolveEnvironmentGuard","loadEnvironmentGuard","toBeNull","id","toBe","result","toContain","disabled","id1","disableGuards","id2","id3"],"sources":["../../../../src/vite/plugins/environmentGuardPlugin.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/env.d.ts

@@ -26,6 +26,8 @@ interface OneEnvVariables {
   VITE_NATIVE: '' | '1'
   /** "web" for web builds, "ios" or "android" for native. Matches Expo convention. */
   EXPO_OS: 'web' | 'ios' | 'android'
+  /** "web" for web builds, "native" for native builds. Used by Tamagui and One native route branches. */
+  TAMAGUI_TARGET: 'web' | 'native'
 
   // React Native (available in native builds)
   /** The React Native version string */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.17.11",
+  "version": "1.18.0",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -186,18 +186,18 @@
     "@cloudflare/vite-plugin": "^1.33.1",
     "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "1.17.11",
-    "@vxrn/compiler": "1.17.11",
-    "@vxrn/resolve": "1.17.11",
-    "@vxrn/tslib-lite": "1.17.11",
-    "@vxrn/use-isomorphic-layout-effect": "1.17.11",
-    "@vxrn/vite-plugin-metro": "1.17.11",
+    "@vxrn/color-scheme": "1.18.0",
+    "@vxrn/compiler": "1.18.0",
+    "@vxrn/resolve": "1.18.0",
+    "@vxrn/tslib-lite": "1.18.0",
+    "@vxrn/use-isomorphic-layout-effect": "1.18.0",
+    "@vxrn/vite-plugin-metro": "1.18.0",
     "babel-dead-code-elimination": "1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-preset-expo": "*",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.17.11",
+    "create-vxrn": "1.18.0",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~55.0.7",
     "expo-modules-core": "~55.0.16",
@@ -217,7 +217,7 @@
     "tsconfig-paths": "^4",
     "use-latest-callback": "^0.2.3",
     "vite": "^8.0.13",
-    "vxrn": "1.17.11",
+    "vxrn": "1.18.0",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },
@@ -266,7 +266,7 @@
     "@react-navigation/core": "^7.17.2",
     "@react-navigation/drawer": "~7.9.8",
     "@react-navigation/native": "~7.2.2",
-    "@tamagui/build": "2.0.0-rc.40",
+    "@tamagui/build": "2.1.0",
     "react-native-gesture-handler": "~2.30.0",
     "react-native-reanimated": "~4.2.1",
     "react-native-safe-area-context": "~5.6.2",

package/src/cli/build.ts

@@ -22,6 +22,7 @@ import {
 
 import * as constants from '../constants'
 import { setServerGlobals } from '../server/setServerGlobals'
+import { environmentGuardPlugin } from '../vite/plugins/environmentGuardPlugin'
 import { writeBuildOutputPointer } from '../utils/buildOutputPointer'
 import { getPathnameFromFilePath } from '../utils/getPathnameFromFilePath'
 import { getRouterRootFromOneOptions } from '../utils/getRouterRootFromOneOptions'
@@ -60,6 +61,10 @@ const GENERATED_CLOUDFLARE_WRANGLER_RULES = [
   { type: 'ESModule', globs: ['./assets/**/*.js'], fallthrough: true },
 ]
 
+const CLOUDFLARE_DEPLOY_WRANGLER_RULES = [
+  { type: 'ESModule', globs: ['assets/**/*.js', 'assets/**/*.mjs'] },
+]
+
 function isPlainObject(value: unknown): value is Record<string, JsonValue> {
   return !!value && typeof value === 'object' && !Array.isArray(value)
 }
@@ -231,6 +236,46 @@ function createCloudflareWranglerConfig(
   return mergedConfig
 }
 
+function omitEmptyJsonValues(value: JsonValue): JsonValue | undefined {
+  if (Array.isArray(value)) {
+    const items = value
+      .map((item) => omitEmptyJsonValues(item))
+      .filter((item): item is JsonValue => item !== undefined)
+
+    return items.length > 0 ? items : undefined
+  }
+
+  if (isPlainObject(value)) {
+    const entries = Object.entries(value)
+      .map(([key, item]) => [key, omitEmptyJsonValues(item)] as const)
+      .filter((entry): entry is readonly [string, JsonValue] => entry[1] !== undefined)
+
+    return entries.length > 0 ? Object.fromEntries(entries) : undefined
+  }
+
+  return value
+}
+
+async function finalizeCloudflareWranglerDeployConfig(configPath: string) {
+  const parsed = JSON.parse(await FSExtra.readFile(configPath, 'utf-8')) as unknown
+  if (!isPlainObject(parsed)) {
+    throw new Error(
+      `Expected ${relative(process.cwd(), configPath)} to contain a JSON object`
+    )
+  }
+
+  parsed.rules = CLOUDFLARE_DEPLOY_WRANGLER_RULES
+
+  const config = omitEmptyJsonValues(parsed)
+  if (!isPlainObject(config)) {
+    throw new Error(
+      `Expected ${relative(process.cwd(), configPath)} to contain deploy config`
+    )
+  }
+
+  await FSExtra.writeFile(configPath, `${JSON.stringify(config, null, 2)}\n`)
+}
+
 // reads package.json name, strips npm scope prefix for use as cloudflare worker name
 async function getCloudflareProjectName(root: string): Promise<string> {
   try {
@@ -1505,6 +1550,15 @@ export default {
           'process.env.ONE_CACHE_KEY': JSON.stringify(constants.CACHE_KEY),
         },
         plugins: [
+          // the cloudflare worker IS a server, but this build runs with
+          // configFile:false so the user vite.config (where the user-level
+          // `one()` plugin registers environmentGuardPlugin via vite.config)
+          // doesn't apply. register the guard plugin directly here so
+          // `import 'server-only'` resolves to an empty module in the
+          // worker bundle instead of inlining the package's throwing
+          // index.js — which would crash the deployed worker on the first
+          // /api request that loads any server-only-importing module.
+          environmentGuardPlugin(oneOptions.environmentGuards),
           cloudflare({
             configPath: wranglerInputPath,
             viteEnvironment: { name: 'worker' },
@@ -1551,6 +1605,9 @@ export default {
       // Clean up temp file
       await FSExtra.remove(workerSrcPath)
       await FSExtra.remove(wranglerInputPath)
+      await finalizeCloudflareWranglerDeployConfig(
+        join(options.root, outDir, 'worker', 'wrangler.json')
+      )
 
       if (userWranglerConfig) {
         console.info(
@@ -1559,7 +1616,7 @@ export default {
       }
 
       postBuildLogs.push(`Cloudflare worker bundled at ${outDir}/worker/index.js`)
-      postBuildLogs.push(`To deploy: cd ${outDir}/worker && wrangler deploy`)
+      postBuildLogs.push(`To deploy: wrangler deploy`)
 
       break
     }

package/src/getURL.native.test.ts

@@ -0,0 +1,33 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { getDevServer } from './getDevServer'
+import { getURL } from './getURL.native'
+
+vi.mock('./getDevServer', () => ({
+  getDevServer: vi.fn(() => ({
+    url: 'http://metro.local:8081/',
+    bundleLoadedFromServer: true,
+  })),
+}))
+
+const originalServerUrl = process.env.ONE_SERVER_URL
+
+afterEach(() => {
+  process.env.ONE_SERVER_URL = originalServerUrl
+  vi.clearAllMocks()
+})
+
+describe('getURL native', () => {
+  it('prefers explicit ONE_SERVER_URL in dev', () => {
+    process.env.ONE_SERVER_URL = 'https://app.example.com/'
+
+    expect(getURL()).toBe('https://app.example.com')
+    expect(getDevServer).not.toHaveBeenCalled()
+  })
+
+  it('falls back to the dev server when ONE_SERVER_URL is unset', () => {
+    delete process.env.ONE_SERVER_URL
+
+    expect(getURL()).toBe('http://metro.local:8081')
+    expect(getDevServer).toHaveBeenCalledTimes(1)
+  })
+})

package/src/getURL.native.ts

@@ -5,15 +5,17 @@ let hasWarnedOnce = false
 export function getURL() {
   let url = process.env.ONE_SERVER_URL
 
+  if (url) {
+    return url.replace(/\/+$/, '') // remove trailing slash for consistency with web
+  }
+
   if (__DEV__) {
     // We'll be using the development server in development mode, but we still need to warn the user to set SERVER_URL for things to work in production.
-    if (!url) {
-      if (hasWarnedOnce) {
-        hasWarnedOnce = true
-        console.warn(
-          `The ONE_SERVER_URL environment variable is not set. While things will work in development mode as we'll be using your development server, you should still set ONE_SERVER_URL in your .env file for your production builds to work.`
-        )
-      }
+    if (!hasWarnedOnce) {
+      hasWarnedOnce = true
+      console.warn(
+        `The ONE_SERVER_URL environment variable is not set. While things will work in development mode as we'll be using your development server, you should still set ONE_SERVER_URL in your .env file for your production builds to work.`
+      )
     }
 
     const { url: devServerUrl } = getDevServer()