@pnpm/plugin-commands-patching 5.0.5 → 5.0.6

package/lib/patch.d.ts

@@ -135,7 +135,7 @@ export declare const shorthands: {
 };
 export declare const commandNames: string[];
 export declare function help(): string;
-export type PatchCommandOptions = Pick<Config, 'dir' | 'registries' | 'tag' | 'storeDir' | 'rootProjectManifest' | 'lockfileDir' | 'modulesDir' | 'virtualStoreDir'> & CreateStoreControllerOptions & {
+export type PatchCommandOptions = Pick<Config, 'dir' | 'registries' | 'tag' | 'storeDir' | 'rootProjectManifest' | 'lockfileDir' | 'modulesDir' | 'virtualStoreDir' | 'sharedWorkspaceLockfile'> & CreateStoreControllerOptions & {
     editDir?: string;
     reporter?: (logObj: LogBase) => void;
     ignoreExisting?: boolean;

package/lib/patch.js

@@ -15,6 +15,7 @@ const tempy_1 = __importDefault(require("tempy"));
 const error_1 = require("@pnpm/error");
 const writePackage_1 = require("./writePackage");
 const getPatchedDependency_1 = require("./getPatchedDependency");
+const read_project_manifest_1 = require("@pnpm/read-project-manifest");
 function rcOptionsTypes() {
     return (0, pick_1.default)([], config_1.types);
 }
@@ -63,13 +64,22 @@ async function handler(opts, params) {
         virtualStoreDir: opts.virtualStoreDir,
     });
     await (0, writePackage_1.writePackage)(patchedDep, editDir, opts);
-    if (!opts.ignoreExisting && opts.rootProjectManifest?.pnpm?.patchedDependencies) {
-        tryPatchWithExistingPatchFile({
-            patchedDep,
-            patchedDir: editDir,
-            patchedDependencies: opts.rootProjectManifest.pnpm.patchedDependencies,
-            lockfileDir,
-        });
+    if (!opts.ignoreExisting) {
+        let rootProjectManifest = opts.rootProjectManifest;
+        if (!opts.sharedWorkspaceLockfile) {
+            const { manifest } = await (0, read_project_manifest_1.tryReadProjectManifest)(lockfileDir);
+            if (manifest) {
+                rootProjectManifest = manifest;
+            }
+        }
+        if (rootProjectManifest?.pnpm?.patchedDependencies) {
+            tryPatchWithExistingPatchFile({
+                patchedDep,
+                patchedDir: editDir,
+                patchedDependencies: rootProjectManifest.pnpm.patchedDependencies,
+                lockfileDir,
+            });
+        }
     }
     return `You can now edit the following folder: ${editDir}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-patching",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "Commands for creating patches",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -28,10 +28,10 @@
     "@types/ramda": "0.28.20",
     "@types/semver": "7.5.3",
     "write-yaml-file": "^5.0.0",
-    "@pnpm/filter-workspace-packages": "7.2.1",
-    "@pnpm/plugin-commands-patching": "5.0.5",
-    "@pnpm/prepare": "0.0.84",
-    "@pnpm/test-fixtures": "0.1.14"
+    "@pnpm/filter-workspace-packages": "7.2.2",
+    "@pnpm/plugin-commands-patching": "5.0.6",
+    "@pnpm/prepare": "0.0.85",
+    "@pnpm/test-fixtures": "0.1.15"
   },
   "dependencies": {
     "enquirer": "^2.4.1",
@@ -44,22 +44,22 @@
     "safe-execa": "^0.1.3",
     "semver": "^7.5.4",
     "tempy": "^1.0.1",
+    "@pnpm/cli-utils": "2.1.2",
+    "@pnpm/config": "20.1.2",
     "@pnpm/constants": "7.1.1",
-    "@pnpm/config": "20.1.1",
-    "@pnpm/cli-utils": "2.1.1",
-    "@pnpm/fs.packlist": "1.0.1",
     "@pnpm/error": "5.0.2",
+    "@pnpm/fs.packlist": "1.0.2",
     "@pnpm/lockfile-file": "8.1.4",
     "@pnpm/lockfile-utils": "9.0.0",
     "@pnpm/modules-yaml": "12.1.4",
-    "@pnpm/patching.apply-patch": "2.0.5",
     "@pnpm/parse-wanted-dependency": "5.0.0",
+    "@pnpm/patching.apply-patch": "2.0.5",
     "@pnpm/pick-fetcher": "2.0.1",
     "@pnpm/pick-registry-for-package": "5.0.4",
-    "@pnpm/plugin-commands-installation": "14.0.5",
-    "@pnpm/read-project-manifest": "5.0.8",
+    "@pnpm/plugin-commands-installation": "14.0.6",
     "@pnpm/read-package-json": "8.0.5",
-    "@pnpm/store-connection-manager": "7.0.13"
+    "@pnpm/read-project-manifest": "5.0.8",
+    "@pnpm/store-connection-manager": "7.0.14"
   },
   "peerDependencies": {
     "@pnpm/logger": "^5.0.0"