wrangler 3.28.1 → 3.28.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.28.1",
+  "version": "3.28.2",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -83,7 +83,6 @@
     }
   },
   "dependencies": {
-    "@cloudflare/kv-asset-handler": "^0.2.0",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "blake3-wasm": "^2.1.5",
@@ -96,7 +95,8 @@
     "selfsigned": "^2.0.1",
     "source-map": "0.6.1",
     "xxhash-wasm": "^1.0.1",
-    "miniflare": "3.20240129.1"
+    "@cloudflare/kv-asset-handler": "0.3.1",
+    "miniflare": "3.20240129.2"
   },
   "devDependencies": {
     "@cloudflare/ai": "^1.0.35",
@@ -187,7 +187,7 @@
     "yargs": "^17.7.2",
     "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/pages-shared": "^0.11.11",
+    "@cloudflare/pages-shared": "^0.11.12",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "optionalDependencies": {
@@ -220,7 +220,7 @@
     "test": "pnpm run assert-git-version && jest",
     "test:ci": "pnpm run test --coverage",
     "test:debug": "pnpm run test --silent=false --verbose=true",
-    "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e --retry 2 run",
+    "test:e2e": "vitest --test-timeout 240000 --poolOptions.threads.singleThread --dir ./e2e --retry 2 run",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   }

package/templates/startDevWorker/ProxyWorker.ts

@@ -113,10 +113,11 @@ export class ProxyWorker implements DurableObject {
 			this.requestRetryQueue.delete(request);
 			this.requestQueue.delete(request);
 
-			const userWorkerUrl = new URL(request.url);
+			const outerUrl = new URL(request.url);
 			const headers = new Headers(request.headers);
 
 			// override url parts for proxying
+			const userWorkerUrl = new URL(request.url);
 			Object.assign(userWorkerUrl, proxyData.userWorkerUrl);
 
 			// set request.url in the UserWorker
@@ -125,6 +126,8 @@ export class ProxyWorker implements DurableObject {
 			headers.set("MF-Original-URL", innerUrl.href);
 			headers.set("MF-Disable-Pretty-Error", "true"); // disables the UserWorker miniflare instance from rendering the pretty error -- instead the ProxyWorker miniflare instance will intercept the json error response and render the pretty error page
 
+			rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);
+
 			// merge proxyData headers with the request headers
 			for (const [key, value] of Object.entries(proxyData.headers ?? {})) {
 				if (value === undefined) continue;
@@ -140,6 +143,9 @@ export class ProxyWorker implements DurableObject {
 			// explicitly NOT await-ing this promise, we are in a loop and want to process the whole queue quickly + synchronously
 			void fetch(userWorkerUrl, new Request(request, { headers }))
 				.then((res) => {
+					res = new Response(res.body, res);
+					rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);
+
 					if (isHtmlResponse(res)) {
 						res = insertLiveReloadScript(request, res, this.env, proxyData);
 					}
@@ -290,3 +296,20 @@ function insertLiveReloadScript(
 
 	return htmlRewriter.transform(response);
 }
+
+/**
+ * Rewrite references to URLs in request/response headers.
+ *
+ * This function is used to map the URLs in headers like Origin and Access-Control-Allow-Origin
+ * so that this proxy is transparent to the Client Browser and User Worker.
+ */
+function rewriteUrlRelatedHeaders(headers: Headers, from: URL, to: URL) {
+	headers.forEach((value, key) => {
+		if (typeof value === "string" && value.includes(from.host)) {
+			headers.set(
+				key,
+				value.replaceAll(from.origin, to.origin).replaceAll(from.host, to.host)
+			);
+		}
+	});
+}

package/wrangler-dist/ProxyWorker.js

@@ -90,13 +90,15 @@ var ProxyWorker = class {
     for (const [request, deferredResponse] of this.getOrderedQueue()) {
       this.requestRetryQueue.delete(request);
       this.requestQueue.delete(request);
-      const userWorkerUrl = new URL(request.url);
+      const outerUrl = new URL(request.url);
       const headers = new Headers(request.headers);
+      const userWorkerUrl = new URL(request.url);
       Object.assign(userWorkerUrl, proxyData.userWorkerUrl);
       const innerUrl = new URL(request.url);
       Object.assign(innerUrl, proxyData.userWorkerInnerUrlOverrides);
       headers.set("MF-Original-URL", innerUrl.href);
       headers.set("MF-Disable-Pretty-Error", "true");
+      rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);
       for (const [key, value] of Object.entries(proxyData.headers ?? {})) {
         if (value === void 0)
           continue;
@@ -108,6 +110,8 @@ var ProxyWorker = class {
         }
       }
       void fetch(userWorkerUrl, new Request(request, { headers })).then((res) => {
+        res = new Response(res.body, res);
+        rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);
         if (isHtmlResponse(res)) {
           res = insertLiveReloadScript(request, res, this.env, proxyData);
         }
@@ -205,6 +209,16 @@ function insertLiveReloadScript(request, response, env, proxyData) {
   });
   return htmlRewriter.transform(response);
 }
+function rewriteUrlRelatedHeaders(headers, from, to) {
+  headers.forEach((value, key) => {
+    if (typeof value === "string" && value.includes(from.host)) {
+      headers.set(
+        key,
+        value.replaceAll(from.origin, to.origin).replaceAll(from.host, to.host)
+      );
+    }
+  });
+}
 export {
   ProxyWorker,
   ProxyWorker_default as default

package/wrangler-dist/ProxyWorker.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/api/startDevWorker/utils.ts", "../templates/startDevWorker/ProxyWorker.ts"],
-  "mappings": ";AAAA,OAAO,YAAY;AASZ,SAAS,eACf,kBACqB;AACrB,MAAI,SAAS;AACb,QAAM,aAAa,IAAI,QAAW,CAAC,UAAU,YAAY;AACxD,cAAU;AACV,aAAS;AAAA,EACV,CAAC;AACD,SAAO,OAAO;AACd,SAAO,MAAM;AAIb,oBAAkB,QAAQ,UAAU;AAEpC,SAAO;AAAA,IACN,SAAS;AAAA,IACT;AAAA,IACA;AAAA,EACD;AACD;AAIO,SAAS,aACf,OACA,OAAO,oBACD;AACN,QAAM,MAAM,IAAI,IAAI,IAAI;AAExB,SAAO,OAAO,KAAK,KAAK;AAExB,SAAO;AACR;;;AClBA,IAAM,uBAAuB;AAC7B,IAAO,sBAAQ;AAAA,EACd,MAAM,KAAK,KAAK;AACf,UAAM,YAAY,IAAI,eAAe,WAAW,EAAE;AAClD,UAAM,iBAAiB,IAAI,eAAe,IAAI,SAAS;AAEvD,WAAO,eAAe,MAAM,GAAG;AAAA,EAChC;AACD;AAEO,IAAM,cAAN,MAA2C;AAAA,EACjD,YAAqB,OAAoC,KAAU;AAA9C;AAAoC;AAAA,EAAW;AAAA,EAEpE;AAAA,EACA,eAAe,oBAAI,IAAwC;AAAA,EAC3D,oBAAoB,oBAAI,IAAwC;AAAA,EAEhE,MAAM,SAAkB;AACvB,QAAI,gCAAgC,OAAO,GAAG;AAG7C,aAAO,KAAK,0BAA0B,OAAO;AAAA,IAC9C;AAEA,QAAI,6BAA6B,SAAS,KAAK,GAAG,GAAG;AAGpD,aAAO,KAAK,8BAA8B,OAAO;AAAA,IAClD;AAGA,UAAM,WAAW,eAAyB;AAE1C,SAAK,aAAa,IAAI,SAAS,QAAQ;AACvC,SAAK,aAAa;AAElB,WAAO,SAAS;AAAA,EACjB;AAAA,EAEA,0BAA0B,SAAkB;AAC3C,UAAM,EAAE,GAAG,UAAU,GAAG,WAAW,IAAI,IAAI,cAAc;AACzD,UAAM,oBACL,QAAQ,QAAQ,IAAI,wBAAwB,KAAK;AAElD,SAAK,MAAM,gBAAgB,YAAY,CAAC,aAAa,CAAC;AAEtD,WAAO,IAAI,SAAS,MAAM;AAAA,MACzB,QAAQ;AAAA,MACR,WAAW;AAAA,MACX,SAAS,EAAE,0BAA0B,kBAAkB;AAAA,IACxD,CAAC;AAAA,EACF;AAAA,EAEA,8BAA8B,SAAkB;AAC/C,UAAM,QAAQ,QAAQ,IAAI;AAC1B,YAAQ,OAAO,MAAM;AAAA,MACpB,KAAK;AACJ,aAAK,YAAY;AACjB;AAAA,MAED,KAAK;AACJ,aAAK,YAAY,MAAM;AACvB,aAAK,aAAa;AAClB,aAAK,MACH,cAAc,aAAa,EAC3B,QAAQ,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC;AAEnC;AAAA,IACF;AAEA,WAAO,IAAI,SAAS,MAAM,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC1C;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,CAAC,kBAAkB;AAClB,WAAO,KAAK;AACZ,WAAO,KAAK;AAAA,EACb;AAAA,EAEA,eAAe;AACd,UAAM,EAAE,UAAU,IAAI;AACtB,QAAI,cAAc;AAAW;AAE7B,eAAW,CAAC,SAAS,gBAAgB,KAAK,KAAK,gBAAgB,GAAG;AACjE,WAAK,kBAAkB,OAAO,OAAO;AACrC,WAAK,aAAa,OAAO,OAAO;AAEhC,YAAM,gBAAgB,IAAI,IAAI,QAAQ,GAAG;AACzC,YAAM,UAAU,IAAI,QAAQ,QAAQ,OAAO;AAG3C,aAAO,OAAO,eAAe,UAAU,aAAa;AAGpD,YAAM,WAAW,IAAI,IAAI,QAAQ,GAAG;AACpC,aAAO,OAAO,UAAU,UAAU,2BAA2B;AAC7D,cAAQ,IAAI,mBAAmB,SAAS,IAAI;AAC5C,cAAQ,IAAI,2BAA2B,MAAM;AAG7C,iBAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,UAAU,WAAW,CAAC,CAAC,GAAG;AACnE,YAAI,UAAU;AAAW;AAEzB,YAAI,IAAI,YAAY,MAAM,UAAU;AACnC,gBAAM,WAAW,QAAQ,QAAQ,IAAI,QAAQ,KAAK;AAClD,kBAAQ,IAAI,UAAU,GAAG,YAAY,OAAO;AAAA,QAC7C,OAAO;AACN,kBAAQ,IAAI,KAAK,KAAK;AAAA,QACvB;AAAA,MACD;AAGA,WAAK,MAAM,eAAe,IAAI,QAAQ,SAAS,EAAE,QAAQ,CAAC,CAAC,EACzD,KAAK,CAAC,QAAQ;AACd,YAAI,eAAe,GAAG,GAAG;AACxB,gBAAM,uBAAuB,SAAS,KAAK,KAAK,KAAK,SAAS;AAAA,QAC/D;AAEA,yBAAiB,QAAQ,GAAG;AAAA,MAC7B,CAAC,EACA,MAAM,CAAC,UAAiB;AAQxB,cAAM,mBACL,KAAK,aAAa,aAAa,KAAK,UAAU,aAAa;AAG5D,YAAI,cAAc,SAAS,kBAAkB,MAAM;AAClD,eAAK,6BAA6B,KAAK,KAAK;AAAA,YAC3C,MAAM;AAAA,YACN,OAAO;AAAA,cACN,MAAM,MAAM;AAAA,cACZ,SAAS,MAAM;AAAA,cACf,OAAO,MAAM;AAAA,cACb,OAAO,MAAM;AAAA,YACd;AAAA,UACD,CAAC;AAED,2BAAiB,OAAO,KAAK;AAAA,QAC9B,WAGS,QAAQ,WAAW,SAAS,QAAQ,WAAW,QAAQ;AAC/D,eAAK,kBAAkB,IAAI,SAAS,gBAAgB;AAAA,QAOrD,OAOK;AACJ,2BAAiB;AAAA,YAChB,IAAI;AAAA,cACH;AAAA,cACA;AAAA,gBACC,QAAQ;AAAA,gBACR,SAAS,EAAE,eAAe,IAAI;AAAA,cAC/B;AAAA,YACD;AAAA,UACD;AAAA,QACD;AAAA,MACD,CAAC;AAAA,IACH;AAAA,EACD;AACD;AAEA,SAAS,6BAA6B,KAAc,KAAmB;AACtE,SAAO,IAAI,QAAQ,IAAI,eAAe,MAAM,IAAI;AACjD;AACA,SAAS,eAAe,KAAwB;AAC/C,SAAO,IAAI,QAAQ,IAAI,cAAc,GAAG,WAAW,WAAW,KAAK;AACpE;AACA,SAAS,gCAAgC,KAAuB;AAC/D,QAAM,oBAAoB,IAAI,QAAQ,IAAI,wBAAwB;AAClE,QAAM,qBAAqB,IAAI,QAAQ,IAAI,SAAS,MAAM;AAE1D,SAAO,sBAAsB,sBAAsB;AACpD;AAEA,SAAS,6BACR,KACA,SACC;AACD,SAAO,IAAI,iBAAiB,MAAM,gBAAgB;AAAA,IACjD,QAAQ;AAAA,IACR,MAAM,KAAK,UAAU,OAAO;AAAA,EAC7B,CAAC;AACF;AAEA,SAAS,uBACR,SACA,UACA,KACA,WACC;AACD,QAAM,eAAe,IAAI,aAAa;AAGtC,MAAI,eAAe;AACnB,eAAa,GAAG,qBAAqB;AAAA,IACpC,KAAK,SAAS;AACb,sBAAgB,QAAQ;AAAA,IACzB;AAAA,EACD,CAAC;AAED,eAAa,WAAW;AAAA,IACvB,IAAI,KAAK;AACR,UACC,SAAS,WAAW,OACpB,aAAa,SAAS,uCAAuC,GAC5D;AACD,aAAK,6BAA6B,KAAK;AAAA,UACtC,MAAM;AAAA,UACN;AAAA,QACD,CAAC;AAAA,MACF;AAIA,UAAI,UAAU,YAAY;AACzB,cAAM,eAAe,IAAI,IAAI,QAAQ,GAAG;AACxC,qBAAa,WACZ,aAAa,aAAa,UAAU,QAAQ;AAE7C,YAAI;AAAA,UACH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,+DAW0D;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,UAQ1D,EAAE,MAAM,KAAK;AAAA,QACd;AAAA,MACD;AAAA,IACD;AAAA,EACD,CAAC;AAED,SAAO,aAAa,UAAU,QAAQ;AACvC;",
+  "mappings": "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",
   "names": []
 }

package/wrangler-dist/cli.d.ts

@@ -137,27 +137,11 @@ declare type Binding = {
 /**
  * Result of the `getBindingsProxy` utility
  */
-export declare type BindingsProxy<Bindings = Record<string, unknown>, CfProperties extends Record<string, unknown> = IncomingRequestCfProperties_2> = {
+export declare type BindingsProxy<Bindings = Record<string, unknown>, CfProperties extends Record<string, unknown> = IncomingRequestCfProperties_2> = Omit<PlatformProxy<Bindings, CfProperties>, "env"> & {
     /**
      * Object containing the various proxies
      */
     bindings: Bindings;
-    /**
-     * Mock of the context object that Workers received in their request handler, all the object's methods are no-op
-     */
-    cf: CfProperties;
-    /**
-     * Mock of the context object that Workers received in their request handler, all the object's methods are no-op
-     */
-    ctx: ExecutionContext_2;
-    /**
-     * Caches object emulating the Workers Cache runtime API
-     */
-    caches: CacheStorage_3;
-    /**
-     * Function used to dispose of the child process providing the bindings implementation
-     */
-    dispose: () => Promise<void>;
 };
 
 declare interface BlobPropertyBag {
@@ -353,7 +337,7 @@ declare const CacheStorage_2: {
  *
  * We are not using miniflare's implementation because that would require the user to provide
  * miniflare-specific Request objects and they would receive back miniflare-specific Response
- * objects, this (in particular the Request part) is not really suitable for `getBindingsProxy`
+ * objects, this (in particular the Request part) is not really suitable for `getPlatformProxy`
  * as people would ideally interact with their bindings in a very production-like manner and
  * requiring them to deal with miniflare-specific classes defeats a bit the purpose of the utility.
  *
@@ -2280,15 +2264,36 @@ declare type FormDataEntryValue = string | File_2
  * By reading from a `wrangler.toml` file this function generates proxy binding objects that can be
  * used to simulate the interaction with bindings during local development in a Node.js environment
  *
+ * @deprecated use `getPlatformProxy` instead
+ *
  * @param options The various options that can tweak this function's behavior
  * @returns An Object containing the generated proxies alongside other related utilities
  */
 export declare function getBindingsProxy<Bindings = Record<string, unknown>, CfProperties extends Record<string, unknown> = IncomingRequestCfProperties_2>(options?: GetBindingsProxyOptions): Promise<BindingsProxy<Bindings, CfProperties>>;
 
+/** Options for the `getBindingsProxy` utility */
+export declare type GetBindingsProxyOptions = GetPlatformProxyOptions;
+
+declare function getCookies (headers: Headers_2): Record<string, string>
+
+declare function getGlobalDispatcher(): Dispatcher;
+
+declare function getGlobalOrigin(): URL | undefined;
+
+/**
+ * By reading from a `wrangler.toml` file this function generates proxy objects that can be
+ * used to simulate the interaction with the Cloudflare platform during local development
+ * in a Node.js environment
+ *
+ * @param options The various options that can tweak this function's behavior
+ * @returns An Object containing the generated proxies alongside other related utilities
+ */
+export declare function getPlatformProxy<Env = Record<string, unknown>, CfProperties extends Record<string, unknown> = IncomingRequestCfProperties_2>(options?: GetPlatformProxyOptions): Promise<PlatformProxy<Env, CfProperties>>;
+
 /**
- * Options for the `getBindingsProxy` utility
+ * Options for the `getPlatformProxy` utility
  */
-export declare type GetBindingsProxyOptions = {
+export declare type GetPlatformProxyOptions = {
     /**
      * The path to the config object to use (default `wrangler.toml`)
      */
@@ -2310,12 +2315,6 @@ export declare type GetBindingsProxyOptions = {
     };
 };
 
-declare function getCookies (headers: Headers_2): Record<string, string>
-
-declare function getGlobalDispatcher(): Dispatcher;
-
-declare function getGlobalOrigin(): URL | undefined;
-
 declare function getSetCookies (headers: Headers_2): Cookie[]
 
 declare class Headers_2 implements SpecIterable<[string, string]> {
@@ -2660,6 +2659,32 @@ options: { dispatcher?: Dispatcher } & Omit<Dispatcher.PipelineOptions, 'origin'
 handler: Dispatcher.PipelineHandler
 ): Duplex;
 
+/**
+ * Result of the `getPlatformProxy` utility
+ */
+export declare type PlatformProxy<Env = Record<string, unknown>, CfProperties extends Record<string, unknown> = IncomingRequestCfProperties_2> = {
+    /**
+     * Environment object containing the various Cloudflare bindings
+     */
+    env: Env;
+    /**
+     * Mock of the context object that Workers received in their request handler, all the object's methods are no-op
+     */
+    cf: CfProperties;
+    /**
+     * Mock of the context object that Workers received in their request handler, all the object's methods are no-op
+     */
+    ctx: ExecutionContext_2;
+    /**
+     * Caches object emulating the Workers Cache runtime API
+     */
+    caches: CacheStorage_3;
+    /**
+     * Function used to dispose of the child process providing the bindings implementation
+     */
+    dispose: () => Promise<void>;
+};
+
 declare class Pool extends Dispatcher {
     constructor(url: string | URL_2, options?: Pool.Options)
     /** `true` after `pool.close()` has been called. */
@@ -23018,7 +23043,7 @@ declare type ProxyData = {
     userWorkerUrl: UrlOriginParts;
     userWorkerInspectorUrl: UrlOriginAndPathnameParts;
     userWorkerInnerUrlOverrides: Partial<UrlOriginParts>;
-    headers: Record<string, string | undefined>;
+    headers: Record<string, string>;
     liveReload?: boolean;
     proxyLogsToController?: boolean;
     internalDurableObjects?: CfDurableObject[];

package/wrangler-dist/cli.js

@@ -116035,6 +116035,7 @@ var require_dist6 = __commonJS({
 var cli_exports = {};
 __export(cli_exports, {
   getBindingsProxy: () => getBindingsProxy,
+  getPlatformProxy: () => getPlatformProxy,
   unstable_DevEnv: () => DevEnv,
   unstable_dev: () => unstable_dev,
   unstable_pages: () => unstable_pages
@@ -119620,7 +119621,7 @@ var import_node_assert2 = __toESM(require("node:assert"));
 var import_undici3 = __toESM(require_undici());
 
 // package.json
-var version = "3.28.1";
+var version = "3.28.2";
 var package_default = {
   name: "wrangler",
   version,
@@ -119686,7 +119687,7 @@ var package_default = {
     test: "pnpm run assert-git-version && jest",
     "test:ci": "pnpm run test --coverage",
     "test:debug": "pnpm run test --silent=false --verbose=true",
-    "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e --retry 2 run",
+    "test:e2e": "vitest --test-timeout 240000 --poolOptions.threads.singleThread --dir ./e2e --retry 2 run",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   },
@@ -119724,7 +119725,7 @@ var package_default = {
     }
   },
   dependencies: {
-    "@cloudflare/kv-asset-handler": "^0.2.0",
+    "@cloudflare/kv-asset-handler": "workspace:*",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "blake3-wasm": "^2.1.5",
@@ -126577,14 +126578,23 @@ __name(execaCommandSync, "execaCommandSync");
 async function runCustomBuild(expectedEntryAbsolute, expectedEntryRelative, build5) {
   if (build5.command) {
     logger.log("Running custom build:", build5.command);
-    await execaCommand(build5.command, {
-      shell: true,
-      // we keep these two as "inherit" so that
-      // logs are still visible.
-      stdout: "inherit",
-      stderr: "inherit",
-      ...build5.cwd && { cwd: build5.cwd }
-    });
+    try {
+      await execaCommand(build5.command, {
+        shell: true,
+        // we keep these two as "inherit" so that
+        // logs are still visible.
+        stdout: "inherit",
+        stderr: "inherit",
+        ...build5.cwd && { cwd: build5.cwd }
+      });
+    } catch (e3) {
+      throw new UserError(
+        `Running custom build \`${build5.command}\` failed. There are likely more logs from your build command above.`,
+        {
+          cause: e3
+        }
+      );
+    }
     assertEntryPointExists(
       expectedEntryAbsolute,
       expectedEntryRelative,
@@ -166015,11 +166025,13 @@ ${onboardingLink}`);
           port: workerPreviewToken.inspectorUrl.port.toString(),
           pathname: workerPreviewToken.inspectorUrl.pathname
         },
-        userWorkerInnerUrlOverrides: {},
-        // there is no analagous prop for this option because we did not permit overriding request.url in remote mode
+        userWorkerInnerUrlOverrides: {
+          hostname: props.host,
+          port: props.port.toString()
+        },
         headers: {
           "cf-workers-preview-token": workerPreviewToken.value,
-          Cookie: accessToken && `CF_Authorization=${accessToken}`
+          ...accessToken ? { Cookie: `CF_Authorization=${accessToken}` } : {}
         },
         liveReload: false,
         // liveReload currently disabled in remote-mode, but will be supported with startDevWorker
@@ -166113,11 +166125,13 @@ async function startRemoteServer(props) {
           port: previewToken.inspectorUrl.port.toString(),
           pathname: previewToken.inspectorUrl.pathname
         },
-        userWorkerInnerUrlOverrides: {},
-        // there is no analagous prop for this option because we did not permit overriding request.url in remote mode
+        userWorkerInnerUrlOverrides: {
+          hostname: props.host,
+          port: props.port.toString()
+        },
         headers: {
           "cf-workers-preview-token": previewToken.value,
-          Cookie: accessToken && `CF_Authorization=${accessToken}`
+          ...accessToken ? { Cookie: `CF_Authorization=${accessToken}` } : {}
         },
         liveReload: false,
         // liveReload currently disabled in remote-mode, but will be supported with startDevWorker
@@ -166516,7 +166530,8 @@ function useEsbuild({
     testScheduled,
     experimentalLocal,
     projectRoot,
-    onBundleStart
+    onBundleStart,
+    defineNavigatorUserAgent
   ]);
   return bundle;
 }
@@ -169053,11 +169068,11 @@ init_import_meta_url();
 // src/api/integrations/index.ts
 init_import_meta_url();
 
-// src/api/integrations/bindings/index.ts
+// src/api/integrations/platform/index.ts
 init_import_meta_url();
 var import_miniflare18 = require("miniflare");
 
-// src/api/integrations/bindings/caches.ts
+// src/api/integrations/platform/caches.ts
 init_import_meta_url();
 var CacheStorage = class {
   async open(cacheName) {
@@ -169080,7 +169095,7 @@ var Cache2 = class {
 };
 __name(Cache2, "Cache");
 
-// src/api/integrations/bindings/executionContext.ts
+// src/api/integrations/platform/executionContext.ts
 init_import_meta_url();
 var ExecutionContext = class {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, unused-imports/no-unused-vars
@@ -169091,7 +169106,7 @@ var ExecutionContext = class {
 };
 __name(ExecutionContext, "ExecutionContext");
 
-// src/api/integrations/bindings/services.ts
+// src/api/integrations/platform/services.ts
 init_import_meta_url();
 var import_miniflare17 = require("miniflare");
 var import_undici24 = __toESM(require_undici());
@@ -169161,8 +169176,8 @@ async function maybeGetRegisteredWorkers() {
 }
 __name(maybeGetRegisteredWorkers, "maybeGetRegisteredWorkers");
 
-// src/api/integrations/bindings/index.ts
-async function getBindingsProxy(options25 = {}) {
+// src/api/integrations/platform/index.ts
+async function getPlatformProxy(options25 = {}) {
   const rawConfig = readConfig(options25.configPath, {
     experimentalJsonConfig: options25.experimentalJsonConfig
   });
@@ -169182,7 +169197,7 @@ async function getBindingsProxy(options25 = {}) {
   const cf = await mf.getCf();
   deepFreeze(cf);
   return {
-    bindings: {
+    env: {
       ...vars,
       ...bindings
     },
@@ -169192,7 +169207,7 @@ async function getBindingsProxy(options25 = {}) {
     dispose: () => mf.dispose()
   };
 }
-__name(getBindingsProxy, "getBindingsProxy");
+__name(getPlatformProxy, "getPlatformProxy");
 async function getMiniflareOptionsFromConfig(rawConfig, env5, options25) {
   const bindings = getBindings(rawConfig, env5, true, {});
   const workerDefinitions = await getBoundRegisteredWorkers({
@@ -169255,6 +169270,20 @@ function deepFreeze(obj) {
 }
 __name(deepFreeze, "deepFreeze");
 
+// src/api/integrations/deprecated/index.ts
+init_import_meta_url();
+
+// src/api/integrations/deprecated/getBindingsProxy.ts
+init_import_meta_url();
+async function getBindingsProxy(options25 = {}) {
+  const { env: env5, ...restOfPlatformProxy } = await getPlatformProxy(options25);
+  return {
+    bindings: env5,
+    ...restOfPlatformProxy
+  };
+}
+__name(getBindingsProxy, "getBindingsProxy");
+
 // src/cli.ts
 if (typeof jest === "undefined" && require.main === module) {
   main(hideBin(import_process6.default.argv)).catch((e3) => {
@@ -169265,6 +169294,7 @@ if (typeof jest === "undefined" && require.main === module) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getBindingsProxy,
+  getPlatformProxy,
   unstable_DevEnv,
   unstable_dev,
   unstable_pages