@rollup/plugin-node-resolve 15.2.3 → 15.3.0

package/README.md

@@ -133,11 +133,19 @@ Specifies the properties to scan within a `package.json`, used to determine the
 
 ### `preferBuiltins`
 
-Type: `Boolean`<br>
+Type: `Boolean | (module: string) => boolean`<br>
 Default: `true` (with warnings if a builtin module is used over a local version. Set to `true` to disable warning.)
 
 If `true`, the plugin will prefer built-in modules (e.g. `fs`, `path`). If `false`, the plugin will look for locally installed modules of the same name.
 
+Alternatively, you may pass in a function that returns a boolean to confirm whether the plugin should prefer built-in modules. e.g.
+
+```js
+preferBuiltins: (module) => module !== 'punycode';
+```
+
+will not treat `punycode` as a built-in module
+
 ### `modulesOnly`
 
 Type: `Boolean`<br>

package/dist/cjs/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var path = require('path');
-var isBuiltinModule = require('is-builtin-module');
+var module$1 = require('module');
 var deepMerge = require('deepmerge');
 var isModule = require('is-module');
 var fs = require('fs');
@@ -12,7 +12,7 @@ var url = require('url');
 var resolve = require('resolve');
 var pluginutils = require('@rollup/pluginutils');
 
-var version = "15.2.3";
+var version = "15.3.0";
 var peerDependencies = {
 	rollup: "^2.78.0||^3.0.0||^4.0.0"
 };
@@ -1058,6 +1058,8 @@ const defaults = {
   // TODO: set to false in next major release or remove
   allowExportsFolderMapping: true
 };
+const nodeImportPrefix = /^node:/;
+
 const DEFAULTS = deepFreeze(deepMerge({}, defaults));
 
 function nodeResolve(opts = {}) {
@@ -1071,7 +1073,7 @@ function nodeResolve(opts = {}) {
   const idToPackageInfo = new Map();
   const mainFields = getMainFields(options);
   const useBrowserOverrides = mainFields.indexOf('browser') !== -1;
-  const isPreferBuiltinsSet = options.preferBuiltins === true || options.preferBuiltins === false;
+  const isPreferBuiltinsSet = Object.prototype.hasOwnProperty.call(options, 'preferBuiltins');
   const preferBuiltins = isPreferBuiltinsSet ? options.preferBuiltins : true;
   const rootDir = path.resolve(options.rootDir || process.cwd());
   let { dedupe } = options;
@@ -1206,9 +1208,11 @@ function nodeResolve(opts = {}) {
       allowExportsFolderMapping: options.allowExportsFolderMapping
     });
 
-    const importeeIsBuiltin = isBuiltinModule(importee);
+    const importeeIsBuiltin = module$1.builtinModules.includes(importee.replace(nodeImportPrefix, ''));
+    const preferImporteeIsBuiltin =
+      typeof preferBuiltins === 'function' ? preferBuiltins(importee) : preferBuiltins;
     const resolved =
-      importeeIsBuiltin && preferBuiltins
+      importeeIsBuiltin && preferImporteeIsBuiltin
         ? {
             packageInfo: undefined,
             hasModuleSideEffects: () => null,
@@ -1243,11 +1247,14 @@ function nodeResolve(opts = {}) {
     idToPackageInfo.set(location, packageInfo);
 
     if (hasPackageEntry) {
-      if (importeeIsBuiltin && preferBuiltins) {
+      if (importeeIsBuiltin && preferImporteeIsBuiltin) {
         if (!isPreferBuiltinsSet && resolvedWithoutBuiltins && resolved !== importee) {
-          context.warn(
-            `preferring built-in module '${importee}' over local alternative at '${resolvedWithoutBuiltins.location}', pass 'preferBuiltins: false' to disable this behavior or 'preferBuiltins: true' to disable this warning`
-          );
+          context.warn({
+            message:
+              `preferring built-in module '${importee}' over local alternative at '${resolvedWithoutBuiltins.location}', pass 'preferBuiltins: false' to disable this behavior or 'preferBuiltins: true' to disable this warning.` +
+              `or passing a function to 'preferBuiltins' to provide more fine-grained control over which built-in modules to prefer.`,
+            pluginCode: 'PREFER_BUILTINS'
+          });
         }
         return false;
       } else if (jail && location.indexOf(path.normalize(jail.trim(path.sep))) !== 0) {

package/dist/es/index.js

@@ -1,5 +1,5 @@
 import path, { dirname, resolve, extname, normalize, sep } from 'path';
-import isBuiltinModule from 'is-builtin-module';
+import { builtinModules } from 'module';
 import deepMerge from 'deepmerge';
 import isModule from 'is-module';
 import fs, { realpathSync } from 'fs';
@@ -8,7 +8,7 @@ import { pathToFileURL, fileURLToPath } from 'url';
 import resolve$1 from 'resolve';
 import { createFilter } from '@rollup/pluginutils';
 
-var version = "15.2.3";
+var version = "15.3.0";
 var peerDependencies = {
 	rollup: "^2.78.0||^3.0.0||^4.0.0"
 };
@@ -1054,6 +1054,8 @@ const defaults = {
   // TODO: set to false in next major release or remove
   allowExportsFolderMapping: true
 };
+const nodeImportPrefix = /^node:/;
+
 const DEFAULTS = deepFreeze(deepMerge({}, defaults));
 
 function nodeResolve(opts = {}) {
@@ -1067,7 +1069,7 @@ function nodeResolve(opts = {}) {
   const idToPackageInfo = new Map();
   const mainFields = getMainFields(options);
   const useBrowserOverrides = mainFields.indexOf('browser') !== -1;
-  const isPreferBuiltinsSet = options.preferBuiltins === true || options.preferBuiltins === false;
+  const isPreferBuiltinsSet = Object.prototype.hasOwnProperty.call(options, 'preferBuiltins');
   const preferBuiltins = isPreferBuiltinsSet ? options.preferBuiltins : true;
   const rootDir = resolve(options.rootDir || process.cwd());
   let { dedupe } = options;
@@ -1202,9 +1204,11 @@ function nodeResolve(opts = {}) {
       allowExportsFolderMapping: options.allowExportsFolderMapping
     });
 
-    const importeeIsBuiltin = isBuiltinModule(importee);
+    const importeeIsBuiltin = builtinModules.includes(importee.replace(nodeImportPrefix, ''));
+    const preferImporteeIsBuiltin =
+      typeof preferBuiltins === 'function' ? preferBuiltins(importee) : preferBuiltins;
     const resolved =
-      importeeIsBuiltin && preferBuiltins
+      importeeIsBuiltin && preferImporteeIsBuiltin
         ? {
             packageInfo: undefined,
             hasModuleSideEffects: () => null,
@@ -1239,11 +1243,14 @@ function nodeResolve(opts = {}) {
     idToPackageInfo.set(location, packageInfo);
 
     if (hasPackageEntry) {
-      if (importeeIsBuiltin && preferBuiltins) {
+      if (importeeIsBuiltin && preferImporteeIsBuiltin) {
         if (!isPreferBuiltinsSet && resolvedWithoutBuiltins && resolved !== importee) {
-          context.warn(
-            `preferring built-in module '${importee}' over local alternative at '${resolvedWithoutBuiltins.location}', pass 'preferBuiltins: false' to disable this behavior or 'preferBuiltins: true' to disable this warning`
-          );
+          context.warn({
+            message:
+              `preferring built-in module '${importee}' over local alternative at '${resolvedWithoutBuiltins.location}', pass 'preferBuiltins: false' to disable this behavior or 'preferBuiltins: true' to disable this warning.` +
+              `or passing a function to 'preferBuiltins' to provide more fine-grained control over which built-in modules to prefer.`,
+            pluginCode: 'PREFER_BUILTINS'
+          });
         }
         return false;
       } else if (jail && location.indexOf(normalize(jail.trim(sep))) !== 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-node-resolve",
-  "version": "15.2.3",
+  "version": "15.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -23,21 +23,6 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "scripts": {
-    "build": "rollup -c",
-    "ci:coverage": "nyc pnpm test && nyc report --reporter=text-lcov > coverage.lcov",
-    "ci:lint": "pnpm build && pnpm lint",
-    "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}",
-    "ci:test": "pnpm test -- --verbose",
-    "prebuild": "del-cli dist",
-    "prepare": "if [ ! -d 'dist' ]; then pnpm build; fi",
-    "prepublishOnly": "pnpm build",
-    "prerelease": "pnpm build",
-    "pretest": "pnpm build",
-    "release": "pnpm --workspace-root plugin:release --pkg $npm_package_name",
-    "test": "pnpm test:ts && ava",
-    "test:ts": "tsc types/index.d.ts test/types.ts --noEmit"
-  },
   "files": [
     "dist",
     "!dist/**/*.map",
@@ -64,7 +49,6 @@
     "@rollup/pluginutils": "^5.0.1",
     "@types/resolve": "1.20.2",
     "deepmerge": "^4.2.2",
-    "is-builtin-module": "^3.2.1",
     "is-module": "^1.0.0",
     "resolve": "^1.22.1"
   },
@@ -88,5 +72,18 @@
       "!**/recipes/**",
       "!**/types.ts"
     ]
+  },
+  "scripts": {
+    "build": "rollup -c",
+    "ci:coverage": "nyc pnpm test && nyc report --reporter=text-lcov > coverage.lcov",
+    "ci:lint": "pnpm build && pnpm lint",
+    "ci:lint:commits": "commitlint --from=${CIRCLE_BRANCH} --to=${CIRCLE_SHA1}",
+    "ci:test": "pnpm test -- --verbose",
+    "prebuild": "del-cli dist",
+    "prerelease": "pnpm build",
+    "pretest": "pnpm build",
+    "release": "pnpm --workspace-root package:release $(pwd)",
+    "test": "pnpm test:ts && ava",
+    "test:ts": "tsc types/index.d.ts test/types.ts --noEmit"
   }
-}
+}

package/types/index.d.ts

@@ -79,9 +79,11 @@ export interface RollupNodeResolveOptions {
   /**
    * If `true`, the plugin will prefer built-in modules (e.g. `fs`, `path`). If `false`,
    * the plugin will look for locally installed modules of the same name.
+   *
+   * If a function is provided, it will be called to determine whether to prefer built-ins.
    * @default true
    */
-  preferBuiltins?: boolean;
+  preferBuiltins?: boolean | ((module: string) => boolean);
 
   /**
    * An `Array` which instructs the plugin to limit module resolution to those whose