@pnpm/lockfile.merger 1001.0.20 → 1100.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/index.d.ts +1 -1
  2. package/lib/index.js +9 -12
  3. package/package.json +14 -14
  4. package/lib/index.js.map +0 -1
package/lib/index.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- import { type LockfileObject } from '@pnpm/lockfile.types';
1
+ import type { LockfileObject } from '@pnpm/lockfile.types';
2
2
  export declare function mergeLockfileChanges(ours: LockfileObject, theirs: LockfileObject): LockfileObject;
package/lib/index.js CHANGED
@@ -1,15 +1,9 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.mergeLockfileChanges = mergeLockfileChanges;
7
- const comver_to_semver_1 = __importDefault(require("comver-to-semver"));
8
- const semver_1 = __importDefault(require("semver"));
9
- function mergeLockfileChanges(ours, theirs) {
1
+ import { comverToSemver } from 'comver-to-semver';
2
+ import semver from 'semver';
3
+ export function mergeLockfileChanges(ours, theirs) {
10
4
  const newLockfile = {
11
5
  importers: {},
12
- lockfileVersion: semver_1.default.gt((0, comver_to_semver_1.default)(theirs.lockfileVersion.toString()), (0, comver_to_semver_1.default)(ours.lockfileVersion.toString()))
6
+ lockfileVersion: semver.gt(comverToSemver(theirs.lockfileVersion.toString()), comverToSemver(ours.lockfileVersion.toString()))
13
7
  ? theirs.lockfileVersion
14
8
  : ours.lockfileVersion,
15
9
  };
@@ -77,9 +71,12 @@ function mergeVersions(ourValue, theirValue) {
77
71
  return theirValue;
78
72
  const [ourVersion] = ourValue.split('(');
79
73
  const [theirVersion] = theirValue.split('(');
80
- if (semver_1.default.gt(ourVersion, theirVersion)) {
81
- return ourValue;
74
+ const validOurVersion = semver.valid(ourVersion);
75
+ const validTheirVersion = semver.valid(theirVersion);
76
+ if (validOurVersion && validTheirVersion) {
77
+ return semver.gt(ourVersion, theirVersion) ? ourValue : theirValue;
82
78
  }
79
+ // Non-semver versions (link:, file:, git URLs, etc.) — prefer theirs
83
80
  return theirValue;
84
81
  }
85
82
  //# sourceMappingURL=index.js.map
package/package.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "name": "@pnpm/lockfile.merger",
3
- "version": "1001.0.20",
3
+ "version": "1100.0.0",
4
4
  "description": "Merges lockfiles. Can automatically fix merge conflicts",
5
5
  "keywords": [
6
6
  "pnpm",
7
- "pnpm10",
7
+ "pnpm11",
8
8
  "lockfile",
9
9
  "shrinkwrap"
10
10
  ],
@@ -15,7 +15,7 @@
15
15
  "bugs": {
16
16
  "url": "https://github.com/pnpm/pnpm/issues"
17
17
  },
18
- "type": "commonjs",
18
+ "type": "module",
19
19
  "main": "lib/index.js",
20
20
  "types": "lib/index.d.ts",
21
21
  "exports": {
@@ -26,27 +26,27 @@
26
26
  "!*.map"
27
27
  ],
28
28
  "dependencies": {
29
- "comver-to-semver": "^1.0.0",
29
+ "comver-to-semver": "^2.0.0",
30
30
  "ramda": "npm:@pnpm/ramda@0.28.1",
31
- "semver": "^7.7.4",
32
- "@pnpm/lockfile.types": "1002.1.0",
33
- "@pnpm/types": "1001.3.0"
31
+ "semver": "^7.7.2",
32
+ "@pnpm/lockfile.types": "1100.0.0",
33
+ "@pnpm/types": "1100.0.0"
34
34
  },
35
35
  "devDependencies": {
36
- "@types/ramda": "0.29.12",
37
- "@types/semver": "7.5.3",
38
- "@pnpm/lockfile.merger": "1001.0.20"
36
+ "@types/ramda": "0.31.1",
37
+ "@types/semver": "7.7.1",
38
+ "@pnpm/lockfile.merger": "1100.0.0"
39
39
  },
40
40
  "engines": {
41
- "node": ">=18.12"
41
+ "node": ">=22.13"
42
42
  },
43
43
  "jest": {
44
44
  "preset": "@pnpm/jest-config"
45
45
  },
46
46
  "scripts": {
47
47
  "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
48
- "_test": "jest",
49
- "test": "pnpm run compile && pnpm run _test",
50
- "compile": "tsc --build && pnpm run lint --fix"
48
+ "test": "pn compile && pn .test",
49
+ "compile": "tsgo --build && pn lint --fix",
50
+ ".test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
51
51
  }
52
52
  }
package/lib/index.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}