Merge branch 'master' into master

This commit is contained in:
Ben Conolly
2020-01-24 13:16:23 +11:00
committed by GitHub
3 changed files with 20 additions and 18 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
+6 -9
View File
@@ -168,7 +168,7 @@ import readChangesets from "@changesets/read";
let cmd = semver.lt(changesetsCliPkgJson.version, "2.0.0")
? "bump"
: "version";
let output = await execWithOutput("node", [
await exec("node", [
"./node_modules/.bin/changeset",
cmd
]);
@@ -180,7 +180,7 @@ import readChangesets from "@changesets/read";
let prBodyPromise = (async () => {
return (
`This PR was opened by the Changesets release GitHub action. When you're ready to do a release, you can merge this and ${
`This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and ${
publishScript
? `the packages will be published to npm automatically`
: `publish to npm yourself or [setup this action to publish automatically](https://github.com/changesets/action#with-publishing)`
@@ -224,12 +224,9 @@ ${
.join("\n ")
);
})();
const title = `ci(changset): generate PR with changelog &${isInPreMode ? ` (${preState.tag})` : ""} version updates`
await exec("git", ["add", "."]);
await exec("git", [
"commit",
"-m",
"ci(changset): generate PR with changelog & version updates"
]);
await exec("git", ["commit", "-m", title]);
await exec("git", ["push", "origin", versionBranch, "--force"]);
let searchResult = await searchResultPromise;
console.log(JSON.stringify(searchResult.data, null, 2));
@@ -238,14 +235,14 @@ ${
await octokit.pulls.create({
base: branch,
head: versionBranch,
title: `Version Packages${isInPreMode ? ` (${preState.tag})` : ""}`,
title,
body: await prBodyPromise,
...github.context.repo
});
} else {
octokit.pulls.update({
pull_number: searchResult.data.items[0].number,
title: `Version Packages${isInPreMode ? ` (${preState.tag})` : ""}`,
title,
body: await prBodyPromise,
...github.context.repo
});
+13 -8
View File
@@ -2271,11 +2271,16 @@ command-exists@^1.2.6:
resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291"
integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==
commander@^2.11.0, commander@^2.19.0, commander@^2.20.0, commander@~2.20.0:
commander@^2.11.0, commander@^2.19.0, commander@^2.20.0:
version "2.20.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
commander@~2.20.3:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
component-emitter@^1.2.1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -3411,9 +3416,9 @@ growly@^1.3.0:
integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
handlebars@^4.1.2:
version "4.2.0"
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.0.tgz#57ce8d2175b9bbb3d8b3cf3e4217b1aec8ddcb2e"
integrity sha512-Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==
version "4.5.3"
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
dependencies:
neo-async "^2.6.0"
optimist "^0.6.1"
@@ -7349,11 +7354,11 @@ typescript@^3.5.3:
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
uglify-js@^3.1.4:
version "3.6.0"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
version "3.7.3"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"
integrity sha512-7tINm46/3puUA4hCkKYo4Xdts+JDaVC9ZPRcG8Xw9R4nhO/gZgUM3TENq8IF4Vatk8qCig4MzP/c8G4u2BkVQg==
dependencies:
commander "~2.20.0"
commander "~2.20.3"
source-map "~0.6.1"
uncss@^0.17.0: