From 0754e99507d17cb473029df2251653de9ceacb74 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Tue, 5 Sep 2023 15:57:37 +0100 Subject: [PATCH] =?UTF-8?q?Removed=20changeset=20patch=20(it=20didn?= =?UTF-8?q?=E2=80=99t=20work)=20and=20instead=20use=20the=20documented=20e?= =?UTF-8?q?xperimental=20flag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 5 ---- ...ngesets__assemble-release-plan@5.2.4.patch | 26 ------------------- pnpm-lock.yaml | 12 +++------ 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 patches/@changesets__assemble-release-plan@5.2.4.patch diff --git a/package.json b/package.json index 106934b18..ed7ec4e46 100644 --- a/package.json +++ b/package.json @@ -66,10 +66,5 @@ "@changesets/cli": "2.26.2", "@remix-run/changelog-github": "^0.0.5", "node-fetch": "2.6.x" - }, - "pnpm": { - "patchedDependencies": { - "@changesets/assemble-release-plan@5.2.4": "patches/@changesets__assemble-release-plan@5.2.4.patch" - } } } diff --git a/patches/@changesets__assemble-release-plan@5.2.4.patch b/patches/@changesets__assemble-release-plan@5.2.4.patch deleted file mode 100644 index 7b4445a5a..000000000 --- a/patches/@changesets__assemble-release-plan@5.2.4.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/dist/assemble-release-plan.cjs.dev.js b/dist/assemble-release-plan.cjs.dev.js -index e1376ca756d69816f8c79637ee7b45161f092167..8cb0a24dced96f422afffe4ec21cf3628b4951dd 100644 ---- a/dist/assemble-release-plan.cjs.dev.js -+++ b/dist/assemble-release-plan.cjs.dev.js -@@ -257,7 +257,7 @@ function shouldBumpMajor({ - // we check if it is a peerDependency because if it is, our dependent bump type might need to be major. - return depType === "peerDependencies" && nextRelease.type !== "none" && nextRelease.type !== "patch" && ( // 1. If onlyUpdatePeerDependentsWhenOutOfRange set to true, bump major if the version is leaving the range. - // 2. If onlyUpdatePeerDependentsWhenOutOfRange set to false, bump major regardless whether or not the version is leaving the range. -- !onlyUpdatePeerDependentsWhenOutOfRange || !semverSatisfies__default['default'](incrementVersion(nextRelease, preInfo), versionRange)) && ( // bump major only if the dependent doesn't already has a major release. -+ !onlyUpdatePeerDependentsWhenOutOfRange) && ( // bump major only if the dependent doesn't already has a major release. - !releases.has(dependent) || releases.has(dependent) && releases.get(dependent).type !== "major"); - } - -diff --git a/dist/assemble-release-plan.cjs.prod.js b/dist/assemble-release-plan.cjs.prod.js -index 3a83720644a94cdf6e62fa188a72c51c0384d00e..411ef794988c7f770545bca6a7a38f9419806cd6 100644 ---- a/dist/assemble-release-plan.cjs.prod.js -+++ b/dist/assemble-release-plan.cjs.prod.js -@@ -130,7 +130,7 @@ function getDependencyVersionRanges(dependentPkgJSON, dependencyRelease) { - } - - function shouldBumpMajor({dependent: dependent, depType: depType, versionRange: versionRange, releases: releases, nextRelease: nextRelease, preInfo: preInfo, onlyUpdatePeerDependentsWhenOutOfRange: onlyUpdatePeerDependentsWhenOutOfRange}) { -- return "peerDependencies" === depType && "none" !== nextRelease.type && "patch" !== nextRelease.type && (!onlyUpdatePeerDependentsWhenOutOfRange || !semverSatisfies__default.default(incrementVersion(nextRelease, preInfo), versionRange)) && (!releases.has(dependent) || releases.has(dependent) && "major" !== releases.get(dependent).type); -+ return "peerDependencies" === depType && "none" !== nextRelease.type && "patch" !== nextRelease.type && !onlyUpdatePeerDependentsWhenOutOfRange && (!releases.has(dependent) || releases.has(dependent) && "major" !== releases.get(dependent).type); - } - - function flattenReleases(changesets, packagesByName, ignoredPackages) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 59a1d001f..c2891e2fb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,10 +1,5 @@ lockfileVersion: 5.4 -patchedDependencies: - '@changesets/assemble-release-plan@5.2.4': - hash: 3wuhjtl4hjck4itk3w32z4cd5u - path: patches/@changesets__assemble-release-plan@5.2.4.patch - importers: .: @@ -3728,7 +3723,7 @@ packages: semver: 7.5.4 dev: false - /@changesets/assemble-release-plan/5.2.4_3wuhjtl4hjck4itk3w32z4cd5u: + /@changesets/assemble-release-plan/5.2.4: resolution: {integrity: sha512-xJkWX+1/CUaOUWTguXEbCDTyWJFECEhmdtbkjhn5GVBGxdP/JwaHBIU9sW3FR6gD07UwZ7ovpiPclQZs+j+mvg==} dependencies: '@babel/runtime': 7.22.5 @@ -3738,7 +3733,6 @@ packages: '@manypkg/get-packages': 1.1.3 semver: 7.5.4 dev: false - patched: true /@changesets/changelog-git/0.1.14: resolution: {integrity: sha512-+vRfnKtXVWsDDxGctOfzJsPhaCdXRYoe+KyWYoq5X/GqoISREiat0l3L8B0a453B2B4dfHGcZaGyowHbp9BSaA==} @@ -3752,7 +3746,7 @@ packages: dependencies: '@babel/runtime': 7.22.5 '@changesets/apply-release-plan': 6.1.4 - '@changesets/assemble-release-plan': 5.2.4_3wuhjtl4hjck4itk3w32z4cd5u + '@changesets/assemble-release-plan': 5.2.4 '@changesets/changelog-git': 0.1.14 '@changesets/config': 2.3.1 '@changesets/errors': 0.1.4 @@ -3826,7 +3820,7 @@ packages: resolution: {integrity: sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw==} dependencies: '@babel/runtime': 7.22.5 - '@changesets/assemble-release-plan': 5.2.4_3wuhjtl4hjck4itk3w32z4cd5u + '@changesets/assemble-release-plan': 5.2.4 '@changesets/config': 2.3.1 '@changesets/pre': 1.0.14 '@changesets/read': 0.5.9