mirror of
https://github.com/transloadit/uppy.git
synced 2026-01-23 02:25:07 +00:00
Improve yarn changesets patch
This commit is contained in:
parent
e970326cc2
commit
c71a8e756a
4 changed files with 34 additions and 49 deletions
5
.changeset/cold-spies-lick.md
Normal file
5
.changeset/cold-spies-lick.md
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
"@uppy/redux-dev-tools": patch
|
||||
---
|
||||
|
||||
Nothing, testing release tooling
|
||||
8
.github/workflows/release.yml
vendored
8
.github/workflows/release.yml
vendored
|
|
@ -30,14 +30,6 @@ jobs:
|
|||
- name: Build
|
||||
run: corepack yarn build
|
||||
|
||||
- name: Verify changeset patch is applied
|
||||
run: |
|
||||
if ! grep -q "yarn.*npm.*publish" node_modules/@changesets/cli/dist/changesets-cli.esm.js; then
|
||||
echo "ERROR: Changeset patch is missing - yarn npm publish command not found"
|
||||
exit 1
|
||||
fi
|
||||
echo "Patch verified: yarn npm publish command found"
|
||||
|
||||
- name: Create Release Pull Request or Publish
|
||||
id: changesets
|
||||
uses: changesets/action@v1
|
||||
|
|
|
|||
|
|
@ -1,34 +1,33 @@
|
|||
diff --git a/dist/changesets-cli.cjs.js b/dist/changesets-cli.cjs.js
|
||||
index 82ed39a6b2a38fe0aaabb71c2ec745c502dbe06a..c779498212942c5ee822501a5630c3755e335db8 100644
|
||||
--- a/dist/changesets-cli.cjs.js
|
||||
+++ b/dist/changesets-cli.cjs.js
|
||||
@@ -634,9 +634,8 @@ async function getPublishTool(cwd) {
|
||||
const pm = await packageManagerDetector.detect({
|
||||
cwd
|
||||
});
|
||||
- if (!pm || pm.name !== "pnpm") return {
|
||||
- name: "npm"
|
||||
- };
|
||||
+ if (!pm) return { name: "npm" };
|
||||
+ if (pm.name === "yarn") return { name: "yarn" };
|
||||
try {
|
||||
let result = await spawn__default["default"]("pnpm", ["--version"], {
|
||||
cwd
|
||||
@@ -771,6 +770,9 @@ async function internalPublish(packageJson, opts, twoFactorState) {
|
||||
} = publishTool.name === "pnpm" ? await spawn__default["default"]("pnpm", ["publish", "--json", ...publishFlags], {
|
||||
env: Object.assign({}, process.env, envOverride),
|
||||
cwd: opts.cwd
|
||||
+ }) : publishTool.name === "yarn" ? await spawn__default["default"]("yarn", ["npm", "publish", ...publishFlags], {
|
||||
+ env: Object.assign({}, process.env, envOverride),
|
||||
+ cwd: opts.cwd,
|
||||
}) : await spawn__default["default"](publishTool.name, ["publish", opts.publishDir, "--json", ...publishFlags], {
|
||||
env: Object.assign({}, process.env, envOverride)
|
||||
});
|
||||
diff --git a/dist/changesets-cli.esm.js b/dist/changesets-cli.esm.js
|
||||
index 1e945455b39b9c6424b26960b3d26a095ad980e4..b4ad2a7f34c226b998d0deef0272655d73115577 100644
|
||||
index 1e945455b39b9c6424b26960b3d26a095ad980e4..3a7339db5d9d1ffac16c0ef5a7d56a9d506483a4 100644
|
||||
--- a/dist/changesets-cli.esm.js
|
||||
+++ b/dist/changesets-cli.esm.js
|
||||
@@ -222,16 +222,16 @@ async function confirmMajorRelease(pkgJSON) {
|
||||
async function getPackagesToRelease(changedPackages, allPackages) {
|
||||
function askInitialReleaseQuestion(defaultChoiceList) {
|
||||
return askCheckboxPlus(
|
||||
- // TODO: Make this wording better
|
||||
- // TODO: take objects and be fancy with matching
|
||||
- `Which packages would you like to include?`, defaultChoiceList, x => {
|
||||
- // this removes changed packages and unchanged packages from the list
|
||||
- // of packages shown after selection
|
||||
- if (Array.isArray(x)) {
|
||||
- return x.filter(x => x !== "changed packages" && x !== "unchanged packages").map(x => cyan(x)).join(", ");
|
||||
- }
|
||||
- return x;
|
||||
- });
|
||||
+ // TODO: Make this wording better
|
||||
+ // TODO: take objects and be fancy with matching
|
||||
+ `Which packages would you like to include?`, defaultChoiceList, x => {
|
||||
+ // this removes changed packages and unchanged packages from the list
|
||||
+ // of packages shown after selection
|
||||
+ if (Array.isArray(x)) {
|
||||
+ return x.filter(x => x !== "changed packages" && x !== "unchanged packages").map(x => cyan(x)).join(", ");
|
||||
+ }
|
||||
+ return x;
|
||||
+ });
|
||||
}
|
||||
if (allPackages.length > 1) {
|
||||
const unchangedPackagesNames = allPackages.map(({
|
||||
@@ -596,9 +596,8 @@ async function getPublishTool(cwd) {
|
||||
const pm = await detect({
|
||||
cwd
|
||||
|
|
@ -51,14 +50,3 @@ index 1e945455b39b9c6424b26960b3d26a095ad980e4..b4ad2a7f34c226b998d0deef0272655d
|
|||
}) : await spawn$1(publishTool.name, ["publish", opts.publishDir, "--json", ...publishFlags], {
|
||||
env: Object.assign({}, process.env, envOverride)
|
||||
});
|
||||
@@ -1436,8 +1438,8 @@ ${format("", err).replace(process.cwd(), "<cwd>")}
|
||||
## Versions
|
||||
|
||||
- @changesets/cli@${
|
||||
- // eslint-disable-next-line import/no-extraneous-dependencies
|
||||
- require("@changesets/cli/package.json").version}
|
||||
+ // eslint-disable-next-line import/no-extraneous-dependencies
|
||||
+ require("@changesets/cli/package.json").version}
|
||||
- node@${process.version}
|
||||
|
||||
## Extra details
|
||||
|
|
|
|||
|
|
@ -4590,7 +4590,7 @@ __metadata:
|
|||
|
||||
"@changesets/cli@patch:@changesets/cli@npm%3A2.29.5#~/.yarn/patches/@changesets-cli-npm-2.29.5-68d8030bf3.patch":
|
||||
version: 2.29.5
|
||||
resolution: "@changesets/cli@patch:@changesets/cli@npm%3A2.29.5#~/.yarn/patches/@changesets-cli-npm-2.29.5-68d8030bf3.patch::version=2.29.5&hash=300b58"
|
||||
resolution: "@changesets/cli@patch:@changesets/cli@npm%3A2.29.5#~/.yarn/patches/@changesets-cli-npm-2.29.5-68d8030bf3.patch::version=2.29.5&hash=d5418f"
|
||||
dependencies:
|
||||
"@changesets/apply-release-plan": "npm:^7.0.12"
|
||||
"@changesets/assemble-release-plan": "npm:^6.0.9"
|
||||
|
|
@ -4622,7 +4622,7 @@ __metadata:
|
|||
term-size: "npm:^2.1.0"
|
||||
bin:
|
||||
changeset: bin.js
|
||||
checksum: 10/fd25f13200e1da892fa03199d2924e008acb9bfd3b530f7ccf0c5862a5b0d5da862db3583944fdb9c660e49490fc95afa3f9d14d93ca49ef8db04a9cd88f0adf
|
||||
checksum: 10/cd0a363d0015e671b5587d42a97ce0ebf27dd1bd2e54b314be25e7fad5900f74aedb465ac9e1428af26d6ae67e41c2eb71c4b2db91749ee7b4974bbfaee6513b
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue