wrangler 2.6.0 → 2.6.1

package/miniflare-dist/index.mjs

@@ -130,41 +130,43 @@ var init_environment_polyfills = __esm({
 
 // ../pages-shared/environment-polyfills/miniflare-tre.ts
 var miniflare_tre_exports = {};
-import {
-  fetch as miniflareFetch,
-  Headers as MiniflareHeaders,
-  Request as MiniflareRequest,
-  Response as MiniflareResponse
-} from "@miniflare/tre";
+__export(miniflare_tre_exports, {
+  default: () => miniflare_tre_default
+});
+var miniflare_tre_default;
 var init_miniflare_tre = __esm({
   "../pages-shared/environment-polyfills/miniflare-tre.ts"() {
     init_environment_polyfills();
-    polyfill({
-      fetch: miniflareFetch,
-      Headers: MiniflareHeaders,
-      Request: MiniflareRequest,
-      Response: MiniflareResponse
-    });
+    miniflare_tre_default = async () => {
+      const mf = await import("@miniflare/tre");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
   }
 });
 
 // ../pages-shared/environment-polyfills/miniflare.ts
 var miniflare_exports = {};
-import {
-  fetch as miniflareFetch2,
-  Headers as MiniflareHeaders2,
-  Request as MiniflareRequest2,
-  Response as MiniflareResponse2
-} from "@miniflare/core";
+__export(miniflare_exports, {
+  default: () => miniflare_default
+});
+var miniflare_default;
 var init_miniflare = __esm({
   "../pages-shared/environment-polyfills/miniflare.ts"() {
     init_environment_polyfills();
-    polyfill({
-      fetch: miniflareFetch2,
-      Headers: MiniflareHeaders2,
-      Request: MiniflareRequest2,
-      Response: MiniflareResponse2
-    });
+    miniflare_default = async () => {
+      const mf = await import("@miniflare/core");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
   }
 });
 
@@ -786,8 +788,8 @@ import {
   Log as MiniflareLog,
   LogLevel as MiniflareLogLevel,
   Miniflare,
-  Request as MiniflareRequest3,
-  Response as MiniflareResponse3
+  Request as MiniflareRequest,
+  Response as MiniflareResponse
 } from "miniflare";
 
 // ../../node_modules/yargs/lib/platform-shims/esm.mjs
@@ -6066,11 +6068,8 @@ async function generateASSETSBinding(options) {
   };
 }
 async function generateAssetsFetch(directory, log, tre) {
-  if (tre) {
-    await Promise.resolve().then(() => (init_miniflare_tre(), miniflare_tre_exports));
-  } else {
-    await Promise.resolve().then(() => (init_miniflare(), miniflare_exports));
-  }
+  const polyfill2 = tre ? (await Promise.resolve().then(() => (init_miniflare_tre(), miniflare_tre_exports))).default : (await Promise.resolve().then(() => (init_miniflare(), miniflare_exports))).default;
+  await polyfill2();
   const miniflare = tre ? await import("@miniflare/tre") : await import("@miniflare/core");
   const Request = miniflare.Request;
   const { generateHandler: generateHandler2, parseQualityWeightedList: parseQualityWeightedList2 } = await Promise.resolve().then(() => (init_handler(), handler_exports));
@@ -6234,12 +6233,12 @@ async function main() {
         namespace.get = (id) => {
           const stub = new DurableObjectStub(factory, id);
           stub.fetch = (...reqArgs) => {
-            const requestFromArgs = new MiniflareRequest3(...reqArgs);
+            const requestFromArgs = new MiniflareRequest(...reqArgs);
             const url = new URL(requestFromArgs.url);
             url.host = host;
             if (port !== void 0)
               url.port = port.toString();
-            const request = new MiniflareRequest3(
+            const request = new MiniflareRequest(
               url.toString(),
               requestFromArgs
             );
@@ -6299,7 +6298,7 @@ async function main() {
 				}`,
         serviceBindings: {
           DO: async (request) => {
-            request = new MiniflareRequest3(request);
+            request = new MiniflareRequest(request);
             const name = request.headers.get("x-miniflare-durable-object-name");
             const idString = request.headers.get(
               "x-miniflare-durable-object-id"
@@ -6307,7 +6306,7 @@ async function main() {
             request.headers.delete("x-miniflare-durable-object-name");
             request.headers.delete("x-miniflare-durable-object-id");
             if (!name || !idString) {
-              return new MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Missing `x-miniflare-durable-object-name` or `x-miniflare-durable-object-id` headers.",
                 { status: 400 }
               );
@@ -6315,14 +6314,14 @@ async function main() {
             const namespace = await mf?.getDurableObjectNamespace(name);
             const id = namespace?.idFromString(idString);
             if (!id) {
-              return new MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Could not generate an ID. Possibly due to a mismatched DO name and ID?",
                 { status: 500 }
               );
             }
             const stub = namespace?.get(id);
             if (!stub) {
-              return new MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Could not generate a stub. Possibly due to a mismatched DO name and ID?",
                 { status: 500 }
               );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.6.0",
+	"version": "2.6.1",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",

package/src/miniflare-cli/assets.ts

@@ -89,13 +89,17 @@ async function generateAssetsFetch(
 	tre: boolean
 ): Promise<typeof fetch> {
 	// Defer importing miniflare until we really need it
-	if (tre) {
-		await import(
-			"@cloudflare/pages-shared/environment-polyfills/miniflare-tre"
-		);
-	} else {
-		await import("@cloudflare/pages-shared/environment-polyfills/miniflare");
-	}
+
+	const polyfill = tre
+		? (
+				await import(
+					"@cloudflare/pages-shared/environment-polyfills/miniflare-tre"
+				)
+		  ).default
+		: (await import("@cloudflare/pages-shared/environment-polyfills/miniflare"))
+				.default;
+
+	await polyfill();
 
 	const miniflare = tre
 		? await import("@miniflare/tre")

package/wrangler-dist/cli.js

@@ -129453,35 +129453,45 @@ var init_environment_polyfills = __esm({
 
 // ../pages-shared/environment-polyfills/miniflare-tre.ts
 var miniflare_tre_exports = {};
-var import_tre;
+__export(miniflare_tre_exports, {
+  default: () => miniflare_tre_default
+});
+var miniflare_tre_default;
 var init_miniflare_tre = __esm({
   "../pages-shared/environment-polyfills/miniflare-tre.ts"() {
     init_import_meta_url();
-    import_tre = require("@miniflare/tre");
     init_environment_polyfills();
-    polyfill({
-      fetch: import_tre.fetch,
-      Headers: import_tre.Headers,
-      Request: import_tre.Request,
-      Response: import_tre.Response
-    });
+    miniflare_tre_default = async () => {
+      const mf = await import("@miniflare/tre");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
   }
 });
 
 // ../pages-shared/environment-polyfills/miniflare.ts
 var miniflare_exports = {};
-var import_core2;
+__export(miniflare_exports, {
+  default: () => miniflare_default
+});
+var miniflare_default;
 var init_miniflare = __esm({
   "../pages-shared/environment-polyfills/miniflare.ts"() {
     init_import_meta_url();
-    import_core2 = require("@miniflare/core");
     init_environment_polyfills();
-    polyfill({
-      fetch: import_core2.fetch,
-      Headers: import_core2.Headers,
-      Request: import_core2.Request,
-      Response: import_core2.Response
-    });
+    miniflare_default = async () => {
+      const mf = await import("@miniflare/core");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
   }
 });
 
@@ -141885,7 +141895,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.6.0";
+var version = "2.6.1";
 var package_default = {
   name: "wrangler",
   version,
@@ -144986,11 +144996,8 @@ async function generateASSETSBinding(options6) {
   };
 }
 async function generateAssetsFetch(directory, log, tre) {
-  if (tre) {
-    await Promise.resolve().then(() => (init_miniflare_tre(), miniflare_tre_exports));
-  } else {
-    await Promise.resolve().then(() => (init_miniflare(), miniflare_exports));
-  }
+  const polyfill2 = tre ? (await Promise.resolve().then(() => (init_miniflare_tre(), miniflare_tre_exports))).default : (await Promise.resolve().then(() => (init_miniflare(), miniflare_exports))).default;
+  await polyfill2();
   const miniflare = tre ? await import("@miniflare/tre") : await import("@miniflare/core");
   const Request2 = miniflare.Request;
   const { generateHandler: generateHandler3, parseQualityWeightedList: parseQualityWeightedList2 } = await Promise.resolve().then(() => (init_handler(), handler_exports));