wrangler 2.1.4 → 2.1.6

package/src/pages/functions.tsx

@@ -2,11 +2,9 @@ import { existsSync, lstatSync, readFileSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { FatalError } from "../errors";
 import { logger } from "../logger";
-import { isInPagesCI, ROUTES_SPEC_VERSION } from "./constants";
-import {
-	isRoutesJSONSpec,
-	optimizeRoutesJSONSpec,
-} from "./functions/routes-transformation";
+import { isInPagesCI } from "./constants";
+import { optimizeRoutesJSONSpec } from "./functions/routes-transformation";
+import { validateRoutes } from "./functions/routes-validation";
 import { pagesBetaWarning } from "./utils";
 import type { YargsOptionsToInterface } from "./types";
 import type { Argv } from "yargs";
@@ -68,19 +66,7 @@ export async function OptimizeRoutesHandler({
 
 	const routes = JSON.parse(routesFileContents);
 
-	if (!isRoutesJSONSpec(routes)) {
-		throw new FatalError(
-			`
-      Invalid _routes.json file found at: ${routesPath}. Please make sure the JSON object has the following format:
-      {
-        version: ${ROUTES_SPEC_VERSION};
-        include: string[];
-        exclude: string[];
-      }
-      `,
-			1
-		);
-	}
+	validateRoutes(routes, routesPath);
 
 	const optimizedRoutes = optimizeRoutesJSONSpec(routes);
 	const optimizedRoutesContents = JSON.stringify(optimizedRoutes);

package/src/pages/publish.tsx

@@ -15,9 +15,9 @@ import { logger } from "../logger";
 import * as metrics from "../metrics";
 import { requireAuth } from "../user";
 import { buildFunctions } from "./build";
-import { PAGES_CONFIG_CACHE_FILENAME, ROUTES_SPEC_VERSION } from "./constants";
+import { PAGES_CONFIG_CACHE_FILENAME } from "./constants";
 import { FunctionsNoRoutesError, getFunctionsNoRoutesWarning } from "./errors";
-import { isRoutesJSONSpec } from "./functions/routes-transformation";
+import { validateRoutes } from "./functions/routes-validation";
 import { listProjects } from "./projects";
 import { upload } from "./upload";
 import { pagesBetaWarning } from "./utils";
@@ -343,7 +343,8 @@ export const Handler = async ({
 		if (_routesCustom) {
 			// user provided a custom _routes.json file
 			try {
-				validateRoutesFile(_routesCustom, join(directory, "_routes.json"));
+				const routesCustomJSON = JSON.parse(_routesCustom);
+				validateRoutes(routesCustomJSON, join(directory, "_routes.json"));
 
 				formData.append(
 					"_routes.json",
@@ -380,7 +381,8 @@ export const Handler = async ({
 		if (_routesCustom) {
 			// user provided a custom _routes.json file
 			try {
-				validateRoutesFile(_routesCustom, join(directory, "_routes.json"));
+				const routesCustomJSON = JSON.parse(_routesCustom);
+				validateRoutes(routesCustomJSON, join(directory, "_routes.json"));
 
 				formData.append(
 					"_routes.json",
@@ -415,21 +417,3 @@ export const Handler = async ({
 	);
 	await metrics.sendMetricsEvent("create pages deployment");
 };
-
-function validateRoutesFile(_routes: string, routesPath: string) {
-	const routes = JSON.parse(_routes);
-
-	if (!isRoutesJSONSpec(routes)) {
-		throw new FatalError(
-			`Invalid _routes.json file found at: ${routesPath}. Please make sure the JSON object has the following format:
-      {
-        version: ${ROUTES_SPEC_VERSION};
-        include: string[];
-        exclude: string[];
-      }
-and that at least one include rule is provided.
-      `,
-			1
-		);
-	}
-}

package/src/publish.ts

@@ -50,6 +50,7 @@ type Props = {
 	outDir: string | undefined;
 	dryRun: boolean | undefined;
 	noBundle: boolean | undefined;
+	keepVars: boolean | undefined;
 };
 
 type RouteObject = ZoneIdRoute | ZoneNameRoute | CustomDomainRoute;
@@ -288,6 +289,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 
 	const jsxFactory = props.jsxFactory || config.jsx_factory;
 	const jsxFragment = props.jsxFragment || config.jsx_fragment;
+	const keepVars = props.keepVars ?? config.keep_vars;
 
 	const minify = props.minify ?? config.minify;
 
@@ -502,7 +504,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 			compatibility_flags:
 				props.compatibilityFlags ?? config.compatibility_flags,
 			usage_model: config.usage_model,
-			keep_bindings: true,
+			keepVars,
 		};
 
 		// As this is not deterministic for testing, we detect if in a jest environment and run asynchronously

package/src/worker.ts

@@ -191,7 +191,7 @@ export interface CfWorkerInit {
 	compatibility_date: string | undefined;
 	compatibility_flags: string[] | undefined;
 	usage_model: "bundled" | "unbound" | undefined;
-	keep_bindings: boolean | undefined;
+	keepVars: boolean | undefined;
 }
 
 export interface CfWorkerContext {

package/templates/middleware/middleware-scheduled.ts

@@ -6,7 +6,8 @@ const scheduled: Middleware = async (request, env, _ctx, middlewareCtx) => {
 	if (url.pathname === "/__scheduled") {
 		const cron = url.searchParams.get("cron") ?? "";
 		await middlewareCtx.dispatch("scheduled", { cron });
-		return new Response("OK");
+
+		return new Response("Ran scheduled event");
 	}
 	return middlewareCtx.next(request, env);
 };

package/templates/pages-dev-pipeline.ts

@@ -0,0 +1,35 @@
+// @ts-ignore entry point will get replaced
+import worker from "__ENTRY_POINT__";
+// @ts-ignore entry point will get replaced
+export * from "__ENTRY_POINT__";
+
+const transformToRegex = (filter: string) => {
+	return filter.replace("*", ".*");
+};
+
+const routes = {
+	// @ts-ignore routes are injected
+	include: __ROUTES__.include.map(transformToRegex),
+	// @ts-ignore routes are injected
+	exclude: __ROUTES__.exclude.map(transformToRegex) || [],
+};
+
+export default {
+	fetch(request, env, context) {
+		const { pathname } = new URL(request.url);
+
+		for (const exclude of routes.exclude) {
+			if (pathname.match(exclude)) {
+				return env.ASSETS.fetch(request);
+			}
+		}
+
+		for (const include of routes.include) {
+			if (pathname.match(include)) {
+				return worker.fetch(request, env, context);
+			}
+		}
+
+		return env.ASSETS.fetch(request);
+	},
+};

package/wrangler-dist/cli.d.ts

@@ -43,6 +43,7 @@ declare interface DevOptions {
     env?: string;
     ip?: string;
     port?: number;
+    noBundle?: boolean;
     inspectorPort?: number;
     localProtocol?: "http" | "https";
     assets?: string;
@@ -83,6 +84,7 @@ declare interface DevOptions {
     enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
     _?: (string | number)[];
     $0?: string;
+    testScheduled?: boolean;
 }
 
 declare interface EnablePagesAssetsServiceBindingOptions {