wrangler 2.0.19 → 2.0.23

package/src/pages/projects.tsx

@@ -44,8 +44,11 @@ export async function ListHandler() {
 		account_id: accountId,
 	});
 
-	render(<Table data={data}></Table>, { patchConsole: false });
-	metrics.sendMetricsEvent("list pages projects");
+	const { unmount } = render(<Table data={data}></Table>, {
+		patchConsole: false,
+	});
+	unmount();
+	await metrics.sendMetricsEvent("list pages projects");
 }
 
 export const listProjects = async ({
@@ -156,5 +159,5 @@ export async function CreateHandler({
 	logger.log(
 		`To deploy a folder of assets, run 'wrangler pages publish [directory]'.`
 	);
-	metrics.sendMetricsEvent("create pages project");
+	await metrics.sendMetricsEvent("create pages project");
 }

package/src/pages/publish.tsx

@@ -194,7 +194,7 @@ export const Handler = async ({
 				});
 
 				logger.log(`✨ Successfully created the '${projectName}' project.`);
-				metrics.sendMetricsEvent("create pages project");
+				await metrics.sendMetricsEvent("create pages project");
 				break;
 			}
 		}
@@ -334,5 +334,5 @@ export const Handler = async ({
 	logger.log(
 		`✨ Deployment complete! Take a peek over at ${deploymentResponse.url}`
 	);
-	metrics.sendMetricsEvent("deploy pages project");
+	await metrics.sendMetricsEvent("deploy pages project");
 };

package/src/publish.ts

@@ -276,6 +276,19 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 		);
 	}
 
+	// Warn if user tries minify or node-compat with no-bundle
+	if (props.noBundle && minify) {
+		logger.warn(
+			"`--minify` and `--no-bundle` can't be used together. If you want to minify your Worker and disable Wrangler's bundling, please minify as part of your own bundling process."
+		);
+	}
+
+	if (props.noBundle && nodeCompat) {
+		logger.warn(
+			"`--node-compat` and `--no-bundle` can't be used together. If you want to polyfill Node.js built-ins and disable Wrangler's bundling, please polyfill as part of your own bundling process."
+		);
+	}
+
 	const scriptName = props.name;
 	assert(
 		scriptName,

package/src/pubsub/pubsub-commands.tsx

@@ -51,7 +51,7 @@ export function pubSubCommands(
 							logger.log(`Creating Pub/SubNamespace ${args.name}...`);
 							await pubsub.createPubSubNamespace(accountId, namespace);
 							logger.log(`Success! Created Pub/Sub Namespace ${args.name}`);
-							metrics.sendMetricsEvent("create pubsub namespace", {
+							await metrics.sendMetricsEvent("create pubsub namespace", {
 								sendMetrics: config.send_metrics,
 							});
 						}
@@ -67,7 +67,7 @@ export function pubSubCommands(
 							const accountId = await requireAuth(config);
 
 							logger.log(await pubsub.listPubSubNamespaces(accountId));
-							metrics.sendMetricsEvent("list pubsub namespaces", {
+							await metrics.sendMetricsEvent("list pubsub namespaces", {
 								sendMetrics: config.send_metrics,
 							});
 						}
@@ -96,7 +96,7 @@ export function pubSubCommands(
 								logger.log(`Deleting namespace ${args.name}...`);
 								await pubsub.deletePubSubNamespace(accountId, args.name);
 								logger.log(`Deleted namespace ${args.name}.`);
-								metrics.sendMetricsEvent("delete pubsub namespace", {
+								await metrics.sendMetricsEvent("delete pubsub namespace", {
 									sendMetrics: config.send_metrics,
 								});
 							}
@@ -121,7 +121,7 @@ export function pubSubCommands(
 							logger.log(
 								await pubsub.describePubSubNamespace(accountId, args.name)
 							);
-							metrics.sendMetricsEvent("view pubsub namespace", {
+							await metrics.sendMetricsEvent("view pubsub namespace", {
 								sendMetrics: config.send_metrics,
 							});
 						}
@@ -191,7 +191,7 @@ export function pubSubCommands(
 					logger.log(
 						await pubsub.createPubSubBroker(accountId, args.namespace, broker)
 					);
-					metrics.sendMetricsEvent("create pubsub broker", {
+					await metrics.sendMetricsEvent("create pubsub broker", {
 						sendMetrics: config.send_metrics,
 					});
 				}
@@ -263,7 +263,7 @@ export function pubSubCommands(
 						)
 					);
 					logger.log(`Successfully updated Pub/Sub Broker ${args.name}`);
-					metrics.sendMetricsEvent("update pubsub broker", {
+					await metrics.sendMetricsEvent("update pubsub broker", {
 						sendMetrics: config.send_metrics,
 					});
 				}
@@ -287,7 +287,7 @@ export function pubSubCommands(
 					const accountId = await requireAuth(config);
 
 					logger.log(await pubsub.listPubSubBrokers(accountId, args.namespace));
-					metrics.sendMetricsEvent("list pubsub brokers", {
+					await metrics.sendMetricsEvent("list pubsub brokers", {
 						sendMetrics: config.send_metrics,
 					});
 				}
@@ -328,7 +328,7 @@ export function pubSubCommands(
 								args.name
 							);
 							logger.log(`Deleted Pub/Sub Broker ${args.name}.`);
-							metrics.sendMetricsEvent("delete pubsub broker", {
+							await metrics.sendMetricsEvent("delete pubsub broker", {
 								sendMetrics: config.send_metrics,
 							});
 						}
@@ -363,7 +363,7 @@ export function pubSubCommands(
 								args.name
 							)
 						);
-						metrics.sendMetricsEvent("view pubsub broker", {
+						await metrics.sendMetricsEvent("view pubsub broker", {
 							sendMetrics: config.send_metrics,
 						});
 					}
@@ -441,7 +441,7 @@ export function pubSubCommands(
 							parsedExpiration
 						)
 					);
-					metrics.sendMetricsEvent("issue pubsub broker credentials", {
+					await metrics.sendMetricsEvent("issue pubsub broker credentials", {
 						sendMetrics: config.send_metrics,
 					});
 				}
@@ -489,7 +489,7 @@ export function pubSubCommands(
 					);
 
 					logger.log(`Revoked ${args.jti.length} credential(s).`);
-					metrics.sendMetricsEvent("revoke pubsub broker credentials", {
+					await metrics.sendMetricsEvent("revoke pubsub broker credentials", {
 						sendMetrics: config.send_metrics,
 					});
 				}
@@ -536,7 +536,7 @@ export function pubSubCommands(
 					);
 
 					logger.log(`Unrevoked ${numTokens} credential(s)`);
-					metrics.sendMetricsEvent("unrevoke pubsub broker credentials", {
+					await metrics.sendMetricsEvent("unrevoke pubsub broker credentials", {
 						sendMetrics: config.send_metrics,
 					});
 				}
@@ -572,9 +572,12 @@ export function pubSubCommands(
 							args.name
 						)
 					);
-					metrics.sendMetricsEvent("list pubsub broker revoked credentials", {
-						sendMetrics: config.send_metrics,
-					});
+					await metrics.sendMetricsEvent(
+						"list pubsub broker revoked credentials",
+						{
+							sendMetrics: config.send_metrics,
+						}
+					);
 				}
 			);
 
@@ -607,7 +610,7 @@ export function pubSubCommands(
 							args.name
 						)
 					);
-					metrics.sendMetricsEvent("list pubsub broker public-keys", {
+					await metrics.sendMetricsEvent("list pubsub broker public-keys", {
 						sendMetrics: config.send_metrics,
 					});
 				}

package/src/user/choose-account.tsx

@@ -44,17 +44,26 @@ export async function getAccountChoices(): Promise<ChooseAccountItem[]> {
 	if (accountIdFromEnv) {
 		return [{ id: accountIdFromEnv, name: "" }];
 	} else {
-		const response = await fetchListResult<{
-			account: ChooseAccountItem;
-		}>(`/memberships`);
-		const accounts = response.map((r) => r.account);
-		if (accounts.length === 0) {
-			throw new Error(
-				"Failed to automatically retrieve account IDs for the logged in user.\n" +
-					"In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as `account_id` in your `wrangler.toml` file."
-			);
-		} else {
-			return accounts;
+		try {
+			const response = await fetchListResult<{
+				account: ChooseAccountItem;
+			}>(`/memberships`);
+			const accounts = response.map((r) => r.account);
+			if (accounts.length === 0) {
+				throw new Error(
+					"Failed to automatically retrieve account IDs for the logged in user.\n" +
+						"In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as `account_id` in your `wrangler.toml` file."
+				);
+			} else {
+				return accounts;
+			}
+		} catch (err) {
+			if ((err as { code: number }).code === 9109) {
+				throw new Error(
+					`Failed to automatically retrieve account IDs for the logged in user.
+You may have incorrect permissions on your API token. You can skip this account check by adding an \`account_id\` in your \`wrangler.toml\`, or by setting the value of CLOUDFLARE_ACCOUNT_ID"`
+				);
+			} else throw err;
 		}
 	}
 }

package/src/user/user.tsx

@@ -1058,7 +1058,8 @@ export function listScopes(message = "💁 Available scopes:"): void {
 		Scope: scope,
 		Description: Scopes[scope],
 	}));
-	render(<Table data={data} />);
+	const { unmount } = render(<Table data={data} />);
+	unmount();
 	// TODO: maybe a good idea to show usage here
 }
 

package/src/whoami.tsx

@@ -8,7 +8,8 @@ import { getAPIToken, getAuthFromEnv } from "./user";
 export async function whoami() {
 	logger.log("Getting User settings...");
 	const user = await getUserInfo();
-	render(<WhoAmI user={user}></WhoAmI>);
+	const { unmount } = render(<WhoAmI user={user}></WhoAmI>);
+	unmount();
 }
 
 export function WhoAmI({ user }: { user: UserInfo | undefined }) {

package/src/worker-namespace.ts

@@ -114,7 +114,7 @@ export function workerNamespaceCommands(
 			const config = readConfig(args.config as ConfigPath, args);
 			const accountId = await requireAuth(config);
 			await listWorkerNamespaces(accountId);
-			metrics.sendMetricsEvent("list worker namespaces", {
+			await metrics.sendMetricsEvent("list worker namespaces", {
 				sendMetrics: config.send_metrics,
 			});
 		})
@@ -132,7 +132,7 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await getWorkerNamespaceInfo(accountId, args.name);
-				metrics.sendMetricsEvent("view worker namespace", {
+				await metrics.sendMetricsEvent("view worker namespace", {
 					sendMetrics: config.send_metrics,
 				});
 			}
@@ -152,7 +152,7 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await createWorkerNamespace(accountId, args.name);
-				metrics.sendMetricsEvent("create worker namespace", {
+				await metrics.sendMetricsEvent("create worker namespace", {
 					sendMetrics: config.send_metrics,
 				});
 			}
@@ -172,7 +172,7 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await deleteWorkerNamespace(accountId, args.name);
-				metrics.sendMetricsEvent("delete worker namespace", {
+				await metrics.sendMetricsEvent("delete worker namespace", {
 					sendMetrics: config.send_metrics,
 				});
 			}
@@ -198,7 +198,7 @@ export function workerNamespaceCommands(
 				const config = readConfig(args.config as ConfigPath, args);
 				const accountId = await requireAuth(config);
 				await renameWorkerNamespace(accountId, args.oldName, args.newName);
-				metrics.sendMetricsEvent("rename worker namespace", {
+				await metrics.sendMetricsEvent("rename worker namespace", {
 					sendMetrics: config.send_metrics,
 				});
 			}

package/templates/pages-shim.ts

@@ -0,0 +1,9 @@
+// This Worker is used as a default when no Pages Functions are present.
+// It proxies the request directly on to the asset server binding.
+
+export default {
+	async fetch(request, env, context) {
+		const response = await env.ASSETS.fetch(request.url, request);
+		return new Response(response.body, response);
+	},
+};

package/wrangler-dist/cli.d.ts

@@ -39,9 +39,37 @@ declare interface DevOptions {
     siteInclude?: string[];
     siteExclude?: string[];
     nodeCompat?: boolean;
+    compatibilityDate?: string;
     experimentalEnableLocalPersistence?: boolean;
-    _: (string | number)[];
-    $0: string;
+    liveReload?: boolean;
+    watch?: boolean;
+    vars: {
+        [key: string]: unknown;
+    };
+    kv?: {
+        binding: string;
+        id: string;
+        preview_id?: string;
+    }[];
+    durableObjects?: {
+        name: string;
+        class_name: string;
+        script_name?: string | undefined;
+        environment?: string | undefined;
+    }[];
+    showInteractiveDevSession?: boolean;
+    logLevel?: "none" | "error" | "log" | "warn" | "debug";
+    logPrefix?: string;
+    inspect?: boolean;
+    forceLocal?: boolean;
+    enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
+    _?: (string | number)[];
+    $0?: string;
+}
+
+declare interface EnablePagesAssetsServiceBindingOptions {
+    proxyPort?: number;
+    directory?: string;
 }
 
 declare class File extends Blob_2 {
@@ -290,9 +318,10 @@ declare interface SpecIterator<T, TReturn = any, TNext = undefined> {
  *  @param {string} script
  *  @param {DevOptions} options
  */
-export declare function unstable_dev(script: string, options: DevOptions): Promise<{
+export declare function unstable_dev(script: string, options: DevOptions, disableExperimentalWarning?: boolean): Promise<{
     stop: () => void;
     fetch: (init?: RequestInit | undefined) => Promise<Response | undefined>;
+    waitUntilExit: () => Promise<void>;
 }>;
 
 export { }