wrangler 0.0.0-b2c2c2b → 0.0.0-b2d3a9a

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "0.0.0-b2c2c2b",
+	"version": "0.0.0-b2d3a9a",
 	"author": "wrangler@cloudflare.com",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"bin": {
@@ -39,9 +39,10 @@
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
+		"@types/javascript-time-ago": "^2.0.3",
 		"blake3-wasm": "^2.1.5",
-		"esbuild": "0.14.34",
-		"miniflare": "^2.5.1",
+		"esbuild": "0.14.47",
+		"miniflare": "^2.6.0-d1.1",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -85,6 +86,7 @@
 		"ink-table": "^3.0.0",
 		"ink-testing-library": "^2.1.0",
 		"ink-text-input": "^4.0.3",
+		"javascript-time-ago": "^2.5.4",
 		"jest-fetch-mock": "^3.0.3",
 		"jest-websocket-mock": "^2.3.0",
 		"mime": "^3.0.0",
@@ -94,6 +96,7 @@
 		"prompts": "^2.4.2",
 		"react": "^17.0.2",
 		"react-error-boundary": "^3.1.4",
+		"remove-accents-esm": "^0.0.1",
 		"serve-static": "^1.15.0",
 		"signal-exit": "^3.0.7",
 		"supports-color": "^9.2.2",
@@ -122,7 +125,7 @@
 		"check:type": "tsc",
 		"bundle": "node -r esbuild-register scripts/bundle.ts",
 		"build": "npm run clean && npm run bundle",
-		"dev": "npm run clean && concurrently -c black,blue 'npm run bundle -- --watch' 'npm run check:type -- --watch --preserveWatchOutput'",
+		"dev": "npm run clean && concurrently -k -c black,blue 'npm run bundle -- --watch' 'npm run check:type -- --watch --preserveWatchOutput'",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
 		"start": "npm run bundle && NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
 		"test": "jest --silent=false --verbose=true",

package/src/__tests__/configuration.test.ts

@@ -16,6 +16,7 @@ describe("normalizeAndValidateConfig()", () => {
 
 		expect(config).toEqual({
 			account_id: undefined,
+			assets: undefined,
 			build: {
 				command: undefined,
 				cwd: undefined,
@@ -24,6 +25,7 @@ describe("normalizeAndValidateConfig()", () => {
 			compatibility_date: undefined,
 			compatibility_flags: [],
 			configPath: undefined,
+			d1_databases: [],
 			dev: {
 				ip: "localhost",
 				local_protocol: "http",
@@ -2471,28 +2473,28 @@ describe("normalizeAndValidateConfig()", () => {
 			);
 			expect(diagnostics.hasErrors()).toBe(false);
 			expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
-			        "Processing wrangler configuration:
-			          - \\"unsafe\\" fields are experimental and may change or break at any time.
-			          - \\"env.ENV1\\" environment configuration
-			            - \\"vars\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"vars\\" is not inherited by environments.
-			              Please add \\"vars\\" to \\"env.ENV1\\".
-			            - \\"define\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"define\\" is not inherited by environments.
-			              Please add \\"define\\" to \\"env.ENV1\\".
-			            - \\"durable_objects\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"durable_objects\\" is not inherited by environments.
-			              Please add \\"durable_objects\\" to \\"env.ENV1\\".
-			            - \\"kv_namespaces\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"kv_namespaces\\" is not inherited by environments.
-			              Please add \\"kv_namespaces\\" to \\"env.ENV1\\".
-			            - \\"r2_buckets\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"r2_buckets\\" is not inherited by environments.
-			              Please add \\"r2_buckets\\" to \\"env.ENV1\\".
-			            - \\"unsafe\\" exists at the top level, but not on \\"env.ENV1\\".
-			              This is not what you probably want, since \\"unsafe\\" is not inherited by environments.
-			              Please add \\"unsafe\\" to \\"env.ENV1\\"."
-		      `);
+			"Processing wrangler configuration:
+			  - \\"unsafe\\" fields are experimental and may change or break at any time.
+			  - \\"env.ENV1\\" environment configuration
+			    - \\"vars\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"vars\\" is not inherited by environments.
+			      Please add \\"vars\\" to \\"env.ENV1\\".
+			    - \\"define\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"define\\" is not inherited by environments.
+			      Please add \\"define\\" to \\"env.ENV1\\".
+			    - \\"durable_objects\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"durable_objects\\" is not inherited by environments.
+			      Please add \\"durable_objects\\" to \\"env.ENV1\\".
+			    - \\"kv_namespaces\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"kv_namespaces\\" is not inherited by environments.
+			      Please add \\"kv_namespaces\\" to \\"env.ENV1\\".
+			    - \\"r2_buckets\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"r2_buckets\\" is not inherited by environments.
+			      Please add \\"r2_buckets\\" to \\"env.ENV1\\".
+			    - \\"unsafe\\" exists at the top level, but not on \\"env.ENV1\\".
+			      This is not what you probably want, since \\"unsafe\\" is not inherited by environments.
+			      Please add \\"unsafe\\" to \\"env.ENV1\\"."
+		`);
 		});
 
 		it("should error on invalid environment values", () => {

package/src/__tests__/dev.test.tsx

@@ -161,7 +161,6 @@ describe("wrangler dev", () => {
 			);
 		});
 	});
-
 	describe("host", () => {
 		it("should resolve a host to its zone", async () => {
 			writeWranglerToml({
@@ -991,7 +990,6 @@ describe("wrangler dev", () => {
 			await runWrangler("dev --assets abc");
 			expect((Dev as jest.Mock).mock.calls[2][0].isWorkersSite).toEqual(false);
 		});
-
 		it("should warn if --assets is used", async () => {
 			writeWranglerToml({
 				main: "./index.js",

package/src/__tests__/helpers/mock-istty.ts

@@ -6,7 +6,7 @@ const ORIGINAL_STDIN = process.stdin;
  */
 export function useMockIsTTY() {
 	/**
-	 * Explicitly set `process.stdout.isTTY` to a given value (or to a getter function).
+	 * Explicitly set `process.stdout.isTTY` to a given value(or to a getter function).
 	 */
 	const setIsTTY = (
 		isTTY:

package/src/__tests__/index.test.ts

@@ -28,29 +28,30 @@ describe("wrangler", () => {
 			await runWrangler();
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "wrangler
-
-        Commands:
-          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.
-          wrangler tail [name]       🦚 Starts a log tailing session for a published Worker.
-          wrangler secret            🤫 Generate a secret that can be referenced in the worker script
-          wrangler kv:namespace      🗂️  Interact with your Workers KV Namespaces
-          wrangler kv:key            🔑 Individually manage Workers KV key-value pairs
-          wrangler kv:bulk           💪 Interact with multiple Workers KV key-value pairs at once
-          wrangler pages             ⚡️ Configure Cloudflare Pages
-          wrangler r2                📦 Interact with an R2 store
-          wrangler pubsub            📮 Interact and manage Pub/Sub Brokers
-          wrangler login             🔓 Login to Cloudflare
-          wrangler logout            🚪 Logout from Cloudflare
-          wrangler whoami            🕵️  Retrieve your user info and test your auth config
-
-        Flags:
-          -c, --config   Path to .toml configuration file  [string]
-          -h, --help     Show help  [boolean]
-          -v, --version  Show version number  [boolean]"
-      `);
+			"wrangler
+
+			Commands:
+			  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.
+			  wrangler tail [name]       🦚 Starts a log tailing session for a published Worker.
+			  wrangler secret            🤫 Generate a secret that can be referenced in the worker script
+			  wrangler kv:namespace      🗂️  Interact with your Workers KV Namespaces
+			  wrangler kv:key            🔑 Individually manage Workers KV key-value pairs
+			  wrangler kv:bulk           💪 Interact with multiple Workers KV key-value pairs at once
+			  wrangler pages             ⚡️ Configure Cloudflare Pages
+			  wrangler r2                📦 Interact with an R2 store
+			  wrangler d1                🗄  Interact with a D1 database
+			  wrangler pubsub            📮 Interact and manage Pub/Sub Brokers
+			  wrangler login             🔓 Login to Cloudflare
+			  wrangler logout            🚪 Logout from Cloudflare
+			  wrangler whoami            🕵️  Retrieve your user info and test your auth config
+
+			Flags:
+			  -c, --config   Path to .toml configuration file  [string]
+			  -h, --help     Show help  [boolean]
+			  -v, --version  Show version number  [boolean]"
+		`);
 
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -65,35 +66,36 @@ describe("wrangler", () => {
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "
-        wrangler
-
-        Commands:
-          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.
-          wrangler tail [name]       🦚 Starts a log tailing session for a published Worker.
-          wrangler secret            🤫 Generate a secret that can be referenced in the worker script
-          wrangler kv:namespace      🗂️  Interact with your Workers KV Namespaces
-          wrangler kv:key            🔑 Individually manage Workers KV key-value pairs
-          wrangler kv:bulk           💪 Interact with multiple Workers KV key-value pairs at once
-          wrangler pages             ⚡️ Configure Cloudflare Pages
-          wrangler r2                📦 Interact with an R2 store
-          wrangler pubsub            📮 Interact and manage Pub/Sub Brokers
-          wrangler login             🔓 Login to Cloudflare
-          wrangler logout            🚪 Logout from Cloudflare
-          wrangler whoami            🕵️  Retrieve your user info and test your auth config
-
-        Flags:
-          -c, --config   Path to .toml configuration file  [string]
-          -h, --help     Show help  [boolean]
-          -v, --version  Show version number  [boolean]"
-      `);
+			"
+			wrangler
+
+			Commands:
+			  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.
+			  wrangler tail [name]       🦚 Starts a log tailing session for a published Worker.
+			  wrangler secret            🤫 Generate a secret that can be referenced in the worker script
+			  wrangler kv:namespace      🗂️  Interact with your Workers KV Namespaces
+			  wrangler kv:key            🔑 Individually manage Workers KV key-value pairs
+			  wrangler kv:bulk           💪 Interact with multiple Workers KV key-value pairs at once
+			  wrangler pages             ⚡️ Configure Cloudflare Pages
+			  wrangler r2                📦 Interact with an R2 store
+			  wrangler d1                🗄  Interact with a D1 database
+			  wrangler pubsub            📮 Interact and manage Pub/Sub Brokers
+			  wrangler login             🔓 Login to Cloudflare
+			  wrangler logout            🚪 Logout from Cloudflare
+			  wrangler whoami            🕵️  Retrieve your user info and test your auth config
+
+			Flags:
+			  -c, --config   Path to .toml configuration file  [string]
+			  -h, --help     Show help  [boolean]
+			  -v, --version  Show version number  [boolean]"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`
-        "X [ERROR] Unknown argument: invalid-command
+			        "X [ERROR] Unknown argument: invalid-command
 
-        "
-      `);
+			        "
+		      `);
 		});
 	});
 
@@ -121,98 +123,98 @@ describe("wrangler", () => {
 			await runWrangler("secret");
 			await endEventLoop();
 			expect(std.out).toMatchInlineSnapshot(`
-        "wrangler secret
+			        "wrangler secret
 
-        🤫 Generate a secret that can be referenced in the worker script
+			        🤫 Generate a secret that can be referenced in the worker script
 
-        Commands:
-          wrangler secret put <key>     Create or update a secret variable for a script
-          wrangler secret delete <key>  Delete a secret variable from a script
-          wrangler secret list          List all secrets for a script
+			        Commands:
+			          wrangler secret put <key>     Create or update a secret variable for a script
+			          wrangler secret delete <key>  Delete a secret variable from a script
+			          wrangler secret list          List all secrets for a script
 
-        Flags:
-          -c, --config   Path to .toml configuration file  [string]
-          -h, --help     Show help  [boolean]
-          -v, --version  Show version number  [boolean]"
-      `);
+			        Flags:
+			          -c, --config   Path to .toml configuration file  [string]
+			          -h, --help     Show help  [boolean]
+			          -v, --version  Show version number  [boolean]"
+		      `);
 		});
 
 		it("no subcommand 'kv:namespace' should display a list of available subcommands", async () => {
 			await runWrangler("kv:namespace");
 			await endEventLoop();
 			expect(std.out).toMatchInlineSnapshot(`
-        "wrangler kv:namespace
+			        "wrangler kv:namespace
 
-        🗂️  Interact with your Workers KV Namespaces
+			        🗂️  Interact with your Workers KV Namespaces
 
-        Commands:
-          wrangler kv:namespace create <namespace>  Create a new namespace
-          wrangler kv:namespace list                Outputs a list of all KV namespaces associated with your account id.
-          wrangler kv:namespace delete              Deletes a given namespace.
+			        Commands:
+			          wrangler kv:namespace create <namespace>  Create a new namespace
+			          wrangler kv:namespace list                Outputs a list of all KV namespaces associated with your account id.
+			          wrangler kv:namespace delete              Deletes a given namespace.
 
-        Flags:
-          -c, --config   Path to .toml configuration file  [string]
-          -h, --help     Show help  [boolean]
-          -v, --version  Show version number  [boolean]"
-      `);
+			        Flags:
+			          -c, --config   Path to .toml configuration file  [string]
+			          -h, --help     Show help  [boolean]
+			          -v, --version  Show version number  [boolean]"
+		      `);
 		});
 
 		it("no subcommand 'kv:key' should display a list of available subcommands", async () => {
 			await runWrangler("kv:key");
 			await endEventLoop();
 			expect(std.out).toMatchInlineSnapshot(`
-        "wrangler kv:key
+			        "wrangler kv:key
 
-        🔑 Individually manage Workers KV key-value pairs
+			        🔑 Individually manage Workers KV key-value pairs
 
-        Commands:
-          wrangler kv:key put <key> [value]  Writes a single key/value pair to the given namespace.
-          wrangler kv:key list               Outputs a list of all keys in a given namespace.
-          wrangler kv:key get <key>          Reads a single value by key from the given namespace.
-          wrangler kv:key delete <key>       Removes a single key value pair from the given namespace.
+			        Commands:
+			          wrangler kv:key put <key> [value]  Writes a single key/value pair to the given namespace.
+			          wrangler kv:key list               Outputs a list of all keys in a given namespace.
+			          wrangler kv:key get <key>          Reads a single value by key from the given namespace.
+			          wrangler kv:key delete <key>       Removes a single key value pair from the given namespace.
 
-        Flags:
-          -c, --config   Path to .toml configuration file  [string]
-          -h, --help     Show help  [boolean]
-          -v, --version  Show version number  [boolean]"
-      `);
+			        Flags:
+			          -c, --config   Path to .toml configuration file  [string]
+			          -h, --help     Show help  [boolean]
+			          -v, --version  Show version number  [boolean]"
+		      `);
 		});
 
 		it("no subcommand 'kv:bulk' should display a list of available subcommands", async () => {
 			await runWrangler("kv:bulk");
 			await endEventLoop();
 			expect(std.out).toMatchInlineSnapshot(`
-        "wrangler kv:bulk
+			        "wrangler kv:bulk
 
-        💪 Interact with multiple Workers KV key-value pairs at once
+			        💪 Interact with multiple Workers KV key-value pairs at once
 
-        Commands:
-          wrangler kv:bulk put <filename>     Upload multiple key-value pairs to a namespace
-          wrangler kv:bulk delete <filename>  Delete multiple key-value pairs from a namespace
+			        Commands:
+			          wrangler kv:bulk put <filename>     Upload multiple key-value pairs to a namespace
+			          wrangler kv:bulk delete <filename>  Delete multiple key-value pairs from a namespace
 
-        Flags:
-          -c, --config   Path to .toml configuration file  [string]
-          -h, --help     Show help  [boolean]
-          -v, --version  Show version number  [boolean]"
-      `);
+			        Flags:
+			          -c, --config   Path to .toml configuration file  [string]
+			          -h, --help     Show help  [boolean]
+			          -v, --version  Show version number  [boolean]"
+		      `);
 		});
 
 		it("no subcommand 'r2' should display a list of available subcommands", async () => {
 			await runWrangler("r2");
 			await endEventLoop();
 			expect(std.out).toMatchInlineSnapshot(`
-        "wrangler r2
+			        "wrangler r2
 
-        📦 Interact with an R2 store
+			        📦 Interact with an R2 store
 
-        Commands:
-          wrangler r2 bucket  Manage R2 buckets
+			        Commands:
+			          wrangler r2 bucket  Manage R2 buckets
 
-        Flags:
-          -c, --config   Path to .toml configuration file  [string]
-          -h, --help     Show help  [boolean]
-          -v, --version  Show version number  [boolean]"
-      `);
+			        Flags:
+			          -c, --config   Path to .toml configuration file  [string]
+			          -h, --help     Show help  [boolean]
+			          -v, --version  Show version number  [boolean]"
+		      `);
 		});
 	});
 
@@ -220,16 +222,16 @@ describe("wrangler", () => {
 		it("should print a deprecation message for 'generate'", async () => {
 			await runWrangler("generate").catch((err) => {
 				expect(err.message).toMatchInlineSnapshot(`
-          "Deprecation:
-          \`wrangler generate\` has been deprecated.
-          Try running \`wrangler init\` to generate a basic Worker, or cloning the template repository instead:
+			          "Deprecation:
+			          \`wrangler generate\` has been deprecated.
+			          Try running \`wrangler init\` to generate a basic Worker, or cloning the template repository instead:
 
-          \`\`\`
-          git clone https://github.com/cloudflare/worker-template
-          \`\`\`
+			          \`\`\`
+			          git clone https://github.com/cloudflare/worker-template
+			          \`\`\`
 
-          Please refer to https://developers.cloudflare.com/workers/wrangler/deprecations/#generate for more information."
-        `);
+			          Please refer to https://developers.cloudflare.com/workers/wrangler/deprecations/#generate for more information."
+		        `);
 			});
 		});
 	});
@@ -242,16 +244,16 @@ describe("wrangler", () => {
 		await runWrangler("build");
 		await endEventLoop();
 		expect(std.out).toMatchInlineSnapshot(`
-      "▲ [WARNING] Deprecation: \`wrangler build\` has been deprecated.
+		      "▲ [WARNING] Deprecation: \`wrangler build\` has been deprecated.
 
-        Please refer to https://developers.cloudflare.com/workers/wrangler/migration/deprecations/#build
-        for more information.
-        Attempting to run \`wrangler publish --dry-run --outdir=dist\` for you instead:
+		        Please refer to https://developers.cloudflare.com/workers/wrangler/migration/deprecations/#build
+		        for more information.
+		        Attempting to run \`wrangler publish --dry-run --outdir=dist\` for you instead:
 
 
-      --dry-run: exiting now.
-      Total Upload: 0xx KiB / gzip: 0xx KiB"
-    `);
+		      --dry-run: exiting now.
+		      Total Upload: 0xx KiB / gzip: 0xx KiB"
+	    `);
 	});
 });
 

package/src/__tests__/publish.test.ts

@@ -76,14 +76,14 @@ describe("publish", () => {
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Attempting to login via OAuth...
-			        Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
-			        Successfully logged in.
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Attempting to login via OAuth...
+			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Successfully logged in.
+			Total Upload: 0xx KiB / gzip: 0xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  test-name.test-sub-domain.workers.dev"
+		`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -107,14 +107,14 @@ describe("publish", () => {
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Attempting to login via OAuth...
-			        Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
-			        Successfully logged in.
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Attempting to login via OAuth...
+			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Successfully logged in.
+			Total Upload: 0xx KiB / gzip: 0xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  test-name.test-sub-domain.workers.dev"
+		`);
 			expect(std.warn).toMatchInlineSnapshot(`
 			        "▲ [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.
 
@@ -522,7 +522,6 @@ describe("publish", () => {
 			}
 		`);
 		});
-
 		it("should publish to a route with a pattern/{zone_id|zone_name} combo", async () => {
 			writeWranglerToml({
 				routes: [
@@ -3482,7 +3481,6 @@ addEventListener('fetch', event => {});`
 		      `);
 		});
 	});
-
 	describe("custom builds", () => {
 		beforeEach(() => {
 			// @ts-expect-error disable the mock we'd setup earlier

package/src/__tests__/user.test.ts

@@ -46,10 +46,10 @@ describe("User", () => {
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "Attempting to login via OAuth...
-        Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
-        Successfully logged in."
-      `);
+			"Attempting to login via OAuth...
+			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Successfully logged in."
+		`);
 
 			expect(readAuthConfigFile()).toEqual<UserAuthConfig>({
 				api_token: undefined,

package/src/__tests__/whoami.test.tsx

@@ -53,7 +53,6 @@ describe("getUserInfo()", () => {
 		const userInfo = await getUserInfo();
 		expect(userInfo?.email).toBeUndefined();
 	});
-
 	it("should say it's using an API token when one is set", async () => {
 		process.env = {
 			CLOUDFLARE_API_TOKEN: "123456789",
@@ -68,7 +67,6 @@ describe("getUserInfo()", () => {
 				{ name: "Account Three", id: "account-3" },
 			];
 		});
-
 		const userInfo = await getUserInfo();
 		expect(userInfo).toEqual({
 			authType: "API Token",

package/src/bundle.ts

@@ -52,6 +52,7 @@ export async function bundleWorker(
 	destination: string,
 	options: {
 		serveAssetsFromWorker: boolean;
+		betaD1Shims?: string[];
 		jsxFactory: string | undefined;
 		jsxFragment: string | undefined;
 		rules: Config["rules"];
@@ -65,6 +66,7 @@ export async function bundleWorker(
 ): Promise<BundleResult> {
 	const {
 		serveAssetsFromWorker,
+		betaD1Shims,
 		jsxFactory,
 		jsxFragment,
 		rules,
@@ -93,7 +95,7 @@ export async function bundleWorker(
 	});
 
 	const result = await esbuild.build({
-		...getEntryPoint(entry.file, serveAssetsFromWorker),
+		...getEntryPoint(entry.file, serveAssetsFromWorker, betaD1Shims),
 		bundle: true,
 		absWorkingDir: entry.directory,
 		outdir: destination,
@@ -173,14 +175,23 @@ type EntryPoint = { stdin: esbuild.StdinOptions } | { entryPoints: string[] };
  */
 function getEntryPoint(
 	entryFile: string,
-	serveAssetsFromWorker: boolean
+	serveAssetsFromWorker: boolean,
+	betaD1Shims: string[] | undefined
 ): EntryPoint {
-	if (serveAssetsFromWorker) {
+	if (
+		serveAssetsFromWorker ||
+		(Array.isArray(betaD1Shims) && betaD1Shims.length > 0)
+	) {
 		return {
 			stdin: {
 				contents: fs
 					.readFileSync(
-						path.join(__dirname, "../templates/static-asset-facade.js"),
+						path.join(
+							__dirname,
+							serveAssetsFromWorker
+								? "../templates/static-asset-facade.js"
+								: "../templates/d1-beta-facade.js"
+						),
 						"utf8"
 					)
 					// on windows, escape backslashes in the path (`\`)
@@ -190,8 +201,11 @@ function getEntryPoint(
 						path
 							.join(__dirname, "../kv-asset-handler.js")
 							.replaceAll("\\", "\\\\")
-					),
-				sourcefile: "static-asset-facade.js",
+					)
+					.replace("__D1_IMPORTS__", JSON.stringify(betaD1Shims)),
+				sourcefile: serveAssetsFromWorker
+					? "static-asset-facade.js"
+					: "d1-beta-facade.js",
 				resolveDir: path.dirname(entryFile),
 			},
 		};