wrangler 2.16.0 → 2.18.0

package/miniflare-dist/index.mjs

@@ -459,31 +459,35 @@ 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, void 0, {
-            preventLeadingDoubleSlash: false
-          });
-        case 303:
-          return new SeeOtherResponse(location, void 0, {
-            preventLeadingDoubleSlash: false
-          });
-        case 307:
-          return new TemporaryRedirectResponse(location, void 0, {
-            preventLeadingDoubleSlash: false
-          });
-        case 308:
-          return new PermanentRedirectResponse(location, void 0, {
-            preventLeadingDoubleSlash: false
-          });
-        case 302:
-        default:
-          return new FoundResponse(location, void 0, {
-            preventLeadingDoubleSlash: false
-          });
+      if (match.status === 200) {
+        pathname = new URL(match.to, request.url).pathname;
+      } else {
+        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, void 0, {
+              preventLeadingDoubleSlash: false
+            });
+          case 303:
+            return new SeeOtherResponse(location, void 0, {
+              preventLeadingDoubleSlash: false
+            });
+          case 307:
+            return new TemporaryRedirectResponse(location, void 0, {
+              preventLeadingDoubleSlash: false
+            });
+          case 308:
+            return new PermanentRedirectResponse(location, void 0, {
+              preventLeadingDoubleSlash: false
+            });
+          case 302:
+          default:
+            return new FoundResponse(location, void 0, {
+              preventLeadingDoubleSlash: false
+            });
+        }
       }
     }
     if (!request.method.match(/^(get|head)$/i)) {
@@ -5680,7 +5684,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;
@@ -5851,6 +5855,10 @@ var validateUrl = (token, onlyRelative = false, includeSearch = false, includeHa
     onlyRelative ? "URLs should begin with a forward-slash." : 'URLs should either be relative (e.g. begin with a forward-slash), or use HTTPS (e.g. begin with "https://").'
   ];
 };
+function urlHasHost(token) {
+  const host = URL_REGEX.exec(token);
+  return Boolean(host && host.groups && host.groups.host);
+}
 
 // ../pages-shared/metadata-generator/parseHeaders.ts
 var LINE_IS_PROBABLY_A_PATH = new RegExp(/^([^\s]+:\/\/|^\/)/);
@@ -6059,7 +6067,15 @@ 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;
+    }
+    if (/\/\*?$/.test(from) && /\/index(.html)?$/.test(to) && !urlHasHost(to)) {
+      invalid.push({
+        line,
+        lineNumber: i + 1,
+        message: "Infinite loop detected in this rule and has been ignored. This will cause a redirect to strip `.html` or `/index` and end up triggering this rule again. Please fix or remove this rule to silence this warning."
       });
       continue;
     }
@@ -6072,6 +6088,16 @@ function parseRedirects(input) {
       continue;
     }
     seen_paths.add(from);
+    if (status === 200) {
+      if (urlHasHost(to)) {
+        invalid.push({
+          line,
+          lineNumber: i + 1,
+          message: `Proxy (200) redirects can only point to relative paths. Got ${to}`
+        });
+        continue;
+      }
+    }
     rules.push({ from, to, status, lineNumber: i + 1 });
   }
   return {

package/package.json

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

package/src/__tests__/index.test.ts

@@ -32,7 +32,7 @@ describe("wrangler", () => {
 			"wrangler
 
 			Commands:
-			  wrangler docs [command]              📚 Open wrangler's docs in your browser
+			  wrangler docs [command..]            📚 Open wrangler's docs in your browser
 			  wrangler init [name]                 📥 Initialize a basic Worker project, including a wrangler.toml file
 			  wrangler generate [name] [template]  ✨ Generate a new Worker project from an existing Worker template. See https://github.com/cloudflare/templates
 			  wrangler dev [script]                👂 Start a local server for developing your worker
@@ -85,7 +85,7 @@ describe("wrangler", () => {
 			wrangler
 
 			Commands:
-			  wrangler docs [command]              📚 Open wrangler's docs in your browser
+			  wrangler docs [command..]            📚 Open wrangler's docs in your browser
 			  wrangler init [name]                 📥 Initialize a basic Worker project, including a wrangler.toml file
 			  wrangler generate [name] [template]  ✨ Generate a new Worker project from an existing Worker template. See https://github.com/cloudflare/templates
 			  wrangler dev [script]                👂 Start a local server for developing your worker

package/src/__tests__/mtls-certificates.test.ts

@@ -362,7 +362,7 @@ describe("wrangler", () => {
 				"wrangler
 
 				Commands:
-				  wrangler docs [command]              📚 Open wrangler's docs in your browser
+				  wrangler docs [command..]            📚 Open wrangler's docs in your browser
 				  wrangler init [name]                 📥 Initialize a basic Worker project, including a wrangler.toml file
 				  wrangler generate [name] [template]  ✨ Generate a new Worker project from an existing Worker template. See https://github.com/cloudflare/templates
 				  wrangler dev [script]                👂 Start a local server for developing your worker