wrangler 2.0.25 → 2.0.26

package/src/pages/index.tsx

@@ -3,6 +3,7 @@
 import * as Build from "./build";
 import * as Deployments from "./deployments";
 import * as Dev from "./dev";
+import * as Functions from "./functions";
 import * as Projects from "./projects";
 import * as Publish from "./publish";
 import * as Upload from "./upload";
@@ -19,66 +20,75 @@ process.on("SIGTERM", () => {
 });
 
 export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
-	return yargs
-		.command(
-			"dev [directory] [-- command..]",
-			"🧑‍💻 Develop your full-stack Pages application locally",
-			Dev.Options,
-			Dev.Handler
-		)
-		.command("functions", false, (yargs) =>
-			// we hide this command from help output because
-			// it's not meant to be used directly right now
-			{
-				return yargs.command(
-					"build [directory]",
-					"Compile a folder of Cloudflare Pages Functions into a single Worker",
-					Build.Options,
-					Build.Handler
-				);
-			}
-		)
-		.command("project", "⚡️ Interact with your Pages projects", (yargs) =>
-			yargs
-				.command(
-					"list",
-					"List your Cloudflare Pages projects",
-					Projects.ListOptions,
-					Projects.ListHandler
-				)
-				.command(
-					"create [project-name]",
-					"Create a new Cloudflare Pages project",
-					Projects.CreateOptions,
-					Projects.CreateHandler
-				)
-				.command("upload [directory]", false, Upload.Options, Upload.Handler)
-				.epilogue(pagesBetaWarning)
-		)
-		.command(
-			"deployment",
-			"🚀 Interact with the deployments of a project",
-			(yargs) =>
+	return (
+		yargs
+			.command(
+				"dev [directory] [-- command..]",
+				"🧑‍💻 Develop your full-stack Pages application locally",
+				Dev.Options,
+				Dev.Handler
+			)
+			/**
+			 * `wrangler pages functions` is meant for internal use only for now,
+			 * so let's hide this command from the help output
+			 */
+			.command("functions", false, (yargs) =>
+				yargs
+					.command(
+						"build [directory]",
+						"Compile a folder of Cloudflare Pages Functions into a single Worker",
+						Build.Options,
+						Build.Handler
+					)
+					.command(
+						"optimize-routes [routesPath] [outputRoutesPath]",
+						"Consolidate and optimize the route paths declared in _routes.json",
+						Functions.OptimizeRoutesOptions,
+						Functions.OptimizeRoutesHandler
+					)
+			)
+			.command("project", "⚡️ Interact with your Pages projects", (yargs) =>
 				yargs
 					.command(
 						"list",
-						"List deployments in your Cloudflare Pages project",
-						Deployments.ListOptions,
-						Deployments.ListHandler
+						"List your Cloudflare Pages projects",
+						Projects.ListOptions,
+						Projects.ListHandler
 					)
 					.command(
-						"create [directory]",
-						"🆙 Publish a directory of static assets as a Pages deployment",
-						Publish.Options,
-						Publish.Handler
+						"create [project-name]",
+						"Create a new Cloudflare Pages project",
+						Projects.CreateOptions,
+						Projects.CreateHandler
 					)
+					.command("upload [directory]", false, Upload.Options, Upload.Handler)
 					.epilogue(pagesBetaWarning)
-		)
-		.command(
-			"publish [directory]",
-			"🆙 Publish a directory of static assets as a Pages deployment",
-			Publish.Options,
-			Publish.Handler
-		)
-		.epilogue(pagesBetaWarning);
+			)
+			.command(
+				"deployment",
+				"🚀 Interact with the deployments of a project",
+				(yargs) =>
+					yargs
+						.command(
+							"list",
+							"List deployments in your Cloudflare Pages project",
+							Deployments.ListOptions,
+							Deployments.ListHandler
+						)
+						.command(
+							"create [directory]",
+							"🆙 Publish a directory of static assets as a Pages deployment",
+							Publish.Options,
+							Publish.Handler
+						)
+						.epilogue(pagesBetaWarning)
+			)
+			.command(
+				"publish [directory]",
+				"🆙 Publish a directory of static assets as a Pages deployment",
+				Publish.Options,
+				Publish.Handler
+			)
+			.epilogue(pagesBetaWarning)
+	);
 };

package/src/pages/publish.tsx

@@ -16,6 +16,7 @@ import * as metrics from "../metrics";
 import { requireAuth } from "../user";
 import { buildFunctions } from "./build";
 import { PAGES_CONFIG_CACHE_FILENAME } from "./constants";
+import { FunctionsNoRoutesError, getFunctionsNoRoutesWarning } from "./errors";
 import {
 	isRoutesJSONSpec,
 	optimizeRoutesJSONSpec,
@@ -256,18 +257,24 @@ export const Handler = async ({
 	const routesOutputPath = join(tmpdir(), `_routes-${Math.random()}.json`);
 	if (existsSync(functionsDirectory)) {
 		const outfile = join(tmpdir(), `./functionsWorker-${Math.random()}.js`);
-
-		await new Promise((resolve) =>
-			buildFunctions({
+		try {
+			await buildFunctions({
 				outfile,
 				functionsDirectory,
-				onEnd: () => resolve(null),
+				onEnd: () => {},
 				buildOutputDirectory: dirname(outfile),
 				routesOutputPath,
-			})
-		);
-
-		builtFunctions = readFileSync(outfile, "utf-8");
+			});
+			builtFunctions = readFileSync(outfile, "utf-8");
+		} catch (e) {
+			if (e instanceof FunctionsNoRoutesError) {
+				logger.warn(
+					getFunctionsNoRoutesWarning(functionsDirectory, "skipping")
+				);
+			} else {
+				throw e;
+			}
+		}
 	}
 
 	const manifest = await upload({ directory, accountId, projectName });
@@ -305,32 +312,34 @@ export const Handler = async ({
 		_redirects = readFileSync(join(directory, "_redirects"), "utf-8");
 	} catch {}
 
-	try {
-		_routes = readFileSync(routesOutputPath, "utf-8");
-	} catch {}
-
 	try {
 		_workerJS = readFileSync(join(directory, "_worker.js"), "utf-8");
 	} catch {}
 
 	if (_headers) {
 		formData.append("_headers", new File([_headers], "_headers"));
+		logger.log(`✨ Uploading _headers`);
 	}
 
 	if (_redirects) {
 		formData.append("_redirects", new File([_redirects], "_redirects"));
-	}
-
-	if (_routes) {
-		formData.append("_routes.json", new File([_routes], "_routes.json"));
+		logger.log(`✨ Uploading _redirects`);
 	}
 
 	if (builtFunctions) {
 		formData.append("_worker.js", new File([builtFunctions], "_worker.js"));
+		logger.log(`✨ Uploading Functions`);
+		try {
+			_routes = readFileSync(routesOutputPath, "utf-8");
+			if (_routes) {
+				formData.append("_routes.json", new File([_routes], "_routes.json"));
+			}
+		} catch {}
 	} else if (_workerJS) {
 		// Advanced Mode
 		// https://developers.cloudflare.com/pages/platform/functions/#advanced-mode
 		formData.append("_worker.js", new File([_workerJS], "_worker.js"));
+		logger.log(`✨ Uploading _worker.js`);
 
 		try {
 			// In advanced mode, developers can specify a custom _routes.json
@@ -348,6 +357,8 @@ export const Handler = async ({
 			}
 
 			_routes = JSON.stringify(optimizeRoutesJSONSpec(advancedModeRoutes));
+			formData.append("_routes.json", new File([_routes], "_routes.json"));
+			logger.log(`✨ Uploading _routes.json`);
 
 			logger.warn(
 				`🚨 _routes.json is an experimental feature and is subject to change. Don't use unless you really must!`

package/src/tail/filters.ts

@@ -58,13 +58,14 @@ type OutcomeFilter = {
 
 /**
  * There are five possible outcomes we can get, three of which
- * (exception, exceededCpu, and unknown) are considered errors
+ * (exception, exceededCpu, exceededMemory, and unknown) are considered errors
  */
 export type Outcome =
 	| "ok"
 	| "canceled"
 	| "exception"
 	| "exceededCpu"
+	| "exceededMemory"
 	| "unknown";
 
 /**
@@ -210,6 +211,7 @@ function parseOutcome(
 			case "error":
 				outcomes.add("exception");
 				outcomes.add("exceededCpu");
+				outcomes.add("exceededMemory");
 				outcomes.add("unknown");
 				break;
 

package/src/tail/printing.ts

@@ -96,6 +96,8 @@ function prettifyOutcome(outcome: Outcome): string {
 			return "Canceled";
 		case "exceededCpu":
 			return "Exceeded CPU Limit";
+		case "exceededMemory":
+			return "Exceeded Memory Limit";
 		case "exception":
 			return "Exception Thrown";
 		case "unknown":

package/templates/pages-template-plugin.ts

@@ -1,5 +1,8 @@
 import { match } from "path-to-regexp";
 
+//note: this explicitly does not include the * character, as pages requires this
+const escapeRegex = /[.+?^${}()|[\]\\]/g;
+
 type HTTPMethod =
 	| "HEAD"
 	| "OPTIONS"
@@ -67,8 +70,13 @@ function* executeRequest(request: Request, relativePathname: string) {
 			continue;
 		}
 
-		const routeMatcher = match(route.routePath, { end: false });
-		const mountMatcher = match(route.mountPath, { end: false });
+		// replaces with "\\$&", this prepends a backslash to the matched string, e.g. "[" becomes "\["
+		const routeMatcher = match(route.routePath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
+		const mountMatcher = match(route.mountPath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
 		const matchResult = routeMatcher(relativePathname);
 		const mountMatchResult = mountMatcher(relativePathname);
 		if (matchResult && mountMatchResult) {
@@ -88,8 +96,12 @@ function* executeRequest(request: Request, relativePathname: string) {
 			continue;
 		}
 
-		const routeMatcher = match(route.routePath, { end: true });
-		const mountMatcher = match(route.mountPath, { end: false });
+		const routeMatcher = match(route.routePath.replace(escapeRegex, "\\$&"), {
+			end: true,
+		});
+		const mountMatcher = match(route.mountPath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
 		const matchResult = routeMatcher(relativePathname);
 		const mountMatchResult = mountMatcher(relativePathname);
 		if (matchResult && mountMatchResult && route.modules.length) {

package/templates/pages-template-worker.ts

@@ -1,5 +1,8 @@
 import { match } from "path-to-regexp";
 
+//note: this explicitly does not include the * character, as pages requires this
+const escapeRegex = /[.+?^${}()|[\]\\]/g;
+
 type HTTPMethod =
 	| "HEAD"
 	| "OPTIONS"
@@ -61,8 +64,13 @@ function* executeRequest(request: Request) {
 			continue;
 		}
 
-		const routeMatcher = match(route.routePath, { end: false });
-		const mountMatcher = match(route.mountPath, { end: false });
+		// replaces with "\\$&", this prepends a backslash to the matched string, e.g. "[" becomes "\["
+		const routeMatcher = match(route.routePath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
+		const mountMatcher = match(route.mountPath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
 		const matchResult = routeMatcher(requestPath);
 		const mountMatchResult = mountMatcher(requestPath);
 		if (matchResult && mountMatchResult) {
@@ -81,9 +89,12 @@ function* executeRequest(request: Request) {
 		if (route.method && route.method !== request.method) {
 			continue;
 		}
-
-		const routeMatcher = match(route.routePath, { end: true });
-		const mountMatcher = match(route.mountPath, { end: false });
+		const routeMatcher = match(route.routePath.replace(escapeRegex, "\\$&"), {
+			end: true,
+		});
+		const mountMatcher = match(route.mountPath.replace(escapeRegex, "\\$&"), {
+			end: false,
+		});
 		const matchResult = routeMatcher(requestPath);
 		const mountMatchResult = mountMatcher(requestPath);
 		if (matchResult && mountMatchResult && route.modules.length) {

package/templates/service-bindings-module-facade.js

@@ -16,20 +16,23 @@ export default {
 			if (details) {
 				facadeEnv[name] = {
 					async fetch(...reqArgs) {
+						const reqFromArgs = new Request(...reqArgs);
 						if (details.headers) {
-							const req = new Request(...reqArgs);
 							for (const [key, value] of Object.entries(details.headers)) {
 								// In remote mode, you need to add a couple of headers
 								// to make sure it's talking to the 'dev' preview session
 								// (much like wrangler dev already does via proxy.ts)
-								req.headers.set(key, value);
+								reqFromArgs.headers.set(key, value);
 							}
-							return env[name].fetch(req);
+							return env[name].fetch(reqFromArgs);
 						}
-						const url = `${details.protocol}://${details.host}${
-							details.port ? `:${details.port}` : ""
-						}`;
-						const request = new Request(url, ...reqArgs);
+
+						const url = new URL(reqFromArgs.url);
+						url.protocol = details.protocol;
+						url.host = details.host;
+						if (details.port !== undefined) url.port = details.port;
+
+						const request = new Request(url.toString(), reqFromArgs);
 						return fetch(request);
 					},
 				};

package/templates/service-bindings-sw-facade.js

@@ -7,20 +7,23 @@ for (const [name, details] of Object.entries(Workers)) {
 	if (details) {
 		globalThis[name] = {
 			async fetch(...reqArgs) {
+				const reqFromArgs = new Request(...reqArgs);
 				if (details.headers) {
-					const req = new Request(...reqArgs);
 					for (const [key, value] of Object.entries(details.headers)) {
 						// In remote mode, you need to add a couple of headers
 						// to make sure it's talking to the 'dev' preview session
 						// (much like wrangler dev already does via proxy.ts)
-						req.headers.set(key, value);
+						reqFromArgs.headers.set(key, value);
 					}
-					return env[name].fetch(req);
+					return env[name].fetch(reqFromArgs);
 				}
-				const url = `${details.protocol}://${details.host}${
-					details.port ? `:${details.port}` : ""
-				}`;
-				const request = new Request(url, ...reqArgs);
+
+				const url = new URL(reqFromArgs.url);
+				url.protocol = details.protocol;
+				url.host = details.host;
+				if (details.port !== undefined) url.port = details.port;
+
+				const request = new Request(url.toString(), reqFromArgs);
 				return fetch(request);
 			},
 		};

package/wrangler-dist/cli.d.ts

@@ -41,6 +41,7 @@ declare interface DevOptions {
     siteExclude?: string[];
     nodeCompat?: boolean;
     compatibilityDate?: string;
+    compatibilityFlags?: string[];
     experimentalEnableLocalPersistence?: boolean;
     liveReload?: boolean;
     watch?: boolean;