@pnpm/merge-lockfile-changes - npm Package Compare versions

Comparing version 5.0.7 to 6.0.0

lib/index.js

@@ -16,2 +16,13 @@ "use strict";
     };
+    const pnpmfileChecksum = ours.pnpmfileChecksum ?? theirs.pnpmfileChecksum; // Install should automatically detect change later
+    if (pnpmfileChecksum) {
+        newLockfile.pnpmfileChecksum = pnpmfileChecksum;
+    }
+    const ignoredOptionalDependencies = [...new Set([
+            ...ours.ignoredOptionalDependencies ?? [],
+            ...theirs.ignoredOptionalDependencies ?? [],
+        ])];
+    if (ignoredOptionalDependencies.length) {
+        newLockfile.ignoredOptionalDependencies = ignoredOptionalDependencies;
+    }
     for (const importerId of Array.from(new Set([...Object.keys(ours.importers), ...Object.keys(theirs.importers)]))) {
@@ -69,4 +80,4 @@ newLockfile.importers[importerId] = {
         return theirValue;
-    const [ourVersion] = ourValue.split('_');
-    const [theirVersion] = theirValue.split('_');
+    const [ourVersion] = ourValue.split('(');
+    const [theirVersion] = theirValue.split('(');
     if (semver_1.default.gt(ourVersion, theirVersion)) {
@@ -73,0 +84,0 @@ return ourValue;

package.json

 {
   "name": "@pnpm/merge-lockfile-changes",
-  "version": "5.0.7",
+  "version": "6.0.0",
   "description": "Merges lockfiles. Can automatically fix merge conflicts",
@@ -8,3 +8,3 @@ "main": "lib/index.js",
   "engines": {
-    "node": ">=16.14"
+    "node": ">=18.12"
   },
@@ -17,3 +17,3 @@ "files": [
   "keywords": [
-    "pnpm8",
+    "pnpm9",
     "pnpm",
@@ -31,4 +31,4 @@ "shrinkwrap",
     "ramda": "npm:@pnpm/ramda@0.28.1",
-    "semver": "^7.5.4",
-    "@pnpm/lockfile-types": "5.1.5"
+    "semver": "^7.6.0",
+    "@pnpm/lockfile-types": "6.0.0"
   },
@@ -39,3 +39,3 @@ "funding": "https://opencollective.com/pnpm",
     "@types/semver": "7.5.3",
-    "@pnpm/merge-lockfile-changes": "5.0.7"
+    "@pnpm/merge-lockfile-changes": "6.0.0"
   },
@@ -42,0 +42,0 @@ "exports": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

10071

increased by10.07%

Lines of code

87

increased by14.47%

Dependency changes

• + Added@pnpm/lockfile-types@6.0.0(transitive)

• + Added@pnpm/types@10.0.0(transitive)

• - Removed@pnpm/lockfile-types@5.1.5(transitive)

• - Removed@pnpm/types@9.4.2(transitive)

• Updated@pnpm/lockfile-types@6.0.0

• Updatedsemver@^7.6.0