wrangler 2.6.0 → 2.6.2

package/miniflare-dist/index.mjs

@@ -130,41 +130,43 @@ var init_environment_polyfills = __esm({
 
 // ../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/tre";
+__export(miniflare_tre_exports, {
+  default: () => miniflare_tre_default
+});
+var miniflare_tre_default;
 var init_miniflare_tre = __esm({
   "../pages-shared/environment-polyfills/miniflare-tre.ts"() {
     init_environment_polyfills();
-    polyfill({
-      fetch: miniflareFetch,
-      Headers: MiniflareHeaders,
-      Request: MiniflareRequest,
-      Response: MiniflareResponse
-    });
+    miniflare_tre_default = async () => {
+      const mf = await import("@miniflare/tre");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
   }
 });
 
 // ../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";
+__export(miniflare_exports, {
+  default: () => miniflare_default
+});
+var miniflare_default;
 var init_miniflare = __esm({
   "../pages-shared/environment-polyfills/miniflare.ts"() {
     init_environment_polyfills();
-    polyfill({
-      fetch: miniflareFetch2,
-      Headers: MiniflareHeaders2,
-      Request: MiniflareRequest2,
-      Response: MiniflareResponse2
-    });
+    miniflare_default = async () => {
+      const mf = await import("@miniflare/core");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
   }
 });
 
@@ -786,8 +788,8 @@ import {
   Log as MiniflareLog,
   LogLevel as MiniflareLogLevel,
   Miniflare,
-  Request as MiniflareRequest3,
-  Response as MiniflareResponse3
+  Request as MiniflareRequest,
+  Response as MiniflareResponse
 } from "miniflare";
 
 // ../../node_modules/yargs/lib/platform-shims/esm.mjs
@@ -6066,11 +6068,8 @@ async function generateASSETSBinding(options) {
   };
 }
 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 polyfill2 = tre ? (await Promise.resolve().then(() => (init_miniflare_tre(), miniflare_tre_exports))).default : (await Promise.resolve().then(() => (init_miniflare(), miniflare_exports))).default;
+  await polyfill2();
   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));
@@ -6234,12 +6233,12 @@ async function main() {
         namespace.get = (id) => {
           const stub = new DurableObjectStub(factory, id);
           stub.fetch = (...reqArgs) => {
-            const requestFromArgs = new MiniflareRequest3(...reqArgs);
+            const requestFromArgs = new MiniflareRequest(...reqArgs);
             const url = new URL(requestFromArgs.url);
             url.host = host;
             if (port !== void 0)
               url.port = port.toString();
-            const request = new MiniflareRequest3(
+            const request = new MiniflareRequest(
               url.toString(),
               requestFromArgs
             );
@@ -6299,7 +6298,7 @@ async function main() {
 				}`,
         serviceBindings: {
           DO: async (request) => {
-            request = new MiniflareRequest3(request);
+            request = new MiniflareRequest(request);
             const name = request.headers.get("x-miniflare-durable-object-name");
             const idString = request.headers.get(
               "x-miniflare-durable-object-id"
@@ -6307,7 +6306,7 @@ async function main() {
             request.headers.delete("x-miniflare-durable-object-name");
             request.headers.delete("x-miniflare-durable-object-id");
             if (!name || !idString) {
-              return new MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Missing `x-miniflare-durable-object-name` or `x-miniflare-durable-object-id` headers.",
                 { status: 400 }
               );
@@ -6315,14 +6314,14 @@ async function main() {
             const namespace = await mf?.getDurableObjectNamespace(name);
             const id = namespace?.idFromString(idString);
             if (!id) {
-              return new MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Could not generate an ID. Possibly due to a mismatched DO name and ID?",
                 { status: 500 }
               );
             }
             const stub = namespace?.get(id);
             if (!stub) {
-              return new MiniflareResponse3(
+              return new MiniflareResponse(
                 "[durable-object-proxy-err] Could not generate a stub. Possibly due to a mismatched DO name and ID?",
                 { status: 500 }
               );

package/package.json

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

package/src/__tests__/index.test.ts

@@ -31,6 +31,7 @@ describe("wrangler", () => {
 			"wrangler
 
 			Commands:
+			  wrangler docs [command]      📚 Open wrangler's docs in your browser
 			  wrangler init [name]         📥 Create a wrangler.toml configuration file
 			  wrangler dev [script]        👂 Start a local server for developing your worker
 			  wrangler publish [script]    🆙 Publish your Worker to Cloudflare.
@@ -77,6 +78,7 @@ describe("wrangler", () => {
 			wrangler
 
 			Commands:
+			  wrangler docs [command]      📚 Open wrangler's docs in your browser
 			  wrangler init [name]         📥 Create a wrangler.toml configuration file
 			  wrangler dev [script]        👂 Start a local server for developing your worker
 			  wrangler publish [script]    🆙 Publish your Worker to Cloudflare.

package/src/__tests__/init.test.ts

@@ -2400,6 +2400,42 @@ describe("init", () => {
 			});
 		});
 
+		it("should fail on init --from-dash on non-existent worker name", async () => {
+			setMockResponse(
+				`/accounts/:accountId/workers/services/:scriptName`,
+				"GET",
+				() => mockServiceMetadata
+			);
+			setMockFetchDashScript({
+				accountId: "LCARS",
+				fromDashScriptName: "memory-crystal",
+				environment: mockServiceMetadata.default_environment.environment,
+				mockResponse: mockDashboardScript,
+			});
+			mockConfirm(
+				{
+					text: "Would you like to use git to manage this Worker?",
+					result: false,
+				},
+				{
+					text: "Would you like to use TypeScript?",
+					result: true,
+				},
+				{
+					text: "No package.json found. Would you like to create one?",
+					result: true,
+				},
+				{
+					text: "Would you like to install the type definitions for Workers into your package.json?",
+					result: true,
+				}
+			);
+
+			await expect(
+				runWrangler("init isolinear-optical-chip --from-dash i-dont-exist")
+			).rejects.toThrowError();
+		});
+
 		it("should download source script from dashboard w/ out positional <name>", async () => {
 			mockSupportingDashRequests({
 				expectedAccountId: "LCARS",

package/src/__tests__/pages.test.ts

@@ -335,6 +335,7 @@ describe("pages", () => {
 			      --commit-hash     The SHA to attach to this deployment  [string]
 			      --commit-message  The commit message to attach to this deployment  [string]
 			      --commit-dirty    Whether or not the workspace should be considered dirty for this deployment  [boolean]
+			      --skip-caching    Skip asset caching which speeds up builds  [boolean]
 
 			🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
 		`);

package/src/cfetch/internal.ts

@@ -44,8 +44,13 @@ export async function performApiFetch(
 	logger.debug(
 		`-- START CF API REQUEST: ${method} ${getCloudflareAPIBaseURL()}${resource}${queryString}`
 	);
-	logger.debug("HEADERS:", JSON.stringify(headers, null, 2));
-	logger.debug("INIT:", JSON.stringify(init, null, 2));
+	const logHeaders = cloneHeaders(headers);
+	delete logHeaders["Authorization"];
+	logger.debug("HEADERS:", JSON.stringify(logHeaders, null, 2));
+	logger.debug(
+		"INIT:",
+		JSON.stringify({ ...init, headers: logHeaders }, null, 2)
+	);
 	logger.debug("-- END CF API REQUEST");
 	return await fetch(`${getCloudflareAPIBaseURL()}${resource}${queryString}`, {
 		method,
@@ -83,7 +88,9 @@ export async function fetchInternal<ResponseType>(
 		response.statusText,
 		response.status
 	);
-	logger.debug("HEADERS:", JSON.stringify(response.headers, null, 2));
+	const logHeaders = cloneHeaders(response.headers);
+	delete logHeaders["Authorization"];
+	logger.debug("HEADERS:", JSON.stringify(logHeaders, null, 2));
 	logger.debug("RESPONSE:", jsonText);
 	logger.debug("-- END CF API RESPONSE");
 

package/src/config/index.ts

@@ -166,7 +166,8 @@ export function printBindings(bindings: CfWorkerInit["bindings"]) {
 					if (database_name) {
 						databaseValue = `${database_name} (${database_id})`;
 					}
-					if (preview_database_id) {
+					//database_id is local when running `wrangler dev --local`
+					if (preview_database_id && database_id !== "local") {
 						databaseValue += `, Preview: (${preview_database_id})`;
 					}
 					return {

package/src/d1/migrations/apply.tsx

@@ -102,8 +102,11 @@ export const ApplyHandler = withConfig<BaseSqlExecuteArgs>(
 			if (!ok) return;
 		}
 
-		render(<Text>🕒 Creating backup...</Text>);
-		await createBackup(accountId, databaseInfo.uuid);
+		// don't backup prod db when applying migrations locally
+		if (!local) {
+			render(<Text>🕒 Creating backup...</Text>);
+			await createBackup(accountId, databaseInfo.uuid);
+		}
 
 		for (const migration of unappliedMigrations) {
 			let query = fs.readFileSync(

package/src/dev.tsx

@@ -442,7 +442,7 @@ export async function startDev(args: StartDevOptions) {
 
 		// eslint-disable-next-line no-inner-declarations
 		async function getDevReactElement(configParam: Config) {
-			const { assetPaths, bindings } = await getBindingsAndAssetPaths(
+			const { assetPaths, bindings } = getBindingsAndAssetPaths(
 				args,
 				configParam
 			);
@@ -559,7 +559,7 @@ export async function startApiDev(args: StartDevOptions) {
 
 	// eslint-disable-next-line no-inner-declarations
 	async function getDevServer(configParam: Config) {
-		const { assetPaths, bindings } = await getBindingsAndAssetPaths(
+		const { assetPaths, bindings } = getBindingsAndAssetPaths(
 			args,
 			configParam
 		);
@@ -798,14 +798,11 @@ async function validateDevServerSettings(
 	};
 }
 
-async function getBindingsAndAssetPaths(
-	args: StartDevOptions,
-	configParam: Config
-) {
+function getBindingsAndAssetPaths(args: StartDevOptions, configParam: Config) {
 	const cliVars = collectKeyValues(args.var);
 
 	// now log all available bindings into the terminal
-	const bindings = await getBindings(configParam, args.env, {
+	const bindings = getBindings(configParam, args.env, args.local ?? false, {
 		kv: args.kv,
 		vars: { ...args.vars, ...cliVars },
 		durableObjects: args.durableObjects,
@@ -832,11 +829,12 @@ async function getBindingsAndAssetPaths(
 	return { assetPaths, bindings };
 }
 
-async function getBindings(
+function getBindings(
 	configParam: Config,
 	env: string | undefined,
+	local: boolean,
 	args: AdditionalDevProps
-): Promise<CfWorkerInit["bindings"]> {
+): CfWorkerInit["bindings"] {
 	const bindings = {
 		kv_namespaces: [
 			...(configParam.kv_namespaces || []).map(
@@ -906,6 +904,13 @@ async function getBindings(
 		logfwdr: configParam.logfwdr,
 		d1_databases: identifyD1BindingsAsBeta([
 			...(configParam.d1_databases ?? []).map((d1Db) => {
+				//in local dev, bindings don't matter
+				if (local) {
+					return {
+						...d1Db,
+						database_id: "local",
+					};
+				}
 				if (!d1Db.preview_database_id) {
 					throw new Error(
 						`In development, you should use a separate D1 database than the one you'd use in production. Please create a new D1 database with "wrangler d1 create <name>" and add its id as preview_database_id to the d1_database "${d1Db.binding}" in your wrangler.toml`

package/src/docs/index.ts

@@ -0,0 +1,94 @@
+import { printWranglerBanner } from "..";
+import { readConfig } from "../config";
+import { logger } from "../logger";
+import * as metrics from "../metrics";
+import openInBrowser from "../open-in-browser";
+
+import type {
+	CommonYargsOptions,
+	YargsOptionsToInterface,
+} from "../yargs-types";
+import type { ArgumentsCamelCase, Argv } from "yargs";
+
+const argToUrlHash = {
+	init: "init",
+	generate: "generate",
+	dev: "dev",
+	publish: "publish",
+	delete: "delete",
+	"kv:namespace": "kvnamespace",
+	"kv:key": "kvkey",
+	"kv:bulk": "kvbulk",
+	"r2 bucket": "r2-bucket",
+	"r2 object": "r2-object",
+	secret: "secret",
+	"secret:bulk": "secretbulk",
+	tail: "tail",
+	pages: "pages",
+	login: "login",
+	logout: "logout",
+	whoami: "whoami",
+	types: "types",
+	deployments: "deployments",
+};
+
+export function docsOptions(yargs: Argv<CommonYargsOptions>) {
+	return yargs.positional("command", {
+		describe: "Enter the wrangler command you want to know more about",
+		type: "string",
+		// requiresArg: true,
+		choices: [
+			"init",
+			"dev",
+			"publish",
+			"delete",
+			"tail",
+			"secret",
+			"secret:bulk",
+			"kv:namespace",
+			"kv:key",
+			"kv:bulk",
+			"pages",
+			// "queues", //TODO: Undocumented
+			"r2 object",
+			"r2 bucket",
+			// "dispatch-namespace", // TODO: Undocumented - Workers for Platforms
+			// "d1", //TODO: Undocumented
+			// "pubsub", //TODO: Undocumented
+			"login",
+			"logout",
+			"whoami",
+			"types",
+			"deployments",
+			"api",
+		],
+	});
+}
+
+type DocsArgs = YargsOptionsToInterface<typeof docsOptions>;
+
+function isValidParam(k: string): k is keyof typeof argToUrlHash {
+	return k in argToUrlHash;
+}
+
+export async function docsHandler(args: ArgumentsCamelCase<DocsArgs>) {
+	let urlToOpen =
+		"https://developers.cloudflare.com/workers/wrangler/commands/";
+
+	if (args.command === "api") {
+		//if api, take them to the API docs
+		urlToOpen = "https://developers.cloudflare.com/workers/wrangler/api/";
+	} else if (args.command && isValidParam(args.command)) {
+		//otherwise, they get the wrangler commands page
+		urlToOpen += `#${argToUrlHash[args.command]}`;
+	}
+
+	await printWranglerBanner();
+
+	logger.log(`Opening a link in your default browser: ${urlToOpen}`);
+	await openInBrowser(urlToOpen);
+	const config = readConfig(undefined, {});
+	await metrics.sendMetricsEvent("view docs", {
+		sendMetrics: config.send_metrics,
+	});
+}

package/src/index.tsx

@@ -26,6 +26,7 @@ import {
 } from "./deprecated";
 import { devHandler, devOptions } from "./dev";
 import { workerNamespaceCommands } from "./dispatch-namespace";
+import { docsHandler, docsOptions } from "./docs";
 import { initHandler, initOptions } from "./init";
 import { kvNamespace, kvKey, kvBulk } from "./kv";
 import { logBuildFailure, logger } from "./logger";
@@ -274,6 +275,14 @@ export function createCLIParser(argv: string[]) {
 		generateHandler
 	);
 
+	// docs
+	wrangler.command(
+		"docs [command]",
+		"📚 Open wrangler's docs in your browser",
+		docsOptions,
+		docsHandler
+	);
+
 	// init
 	wrangler.command(
 		"init [name]",

package/src/init.ts

@@ -165,6 +165,18 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 	);
 	let justCreatedWranglerToml = false;
 
+	let accountId = "";
+	let serviceMetaData: undefined | ServiceMetadataRes;
+
+	// If --from-dash, check that script actually exists
+	if (fromDashScriptName) {
+		const config = readConfig(args.config as ConfigPath, args);
+		accountId = await requireAuth(config);
+		serviceMetaData = await fetchResult<ServiceMetadataRes>(
+			`/accounts/${accountId}/workers/services/${fromDashScriptName}`
+		);
+	}
+
 	if (fs.existsSync(wranglerTomlDestination)) {
 		let shouldContinue = false;
 		logger.warn(
@@ -452,16 +464,13 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 					`After running "wrangler init --from-dash", modifying your worker via the Cloudflare dashboard is discouraged.
 					Edits made via the Dashboard will not be synchronized locally and will be overridden by your local code and config when you publish.`
 				);
-				const config = readConfig(args.config as ConfigPath, args);
-				const accountId = await requireAuth(config);
+
 				await mkdir(path.join(creationDirectory, "./src"), {
 					recursive: true,
 				});
-				const serviceMetaData = await fetchResult<ServiceMetadataRes>(
-					`/accounts/${accountId}/workers/services/${fromDashScriptName}`
-				);
+
 				const defaultEnvironment =
-					serviceMetaData.default_environment.environment;
+					serviceMetaData?.default_environment.environment;
 				// I want the default environment, assuming it's the most up to date code.
 				const dashScript = await fetchDashboardScript(
 					`/accounts/${accountId}/workers/services/${fromDashScriptName}/environments/${defaultEnvironment}/content`
@@ -479,7 +488,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 					scriptPath: "src/index.ts",
 					extraToml: (await getWorkerConfig(accountId, fromDashScriptName, {
 						defaultEnvironment,
-						environments: serviceMetaData.environments,
+						environments: serviceMetaData?.environments,
 					})) as TOML.JsonMap,
 				});
 			} else {
@@ -493,6 +502,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 					await mkdir(path.join(creationDirectory, "./src"), {
 						recursive: true,
 					});
+
 					await writeFile(
 						path.join(creationDirectory, "./src/index.ts"),
 						readFileSync(path.join(getBasePath(), `templates/${template}`))
@@ -527,17 +537,13 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 					`After running "wrangler init --from-dash", modifying your worker via the Cloudflare dashboard is discouraged.
 					Edits made via the Dashboard will not be synchronized locally and will be overridden by your local code and config when you publish.`
 				);
-				const config = readConfig(args.config as ConfigPath, args);
-				const accountId = await requireAuth(config);
+
 				await mkdir(path.join(creationDirectory, "./src"), {
 					recursive: true,
 				});
 
-				const serviceMetaData = await fetchResult<ServiceMetadataRes>(
-					`/accounts/${accountId}/workers/services/${fromDashScriptName}`
-				);
 				const defaultEnvironment =
-					serviceMetaData.default_environment.environment;
+					serviceMetaData?.default_environment.environment;
 
 				// I want the default environment, assuming it's the most up to date code.
 				const dashScript = await fetchDashboardScript(
@@ -557,7 +563,7 @@ export async function initHandler(args: ArgumentsCamelCase<InitArgs>) {
 					//? Should we have Environment argument for `wrangler init --from-dash` - Jacob
 					extraToml: (await getWorkerConfig(accountId, fromDashScriptName, {
 						defaultEnvironment,
-						environments: serviceMetaData.environments,
+						environments: serviceMetaData?.environments,
 					})) as TOML.JsonMap,
 				});
 			} else {
@@ -770,8 +776,8 @@ async function getWorkerConfig(
 		defaultEnvironment,
 		environments,
 	}: {
-		defaultEnvironment: string;
-		environments: ServiceMetadataRes["environments"];
+		defaultEnvironment: string | undefined;
+		environments: ServiceMetadataRes["environments"] | undefined;
 	}
 ): Promise<RawConfig> {
 	const [bindings, routes, serviceEnvMetadata, cronTriggers] =
@@ -967,7 +973,7 @@ async function getWorkerConfig(
 			crons: cronTriggers.schedules.map((scheduled) => scheduled.cron),
 		},
 		env: environments
-			.filter((env) => env.environment !== "production")
+			?.filter((env) => env.environment !== "production")
 			// `env` can have multiple Environments, with different configs.
 			.reduce((envObj, { environment }) => {
 				return { ...envObj, [environment]: {} };

package/src/metrics/send-event.ts

@@ -55,7 +55,8 @@ export type EventNames =
 	| "build pages functions"
 	| "run dev"
 	| "run dev (api)"
-	| "run pages dev";
+	| "run pages dev"
+	| "view docs";
 
 /**
  * Send a metrics event, with no extra properties, to Cloudflare, if usage tracking is enabled.

package/src/miniflare-cli/assets.ts

@@ -89,13 +89,17 @@ async function generateAssetsFetch(
 	tre: boolean
 ): Promise<typeof fetch> {
 	// Defer importing miniflare until we really need it
-	if (tre) {
-		await import(
-			"@cloudflare/pages-shared/environment-polyfills/miniflare-tre"
-		);
-	} else {
-		await import("@cloudflare/pages-shared/environment-polyfills/miniflare");
-	}
+
+	const polyfill = tre
+		? (
+				await import(
+					"@cloudflare/pages-shared/environment-polyfills/miniflare-tre"
+				)
+		  ).default
+		: (await import("@cloudflare/pages-shared/environment-polyfills/miniflare"))
+				.default;
+
+	await polyfill();
 
 	const miniflare = tre
 		? await import("@miniflare/tre")

package/src/pages/publish.tsx

@@ -58,6 +58,10 @@ export function Options(yargs: Argv) {
 				description:
 					"Whether or not the workspace should be considered dirty for this deployment",
 			},
+			"skip-caching": {
+				type: "boolean",
+				description: "Skip asset caching which speeds up builds",
+			},
 			config: {
 				describe: "Pages does not support wrangler.toml",
 				type: "string",
@@ -74,6 +78,7 @@ export const Handler = async ({
 	commitHash,
 	commitMessage,
 	commitDirty,
+	skipCaching,
 	config: wranglerConfig,
 }: PublishArgs) => {
 	if (wranglerConfig) {
@@ -313,7 +318,12 @@ export const Handler = async ({
 		}
 	}
 
-	const manifest = await upload({ directory, accountId, projectName });
+	const manifest = await upload({
+		directory,
+		accountId,
+		projectName,
+		skipCaching: skipCaching ?? false,
+	});
 
 	const formData = new FormData();
 

package/src/pages/upload.tsx

@@ -40,6 +40,10 @@ export function Options(yargs: Argv) {
 				type: "string",
 				description: "The name of the project you want to deploy to",
 			},
+			"skip-caching": {
+				type: "boolean",
+				description: "Skip asset caching which speeds up builds",
+			},
 		})
 		.epilogue(pagesBetaWarning);
 }
@@ -47,6 +51,7 @@ export function Options(yargs: Argv) {
 export const Handler = async ({
 	directory,
 	outputManifestPath,
+	skipCaching,
 }: UploadArgs) => {
 	if (!directory) {
 		throw new FatalError("Must specify a directory.", 1);
@@ -59,6 +64,7 @@ export const Handler = async ({
 	const manifest = await upload({
 		directory,
 		jwt: process.env.CF_PAGES_UPLOAD_JWT,
+		skipCaching: skipCaching ?? false,
 	});
 
 	if (outputManifestPath) {
@@ -74,8 +80,14 @@ export const upload = async (
 		| {
 				directory: string;
 				jwt: string;
+				skipCaching: boolean;
+		  }
+		| {
+				directory: string;
+				accountId: string;
+				projectName: string;
+				skipCaching: boolean;
 		  }
-		| { directory: string; accountId: string; projectName: string }
 ) => {
 	async function fetchJwt(): Promise<string> {
 		if ("jwt" in args) {
@@ -184,7 +196,12 @@ export const upload = async (
 	const start = Date.now();
 
 	let attempts = 0;
-	const getMissingHashes = async (): Promise<string[]> => {
+	const getMissingHashes = async (skipCaching: boolean): Promise<string[]> => {
+		if (skipCaching) {
+			console.debug("Force skipping cache");
+			return files.map(({ hash }) => hash);
+		}
+
 		try {
 			return await fetchResult<string[]>(`/pages/assets/check-missing`, {
 				method: "POST",
@@ -207,13 +224,13 @@ export const upload = async (
 					// Looks like the JWT expired, fetch another one
 					jwt = await fetchJwt();
 				}
-				return getMissingHashes();
+				return getMissingHashes(skipCaching);
 			} else {
 				throw e;
 			}
 		}
 	};
-	const missingHashes = await getMissingHashes();
+	const missingHashes = await getMissingHashes(args.skipCaching);
 
 	const sortedFiles = files
 		.filter((file) => missingHashes.includes(file.hash))
@@ -283,7 +300,8 @@ export const upload = async (
 			);
 
 			try {
-				return await fetchResult(`/pages/assets/upload`, {
+				console.debug("POST /pages/assets/upload");
+				const res = await fetchResult(`/pages/assets/upload`, {
 					method: "POST",
 					headers: {
 						"Content-Type": "application/json",
@@ -291,8 +309,10 @@ export const upload = async (
 					},
 					body: JSON.stringify(payload),
 				});
+				console.debug("result:", res);
 			} catch (e) {
 				if (attempts < MAX_UPLOAD_ATTEMPTS) {
+					console.debug("failed:", e, "retrying...");
 					// Exponential backoff, 1 second first time, then 2 second, then 4 second etc.
 					await new Promise((resolvePromise) =>
 						setTimeout(resolvePromise, Math.pow(2, attempts++) * 1000)
@@ -304,6 +324,7 @@ export const upload = async (
 					}
 					return doUpload();
 				} else {
+					console.debug("failed:", e);
 					throw e;
 				}
 			}

package/wrangler-dist/cli.js

@@ -129453,35 +129453,45 @@ var init_environment_polyfills = __esm({
 
 // ../pages-shared/environment-polyfills/miniflare-tre.ts
 var miniflare_tre_exports = {};
-var import_tre;
+__export(miniflare_tre_exports, {
+  default: () => miniflare_tre_default
+});
+var miniflare_tre_default;
 var init_miniflare_tre = __esm({
   "../pages-shared/environment-polyfills/miniflare-tre.ts"() {
     init_import_meta_url();
-    import_tre = require("@miniflare/tre");
     init_environment_polyfills();
-    polyfill({
-      fetch: import_tre.fetch,
-      Headers: import_tre.Headers,
-      Request: import_tre.Request,
-      Response: import_tre.Response
-    });
+    miniflare_tre_default = async () => {
+      const mf = await import("@miniflare/tre");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
   }
 });
 
 // ../pages-shared/environment-polyfills/miniflare.ts
 var miniflare_exports = {};
-var import_core2;
+__export(miniflare_exports, {
+  default: () => miniflare_default
+});
+var miniflare_default;
 var init_miniflare = __esm({
   "../pages-shared/environment-polyfills/miniflare.ts"() {
     init_import_meta_url();
-    import_core2 = require("@miniflare/core");
     init_environment_polyfills();
-    polyfill({
-      fetch: import_core2.fetch,
-      Headers: import_core2.Headers,
-      Request: import_core2.Request,
-      Response: import_core2.Response
-    });
+    miniflare_default = async () => {
+      const mf = await import("@miniflare/core");
+      polyfill({
+        fetch: mf.fetch,
+        Headers: mf.Headers,
+        Request: mf.Request,
+        Response: mf.Response
+      });
+    };
   }
 });
 
@@ -140154,7 +140164,7 @@ function printBindings(bindings) {
           if (database_name) {
             databaseValue = `${database_name} (${database_id})`;
           }
-          if (preview_database_id) {
+          if (preview_database_id && database_id !== "local") {
             databaseValue += `, Preview: (${preview_database_id})`;
           }
           return {
@@ -141885,7 +141895,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.6.0";
+var version = "2.6.2";
 var package_default = {
   name: "wrangler",
   version,
@@ -144375,8 +144385,13 @@ async function performApiFetch(resource, init = {}, queryParams, abortSignal) {
   logger.debug(
     `-- START CF API REQUEST: ${method} ${getCloudflareAPIBaseURL()}${resource}${queryString}`
   );
-  logger.debug("HEADERS:", JSON.stringify(headers, null, 2));
-  logger.debug("INIT:", JSON.stringify(init, null, 2));
+  const logHeaders = cloneHeaders(headers);
+  delete logHeaders["Authorization"];
+  logger.debug("HEADERS:", JSON.stringify(logHeaders, null, 2));
+  logger.debug(
+    "INIT:",
+    JSON.stringify({ ...init, headers: logHeaders }, null, 2)
+  );
   logger.debug("-- END CF API REQUEST");
   return await (0, import_undici4.fetch)(`${getCloudflareAPIBaseURL()}${resource}${queryString}`, {
     method,
@@ -144399,7 +144414,9 @@ async function fetchInternal(resource, init = {}, queryParams, abortSignal) {
     response.statusText,
     response.status
   );
-  logger.debug("HEADERS:", JSON.stringify(response.headers, null, 2));
+  const logHeaders = cloneHeaders(response.headers);
+  delete logHeaders["Authorization"];
+  logger.debug("HEADERS:", JSON.stringify(logHeaders, null, 2));
   logger.debug("RESPONSE:", jsonText);
   logger.debug("-- END CF API RESPONSE");
   try {
@@ -144986,11 +145003,8 @@ async function generateASSETSBinding(options6) {
   };
 }
 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 polyfill2 = tre ? (await Promise.resolve().then(() => (init_miniflare_tre(), miniflare_tre_exports))).default : (await Promise.resolve().then(() => (init_miniflare(), miniflare_exports))).default;
+  await polyfill2();
   const miniflare = tre ? await import("@miniflare/tre") : await import("@miniflare/core");
   const Request2 = miniflare.Request;
   const { generateHandler: generateHandler3, parseQualityWeightedList: parseQualityWeightedList2 } = await Promise.resolve().then(() => (init_handler(), handler_exports));
@@ -155748,8 +155762,10 @@ Your database may not be available to serve requests during the migration, conti
       if (!ok)
         return;
     }
-    (0, import_ink10.render)(/* @__PURE__ */ import_react14.default.createElement(import_ink10.Text, null, "\u{1F552} Creating backup..."));
-    await createBackup(accountId, databaseInfo.uuid);
+    if (!local) {
+      (0, import_ink10.render)(/* @__PURE__ */ import_react14.default.createElement(import_ink10.Text, null, "\u{1F552} Creating backup..."));
+      await createBackup(accountId, databaseInfo.uuid);
+    }
     for (const migration of unappliedMigrations) {
       let query = import_node_fs14.default.readFileSync(
         `${migrationsPath}/${migration.Name}`,
@@ -156432,6 +156448,15 @@ Have you considered using Cloudflare Pages instead? See https://pages.cloudflare
     "./wrangler.toml"
   );
   let justCreatedWranglerToml = false;
+  let accountId = "";
+  let serviceMetaData;
+  if (fromDashScriptName) {
+    const config = readConfig(args.config, args);
+    accountId = await requireAuth(config);
+    serviceMetaData = await fetchResult(
+      `/accounts/${accountId}/workers/services/${fromDashScriptName}`
+    );
+  }
   if (fs12.existsSync(wranglerTomlDestination)) {
     let shouldContinue = false;
     logger.warn(
@@ -156657,15 +156682,10 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
           `After running "wrangler init --from-dash", modifying your worker via the Cloudflare dashboard is discouraged.
 					Edits made via the Dashboard will not be synchronized locally and will be overridden by your local code and config when you publish.`
         );
-        const config = readConfig(args.config, args);
-        const accountId = await requireAuth(config);
         await (0, import_promises9.mkdir)(import_node_path24.default.join(creationDirectory, "./src"), {
           recursive: true
         });
-        const serviceMetaData = await fetchResult(
-          `/accounts/${accountId}/workers/services/${fromDashScriptName}`
-        );
-        const defaultEnvironment = serviceMetaData.default_environment.environment;
+        const defaultEnvironment = serviceMetaData?.default_environment.environment;
         const dashScript = await fetchDashboardScript(
           `/accounts/${accountId}/workers/services/${fromDashScriptName}/environments/${defaultEnvironment}/content`
         );
@@ -156680,7 +156700,7 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
           scriptPath: "src/index.ts",
           extraToml: await getWorkerConfig(accountId, fromDashScriptName, {
             defaultEnvironment,
-            environments: serviceMetaData.environments
+            environments: serviceMetaData?.environments
           })
         });
       } else {
@@ -156721,15 +156741,10 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
           `After running "wrangler init --from-dash", modifying your worker via the Cloudflare dashboard is discouraged.
 					Edits made via the Dashboard will not be synchronized locally and will be overridden by your local code and config when you publish.`
         );
-        const config = readConfig(args.config, args);
-        const accountId = await requireAuth(config);
         await (0, import_promises9.mkdir)(import_node_path24.default.join(creationDirectory, "./src"), {
           recursive: true
         });
-        const serviceMetaData = await fetchResult(
-          `/accounts/${accountId}/workers/services/${fromDashScriptName}`
-        );
-        const defaultEnvironment = serviceMetaData.default_environment.environment;
+        const defaultEnvironment = serviceMetaData?.default_environment.environment;
         const dashScript = await fetchDashboardScript(
           `/accounts/${accountId}/workers/services/${fromDashScriptName}/environments/${defaultEnvironment}/content`
         );
@@ -156744,7 +156759,7 @@ To start developing your Worker, run \`npx wrangler dev\`${isCreatingWranglerTom
           scriptPath: "src/index.ts",
           extraToml: await getWorkerConfig(accountId, fromDashScriptName, {
             defaultEnvironment,
-            environments: serviceMetaData.environments
+            environments: serviceMetaData?.environments
           })
         });
       } else {
@@ -157068,7 +157083,7 @@ async function getWorkerConfig(accountId, fromDashScriptName, {
     triggers: {
       crons: cronTriggers.schedules.map((scheduled) => scheduled.cron)
     },
-    env: environments.filter((env5) => env5.environment !== "production").reduce((envObj, { environment }) => {
+    env: environments?.filter((env5) => env5.environment !== "production").reduce((envObj, { environment }) => {
       return { ...envObj, [environment]: {} };
     }, {}),
     ...mappedBindings
@@ -157459,6 +157474,75 @@ function workerNamespaceCommands(workerNamespaceYargs, subHelp) {
   );
 }
 
+// src/docs/index.ts
+init_import_meta_url();
+var argToUrlHash = {
+  init: "init",
+  generate: "generate",
+  dev: "dev",
+  publish: "publish",
+  delete: "delete",
+  "kv:namespace": "kvnamespace",
+  "kv:key": "kvkey",
+  "kv:bulk": "kvbulk",
+  "r2 bucket": "r2-bucket",
+  "r2 object": "r2-object",
+  secret: "secret",
+  "secret:bulk": "secretbulk",
+  tail: "tail",
+  pages: "pages",
+  login: "login",
+  logout: "logout",
+  whoami: "whoami",
+  types: "types",
+  deployments: "deployments"
+};
+function docsOptions(yargs) {
+  return yargs.positional("command", {
+    describe: "Enter the wrangler command you want to know more about",
+    type: "string",
+    choices: [
+      "init",
+      "dev",
+      "publish",
+      "delete",
+      "tail",
+      "secret",
+      "secret:bulk",
+      "kv:namespace",
+      "kv:key",
+      "kv:bulk",
+      "pages",
+      "r2 object",
+      "r2 bucket",
+      "login",
+      "logout",
+      "whoami",
+      "types",
+      "deployments",
+      "api"
+    ]
+  });
+}
+function isValidParam(k) {
+  return k in argToUrlHash;
+}
+async function docsHandler(args) {
+  let urlToOpen = "https://developers.cloudflare.com/workers/wrangler/commands/";
+  if (args.command === "api") {
+    urlToOpen = "https://developers.cloudflare.com/workers/wrangler/api/";
+  } else if (args.command && isValidParam(args.command)) {
+    urlToOpen += `#${argToUrlHash[args.command]}`;
+  }
+  await printWranglerBanner();
+  logger.log(`Opening a link in your default browser: ${urlToOpen}`);
+  await openInBrowser(urlToOpen);
+  const config = readConfig(void 0, {});
+  await sendMetricsEvent("view docs", {
+    sendMetrics: config.send_metrics
+  });
+}
+
 // src/kv/index.ts
 init_import_meta_url();
 var import_node_string_decoder = require("node:string_decoder");
@@ -160690,12 +160774,17 @@ function Options8(yargs) {
     "output-manifest-path": {
       type: "string",
       description: "The name of the project you want to deploy to"
+    },
+    "skip-caching": {
+      type: "boolean",
+      description: "Skip asset caching which speeds up builds"
     }
   }).epilogue(pagesBetaWarning);
 }
 var Handler8 = async ({
   directory,
-  outputManifestPath
+  outputManifestPath,
+  skipCaching
 }) => {
   if (!directory) {
     throw new FatalError("Must specify a directory.", 1);
@@ -160705,7 +160794,8 @@ var Handler8 = async ({
   }
   const manifest = await upload({
     directory,
-    jwt: process.env.CF_PAGES_UPLOAD_JWT
+    jwt: process.env.CF_PAGES_UPLOAD_JWT,
+    skipCaching: skipCaching ?? false
   });
   if (outputManifestPath) {
     await (0, import_promises15.mkdir)((0, import_node_path34.dirname)(outputManifestPath), { recursive: true });
@@ -160784,7 +160874,11 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
   let jwt = await fetchJwt();
   const start = Date.now();
   let attempts = 0;
-  const getMissingHashes = async () => {
+  const getMissingHashes = async (skipCaching) => {
+    if (skipCaching) {
+      console.debug("Force skipping cache");
+      return files.map(({ hash }) => hash);
+    }
     try {
       return await fetchResult(`/pages/assets/check-missing`, {
         method: "POST",
@@ -160804,13 +160898,13 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
         if (e2.code === 8000013) {
           jwt = await fetchJwt();
         }
-        return getMissingHashes();
+        return getMissingHashes(skipCaching);
       } else {
         throw e2;
       }
     }
   };
-  const missingHashes = await getMissingHashes();
+  const missingHashes = await getMissingHashes(args.skipCaching);
   const sortedFiles = files.filter((file) => missingHashes.includes(file.hash)).sort((a, b) => b.sizeInBytes - a.sizeInBytes);
   const buckets = new Array(BULK_UPLOAD_CONCURRENCY).fill(null).map(() => ({
     files: [],
@@ -160860,7 +160954,8 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
         }))
       );
       try {
-        return await fetchResult(`/pages/assets/upload`, {
+        console.debug("POST /pages/assets/upload");
+        const res = await fetchResult(`/pages/assets/upload`, {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
@@ -160868,8 +160963,10 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
           },
           body: JSON.stringify(payload)
         });
+        console.debug("result:", res);
       } catch (e2) {
         if (attempts < MAX_UPLOAD_ATTEMPTS) {
+          console.debug("failed:", e2, "retrying...");
           await new Promise(
             (resolvePromise) => setTimeout(resolvePromise, Math.pow(2, attempts++) * 1e3)
           );
@@ -160878,6 +160975,7 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
           }
           return doUpload();
         } else {
+          console.debug("failed:", e2);
           throw e2;
         }
       }
@@ -161006,6 +161104,10 @@ function Options9(yargs) {
       type: "boolean",
       description: "Whether or not the workspace should be considered dirty for this deployment"
     },
+    "skip-caching": {
+      type: "boolean",
+      description: "Skip asset caching which speeds up builds"
+    },
     config: {
       describe: "Pages does not support wrangler.toml",
       type: "string",
@@ -161020,6 +161122,7 @@ var Handler9 = async ({
   commitHash,
   commitMessage,
   commitDirty,
+  skipCaching,
   config: wranglerConfig
 }) => {
   if (wranglerConfig) {
@@ -161202,7 +161305,12 @@ To silence this warning, pass in --commit-dirty=true`
       }
     }
   }
-  const manifest = await upload({ directory, accountId, projectName });
+  const manifest = await upload({
+    directory,
+    accountId,
+    projectName,
+    skipCaching: skipCaching ?? false
+  });
   const formData = new import_undici10.FormData();
   formData.append("manifest", JSON.stringify(manifest));
   if (branch) {
@@ -164387,6 +164495,12 @@ function createCLIParser(argv) {
     generateOptions,
     generateHandler2
   );
+  wrangler.command(
+    "docs [command]",
+    "\u{1F4DA} Open wrangler's docs in your browser",
+    docsOptions,
+    docsHandler
+  );
   wrangler.command(
     "init [name]",
     "\u{1F4E5} Create a wrangler.toml configuration file",
@@ -164954,7 +165068,7 @@ Switch out --local for ${import_chalk8.default.bold(
       { sendMetrics: config.send_metrics, offline: args.local }
     );
     async function getDevReactElement(configParam) {
-      const { assetPaths, bindings } = await getBindingsAndAssetPaths(
+      const { assetPaths, bindings } = getBindingsAndAssetPaths(
         args,
         configParam
       );
@@ -165049,7 +165163,7 @@ async function startApiDev(args) {
     { sendMetrics: config.send_metrics, offline: args.local }
   );
   async function getDevServer(configParam) {
-    const { assetPaths, bindings } = await getBindingsAndAssetPaths(
+    const { assetPaths, bindings } = getBindingsAndAssetPaths(
       args,
       configParam
     );
@@ -165234,9 +165348,9 @@ use --persist-to=./wrangler-local-state to keep using the old path.`
     localPersistencePath
   };
 }
-async function getBindingsAndAssetPaths(args, configParam) {
+function getBindingsAndAssetPaths(args, configParam) {
   const cliVars = collectKeyValues(args.var);
-  const bindings = await getBindings(configParam, args.env, {
+  const bindings = getBindings(configParam, args.env, args.local ?? false, {
     kv: args.kv,
     vars: { ...args.vars, ...cliVars },
     durableObjects: args.durableObjects,
@@ -165256,7 +165370,7 @@ async function getBindingsAndAssetPaths(args, configParam) {
   );
   return { assetPaths, bindings };
 }
-async function getBindings(configParam, env5, args) {
+function getBindings(configParam, env5, local, args) {
   const bindings = {
     kv_namespaces: [
       ...(configParam.kv_namespaces || []).map(
@@ -165315,6 +165429,12 @@ async function getBindings(configParam, env5, args) {
     logfwdr: configParam.logfwdr,
     d1_databases: identifyD1BindingsAsBeta([
       ...(configParam.d1_databases ?? []).map((d1Db) => {
+        if (local) {
+          return {
+            ...d1Db,
+            database_id: "local"
+          };
+        }
         if (!d1Db.preview_database_id) {
           throw new Error(
             `In development, you should use a separate D1 database than the one you'd use in production. Please create a new D1 database with "wrangler d1 create <name>" and add its id as preview_database_id to the d1_database "${d1Db.binding}" in your wrangler.toml`