fix(node-modules-polyfill): replace rollup-plugin-node-polyfills with rollup-plugin-polyfill-node

node-modules-polyfill/package.json

@@ -19,13 +19,14 @@
     "author": "Tommaso De Rossi, morse <[email protected]>",
     "license": "ISC",
     "devDependencies": {
+        "rollup": "^2.75.7",
         "safe-buffer": "^5.2.1",
         "test-support": "*",
         "@esbuild-plugins/node-globals-polyfill": "*"
     },
     "dependencies": {
         "escape-string-regexp": "^4.0.0",
-        "rollup-plugin-node-polyfills": "^0.2.1"
+        "rollup-plugin-polyfill-node": "^0.12.0"
     },
     "peerDependencies": {
         "esbuild": "*"

node-modules-polyfill/src/index.test.ts

@@ -12,7 +12,18 @@ test('works', async () => {
         paths: [ENTRY],
     } = await writeFiles({
         'entry.ts': `import {x} from './utils'; console.log(x);`,
-        'utils.ts': `import path from 'path'; import { Buffer } from 'buffer'; export const x = path.resolve(Buffer.from('x').toString());`,
+        'utils.ts': `
+import path from 'path';
+import { Buffer } from 'buffer';
+import { Writable } from 'stream';
+import { request } from 'http';
+export const x =  new Writable({
+  write() {
+    const path = path.resolve(Buffer.from('x').toString());
+    const call = request(path)
+  }
+});
+`,
     })
     // const outfile = randomOutputFile()
     const res = await build({
@@ -23,8 +34,8 @@ test('works', async () => {
         bundle: true,
         plugins: [NodeModulesPolyfillsPlugin()],
     })
-    eval(res.outputFiles[0].text)
-    // console.log(res.outputFiles[0].text)
+    // eval(res.outputFiles[0].text) -- needs JSDom or equiv for globalThis.XMLHttpRequest
+    console.log(res.outputFiles[0].text)
     unlink()
 })
 

node-modules-polyfill/src/index.ts

@@ -1,11 +1,10 @@
-import { OnResolveArgs, Plugin } from 'esbuild'
+import type { OnResolveArgs, Plugin } from 'esbuild'
+import esbuild from 'esbuild'
 import escapeStringRegexp from 'escape-string-regexp'
-import fs from 'fs'
 import path from 'path'
-import esbuild from 'esbuild'
-import { builtinsPolyfills } from './polyfills'
+import { getModules as builtinsPolyfills } from 'rollup-plugin-polyfill-node/dist/modules'
+import polyfills from 'rollup-plugin-polyfill-node/dist/polyfills'
 
-// import { NodeResolvePlugin } from '@esbuild-plugins/node-resolve'
 const NAME = 'node-modules-polyfills'
 const NAMESPACE = NAME
 
@@ -51,13 +50,10 @@ export function NodeModulesPolyfillPlugin(
                     const argsPath = args.path.replace(/^node:/, '')
                     const isCommonjs = args.namespace.endsWith('commonjs')
 
-                    const resolved = polyfilledBuiltins.get(
-                        removeEndingSlash(argsPath),
-                    )
-                    const contents = await (
-                        await fs.promises.readFile(resolved)
-                    ).toString()
-                    let resolveDir = path.dirname(resolved)
+                    const key = removeEndingSlash(argsPath)
+                    const contents =
+                        polyfilledBuiltins.get(key) || polyfills[`${key}.js`]
+                    const resolveDir = path.dirname(key)
 
                     if (isCommonjs) {
                         return {
@@ -91,6 +87,33 @@ export function NodeModulesPolyfillPlugin(
                     .map(escapeStringRegexp)
                     .join('|'), // TODO builtins could end with slash, keep in mind in regex
             )
+
+            const prefixFilter = new RegExp(`^.*\0polyfill-node\.`)
+            onResolve({ filter: prefixFilter }, (args) => {
+                const path = args.path.replace(prefixFilter, '')
+                const isCommonjs =
+                    args.namespace !== commonjsNamespace &&
+                    args.kind === 'require-call'
+
+                return {
+                    namespace: isCommonjs ? commonjsNamespace : namespace,
+                    path,
+                }
+            })
+            const localResolver = (args: OnResolveArgs) => {
+                return {
+                    namespace: args.namespace,
+                    path: `${path.basename(
+                        args.resolveDir,
+                    )}/${args.path.replace('./', '')}`,
+                }
+            }
+            onResolve({ filter: /\.\//, namespace }, localResolver)
+            onResolve(
+                { filter: /\.\//, namespace: commonjsNamespace },
+                localResolver,
+            )
+
             async function resolver(args: OnResolveArgs) {
                 const argsPath = args.path.replace(/^node:/, '')
                 const ignoreRequire = args.namespace === commonjsNamespace