wrangler 2.0.22 → 2.0.23

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/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/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 { }