wrangler 2.1.11 → 2.1.13

package/miniflare-dist/index.mjs

@@ -509,7 +509,7 @@ async function generateHandler({
           (async () => {
             try {
               const links = [];
-              const transformedResponse = new HTMLRewriter().on("link[rel=preconnect],link[rel=preload]", {
+              const transformedResponse = new HTMLRewriter().on("link[rel~=preconnect],link[rel~=preload]", {
                 element(element) {
                   for (const [attributeName] of element.attributes) {
                     if (!ALLOWED_EARLY_HINT_LINK_ATTRIBUTES.includes(

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.1.11",
+	"version": "2.1.13",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -54,6 +54,7 @@
 		"Cloudflare_CA.pem"
 	],
 	"scripts": {
+		"assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
 		"build": "npm run clean && npm run bundle && npm run emit-types",
 		"bundle": "node -r esbuild-register scripts/bundle.ts",
 		"check:type": "tsc",
@@ -62,7 +63,7 @@
 		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
 		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-		"test": "jest --silent=false --verbose=true",
+		"test": "npm run assert-git-version && jest --silent=false --verbose=true",
 		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
 		"test:ci": "npm run test -- --verbose=true --coverage"
 	},
@@ -99,13 +100,13 @@
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
-		"@miniflare/core": "2.9.0",
-		"@miniflare/d1": "2.9.0",
-		"@miniflare/durable-objects": "2.9.0",
+		"@miniflare/core": "2.10.0",
+		"@miniflare/d1": "2.10.0",
+		"@miniflare/durable-objects": "2.10.0",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.14.51",
-		"miniflare": "2.9.0",
+		"miniflare": "2.10.0",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",

package/src/__tests__/d1.test.ts

@@ -0,0 +1,70 @@
+import { mockAccountId } from "./helpers/mock-account-id";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { runWrangler } from "./helpers/run-wrangler";
+
+function endEventLoop() {
+	return new Promise((resolve) => setImmediate(resolve));
+}
+
+describe("d1", () => {
+	const std = mockConsoleMethods();
+
+	mockAccountId();
+
+	it("should show help when no argument is passed", async () => {
+		await runWrangler("d1");
+		await endEventLoop();
+
+		expect(std.out).toMatchInlineSnapshot(`
+		"wrangler d1
+
+		🗄  Interact with a D1 database
+
+		Commands:
+		  wrangler d1 list            List D1 databases
+		  wrangler d1 create <name>   Create D1 database
+		  wrangler d1 delete <name>   Delete D1 database
+		  wrangler d1 backup          Interact with D1 Backups
+		  wrangler d1 execute <name>  Executed command or SQL file
+
+		Flags:
+		  -c, --config   Path to .toml configuration file  [string]
+		  -h, --help     Show help  [boolean]
+		  -v, --version  Show version number  [boolean]
+
+		🚧 'wrangler d1 <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
+	`);
+	});
+
+	it("should show help when an invalid argument is passed", async () => {
+		await expect(() => runWrangler("d1 asdf")).rejects.toThrow(
+			"Unknown argument: asdf"
+		);
+
+		expect(std.err).toMatchInlineSnapshot(`
+		"X [ERROR] Unknown argument: asdf
+
+		"
+	`);
+		expect(std.out).toMatchInlineSnapshot(`
+		"
+		wrangler d1
+
+		🗄  Interact with a D1 database
+
+		Commands:
+		  wrangler d1 list            List D1 databases
+		  wrangler d1 create <name>   Create D1 database
+		  wrangler d1 delete <name>   Delete D1 database
+		  wrangler d1 backup          Interact with D1 Backups
+		  wrangler d1 execute <name>  Executed command or SQL file
+
+		Flags:
+		  -c, --config   Path to .toml configuration file  [string]
+		  -h, --help     Show help  [boolean]
+		  -v, --version  Show version number  [boolean]
+
+		🚧 'wrangler d1 <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
+	`);
+	});
+});

package/src/__tests__/delete.test.ts

@@ -0,0 +1,116 @@
+import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
+import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { mockConfirm } from "./helpers/mock-dialogs";
+import { runInTempDir } from "./helpers/run-in-tmp";
+import { runWrangler } from "./helpers/run-wrangler";
+import writeWranglerToml from "./helpers/write-wrangler-toml";
+
+describe("delete", () => {
+	mockAccountId();
+	mockApiToken();
+	runInTempDir();
+
+	afterEach(() => {
+		unsetAllMocks();
+	});
+
+	const std = mockConsoleMethods();
+
+	it("should delete an entire service by name", async () => {
+		mockConfirm({
+			text: `Are you sure you want to delete my-script? This action cannot be undone.`,
+			result: true,
+		});
+		mockDeleteWorkerRequest({ name: "my-script" });
+		await runWrangler("delete --name my-script");
+
+		expect(std).toMatchInlineSnapshot(`
+		Object {
+		  "debug": "",
+		  "err": "",
+		  "out": "Successfully deleted my-script",
+		  "warn": "",
+		}
+	`);
+	});
+
+	it("should delete a script by configuration", async () => {
+		mockConfirm({
+			text: `Are you sure you want to delete test-name? This action cannot be undone.`,
+			result: true,
+		});
+		writeWranglerToml();
+		mockDeleteWorkerRequest();
+		await runWrangler("delete");
+
+		expect(std).toMatchInlineSnapshot(`
+		Object {
+		  "debug": "",
+		  "err": "",
+		  "out": "Successfully deleted test-name",
+		  "warn": "",
+		}
+	`);
+	});
+
+	it("shouldn't delete a service when doing a --dry-run", async () => {
+		await runWrangler("delete --name xyz --dry-run");
+
+		expect(std).toMatchInlineSnapshot(`
+		Object {
+		  "debug": "",
+		  "err": "",
+		  "out": "--dry-run: exiting now.",
+		  "warn": "",
+		}
+	`);
+	});
+
+	it('shouldn\'t delete when the user says "no"', async () => {
+		mockConfirm({
+			text: `Are you sure you want to delete xyz? This action cannot be undone.`,
+			result: false,
+		});
+
+		await runWrangler("delete --name xyz");
+
+		expect(std).toMatchInlineSnapshot(`
+		Object {
+		  "debug": "",
+		  "err": "",
+		  "out": "",
+		  "warn": "",
+		}
+	`);
+	});
+});
+
+/** Create a mock handler for the request to upload a worker script. */
+function mockDeleteWorkerRequest(
+	options: {
+		name?: string;
+		env?: string;
+		legacyEnv?: boolean;
+	} = {}
+) {
+	const { env, legacyEnv, name } = options;
+	setMockResponse(
+		// there's no special handling for environments yet
+		"/accounts/:accountId/workers/services/:scriptName",
+		"DELETE",
+		async ([_url, accountId, scriptName], { method }, queryParams) => {
+			expect(accountId).toEqual("some-account-id");
+			expect(method).toEqual("DELETE");
+			expect(scriptName).toEqual(
+				legacyEnv && env
+					? `${name || "test-name"}-${env}`
+					: `${name || "test-name"}`
+			);
+
+			expect(queryParams.get("force")).toEqual("true");
+
+			return null;
+		}
+	);
+}

package/src/__tests__/dev.test.tsx

@@ -48,7 +48,7 @@ describe("wrangler dev", () => {
 			          \`\`\`
 			          --compatibility-date=<current-date>
 			          \`\`\`
-			          See https://developers.cloudflare.com/workers/platform/compatibility-dates for more information.
+			          See https://developers.cloudflare.com/workers/platform/compatibility-dates/ for more information.
 
 			        "
 		      `);
@@ -301,7 +301,10 @@ describe("wrangler dev", () => {
 			writeWranglerToml({
 				main: "index.js",
 				routes: [
-					{ pattern: "https://some-domain.com/*", zone_name: "some-zone.com" },
+					{
+						pattern: "https://some-zone.com/*",
+						zone_name: "some-zone.com",
+					},
 				],
 			});
 			fs.writeFileSync("index.js", `export default {};`);

package/src/__tests__/get-host-from-url.test.ts

@@ -0,0 +1,16 @@
+import { getHostFromUrl } from "../zones";
+
+//return the host given a url-like string
+describe("getHostFromUrl", () => {
+	it("should return the host from a url", () => {
+		expect(getHostFromUrl("https://www.example.com")).toBe("www.example.com");
+	});
+
+	it("should return the host from a url using wildcard *.", () => {
+		expect(getHostFromUrl("*.example.com")).toBe("example.com");
+	});
+
+	it("should return the host from a url using wildcard *", () => {
+		expect(getHostFromUrl("*example.com")).toBe("example.com");
+	});
+});

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

@@ -1,5 +1,5 @@
 import { createFetchResult, setMockRawResponse } from "./mock-cfetch";
-import type { NamespaceKeyInfo } from "../../kv";
+import type { NamespaceKeyInfo } from "../../kv/helpers";
 
 export function mockKeyListRequest(
 	expectedNamespaceId: string,

package/src/__tests__/helpers/msw/handlers/script.ts

@@ -0,0 +1,75 @@
+import { rest } from "msw";
+import type { WorkerMetadata } from "../../../../create-worker-upload-form";
+
+const bindings: Record<string, WorkerMetadata["bindings"]> = {
+	"durable-object": [
+		{
+			type: "durable_object_namespace",
+			name: "TestDO",
+			class_name: "TestDO",
+		},
+	],
+};
+const scripts: Record<string, string> = {
+	websocket: `new WebSocket("ws://dummy")`,
+	response: `return new Response("ok")`,
+};
+function getBindings(scriptName: string) {
+	return scriptName.split("--").flatMap((part) => bindings[part] ?? []);
+}
+function getScript(scriptName: string) {
+	return `export default {fetch(request){
+    ${scriptName
+			.split("--")
+			.map((part) => scripts[part] ?? "")
+			.join(";\n")}
+  }}`;
+}
+export default [
+	rest.get(
+		"*/accounts/:accountId/workers/services/:scriptName/environments/:env/content",
+		({ params: { scriptName } }, res, context) => {
+			return res(
+				context.status(200),
+				context.text(getScript(scriptName as string))
+			);
+		}
+	),
+	rest.get(
+		"*/accounts/:accountId/workers/scripts/:scriptName",
+		({ params: { scriptName } }, res, context) => {
+			return res(
+				context.status(200),
+				context.text(getScript(scriptName as string))
+			);
+		}
+	),
+	rest.get(
+		"*/accounts/:accountId/workers/services/:scriptName/environments/:env/bindings",
+		({ params: { scriptName } }, res, context) => {
+			return res(
+				context.status(200),
+				context.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: getBindings(scriptName as string),
+				})
+			);
+		}
+	),
+	rest.get(
+		"*/accounts/:accountId/workers/scripts/:scriptName/bindings",
+		({ params: { scriptName } }, res, context) => {
+			return res(
+				context.status(200),
+				context.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: getBindings(scriptName as string),
+				})
+			);
+		}
+	),
+];

package/src/__tests__/helpers/msw/index.ts

@@ -2,8 +2,8 @@ import { setupServer } from "msw/node";
 import { mswSuccessNamespacesHandlers } from "./handlers/namespaces";
 import { mswSuccessOauthHandlers } from "./handlers/oauth";
 import { mswSuccessR2handlers } from "./handlers/r2";
+import { default as mswScriptHandlers } from "./handlers/script";
 import { mswSuccessUserHandlers } from "./handlers/user";
-
 export const msw = setupServer();
 
 export {
@@ -11,4 +11,5 @@ export {
 	mswSuccessR2handlers,
 	mswSuccessOauthHandlers,
 	mswSuccessNamespacesHandlers,
+	mswScriptHandlers,
 };

package/src/__tests__/index.test.ts

@@ -34,6 +34,7 @@ describe("wrangler", () => {
 			  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 delete [script]     🗑 Delete your Worker from Cloudflare.
 			  wrangler tail [worker]       🦚 Starts a log tailing session for a published Worker.
 			  wrangler secret              🤫 Generate a secret that can be referenced in a Worker
 			  wrangler secret:bulk <json>  🗄️  Bulk upload secrets for a Worker
@@ -75,6 +76,7 @@ describe("wrangler", () => {
 			  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 delete [script]     🗑 Delete your Worker from Cloudflare.
 			  wrangler tail [worker]       🦚 Starts a log tailing session for a published Worker.
 			  wrangler secret              🤫 Generate a secret that can be referenced in a Worker
 			  wrangler secret:bulk <json>  🗄️  Bulk upload secrets for a Worker

package/src/__tests__/kv.test.ts

@@ -17,7 +17,11 @@ import { mockGetMemberships } from "./helpers/mock-oauth-flow";
 import { mockProcess } from "./helpers/mock-process";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
-import type { KeyValue, KVNamespaceInfo, NamespaceKeyInfo } from "../kv";
+import type {
+	KeyValue,
+	KVNamespaceInfo,
+	NamespaceKeyInfo,
+} from "../kv/helpers";
 
 describe("wrangler", () => {
 	mockAccountId();

package/src/__tests__/publish.test.ts

@@ -28,8 +28,8 @@ import { writeWorkerSource } from "./helpers/write-worker-source";
 import writeWranglerToml from "./helpers/write-wrangler-toml";
 import type { Config } from "../config";
 import type { WorkerMetadata } from "../create-worker-upload-form";
-import type { KVNamespaceInfo } from "../kv";
-import type { CustomDomainChangeset, CustomDomain } from "../publish";
+import type { KVNamespaceInfo } from "../kv/helpers";
+import type { CustomDomainChangeset, CustomDomain } from "../publish/publish";
 import type { CfWorkerInit } from "../worker";
 import type { FormData, File } from "undici";
 
@@ -400,17 +400,17 @@ describe("publish", () => {
 				await expect(
 					runWrangler("publish index.js --env some-env --legacy-env true")
 				).rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Processing wrangler.toml configuration:
-                  - No environment found in configuration with name \\"some-env\\".
-                    Before using \`--env=some-env\` there should be an equivalent environment section in the configuration.
-                    The available configured environment names are: [\\"other-env\\"]
+			                "Processing wrangler.toml configuration:
+			                  - No environment found in configuration with name \\"some-env\\".
+			                    Before using \`--env=some-env\` there should be an equivalent environment section in the configuration.
+			                    The available configured environment names are: [\\"other-env\\"]
 
-                    Consider adding an environment configuration section to the wrangler.toml file:
-                    \`\`\`
-                    [env.some-env]
-                    \`\`\`
-                "
-              `);
+			                    Consider adding an environment configuration section to the wrangler.toml file:
+			                    \`\`\`
+			                    [env.some-env]
+			                    \`\`\`
+			                "
+		              `);
 			});
 
 			it("should throw an error w/ helpful message when using --env --name", async () => {
@@ -790,9 +790,9 @@ describe("publish", () => {
 			});
 			await expect(runWrangler("publish ./index --env=staging")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "Service environments combined with an API token that doesn't have 'All Zones' permissions is not supported.
-              Either turn off service environments by setting \`legacy_env = true\`, creating an API token with 'All Zones' permissions, or logging in via OAuth"
-            `);
+			              "Service environments combined with an API token that doesn't have 'All Zones' permissions is not supported.
+			              Either turn off service environments by setting \`legacy_env = true\`, creating an API token with 'All Zones' permissions, or logging in via OAuth"
+		            `);
 		});
 
 		describe("custom domains", () => {
@@ -1180,11 +1180,11 @@ Update them to point to this script instead?`,
 			});
 			await expect(runWrangler("publish")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "Processing wrangler.toml configuration:
-                - Don't define both the \`main\` and \`build.upload.main\` fields in your configuration.
-                  They serve the same purpose: to point to the entry-point of your worker.
-                  Delete the \`build.upload.main\` and \`build.upload.dir\` field from your config."
-            `);
+			              "Processing wrangler.toml configuration:
+			                - Don't define both the \`main\` and \`build.upload.main\` fields in your configuration.
+			                  They serve the same purpose: to point to the entry-point of your worker.
+			                  Delete the \`build.upload.main\` and \`build.upload.dir\` field from your config."
+		            `);
 		});
 
 		it("should be able to transpile TypeScript (esm)", async () => {
@@ -1375,9 +1375,9 @@ addEventListener('fetch', event => {});`
 
 			await expect(runWrangler("publish ./index.js")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "Processing wrangler.toml configuration:
-                - \\"site.bucket\\" is a required field."
-            `);
+			              "Processing wrangler.toml configuration:
+			                - \\"site.bucket\\" is a required field."
+		            `);
 
 			expect(std.out).toMatchInlineSnapshot(`
 			        "
@@ -1521,11 +1521,11 @@ addEventListener('fetch', event => {});`
 
 			await expect(runWrangler("publish")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "Processing wrangler.toml configuration:
-                - Don't define both the \`main\` and \`site.entry-point\` fields in your configuration.
-                  They serve the same purpose: to point to the entry-point of your worker.
-                  Delete the deprecated \`site.entry-point\` field from your config."
-            `);
+			              "Processing wrangler.toml configuration:
+			                - Don't define both the \`main\` and \`site.entry-point\` fields in your configuration.
+			                  They serve the same purpose: to point to the entry-point of your worker.
+			                  Delete the deprecated \`site.entry-point\` field from your config."
+		            `);
 		});
 
 		it("should error if there is no entry-point specified", async () => {
@@ -3301,7 +3301,7 @@ addEventListener('fetch', event => {});`
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
-		it("should error politely when publishing to workers_dev when there is no workers.dev subdomain", async () => {
+		it("should offer to create a new workers.dev subdomain when publishing to workers_dev without one", async () => {
 			writeWranglerToml({
 				workers_dev: true,
 			});
@@ -3309,12 +3309,16 @@ addEventListener('fetch', event => {});`
 			mockUploadWorkerRequest();
 			mockSubDomainRequest("does-not-exist", false);
 
+			mockConfirm({
+				text: `Would you like to register a workers.dev subdomain now?`,
+				result: false,
+			});
+
 			await expect(runWrangler("publish ./index")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "Error: You need to register a workers.dev subdomain before publishing to workers.dev
-              You can either publish your worker to one or more routes by specifying them in wrangler.toml, or register a workers.dev subdomain here:
-              https://dash.cloudflare.com/some-account-id/workers/onboarding"
-            `);
+			"You can either publish your worker to one or more routes by specifying them in wrangler.toml, or register a workers.dev subdomain here:
+			https://dash.cloudflare.com/some-account-id/workers/onboarding"
+		`);
 		});
 
 		it("should not deploy to workers.dev if there are any routes defined", async () => {
@@ -3667,6 +3671,31 @@ addEventListener('fetch', event => {});`
 				`console.log(789);`
 			);
 		});
+
+		it("can be overridden with cli args containing colons", async () => {
+			writeWranglerToml({
+				main: "index.js",
+				define: {
+					abc: "123",
+				},
+			});
+			fs.writeFileSync(
+				"index.js",
+				`
+				console.log(abc);
+			`
+			);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			await runWrangler(
+				"publish --dry-run --outdir dist --define abc:'https://www.abc.net.au/news/'"
+			);
+
+			expect(fs.readFileSync("dist/index.js", "utf-8")).toContain(
+				// eslint-disable-next-line no-useless-escape
+				`console.log(\"https://www.abc.net.au/news/\");`
+			);
+		});
 	});
 	describe("custom builds", () => {
 		beforeEach(() => {
@@ -3734,9 +3763,9 @@ addEventListener('fetch', event => {});`
 
 			await expect(runWrangler("publish index.js")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
-              The \`main\` property in wrangler.toml should point to the file generated by the custom build."
-            `);
+			              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+			              The \`main\` property in wrangler.toml should point to the file generated by the custom build."
+		            `);
 			expect(std.out).toMatchInlineSnapshot(`
 			        "Running custom build: node -e \\"console.log('custom build');\\"
 
@@ -3766,16 +3795,16 @@ addEventListener('fetch', event => {});`
 
 			await expect(runWrangler("publish")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "The expected output file at \\".\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
-              The \`main\` property in wrangler.toml should point to the file generated by the custom build.
-              The provided entry-point path, \\".\\", points to a directory, rather than a file.
-
-              Did you mean to set the main field to one of:
-              \`\`\`
-              main = \\"./worker.js\\"
-              main = \\"./dist/index.ts\\"
-              \`\`\`"
-            `);
+			              "The expected output file at \\".\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+			              The \`main\` property in wrangler.toml should point to the file generated by the custom build.
+			              The provided entry-point path, \\".\\", points to a directory, rather than a file.
+
+			              Did you mean to set the main field to one of:
+			              \`\`\`
+			              main = \\"./worker.js\\"
+			              main = \\"./dist/index.ts\\"
+			              \`\`\`"
+		            `);
 			expect(std.out).toMatchInlineSnapshot(`
 			        "Running custom build: node -e \\"console.log('custom build');\\"
 
@@ -5538,12 +5567,12 @@ addEventListener('fetch', event => {});`
 
 				await expect(runWrangler("publish index.js")).rejects
 					.toThrowErrorMatchingInlineSnapshot(`
-                              "You seem to be trying to use Durable Objects in a Worker written as a service-worker.
-                              You can use Durable Objects defined in other Workers by specifying a \`script_name\` in your wrangler.toml, where \`script_name\` is the name of the Worker that implements that Durable Object. For example:
-                              { name = EXAMPLE_DO_BINDING, class_name = ExampleDurableObject } ==> { name = EXAMPLE_DO_BINDING, class_name = ExampleDurableObject, script_name = example-do-binding-worker }
-                              Alternatively, migrate your worker to ES Module syntax to implement a Durable Object in this Worker:
-                              https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
-                          `);
+			                              "You seem to be trying to use Durable Objects in a Worker written as a service-worker.
+			                              You can use Durable Objects defined in other Workers by specifying a \`script_name\` in your wrangler.toml, where \`script_name\` is the name of the Worker that implements that Durable Object. For example:
+			                              { name = EXAMPLE_DO_BINDING, class_name = ExampleDurableObject } ==> { name = EXAMPLE_DO_BINDING, class_name = ExampleDurableObject, script_name = example-do-binding-worker }
+			                              Alternatively, migrate your worker to ES Module syntax to implement a Durable Object in this Worker:
+			                              https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
+		                          `);
 			});
 		});
 

package/src/__tests__/r2.test.ts

@@ -5,7 +5,7 @@ import { mockConsoleMethods } from "./helpers/mock-console";
 import { msw, mswSuccessR2handlers } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
-import type { R2BucketInfo } from "../r2";
+import type { R2BucketInfo } from "../r2/helpers";
 
 describe("r2", () => {
 	const std = mockConsoleMethods();