@rollup/plugin-node-resolve 13.1.3 → 13.2.2

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @rollup/plugin-node-resolve ChangeLog
 
+## v13.2.2
+
+_2022-05-02_
+
+### Bugfixes
+
+- fix: Respect if other plugins resolve the resolution to a different id (#1181)
+- fix: Revert respect if other plugins resolve the resolution to a different id (ae59ceb)
+- fix: Respect if other plugins resolve the resolution to a different id (f8d4c44)
+
+## v13.2.1
+
+_2022-04-15_
+
+### Bugfixes
+
+- fix: update side effects logic to be deep when glob doesn’t contain `/` (#1148)
+
+## v13.2.0
+
+_2022-04-11_
+
+### Features
+
+- feat: Add the ability to pass a function into resolveOnly (#1152)
+
 ## v13.1.3
 
 _2022-01-05_

package/README.md

@@ -140,12 +140,17 @@ If `true`, inspect resolved files to assert that they are ES2015 modules.
 
 ### `resolveOnly`
 
-Type: `Array[...String|RegExp]`<br>
+Type: `Array[...String|RegExp] | (module: string) => boolean`<br>
 Default: `null`
 
 An `Array` which instructs the plugin to limit module resolution to those whose names match patterns in the array. _Note: Modules not matching any patterns will be marked as external._
 
-Example: `resolveOnly: ['batman', /^@batcave\/.*$/]`
+Alternatively, you may pass in a function that returns a boolean to confirm whether the module should be included or not.
+
+Examples:
+
+- `resolveOnly: ['batman', /^@batcave\/.*$/]`
+- `resolveOnly: module => !module.includes('joker')`
 
 ### `rootDir`
 

package/dist/cjs/index.js

@@ -21,7 +21,7 @@ var isModule__default = /*#__PURE__*/_interopDefaultLegacy(isModule);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var resolve__default = /*#__PURE__*/_interopDefaultLegacy(resolve);
 
-var version = "13.1.3";
+var version = "13.2.2";
 
 util.promisify(fs__default["default"].access);
 const readFile$1 = util.promisify(fs__default["default"].readFile);
@@ -282,7 +282,17 @@ function getPackageInfo(options) {
     if (typeof packageSideEffects === 'boolean') {
       internalPackageInfo.hasModuleSideEffects = () => packageSideEffects;
     } else if (Array.isArray(packageSideEffects)) {
-      internalPackageInfo.hasModuleSideEffects = pluginutils.createFilter(packageSideEffects, null, {
+      const finalPackageSideEffects = packageSideEffects.map((sideEffect) => {
+        /*
+         * The array accepts simple glob patterns to the relevant files... Patterns like .css, which do not include a /, will be treated like **\/.css.
+         * https://webpack.js.org/guides/tree-shaking/
+         */
+        if (sideEffect.includes('/')) {
+          return sideEffect;
+        }
+        return `**/${sideEffect}`;
+      });
+      internalPackageInfo.hasModuleSideEffects = pluginutils.createFilter(finalPackageSideEffects, null, {
         resolve: pkgRoot
       });
     }
@@ -962,13 +972,22 @@ function nodeResolve(opts = {}) {
       options.dedupe.includes(importee) || options.dedupe.includes(getPackageName(importee));
   }
 
-  const resolveOnly = options.resolveOnly.map((pattern) => {
-    if (pattern instanceof RegExp) {
-      return pattern;
-    }
-    const normalized = pattern.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
-    return new RegExp(`^${normalized}$`);
-  });
+  // creates a function from the patterns to test if a particular module should be bundled.
+  const allowPatterns = (patterns) => {
+    const regexPatterns = patterns.map((pattern) => {
+      if (pattern instanceof RegExp) {
+        return pattern;
+      }
+      const normalized = pattern.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
+      return new RegExp(`^${normalized}$`);
+    });
+    return (id) => !regexPatterns.length || regexPatterns.some((pattern) => pattern.test(id));
+  };
+
+  const resolveOnly =
+    typeof options.resolveOnly === 'function'
+      ? options.resolveOnly
+      : allowPatterns(options.resolveOnly);
 
   const browserMapCache = new Map();
   let preserveSymlinks;
@@ -1011,11 +1030,8 @@ function nodeResolve(opts = {}) {
       isRelativeImport = true;
     }
 
-    if (
-      !isRelativeImport &&
-      resolveOnly.length &&
-      !resolveOnly.some((pattern) => pattern.test(id))
-    ) {
+    // if it's not a relative import, and it's not requested, reject it.
+    if (!isRelativeImport && !resolveOnly(id)) {
       if (normalizeInput(rollupOptions.input).includes(importee)) {
         return null;
       }
@@ -1135,14 +1151,14 @@ function nodeResolve(opts = {}) {
 
     version,
 
-    buildStart(options) {
-      rollupOptions = options;
+    buildStart(buildOptions) {
+      rollupOptions = buildOptions;
 
       for (const warning of warnings) {
         this.warn(warning);
       }
 
-      ({ preserveSymlinks } = options);
+      ({ preserveSymlinks } = buildOptions);
     },
 
     generateBundle() {
@@ -1174,6 +1190,11 @@ function nodeResolve(opts = {}) {
           if (resolvedResolved.external) {
             return false;
           }
+          // Allow other plugins to take over resolution. Rollup core will not
+          // change the id if it corresponds to an existing file
+          if (resolvedResolved.id !== resolved.id) {
+            return resolvedResolved;
+          }
           // Pass on meta information added by other plugins
           return { ...resolved, meta: resolvedResolved.meta };
         }

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 = "13.1.3";
+var version = "13.2.2";
 
 promisify(fs.access);
 const readFile$1 = promisify(fs.readFile);
@@ -269,7 +269,17 @@ function getPackageInfo(options) {
     if (typeof packageSideEffects === 'boolean') {
       internalPackageInfo.hasModuleSideEffects = () => packageSideEffects;
     } else if (Array.isArray(packageSideEffects)) {
-      internalPackageInfo.hasModuleSideEffects = createFilter(packageSideEffects, null, {
+      const finalPackageSideEffects = packageSideEffects.map((sideEffect) => {
+        /*
+         * The array accepts simple glob patterns to the relevant files... Patterns like .css, which do not include a /, will be treated like **\/.css.
+         * https://webpack.js.org/guides/tree-shaking/
+         */
+        if (sideEffect.includes('/')) {
+          return sideEffect;
+        }
+        return `**/${sideEffect}`;
+      });
+      internalPackageInfo.hasModuleSideEffects = createFilter(finalPackageSideEffects, null, {
         resolve: pkgRoot
       });
     }
@@ -949,13 +959,22 @@ function nodeResolve(opts = {}) {
       options.dedupe.includes(importee) || options.dedupe.includes(getPackageName(importee));
   }
 
-  const resolveOnly = options.resolveOnly.map((pattern) => {
-    if (pattern instanceof RegExp) {
-      return pattern;
-    }
-    const normalized = pattern.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
-    return new RegExp(`^${normalized}$`);
-  });
+  // creates a function from the patterns to test if a particular module should be bundled.
+  const allowPatterns = (patterns) => {
+    const regexPatterns = patterns.map((pattern) => {
+      if (pattern instanceof RegExp) {
+        return pattern;
+      }
+      const normalized = pattern.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
+      return new RegExp(`^${normalized}$`);
+    });
+    return (id) => !regexPatterns.length || regexPatterns.some((pattern) => pattern.test(id));
+  };
+
+  const resolveOnly =
+    typeof options.resolveOnly === 'function'
+      ? options.resolveOnly
+      : allowPatterns(options.resolveOnly);
 
   const browserMapCache = new Map();
   let preserveSymlinks;
@@ -998,11 +1017,8 @@ function nodeResolve(opts = {}) {
       isRelativeImport = true;
     }
 
-    if (
-      !isRelativeImport &&
-      resolveOnly.length &&
-      !resolveOnly.some((pattern) => pattern.test(id))
-    ) {
+    // if it's not a relative import, and it's not requested, reject it.
+    if (!isRelativeImport && !resolveOnly(id)) {
       if (normalizeInput(rollupOptions.input).includes(importee)) {
         return null;
       }
@@ -1122,14 +1138,14 @@ function nodeResolve(opts = {}) {
 
     version,
 
-    buildStart(options) {
-      rollupOptions = options;
+    buildStart(buildOptions) {
+      rollupOptions = buildOptions;
 
       for (const warning of warnings) {
         this.warn(warning);
       }
 
-      ({ preserveSymlinks } = options);
+      ({ preserveSymlinks } = buildOptions);
     },
 
     generateBundle() {
@@ -1161,6 +1177,11 @@ function nodeResolve(opts = {}) {
           if (resolvedResolved.external) {
             return false;
           }
+          // Allow other plugins to take over resolution. Rollup core will not
+          // change the id if it corresponds to an existing file
+          if (resolvedResolved.id !== resolved.id) {
+            return resolvedResolved;
+          }
           // Pass on meta information added by other plugins
           return { ...resolved, meta: resolvedResolved.meta };
         }

package/package.json

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

package/types/index.d.ts

@@ -81,7 +81,7 @@ export interface RollupNodeResolveOptions {
    * names match patterns in the array.
    * @default []
    */
-  resolveOnly?: ReadonlyArray<string | RegExp> | null;
+  resolveOnly?: ReadonlyArray<string | RegExp> | null | ((module: string) => boolean);
 
   /**
    * Specifies the root directory from which to resolve modules. Typically used when