fix: fix module-root.js package.json in subpath

depcheck · Jan 9, 2024 · cdbf4d8 · cdbf4d8
1 parent a464654
commit cdbf4d8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/src/utils/module-root.js b/src/utils/module-root.js
@@ -7,14 +7,16 @@ export default (...args) => {
   const name = args.find((arg) => typeof arg === 'string');
   const options = args.find((arg) => typeof arg === 'object') || {};
   options.cwd = options.cwd || process.cwd();
-  let pkg;
   try {
-    const fullpath = name
-      ? resolveFrom(options.cwd, name)
-      : callsite()[1].getFileName();
-    pkg = findup('package.json', { cwd: path.dirname(fullpath) });
+    if (name) {
+      const fullpath = resolveFrom(options.cwd, name);
+      const index = fullpath.indexOf(name.replace(/\//g, path.sep))
+      return fullpath.substring(0, index + name.length)
+    } else {
+      return path.dirname(findup('package.json', { cwd: path.dirname(callsite()[1].getFileName()) }))
+    }
   } catch {
-    pkg = resolveFrom(options.cwd, `${args[0]}/package.json`);
+    const pkg = resolveFrom(options.cwd, `${name}/package.json`);
+    return path.resolve(path.dirname(pkg));
   }
-  return path.resolve(path.dirname(pkg));
 };
diff --git a/test/node_modules/esm-packagejson-subpath/package.json b/test/node_modules/esm-packagejson-subpath/package.json
diff --git a/test/special/bin.js b/test/special/bin.js
@@ -125,6 +125,12 @@ const testCases = [
     dependencies: ['@scoped/scoped-binary-package'],
     expected: ['@scoped/scoped-binary-package'],
   },
+  {
+    name: 'esm package.json in subpath',
+    script: 'esm-packagejson-subpath',
+    dependencies: ['esm-packagejson-subpath'],
+    expected: ['esm-packagejson-subpath'],
+  },
   {
     name: 'esm',
     script: 'esm',