@rollup/plugin-node-resolve 14.0.1 → 15.0.0

package/README.md

@@ -13,7 +13,7 @@
 
 ## Requirements
 
-This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v8.0.0+) and Rollup v1.20.0+.
+This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v14.0.0+) and Rollup v2.78.0+.
 
 ## Install
 
@@ -75,7 +75,14 @@ If `true`, instructs the plugin to use the browser module resolutions in `packag
 Type: `Array[...String]`<br>
 Default: `['node_modules']`
 
-One or more directories in which to recursively look for modules.
+A list of directory names in which to recursively look for modules.
+
+### `modulePaths`
+
+Type: `Array[...String]`<br>
+Default: `[]`
+
+A list of absolute paths to additional locations to search for modules. [This is analogous to setting the `NODE_PATH` environment variable for node](https://nodejs.org/api/modules.html#loading-from-the-global-folders).
 
 ### `dedupe`
 
@@ -214,7 +221,7 @@ export default ({
 })
 ```
 
-## Resolving require statements
+## Resolving Require Statements
 
 According to [NodeJS module resolution](https://nodejs.org/api/packages.html#packages_package_entry_points) `require` statements should resolve using the `require` condition in the package exports field, while es modules should use the `import` condition.
 

package/dist/cjs/index.js

@@ -12,21 +12,15 @@ var url = require('url');
 var resolve = require('resolve');
 var pluginutils = require('@rollup/pluginutils');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var isBuiltinModule__default = /*#__PURE__*/_interopDefaultLegacy(isBuiltinModule);
-var deepMerge__default = /*#__PURE__*/_interopDefaultLegacy(deepMerge);
-var isModule__default = /*#__PURE__*/_interopDefaultLegacy(isModule);
-var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-var resolve__default = /*#__PURE__*/_interopDefaultLegacy(resolve);
-
-var version = "14.0.1";
+var version = "15.0.0";
+var peerDependencies = {
+	rollup: "^2.78.0||^3.0.0"
+};
 
-util.promisify(fs__default["default"].access);
-const readFile$1 = util.promisify(fs__default["default"].readFile);
-const realpath = util.promisify(fs__default["default"].realpath);
-const stat = util.promisify(fs__default["default"].stat);
+util.promisify(fs.access);
+const readFile$1 = util.promisify(fs.readFile);
+const realpath = util.promisify(fs.realpath);
+const stat = util.promisify(fs.stat);
 
 async function fileExists(filePath) {
   try {
@@ -320,16 +314,16 @@ function isModuleDir(current, moduleDirs) {
 }
 
 async function findPackageJson(base, moduleDirs) {
-  const { root } = path__default["default"].parse(base);
+  const { root } = path.parse(base);
   let current = base;
 
   while (current !== root && !isModuleDir(current, moduleDirs)) {
-    const pkgJsonPath = path__default["default"].join(current, 'package.json');
+    const pkgJsonPath = path.join(current, 'package.json');
     if (await fileExists(pkgJsonPath)) {
-      const pkgJsonString = fs__default["default"].readFileSync(pkgJsonPath, 'utf-8');
+      const pkgJsonString = fs.readFileSync(pkgJsonPath, 'utf-8');
       return { pkgJson: JSON.parse(pkgJsonString), pkgPath: current, pkgJsonPath };
     }
-    current = path__default["default"].resolve(current, '..');
+    current = path.resolve(current, '..');
   }
   return null;
 }
@@ -613,8 +607,8 @@ async function resolvePackageImports({
   });
 }
 
-const resolveImportPath = util.promisify(resolve__default["default"]);
-const readFile = util.promisify(fs__default["default"].readFile);
+const resolveImportPath = util.promisify(resolve);
+const readFile = util.promisify(fs.readFile);
 
 async function getPackageJson(importer, pkgName, resolveOptions, moduleDirectories) {
   if (importer) {
@@ -643,6 +637,7 @@ async function resolveIdClassic({
   useBrowserOverrides,
   baseDir,
   moduleDirectories,
+  modulePaths,
   rootDir,
   ignoreSideEffectsForRoot
 }) {
@@ -677,6 +672,7 @@ async function resolveIdClassic({
     extensions,
     includeCoreModules: false,
     moduleDirectory: moduleDirectories,
+    paths: modulePaths,
     preserveSymlinks,
     packageFilter: filter
   };
@@ -711,6 +707,7 @@ async function resolveWithExportMap({
   useBrowserOverrides,
   baseDir,
   moduleDirectories,
+  modulePaths,
   rootDir,
   ignoreSideEffectsForRoot
 }) {
@@ -730,7 +727,8 @@ async function resolveWithExportMap({
           preserveSymlinks,
           useBrowserOverrides,
           baseDir,
-          moduleDirectories
+          moduleDirectories,
+          modulePaths
         });
       }
     });
@@ -780,6 +778,7 @@ async function resolveWithExportMap({
       extensions,
       includeCoreModules: false,
       moduleDirectory: moduleDirectories,
+      paths: modulePaths,
       preserveSymlinks,
       packageFilter: filter
     };
@@ -830,6 +829,7 @@ async function resolveWithClassic({
   useBrowserOverrides,
   baseDir,
   moduleDirectories,
+  modulePaths,
   rootDir,
   ignoreSideEffectsForRoot
 }) {
@@ -847,6 +847,7 @@ async function resolveWithClassic({
       useBrowserOverrides,
       baseDir,
       moduleDirectories,
+      modulePaths,
       rootDir,
       ignoreSideEffectsForRoot
     });
@@ -875,6 +876,7 @@ async function resolveImportSpecifiers({
   useBrowserOverrides,
   baseDir,
   moduleDirectories,
+  modulePaths,
   rootDir,
   ignoreSideEffectsForRoot
 }) {
@@ -890,6 +892,7 @@ async function resolveImportSpecifiers({
       useBrowserOverrides,
       baseDir,
       moduleDirectories,
+      modulePaths,
       rootDir,
       ignoreSideEffectsForRoot
     });
@@ -915,11 +918,44 @@ async function resolveImportSpecifiers({
     useBrowserOverrides,
     baseDir,
     moduleDirectories,
+    modulePaths,
     rootDir,
     ignoreSideEffectsForRoot
   });
 }
 
+const versionRegexp = /\^(\d+\.\d+\.\d+)/g;
+
+function validateVersion(actualVersion, peerDependencyVersion) {
+  let minMajor = Infinity;
+  let minMinor = Infinity;
+  let minPatch = Infinity;
+  let foundVersion;
+  // eslint-disable-next-line no-cond-assign
+  while ((foundVersion = versionRegexp.exec(peerDependencyVersion))) {
+    const [foundMajor, foundMinor, foundPatch] = foundVersion[1].split('.').map(Number);
+    if (foundMajor < minMajor) {
+      minMajor = foundMajor;
+      minMinor = foundMinor;
+      minPatch = foundPatch;
+    }
+  }
+  if (!actualVersion) {
+    throw new Error(
+      `Insufficient Rollup version: "@rollup/plugin-node-resolve" requires at least rollup@${minMajor}.${minMinor}.${minPatch}.`
+    );
+  }
+  const [major, minor, patch] = actualVersion.split('.').map(Number);
+  if (
+    major < minMajor ||
+    (major === minMajor && (minor < minMinor || (minor === minMinor && patch < minPatch)))
+  ) {
+    throw new Error(
+      `Insufficient rollup version: "@rollup/plugin-node-resolve" requires at least rollup@${minMajor}.${minMinor}.${minPatch} but found rollup@${actualVersion}.`
+    );
+  }
+}
+
 /* eslint-disable no-param-reassign, no-shadow, no-undefined */
 
 const ES6_BROWSER_EMPTY = '\0node-resolve:empty.js';
@@ -947,13 +983,13 @@ const defaults = {
   moduleDirectories: ['node_modules'],
   ignoreSideEffectsForRoot: false
 };
-const DEFAULTS = deepFreeze(deepMerge__default["default"]({}, defaults));
+const DEFAULTS = deepFreeze(deepMerge({}, defaults));
 
 function nodeResolve(opts = {}) {
   const { warnings } = handleDeprecatedOptions(opts);
 
   const options = { ...defaults, ...opts };
-  const { extensions, jail, moduleDirectories, ignoreSideEffectsForRoot } = options;
+  const { extensions, jail, moduleDirectories, modulePaths, ignoreSideEffectsForRoot } = options;
   const conditionsEsm = [...baseConditionsEsm, ...(options.exportConditions || [])];
   const conditionsCjs = [...baseConditionsCjs, ...(options.exportConditions || [])];
   const packageInfoCache = new Map();
@@ -966,6 +1002,12 @@ function nodeResolve(opts = {}) {
   let { dedupe } = options;
   let rollupOptions;
 
+  if (moduleDirectories.some((name) => name.includes('/'))) {
+    throw new Error(
+      '`moduleDirectories` option must only contain directory names. If you want to load modules from somewhere not supported by the default module resolution algorithm, see `modulePaths`.'
+    );
+  }
+
   if (typeof dedupe !== 'function') {
     dedupe = (importee) =>
       options.dedupe.includes(importee) || options.dedupe.includes(getPackageName(importee));
@@ -1076,11 +1118,12 @@ function nodeResolve(opts = {}) {
       useBrowserOverrides,
       baseDir,
       moduleDirectories,
+      modulePaths,
       rootDir,
       ignoreSideEffectsForRoot
     });
 
-    const importeeIsBuiltin = isBuiltinModule__default["default"](importee);
+    const importeeIsBuiltin = isBuiltinModule(importee);
     const resolved =
       importeeIsBuiltin && preferBuiltins
         ? {
@@ -1131,7 +1174,7 @@ function nodeResolve(opts = {}) {
 
     if (options.modulesOnly && (await fileExists(location))) {
       const code = await readFile$1(location, 'utf-8');
-      if (isModule__default["default"](code)) {
+      if (isModule(code)) {
         return {
           id: `${location}${importSuffix}`,
           moduleSideEffects: hasModuleSideEffects(location)
@@ -1151,6 +1194,7 @@ function nodeResolve(opts = {}) {
     version,
 
     buildStart(buildOptions) {
+      validateVersion(this.meta.rollupVersion, peerDependencies.rollup);
       rollupOptions = buildOptions;
 
       for (const warning of warnings) {
@@ -1228,5 +1272,7 @@ function nodeResolve(opts = {}) {
 }
 
 exports.DEFAULTS = DEFAULTS;
-exports["default"] = nodeResolve;
+exports.default = nodeResolve;
 exports.nodeResolve = nodeResolve;
+module.exports = Object.assign(exports.default, exports);
+//# sourceMappingURL=index.js.map

package/dist/es/index.js

@@ -8,7 +8,10 @@ import { pathToFileURL, fileURLToPath } from 'url';
 import resolve$1 from 'resolve';
 import { createFilter } from '@rollup/pluginutils';
 
-var version = "14.0.1";
+var version = "15.0.0";
+var peerDependencies = {
+	rollup: "^2.78.0||^3.0.0"
+};
 
 promisify(fs.access);
 const readFile$1 = promisify(fs.readFile);
@@ -630,6 +633,7 @@ async function resolveIdClassic({
   useBrowserOverrides,
   baseDir,
   moduleDirectories,
+  modulePaths,
   rootDir,
   ignoreSideEffectsForRoot
 }) {
@@ -664,6 +668,7 @@ async function resolveIdClassic({
     extensions,
     includeCoreModules: false,
     moduleDirectory: moduleDirectories,
+    paths: modulePaths,
     preserveSymlinks,
     packageFilter: filter
   };
@@ -698,6 +703,7 @@ async function resolveWithExportMap({
   useBrowserOverrides,
   baseDir,
   moduleDirectories,
+  modulePaths,
   rootDir,
   ignoreSideEffectsForRoot
 }) {
@@ -717,7 +723,8 @@ async function resolveWithExportMap({
           preserveSymlinks,
           useBrowserOverrides,
           baseDir,
-          moduleDirectories
+          moduleDirectories,
+          modulePaths
         });
       }
     });
@@ -767,6 +774,7 @@ async function resolveWithExportMap({
       extensions,
       includeCoreModules: false,
       moduleDirectory: moduleDirectories,
+      paths: modulePaths,
       preserveSymlinks,
       packageFilter: filter
     };
@@ -817,6 +825,7 @@ async function resolveWithClassic({
   useBrowserOverrides,
   baseDir,
   moduleDirectories,
+  modulePaths,
   rootDir,
   ignoreSideEffectsForRoot
 }) {
@@ -834,6 +843,7 @@ async function resolveWithClassic({
       useBrowserOverrides,
       baseDir,
       moduleDirectories,
+      modulePaths,
       rootDir,
       ignoreSideEffectsForRoot
     });
@@ -862,6 +872,7 @@ async function resolveImportSpecifiers({
   useBrowserOverrides,
   baseDir,
   moduleDirectories,
+  modulePaths,
   rootDir,
   ignoreSideEffectsForRoot
 }) {
@@ -877,6 +888,7 @@ async function resolveImportSpecifiers({
       useBrowserOverrides,
       baseDir,
       moduleDirectories,
+      modulePaths,
       rootDir,
       ignoreSideEffectsForRoot
     });
@@ -902,11 +914,44 @@ async function resolveImportSpecifiers({
     useBrowserOverrides,
     baseDir,
     moduleDirectories,
+    modulePaths,
     rootDir,
     ignoreSideEffectsForRoot
   });
 }
 
+const versionRegexp = /\^(\d+\.\d+\.\d+)/g;
+
+function validateVersion(actualVersion, peerDependencyVersion) {
+  let minMajor = Infinity;
+  let minMinor = Infinity;
+  let minPatch = Infinity;
+  let foundVersion;
+  // eslint-disable-next-line no-cond-assign
+  while ((foundVersion = versionRegexp.exec(peerDependencyVersion))) {
+    const [foundMajor, foundMinor, foundPatch] = foundVersion[1].split('.').map(Number);
+    if (foundMajor < minMajor) {
+      minMajor = foundMajor;
+      minMinor = foundMinor;
+      minPatch = foundPatch;
+    }
+  }
+  if (!actualVersion) {
+    throw new Error(
+      `Insufficient Rollup version: "@rollup/plugin-node-resolve" requires at least rollup@${minMajor}.${minMinor}.${minPatch}.`
+    );
+  }
+  const [major, minor, patch] = actualVersion.split('.').map(Number);
+  if (
+    major < minMajor ||
+    (major === minMajor && (minor < minMinor || (minor === minMinor && patch < minPatch)))
+  ) {
+    throw new Error(
+      `Insufficient rollup version: "@rollup/plugin-node-resolve" requires at least rollup@${minMajor}.${minMinor}.${minPatch} but found rollup@${actualVersion}.`
+    );
+  }
+}
+
 /* eslint-disable no-param-reassign, no-shadow, no-undefined */
 
 const ES6_BROWSER_EMPTY = '\0node-resolve:empty.js';
@@ -940,7 +985,7 @@ function nodeResolve(opts = {}) {
   const { warnings } = handleDeprecatedOptions(opts);
 
   const options = { ...defaults, ...opts };
-  const { extensions, jail, moduleDirectories, ignoreSideEffectsForRoot } = options;
+  const { extensions, jail, moduleDirectories, modulePaths, ignoreSideEffectsForRoot } = options;
   const conditionsEsm = [...baseConditionsEsm, ...(options.exportConditions || [])];
   const conditionsCjs = [...baseConditionsCjs, ...(options.exportConditions || [])];
   const packageInfoCache = new Map();
@@ -953,6 +998,12 @@ function nodeResolve(opts = {}) {
   let { dedupe } = options;
   let rollupOptions;
 
+  if (moduleDirectories.some((name) => name.includes('/'))) {
+    throw new Error(
+      '`moduleDirectories` option must only contain directory names. If you want to load modules from somewhere not supported by the default module resolution algorithm, see `modulePaths`.'
+    );
+  }
+
   if (typeof dedupe !== 'function') {
     dedupe = (importee) =>
       options.dedupe.includes(importee) || options.dedupe.includes(getPackageName(importee));
@@ -1063,6 +1114,7 @@ function nodeResolve(opts = {}) {
       useBrowserOverrides,
       baseDir,
       moduleDirectories,
+      modulePaths,
       rootDir,
       ignoreSideEffectsForRoot
     });
@@ -1138,6 +1190,7 @@ function nodeResolve(opts = {}) {
     version,
 
     buildStart(buildOptions) {
+      validateVersion(this.meta.rollupVersion, peerDependencies.rollup);
       rollupOptions = buildOptions;
 
       for (const warning of warnings) {
@@ -1215,3 +1268,4 @@ function nodeResolve(opts = {}) {
 }
 
 export { DEFAULTS, nodeResolve as default, nodeResolve };
+//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-node-resolve",
-  "version": "14.0.1",
+  "version": "15.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -15,31 +15,32 @@
   "bugs": "https://github.com/rollup/plugins/issues",
   "main": "./dist/cjs/index.js",
   "module": "./dist/es/index.js",
-  "type": "commonjs",
   "exports": {
-    "require": "./dist/cjs/index.js",
-    "import": "./dist/es/index.js"
+    "types": "./types/index.d.ts",
+    "import": "./dist/es/index.js",
+    "default": "./dist/cjs/index.js"
   },
   "engines": {
-    "node": ">= 10.0.0"
+    "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 && pnpm test:ts",
+    "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 plugin:release --workspace-root -- --pkg $npm_package_name",
-    "test": "ava && pnpm test:ts",
+    "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",
     "types",
     "README.md",
     "LICENSE"
@@ -52,32 +53,35 @@
     "modules"
   ],
   "peerDependencies": {
-    "rollup": "^2.78.0"
+    "rollup": "^2.78.0||^3.0.0"
+  },
+  "peerDependenciesMeta": {
+    "rollup": {
+      "optional": true
+    }
   },
   "dependencies": {
-    "@rollup/pluginutils": "^3.1.0",
-    "@types/resolve": "1.17.1",
+    "@rollup/pluginutils": "^4.2.1",
+    "@types/resolve": "1.20.2",
     "deepmerge": "^4.2.2",
-    "is-builtin-module": "^3.1.0",
+    "is-builtin-module": "^3.2.0",
     "is-module": "^1.0.0",
-    "resolve": "^1.19.0"
+    "resolve": "^1.22.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.10.5",
+    "@babel/core": "^7.19.1",
     "@babel/plugin-transform-typescript": "^7.10.5",
     "@rollup/plugin-babel": "^5.1.0",
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
-    "es5-ext": "^0.10.53",
-    "rollup": "^2.78.1",
-    "source-map": "^0.7.3",
+    "es5-ext": "^0.10.62",
+    "rollup": "^3.0.0-7",
+    "source-map": "^0.7.4",
     "string-capitalize": "^1.0.1"
   },
-  "types": "types/index.d.ts",
+  "types": "./types/index.d.ts",
   "ava": {
-    "babel": {
-      "compileEnhancements": false
-    },
+    "workerThreads": false,
     "files": [
       "!**/fixtures/**",
       "!**/helpers/**",

package/types/index.d.ts

@@ -31,11 +31,18 @@ export interface RollupNodeResolveOptions {
   browser?: boolean;
 
   /**
-   * One or more directories in which to recursively look for modules.
+   * A list of directory names in which to recursively look for modules.
    * @default ['node_modules']
    */
   moduleDirectories?: string[];
 
+  /**
+   * A list of absolute paths to additional locations to search for modules.
+   * This is analogous to setting the `NODE_PATH` environment variable for node.
+   * @default []
+   */
+  modulePaths?: string[];
+
   /**
    * An `Array` of modules names, which instructs the plugin to force resolving for the
    * specified modules to the root `node_modules`. Helps to prevent bundling the same