refactor: use esbuild-plugins-node-modules-polyfill

cloudflare · Aug 30, 2023 · 5e2436c · 5e2436c
1 parent a2f71e6
commit 5e2436c
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 154 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/create-cloudflare/src/frameworks/angular/index.ts b/packages/create-cloudflare/src/frameworks/angular/index.ts
@@ -70,10 +70,9 @@ async function installCFWorker(ctx: PagesGeneratorContext) {
 	await installPackages(
 		[
 			"@cloudflare/workers-types",
-			"@esbuild-plugins/node-globals-polyfill",
-			"@esbuild-plugins/node-modules-polyfill",
 			"@miniflare/tre@next",
 			"esbuild",
+			"esbuild-plugins-node-modules-polyfill",
 			"fast-glob",
 			"wrangler@beta",
 		],

diff --git a/packages/create-cloudflare/src/frameworks/angular/templates/tools/bundle.mjs b/packages/create-cloudflare/src/frameworks/angular/templates/tools/bundle.mjs
@@ -2,8 +2,7 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { worker as workerPath } from "./paths.mjs";
 import * as esbuild from "esbuild";
-import { NodeGlobalsPolyfillPlugin } from "@esbuild-plugins/node-globals-polyfill";
-import { NodeModulesPolyfillPlugin } from "@esbuild-plugins/node-modules-polyfill";
+import { nodeModulesPolyfillPlugin } from "esbuild-plugins-node-modules-polyfill";
 import fg from "fast-glob";
 
 // Process each of the JS files in the `_worker.js` directory
@@ -31,10 +30,7 @@ async function bundleMain() {
 		define: {
 			global: "globalThis",
 		},
-		plugins: [
-			NodeGlobalsPolyfillPlugin({ buffer: true }),
-			NodeModulesPolyfillPlugin(),
-		],
+		plugins: [nodeModulesPolyfillPlugin({ globals: { Buffer: true } })],
 	});
 
 	// Store the original promise (before Angular/Zone.js replaces it) on the global scope.
@@ -65,7 +61,7 @@ async function bundleLazyModule(filePath) {
 		define: {
 			global: "globalThis",
 		},
-		plugins: [NodeModulesPolyfillPlugin()],
+		plugins: [nodeModulesPolyfillPlugin()],
 	});
 
 	let content = result.outputFiles[0].text;

diff --git a/packages/wrangler/package.json b/packages/wrangler/package.json
@@ -98,11 +98,10 @@
 	},
 	"dependencies": {
 		"@cloudflare/kv-asset-handler": "^0.2.0",
-		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
-		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.16.3",
+		"esbuild-plugins-node-modules-polyfill": "^1.5.0",
 		"miniflare": "3.20230814.1",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",

diff --git a/packages/wrangler/scripts/deps.ts b/packages/wrangler/scripts/deps.ts
@@ -13,8 +13,7 @@ export const EXTERNAL_DEPENDENCIES = [
 	// todo - bundle miniflare too
 	"selfsigned",
 	"source-map",
-	"@esbuild-plugins/node-globals-polyfill",
-	"@esbuild-plugins/node-modules-polyfill",
+	"esbuild-plugins-node-modules-polyfill",
 	"chokidar",
 ];
 

diff --git a/packages/wrangler/src/deployment-bundle/bundle.ts b/packages/wrangler/src/deployment-bundle/bundle.ts
@@ -1,9 +1,8 @@
 import * as fs from "node:fs";
 import { builtinModules } from "node:module";
 import * as path from "node:path";
-import NodeGlobalsPolyfills from "@esbuild-plugins/node-globals-polyfill";
-import NodeModulesPolyfills from "@esbuild-plugins/node-modules-polyfill";
 import * as esbuild from "esbuild";
+import { nodeModulesPolyfillPlugin } from "esbuild-plugins-node-modules-polyfill";
 import tmp from "tmp-promise";
 import createModuleCollector from "../module-collection";
 import { getBasePath } from "../paths";
@@ -355,7 +354,7 @@ export async function bundleWorker(
 		plugins: [
 			moduleCollector.plugin,
 			...(legacyNodeCompat
-				? [NodeGlobalsPolyfills({ buffer: true }), NodeModulesPolyfills()]
+				? [nodeModulesPolyfillPlugin({ globals: { Buffer: true } })]
 				: []),
 			...(nodejsCompat ? [nodejsCompatPlugin] : []),
 			...[cloudflareInternalPlugin],

diff --git a/templates/worker-aws/package.json b/templates/worker-aws/package.json
@@ -15,7 +15,7 @@
 		"@aws-sdk/client-sqs": "^3.82.0"
 	},
 	"devDependencies": {
-		"@esbuild-plugins/node-modules-polyfill": "0.1.4",
+		"esbuild-plugins-node-modules-polyfill": "^1.5.0",
 		"worktop.build": "0.0.5",
 		"wrangler": "^3.0.0"
 	}