wrangler 2.1.6 → 2.1.7

package/src/dev/local.tsx

@@ -24,6 +24,7 @@ import type {
 	CfKvNamespace,
 	CfR2Bucket,
 	CfVars,
+	CfD1Database,
 } from "../worker";
 import type { EsbuildBundle } from "./use-esbuild";
 import type { MiniflareOptions } from "miniflare";
@@ -49,7 +50,6 @@ export interface LocalProps {
 	localUpstream: string | undefined;
 	inspect: boolean;
 	onReady: ((ip: string, port: number) => void) | undefined;
-	logLevel: "none" | "error" | "log" | "warn" | "debug" | undefined;
 	logPrefix?: string;
 	enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
 	testScheduled?: boolean;
@@ -86,7 +86,6 @@ function useLocalWorker({
 	localUpstream,
 	inspect,
 	onReady,
-	logLevel,
 	logPrefix,
 	enablePagesAssetsServiceBinding,
 }: LocalProps) {
@@ -171,6 +170,7 @@ function useLocalWorker({
 				usageModel,
 				kv_namespaces: bindings?.kv_namespaces,
 				r2_buckets: bindings?.r2_buckets,
+				d1_databases: bindings?.d1_databases,
 				internalDurableObjects,
 				externalDurableObjects,
 				localPersistencePath,
@@ -182,7 +182,6 @@ function useLocalWorker({
 				dataBlobBindings,
 				crons,
 				upstream,
-				logLevel,
 				logPrefix,
 				workerDefinitions,
 				enablePagesAssetsServiceBinding,
@@ -294,6 +293,7 @@ function useLocalWorker({
 		bindings.durable_objects,
 		bindings.kv_namespaces,
 		bindings.r2_buckets,
+		bindings.d1_databases,
 		bindings.vars,
 		bindings.services,
 		workerDefinitions,
@@ -311,7 +311,6 @@ function useLocalWorker({
 		localProtocol,
 		localUpstream,
 		inspect,
-		logLevel,
 		logPrefix,
 		onReady,
 		enablePagesAssetsServiceBinding,
@@ -414,6 +413,7 @@ interface SetupMiniflareOptionsProps {
 	usageModel: "bundled" | "unbound" | undefined;
 	kv_namespaces: CfKvNamespace[] | undefined;
 	r2_buckets: CfR2Bucket[] | undefined;
+	d1_databases: CfD1Database[] | undefined;
 	internalDurableObjects: CfDurableObject[];
 	externalDurableObjects: CfDurableObject[];
 	localPersistencePath: string | null;
@@ -425,7 +425,6 @@ interface SetupMiniflareOptionsProps {
 	dataBlobBindings: Record<string, string>;
 	crons: Config["triggers"]["crons"];
 	upstream: string | undefined;
-	logLevel: "none" | "error" | "log" | "warn" | "debug" | undefined;
 	logPrefix: string | undefined;
 	workerDefinitions: WorkerRegistry | undefined;
 	enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
@@ -444,6 +443,7 @@ export function setupMiniflareOptions({
 	usageModel,
 	kv_namespaces,
 	r2_buckets,
+	d1_databases,
 	internalDurableObjects,
 	externalDurableObjects,
 	localPersistencePath,
@@ -455,12 +455,10 @@ export function setupMiniflareOptions({
 	dataBlobBindings,
 	crons,
 	upstream,
-	logLevel,
 	logPrefix,
 	workerDefinitions,
 	enablePagesAssetsServiceBinding,
 }: SetupMiniflareOptionsProps): MiniflareOptions {
-	// TODO: This was already messy with the custom `disableLogs` and `logOptions`.
 	// It's now getting _really_ messy now with Pages ASSETS binding outside and the external Durable Objects inside.
 	const options = {
 		name: workerName,
@@ -511,12 +509,14 @@ export function setupMiniflareOptions({
 				})
 				.filter(([_, details]) => !!details)
 		),
+		d1Databases: d1_databases?.map((db) => db.binding),
 		...(localPersistencePath
 			? {
 					cachePersist: path.join(localPersistencePath, "cache"),
 					durableObjectsPersist: path.join(localPersistencePath, "do"),
 					kvPersist: path.join(localPersistencePath, "kv"),
 					r2Persist: path.join(localPersistencePath, "r2"),
+					d1Persist: path.join(localPersistencePath, "d1"),
 			  }
 			: {
 					// We mark these as true, so that they'll
@@ -548,7 +548,7 @@ export function setupMiniflareOptions({
 		logUnhandledRejections: true,
 		crons,
 		upstream,
-		disableLogs: logLevel === "none",
+		logLevel: logger.loggerLevel,
 		logOptions: logPrefix ? { prefix: logPrefix } : undefined,
 		enablePagesAssetsServiceBinding,
 	};

package/src/dev/start-server.ts

@@ -111,7 +111,6 @@ export async function startDevServer(
 			crons: props.crons,
 			localProtocol: props.localProtocol,
 			localUpstream: props.localUpstream,
-			logLevel: props.logLevel,
 			logPrefix: props.logPrefix,
 			inspect: props.inspect,
 			onReady: props.onReady,
@@ -212,6 +211,7 @@ async function runEsbuild({
 				services,
 				firstPartyWorkerDevFacade,
 				targetConsumer: "dev", // We are starting a dev server
+				local: false,
 				testScheduled,
 		  });
 
@@ -246,7 +246,6 @@ export async function startLocalServer({
 	localUpstream,
 	inspect,
 	onReady,
-	logLevel,
 	logPrefix,
 	enablePagesAssetsServiceBinding,
 }: LocalProps) {
@@ -321,6 +320,7 @@ export async function startLocalServer({
 			usageModel,
 			kv_namespaces: bindings?.kv_namespaces,
 			r2_buckets: bindings?.r2_buckets,
+			d1_databases: bindings?.d1_databases,
 			internalDurableObjects,
 			externalDurableObjects,
 			localPersistencePath,
@@ -332,7 +332,6 @@ export async function startLocalServer({
 			dataBlobBindings,
 			crons,
 			upstream,
-			logLevel,
 			logPrefix,
 			workerDefinitions,
 			enablePagesAssetsServiceBinding,

package/src/dev/use-esbuild.ts

@@ -30,12 +30,14 @@ export function useEsbuild({
 	tsconfig,
 	minify,
 	nodeCompat,
+	betaD1Shims,
 	define,
 	noBundle,
 	workerDefinitions,
 	services,
 	durableObjects,
 	firstPartyWorkerDevFacade,
+	local,
 	targetConsumer,
 	testScheduled,
 }: {
@@ -51,10 +53,12 @@ export function useEsbuild({
 	tsconfig: string | undefined;
 	minify: boolean | undefined;
 	nodeCompat: boolean | undefined;
+	betaD1Shims?: string[];
 	noBundle: boolean;
 	workerDefinitions: WorkerRegistry;
 	durableObjects: Config["durable_objects"];
 	firstPartyWorkerDevFacade: boolean | undefined;
+	local: boolean;
 	targetConsumer: "dev" | "publish";
 	testScheduled: boolean;
 }): EsbuildBundle | undefined {
@@ -110,6 +114,7 @@ export function useEsbuild({
 						tsconfig,
 						minify,
 						nodeCompat,
+						betaD1Shims,
 						define,
 						checkFetch: true,
 						assets: assets && {
@@ -120,6 +125,7 @@ export function useEsbuild({
 						workerDefinitions,
 						services,
 						firstPartyWorkerDevFacade,
+						local,
 						targetConsumer,
 						testScheduled,
 				  });
@@ -140,7 +146,6 @@ export function useEsbuild({
 					watcher.close();
 				};
 			}
-
 			setBundle({
 				id: 0,
 				entry,
@@ -179,6 +184,8 @@ export function useEsbuild({
 		durableObjects,
 		workerDefinitions,
 		firstPartyWorkerDevFacade,
+		betaD1Shims,
+		local,
 		targetConsumer,
 		testScheduled,
 	]);

package/src/dev.tsx

@@ -6,6 +6,7 @@ import React from "react";
 import { findWranglerToml, printBindings, readConfig } from "./config";
 import Dev from "./dev/dev";
 import { getVarsForDev } from "./dev/dev-vars";
+import { getLocalPersistencePath } from "./dev/get-local-persistence-path";
 
 import { startDevServer } from "./dev/start-server";
 import { getEntry } from "./entry";
@@ -13,18 +14,19 @@ import { logger } from "./logger";
 import * as metrics from "./metrics";
 import { getAssetPaths, getSiteAssetPaths } from "./sites";
 import { getAccountFromCache } from "./user";
-import { getZoneIdFromHost, getZoneForRoute, getHostFromRoute } from "./zones";
+import { identifyD1BindingsAsBeta } from "./worker";
+import { getHostFromRoute, getZoneForRoute, getZoneIdFromHost } from "./zones";
 import {
-	printWranglerBanner,
-	DEFAULT_LOCAL_PORT,
 	type ConfigPath,
-	getScriptName,
+	DEFAULT_INSPECTOR_PORT,
+	DEFAULT_LOCAL_PORT,
 	getDevCompatibilityDate,
 	getRules,
+	getScriptName,
 	isLegacyEnv,
-	DEFAULT_INSPECTOR_PORT,
+	printWranglerBanner,
 } from "./index";
-import type { Config } from "./config";
+import type { Config, Environment } from "./config";
 import type { Route } from "./config/environment";
 import type { EnablePagesAssetsServiceBindingOptions } from "./miniflare-cli";
 import type { CfWorkerInit } from "./worker";
@@ -69,7 +71,7 @@ interface DevArgs {
 	"persist-to"?: string;
 	"live-reload"?: boolean;
 	onReady?: (ip: string, port: number) => void;
-	logLevel?: "none" | "error" | "log" | "warn" | "debug";
+	logLevel?: "none" | "info" | "error" | "log" | "warn" | "debug";
 	logPrefix?: string;
 	showInteractiveDevSession?: boolean;
 	"test-scheduled"?: boolean;
@@ -280,7 +282,6 @@ export function devOptions(yargs: Argv): Argv<DevArgs> {
 				default: false,
 			})
 			.option("log-level", {
-				// "none" will currently default to "error" for Wrangler Logger
 				choices: ["debug", "info", "log", "warn", "error", "none"] as const,
 				describe: "Specify logging level",
 				default: "log",
@@ -320,6 +321,7 @@ export type AdditionalDevProps = {
 		bucket_name: string;
 		preview_bucket_name?: string;
 	}[];
+	d1Databases?: Environment["d1_databases"];
 };
 
 type StartDevOptions = ArgumentsCamelCase<DevArgs> &
@@ -335,8 +337,7 @@ export async function startDev(args: StartDevOptions) {
 	let rerender: (node: React.ReactNode) => void | undefined;
 	try {
 		if (args.logLevel) {
-			// we don't define a "none" logLevel, so "error" will do for now.
-			logger.loggerLevel = args.logLevel === "none" ? "error" : args.logLevel;
+			logger.loggerLevel = args.logLevel;
 		}
 		await printWranglerBanner();
 
@@ -434,7 +435,6 @@ export async function startDev(args: StartDevOptions) {
 					usageModel={configParam.usage_model}
 					bindings={bindings}
 					crons={configParam.triggers.crons}
-					logLevel={args.logLevel}
 					logPrefix={args.logPrefix}
 					onReady={args.onReady}
 					inspect={args.inspect ?? true}
@@ -464,8 +464,7 @@ export async function startDev(args: StartDevOptions) {
 
 export async function startApiDev(args: StartDevOptions) {
 	if (args.logLevel) {
-		// we don't define a "none" logLevel, so "error" will do for now.
-		logger.loggerLevel = args.logLevel === "none" ? "error" : args.logLevel;
+		logger.loggerLevel = args.logLevel;
 	}
 	await printWranglerBanner();
 
@@ -501,9 +500,13 @@ export async function startApiDev(args: StartDevOptions) {
 			configParam
 		);
 
+		//if args.bundle is on, don't disable bundling
+		//if there's no args.bundle, and configParam.no_bundle is on, disable bundling
+		//otherwise, enable bundling
+		const enableBundling = args.bundle ?? !configParam.no_bundle;
 		return await startDevServer({
 			name: getScriptName({ name: args.name, env: args.env }, configParam),
-			noBundle: !(args.bundle ?? !configParam.no_bundle),
+			noBundle: !enableBundling,
 			entry: entry,
 			env: args.env,
 			zone: zoneId,
@@ -522,7 +525,7 @@ export async function startApiDev(args: StartDevOptions) {
 			upstreamProtocol: upstreamProtocol,
 			localProtocol: args.localProtocol || configParam.dev.local_protocol,
 			localUpstream: args["local-upstream"] || host,
-			localPersistencePath: localPersistencePath,
+			localPersistencePath,
 			liveReload: args.liveReload || false,
 			accountId: configParam.account_id || getAccountFromCache()?.id,
 			assetPaths: assetPaths,
@@ -547,7 +550,6 @@ export async function startApiDev(args: StartDevOptions) {
 			usageModel: configParam.usage_model,
 			bindings: bindings,
 			crons: configParam.triggers.crons,
-			logLevel: args.logLevel,
 			logPrefix: args.logPrefix,
 			onReady: args.onReady,
 			inspect: args.inspect ?? true,
@@ -683,7 +685,6 @@ async function validateDevServerSettings(
 			"The --assets argument is experimental and may change or break at any time"
 		);
 	}
-
 	const upstreamProtocol =
 		args["upstream-protocol"] || config.dev.upstream_protocol;
 	if (upstreamProtocol === "http") {
@@ -708,17 +709,11 @@ async function validateDevServerSettings(
 		);
 	}
 
-	const localPersistencePath = args.persistTo
-		? // If path specified, always treat it as relative to cwd()
-		  path.resolve(process.cwd(), args.persistTo)
-		: args.persist
-		? // If just flagged on, treat it as relative to wrangler.toml,
-		  // if one can be found, otherwise cwd()
-		  path.resolve(
-				config.configPath ? path.dirname(config.configPath) : process.cwd(),
-				".wrangler/state"
-		  )
-		: null;
+	const localPersistencePath = getLocalPersistencePath(
+		args.persistTo,
+		Boolean(args.persist),
+		config.configPath
+	);
 
 	const cliDefines =
 		args.define?.reduce<Record<string, string>>((collectDefines, d) => {
@@ -758,6 +753,7 @@ async function getBindingsAndAssetPaths(
 		vars: { ...args.vars, ...cliVars },
 		durableObjects: args.durableObjects,
 		r2: args.r2,
+		d1Databases: args.d1Databases,
 	});
 
 	const maskedVars = maskVars(bindings, configParam);
@@ -844,6 +840,10 @@ async function getBindings(
 		services: configParam.services,
 		unsafe: configParam.unsafe?.bindings,
 		logfwdr: configParam.logfwdr,
+		d1_databases: identifyD1BindingsAsBeta([
+			...configParam.d1_databases,
+			...(args.d1Databases || []),
+		]),
 	};
 
 	return bindings;

package/src/dialogs.tsx

@@ -138,6 +138,10 @@ export function select(
 	});
 }
 
+export function logDim(msg: string) {
+	console.log(chalk.gray(msg));
+}
+
 export async function fromDashMessagePrompt(
 	deploySource: "dash" | "wrangler" | "api"
 ): Promise<boolean | void> {

package/src/environment-variables.ts

@@ -1,5 +1,20 @@
 import { logger } from "./logger";
 
+type VariableNames =
+	| "CLOUDFLARE_ACCOUNT_ID"
+	| "CLOUDFLARE_API_TOKEN"
+	| "CLOUDFLARE_API_KEY"
+	| "CLOUDFLARE_EMAIL"
+	| "WRANGLER_SEND_METRICS"
+	| "CLOUDFLARE_API_BASE_URL"
+	| "WRANGLER_LOG";
+
+type DeprecatedNames =
+	| "CF_ACCOUNT_ID"
+	| "CF_API_TOKEN"
+	| "CF_API_KEY"
+	| "CF_EMAIL"
+	| "CF_API_BASE_URL";
 /**
  * Create a function used to access an environment variable.
  *
@@ -11,8 +26,8 @@ export function getEnvironmentVariableFactory({
 	deprecatedName,
 	defaultValue,
 }: {
-	variableName: string;
-	deprecatedName?: string;
+	variableName: VariableNames;
+	deprecatedName?: DeprecatedNames;
 	defaultValue?: string;
 }) {
 	let hasWarned = false;

package/src/index.tsx

@@ -7,33 +7,34 @@ import TOML from "@iarna/toml";
 import chalk from "chalk";
 import onExit from "signal-exit";
 import supportsColor from "supports-color";
-import { setGlobalDispatcher, ProxyAgent } from "undici";
+import { ProxyAgent, setGlobalDispatcher } from "undici";
 import makeCLI from "yargs";
 import { version as wranglerVersion } from "../package.json";
 import { fetchResult } from "./cfetch";
 import { findWranglerToml, readConfig } from "./config";
 import { createWorkerUploadForm } from "./create-worker-upload-form";
+import { d1api } from "./d1";
 import { devHandler, devOptions } from "./dev";
 import { confirm, prompt } from "./dialogs";
 import { workerNamespaceCommands } from "./dispatch-namespace";
 import { getEntry } from "./entry";
 import { DeprecationError } from "./errors";
 import { generateHandler, generateOptions } from "./generate";
-import { initOptions, initHandler } from "./init";
+import { initHandler, initOptions } from "./init";
 import {
-	getKVNamespaceId,
-	listKVNamespaces,
-	listKVNamespaceKeys,
-	putKVKeyValue,
-	putKVBulkKeyValue,
-	deleteKVBulkKeyValue,
 	createKVNamespace,
-	isValidKVNamespaceBinding,
+	deleteKVBulkKeyValue,
+	deleteKVKeyValue,
+	deleteKVNamespace,
 	getKVKeyValue,
+	getKVNamespaceId,
 	isKVKeyValue,
+	isValidKVNamespaceBinding,
+	listKVNamespaceKeys,
+	listKVNamespaces,
+	putKVBulkKeyValue,
+	putKVKeyValue,
 	unexpectedKVKeyValueProps,
-	deleteKVNamespace,
-	deleteKVKeyValue,
 } from "./kv";
 import { logger } from "./logger";
 import * as metrics from "./metrics";
@@ -66,11 +67,11 @@ import {
 } from "./tail";
 import { updateCheck } from "./update-check";
 import {
+	listScopes,
 	login,
 	logout,
-	listScopes,
-	validateScopeKeys,
 	requireAuth,
+	validateScopeKeys,
 } from "./user";
 import { whoami } from "./whoami";
 
@@ -80,7 +81,6 @@ import type { KeyValue } from "./kv";
 import type { TailCLIFilters } from "./tail";
 import type { Readable } from "node:stream";
 import type { RawData } from "ws";
-import type { CommandModule } from "yargs";
 import type Yargs from "yargs";
 
 export type ConfigPath = string | undefined;
@@ -262,7 +262,7 @@ function createCLIParser(argv: string[]) {
 		.wrap(null);
 
 	// Default help command that supports the subcommands
-	const subHelp: CommandModule = {
+	const subHelp: Yargs.CommandModule = {
 		command: ["*"],
 		handler: async (args) => {
 			setImmediate(() =>
@@ -578,7 +578,6 @@ function createCLIParser(argv: string[]) {
 					"The --assets argument is experimental and may change or break at any time"
 				);
 			}
-
 			if (args.latest) {
 				logger.warn(
 					"Using the latest version of the Workers runtime. To silence this warning, please choose a specific version of the runtime with --compatibility-date, or add a compatibility_date to your wrangler.toml.\n"
@@ -1015,6 +1014,7 @@ function createCLIParser(argv: string[]) {
 											vars: {},
 											durable_objects: { bindings: [] },
 											r2_buckets: [],
+											d1_databases: [],
 											services: [],
 											wasm_modules: {},
 											text_blobs: {},
@@ -2182,6 +2182,8 @@ function createCLIParser(argv: string[]) {
 		}
 	);
 
+	wrangler.command("d1", "🗄  Interact with a D1 database", d1api);
+
 	wrangler.command(
 		"pubsub",
 		"📮 Interact and manage Pub/Sub Brokers",

package/src/logger.ts

@@ -3,10 +3,12 @@ import { formatMessagesSync } from "esbuild";
 import { getEnvironmentVariableFactory } from "./environment-variables";
 
 const LOGGER_LEVELS = {
+	none: -1,
 	error: 0,
 	warn: 1,
-	log: 2,
-	debug: 3,
+	info: 2,
+	log: 3,
+	debug: 4,
 } as const;
 
 type LoggerLevel = keyof typeof LOGGER_LEVELS;
@@ -15,6 +17,7 @@ type LoggerLevel = keyof typeof LOGGER_LEVELS;
 const LOGGER_LEVEL_FORMAT_TYPE_MAP = {
 	error: "error",
 	warn: "warning",
+	info: undefined,
 	log: undefined,
 	debug: undefined,
 } as const;
@@ -31,17 +34,21 @@ class Logger {
 	columns = process.stdout.columns;
 
 	debug = (...args: unknown[]) => this.doLog("debug", args);
+	info = (...args: unknown[]) => this.doLog("info", args);
 	log = (...args: unknown[]) => this.doLog("log", args);
 	warn = (...args: unknown[]) => this.doLog("warn", args);
 	error = (...args: unknown[]) => this.doLog("error", args);
 
-	private doLog(messageLevel: LoggerLevel, args: unknown[]) {
+	private doLog(messageLevel: Exclude<LoggerLevel, "none">, args: unknown[]) {
 		if (LOGGER_LEVELS[this.loggerLevel] >= LOGGER_LEVELS[messageLevel]) {
 			console[messageLevel](this.formatMessage(messageLevel, format(...args)));
 		}
 	}
 
-	private formatMessage(level: LoggerLevel, message: string): string {
+	private formatMessage(
+		level: Exclude<LoggerLevel, "none">,
+		message: string
+	): string {
 		const kind = LOGGER_LEVEL_FORMAT_TYPE_MAP[level];
 		if (kind) {
 			// Format the message using the esbuild formatter.

package/src/miniflare-cli/index.ts

@@ -5,7 +5,6 @@ import {
 } from "@miniflare/durable-objects";
 import {
 	Log,
-	LogLevel,
 	Miniflare,
 	Response as MiniflareResponse,
 	Request as MiniflareRequest,
@@ -14,7 +13,6 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { FatalError } from "../errors";
 import generateASSETSBinding from "./assets";
-import { enumKeys } from "./enum-keys";
 import { getRequestContextCheckOptions } from "./request-context";
 import type { Options } from "./assets";
 import type { AddressInfo } from "net";
@@ -35,26 +33,23 @@ class NoOpLog extends Log {
 }
 
 async function main() {
-	const args = await yargs(hideBin(process.argv))
-		.help(false)
-		.version(false)
-		.option("log", {
-			choices: enumKeys(LogLevel),
-		}).argv;
-
-	const logLevel = LogLevel[args.log ?? "INFO"];
+	const args = await yargs(hideBin(process.argv)).help(false).version(false)
+		.argv;
+
 	const requestContextCheckOptions = await getRequestContextCheckOptions();
 	const config = {
 		...JSON.parse((args._[0] as string) ?? "{}"),
 		...requestContextCheckOptions,
 	};
-	//miniflare's logLevel 0 still logs routes, so lets override the logger
-	config.log = config.disableLogs
-		? new NoOpLog()
-		: new Log(logLevel, config.logOptions);
+	const logLevel = config.logLevel.toUpperCase();
+
+	config.log =
+		config.logLevel === "none"
+			? new NoOpLog()
+			: new Log(logLevel, config.logOptions);
 
-	if (logLevel > LogLevel.INFO) {
-		console.log("OPTIONS:\n", JSON.stringify(config, null, 2));
+	if (logLevel === "DEBUG" || logLevel === "VERBOSE") {
+		console.log("MINIFLARE OPTIONS:\n", JSON.stringify(config, null, 2));
 	}
 
 	config.bindings = {

package/src/pages/dev.tsx

@@ -99,6 +99,10 @@ export function Options(yargs: Argv) {
 				description: "KV namespace to bind (--kv KV_BINDING)",
 				alias: "k",
 			},
+			d1: {
+				type: "array",
+				description: "D1 database to bind",
+			},
 			do: {
 				type: "array",
 				description: "Durable Object to bind (--do NAME=CLASS)",
@@ -146,12 +150,9 @@ export function Options(yargs: Argv) {
 				type: "string",
 				hidden: true,
 			},
-
 			"log-level": {
-				// "none" will currently default to "error" for Wrangler Logger
 				choices: ["debug", "info", "log", "warn", "error", "none"] as const,
 				describe: "Specify logging level",
-				default: "log",
 			},
 		})
 		.epilogue(pagesBetaWarning);
@@ -170,6 +171,7 @@ export const Handler = async ({
 	binding: bindings = [],
 	kv: kvs = [],
 	do: durableObjects = [],
+	d1: d1s = [],
 	r2: r2s = [],
 	"live-reload": liveReload,
 	"local-protocol": localProtocol,
@@ -186,12 +188,8 @@ export const Handler = async ({
 
 	type LogLevelArg = "debug" | "info" | "log" | "warn" | "error" | "none";
 	if (logLevel) {
-		// we don't define a "none" logLevel, so "error" will do for now.
 		// The YargsOptionsToInterface doesn't handle the passing in of Unions from choices in Yargs
-		logger.loggerLevel =
-			(logLevel as LogLevelArg) === "none"
-				? "error"
-				: (logLevel as Exclude<"none", LogLevelArg>);
+		logger.loggerLevel = logLevel as LogLevelArg;
 	}
 
 	if (!local) {
@@ -499,6 +497,12 @@ export const Handler = async ({
 				return { binding: binding.toString(), bucket_name: "" };
 			}),
 
+			d1Databases: d1s.map((binding) => ({
+				binding: binding.toString(),
+				database_id: "", // Required for types, but unused by dev
+				database_name: `local-${binding}`,
+			})),
+
 			enablePagesAssetsServiceBinding: {
 				proxyPort,
 				directory,
@@ -508,8 +512,8 @@ export const Handler = async ({
 			persistTo,
 			showInteractiveDevSession: undefined,
 			inspect: true,
-			logLevel: "warn",
 			logPrefix: "pages",
+			logLevel: logLevel ?? "warn",
 		},
 		{ testMode: false, disableExperimentalWarning: true }
 	);