From ceb65b54ec65b67f755dd7993d0b5164866f0b34 Mon Sep 17 00:00:00 2001 From: sosukesuzuki Date: Wed, 26 Aug 2020 01:30:02 +0900 Subject: [PATCH 1/3] Replace version in draft-blog-post --- scripts/draft-blog-post.js | 49 +++++++++++++++-------- scripts/release/steps/update-changelog.js | 17 -------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/scripts/draft-blog-post.js b/scripts/draft-blog-post.js index 28adf7e20e7d..f14b8c35f03c 100644 --- a/scripts/draft-blog-post.js +++ b/scripts/draft-blog-post.js @@ -4,12 +4,17 @@ const fs = require("fs"); const path = require("path"); +const { execSync } = require("child_process"); const rimraf = require("rimraf"); +const semver = require("semver"); const changelogUnreleasedDir = path.join(__dirname, "../changelog_unreleased"); const blogDir = path.join(__dirname, "../website/blog"); const introFile = path.join(changelogUnreleasedDir, "blog-post-intro.md"); const version = require("../package.json").version.replace(/-.+/, ""); +const previousVersion = execSync("git describe --tags --abbrev=0") + .toString() + .trim(); const postGlob = path.join(blogDir, `????-??-??-${version}.md`); const postFile = path.join( blogDir, @@ -80,22 +85,24 @@ rimraf.sync(postGlob); fs.writeFileSync( postFile, - [ - fs.readFileSync(introFile, "utf8").trim(), - "", - ...printEntries({ - title: "Highlights", - filter: (entry) => entry.highlight, - }), - ...printEntries({ - title: "Breaking changes", - filter: (entry) => entry.breaking && !entry.highlight, - }), - ...printEntries({ - title: "Other changes", - filter: (entry) => !entry.breaking && !entry.highlight, - }), - ].join("\n\n") + "\n" + replaceVersions( + [ + fs.readFileSync(introFile, "utf8").trim(), + "", + ...printEntries({ + title: "Highlights", + filter: (entry) => entry.highlight, + }), + ...printEntries({ + title: "Breaking changes", + filter: (entry) => entry.breaking && !entry.highlight, + }), + ...printEntries({ + title: "Other changes", + filter: (entry) => !entry.breaking && !entry.highlight, + }), + ].join("\n\n") + "\n" + ) ); function printEntries({ title, filter }) { @@ -115,3 +122,13 @@ function printEntries({ title, filter }) { return result; } + +function formatVersion(version) { + return `${semver.major(version)}.${semver.minor(version)}`; +} + +function replaceVersions(data) { + return data + .replace(/prettier stable/gi, `Prettier ${formatVersion(previousVersion)}`) + .replace(/prettier master/gi, `Prettier ${formatVersion(version)}`); +} diff --git a/scripts/release/steps/update-changelog.js b/scripts/release/steps/update-changelog.js index d6218f789319..76cfad53a624 100644 --- a/scripts/release/steps/update-changelog.js +++ b/scripts/release/steps/update-changelog.js @@ -30,18 +30,6 @@ function writeChangelog({ version, previousVersion, releaseNotes }) { fs.writeFileSync("CHANGELOG.md", newEntry + "\n\n" + changelog); } -function formatVersion(version) { - return `${semver.major(version)}.${semver.minor(version)}`; -} - -function replaceVersionsInBlogPost({ blogPost, version, previousVersion }) { - const blogPostData = fs.readFileSync(blogPost, "utf-8"); - const newBlogPostData = blogPostData - .replace(/prettier stable/gi, `Prettier ${formatVersion(previousVersion)}`) - .replace(/prettier master/gi, `Prettier ${formatVersion(version)}`); - fs.writeFileSync(blogPost, newBlogPostData); -} - module.exports = async function ({ version, previousVersion }) { const semverDiff = semver.diff(version, previousVersion); @@ -53,11 +41,6 @@ module.exports = async function ({ version, previousVersion }) { releaseNotes: `🔗 [Release Notes](https://prettier.io/${blogPost.path})`, }); if (fs.existsSync(blogPost.file)) { - replaceVersionsInBlogPost({ - blogPost: blogPost.file, - version, - previousVersion, - }); // Everything is fine, this step is finished return; } From e5569c744723e4ff51a0d9f03533c6fdfea21fb2 Mon Sep 17 00:00:00 2001 From: sosukesuzuki Date: Wed, 26 Aug 2020 02:07:18 +0900 Subject: [PATCH 2/3] Use require to get previous version --- scripts/draft-blog-post.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/draft-blog-post.js b/scripts/draft-blog-post.js index f14b8c35f03c..4dd45cd30a78 100644 --- a/scripts/draft-blog-post.js +++ b/scripts/draft-blog-post.js @@ -4,7 +4,6 @@ const fs = require("fs"); const path = require("path"); -const { execSync } = require("child_process"); const rimraf = require("rimraf"); const semver = require("semver"); @@ -12,9 +11,7 @@ const changelogUnreleasedDir = path.join(__dirname, "../changelog_unreleased"); const blogDir = path.join(__dirname, "../website/blog"); const introFile = path.join(changelogUnreleasedDir, "blog-post-intro.md"); const version = require("../package.json").version.replace(/-.+/, ""); -const previousVersion = execSync("git describe --tags --abbrev=0") - .toString() - .trim(); +const previousVersion = require("prettier/package.json").version; const postGlob = path.join(blogDir, `????-??-??-${version}.md`); const postFile = path.join( blogDir, From 453ee036765d8b17258f8be5b4200a87a60d7193 Mon Sep 17 00:00:00 2001 From: sosukesuzuki Date: Wed, 26 Aug 2020 02:13:13 +0900 Subject: [PATCH 3/3] Fix from lint --- scripts/draft-blog-post.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/draft-blog-post.js b/scripts/draft-blog-post.js index 4dd45cd30a78..bdaf413980c1 100644 --- a/scripts/draft-blog-post.js +++ b/scripts/draft-blog-post.js @@ -10,8 +10,8 @@ const semver = require("semver"); const changelogUnreleasedDir = path.join(__dirname, "../changelog_unreleased"); const blogDir = path.join(__dirname, "../website/blog"); const introFile = path.join(changelogUnreleasedDir, "blog-post-intro.md"); -const version = require("../package.json").version.replace(/-.+/, ""); const previousVersion = require("prettier/package.json").version; +const version = require("../package.json").version.replace(/-.+/, ""); const postGlob = path.join(blogDir, `????-??-??-${version}.md`); const postFile = path.join( blogDir,