From 2f287bbb0b50203503fc6cc82922afe6c5b188d6 Mon Sep 17 00:00:00 2001 From: Ryan <39529072+ryndh@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:15:22 -0600 Subject: [PATCH 1/5] Update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b8956d0..ee3ecdb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "synp", - "version": "1.9.10", + "version": "1.9.11", "description": "Convert yarn.lock to package-lock.json and vice versa", "keywords": [ "yarn", From 1789e2088dba9e0d1161d790f2c1fceb68f39e80 Mon Sep 17 00:00:00 2001 From: Ryan <39529072+ryndh@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:17:46 -0600 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3654061..a9dd981 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.9.11](https://github.com/imsnif/synp/compare/v1.9.11...v1.9.10) (2024-04-26) + +### Bug Fixes +* fix: allow for `packageLock.packages` to resolve some package-lock v3 failures + ## [1.9.10](https://github.com/imsnif/synp/compare/v1.9.9...v1.9.10) (2022-02-10) From 9249cc5a2c2a4e3457cfecef2882ea45085f4d68 Mon Sep 17 00:00:00 2001 From: Ryan <39529072+ryndh@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:19:25 -0600 Subject: [PATCH 3/5] lockfilev1 tree.js fix --- lib/lockfileV1/tree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/lockfileV1/tree.js b/lib/lockfileV1/tree.js index d07cde3..3be189e 100644 --- a/lib/lockfileV1/tree.js +++ b/lib/lockfileV1/tree.js @@ -21,7 +21,7 @@ const { module.exports = { buildYarnTree (nodeModulesTree, packageLock) { - const flattenedPackageLock = flattenPackageLock(packageLock.dependencies) + const flattenedPackageLock = flattenPackageLock(packageLock.dependencies ?? packageLock.packages) const tree = Object.keys(nodeModulesTree).reduce((tree, path) => { const nmEntry = nodeModulesTree[path] const { name } = nmEntry From f8f10bfc93b86829299911253d183c02484c59a0 Mon Sep 17 00:00:00 2001 From: Ryan <39529072+ryndh@users.noreply.github.com> Date: Mon, 29 Apr 2024 08:36:22 -0600 Subject: [PATCH 4/5] work with node 12 --- lib/lockfileV1/tree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/lockfileV1/tree.js b/lib/lockfileV1/tree.js index 3be189e..7995499 100644 --- a/lib/lockfileV1/tree.js +++ b/lib/lockfileV1/tree.js @@ -21,7 +21,7 @@ const { module.exports = { buildYarnTree (nodeModulesTree, packageLock) { - const flattenedPackageLock = flattenPackageLock(packageLock.dependencies ?? packageLock.packages) + const flattenedPackageLock = flattenPackageLock(packageLock.dependencies || packageLock.packages) const tree = Object.keys(nodeModulesTree).reduce((tree, path) => { const nmEntry = nodeModulesTree[path] const { name } = nmEntry From f3edec115e9f1deb2a2199d58c0850b385dba12c Mon Sep 17 00:00:00 2001 From: Ryan <39529072+ryndh@users.noreply.github.com> Date: Mon, 29 Apr 2024 09:00:56 -0600 Subject: [PATCH 5/5] revert changelog.md --- CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9dd981..3654061 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,3 @@ -## [1.9.11](https://github.com/imsnif/synp/compare/v1.9.11...v1.9.10) (2024-04-26) - -### Bug Fixes -* fix: allow for `packageLock.packages` to resolve some package-lock v3 failures - ## [1.9.10](https://github.com/imsnif/synp/compare/v1.9.9...v1.9.10) (2022-02-10)