wrangler 2.5.0 → 2.6.0

package/miniflare-dist/index.mjs

@@ -128,16 +128,16 @@ var init_environment_polyfills = __esm({
   }
 });
 
-// ../pages-shared/environment-polyfills/miniflare.ts
-var miniflare_exports = {};
+// ../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/core";
-var init_miniflare = __esm({
-  "../pages-shared/environment-polyfills/miniflare.ts"() {
+} from "@miniflare/tre";
+var init_miniflare_tre = __esm({
+  "../pages-shared/environment-polyfills/miniflare-tre.ts"() {
     init_environment_polyfills();
     polyfill({
       fetch: miniflareFetch,
@@ -148,6 +148,26 @@ var init_miniflare = __esm({
   }
 });
 
+// ../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";
+var init_miniflare = __esm({
+  "../pages-shared/environment-polyfills/miniflare.ts"() {
+    init_environment_polyfills();
+    polyfill({
+      fetch: miniflareFetch2,
+      Headers: MiniflareHeaders2,
+      Request: MiniflareRequest2,
+      Response: MiniflareResponse2
+    });
+  }
+});
+
 // ../pages-shared/asset-server/responses.ts
 function mergeHeaders(base, extra) {
   base = new Headers(base ?? {});
@@ -329,6 +349,15 @@ var init_rulesEngine = __esm({
   }
 });
 
+// ../pages-shared/asset-server/url.ts
+function stringifyURLToRootRelativePathname(url) {
+  return `${url.pathname}${url.search}${url.hash}`;
+}
+var init_url = __esm({
+  "../pages-shared/asset-server/url.ts"() {
+  }
+});
+
 // ../pages-shared/asset-server/handler.ts
 var handler_exports = {};
 __export(handler_exports, {
@@ -339,6 +368,7 @@ __export(handler_exports, {
   HEADERS_VERSION_V1: () => HEADERS_VERSION_V1,
   REDIRECTS_VERSION: () => REDIRECTS_VERSION2,
   generateHandler: () => generateHandler,
+  getResponseFromMatch: () => getResponseFromMatch,
   normaliseHeaders: () => normaliseHeaders,
   parseQualityWeightedList: () => parseQualityWeightedList
 });
@@ -409,22 +439,7 @@ async function generateHandler({
   async function generateResponse() {
     const match = staticRedirectsMatcher() || generateRedirectsMatcher()({ request })[0];
     if (match) {
-      const { status, to } = match;
-      const destination = new URL(to, request.url);
-      const location = destination.origin === new URL(request.url).origin ? `${destination.pathname}${destination.search || search}${destination.hash}` : `${destination.href}${destination.search ? "" : search}${destination.hash}`;
-      switch (status) {
-        case 301:
-          return new MovedPermanentlyResponse(location);
-        case 303:
-          return new SeeOtherResponse(location);
-        case 307:
-          return new TemporaryRedirectResponse(location);
-        case 308:
-          return new PermanentRedirectResponse(location);
-        case 302:
-        default:
-          return new FoundResponse(location);
-      }
+      return getResponseFromMatch(match, url);
     }
     if (!request.method.match(/^(get|head)$/i)) {
       return new MethodNotAllowedResponse();
@@ -703,6 +718,27 @@ async function generateHandler({
     );
   }
 }
+function getResponseFromMatch({
+  status,
+  to
+}, requestUrl) {
+  const destination = new URL(to, requestUrl);
+  destination.search = destination.search || requestUrl.search;
+  const location = destination.origin === requestUrl.origin ? stringifyURLToRootRelativePathname(destination) : destination.toString();
+  switch (status) {
+    case 301:
+      return new MovedPermanentlyResponse(location);
+    case 303:
+      return new SeeOtherResponse(location);
+    case 307:
+      return new TemporaryRedirectResponse(location);
+    case 308:
+      return new PermanentRedirectResponse(location);
+    case 302:
+    default:
+      return new FoundResponse(location);
+  }
+}
 function parseQualityWeightedList(list = "") {
   const items = {};
   list.replace(/\s/g, "").split(",").forEach((el) => {
@@ -728,6 +764,7 @@ var init_handler = __esm({
   "../pages-shared/asset-server/handler.ts"() {
     init_responses();
     init_rulesEngine();
+    init_url();
     ASSET_PRESERVATION_CACHE = "assetPreservationCache";
     CACHE_CONTROL_PRESERVATION = "public, s-maxage=604800";
     CACHE_CONTROL_BROWSER = "public, max-age=0, must-revalidate";
@@ -5632,7 +5669,11 @@ function constructRedirects({
   for (const rule of redirects.rules) {
     if (!rule.from.match(SPLAT_REGEX) && !rule.from.match(PLACEHOLDER_REGEX)) {
       if (canCreateStaticRule) {
-        staticRedirects[rule.from] = { status: rule.status, to: rule.to };
+        staticRedirects[rule.from] = {
+          status: rule.status,
+          to: rule.to,
+          lineNumber: rule.lineNumber
+        };
         continue;
       } else {
         logger(
@@ -5974,11 +6015,6 @@ function parseRedirects(input) {
 
 // src/miniflare-cli/assets.ts
 var import_mime = __toESM(require_mime());
-import {
-  Response as MiniflareResponse2,
-  Request as MiniflareRequest2
-} from "@miniflare/core";
-import { upgradingFetch as miniflareFetch2 } from "@miniflare/web-sockets";
 import { watch } from "chokidar";
 
 // src/pages/hash.tsx
@@ -5994,33 +6030,34 @@ var hashFile = (filepath) => {
 
 // src/miniflare-cli/assets.ts
 async function generateASSETSBinding(options) {
-  const assetsFetch = options.directory !== void 0 ? await generateAssetsFetch(options.directory, options.log) : invalidAssetsFetch;
+  const assetsFetch = options.directory !== void 0 ? await generateAssetsFetch(options.directory, options.log, options.tre) : invalidAssetsFetch;
+  const miniflare = options.tre ? await import("@miniflare/tre") : await import("@miniflare/core");
+  const Request = miniflare.Request;
+  const Response2 = miniflare.Response;
+  const fetch2 = options.tre ? miniflare.fetch : (await import("@miniflare/web-sockets")).upgradingFetch;
   return async function(miniflareRequest) {
     if (options.proxyPort) {
       try {
         const url = new URL(miniflareRequest.url);
         url.host = `localhost:${options.proxyPort}`;
-        const proxyRequest = new MiniflareRequest2(url, miniflareRequest);
+        const proxyRequest = new Request(url, miniflareRequest);
         if (proxyRequest.headers.get("Upgrade") === "websocket") {
           proxyRequest.headers.delete("Sec-WebSocket-Accept");
           proxyRequest.headers.delete("Sec-WebSocket-Key");
         }
-        return await miniflareFetch2(proxyRequest);
+        return await fetch2(proxyRequest);
       } catch (thrown) {
         options.log.error(new Error(`Could not proxy request: ${thrown}`));
-        return new MiniflareResponse2(
-          `[wrangler] Could not proxy request: ${thrown}`,
-          {
-            status: 502
-          }
-        );
+        return new Response2(`[wrangler] Could not proxy request: ${thrown}`, {
+          status: 502
+        });
       }
     } else {
       try {
         return await assetsFetch(miniflareRequest);
       } catch (thrown) {
         options.log.error(new Error(`Could not serve static asset: ${thrown}`));
-        return new MiniflareResponse2(
+        return new Response2(
           `[wrangler] Could not serve static asset: ${thrown}`,
           { status: 502 }
         );
@@ -6028,8 +6065,14 @@ async function generateASSETSBinding(options) {
     }
   };
 }
-async function generateAssetsFetch(directory, log) {
-  await Promise.resolve().then(() => (init_miniflare(), miniflare_exports));
+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 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));
   const headersFile = join(directory, "_headers");
   const redirectsFile = join(directory, "_redirects");
@@ -6123,7 +6166,7 @@ async function generateAssetsFetch(directory, log) {
     });
   };
   return async (input, init) => {
-    const request = new MiniflareRequest2(input, init);
+    const request = new Request(input, init);
     return await generateResponse(request);
   };
 }
@@ -6229,7 +6272,8 @@ async function main() {
       const options = {
         log: config.log,
         proxyPort: opts.proxyPort,
-        directory: opts.directory
+        directory: opts.directory,
+        tre: false
       };
       config.serviceBindings = {
         ...config.serviceBindings,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.5.0",
+	"version": "2.6.0",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -119,7 +119,7 @@
 		"@databases/sql": "^3.2.0",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
-		"@miniflare/tre": "^3.0.0-next.7",
+		"@miniflare/tre": "^3.0.0-next.8",
 		"@types/better-sqlite3": "^7.6.0",
 		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",
@@ -162,7 +162,7 @@
 		"jest-websocket-mock": "^2.3.0",
 		"mime": "^3.0.0",
 		"minimatch": "^5.1.0",
-		"msw": "^0.47.1",
+		"msw": "^0.49.1",
 		"npx-import": "^1.1.3",
 		"open": "^8.4.0",
 		"p-queue": "^7.2.0",

package/src/__tests__/configuration.test.ts

@@ -55,6 +55,7 @@ describe("normalizeAndValidateConfig()", () => {
 			},
 			r2_buckets: [],
 			services: [],
+			analytics_engine_datasets: [],
 			route: undefined,
 			routes: undefined,
 			rules: [],
@@ -915,6 +916,15 @@ describe("normalizeAndValidateConfig()", () => {
 						environment: "SERVICE_BINDING_ENVIRONMENT_1",
 					},
 				],
+				analytics_engine_datasets: [
+					{
+						binding: "AE_BINDING_1",
+						dataset: "DATASET_1",
+					},
+					{
+						binding: "AE_BINDING_2",
+					},
+				],
 				unsafe: {
 					bindings: [
 						{ name: "UNSAFE_BINDING_1", type: "UNSAFE_TYPE_1" },
@@ -2028,6 +2038,92 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
+		describe("[analytics_engine_datasets]", () => {
+			it("should error if analytics_engine_datasets is an object", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ analytics_engine_datasets: {} } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"analytics_engine_datasets\\" should be an array but got {}."
+		              `);
+			});
+
+			it("should error if analytics_engine_datasets is a string", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ analytics_engine_datasets: "BAD" } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"analytics_engine_datasets\\" should be an array but got \\"BAD\\"."
+		              `);
+			});
+
+			it("should error if analytics_engine_datasets is a number", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ analytics_engine_datasets: 999 } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"analytics_engine_datasets\\" should be an array but got 999."
+		              `);
+			});
+
+			it("should error if analytics_engine_datasets is null", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ analytics_engine_datasets: null } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"analytics_engine_datasets\\" should be an array but got null."
+		              `);
+			});
+
+			it("should error if analytics_engine_datasets.bindings are not valid", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						analytics_engine_datasets: [
+							{},
+							{ binding: 2333, dataset: 2444 },
+							{
+								binding: "AE_BINDING_2",
+								dataset: 2555,
+							},
+							{ binding: "AE_BINDING_1", dataset: "" },
+						],
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+			            - \\"analytics_engine_datasets[0]\\" bindings should have a string \\"binding\\" field but got {}.
+			            - \\"analytics_engine_datasets[1]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":2333,\\"dataset\\":2444}.
+			            - \\"analytics_engine_datasets[1]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":2333,\\"dataset\\":2444}.
+			            - \\"analytics_engine_datasets[2]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":\\"AE_BINDING_2\\",\\"dataset\\":2555}.
+			            - \\"analytics_engine_datasets[3]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":\\"AE_BINDING_1\\",\\"dataset\\":\\"\\"}."
+		        `);
+			});
+		});
+
 		describe("[dispatch_namespaces]", () => {
 			it("should log an experimental warning when dispatch_namespaces is used", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
@@ -2697,6 +2793,8 @@ describe("normalizeAndValidateConfig()", () => {
 			};
 			const kv_namespaces: RawConfig["kv_namespaces"] = [];
 			const r2_buckets: RawConfig["r2_buckets"] = [];
+			const analytics_engine_datasets: RawConfig["analytics_engine_datasets"] =
+				[];
 			const unsafe: RawConfig["unsafe"] = { bindings: [] };
 			const rawConfig: RawConfig = {
 				define,
@@ -2704,6 +2802,7 @@ describe("normalizeAndValidateConfig()", () => {
 				durable_objects,
 				kv_namespaces,
 				r2_buckets,
+				analytics_engine_datasets,
 				unsafe,
 				env: {
 					ENV1: {},
@@ -2723,6 +2822,7 @@ describe("normalizeAndValidateConfig()", () => {
 					durable_objects,
 					kv_namespaces,
 					r2_buckets,
+					analytics_engine_datasets,
 					unsafe,
 				})
 			);
@@ -2746,6 +2846,9 @@ describe("normalizeAndValidateConfig()", () => {
 			    - \\"r2_buckets\\" exists at the top level, but not on \\"env.ENV1\\".
 			      This is not what you probably want, since \\"r2_buckets\\" is not inherited by environments.
 			      Please add \\"r2_buckets\\" to \\"env.ENV1\\".
+			    - \\"analytics_engine_datasets\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"analytics_engine_datasets\\" is not inherited by environments.
+			      Please add \\"analytics_engine_datasets\\" to \\"env.ENV1\\".
 			    - \\"unsafe\\" exists at the top level, but not on \\"env.ENV1\\".
 			      This is not what you probably want, since \\"unsafe\\" is not inherited by environments.
 			      Please add \\"unsafe\\" to \\"env.ENV1\\"."
@@ -3447,6 +3550,114 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
+		describe("[analytics_engine_datasets]", () => {
+			it("should error if analytics_engine_datasets is an object", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { analytics_engine_datasets: {} } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - The field \\"env.ENV1.analytics_engine_datasets\\" should be an array but got {}."
+		        `);
+			});
+
+			it("should error if analytics_engine_datasets is a string", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { analytics_engine_datasets: "BAD" } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - The field \\"env.ENV1.analytics_engine_datasets\\" should be an array but got \\"BAD\\"."
+		        `);
+			});
+
+			it("should error if analytics_engine_datasets is a number", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { analytics_engine_datasets: 999 } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - The field \\"env.ENV1.analytics_engine_datasets\\" should be an array but got 999."
+		        `);
+			});
+
+			it("should error if analytics_engine_datasets is null", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { analytics_engine_datasets: null } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - The field \\"env.ENV1.analytics_engine_datasets\\" should be an array but got null."
+		        `);
+			});
+
+			it("should error if analytics_engine_datasets.bindings are not valid", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: {
+							ENV1: {
+								analytics_engine_datasets: [
+									{},
+									{ binding: 2333, dataset: 2444 },
+									{
+										binding: "AE_BINDING_2",
+										dataset: 2555,
+									},
+									{ binding: "AE_BINDING_1", dataset: "" },
+								],
+							},
+						},
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"env.ENV1.analytics_engine_datasets[0]\\" bindings should have a string \\"binding\\" field but got {}.
+			              - \\"env.ENV1.analytics_engine_datasets[1]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":2333,\\"dataset\\":2444}.
+			              - \\"env.ENV1.analytics_engine_datasets[1]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":2333,\\"dataset\\":2444}.
+			              - \\"env.ENV1.analytics_engine_datasets[2]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":\\"AE_BINDING_2\\",\\"dataset\\":2555}.
+			              - \\"env.ENV1.analytics_engine_datasets[3]\\" bindings should, optionally, have a string \\"dataset\\" field but got {\\"binding\\":\\"AE_BINDING_1\\",\\"dataset\\":\\"\\"}."
+		        `);
+			});
+		});
+
 		describe("[unsafe.bindings]", () => {
 			it("should error if unsafe is an array", () => {
 				const { diagnostics } = normalizeAndValidateConfig(

package/src/__tests__/dev.test.tsx

@@ -3,6 +3,7 @@ import getPort from "get-port";
 import patchConsole from "patch-console";
 import dedent from "ts-dedent";
 import Dev from "../dev/dev";
+import { CI } from "../is-ci";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
@@ -35,6 +36,22 @@ describe("wrangler dev", () => {
 		unsetAllMocks();
 	});
 
+	describe("authorization", () => {
+		mockApiToken({ apiToken: null });
+		const isCISpy = jest.spyOn(CI, "isCI").mockReturnValue(true);
+
+		it("should kick you to the login flow when running wrangler dev in remote mode without authorization", async () => {
+			fs.writeFileSync("index.js", `export default {};`);
+			await expect(
+				runWrangler("dev index.js")
+			).rejects.toThrowErrorMatchingInlineSnapshot(
+				`"You must be logged in to use wrangler dev in remote mode. Try logging in, or run wrangler dev --local."`
+			);
+		});
+
+		isCISpy.mockClear();
+	});
+
 	describe("compatibility-date", () => {
 		it("should not warn if there is no wrangler.toml and no compatibility-date specified", async () => {
 			fs.writeFileSync("index.js", `export default {};`);

package/src/__tests__/init.test.ts

@@ -529,7 +529,7 @@ describe("init", () => {
 			        }
 		      `);
 			expect((await execa("git", ["branch", "--show-current"])).stdout).toEqual(
-				"main"
+				getDefaultBranchName()
 			);
 		});
 
@@ -598,7 +598,7 @@ describe("init", () => {
 			"should not offer to initialize a git repo if git is not installed"
 		);
 
-		it("should initialize git repo with `main` default branch", async () => {
+		it("should initialize git repo with the user's default branch", async () => {
 			mockConfirm(
 				{
 					text: "Would you like to use git to manage this Worker?",
@@ -621,7 +621,7 @@ describe("init", () => {
 		      `);
 
 			expect(execaSync("git", ["symbolic-ref", "HEAD"]).stdout).toEqual(
-				"refs/heads/main"
+				`refs/heads/${getDefaultBranchName()}`
 			);
 		});
 	});
@@ -2810,6 +2810,21 @@ describe("init", () => {
 	});
 });
 
+function getDefaultBranchName() {
+	try {
+		const { stdout: defaultBranchName } = execaSync("git", [
+			"config",
+			"--get",
+			"init.defaultBranch",
+		]);
+
+		return defaultBranchName;
+	} catch {
+		// ew
+		return "master";
+	}
+}
+
 /**
  * Change the current working directory, ensuring that this exists.
  */