Use resolve-package-path

CrowdStrike · Feb 16, 2023 · 0188aca · 0188aca
1 parent 8db5d54
commit 0188aca
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 21 deletions.
diff --git a/internal/sync-pnpm/index.js b/internal/sync-pnpm/index.js
@@ -1,11 +1,11 @@
-import { join } from 'node:path';
+import { join, dirname } from 'node:path';
 import { createRequire } from 'node:module';
 
 import { getPackages } from '@manypkg/get-packages';
 import { findRoot } from '@manypkg/find-root';
 import { readJson, pathExists } from 'fs-extra/esm';
 import { hardLinkDir } from '@pnpm/fs.hard-link-dir';
-import resolvePkg from 'resolve-pkg';
+import resolvePackagePath from 'resolve-package-path';
 
 const require = createRequire(import.meta.url);
 
@@ -29,9 +29,9 @@ export default async function syncPnpm(dir = process.cwd()) {
 
   for (const pkg of packagesToSync) {
     const syncFrom = join(pkg.dir, syncDir);
-    const resolvedPackagePath = resolvePkg(pkg.packageJson.name, {
-      cwd: dir,
-    });
+    const resolvedPackagePath = dirname(
+      resolvePackagePath(pkg.packageJson.name, dir)
+    );
     const syncTo = join(resolvedPackagePath, syncDir);
 
     if (await pathExists(syncFrom)) {

diff --git a/internal/sync-pnpm/package.json b/internal/sync-pnpm/package.json
@@ -14,6 +14,6 @@
     "@manypkg/get-packages": "^2.1.0",
     "@pnpm/fs.hard-link-dir": "^1.0.3",
     "fs-extra": "^11.1.0",
-    "resolve-pkg": "^2.0.0"
+    "resolve-package-path": "^4.0.3"
   }
 }
diff --git a/packages/changeset-validations/package.json b/packages/changeset-validations/package.json
@@ -101,8 +101,7 @@
       "types": "./dist/*.d.ts",
       "default": "./dist/*.js"
     },
-    "./addon-main.js": "./addon-main.cjs",
-    "./package.json": "./package.json"
+    "./addon-main.js": "./addon-main.cjs"
   },
   "typesVersions": {
     "*": {

diff --git a/packages/ember-headless-form/package.json b/packages/ember-headless-form/package.json
@@ -109,8 +109,7 @@
       "default": "./dist/*.js"
     },
     "./addon-main.js": "./addon-main.js",
-    "./-private/*": null,
-    "./package.json": "./package.json"
+    "./-private/*": null
   },
   "typesVersions": {
     "*": {

diff --git a/packages/yup/package.json b/packages/yup/package.json
@@ -100,8 +100,7 @@
       "types": "./dist/*.d.ts",
       "default": "./dist/*.js"
     },
-    "./addon-main.js": "./addon-main.cjs",
-    "./package.json": "./package.json"
+    "./addon-main.js": "./addon-main.cjs"
   },
   "typesVersions": {
     "*": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml