wrangler 2.10.0 → 2.11.0

package/miniflare-dist/index.mjs

@@ -441,7 +441,11 @@ async function generateHandler({
   async function generateResponse() {
     const match = staticRedirectsMatcher() || generateRedirectsMatcher()({ request })[0];
     if (match) {
-      return getResponseFromMatch(match, url);
+      if (match.status === 200) {
+        pathname = new URL(match.to, request.url).pathname;
+      } else {
+        return getResponseFromMatch(match, url);
+      }
     }
     if (!request.method.match(/^(get|head)$/i)) {
       return new MethodNotAllowedResponse();
@@ -5615,7 +5619,7 @@ import { join } from "node:path";
 var REDIRECTS_VERSION = 1;
 var HEADERS_VERSION = 2;
 var ANALYTICS_VERSION = 1;
-var PERMITTED_STATUS_CODES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+var PERMITTED_STATUS_CODES = /* @__PURE__ */ new Set([200, 301, 302, 303, 307, 308]);
 var HEADER_SEPARATOR = ":";
 var MAX_LINE_LENGTH = 2e3;
 var MAX_HEADER_RULES = 100;
@@ -5994,7 +5998,7 @@ function parseRedirects(input) {
       invalid.push({
         line,
         lineNumber: i + 1,
-        message: `Valid status codes are 301, 302 (default), 303, 307, or 308. Got ${str_status}.`
+        message: `Valid status codes are 200, 301, 302 (default), 303, 307, or 308. Got ${str_status}.`
       });
       continue;
     }
@@ -6007,6 +6011,19 @@ function parseRedirects(input) {
       continue;
     }
     seen_paths.add(from);
+    if (status === 200) {
+      const [proxyTo, error] = validateUrl(to, true, true, true);
+      if (error) {
+        invalid.push({
+          line,
+          lineNumber: i + 1,
+          message: `Proxy (200) redirects can only point to relative paths. Got ${to}`
+        });
+        continue;
+      }
+      rules.push({ from, to: proxyTo, status, lineNumber: i + 1 });
+      continue;
+    }
     rules.push({ from, to, status, lineNumber: i + 1 });
   }
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.10.0",
+	"version": "2.11.0",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -63,7 +63,7 @@
 		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
 		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-		"test": "npm run assert-git-version && jest --silent=false --verbose=true",
+		"test": "npm run assert-git-version && jest --silent=false --verbose=true --forceExit",
 		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
 		"test:ci": "npm run test -- --verbose=true --coverage"
 	},
@@ -100,13 +100,13 @@
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
-		"@miniflare/core": "2.12.0",
-		"@miniflare/d1": "2.12.0",
-		"@miniflare/durable-objects": "2.12.0",
+		"@miniflare/core": "2.12.1",
+		"@miniflare/d1": "2.12.1",
+		"@miniflare/durable-objects": "2.12.1",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.16.3",
-		"miniflare": "2.12.0",
+		"miniflare": "2.12.1",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -118,7 +118,7 @@
 		"@cloudflare/workers-types": "^4.20221111.1",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
-		"@miniflare/tre": "^3.0.0-next.8",
+		"@miniflare/tre": "^3.0.0-next.10",
 		"@types/better-sqlite3": "^7.6.0",
 		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",
@@ -179,7 +179,7 @@
 		"timeago.js": "^4.0.2",
 		"tmp-promise": "^3.0.3",
 		"ts-dedent": "^2.2.0",
-		"undici": "5.11.0",
+		"undici": "5.20.0",
 		"update-check": "^1.5.4",
 		"ws": "^8.5.0",
 		"xdg-app-paths": "^7.3.0",

package/src/__tests__/guess-worker-format.test.ts

@@ -32,6 +32,41 @@ describe("guess worker format", () => {
 		expect(guess).toBe("service-worker");
 	});
 
+	it('should detect a "service-worker" worker using `typeof module`', async () => {
+		await writeFile("./index.ts", "typeof module");
+		const guess = await guessWorkerFormat(
+			path.join(process.cwd(), "./index.ts"),
+			process.cwd(),
+			undefined
+		);
+		expect(guess).toBe("service-worker");
+	});
+
+	it('should detect a "service-worker" worker using imports', async () => {
+		await writeFile(
+			"./dep.ts",
+			`
+			const value = 'thing';
+			export default value;
+			`
+		);
+		await writeFile(
+			"./index.ts",
+			`
+			import value from './dep.ts';
+			addEventListener('fetch', (event) => {
+				event.respondWith(new Response(value));
+			});
+			`
+		);
+		const guess = await guessWorkerFormat(
+			path.join(process.cwd(), "./index.ts"),
+			process.cwd(),
+			undefined
+		);
+		expect(guess).toBe("service-worker");
+	});
+
 	it("should throw an error when the hint doesn't match the guess (modules - service-worker)", async () => {
 		await writeFile("./index.ts", "export default {};");
 		await expect(

package/src/__tests__/publish.test.ts

@@ -6489,9 +6489,22 @@ addEventListener('fetch', event => {});`
 		`);
 		});
 
-		it("should output to target es2020 even if tsconfig says otherwise", async () => {
+		it("should output to target es2022 even if tsconfig says otherwise", async () => {
 			writeWranglerToml();
 			writeWorkerSource();
+			fs.writeFileSync(
+				"./index.js",
+				`
+			import { foo } from "./another";
+			const topLevelAwait = await new Promise((resolve) => setTimeout(resolve, 0));
+
+			export default {
+  			async fetch(request) {
+
+    			return new Response("Hello world!");
+  			},
+			};`
+			);
 			fs.writeFileSync(
 				"tsconfig.json",
 				JSON.stringify({
@@ -6502,8 +6515,14 @@ addEventListener('fetch', event => {});`
 				})
 			);
 			mockSubDomainRequest();
+			/**
+			 * When we compile with es2022, we should preserve the export statement and top level await
+			 * If you attempt to target es2020 top level await will cause a build error
+			 * @error Build failed with 1 error:
+			 * index.js:3:25: ERROR: Top-level await is not available in the configured target environment ("es2020")
+			 */
 			mockUploadWorkerRequest({
-				expectedEntry: "export {", // just check that the export is preserved
+				expectedEntry: "export {", // check that the export is preserved
 			});
 			await runWrangler("publish index.js"); // this would throw if we tried to compile with es5
 			expect(std).toMatchInlineSnapshot(`
@@ -7448,7 +7467,7 @@ function mockLastDeploymentRequest() {
 function mockUploadWorkerRequest(
 	options: {
 		available_on_subdomain?: boolean;
-		expectedEntry?: string;
+		expectedEntry?: string | RegExp;
 		expectedMainModule?: string;
 		expectedType?: "esm" | "sw";
 		expectedBindings?: unknown;