@rollup/plugin-node-resolve 13.0.5 → 13.0.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @rollup/plugin-node-resolve ChangeLog
 
+## v13.0.6
+
+_2021-10-19_
+
+### Bugfixes
+
+- fix: pass on isEntry flag (#1016)
+
 ## v13.0.5
 
 _2021-09-21_

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 {
@@ -261,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;
 }
@@ -554,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) {
@@ -910,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);
@@ -936,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);
@@ -971,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}` : ''}`;
@@ -1041,8 +1041,7 @@ function nodeResolve(opts = {}) {
     }
 
     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'))
@@ -1115,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)
@@ -1149,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;
       }
@@ -1160,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;
@@ -1185,5 +1188,5 @@ function nodeResolve(opts = {}) {
 }
 
 exports.DEFAULTS = DEFAULTS;
-exports.default = nodeResolve;
+exports["default"] = nodeResolve;
 exports.nodeResolve = nodeResolve;

package/dist/es/index.js

@@ -958,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}` : ''}`;
@@ -1028,8 +1028,7 @@ function nodeResolve(opts = {}) {
     }
 
     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'))
@@ -1136,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;
       }
@@ -1147,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;
@@ -1171,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.5",
+  "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"
   },