@rollup/plugin-node-resolve 16.0.1 → 16.0.3

package/dist/cjs/index.js

@@ -12,7 +12,7 @@ var url = require('url');
 var resolve = require('resolve');
 var pluginutils = require('@rollup/pluginutils');
 
-var version = "16.0.1";
+var version = "16.0.3";
 var peerDependencies = {
 	rollup: "^2.78.0||^3.0.0||^4.0.0"
 };
@@ -787,9 +787,18 @@ async function resolveWithExportMap({
       importer,
       moduleDirs: moduleDirectories,
       conditions: exportConditions,
+      // Resolve targets of "imports" mappings using the same algorithm
+      // we use for normal specifiers: try export maps first and then
+      // fall back to classic resolution. This is important for cases
+      // like "#foo/*": "@scope/pkg/*" where the target package relies
+      // on "exports" to expose subpaths. Using the classic resolver
+      // alone would fail to find those subpaths.
       resolveId(id /* , parent*/) {
-        return resolveIdClassic({
-          importSpecifier: id,
+        return resolveImportSpecifiers({
+          importer,
+          importSpecifierList: [id],
+          exportConditions,
+          // pass-through of the rest of the context
           packageInfoCache,
           extensions,
           mainFields,
@@ -797,11 +806,22 @@ async function resolveWithExportMap({
           useBrowserOverrides,
           baseDir,
           moduleDirectories,
-          modulePaths
+          modulePaths,
+          rootDir,
+          ignoreSideEffectsForRoot,
+          allowExportsFolderMapping
         });
       }
     });
 
+    if (resolveResult == null) {
+      // When the target of an "imports" mapping cannot be resolved,
+      // surface a proper resolve error instead of throwing from
+      // fileURLToPath(null).
+      throw new ResolveError(
+        `Could not resolve import "${importSpecifier}" in ${importer} using imports.`
+      );
+    }
     const location = url.fileURLToPath(resolveResult);
     return {
       location: preserveSymlinks ? location : await resolveSymlink(location),
@@ -1167,7 +1187,7 @@ function nodeResolve(opts = {}) {
 
     const importSpecifierList = [importee];
 
-    if (importer === undefined && !importee[0].match(/^\.?\.?\//)) {
+    if (importer === undefined && importee[0] && !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

package/dist/es/index.js

@@ -8,7 +8,7 @@ import { pathToFileURL, fileURLToPath } from 'url';
 import resolve$1 from 'resolve';
 import { createFilter } from '@rollup/pluginutils';
 
-var version = "16.0.1";
+var version = "16.0.3";
 var peerDependencies = {
 	rollup: "^2.78.0||^3.0.0||^4.0.0"
 };
@@ -783,9 +783,18 @@ async function resolveWithExportMap({
       importer,
       moduleDirs: moduleDirectories,
       conditions: exportConditions,
+      // Resolve targets of "imports" mappings using the same algorithm
+      // we use for normal specifiers: try export maps first and then
+      // fall back to classic resolution. This is important for cases
+      // like "#foo/*": "@scope/pkg/*" where the target package relies
+      // on "exports" to expose subpaths. Using the classic resolver
+      // alone would fail to find those subpaths.
       resolveId(id /* , parent*/) {
-        return resolveIdClassic({
-          importSpecifier: id,
+        return resolveImportSpecifiers({
+          importer,
+          importSpecifierList: [id],
+          exportConditions,
+          // pass-through of the rest of the context
           packageInfoCache,
           extensions,
           mainFields,
@@ -793,11 +802,22 @@ async function resolveWithExportMap({
           useBrowserOverrides,
           baseDir,
           moduleDirectories,
-          modulePaths
+          modulePaths,
+          rootDir,
+          ignoreSideEffectsForRoot,
+          allowExportsFolderMapping
         });
       }
     });
 
+    if (resolveResult == null) {
+      // When the target of an "imports" mapping cannot be resolved,
+      // surface a proper resolve error instead of throwing from
+      // fileURLToPath(null).
+      throw new ResolveError(
+        `Could not resolve import "${importSpecifier}" in ${importer} using imports.`
+      );
+    }
     const location = fileURLToPath(resolveResult);
     return {
       location: preserveSymlinks ? location : await resolveSymlink(location),
@@ -1163,7 +1183,7 @@ function nodeResolve(opts = {}) {
 
     const importSpecifierList = [importee];
 
-    if (importer === undefined && !importee[0].match(/^\.?\.?\//)) {
+    if (importer === undefined && importee[0] && !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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-node-resolve",
-  "version": "16.0.1",
+  "version": "16.0.3",
   "publishConfig": {
     "access": "public"
   },