feat: second-cut of using unenv to create a hybrid node.js compatibility setting (via inject)

.changeset/calm-ducks-happen.md

@@ -0,0 +1,11 @@
+---
+"wrangler": minor
+---
+
+feat: add experimental support for hybrid Node.js compatibility
+
+_This feature is experimental and not yet available for general consumption._
+
+Use a combination of workerd Node.js builtins (behind the `experimental:nodejs_compat_v2` flag) and
+Unenv polyfills (configured to only add those missing from the runtime) to provide a new more effective
+Node.js compatibility approach.

fixtures/nodejs-hybrid-app/package.json

@@ -0,0 +1,19 @@
+{
+	"name": "nodejs-hybrid-app",
+	"private": true,
+	"scripts": {
+		"dev": "wrangler dev",
+		"build": "wrangler deploy --dry-run --outdir=./dist",
+		"test:ci": "vitest run",
+		"test:watch": "vitest"
+	},
+	"devDependencies": {
+		"@cloudflare/workers-tsconfig": "workspace:*",
+		"@cloudflare/workers-types": "^4.20240222.0",
+		"@types/pg": "^8.11.2",
+		"pg": "8.11.3",
+		"pg-cloudflare": "^1.1.1",
+		"undici": "^5.28.3",
+		"wrangler": "workspace:*"
+	}
+}

fixtures/nodejs-hybrid-app/src/index.ts

@@ -0,0 +1,44 @@
+// node:assert/strict is currently an unenv alias to node:assert
+// this is not very common, but happens and we need to support it
+import assert from "node:assert/strict";
+import { Client } from "pg";
+
+assert(true, "the world is broken");
+
+/**
+ * Welcome to Cloudflare Workers! This is your first worker.
+ *
+ * - Run `npm run dev` in your terminal to start a development server
+ * - Open a browser tab at http://localhost:8787/ to see your worker in action
+ * - Run `npm run deploy` to publish your worker
+ *
+ * Learn more at https://developers.cloudflare.com/workers/
+ */
+
+export default {
+	async fetch(
+		request: Request,
+		env: Env,
+		ctx: ExecutionContext
+	): Promise<Response> {
+		const client = new Client({
+			user: env.DB_USERNAME,
+			password: env.DB_PASSWORD,
+			host: env.DB_HOSTNAME,
+			port: Number(env.DB_PORT),
+			database: env.DB_NAME,
+		});
+		await client.connect();
+		const result = await client.query(`SELECT * FROM rnc_database`);
+		assert(true);
+
+		// Return the first row as JSON
+		const resp = new Response(JSON.stringify(result.rows[0]), {
+			headers: { "Content-Type": "application/json" },
+		});
+
+		// Clean up the client
+		ctx.waitUntil(client.end());
+		return resp;
+	},
+};

fixtures/nodejs-hybrid-app/tests/index.test.ts

@@ -0,0 +1,22 @@
+import { resolve } from "node:path";
+import { fetch } from "undici";
+import { describe, it } from "vitest";
+import { runWranglerDev } from "../../shared/src/run-wrangler-long-lived";
+
+describe("nodejs compat", () => {
+	it("should work when running code requiring polyfills", async ({
+		expect,
+	}) => {
+		const { ip, port, stop } = await runWranglerDev(
+			resolve(__dirname, "../src"),
+			["--port=0", "--inspector-port=0"]
+		);
+		try {
+			const response = await fetch(`http://${ip}:${port}`);
+			const result = (await response.json()) as { id: string };
+			expect(result.id).toEqual("1");
+		} finally {
+			await stop();
+		}
+	});
+});

fixtures/nodejs-hybrid-app/tests/tsconfig.json

@@ -0,0 +1,7 @@
+{
+	"extends": "@cloudflare/workers-tsconfig/tsconfig.json",
+	"compilerOptions": {
+		"types": ["node"]
+	},
+	"include": ["**/*.ts", "../../../node-types.d.ts"]
+}

fixtures/nodejs-hybrid-app/tsconfig.json

@@ -0,0 +1,17 @@
+{
+	"compilerOptions": {
+		"module": "esnext",
+		"target": "esnext",
+		"lib": ["esnext"],
+		"strict": true,
+		"isolatedModules": true,
+		"noEmit": true,
+		"types": [
+			"@cloudflare/workers-types/experimental",
+			"./worker-configuration.d.ts"
+		],
+		"allowJs": true,
+		"allowSyntheticDefaultImports": true
+	},
+	"include": ["src"]
+}

fixtures/nodejs-hybrid-app/turbo.json

@@ -0,0 +1,9 @@
+{
+	"$schema": "http://turbo.build/schema.json",
+	"extends": ["//"],
+	"pipeline": {
+		"build": {
+			"outputs": ["dist/**"]
+		}
+	}
+}

fixtures/nodejs-hybrid-app/vitest.config.ts

@@ -0,0 +1,9 @@
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
+
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/nodejs-hybrid-app/worker-configuration.d.ts

@@ -0,0 +1,10 @@
+// Generated by Wrangler on Tue Mar 05 2024 16:04:07 GMT+0000 (Greenwich Mean Time)
+// by running `wrangler types`
+
+interface Env {
+	DB_HOSTNAME: "hh-pgsql-public.ebi.ac.uk";
+	DB_PORT: "5432";
+	DB_NAME: "pfmegrnargs";
+	DB_USERNAME: "reader";
+	DB_PASSWORD: "NWDMCE5xdipIjRrp";
+}

fixtures/nodejs-hybrid-app/wrangler.toml

@@ -0,0 +1,11 @@
+name = "nodejs-hybrid-app"
+main = "src/index.ts"
+compatibility_date = "2024-06-03"
+compatibility_flags = ["experimental:nodejs_compat_v2"]
+
+[vars]
+DB_HOSTNAME = "hh-pgsql-public.ebi.ac.uk"
+DB_PORT = "5432"
+DB_NAME = "pfmegrnargs"
+DB_USERNAME = "reader"
+DB_PASSWORD = "NWDMCE5xdipIjRrp"

package.json

@@ -78,7 +78,8 @@
 			"ink@3.2.0": "patches/ink@3.2.0.patch",
 			"toucan-js@3.2.2": "patches/toucan-js@3.2.2.patch",
 			"@cloudflare/component-listbox@1.10.6": "patches/@cloudflare__component-listbox@1.10.6.patch",
-			"capnp-ts@0.7.0": "patches/capnp-ts@0.7.0.patch"
+			"capnp-ts@0.7.0": "patches/capnp-ts@0.7.0.patch",
+			"pg@8.11.3": "patches/pg@8.11.3.patch"
 		}
 	}
 }

packages/wrangler/package.json

@@ -82,6 +82,7 @@
 		"resolve.exports": "^2.0.2",
 		"selfsigned": "^2.0.1",
 		"source-map": "0.6.1",
+		"unenv": "npm:unenv-nightly@1.10.0-1717606461.a117952",
 		"xxhash-wasm": "^1.0.1"
 	},
 	"devDependencies": {

packages/wrangler/scripts/deps.ts

@@ -18,6 +18,9 @@ export const EXTERNAL_DEPENDENCIES = [
 	// @cloudflare/workers-types is an optional peer dependency of wrangler, so users can
 	// get the types by installing the package (to what version they prefer) themselves
 	"@cloudflare/workers-types",
+	// unenv must be external because it contains unenv/runtime code which needs to be resolved
+	// and read when we are bundling the worker application
+	"unenv",
 ];
 
 const pathToPackageJson = path.resolve(__dirname, "..", "package.json");

packages/wrangler/src/__tests__/deploy.test.ts

@@ -8530,17 +8530,17 @@ export default{
 			writeWorkerSource();
 			await runWrangler("deploy index.js --node-compat --dry-run");
 			expect(std).toMatchInlineSnapshot(`
-			Object {
-			  "debug": "",
-			  "err": "",
-			  "info": "",
-			  "out": "Total Upload: xx KiB / gzip: xx KiB
-			--dry-run: exiting now.",
-			  "warn": "▲ [WARNING] Enabling Node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
-
-			",
-			}
-		`);
+				Object {
+				  "debug": "",
+				  "err": "",
+				  "info": "",
+				  "out": "Total Upload: xx KiB / gzip: xx KiB
+				--dry-run: exiting now.",
+				  "warn": "▲ [WARNING] Enabling Wrangler compile-time Node.js compatibility polyfill mode for builtins and globals. This is experimental and has serious tradeoffs.
+
+				",
+				}
+			`);
 		});
 
 		it("should recommend node compatibility mode when using node builtins and node-compat isn't enabled", async () => {
@@ -8578,17 +8578,17 @@ export default{
 			);
 			await runWrangler("deploy index.js --node-compat --dry-run"); // this would throw if node compatibility didn't exist
 			expect(std).toMatchInlineSnapshot(`
-			Object {
-			  "debug": "",
-			  "err": "",
-			  "info": "",
-			  "out": "Total Upload: xx KiB / gzip: xx KiB
-			--dry-run: exiting now.",
-			  "warn": "▲ [WARNING] Enabling Node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
-
-			",
-			}
-		`);
+				Object {
+				  "debug": "",
+				  "err": "",
+				  "info": "",
+				  "out": "Total Upload: xx KiB / gzip: xx KiB
+				--dry-run: exiting now.",
+				  "warn": "▲ [WARNING] Enabling Wrangler compile-time Node.js compatibility polyfill mode for builtins and globals. This is experimental and has serious tradeoffs.
+
+				",
+				}
+			`);
 		});
 	});
 
@@ -8663,7 +8663,7 @@ export default{
 					"deploy index.js --dry-run --outdir=dist --compatibility-flag=nodejs_compat --node-compat"
 				)
 			).rejects.toThrowErrorMatchingInlineSnapshot(
-				`[AssertionError: The \`nodejs_compat\` compatibility flag cannot be used in conjunction with the legacy \`--node-compat\` flag. If you want to use the Workers runtime Node.js compatibility features, please remove the \`--node-compat\` argument from your CLI command or \`node_compat = true\` from your config file.]`
+				`[Error: The \`nodejs_compat\` compatibility flag cannot be used in conjunction with the legacy \`--node-compat\` flag. If you want to use the Workers \`nodejs_compat\` compatibility flag, please remove the \`--node-compat\` argument from your CLI command or \`node_compat = true\` from your config file.]`
 			);
 		});
 	});
@@ -9098,13 +9098,13 @@ export default{
 				"deploy index.js --no-bundle --node-compat --dry-run --outdir dist"
 			);
 			expect(std.warn).toMatchInlineSnapshot(`
-			"▲ [WARNING] Enabling Node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+				"▲ [WARNING] Enabling Wrangler compile-time Node.js compatibility polyfill mode for builtins and globals. This is experimental and has serious tradeoffs.
 
 
-			▲ [WARNING] \`--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.
+				▲ [WARNING] \`--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.
 
-			"
-		`);
+				"
+			`);
 		});
 
 		it("should warn that no-bundle and node-compat can't be used together", async () => {
@@ -9118,13 +9118,13 @@ export default{
 			fs.writeFileSync("index.js", scriptContent);
 			await runWrangler("deploy index.js --dry-run --outdir dist");
 			expect(std.warn).toMatchInlineSnapshot(`
-			"▲ [WARNING] Enabling Node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+				"▲ [WARNING] Enabling Wrangler compile-time Node.js compatibility polyfill mode for builtins and globals. This is experimental and has serious tradeoffs.
 
 
-			▲ [WARNING] \`--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.
+				▲ [WARNING] \`--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.
 
-			"
-		`);
+				"
+			`);
 		});
 	});
 

packages/wrangler/src/__tests__/pages/functions-build.test.ts

@@ -432,15 +432,15 @@ export default {
 			await runWrangler(`pages functions build --outfile=public/_worker.bundle`)
 		);
 		expect(std.warn).toMatchInlineSnapshot(`
-		"▲ [WARNING] The package \\"node:async_hooks\\" wasn't found on the file system but is built into node.
+			"▲ [WARNING] The package \\"node:async_hooks\\" wasn't found on the file system but is built into node.
 
-		  Your Worker may throw errors at runtime unless you enable the \\"nodejs_compat\\" compatibility flag.
-		  Refer to https://developers.cloudflare.com/workers/runtime-apis/nodejs/ for more details. Imported
-		  from:
-		   - hello.js
+			  Your Worker may throw errors at runtime unless you enable the \\"nodejs_compat\\" compatibility flag.
+			  Refer to https://developers.cloudflare.com/workers/runtime-apis/nodejs/ for more details. Imported
+			  from:
+			   - hello.js
 
-		"
-	`);
+			"
+		`);
 	});
 
 	it("should compile a _worker.js/ directory", async () => {