@rollup/plugin-node-resolve 13.0.2 → 13.0.6

package/CHANGELOG.md

@@ -1,12 +1,44 @@
 # @rollup/plugin-node-resolve ChangeLog
 
+## v13.0.6
+
+_2021-10-19_
+
+### Bugfixes
+
+- fix: pass on isEntry flag (#1016)
+
+## v13.0.5
+
+_2021-09-21_
+
+### Updates
+
+- docs: fix readme heading depth (#999)
+
+## v13.0.4
+
+_2021-07-24_
+
+### Bugfixes
+
+- fix: Fix bug where JS import was converted to a TS import, resulting in an error when using export maps (#921)
+
+## v13.0.3
+
+_2021-07-24_
+
+### Bugfixes
+
+- fix: handle browser-mapped paths correctly in nested contexts (#920)
+
 ## v13.0.2
 
 _2021-07-15_
 
 ### Bugfixes
 
-- fix
+- fix: handle "package.json" being in path (#927)
 
 ## v13.0.1
 
@@ -451,4 +483,4 @@ This release caches reading/statting of files, to improve speed.
 
 ## 0.1.0
 
-- First release
+- First release

package/README.md

@@ -159,7 +159,7 @@ Specifies the root directory from which to resolve modules. Typically used when
 rootDir: path.join(process.cwd(), '..')
 ```
 
-## `ignoreSideEffectsForRoot`
+### `ignoreSideEffectsForRoot`
 
 If you use the `sideEffects` property in the package.json, by default this is respected for files in the root package. Set to `true` to ignore the `sideEffects` configuration for the root package.
 

package/dist/cjs/index.js

@@ -21,10 +21,10 @@ var isModule__default = /*#__PURE__*/_interopDefaultLegacy(isModule);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var resolve__default = /*#__PURE__*/_interopDefaultLegacy(resolve);
 
-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__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 {
@@ -35,6 +35,10 @@ async function fileExists(filePath) {
   }
 }
 
+async function resolveSymlink(path) {
+  return (await fileExists(path)) ? realpath(path) : path;
+}
+
 const onError = (error) => {
   if (error.code === 'ENOENT') {
     return false;
@@ -257,16 +261,16 @@ function isModuleDir(current, moduleDirs) {
 }
 
 async function findPackageJson(base, moduleDirs) {
-  const { root } = path__default['default'].parse(base);
+  const { root } = path__default["default"].parse(base);
   let current = base;
 
   while (current !== root && !isModuleDir(current, moduleDirs)) {
-    const pkgJsonPath = path__default['default'].join(current, 'package.json');
+    const pkgJsonPath = path__default["default"].join(current, 'package.json');
     if (await fileExists(pkgJsonPath)) {
-      const pkgJsonString = fs__default['default'].readFileSync(pkgJsonPath, 'utf-8');
+      const pkgJsonString = fs__default["default"].readFileSync(pkgJsonPath, 'utf-8');
       return { pkgJson: JSON.parse(pkgJsonString), pkgPath: current, pkgJsonPath };
     }
-    current = path__default['default'].resolve(current, '..');
+    current = path__default["default"].resolve(current, '..');
   }
   return null;
 }
@@ -312,8 +316,8 @@ class InvalidConfigurationError extends ResolveError {
 }
 
 class InvalidModuleSpecifierError extends ResolveError {
-  constructor(context, internal) {
-    super(createErrorMsg(context, internal));
+  constructor(context, internal, reason) {
+    super(createErrorMsg(context, reason, internal));
   }
 }
 
@@ -540,7 +544,7 @@ async function resolvePackageImports({
   }
 
   if (importSpecifier === '#' || importSpecifier.startsWith('#/')) {
-    throw new InvalidModuleSpecifierError(context, 'Invalid import specifier.');
+    throw new InvalidModuleSpecifierError(context, true, 'Invalid import specifier.');
   }
 
   return resolvePackageImportsExports(context, {
@@ -550,8 +554,8 @@ async function resolvePackageImports({
   });
 }
 
-const resolveImportPath = util.promisify(resolve__default['default']);
-const readFile = util.promisify(fs__default['default'].readFile);
+const resolveImportPath = util.promisify(resolve__default["default"]);
+const readFile = util.promisify(fs__default["default"].readFile);
 
 async function getPackageJson(importer, pkgName, resolveOptions, moduleDirectories) {
   if (importer) {
@@ -571,11 +575,8 @@ async function getPackageJson(importer, pkgName, resolveOptions, moduleDirectori
   }
 }
 
-async function resolveId({
-  importer,
+async function resolveIdClassic({
   importSpecifier,
-  exportConditions,
-  warn,
   packageInfoCache,
   extensions,
   mainFields,
@@ -622,8 +623,38 @@ async function resolveId({
   };
 
   let location;
+  try {
+    location = await resolveImportPath(importSpecifier, resolveOptions);
+  } catch (error) {
+    if (error.code !== 'MODULE_NOT_FOUND') {
+      throw error;
+    }
+    return null;
+  }
 
-  const pkgName = getPackageName(importSpecifier);
+  return {
+    location: preserveSymlinks ? location : await resolveSymlink(location),
+    hasModuleSideEffects,
+    hasPackageEntry,
+    packageBrowserField,
+    packageInfo
+  };
+}
+
+async function resolveWithExportMap({
+  importer,
+  importSpecifier,
+  exportConditions,
+  packageInfoCache,
+  extensions,
+  mainFields,
+  preserveSymlinks,
+  useBrowserOverrides,
+  baseDir,
+  moduleDirectories,
+  rootDir,
+  ignoreSideEffectsForRoot
+}) {
   if (importSpecifier.startsWith('#')) {
     // this is a package internal import, resolve using package imports field
     const resolveResult = await resolvePackageImports({
@@ -631,12 +662,9 @@ async function resolveId({
       importer,
       moduleDirs: moduleDirectories,
       conditions: exportConditions,
-      resolveId(id, parent) {
-        return resolveId({
+      resolveId(id /* , parent*/) {
+        return resolveIdClassic({
           importSpecifier: id,
-          importer: parent,
-          exportConditions,
-          warn,
           packageInfoCache,
           extensions,
           mainFields,
@@ -647,71 +675,91 @@ async function resolveId({
         });
       }
     });
-    location = url.fileURLToPath(resolveResult);
-  } else if (pkgName) {
+
+    const location = url.fileURLToPath(resolveResult);
+    return {
+      location: preserveSymlinks ? location : await resolveSymlink(location),
+      hasModuleSideEffects: () => null,
+      hasPackageEntry: true,
+      packageBrowserField: false,
+      // eslint-disable-next-line no-undefined
+      packageInfo: undefined
+    };
+  }
+
+  const pkgName = getPackageName(importSpecifier);
+  if (pkgName) {
     // it's a bare import, find the package.json and resolve using package exports if available
+    let hasModuleSideEffects = () => null;
+    let hasPackageEntry = true;
+    let packageBrowserField = false;
+    let packageInfo;
+
+    const filter = (pkg, pkgPath) => {
+      const info = getPackageInfo({
+        cache: packageInfoCache,
+        extensions,
+        pkg,
+        pkgPath,
+        mainFields,
+        preserveSymlinks,
+        useBrowserOverrides,
+        rootDir,
+        ignoreSideEffectsForRoot
+      });
+
+      ({ packageInfo, hasModuleSideEffects, hasPackageEntry, packageBrowserField } = info);
+
+      return info.cachedPkg;
+    };
+
+    const resolveOptions = {
+      basedir: baseDir,
+      readFile: readCachedFile,
+      isFile: isFileCached,
+      isDirectory: isDirCached,
+      extensions,
+      includeCoreModules: false,
+      moduleDirectory: moduleDirectories,
+      preserveSymlinks,
+      packageFilter: filter
+    };
+
     const result = await getPackageJson(importer, pkgName, resolveOptions, moduleDirectories);
 
     if (result && result.pkgJson.exports) {
-      const { pkgJson, pkgJsonPath, pkgPath } = result;
-      try {
-        const subpath =
-          pkgName === importSpecifier ? '.' : `.${importSpecifier.substring(pkgName.length)}`;
-        const pkgURL = url.pathToFileURL(`${pkgPath}/`);
-
-        const context = {
-          importer,
-          importSpecifier,
-          moduleDirs: moduleDirectories,
-          pkgURL,
-          pkgJsonPath,
-          conditions: exportConditions
+      const { pkgJson, pkgJsonPath } = result;
+      const subpath =
+        pkgName === importSpecifier ? '.' : `.${importSpecifier.substring(pkgName.length)}`;
+      const pkgDr = pkgJsonPath.replace('package.json', '');
+      const pkgURL = url.pathToFileURL(pkgDr);
+
+      const context = {
+        importer,
+        importSpecifier,
+        moduleDirs: moduleDirectories,
+        pkgURL,
+        pkgJsonPath,
+        conditions: exportConditions
+      };
+      const resolvedPackageExport = await resolvePackageExports(context, subpath, pkgJson.exports);
+      const location = url.fileURLToPath(resolvedPackageExport);
+      if (location) {
+        return {
+          location: preserveSymlinks ? location : await resolveSymlink(location),
+          hasModuleSideEffects,
+          hasPackageEntry,
+          packageBrowserField,
+          packageInfo
         };
-        const resolvedPackageExport = await resolvePackageExports(
-          context,
-          subpath,
-          pkgJson.exports
-        );
-        location = url.fileURLToPath(resolvedPackageExport);
-      } catch (error) {
-        if (error instanceof ResolveError) {
-          return error;
-        }
-        throw error;
       }
     }
   }
 
-  if (!location) {
-    // package has no imports or exports, use classic node resolve
-    try {
-      location = await resolveImportPath(importSpecifier, resolveOptions);
-    } catch (error) {
-      if (error.code !== 'MODULE_NOT_FOUND') {
-        throw error;
-      }
-      return null;
-    }
-  }
-
-  if (!preserveSymlinks) {
-    if (await fileExists(location)) {
-      location = await realpath(location);
-    }
-  }
-
-  return {
-    location,
-    hasModuleSideEffects,
-    hasPackageEntry,
-    packageBrowserField,
-    packageInfo
-  };
+  return null;
 }
 
-// Resolve module specifiers in order. Promise resolves to the first module that resolves
-// successfully, or the error that resulted from the last attempted module resolution.
-async function resolveImportSpecifiers({
+async function resolveWithClassic({
   importer,
   importSpecifierList,
   exportConditions,
@@ -726,11 +774,9 @@ async function resolveImportSpecifiers({
   rootDir,
   ignoreSideEffectsForRoot
 }) {
-  let lastResolveError;
-
   for (let i = 0; i < importSpecifierList.length; i++) {
     // eslint-disable-next-line no-await-in-loop
-    const result = await resolveId({
+    const result = await resolveIdClassic({
       importer,
       importSpecifier: importSpecifierList[i],
       exportConditions,
@@ -746,20 +792,75 @@ async function resolveImportSpecifiers({
       ignoreSideEffectsForRoot
     });
 
-    if (result instanceof ResolveError) {
-      lastResolveError = result;
-    } else if (result) {
+    if (result) {
       return result;
     }
   }
 
-  if (lastResolveError) {
-    // only log the last failed resolve error
-    warn(lastResolveError);
-  }
   return null;
 }
 
+// Resolves to the module if found or `null`.
+// The first import specificer will first be attempted with the exports algorithm.
+// If this is unsuccesful because export maps are not being used, then all of `importSpecifierList`
+// will be tried with the classic resolution algorithm
+async function resolveImportSpecifiers({
+  importer,
+  importSpecifierList,
+  exportConditions,
+  warn,
+  packageInfoCache,
+  extensions,
+  mainFields,
+  preserveSymlinks,
+  useBrowserOverrides,
+  baseDir,
+  moduleDirectories,
+  rootDir,
+  ignoreSideEffectsForRoot
+}) {
+  try {
+    const exportMapRes = await resolveWithExportMap({
+      importer,
+      importSpecifier: importSpecifierList[0],
+      exportConditions,
+      packageInfoCache,
+      extensions,
+      mainFields,
+      preserveSymlinks,
+      useBrowserOverrides,
+      baseDir,
+      moduleDirectories,
+      rootDir,
+      ignoreSideEffectsForRoot
+    });
+    if (exportMapRes) return exportMapRes;
+  } catch (error) {
+    if (error instanceof ResolveError) {
+      warn(error);
+      return null;
+    }
+    throw error;
+  }
+
+  // package has no imports or exports, use classic node resolve
+  return resolveWithClassic({
+    importer,
+    importSpecifierList,
+    exportConditions,
+    warn,
+    packageInfoCache,
+    extensions,
+    mainFields,
+    preserveSymlinks,
+    useBrowserOverrides,
+    baseDir,
+    moduleDirectories,
+    rootDir,
+    ignoreSideEffectsForRoot
+  });
+}
+
 function handleDeprecatedOptions(opts) {
   const warnings = [];
 
@@ -809,7 +910,7 @@ function handleDeprecatedOptions(opts) {
 
 /* eslint-disable no-param-reassign, no-shadow, no-undefined */
 
-const builtins = new Set(builtinList__default['default']);
+const builtins = new Set(builtinList__default["default"]);
 const ES6_BROWSER_EMPTY = '\0node-resolve:empty.js';
 const deepFreeze = (object) => {
   Object.freeze(object);
@@ -835,7 +936,7 @@ const defaults = {
   moduleDirectories: ['node_modules'],
   ignoreSideEffectsForRoot: false
 };
-const DEFAULTS = deepFreeze(deepMerge__default['default']({}, defaults));
+const DEFAULTS = deepFreeze(deepMerge__default["default"]({}, defaults));
 
 function nodeResolve(opts = {}) {
   const { warnings } = handleDeprecatedOptions(opts);
@@ -870,7 +971,7 @@ function nodeResolve(opts = {}) {
   const browserMapCache = new Map();
   let preserveSymlinks;
 
-  const doResolveId = async (context, importee, importer, opts) => {
+  const doResolveId = async (context, importee, importer, custom) => {
     // strip query params from import
     const [importPath, params] = importee.split('?');
     const importSuffix = `${params ? `?${params}` : ''}`;
@@ -886,7 +987,7 @@ function nodeResolve(opts = {}) {
         return { id: ES6_BROWSER_EMPTY };
       }
       const browserImportee =
-        browser[importee] ||
+        (importee[0] !== '.' && browser[importee]) ||
         browser[resolvedImportee] ||
         browser[`${resolvedImportee}.js`] ||
         browser[`${resolvedImportee}.json`];
@@ -919,30 +1020,17 @@ function nodeResolve(opts = {}) {
       return false;
     }
 
-    const importSpecifierList = [];
+    const importSpecifierList = [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.
+      // resolve it.
       importSpecifierList.push(`./${importee}`);
     }
 
-    const importeeIsBuiltin = builtins.has(importee);
-
-    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}/`);
-    }
-
     // TypeScript files may import '.js' to refer to either '.ts' or '.tsx'
     if (importer && importee.endsWith('.js')) {
       for (const ext of ['.ts', '.tsx']) {
@@ -952,11 +1040,8 @@ function nodeResolve(opts = {}) {
       }
     }
 
-    importSpecifierList.push(importee);
-
     const warn = (...args) => context.warn(...args);
-    const isRequire =
-      opts && opts.custom && opts.custom['node-resolve'] && opts.custom['node-resolve'].isRequire;
+    const isRequire = custom && custom['node-resolve'] && custom['node-resolve'].isRequire;
     const exportConditions = isRequire ? conditionsCjs : conditionsEsm;
 
     if (useBrowserOverrides && !exportConditions.includes('browser'))
@@ -978,6 +1063,7 @@ function nodeResolve(opts = {}) {
       ignoreSideEffectsForRoot
     });
 
+    const importeeIsBuiltin = builtins.has(importee);
     const resolved =
       importeeIsBuiltin && preferBuiltins
         ? {
@@ -1028,7 +1114,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__default["default"](code)) {
         return {
           id: `${location}${importSuffix}`,
           moduleSideEffects: hasModuleSideEffects(location)
@@ -1062,7 +1148,7 @@ function nodeResolve(opts = {}) {
       isDirCached.clear();
     },
 
-    async resolveId(importee, importer, opts) {
+    async resolveId(importee, importer, resolveOptions) {
       if (importee === ES6_BROWSER_EMPTY) {
         return importee;
       }
@@ -1073,9 +1159,13 @@ function nodeResolve(opts = {}) {
         importer = undefined;
       }
 
-      const resolved = await doResolveId(this, importee, importer, opts);
+      const resolved = await doResolveId(this, importee, importer, resolveOptions.custom);
       if (resolved) {
-        const resolvedResolved = await this.resolve(resolved.id, importer, { skipSelf: true });
+        const resolvedResolved = await this.resolve(
+          resolved.id,
+          importer,
+          Object.assign({ skipSelf: true }, resolveOptions)
+        );
         const isExternal = !!(resolvedResolved && resolvedResolved.external);
         if (isExternal) {
           return false;
@@ -1098,5 +1188,5 @@ function nodeResolve(opts = {}) {
 }
 
 exports.DEFAULTS = DEFAULTS;
-exports.default = nodeResolve;
+exports["default"] = nodeResolve;
 exports.nodeResolve = nodeResolve;

package/dist/es/index.js

@@ -22,6 +22,10 @@ async function fileExists(filePath) {
   }
 }
 
+async function resolveSymlink(path) {
+  return (await fileExists(path)) ? realpath(path) : path;
+}
+
 const onError = (error) => {
   if (error.code === 'ENOENT') {
     return false;
@@ -299,8 +303,8 @@ class InvalidConfigurationError extends ResolveError {
 }
 
 class InvalidModuleSpecifierError extends ResolveError {
-  constructor(context, internal) {
-    super(createErrorMsg(context, internal));
+  constructor(context, internal, reason) {
+    super(createErrorMsg(context, reason, internal));
   }
 }
 
@@ -527,7 +531,7 @@ async function resolvePackageImports({
   }
 
   if (importSpecifier === '#' || importSpecifier.startsWith('#/')) {
-    throw new InvalidModuleSpecifierError(context, 'Invalid import specifier.');
+    throw new InvalidModuleSpecifierError(context, true, 'Invalid import specifier.');
   }
 
   return resolvePackageImportsExports(context, {
@@ -558,11 +562,8 @@ async function getPackageJson(importer, pkgName, resolveOptions, moduleDirectori
   }
 }
 
-async function resolveId({
-  importer,
+async function resolveIdClassic({
   importSpecifier,
-  exportConditions,
-  warn,
   packageInfoCache,
   extensions,
   mainFields,
@@ -609,8 +610,38 @@ async function resolveId({
   };
 
   let location;
+  try {
+    location = await resolveImportPath(importSpecifier, resolveOptions);
+  } catch (error) {
+    if (error.code !== 'MODULE_NOT_FOUND') {
+      throw error;
+    }
+    return null;
+  }
 
-  const pkgName = getPackageName(importSpecifier);
+  return {
+    location: preserveSymlinks ? location : await resolveSymlink(location),
+    hasModuleSideEffects,
+    hasPackageEntry,
+    packageBrowserField,
+    packageInfo
+  };
+}
+
+async function resolveWithExportMap({
+  importer,
+  importSpecifier,
+  exportConditions,
+  packageInfoCache,
+  extensions,
+  mainFields,
+  preserveSymlinks,
+  useBrowserOverrides,
+  baseDir,
+  moduleDirectories,
+  rootDir,
+  ignoreSideEffectsForRoot
+}) {
   if (importSpecifier.startsWith('#')) {
     // this is a package internal import, resolve using package imports field
     const resolveResult = await resolvePackageImports({
@@ -618,12 +649,9 @@ async function resolveId({
       importer,
       moduleDirs: moduleDirectories,
       conditions: exportConditions,
-      resolveId(id, parent) {
-        return resolveId({
+      resolveId(id /* , parent*/) {
+        return resolveIdClassic({
           importSpecifier: id,
-          importer: parent,
-          exportConditions,
-          warn,
           packageInfoCache,
           extensions,
           mainFields,
@@ -634,71 +662,91 @@ async function resolveId({
         });
       }
     });
-    location = fileURLToPath(resolveResult);
-  } else if (pkgName) {
+
+    const location = fileURLToPath(resolveResult);
+    return {
+      location: preserveSymlinks ? location : await resolveSymlink(location),
+      hasModuleSideEffects: () => null,
+      hasPackageEntry: true,
+      packageBrowserField: false,
+      // eslint-disable-next-line no-undefined
+      packageInfo: undefined
+    };
+  }
+
+  const pkgName = getPackageName(importSpecifier);
+  if (pkgName) {
     // it's a bare import, find the package.json and resolve using package exports if available
+    let hasModuleSideEffects = () => null;
+    let hasPackageEntry = true;
+    let packageBrowserField = false;
+    let packageInfo;
+
+    const filter = (pkg, pkgPath) => {
+      const info = getPackageInfo({
+        cache: packageInfoCache,
+        extensions,
+        pkg,
+        pkgPath,
+        mainFields,
+        preserveSymlinks,
+        useBrowserOverrides,
+        rootDir,
+        ignoreSideEffectsForRoot
+      });
+
+      ({ packageInfo, hasModuleSideEffects, hasPackageEntry, packageBrowserField } = info);
+
+      return info.cachedPkg;
+    };
+
+    const resolveOptions = {
+      basedir: baseDir,
+      readFile: readCachedFile,
+      isFile: isFileCached,
+      isDirectory: isDirCached,
+      extensions,
+      includeCoreModules: false,
+      moduleDirectory: moduleDirectories,
+      preserveSymlinks,
+      packageFilter: filter
+    };
+
     const result = await getPackageJson(importer, pkgName, resolveOptions, moduleDirectories);
 
     if (result && result.pkgJson.exports) {
-      const { pkgJson, pkgJsonPath, pkgPath } = result;
-      try {
-        const subpath =
-          pkgName === importSpecifier ? '.' : `.${importSpecifier.substring(pkgName.length)}`;
-        const pkgURL = pathToFileURL(`${pkgPath}/`);
-
-        const context = {
-          importer,
-          importSpecifier,
-          moduleDirs: moduleDirectories,
-          pkgURL,
-          pkgJsonPath,
-          conditions: exportConditions
+      const { pkgJson, pkgJsonPath } = result;
+      const subpath =
+        pkgName === importSpecifier ? '.' : `.${importSpecifier.substring(pkgName.length)}`;
+      const pkgDr = pkgJsonPath.replace('package.json', '');
+      const pkgURL = pathToFileURL(pkgDr);
+
+      const context = {
+        importer,
+        importSpecifier,
+        moduleDirs: moduleDirectories,
+        pkgURL,
+        pkgJsonPath,
+        conditions: exportConditions
+      };
+      const resolvedPackageExport = await resolvePackageExports(context, subpath, pkgJson.exports);
+      const location = fileURLToPath(resolvedPackageExport);
+      if (location) {
+        return {
+          location: preserveSymlinks ? location : await resolveSymlink(location),
+          hasModuleSideEffects,
+          hasPackageEntry,
+          packageBrowserField,
+          packageInfo
         };
-        const resolvedPackageExport = await resolvePackageExports(
-          context,
-          subpath,
-          pkgJson.exports
-        );
-        location = fileURLToPath(resolvedPackageExport);
-      } catch (error) {
-        if (error instanceof ResolveError) {
-          return error;
-        }
-        throw error;
       }
     }
   }
 
-  if (!location) {
-    // package has no imports or exports, use classic node resolve
-    try {
-      location = await resolveImportPath(importSpecifier, resolveOptions);
-    } catch (error) {
-      if (error.code !== 'MODULE_NOT_FOUND') {
-        throw error;
-      }
-      return null;
-    }
-  }
-
-  if (!preserveSymlinks) {
-    if (await fileExists(location)) {
-      location = await realpath(location);
-    }
-  }
-
-  return {
-    location,
-    hasModuleSideEffects,
-    hasPackageEntry,
-    packageBrowserField,
-    packageInfo
-  };
+  return null;
 }
 
-// Resolve module specifiers in order. Promise resolves to the first module that resolves
-// successfully, or the error that resulted from the last attempted module resolution.
-async function resolveImportSpecifiers({
+async function resolveWithClassic({
   importer,
   importSpecifierList,
   exportConditions,
@@ -713,11 +761,9 @@ async function resolveImportSpecifiers({
   rootDir,
   ignoreSideEffectsForRoot
 }) {
-  let lastResolveError;
-
   for (let i = 0; i < importSpecifierList.length; i++) {
     // eslint-disable-next-line no-await-in-loop
-    const result = await resolveId({
+    const result = await resolveIdClassic({
       importer,
       importSpecifier: importSpecifierList[i],
       exportConditions,
@@ -733,20 +779,75 @@ async function resolveImportSpecifiers({
       ignoreSideEffectsForRoot
     });
 
-    if (result instanceof ResolveError) {
-      lastResolveError = result;
-    } else if (result) {
+    if (result) {
       return result;
     }
   }
 
-  if (lastResolveError) {
-    // only log the last failed resolve error
-    warn(lastResolveError);
-  }
   return null;
 }
 
+// Resolves to the module if found or `null`.
+// The first import specificer will first be attempted with the exports algorithm.
+// If this is unsuccesful because export maps are not being used, then all of `importSpecifierList`
+// will be tried with the classic resolution algorithm
+async function resolveImportSpecifiers({
+  importer,
+  importSpecifierList,
+  exportConditions,
+  warn,
+  packageInfoCache,
+  extensions,
+  mainFields,
+  preserveSymlinks,
+  useBrowserOverrides,
+  baseDir,
+  moduleDirectories,
+  rootDir,
+  ignoreSideEffectsForRoot
+}) {
+  try {
+    const exportMapRes = await resolveWithExportMap({
+      importer,
+      importSpecifier: importSpecifierList[0],
+      exportConditions,
+      packageInfoCache,
+      extensions,
+      mainFields,
+      preserveSymlinks,
+      useBrowserOverrides,
+      baseDir,
+      moduleDirectories,
+      rootDir,
+      ignoreSideEffectsForRoot
+    });
+    if (exportMapRes) return exportMapRes;
+  } catch (error) {
+    if (error instanceof ResolveError) {
+      warn(error);
+      return null;
+    }
+    throw error;
+  }
+
+  // package has no imports or exports, use classic node resolve
+  return resolveWithClassic({
+    importer,
+    importSpecifierList,
+    exportConditions,
+    warn,
+    packageInfoCache,
+    extensions,
+    mainFields,
+    preserveSymlinks,
+    useBrowserOverrides,
+    baseDir,
+    moduleDirectories,
+    rootDir,
+    ignoreSideEffectsForRoot
+  });
+}
+
 function handleDeprecatedOptions(opts) {
   const warnings = [];
 
@@ -857,7 +958,7 @@ function nodeResolve(opts = {}) {
   const browserMapCache = new Map();
   let preserveSymlinks;
 
-  const doResolveId = async (context, importee, importer, opts) => {
+  const doResolveId = async (context, importee, importer, custom) => {
     // strip query params from import
     const [importPath, params] = importee.split('?');
     const importSuffix = `${params ? `?${params}` : ''}`;
@@ -873,7 +974,7 @@ function nodeResolve(opts = {}) {
         return { id: ES6_BROWSER_EMPTY };
       }
       const browserImportee =
-        browser[importee] ||
+        (importee[0] !== '.' && browser[importee]) ||
         browser[resolvedImportee] ||
         browser[`${resolvedImportee}.js`] ||
         browser[`${resolvedImportee}.json`];
@@ -906,30 +1007,17 @@ function nodeResolve(opts = {}) {
       return false;
     }
 
-    const importSpecifierList = [];
+    const importSpecifierList = [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.
+      // resolve it.
       importSpecifierList.push(`./${importee}`);
     }
 
-    const importeeIsBuiltin = builtins.has(importee);
-
-    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}/`);
-    }
-
     // TypeScript files may import '.js' to refer to either '.ts' or '.tsx'
     if (importer && importee.endsWith('.js')) {
       for (const ext of ['.ts', '.tsx']) {
@@ -939,11 +1027,8 @@ function nodeResolve(opts = {}) {
       }
     }
 
-    importSpecifierList.push(importee);
-
     const warn = (...args) => context.warn(...args);
-    const isRequire =
-      opts && opts.custom && opts.custom['node-resolve'] && opts.custom['node-resolve'].isRequire;
+    const isRequire = custom && custom['node-resolve'] && custom['node-resolve'].isRequire;
     const exportConditions = isRequire ? conditionsCjs : conditionsEsm;
 
     if (useBrowserOverrides && !exportConditions.includes('browser'))
@@ -965,6 +1050,7 @@ function nodeResolve(opts = {}) {
       ignoreSideEffectsForRoot
     });
 
+    const importeeIsBuiltin = builtins.has(importee);
     const resolved =
       importeeIsBuiltin && preferBuiltins
         ? {
@@ -1049,7 +1135,7 @@ function nodeResolve(opts = {}) {
       isDirCached.clear();
     },
 
-    async resolveId(importee, importer, opts) {
+    async resolveId(importee, importer, resolveOptions) {
       if (importee === ES6_BROWSER_EMPTY) {
         return importee;
       }
@@ -1060,9 +1146,13 @@ function nodeResolve(opts = {}) {
         importer = undefined;
       }
 
-      const resolved = await doResolveId(this, importee, importer, opts);
+      const resolved = await doResolveId(this, importee, importer, resolveOptions.custom);
       if (resolved) {
-        const resolvedResolved = await this.resolve(resolved.id, importer, { skipSelf: true });
+        const resolvedResolved = await this.resolve(
+          resolved.id,
+          importer,
+          Object.assign({ skipSelf: true }, resolveOptions)
+        );
         const isExternal = !!(resolvedResolved && resolvedResolved.external);
         if (isExternal) {
           return false;
@@ -1084,5 +1174,4 @@ function nodeResolve(opts = {}) {
   };
 }
 
-export default nodeResolve;
-export { DEFAULTS, nodeResolve };
+export { DEFAULTS, nodeResolve as default, nodeResolve };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-node-resolve",
-  "version": "13.0.2",
+  "version": "13.0.6",
   "publishConfig": {
     "access": "public"
   },
@@ -68,7 +68,7 @@
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "es5-ext": "^0.10.53",
-    "rollup": "^2.42.0",
+    "rollup": "^2.58.0",
     "source-map": "^0.7.3",
     "string-capitalize": "^1.0.1"
   },