From 54ff009ec749de3ee6ca38cfb5ec5303a7cced64 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Wed, 5 Jul 2023 21:52:17 +0900 Subject: [PATCH] Fix --- scripts/release/run.js | 68 +++++++++++++------------- scripts/release/steps/bump-prettier.js | 13 ++--- yarn.lock | 11 ++++- 3 files changed, 49 insertions(+), 43 deletions(-) diff --git a/scripts/release/run.js b/scripts/release/run.js index 0fc4803e4..231610a57 100644 --- a/scripts/release/run.js +++ b/scripts/release/run.js @@ -19,40 +19,40 @@ if (semver.parse(previousVersion) === null) { } for (let step of [ - // { - // name: "Validating new version", - // process: steps.validateNewVersion, - // }, - // { - // name: "Checking git status", - // process: steps.checkGitStatus, - // skip: params.dry, - // }, - // { - // name: "Installing NPM dependencies", - // process: steps.installDependencies, - // skip: params.dry || params.skipDependenciesInstall || !params.manual, - // }, - // { - // name: "Linting files", - // process: steps.lintFiles, - // skip: params.dry, - // }, - // { - // name: "Bumping version", - // process: steps.updateVersion, - // skip: params.dry, - // }, - // steps.generateBundles, - // steps.updateChangelog, - // { - // name: "Committing and pushing to remote", - // process: steps.pushToGit, - // skip: params.dry, - // }, - // params.manual ? steps.publishToNpm : steps.waitForBotRelease, - // steps.showInstructionsAfterNpmPublish, - // steps.updateDependentsCount, + { + name: "Validating new version", + process: steps.validateNewVersion, + }, + { + name: "Checking git status", + process: steps.checkGitStatus, + skip: params.dry, + }, + { + name: "Installing NPM dependencies", + process: steps.installDependencies, + skip: params.dry || params.skipDependenciesInstall || !params.manual, + }, + { + name: "Linting files", + process: steps.lintFiles, + skip: params.dry, + }, + { + name: "Bumping version", + process: steps.updateVersion, + skip: params.dry, + }, + steps.generateBundles, + steps.updateChangelog, + { + name: "Committing and pushing to remote", + process: steps.pushToGit, + skip: params.dry, + }, + params.manual ? steps.publishToNpm : steps.waitForBotRelease, + steps.showInstructionsAfterNpmPublish, + steps.updateDependentsCount, steps.bumpPrettier, steps.postPublishSteps, ]) { diff --git a/scripts/release/steps/bump-prettier.js b/scripts/release/steps/bump-prettier.js index 6e9d45c1c..e16f4e648 100644 --- a/scripts/release/steps/bump-prettier.js +++ b/scripts/release/steps/bump-prettier.js @@ -37,19 +37,16 @@ async function bump({ } export default async function bumpPrettier(params) { - const { - dry, - // version - } = params; + const { dry, version } = params; if (dry) { return; } - // await logPromise( - // "Installing Prettier", - // runYarn(["add", "--dev", `prettier@${version}`]) - // ); + await logPromise( + "Installing Prettier", + runYarn(["add", "--dev", `prettier@${version}`]), + ); await logPromise("Updating files", format()); await logPromise("Bump default branch version", bump(params)); diff --git a/yarn.lock b/yarn.lock index a5803a55b..2796b3d0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6953,7 +6953,16 @@ __metadata: languageName: node linkType: hard -"prettier@3.0.0, prettier@workspace:.": +"prettier@npm:3.0.0": + version: 3.0.0 + resolution: "prettier@npm:3.0.0" + bin: + prettier: bin/prettier.cjs + checksum: 6a832876a1552dc58330d2467874e5a0b46b9ccbfc5d3531eb69d15684743e7f83dc9fbd202db6270446deba9c82b79d24383d09924c462b457136a759425e33 + languageName: node + linkType: hard + +"prettier@workspace:.": version: 0.0.0-use.local resolution: "prettier@workspace:." dependencies: