@rollup/plugin-node-resolve 13.0.1 → 13.0.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @rollup/plugin-node-resolve ChangeLog
 
+## v13.0.2
+
+_2021-07-15_
+
+### Bugfixes
+
+- fix
+
 ## v13.0.1
 
 _2021-07-15_
@@ -443,4 +451,4 @@ This release caches reading/statting of files, to improve speed.
 
 ## 0.1.0
 
-- First release
+- First release

package/dist/cjs/index.js

@@ -21,14 +21,15 @@ var isModule__default = /*#__PURE__*/_interopDefaultLegacy(isModule);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 var resolve__default = /*#__PURE__*/_interopDefaultLegacy(resolve);
 
-const access = util.promisify(fs__default['default'].access);
+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 exists(filePath) {
+
+async function fileExists(filePath) {
   try {
-    await access(filePath);
-    return true;
+    const res = await stat(filePath);
+    return res.isFile();
   } catch {
     return false;
   }
@@ -251,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));
 }
@@ -566,7 +565,7 @@ async function getPackageJson(importer, pkgName, resolveOptions, moduleDirectori
   try {
     const pkgJsonPath = await resolveImportPath(`${pkgName}/package.json`, resolveOptions);
     const pkgJson = JSON.parse(await readFile(pkgJsonPath, 'utf-8'));
-    return { pkgJsonPath, pkgJson };
+    return { pkgJsonPath, pkgJson, pkgPath: path.dirname(pkgJsonPath) };
   } catch (_) {
     return null;
   }
@@ -654,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,
@@ -697,7 +695,7 @@ async function resolveId({
   }
 
   if (!preserveSymlinks) {
-    if (await exists(location)) {
+    if (await fileExists(location)) {
       location = await realpath(location);
     }
   }
@@ -1007,8 +1005,8 @@ function nodeResolve(opts = {}) {
     }
 
     if (hasPackageEntry && !preserveSymlinks) {
-      const fileExists = await exists(location);
-      if (fileExists) {
+      const exists = await fileExists(location);
+      if (exists) {
         location = await realpath(location);
       }
     }
@@ -1028,7 +1026,7 @@ function nodeResolve(opts = {}) {
       }
     }
 
-    if (options.modulesOnly && (await exists(location))) {
+    if (options.modulesOnly && (await fileExists(location))) {
       const code = await readFile$1(location, 'utf-8');
       if (isModule__default['default'](code)) {
         return {

package/dist/es/index.js

@@ -8,14 +8,15 @@ import { pathToFileURL, fileURLToPath } from 'url';
 import resolve$1 from 'resolve';
 import { createFilter } from '@rollup/pluginutils';
 
-const access = promisify(fs.access);
+promisify(fs.access);
 const readFile$1 = promisify(fs.readFile);
 const realpath = promisify(fs.realpath);
 const stat = promisify(fs.stat);
-async function exists(filePath) {
+
+async function fileExists(filePath) {
   try {
-    await access(filePath);
-    return true;
+    const res = await stat(filePath);
+    return res.isFile();
   } catch {
     return false;
   }
@@ -238,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));
 }
@@ -553,7 +552,7 @@ async function getPackageJson(importer, pkgName, resolveOptions, moduleDirectori
   try {
     const pkgJsonPath = await resolveImportPath(`${pkgName}/package.json`, resolveOptions);
     const pkgJson = JSON.parse(await readFile(pkgJsonPath, 'utf-8'));
-    return { pkgJsonPath, pkgJson };
+    return { pkgJsonPath, pkgJson, pkgPath: dirname(pkgJsonPath) };
   } catch (_) {
     return null;
   }
@@ -641,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,
@@ -684,7 +682,7 @@ async function resolveId({
   }
 
   if (!preserveSymlinks) {
-    if (await exists(location)) {
+    if (await fileExists(location)) {
       location = await realpath(location);
     }
   }
@@ -994,8 +992,8 @@ function nodeResolve(opts = {}) {
     }
 
     if (hasPackageEntry && !preserveSymlinks) {
-      const fileExists = await exists(location);
-      if (fileExists) {
+      const exists = await fileExists(location);
+      if (exists) {
         location = await realpath(location);
       }
     }
@@ -1015,7 +1013,7 @@ function nodeResolve(opts = {}) {
       }
     }
 
-    if (options.modulesOnly && (await exists(location))) {
+    if (options.modulesOnly && (await fileExists(location))) {
       const code = await readFile$1(location, 'utf-8');
       if (isModule(code)) {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rollup/plugin-node-resolve",
-  "version": "13.0.1",
+  "version": "13.0.2",
   "publishConfig": {
     "access": "public"
   },
@@ -25,15 +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",
+    "ci:test": "pnpm test -- --verbose && pnpm test:ts",
     "prebuild": "del-cli dist",
-    "prepare": "pnpm run build",
-    "prepublishOnly": "pnpm -w 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": [