From 0a5ace2c25888295ce49ea3dd8a826b745667b9d Mon Sep 17 00:00:00 2001 From: Jed Fox Date: Thu, 9 Jan 2020 20:18:46 -0500 Subject: [PATCH 01/26] Remove the beta label from the plugin docs (#5594) --- docs/plugins.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/plugins.md b/docs/plugins.md index 4039a6997..c6ef2471f 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -1,12 +1,8 @@ --- id: plugins -title: Plugins (Beta) +title: Plugins --- -## IN BETA - -> The plugin API is in a **beta** state as of Prettier 1.10 and the API may change in the next release! - Plugins are ways of adding new languages to Prettier. Prettier's own implementations of all languages are expressed using the plugin API. The core `prettier` package contains JavaScript and other web-focused languages built in. For additional languages you'll need to install a plugin. ## Using Plugins From c90fd77db65d74c37de94a28cafb6ef9e5858232 Mon Sep 17 00:00:00 2001 From: Jed Fox Date: Sun, 12 Jan 2020 16:22:48 -0500 Subject: [PATCH 02/26] Add a Netlify badge to the footer (#7289) * Add a Netlify badge to the footer * Change badge as suggested by @vjeux --- website/core/Footer.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/core/Footer.js b/website/core/Footer.js index 77dd32e0f..4b1bb4e2a 100644 --- a/website/core/Footer.js +++ b/website/core/Footer.js @@ -44,6 +44,10 @@ class Footer extends React.Component {
Docs
About Usage +
+ + +
Community
From 34253b0b8914520cf52e3658d51045b319c974fa Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Mon, 13 Jan 2020 17:41:38 +0800 Subject: [PATCH 03/26] Fix #5959 changlog (#7294) --- changelog_unreleased/html/{pr-5959 => pr-5959.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog_unreleased/html/{pr-5959 => pr-5959.md} (100%) diff --git a/changelog_unreleased/html/pr-5959 b/changelog_unreleased/html/pr-5959.md similarity index 100% rename from changelog_unreleased/html/pr-5959 rename to changelog_unreleased/html/pr-5959.md From 178241841bf463eba47bef1299478ff431008737 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Mon, 13 Jan 2020 19:41:40 +0800 Subject: [PATCH 04/26] Update `rollup` related deps (#7254) --- package.json | 10 +++++----- yarn.lock | 47 ++++++++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index b3139c3e7..7bd359511 100644 --- a/package.json +++ b/package.json @@ -76,9 +76,9 @@ "devDependencies": { "@babel/core": "7.7.2", "@babel/preset-env": "7.7.4", - "@rollup/plugin-alias": "2.2.0", - "@rollup/plugin-json": "4.0.0", - "@rollup/plugin-replace": "2.2.1", + "@rollup/plugin-alias": "3.0.0", + "@rollup/plugin-json": "4.0.1", + "@rollup/plugin-replace": "2.3.0", "babel-loader": "8.0.6", "benchmark": "2.1.4", "builtin-modules": "3.1.0", @@ -99,12 +99,12 @@ "mkdirp": "0.5.1", "prettier": "1.19.1", "rimraf": "3.0.0", - "rollup": "1.27.13", + "rollup": "1.29.0", "rollup-plugin-babel": "4.3.3", "rollup-plugin-commonjs": "10.1.0", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-node-resolve": "5.2.0", - "rollup-plugin-terser": "5.1.2", + "rollup-plugin-terser": "5.1.3", "shelljs": "0.8.3", "snapshot-diff": "0.4.0", "strip-ansi": "5.2.0", diff --git a/yarn.lock b/yarn.lock index 6303d5501..fb980c387 100644 --- a/yarn.lock +++ b/yarn.lock @@ -809,24 +809,24 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^13.0.0" -"@rollup/plugin-alias@2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-2.2.0.tgz#3ac52ece8b39583249884adb90fb316484389fe5" - integrity sha512-//6zmlHGbmousaatu4pBlC61gqZykLbH0c2GESBO4JgK5xFZgb/ih0zlg/5/BmTAczX5R/xsHRnsYsu4KyHV5w== +"@rollup/plugin-alias@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-3.0.0.tgz#3ac4952d05d5a700b0d918b18f312db0aa2b006f" + integrity sha512-MYlgCptgl/VgyMvqkqn/XxYMph6xv83cdgj6aKQHjFnhVFXn1N/IJfrSdgQAxRFqfHUCZyTxEPlHfmlgRzTG1w== dependencies: slash "^3.0.0" -"@rollup/plugin-json@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.0.0.tgz#4462e83c7ad5544bef4a601a6e8450daedc4b69b" - integrity sha512-Z65CtEVWv40+ri4CvmswyhtuUtki9yP5p0UJN/GyCKKyU4jRuDS9CG0ZuV7/XuS7zGkoajyE7E4XBEaC4GW62A== +"@rollup/plugin-json@4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.0.1.tgz#223898c6c37993886da06989b0e93ceef52aa3ce" + integrity sha512-soxllkhOGgchswBAAaTe7X9G80U2tjjHvXv0sBrriLJcC/89PkP59iTrKPOfbz3SjX088mKDmMhAscuyLz8ZSg== dependencies: rollup-pluginutils "^2.5.0" -"@rollup/plugin-replace@2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.2.1.tgz#94af20cb3d70cccdcec991d1f97dd373936ec544" - integrity sha512-dgq5ijT8fK18KTb1inenZ61ivTayV7pvbz2+ivT+VN20BOgJVM1fqoBETqGHKgFVm/J9BhR82mQyAtxfpPv1lQ== +"@rollup/plugin-replace@2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.3.0.tgz#86d88746383e40dd81cffb5216449cc51a734eb9" + integrity sha512-rzWAMqXAHC1w3eKpK6LxRqiF4f3qVFaa1sGii6Bp3rluKcwHNOpPt+hWRCmAH6SDEPtbPiLFf0pfNQyHs6Btlg== dependencies: magic-string "^0.25.2" rollup-pluginutils "^2.6.0" @@ -6041,15 +6041,15 @@ rollup-plugin-node-resolve@5.2.0: resolve "^1.11.1" rollup-pluginutils "^2.8.1" -rollup-plugin-terser@5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.1.2.tgz#3e41256205cb75f196fc70d4634227d1002c255c" - integrity sha512-sWKBCOS+vUkRtHtEiJPAf+WnBqk/C402fBD9AVHxSIXMqjsY7MnYWKYEUqGixtr0c8+1DjzUEPlNgOYQPVrS1g== +rollup-plugin-terser@5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.1.3.tgz#5f4c4603b12b4f8d093f4b6f31c9aa5eba98a223" + integrity sha512-FuFuXE5QUJ7snyxHLPp/0LFXJhdomKlIx/aK7Tg88Yubsx/UU/lmInoJafXJ4jwVVNcORJ1wRUC5T9cy5yk0wA== dependencies: "@babel/code-frame" "^7.0.0" jest-worker "^24.6.0" rollup-pluginutils "^2.8.1" - serialize-javascript "^1.7.0" + serialize-javascript "^2.1.2" terser "^4.1.0" rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1: @@ -6059,10 +6059,10 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, dependencies: estree-walker "^0.6.1" -rollup@1.27.13: - version "1.27.13" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.13.tgz#d6d3500512daacbf8de54d2800de62d893085b90" - integrity sha512-hDi7M07MpmNSDE8YVwGVFA8L7n8jTLJ4lG65nMAijAyqBe//rtu4JdxjUBE7JqXfdpqxqDTbCDys9WcqdpsQvw== +rollup@1.29.0: + version "1.29.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.29.0.tgz#6a1a79eea43ca9d3d79a90c15a1ceecedc72097b" + integrity sha512-V63Iz0dSdI5qPPN5HmCN6OBRzBFhMqNWcvwgq863JtSCTU6Vdvqq6S2fYle/dSCyoPrBkIP3EIr1RVs3HTRqqg== dependencies: "@types/estree" "*" "@types/node" "*" @@ -6169,6 +6169,11 @@ serialize-javascript@^2.1.1: resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.1.tgz#952907a04a3e3a75af7f73d92d15e233862048b2" integrity sha512-MPLPRpD4FNqWq9tTIjYG5LesFouDhdyH0EPY3gVK4DRD5+g4aDqdNSzLIwceulo3Yj+PL1bPh6laE5+H6LTcrQ== +serialize-javascript@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" + integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== + set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" From 7594d6ac4c6b9ec97d8f29c9959dd8ac1b2334ee Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Mon, 13 Jan 2020 19:53:14 +0800 Subject: [PATCH 05/26] Update `eslint` to v6.8.0 (#7249) --- package.json | 2 +- yarn.lock | 48 +++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 7bd359511..5cd7bee30 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "builtin-modules": "3.1.0", "codecov": "3.6.1", "cross-env": "6.0.3", - "eslint": "6.6.0", + "eslint": "6.8.0", "eslint-config-prettier": "6.7.0", "eslint-formatter-friendly": "7.0.0", "eslint-plugin-import": "2.19.1", diff --git a/yarn.lock b/yarn.lock index fb980c387..0feed3ed1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2624,10 +2624,10 @@ eslint-visitor-keys@^1.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== -eslint@6.6.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.6.0.tgz#4a01a2fb48d32aacef5530ee9c5a78f11a8afd04" - integrity sha512-PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g== +eslint@6.8.0: + version "6.8.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" + integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== dependencies: "@babel/code-frame" "^7.0.0" ajv "^6.10.0" @@ -2644,7 +2644,7 @@ eslint@6.6.0: file-entry-cache "^5.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^11.7.0" + globals "^12.1.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -2657,7 +2657,7 @@ eslint@6.6.0: minimatch "^3.0.4" mkdirp "^0.5.1" natural-compare "^1.4.0" - optionator "^0.8.2" + optionator "^0.8.3" progress "^2.0.0" regexpp "^2.0.1" semver "^6.1.2" @@ -2872,9 +2872,10 @@ fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" -fast-levenshtein@~2.0.4: +fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= fb-watchman@^2.0.0: version "2.0.0" @@ -3184,11 +3185,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl once "^1.3.0" path-is-absolute "^1.0.0" -globals@^11.1.0, globals@^11.7.0: +globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== +globals@^12.1.0: + version "12.3.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13" + integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw== + dependencies: + type-fest "^0.8.1" + globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" @@ -5167,7 +5175,7 @@ optimist@^0.6.1: minimist "~0.0.1" wordwrap "~0.0.2" -optionator@^0.8.1, optionator@^0.8.2: +optionator@^0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" dependencies: @@ -5178,6 +5186,18 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" +optionator@^0.8.3: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" @@ -6857,6 +6877,11 @@ type-fest@^0.5.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2" integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw== +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -7212,6 +7237,11 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2" +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" From ac3c046747a8aedad601f0b0f495b9b8a793c15c Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Mon, 13 Jan 2020 20:13:38 +0800 Subject: [PATCH 06/26] Run `lint-docs` on changelogs (#7253) --- changelog_unreleased/handlebars/pr-7051.md | 2 +- changelog_unreleased/javascript/pr-7070.md | 2 +- changelog_unreleased/javascript/pr-7140.md | 1 + changelog_unreleased/scss/pr-7211.md | 1 - changelog_unreleased/typescript/pr-7075.md | 6 +++--- changelog_unreleased/vue/pr-7180.md | 1 + package.json | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/changelog_unreleased/handlebars/pr-7051.md b/changelog_unreleased/handlebars/pr-7051.md index 505bf926e..4318eed57 100644 --- a/changelog_unreleased/handlebars/pr-7051.md +++ b/changelog_unreleased/handlebars/pr-7051.md @@ -1,4 +1,4 @@ -#### handlebars: Fix superfluous line breaks in ConcatStatement ([7051](https://github.com/prettier/prettier/pull/7051) by [@dcyriller](https://github.com/dcyriller)) +#### handlebars: Fix superfluous line breaks in ConcatStatement ([7051](https://github.com/prettier/prettier/pull/7051) by [@dcyriller](https://github.com/dcyriller)) ```hbs diff --git a/changelog_unreleased/javascript/pr-7070.md b/changelog_unreleased/javascript/pr-7070.md index e105b65f2..b2339474c 100644 --- a/changelog_unreleased/javascript/pr-7070.md +++ b/changelog_unreleased/javascript/pr-7070.md @@ -21,4 +21,4 @@ function foo() { this.lookahead().type === tt.parenLeft.right ); } -``` +``` diff --git a/changelog_unreleased/javascript/pr-7140.md b/changelog_unreleased/javascript/pr-7140.md index 041b52b5a..d2fa480bc 100644 --- a/changelog_unreleased/javascript/pr-7140.md +++ b/changelog_unreleased/javascript/pr-7140.md @@ -1,5 +1,6 @@ #### Fix moving semi for `return` to end of line-comment([#7140](https://github.com/prettier/prettier/pull/7140) by [@sosukesuzuki](https://github.com/sosukesuzuki)) + ```js // Input return // comment diff --git a/changelog_unreleased/scss/pr-7211.md b/changelog_unreleased/scss/pr-7211.md index 3c00f3ceb..dc283cbf5 100644 --- a/changelog_unreleased/scss/pr-7211.md +++ b/changelog_unreleased/scss/pr-7211.md @@ -19,4 +19,3 @@ a { background-image: url($test-path + "static/test.jpg"); } ``` - diff --git a/changelog_unreleased/typescript/pr-7075.md b/changelog_unreleased/typescript/pr-7075.md index 60c3da14e..144b32b07 100644 --- a/changelog_unreleased/typescript/pr-7075.md +++ b/changelog_unreleased/typescript/pr-7075.md @@ -1,8 +1,8 @@ #### Don't print trailing commas after rest elements in tuples ([#7075](https://github.com/prettier/prettier/pull/7075) by [@thorn](https://github.com/thorn0)) -* A rest element is always the last element of a tuple type. Nothing can be added after it. -* While TS is okay with this comma, [Babel doesn't parse it](https://github.com/babel/babel/issues/10769) -* In function parameters and array destructuring, such a comma is a syntax error. Keeping it in tuples is inconsistent. +- A rest element is always the last element of a tuple type. Nothing can be added after it. +- While TS is okay with this comma, [Babel doesn't parse it](https://github.com/babel/babel/issues/10769) +- In function parameters and array destructuring, such a comma is a syntax error. Keeping it in tuples is inconsistent. ```jsx diff --git a/changelog_unreleased/vue/pr-7180.md b/changelog_unreleased/vue/pr-7180.md index f93b06a88..36f957eea 100644 --- a/changelog_unreleased/vue/pr-7180.md +++ b/changelog_unreleased/vue/pr-7180.md @@ -1,5 +1,6 @@ #### format vue SFC containing JSX script([#7180](https://github.com/prettier/prettier/pull/7180) by [@sosukesuzuki](https://github.com/sosukesuzuki)) + ```html