Skip to content

Commit

Permalink
Merge branch 'v2-develop' into v2-release/react-2.7.0.rc.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Szymon-dziewonski committed May 14, 2024
2 parents 475df21 + af88a9c commit b4ec9b2
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 115 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/dist/changesets-assemble-release-plan.cjs.js b/dist/changesets-assemble-release-plan.cjs.js
index ee5c0f67fabadeb112e9f238d8b144a4d125830f..e33f11f706cec2a88828e377158304b84147deca 100644
--- a/dist/changesets-assemble-release-plan.cjs.js
+++ b/dist/changesets-assemble-release-plan.cjs.js
@@ -388,7 +388,7 @@ function applyLinks(releases, packagesByName, linked) {

function getPreVersion(version) {
let parsed = semverParse__default["default"](version);
- let preVersion = parsed.prerelease[1] === undefined ? -1 : parsed.prerelease[1];
+ let preVersion = parsed?.prerelease[1] === undefined ? -1 : parsed.prerelease[1];

if (typeof preVersion !== "number") {
throw new errors.InternalError("preVersion is not a number");
diff --git a/dist/changesets-assemble-release-plan.esm.js b/dist/changesets-assemble-release-plan.esm.js
index bf5202626a164a7780650d333983c3479b078689..298d88ad37b02c00ea068ea5f450782be21404e2 100644
--- a/dist/changesets-assemble-release-plan.esm.js
+++ b/dist/changesets-assemble-release-plan.esm.js
@@ -377,7 +377,7 @@ function applyLinks(releases, packagesByName, linked) {

function getPreVersion(version) {
let parsed = semverParse(version);
- let preVersion = parsed.prerelease[1] === undefined ? -1 : parsed.prerelease[1];
+ let preVersion = parsed?.prerelease[1] === undefined ? -1 : parsed.prerelease[1];

if (typeof preVersion !== "number") {
throw new InternalError("preVersion is not a number");
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@
}
},
"resolutions": {
"@changesets/assemble-release-plan@^5.2.3": "patch:@changesets/assemble-release-plan@npm%3A5.2.3#./.yarn/patches/@changesets-assemble-release-plan-npm-5.2.3-296454a28f.patch"
"@changesets/assemble-release-plan@^6.0.0": "patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch"
}
}
16 changes: 15 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ __metadata:
languageName: node
linkType: hard

"@changesets/assemble-release-plan@npm:^6.0.0":
"@changesets/assemble-release-plan@npm:6.0.0":
version: 6.0.0
resolution: "@changesets/assemble-release-plan@npm:6.0.0"
dependencies:
Expand All @@ -699,6 +699,20 @@ __metadata:
languageName: node
linkType: hard

"@changesets/assemble-release-plan@patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch::locator=%40storefront-ui%2Fmonorepo%40workspace%3A.":
version: 6.0.0
resolution: "@changesets/assemble-release-plan@patch:@changesets/assemble-release-plan@npm%3A6.0.0#./.yarn/patches/@changesets-assemble-release-plan-npm-6.0.0-f7b3005037.patch::version=6.0.0&hash=a871a7&locator=%40storefront-ui%2Fmonorepo%40workspace%3A."
dependencies:
"@babel/runtime": ^7.20.1
"@changesets/errors": ^0.2.0
"@changesets/get-dependents-graph": ^2.0.0
"@changesets/types": ^6.0.0
"@manypkg/get-packages": ^1.1.3
semver: ^7.5.3
checksum: ab9bf5e847715d4bfdb3588e573db00630b07d76067a58daa6b9c01c77f85a453419290080058d1b2c5c6232a9b7ff70fb7adb2b558ea23c3d94ef36da544e0d
languageName: node
linkType: hard

"@changesets/changelog-git@npm:^0.2.0":
version: 0.2.0
resolution: "@changesets/changelog-git@npm:0.2.0"
Expand Down

0 comments on commit b4ec9b2

Please sign in to comment.