diff --git a/package.json b/package.json index b3f5ffdf2..4af0e5dbe 100644 --- a/package.json +++ b/package.json @@ -41,10 +41,10 @@ "test:ci": "pnpm nx run-many --target=test:ci" }, "dependencies": { - "@changesets/cli": "^2.26.2" + "@changesets/cli": "2.26.2" }, "devDependencies": { - "@changesets/changelog-github": "^0.4.8", + "@changesets/changelog-github": "0.4.8", "@commitlint/cli": "^17.6.7", "@commitlint/config-conventional": "^17.6.7", "@ianvs/prettier-plugin-sort-imports": "^4.1.0", @@ -95,7 +95,8 @@ "cross-fetch@3.1.8": "patches/cross-fetch@3.1.8.patch", "cross-fetch@4.0.0": "patches/cross-fetch@4.0.0.patch", "@ceramicnetwork/common@2.30.0": "patches/@ceramicnetwork__common@2.30.0.patch", - "@metamask/snaps-types@1.0.1": "patches/@metamask__snaps-types@1.0.1.patch" + "@metamask/snaps-types@1.0.1": "patches/@metamask__snaps-types@1.0.1.patch", + "@changesets/assemble-release-plan@5.2.4": "patches/@changesets__assemble-release-plan@5.2.4.patch" }, "allowNonAppliedPatches": true } diff --git a/patches/@changesets__assemble-release-plan@5.2.4.patch b/patches/@changesets__assemble-release-plan@5.2.4.patch new file mode 100644 index 000000000..1f63a80c8 --- /dev/null +++ b/patches/@changesets__assemble-release-plan@5.2.4.patch @@ -0,0 +1,31 @@ +diff --git a/src/index.ts b/src/index.ts +index c2808fcd430346759975a40e951d49142f4896b9..17398ae30bf292791d2aa9f36b2efce545a58b1a 100644 +--- a/src/index.ts ++++ b/src/index.ts +@@ -215,14 +215,18 @@ function assembleReleasePlan( + // Detailed explanation at https://github.com/changesets/changesets/pull/382#discussion_r434434182 + if (preInfo.preVersions.get(pkg.packageJson.name) !== 0) { + const existingRelease = releases.get(pkg.packageJson.name); +- if (!existingRelease) { +- releases.set(pkg.packageJson.name, { +- name: pkg.packageJson.name, +- type: "patch", +- oldVersion: pkg.packageJson.version, +- changesets: [], +- }); +- } else if ( ++ // [martines3000]:We don't want this behaviour in our workflows ++ // https://github.com/martines3000/changesets ++ // if (!existingRelease) { ++ // releases.set(pkg.packageJson.name, { ++ // name: pkg.packageJson.name, ++ // type: "patch", ++ // oldVersion: pkg.packageJson.version, ++ // changesets: [], ++ // }); ++ // } ++ if ( ++ existingRelease && + existingRelease.type === "none" && + !refinedConfig.ignore.includes(pkg.packageJson.name) + ) { \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c75c4b2bb..828e9bb21 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,9 @@ patchedDependencies: '@ceramicnetwork/common@2.30.0': hash: uqwtqun5atcy5jjekxssfbohei path: patches/@ceramicnetwork__common@2.30.0.patch + '@changesets/assemble-release-plan@5.2.4': + hash: mnms6hd3rk47f2sorjdmvubffq + path: patches/@changesets__assemble-release-plan@5.2.4.patch '@digitalbazaar/http-client@1.2.0': hash: yl3b524jp4dtc7mdahww7krgi4 path: patches/@digitalbazaar__http-client@1.2.0.patch @@ -29,11 +32,11 @@ importers: .: dependencies: '@changesets/cli': - specifier: ^2.26.2 + specifier: 2.26.2 version: 2.26.2 devDependencies: '@changesets/changelog-github': - specifier: ^0.4.8 + specifier: 0.4.8 version: 0.4.8 '@commitlint/cli': specifier: ^17.6.7 @@ -4324,7 +4327,7 @@ packages: /@changesets/apply-release-plan@6.1.4: resolution: {integrity: sha512-FMpKF1fRlJyCZVYHr3CbinpZZ+6MwvOtWUuO8uo+svcATEoc1zRDcj23pAurJ2TZ/uVz1wFHH6K3NlACy0PLew==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/config': 2.3.1 '@changesets/get-version-range-type': 0.3.2 '@changesets/git': 2.0.0 @@ -4339,16 +4342,17 @@ packages: semver: 7.5.4 dev: false - /@changesets/assemble-release-plan@5.2.4: + /@changesets/assemble-release-plan@5.2.4(patch_hash=mnms6hd3rk47f2sorjdmvubffq): resolution: {integrity: sha512-xJkWX+1/CUaOUWTguXEbCDTyWJFECEhmdtbkjhn5GVBGxdP/JwaHBIU9sW3FR6gD07UwZ7ovpiPclQZs+j+mvg==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/errors': 0.1.4 '@changesets/get-dependents-graph': 1.3.6 '@changesets/types': 5.2.1 '@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==} @@ -4370,9 +4374,9 @@ packages: resolution: {integrity: sha512-dnWrJTmRR8bCHikJHl9b9HW3gXACCehz4OasrXpMp7sx97ECuBGGNjJhjPhdZNCvMy9mn4BWdplI323IbqsRig==} hasBin: true dependencies: - '@babel/runtime': 7.22.6 + '@babel/runtime': 7.22.11 '@changesets/apply-release-plan': 6.1.4 - '@changesets/assemble-release-plan': 5.2.4 + '@changesets/assemble-release-plan': 5.2.4(patch_hash=mnms6hd3rk47f2sorjdmvubffq) '@changesets/changelog-git': 0.1.14 '@changesets/config': 2.3.1 '@changesets/errors': 0.1.4 @@ -4437,7 +4441,7 @@ packages: resolution: {integrity: sha512-JppheLu7S114aEs157fOZDjFqUDpm7eHdq5E8SSR0gUBTEK0cNSHsrSR5a66xs0z3RWuo46QvA3vawp8BxDHvg==} dependencies: dataloader: 1.4.0 - node-fetch: 2.6.12 + node-fetch: 2.7.0 transitivePeerDependencies: - encoding dev: true @@ -4445,8 +4449,8 @@ packages: /@changesets/get-release-plan@3.0.17: resolution: {integrity: sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw==} dependencies: - '@babel/runtime': 7.22.10 - '@changesets/assemble-release-plan': 5.2.4 + '@babel/runtime': 7.22.11 + '@changesets/assemble-release-plan': 5.2.4(patch_hash=mnms6hd3rk47f2sorjdmvubffq) '@changesets/config': 2.3.1 '@changesets/pre': 1.0.14 '@changesets/read': 0.5.9 @@ -4461,7 +4465,7 @@ packages: /@changesets/git@2.0.0: resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/errors': 0.1.4 '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 @@ -4486,7 +4490,7 @@ packages: /@changesets/pre@1.0.14: resolution: {integrity: sha512-dTsHmxQWEQekHYHbg+M1mDVYFvegDh9j/kySNuDKdylwfMEevTeDouR7IfHNyVodxZXu17sXoJuf2D0vi55FHQ==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/errors': 0.1.4 '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 @@ -4496,7 +4500,7 @@ packages: /@changesets/read@0.5.9: resolution: {integrity: sha512-T8BJ6JS6j1gfO1HFq50kU3qawYxa4NTbI/ASNVVCBTsKquy2HYwM9r7ZnzkiMe8IEObAJtUVGSrePCOxAK2haQ==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/git': 2.0.0 '@changesets/logger': 0.0.5 '@changesets/parse': 0.3.16 @@ -4516,7 +4520,7 @@ packages: /@changesets/write@0.2.3: resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/types': 5.2.1 fs-extra: 7.0.1 human-id: 1.0.2 @@ -7572,7 +7576,7 @@ packages: /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 @@ -7581,7 +7585,7 @@ packages: /@manypkg/get-packages@1.1.3: resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -23501,7 +23505,7 @@ packages: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 react: 18.2.0 use-composed-ref: 1.3.0(react@18.2.0) use-latest: 1.2.1(@types/react@18.2.19)(react@18.2.0)