@rollup/plugin-node-resolve 11.2.0 → 13.0.2

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @rollup/plugin-node-resolve ChangeLog
 
+## v13.0.2
+
+_2021-07-15_
+
+### Bugfixes
+
+- fix
+
+## v13.0.1
+
+_2021-07-15_
+
+### Updates
+
+- docs: Document how to get Node.js exports resolution (#884)
+
+## v13.0.0
+
+_2021-05-04_
+
+### Breaking Changes
+
+- fix!: mark module as external if resolved module is external (#799)
+
+### Features
+
+- feat: Follow up to #843, refining exports and browser field interaction (#866)
+
+## v12.0.0
+
+_2021-05-04_
+
+### Breaking Changes
+
+- fix!: mark module as external if resolved module is external (#799)
+
+### Features
+
+- feat: Follow up to #843, refining exports and browser field interaction (#866)
+
+## v11.2.1
+
+_2021-03-26_
+
+### Bugfixes
+
+- fix: fs.exists is incorrectly promisified (#835)
+
 ## v11.2.0
 
 _2021-02-14_
@@ -403,4 +451,4 @@ This release caches reading/statting of files, to improve speed.
 
 ## 0.1.0
 
-- First release
+- First release

package/README.md

@@ -59,12 +59,14 @@ When using `@rollup/plugin-commonjs` v16 or higher, this plugin will use the `['
 
 Setting this option will add extra conditions on top of the default conditions. See https://nodejs.org/api/packages.html#packages_conditional_exports for more information.
 
+In order to get the [resolution behavior of Node.js](https://nodejs.org/api/packages.html#packages_conditional_exports), set this to `['node']`.
+
 ### `browser`
 
 Type: `Boolean`<br>
 Default: `false`
 
-If `true`, instructs the plugin to use the `"browser"` property in `package.json` files to specify alternative files to load for bundling. This is useful when bundling for a browser environment. Alternatively, a value of `'browser'` can be added to the `mainFields` option. If `false`, any `"browser"` properties in package files will be ignored. This option takes precedence over `mainFields`.
+If `true`, instructs the plugin to use the browser module resolutions in `package.json` and adds `'browser'` to `exportConditions` if it is not present so browser conditionals in `exports` are applied. If `false`, any browser properties in package files will be ignored. Alternatively, a value of `'browser'` can be added to both the `mainFields` and `exportConditions` options, however this option takes precedence over `mainFields`.
 
 > This option does not work when a package is using [package entrypoints](https://nodejs.org/api/packages.html#packages_package_entry_points)
 

package/dist/cjs/index.js

@@ -21,11 +21,20 @@ var isModule__default = /*#__PURE__*/_interopDefaultLegacy(isModule);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var resolve__default = /*#__PURE__*/_interopDefaultLegacy(resolve);
 
-const exists = util.promisify(fs__default['default'].exists);
-const readFile = util.promisify(fs__default['default'].readFile);
+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);
 
+async function fileExists(filePath) {
+  try {
+    const res = await stat(filePath);
+    return res.isFile();
+  } catch {
+    return false;
+  }
+}
+
 const onError = (error) => {
   if (error.code === 'ENOENT') {
     return false;
@@ -78,7 +87,7 @@ const isFileCached = makeCache(async (file) => {
   }
 });
 
-const readCachedFile = makeCache(readFile);
+const readCachedFile = makeCache(readFile$1);
 
 // returns the imported package name for bare module imports
 function getPackageName(id) {
@@ -243,8 +252,6 @@ function normalizeInput(input) {
 
 /* eslint-disable no-await-in-loop */
 
-const fileExists = util.promisify(fs__default['default'].exists);
-
 function isModuleDir(current, moduleDirs) {
   return moduleDirs.some((dir) => current.endsWith(dir));
 }
@@ -339,11 +346,11 @@ async function resolvePackageTarget(context, { target, subpath, pattern, interna
             target.replace(/\*/g, subpath),
             context.pkgURL.href
           );
-          return result ? url.pathToFileURL(result.location) : null;
+          return result ? url.pathToFileURL(result.location).href : null;
         }
 
         const result = await context.resolveId(`${target}${subpath}`, context.pkgURL.href);
-        return result ? url.pathToFileURL(result.location) : null;
+        return result ? url.pathToFileURL(result.location).href : null;
       }
       throw new InvalidPackageTargetError(context, `Invalid mapping: "${target}".`);
     }
@@ -544,7 +551,7 @@ async function resolvePackageImports({
 }
 
 const resolveImportPath = util.promisify(resolve__default['default']);
-const readFile$1 = util.promisify(fs__default['default'].readFile);
+const readFile = util.promisify(fs__default['default'].readFile);
 
 async function getPackageJson(importer, pkgName, resolveOptions, moduleDirectories) {
   if (importer) {
@@ -557,8 +564,8 @@ async function getPackageJson(importer, pkgName, resolveOptions, moduleDirectori
 
   try {
     const pkgJsonPath = await resolveImportPath(`${pkgName}/package.json`, resolveOptions);
-    const pkgJson = JSON.parse(await readFile$1(pkgJsonPath, 'utf-8'));
-    return { pkgJsonPath, pkgJson };
+    const pkgJson = JSON.parse(await readFile(pkgJsonPath, 'utf-8'));
+    return { pkgJsonPath, pkgJson, pkgPath: path.dirname(pkgJsonPath) };
   } catch (_) {
     return null;
   }
@@ -646,12 +653,11 @@ async function resolveId({
     const result = await getPackageJson(importer, pkgName, resolveOptions, moduleDirectories);
 
     if (result && result.pkgJson.exports) {
-      const { pkgJson, pkgJsonPath } = result;
+      const { pkgJson, pkgJsonPath, pkgPath } = result;
       try {
         const subpath =
           pkgName === importSpecifier ? '.' : `.${importSpecifier.substring(pkgName.length)}`;
-        const pkgDr = pkgJsonPath.replace('package.json', '');
-        const pkgURL = url.pathToFileURL(pkgDr);
+        const pkgURL = url.pathToFileURL(`${pkgPath}/`);
 
         const context = {
           importer,
@@ -689,7 +695,7 @@ async function resolveId({
   }
 
   if (!preserveSymlinks) {
-    if (await exists(location)) {
+    if (await fileExists(location)) {
       location = await realpath(location);
     }
   }
@@ -864,203 +870,218 @@ function nodeResolve(opts = {}) {
   const browserMapCache = new Map();
   let preserveSymlinks;
 
-  return {
-    name: 'node-resolve',
+  const doResolveId = async (context, importee, importer, opts) => {
+    // strip query params from import
+    const [importPath, params] = importee.split('?');
+    const importSuffix = `${params ? `?${params}` : ''}`;
+    importee = importPath;
 
-    buildStart(options) {
-      rollupOptions = options;
+    const baseDir = !importer || dedupe(importee) ? rootDir : path.dirname(importer);
 
-      for (const warning of warnings) {
-        this.warn(warning);
+    // https://github.com/defunctzombie/package-browser-field-spec
+    const browser = browserMapCache.get(importer);
+    if (useBrowserOverrides && browser) {
+      const resolvedImportee = path.resolve(baseDir, importee);
+      if (browser[importee] === false || browser[resolvedImportee] === false) {
+        return { id: ES6_BROWSER_EMPTY };
       }
-
-      ({ preserveSymlinks } = options);
-    },
-
-    generateBundle() {
-      readCachedFile.clear();
-      isFileCached.clear();
-      isDirCached.clear();
-    },
-
-    async resolveId(importee, importer, opts) {
-      if (importee === ES6_BROWSER_EMPTY) {
-        return importee;
+      const browserImportee =
+        browser[importee] ||
+        browser[resolvedImportee] ||
+        browser[`${resolvedImportee}.js`] ||
+        browser[`${resolvedImportee}.json`];
+      if (browserImportee) {
+        importee = browserImportee;
       }
-      // ignore IDs with null character, these belong to other plugins
-      if (/\0/.test(importee)) return null;
+    }
 
-      if (/\0/.test(importer)) {
-        importer = undefined;
+    const parts = importee.split(/[/\\]/);
+    let id = parts.shift();
+    let isRelativeImport = false;
+
+    if (id[0] === '@' && parts.length > 0) {
+      // scoped packages
+      id += `/${parts.shift()}`;
+    } else if (id[0] === '.') {
+      // an import relative to the parent dir of the importer
+      id = path.resolve(baseDir, importee);
+      isRelativeImport = true;
+    }
+
+    if (
+      !isRelativeImport &&
+      resolveOnly.length &&
+      !resolveOnly.some((pattern) => pattern.test(id))
+    ) {
+      if (normalizeInput(rollupOptions.input).includes(importee)) {
+        return null;
       }
+      return false;
+    }
 
-      // strip query params from import
-      const [importPath, params] = importee.split('?');
-      const importSuffix = `${params ? `?${params}` : ''}`;
-      importee = importPath;
+    const importSpecifierList = [];
 
-      const baseDir = !importer || dedupe(importee) ? rootDir : path.dirname(importer);
+    if (importer === undefined && !importee[0].match(/^\.?\.?\//)) {
+      // For module graph roots (i.e. when importer is undefined), we
+      // need to handle 'path fragments` like `foo/bar` that are commonly
+      // found in rollup config files. If importee doesn't look like a
+      // relative or absolute path, we make it relative and attempt to
+      // resolve it. If we don't find anything, we try resolving it as we
+      // got it.
+      importSpecifierList.push(`./${importee}`);
+    }
 
-      // https://github.com/defunctzombie/package-browser-field-spec
-      const browser = browserMapCache.get(importer);
-      if (useBrowserOverrides && browser) {
-        const resolvedImportee = path.resolve(baseDir, importee);
-        if (browser[importee] === false || browser[resolvedImportee] === false) {
-          return ES6_BROWSER_EMPTY;
-        }
-        const browserImportee =
-          browser[importee] ||
-          browser[resolvedImportee] ||
-          browser[`${resolvedImportee}.js`] ||
-          browser[`${resolvedImportee}.json`];
-        if (browserImportee) {
-          importee = browserImportee;
-        }
-      }
+    const importeeIsBuiltin = builtins.has(importee);
 
-      const parts = importee.split(/[/\\]/);
-      let id = parts.shift();
-      let isRelativeImport = false;
-
-      if (id[0] === '@' && parts.length > 0) {
-        // scoped packages
-        id += `/${parts.shift()}`;
-      } else if (id[0] === '.') {
-        // an import relative to the parent dir of the importer
-        id = path.resolve(baseDir, importee);
-        isRelativeImport = true;
-      }
+    if (importeeIsBuiltin) {
+      // The `resolve` library will not resolve packages with the same
+      // name as a node built-in module. If we're resolving something
+      // that's a builtin, and we don't prefer to find built-ins, we
+      // first try to look up a local module with that name. If we don't
+      // find anything, we resolve the builtin which just returns back
+      // the built-in's name.
+      importSpecifierList.push(`${importee}/`);
+    }
 
-      if (
-        !isRelativeImport &&
-        resolveOnly.length &&
-        !resolveOnly.some((pattern) => pattern.test(id))
-      ) {
-        if (normalizeInput(rollupOptions.input).includes(importee)) {
-          return null;
+    // TypeScript files may import '.js' to refer to either '.ts' or '.tsx'
+    if (importer && importee.endsWith('.js')) {
+      for (const ext of ['.ts', '.tsx']) {
+        if (importer.endsWith(ext) && extensions.includes(ext)) {
+          importSpecifierList.push(importee.replace(/.js$/, ext));
         }
-        return false;
       }
+    }
 
-      const importSpecifierList = [];
+    importSpecifierList.push(importee);
 
-      if (importer === undefined && !importee[0].match(/^\.?\.?\//)) {
-        // For module graph roots (i.e. when importer is undefined), we
-        // need to handle 'path fragments` like `foo/bar` that are commonly
-        // found in rollup config files. If importee doesn't look like a
-        // relative or absolute path, we make it relative and attempt to
-        // resolve it. If we don't find anything, we try resolving it as we
-        // got it.
-        importSpecifierList.push(`./${importee}`);
-      }
+    const warn = (...args) => context.warn(...args);
+    const isRequire =
+      opts && opts.custom && opts.custom['node-resolve'] && opts.custom['node-resolve'].isRequire;
+    const exportConditions = isRequire ? conditionsCjs : conditionsEsm;
 
-      const importeeIsBuiltin = builtins.has(importee);
+    if (useBrowserOverrides && !exportConditions.includes('browser'))
+      exportConditions.push('browser');
 
-      if (importeeIsBuiltin) {
-        // The `resolve` library will not resolve packages with the same
-        // name as a node built-in module. If we're resolving something
-        // that's a builtin, and we don't prefer to find built-ins, we
-        // first try to look up a local module with that name. If we don't
-        // find anything, we resolve the builtin which just returns back
-        // the built-in's name.
-        importSpecifierList.push(`${importee}/`);
-      }
+    const resolvedWithoutBuiltins = await resolveImportSpecifiers({
+      importer,
+      importSpecifierList,
+      exportConditions,
+      warn,
+      packageInfoCache,
+      extensions,
+      mainFields,
+      preserveSymlinks,
+      useBrowserOverrides,
+      baseDir,
+      moduleDirectories,
+      rootDir,
+      ignoreSideEffectsForRoot
+    });
 
-      // TypeScript files may import '.js' to refer to either '.ts' or '.tsx'
-      if (importer && importee.endsWith('.js')) {
-        for (const ext of ['.ts', '.tsx']) {
-          if (importer.endsWith(ext) && extensions.includes(ext)) {
-            importSpecifierList.push(importee.replace(/.js$/, ext));
+    const resolved =
+      importeeIsBuiltin && preferBuiltins
+        ? {
+            packageInfo: undefined,
+            hasModuleSideEffects: () => null,
+            hasPackageEntry: true,
+            packageBrowserField: false
           }
+        : resolvedWithoutBuiltins;
+    if (!resolved) {
+      return null;
+    }
+
+    const { packageInfo, hasModuleSideEffects, hasPackageEntry, packageBrowserField } = resolved;
+    let { location } = resolved;
+    if (packageBrowserField) {
+      if (Object.prototype.hasOwnProperty.call(packageBrowserField, location)) {
+        if (!packageBrowserField[location]) {
+          browserMapCache.set(location, packageBrowserField);
+          return { id: ES6_BROWSER_EMPTY };
         }
+        location = packageBrowserField[location];
       }
+      browserMapCache.set(location, packageBrowserField);
+    }
 
-      importSpecifierList.push(importee);
-
-      const warn = (...args) => this.warn(...args);
-      const isRequire =
-        opts && opts.custom && opts.custom['node-resolve'] && opts.custom['node-resolve'].isRequire;
-      const exportConditions = isRequire ? conditionsCjs : conditionsEsm;
-
-      const resolvedWithoutBuiltins = await resolveImportSpecifiers({
-        importer,
-        importSpecifierList,
-        exportConditions,
-        warn,
-        packageInfoCache,
-        extensions,
-        mainFields,
-        preserveSymlinks,
-        useBrowserOverrides,
-        baseDir,
-        moduleDirectories,
-        rootDir,
-        ignoreSideEffectsForRoot
-      });
+    if (hasPackageEntry && !preserveSymlinks) {
+      const exists = await fileExists(location);
+      if (exists) {
+        location = await realpath(location);
+      }
+    }
 
-      const resolved =
-        importeeIsBuiltin && preferBuiltins
-          ? {
-              packageInfo: undefined,
-              hasModuleSideEffects: () => null,
-              hasPackageEntry: true,
-              packageBrowserField: false
-            }
-          : resolvedWithoutBuiltins;
-      if (!resolved) {
+    idToPackageInfo.set(location, packageInfo);
+
+    if (hasPackageEntry) {
+      if (importeeIsBuiltin && preferBuiltins) {
+        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`
+          );
+        }
+        return false;
+      } else if (jail && location.indexOf(path.normalize(jail.trim(path.sep))) !== 0) {
         return null;
       }
+    }
 
-      const { packageInfo, hasModuleSideEffects, hasPackageEntry, packageBrowserField } = resolved;
-      let { location } = resolved;
-      if (packageBrowserField) {
-        if (Object.prototype.hasOwnProperty.call(packageBrowserField, location)) {
-          if (!packageBrowserField[location]) {
-            browserMapCache.set(location, packageBrowserField);
-            return ES6_BROWSER_EMPTY;
-          }
-          location = packageBrowserField[location];
-        }
-        browserMapCache.set(location, packageBrowserField);
+    if (options.modulesOnly && (await fileExists(location))) {
+      const code = await readFile$1(location, 'utf-8');
+      if (isModule__default['default'](code)) {
+        return {
+          id: `${location}${importSuffix}`,
+          moduleSideEffects: hasModuleSideEffects(location)
+        };
       }
+      return null;
+    }
+    const result = {
+      id: `${location}${importSuffix}`,
+      moduleSideEffects: hasModuleSideEffects(location)
+    };
+    return result;
+  };
 
-      if (hasPackageEntry && !preserveSymlinks) {
-        const fileExists = await exists(location);
-        if (fileExists) {
-          location = await realpath(location);
-        }
+  return {
+    name: 'node-resolve',
+
+    buildStart(options) {
+      rollupOptions = options;
+
+      for (const warning of warnings) {
+        this.warn(warning);
       }
 
-      idToPackageInfo.set(location, packageInfo);
+      ({ preserveSymlinks } = options);
+    },
 
-      if (hasPackageEntry) {
-        if (importeeIsBuiltin && preferBuiltins) {
-          if (!isPreferBuiltinsSet && resolvedWithoutBuiltins && resolved !== importee) {
-            this.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`
-            );
-          }
-          return false;
-        } else if (jail && location.indexOf(path.normalize(jail.trim(path.sep))) !== 0) {
-          return null;
-        }
+    generateBundle() {
+      readCachedFile.clear();
+      isFileCached.clear();
+      isDirCached.clear();
+    },
+
+    async resolveId(importee, importer, opts) {
+      if (importee === ES6_BROWSER_EMPTY) {
+        return importee;
+      }
+      // ignore IDs with null character, these belong to other plugins
+      if (/\0/.test(importee)) return null;
+
+      if (/\0/.test(importer)) {
+        importer = undefined;
       }
 
-      if (options.modulesOnly && (await exists(location))) {
-        const code = await readFile(location, 'utf-8');
-        if (isModule__default['default'](code)) {
-          return {
-            id: `${location}${importSuffix}`,
-            moduleSideEffects: hasModuleSideEffects(location)
-          };
+      const resolved = await doResolveId(this, importee, importer, opts);
+      if (resolved) {
+        const resolvedResolved = await this.resolve(resolved.id, importer, { skipSelf: true });
+        const isExternal = !!(resolvedResolved && resolvedResolved.external);
+        if (isExternal) {
+          return false;
         }
-        return null;
       }
-      const result = {
-        id: `${location}${importSuffix}`,
-        moduleSideEffects: hasModuleSideEffects(location)
-      };
-      return result;
+      return resolved;
     },
 
     load(importee) {

package/dist/es/index.js

@@ -8,11 +8,20 @@ import { pathToFileURL, fileURLToPath } from 'url';
 import resolve$1 from 'resolve';
 import { createFilter } from '@rollup/pluginutils';
 
-const exists = promisify(fs.exists);
-const readFile = promisify(fs.readFile);
+promisify(fs.access);
+const readFile$1 = promisify(fs.readFile);
 const realpath = promisify(fs.realpath);
 const stat = promisify(fs.stat);
 
+async function fileExists(filePath) {
+  try {
+    const res = await stat(filePath);
+    return res.isFile();
+  } catch {
+    return false;
+  }
+}
+
 const onError = (error) => {
   if (error.code === 'ENOENT') {
     return false;
@@ -65,7 +74,7 @@ const isFileCached = makeCache(async (file) => {
   }
 });
 
-const readCachedFile = makeCache(readFile);
+const readCachedFile = makeCache(readFile$1);
 
 // returns the imported package name for bare module imports
 function getPackageName(id) {
@@ -230,8 +239,6 @@ function normalizeInput(input) {
 
 /* eslint-disable no-await-in-loop */
 
-const fileExists = promisify(fs.exists);
-
 function isModuleDir(current, moduleDirs) {
   return moduleDirs.some((dir) => current.endsWith(dir));
 }
@@ -326,11 +333,11 @@ async function resolvePackageTarget(context, { target, subpath, pattern, interna
             target.replace(/\*/g, subpath),
             context.pkgURL.href
           );
-          return result ? pathToFileURL(result.location) : null;
+          return result ? pathToFileURL(result.location).href : null;
         }
 
         const result = await context.resolveId(`${target}${subpath}`, context.pkgURL.href);
-        return result ? pathToFileURL(result.location) : null;
+        return result ? pathToFileURL(result.location).href : null;
       }
       throw new InvalidPackageTargetError(context, `Invalid mapping: "${target}".`);
     }
@@ -531,7 +538,7 @@ async function resolvePackageImports({
 }
 
 const resolveImportPath = promisify(resolve$1);
-const readFile$1 = promisify(fs.readFile);
+const readFile = promisify(fs.readFile);
 
 async function getPackageJson(importer, pkgName, resolveOptions, moduleDirectories) {
   if (importer) {
@@ -544,8 +551,8 @@ async function getPackageJson(importer, pkgName, resolveOptions, moduleDirectori
 
   try {
     const pkgJsonPath = await resolveImportPath(`${pkgName}/package.json`, resolveOptions);
-    const pkgJson = JSON.parse(await readFile$1(pkgJsonPath, 'utf-8'));
-    return { pkgJsonPath, pkgJson };
+    const pkgJson = JSON.parse(await readFile(pkgJsonPath, 'utf-8'));
+    return { pkgJsonPath, pkgJson, pkgPath: dirname(pkgJsonPath) };
   } catch (_) {
     return null;
   }
@@ -633,12 +640,11 @@ async function resolveId({
     const result = await getPackageJson(importer, pkgName, resolveOptions, moduleDirectories);
 
     if (result && result.pkgJson.exports) {
-      const { pkgJson, pkgJsonPath } = result;
+      const { pkgJson, pkgJsonPath, pkgPath } = result;
       try {
         const subpath =
           pkgName === importSpecifier ? '.' : `.${importSpecifier.substring(pkgName.length)}`;
-        const pkgDr = pkgJsonPath.replace('package.json', '');
-        const pkgURL = pathToFileURL(pkgDr);
+        const pkgURL = pathToFileURL(`${pkgPath}/`);
 
         const context = {
           importer,
@@ -676,7 +682,7 @@ async function resolveId({
   }
 
   if (!preserveSymlinks) {
-    if (await exists(location)) {
+    if (await fileExists(location)) {
       location = await realpath(location);
     }
   }
@@ -851,203 +857,218 @@ function nodeResolve(opts = {}) {
   const browserMapCache = new Map();
   let preserveSymlinks;
 
-  return {
-    name: 'node-resolve',
+  const doResolveId = async (context, importee, importer, opts) => {
+    // strip query params from import
+    const [importPath, params] = importee.split('?');
+    const importSuffix = `${params ? `?${params}` : ''}`;
+    importee = importPath;
 
-    buildStart(options) {
-      rollupOptions = options;
+    const baseDir = !importer || dedupe(importee) ? rootDir : dirname(importer);
 
-      for (const warning of warnings) {
-        this.warn(warning);
+    // https://github.com/defunctzombie/package-browser-field-spec
+    const browser = browserMapCache.get(importer);
+    if (useBrowserOverrides && browser) {
+      const resolvedImportee = resolve(baseDir, importee);
+      if (browser[importee] === false || browser[resolvedImportee] === false) {
+        return { id: ES6_BROWSER_EMPTY };
       }
-
-      ({ preserveSymlinks } = options);
-    },
-
-    generateBundle() {
-      readCachedFile.clear();
-      isFileCached.clear();
-      isDirCached.clear();
-    },
-
-    async resolveId(importee, importer, opts) {
-      if (importee === ES6_BROWSER_EMPTY) {
-        return importee;
+      const browserImportee =
+        browser[importee] ||
+        browser[resolvedImportee] ||
+        browser[`${resolvedImportee}.js`] ||
+        browser[`${resolvedImportee}.json`];
+      if (browserImportee) {
+        importee = browserImportee;
       }
-      // ignore IDs with null character, these belong to other plugins
-      if (/\0/.test(importee)) return null;
+    }
 
-      if (/\0/.test(importer)) {
-        importer = undefined;
+    const parts = importee.split(/[/\\]/);
+    let id = parts.shift();
+    let isRelativeImport = false;
+
+    if (id[0] === '@' && parts.length > 0) {
+      // scoped packages
+      id += `/${parts.shift()}`;
+    } else if (id[0] === '.') {
+      // an import relative to the parent dir of the importer
+      id = resolve(baseDir, importee);
+      isRelativeImport = true;
+    }
+
+    if (
+      !isRelativeImport &&
+      resolveOnly.length &&
+      !resolveOnly.some((pattern) => pattern.test(id))
+    ) {
+      if (normalizeInput(rollupOptions.input).includes(importee)) {
+        return null;
       }
+      return false;
+    }
 
-      // strip query params from import
-      const [importPath, params] = importee.split('?');
-      const importSuffix = `${params ? `?${params}` : ''}`;
-      importee = importPath;
+    const importSpecifierList = [];
 
-      const baseDir = !importer || dedupe(importee) ? rootDir : dirname(importer);
+    if (importer === undefined && !importee[0].match(/^\.?\.?\//)) {
+      // For module graph roots (i.e. when importer is undefined), we
+      // need to handle 'path fragments` like `foo/bar` that are commonly
+      // found in rollup config files. If importee doesn't look like a
+      // relative or absolute path, we make it relative and attempt to
+      // resolve it. If we don't find anything, we try resolving it as we
+      // got it.
+      importSpecifierList.push(`./${importee}`);
+    }
 
-      // https://github.com/defunctzombie/package-browser-field-spec
-      const browser = browserMapCache.get(importer);
-      if (useBrowserOverrides && browser) {
-        const resolvedImportee = resolve(baseDir, importee);
-        if (browser[importee] === false || browser[resolvedImportee] === false) {
-          return ES6_BROWSER_EMPTY;
-        }
-        const browserImportee =
-          browser[importee] ||
-          browser[resolvedImportee] ||
-          browser[`${resolvedImportee}.js`] ||
-          browser[`${resolvedImportee}.json`];
-        if (browserImportee) {
-          importee = browserImportee;
-        }
-      }
+    const importeeIsBuiltin = builtins.has(importee);
 
-      const parts = importee.split(/[/\\]/);
-      let id = parts.shift();
-      let isRelativeImport = false;
-
-      if (id[0] === '@' && parts.length > 0) {
-        // scoped packages
-        id += `/${parts.shift()}`;
-      } else if (id[0] === '.') {
-        // an import relative to the parent dir of the importer
-        id = resolve(baseDir, importee);
-        isRelativeImport = true;
-      }
+    if (importeeIsBuiltin) {
+      // The `resolve` library will not resolve packages with the same
+      // name as a node built-in module. If we're resolving something
+      // that's a builtin, and we don't prefer to find built-ins, we
+      // first try to look up a local module with that name. If we don't
+      // find anything, we resolve the builtin which just returns back
+      // the built-in's name.
+      importSpecifierList.push(`${importee}/`);
+    }
 
-      if (
-        !isRelativeImport &&
-        resolveOnly.length &&
-        !resolveOnly.some((pattern) => pattern.test(id))
-      ) {
-        if (normalizeInput(rollupOptions.input).includes(importee)) {
-          return null;
+    // TypeScript files may import '.js' to refer to either '.ts' or '.tsx'
+    if (importer && importee.endsWith('.js')) {
+      for (const ext of ['.ts', '.tsx']) {
+        if (importer.endsWith(ext) && extensions.includes(ext)) {
+          importSpecifierList.push(importee.replace(/.js$/, ext));
         }
-        return false;
       }
+    }
 
-      const importSpecifierList = [];
+    importSpecifierList.push(importee);
 
-      if (importer === undefined && !importee[0].match(/^\.?\.?\//)) {
-        // For module graph roots (i.e. when importer is undefined), we
-        // need to handle 'path fragments` like `foo/bar` that are commonly
-        // found in rollup config files. If importee doesn't look like a
-        // relative or absolute path, we make it relative and attempt to
-        // resolve it. If we don't find anything, we try resolving it as we
-        // got it.
-        importSpecifierList.push(`./${importee}`);
-      }
+    const warn = (...args) => context.warn(...args);
+    const isRequire =
+      opts && opts.custom && opts.custom['node-resolve'] && opts.custom['node-resolve'].isRequire;
+    const exportConditions = isRequire ? conditionsCjs : conditionsEsm;
 
-      const importeeIsBuiltin = builtins.has(importee);
+    if (useBrowserOverrides && !exportConditions.includes('browser'))
+      exportConditions.push('browser');
 
-      if (importeeIsBuiltin) {
-        // The `resolve` library will not resolve packages with the same
-        // name as a node built-in module. If we're resolving something
-        // that's a builtin, and we don't prefer to find built-ins, we
-        // first try to look up a local module with that name. If we don't
-        // find anything, we resolve the builtin which just returns back
-        // the built-in's name.
-        importSpecifierList.push(`${importee}/`);
-      }
+    const resolvedWithoutBuiltins = await resolveImportSpecifiers({
+      importer,
+      importSpecifierList,
+      exportConditions,
+      warn,
+      packageInfoCache,
+      extensions,
+      mainFields,
+      preserveSymlinks,
+      useBrowserOverrides,
+      baseDir,
+      moduleDirectories,
+      rootDir,
+      ignoreSideEffectsForRoot
+    });
 
-      // TypeScript files may import '.js' to refer to either '.ts' or '.tsx'
-      if (importer && importee.endsWith('.js')) {
-        for (const ext of ['.ts', '.tsx']) {
-          if (importer.endsWith(ext) && extensions.includes(ext)) {
-            importSpecifierList.push(importee.replace(/.js$/, ext));
+    const resolved =
+      importeeIsBuiltin && preferBuiltins
+        ? {
+            packageInfo: undefined,
+            hasModuleSideEffects: () => null,
+            hasPackageEntry: true,
+            packageBrowserField: false
           }
+        : resolvedWithoutBuiltins;
+    if (!resolved) {
+      return null;
+    }
+
+    const { packageInfo, hasModuleSideEffects, hasPackageEntry, packageBrowserField } = resolved;
+    let { location } = resolved;
+    if (packageBrowserField) {
+      if (Object.prototype.hasOwnProperty.call(packageBrowserField, location)) {
+        if (!packageBrowserField[location]) {
+          browserMapCache.set(location, packageBrowserField);
+          return { id: ES6_BROWSER_EMPTY };
         }
+        location = packageBrowserField[location];
       }
+      browserMapCache.set(location, packageBrowserField);
+    }
 
-      importSpecifierList.push(importee);
-
-      const warn = (...args) => this.warn(...args);
-      const isRequire =
-        opts && opts.custom && opts.custom['node-resolve'] && opts.custom['node-resolve'].isRequire;
-      const exportConditions = isRequire ? conditionsCjs : conditionsEsm;
-
-      const resolvedWithoutBuiltins = await resolveImportSpecifiers({
-        importer,
-        importSpecifierList,
-        exportConditions,
-        warn,
-        packageInfoCache,
-        extensions,
-        mainFields,
-        preserveSymlinks,
-        useBrowserOverrides,
-        baseDir,
-        moduleDirectories,
-        rootDir,
-        ignoreSideEffectsForRoot
-      });
+    if (hasPackageEntry && !preserveSymlinks) {
+      const exists = await fileExists(location);
+      if (exists) {
+        location = await realpath(location);
+      }
+    }
 
-      const resolved =
-        importeeIsBuiltin && preferBuiltins
-          ? {
-              packageInfo: undefined,
-              hasModuleSideEffects: () => null,
-              hasPackageEntry: true,
-              packageBrowserField: false
-            }
-          : resolvedWithoutBuiltins;
-      if (!resolved) {
+    idToPackageInfo.set(location, packageInfo);
+
+    if (hasPackageEntry) {
+      if (importeeIsBuiltin && preferBuiltins) {
+        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`
+          );
+        }
+        return false;
+      } else if (jail && location.indexOf(normalize(jail.trim(sep))) !== 0) {
         return null;
       }
+    }
 
-      const { packageInfo, hasModuleSideEffects, hasPackageEntry, packageBrowserField } = resolved;
-      let { location } = resolved;
-      if (packageBrowserField) {
-        if (Object.prototype.hasOwnProperty.call(packageBrowserField, location)) {
-          if (!packageBrowserField[location]) {
-            browserMapCache.set(location, packageBrowserField);
-            return ES6_BROWSER_EMPTY;
-          }
-          location = packageBrowserField[location];
-        }
-        browserMapCache.set(location, packageBrowserField);
+    if (options.modulesOnly && (await fileExists(location))) {
+      const code = await readFile$1(location, 'utf-8');
+      if (isModule(code)) {
+        return {
+          id: `${location}${importSuffix}`,
+          moduleSideEffects: hasModuleSideEffects(location)
+        };
       }
+      return null;
+    }
+    const result = {
+      id: `${location}${importSuffix}`,
+      moduleSideEffects: hasModuleSideEffects(location)
+    };
+    return result;
+  };
 
-      if (hasPackageEntry && !preserveSymlinks) {
-        const fileExists = await exists(location);
-        if (fileExists) {
-          location = await realpath(location);
-        }
+  return {
+    name: 'node-resolve',
+
+    buildStart(options) {
+      rollupOptions = options;
+
+      for (const warning of warnings) {
+        this.warn(warning);
       }
 
-      idToPackageInfo.set(location, packageInfo);
+      ({ preserveSymlinks } = options);
+    },
 
-      if (hasPackageEntry) {
-        if (importeeIsBuiltin && preferBuiltins) {
-          if (!isPreferBuiltinsSet && resolvedWithoutBuiltins && resolved !== importee) {
-            this.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`
-            );
-          }
-          return false;
-        } else if (jail && location.indexOf(normalize(jail.trim(sep))) !== 0) {
-          return null;
-        }
+    generateBundle() {
+      readCachedFile.clear();
+      isFileCached.clear();
+      isDirCached.clear();
+    },
+
+    async resolveId(importee, importer, opts) {
+      if (importee === ES6_BROWSER_EMPTY) {
+        return importee;
+      }
+      // ignore IDs with null character, these belong to other plugins
+      if (/\0/.test(importee)) return null;
+
+      if (/\0/.test(importer)) {
+        importer = undefined;
       }
 
-      if (options.modulesOnly && (await exists(location))) {
-        const code = await readFile(location, 'utf-8');
-        if (isModule(code)) {
-          return {
-            id: `${location}${importSuffix}`,
-            moduleSideEffects: hasModuleSideEffects(location)
-          };
+      const resolved = await doResolveId(this, importee, importer, opts);
+      if (resolved) {
+        const resolvedResolved = await this.resolve(resolved.id, importer, { skipSelf: true });
+        const isExternal = !!(resolvedResolved && resolvedResolved.external);
+        if (isExternal) {
+          return false;
         }
-        return null;
       }
-      const result = {
-        id: `${location}${importSuffix}`,
-        moduleSideEffects: hasModuleSideEffects(location)
-      };
-      return result;
+      return resolved;
     },
 
     load(importee) {

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@rollup/plugin-node-resolve",
-  "version": "11.2.0",
+  "version": "13.0.2",
   "publishConfig": {
     "access": "public"
   },
   "description": "Locate and bundle third-party dependencies in node_modules",
   "license": "MIT",
-  "repository": "rollup/plugins",
+  "repository": {
+    "url": "rollup/plugins",
+    "directory": "packages/node-resolve"
+  },
   "author": "Rich Harris <richard.a.harris@gmail.com>",
   "homepage": "https://github.com/rollup/plugins/tree/master/packages/node-resolve/#readme",
   "bugs": "https://github.com/rollup/plugins/issues",
@@ -22,19 +25,16 @@
   },
   "scripts": {
     "build": "rollup -c",
-    "ci:coverage": "nyc pnpm run test && nyc report --reporter=text-lcov > coverage.lcov",
-    "ci:lint": "pnpm run build && pnpm run lint",
+    "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 run test -- --verbose && pnpm run test:ts",
-    "lint": "pnpm run lint:js && pnpm run lint:docs && pnpm run lint:package",
-    "lint:docs": "prettier --single-quote --arrow-parens avoid --trailing-comma none --write README.md",
-    "lint:js": "eslint --fix --cache src test types --ext .js,.ts",
-    "lint:package": "prettier --write package.json --plugin=prettier-plugin-package",
+    "ci:test": "pnpm test -- --verbose && pnpm test:ts",
     "prebuild": "del-cli dist",
-    "prepare": "pnpm run build",
-    "prepublishOnly": "pnpm run lint && pnpm run test && pnpm run test:ts",
-    "pretest": "pnpm run build",
-    "test": "ava",
+    "prepare": "if [ ! -d 'dist' ]; then pnpm build; fi",
+    "prerelease": "pnpm build",
+    "pretest": "pnpm build",
+    "release": "pnpm plugin:release --workspace-root -- --pkg $npm_package_name",
+    "test": "ava && pnpm test:ts",
     "test:ts": "tsc types/index.d.ts test/types.ts --noEmit"
   },
   "files": [
@@ -51,7 +51,7 @@
     "modules"
   ],
   "peerDependencies": {
-    "rollup": "^1.20.0||^2.0.0"
+    "rollup": "^2.42.0"
   },
   "dependencies": {
     "@rollup/pluginutils": "^3.1.0",
@@ -68,7 +68,7 @@
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "es5-ext": "^0.10.53",
-    "rollup": "^2.23.0",
+    "rollup": "^2.42.0",
     "source-map": "^0.7.3",
     "string-capitalize": "^1.0.1"
   },