Refactor some of the shared no bundle logic and address misc PR comments

Author: GregBrimble

.changeset/cuddly-rules-rest.md

@@ -1,5 +1,5 @@
 ---
-"wrangler": patch
+"wrangler": minor
 ---
 
 feat: Add support for the undocumented `_worker.js/` directory in Pages

fixtures/pages-workerjs-directory/public/_worker.js/index.js

@@ -1,6 +1,13 @@
+import staticMod from "./static.js";
+
 export default {
 	async fetch(request, env) {
 		const { pathname } = new URL(request.url);
+
+		if (pathname === "/static") {
+			return new Response(staticMod);
+		}
+
 		if (pathname !== "/") {
 			return new Response((await import(`./${pathname.slice(1)}`)).default);
 		}

fixtures/pages-workerjs-directory/public/_worker.js/static.js

@@ -0,0 +1 @@
+export default "static";

fixtures/pages-workerjs-directory/tests/index.test.ts

@@ -1,4 +1,7 @@
-import { resolve } from "node:path";
+import { execSync } from "node:child_process";
+import { readFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path, { join, resolve } from "node:path";
 import { fetch } from "undici";
 import { describe, it } from "vitest";
 import { runWranglerPagesDev } from "../../shared/src/run-wrangler-long-lived";
@@ -13,9 +16,27 @@ describe.concurrent("Pages _worker.js/ directory", () => {
 		await expect(
 			fetch(`http://${ip}:${port}/`).then((resp) => resp.text())
 		).resolves.toContain("Hello, world!");
+		await expect(
+			fetch(`http://${ip}:${port}/static`).then((resp) => resp.text())
+		).resolves.toContain("static");
 		await expect(
 			fetch(`http://${ip}:${port}/other-script`).then((resp) => resp.text())
 		).resolves.toContain("test");
 		await stop();
 	});
+
+	it("should bundle", async ({ expect }) => {
+		const dir = tmpdir();
+		const file = join(dir, "./_worker.bundle");
+
+		execSync(
+			`npx wrangler pages functions build --build-output-directory public --outfile ${file} --bindings="{\\"d1_databases\\":{\\"FOO\\":{}}}"`,
+			{
+				cwd: path.resolve(__dirname, ".."),
+			}
+		);
+
+		expect(readFileSync(file, "utf-8")).toContain("D1_ERROR");
+		expect(readFileSync(file, "utf-8")).toContain('"static"');
+	});
 });