refactor: rename merge-lockfile-changes to lockfile.merger

.changeset/hip-tools-build.md

@@ -0,0 +1,5 @@
+---
+"@pnpm/lockfile.merger": major
+---
+
+Package renamed from `@pnpm/merge-lockfile-changes`.

lockfile/fs/package.json

@@ -53,7 +53,7 @@
     "@pnpm/git-utils": "workspace:*",
     "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/lockfile.utils": "workspace:*",
-    "@pnpm/merge-lockfile-changes": "workspace:*",
+    "@pnpm/lockfile.merger": "workspace:*",
     "@pnpm/types": "workspace:*",
     "@pnpm/util.lex-comparator": "catalog:",
     "@zkochan/rimraf": "catalog:",

lockfile/fs/src/gitMergeFile.ts

@@ -1,5 +1,5 @@
 import { type Lockfile, type LockfileFile } from '@pnpm/lockfile.types'
-import { mergeLockfileChanges } from '@pnpm/merge-lockfile-changes'
+import { mergeLockfileChanges } from '@pnpm/lockfile.merger'
 import yaml from 'js-yaml'
 import { convertToLockfileObject } from './lockfileFormatConverters'
 

lockfile/fs/src/read.ts

@@ -6,7 +6,7 @@ import {
   WANTED_LOCKFILE,
 } from '@pnpm/constants'
 import { PnpmError } from '@pnpm/error'
-import { mergeLockfileChanges } from '@pnpm/merge-lockfile-changes'
+import { mergeLockfileChanges } from '@pnpm/lockfile.merger'
 import { type Lockfile } from '@pnpm/lockfile.types'
 import { type ProjectId } from '@pnpm/types'
 import comverToSemver from 'comver-to-semver'

lockfile/fs/tsconfig.json

@@ -28,7 +28,7 @@
       "path": "../../resolving/git-resolver"
     },
     {
-      "path": "../merge-lockfile-changes"
+      "path": "../merger"
     },
     {
       "path": "../types"

lockfile/merger/README.md

@@ -1,11 +1,11 @@
-# @pnpm/merge-lockfile-changes
+# @pnpm/lockfile.merger
 
 > Merges lockfiles. Can automatically fix merge conflicts
 
 ## Install
 
 ```
-pnpm add @pnpm/merge-lockfile-changes
+pnpm add @pnpm/lockfile.merger
 ```
 
 ## License

lockfile/merger/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pnpm/merge-lockfile-changes",
-  "version": "6.0.5",
+  "name": "@pnpm/lockfile.merger",
+  "version": "0.0.0",
   "description": "Merges lockfiles. Can automatically fix merge conflicts",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,7 +18,7 @@
     "prepublishOnly": "pnpm run compile",
     "compile": "tsc --build && pnpm run lint --fix"
   },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/lockfile/merge-lockfile-changes",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/lockfile/merger",
   "keywords": [
     "pnpm9",
     "pnpm",
@@ -29,7 +29,7 @@
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/merge-lockfile-changes#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/merger#readme",
   "dependencies": {
     "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/types": "workspace:*",
@@ -39,7 +39,7 @@
   },
   "funding": "https://opencollective.com/pnpm",
   "devDependencies": {
-    "@pnpm/merge-lockfile-changes": "workspace:*",
+    "@pnpm/lockfile.merger": "workspace:*",
     "@types/ramda": "catalog:",
     "@types/semver": "catalog:"
   },

pnpm-lock.yaml

@@ -2828,6 +2828,9 @@ importers:
       '@pnpm/git-utils':
         specifier: workspace:*
         version: link:../../packages/git-utils
+      '@pnpm/lockfile.merger':
+        specifier: workspace:*
+        version: link:../merger
       '@pnpm/lockfile.types':
         specifier: workspace:*
         version: link:../types
@@ -2837,9 +2840,6 @@ importers:
       '@pnpm/logger':
         specifier: ^5.0.0
         version: 5.0.0
-      '@pnpm/merge-lockfile-changes':
-        specifier: workspace:*
-        version: link:../merge-lockfile-changes
       '@pnpm/types':
         specifier: workspace:*
         version: link:../../packages/types
@@ -2939,7 +2939,7 @@ importers:
         specifier: 'catalog:'
         version: 0.29.12
 
-  lockfile/merge-lockfile-changes:
+  lockfile/merger:
     dependencies:
       '@pnpm/lockfile.types':
         specifier: workspace:*
@@ -2957,7 +2957,7 @@ importers:
         specifier: 'catalog:'
         version: 7.6.2
     devDependencies:
-      '@pnpm/merge-lockfile-changes':
+      '@pnpm/lockfile.merger':
         specifier: workspace:*
         version: 'link:'
       '@types/ramda':