diff --git a/CHANGELOG.md b/CHANGELOG.md index 94694bb85..22c2097c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -214,7 +214,7 @@ class Foo extends Bar { // Prettier stable class Foo extends Bar { - override abstract foo: string; + abstract override foo: string; } // Prettier main diff --git a/changelog_unreleased/typescript/10961.md b/changelog_unreleased/typescript/10961.md index 5c8d87a15..84c604239 100644 --- a/changelog_unreleased/typescript/10961.md +++ b/changelog_unreleased/typescript/10961.md @@ -8,7 +8,7 @@ class Foo extends Bar { // Prettier stable class Foo extends Bar { - override abstract foo: string; + abstract override foo: string; } // Prettier main diff --git a/package.json b/package.json index eb2b19345..ecd38ff85 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "prettier", - "version": "2.3.1", + "version": "2.4.0-dev", "description": "Prettier is an opinionated code formatter", "bin": "./bin/prettier.js", "repository": "prettier/prettier", @@ -122,7 +122,7 @@ "jest-watch-typeahead": "0.6.4", "npm-run-all": "4.1.5", "path-browserify": "1.0.1", - "prettier": "2.3.0", + "prettier": "2.3.1", "pretty-bytes": "5.6.0", "rimraf": "3.0.2", "rollup": "2.48.0", diff --git a/scripts/release/steps/bump-prettier.js b/scripts/release/steps/bump-prettier.js index 96a4ec160..6bacaf49b 100644 --- a/scripts/release/steps/bump-prettier.js +++ b/scripts/release/steps/bump-prettier.js @@ -30,6 +30,7 @@ async function commit(version) { await runGit(["push"]); } +// eslint-disable-next-line no-unused-vars async function bump({ version, previousVersion, @@ -57,6 +58,6 @@ module.exports = async function (params) { ); await logPromise("Updating files", format()); - await logPromise("Bump default branch version", bump(params)); + // await logPromise("Bump default branch version", bump(params)); await logPromise("Committing changed files", commit(version)); }; diff --git a/yarn.lock b/yarn.lock index fb97697aa..3ea0ae7dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5934,10 +5934,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prettier@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18" - integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w== +prettier@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz#76903c3f8c4449bc9ac597acefa24dc5ad4cbea6" + integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA== pretty-bytes@5.6.0: version "5.6.0"