@pnpm/patching.commands 1100.1.5 → 1100.1.7

package/lib/getPatchedDependency.js

@@ -1,9 +1,8 @@
 import path from 'node:path';
 import { confirm, select } from '@inquirer/prompts';
 import { PnpmError } from '@pnpm/error';
-import { isGitHostedPkgUrl } from '@pnpm/fetching.pick-fetcher';
 import { readCurrentLockfile } from '@pnpm/lockfile.fs';
-import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils';
+import { isGitHostedTarballUrl, nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils';
 import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency';
 import { realpathMissing } from 'realpath-missing';
 import semver from 'semver';
@@ -47,7 +46,7 @@ export async function getPatchedDependency(rawDependency, opts) {
         const preferred = preferredVersions[0];
         if (preferred.gitTarballUrl) {
             return {
-                ...opts,
+                ...dep,
                 applyToAll: false,
                 bareSpecifier: preferred.gitTarballUrl,
             };
@@ -83,7 +82,7 @@ export async function getVersionsFromLockfile(dep, opts) {
         const tarball = pkgSnapshot.resolution?.tarball ?? '';
         return {
             ...nameVerFromPkgSnapshot(depPath, pkgSnapshot),
-            gitTarballUrl: (isGitHostedPkgUrl(tarball) || isPkgPrNewUrl(tarball)) ? tarball : undefined,
+            gitTarballUrl: (isGitHostedTarballUrl(tarball) || isPkgPrNewUrl(tarball)) ? tarball : undefined,
         };
     })
         .filter(({ name }) => name === pkgName)

package/lib/patchCommit.js

@@ -97,11 +97,12 @@ export async function handler(opts, params) {
         ...opts,
         workspaceDir: opts.workspaceDir ?? opts.rootProjectManifestDir,
     });
-    return install.handler({
+    await install.handler({
         ...opts,
         patchedDependencies,
         frozenLockfile: false,
     });
+    return undefined;
 }
 async function getPatchContent(ctx, opts) {
     const storeDir = await getStorePath({

package/lib/patchRemove.js

@@ -83,7 +83,7 @@ export async function handler(opts, params) {
         ...opts,
         workspaceDir: opts.workspaceDir ?? opts.rootProjectManifestDir,
     });
-    return install.handler({
+    await install.handler({
         ...opts,
         patchedDependencies,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/patching.commands",
-  "version": "1100.1.5",
+  "version": "1100.1.7",
   "description": "Commands for creating patches",
   "keywords": [
     "pnpm",
@@ -11,9 +11,9 @@
   "funding": "https://opencollective.com/pnpm",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pnpm/pnpm/tree/main/patching/commands"
+    "url": "https://github.com/pnpm/pnpm/tree/main/pnpm11/patching/commands"
   },
-  "homepage": "https://github.com/pnpm/pnpm/tree/main/patching/commands#readme",
+  "homepage": "https://github.com/pnpm/pnpm/tree/main/pnpm11/patching/commands#readme",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
@@ -41,26 +41,25 @@
     "semver": "^7.8.4",
     "terminal-link": "^5.0.0",
     "tinyglobby": "^0.2.16",
-    "@pnpm/config.reader": "1101.9.0",
+    "@pnpm/config.reader": "1101.10.1",
+    "@pnpm/cli.utils": "1101.0.13",
+    "@pnpm/config.writer": "1100.0.14",
     "@pnpm/constants": "1100.0.0",
-    "@pnpm/config.writer": "1100.0.13",
     "@pnpm/crypto.hash": "1100.0.1",
+    "@pnpm/error": "1100.0.1",
+    "@pnpm/installing.commands": "1100.10.1",
     "@pnpm/fs.packlist": "1100.0.1",
-    "@pnpm/installing.commands": "1100.9.0",
     "@pnpm/installing.modules-yaml": "1100.0.9",
-    "@pnpm/cli.utils": "1101.0.12",
-    "@pnpm/lockfile.utils": "1100.0.13",
-    "@pnpm/patching.apply-patch": "1100.0.2",
-    "@pnpm/pkg-manifest.reader": "1100.0.8",
+    "@pnpm/lockfile.fs": "1100.1.7",
+    "@pnpm/lockfile.utils": "1100.1.0",
+    "@pnpm/patching.apply-patch": "1100.0.3",
+    "@pnpm/pkg-manifest.reader": "1100.0.9",
+    "@pnpm/store.connection-manager": "1100.3.2",
     "@pnpm/resolving.parse-wanted-dependency": "1100.0.1",
-    "@pnpm/store.connection-manager": "1100.3.0",
-    "@pnpm/store.path": "1100.0.1",
+    "@pnpm/store.path": "1100.0.2",
     "@pnpm/types": "1101.3.2",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.13",
-    "@pnpm/workspace.workspace-manifest-reader": "1100.0.8",
-    "@pnpm/error": "1100.0.0",
-    "@pnpm/fetching.pick-fetcher": "1100.0.12",
-    "@pnpm/lockfile.fs": "1100.1.5"
+    "@pnpm/workspace.project-manifest-reader": "1100.0.14",
+    "@pnpm/workspace.workspace-manifest-reader": "1100.0.9"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
@@ -74,12 +73,12 @@
     "tempy": "3.0.0",
     "write-yaml-file": "^6.0.0",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/patching.commands": "1100.1.5",
-    "@pnpm/prepare": "1100.0.16",
+    "@pnpm/patching.commands": "1100.1.7",
+    "@pnpm/prepare": "1100.0.17",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/testing.command-defaults": "1100.0.6",
-    "@pnpm/testing.registry-mock": "1100.0.6",
-    "@pnpm/workspace.projects-filter": "1100.0.21"
+    "@pnpm/testing.command-defaults": "1100.0.7",
+    "@pnpm/testing.registry-mock": "1100.0.7",
+    "@pnpm/workspace.projects-filter": "1100.0.23"
   },
   "engines": {
     "node": ">=22.13"