Merge branch 'main' into next

# Conflicts: # docs/browser.md # package.json # scripts/release/yarn.lock # scripts/vendors/vendor-meta.json # scripts/vendors/vendors.mjs # src/cli/expand-patterns.js # src/cli/format.js # src/cli/utils.js # src/language-js/index.js # src/language-js/parse/postprocess/index.js # src/language-js/parse/postprocess/typescript.js # tests/format/misc/errors/invalid/jsfmt.spec.js # tests/integration/__tests__/__snapshots__/support-info.js.snap # website/playground/sidebar/SidebarOptions.js # yarn.lock
prettier · Jun 19, 2022 · 0e0f879 · 0e0f879
2 parents 5f8885d + fde0b49
commit 0e0f879
Show file tree

Hide file tree

Showing 68 changed files with 2,787 additions and 1,284 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -5,6 +5,10 @@
 # See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
 
 # Prettier bump after release
+# 2.7.1
+1f9baef429df2516ff8eb835fd8c020b5e854a5f
+# 2.7.0
+59ec4f2ef4aef37c10a265aa7fc568c596fb4427
 # 2.6.2
 e2d9e9139d34043c8e6c45cda2777de013340e2e
 # 2.6.1

diff --git a/.github/ISSUE_TEMPLATE/formatting.md b/.github/ISSUE_TEMPLATE/formatting.md
@@ -26,7 +26,7 @@ Don't fill the form below manually! Let a program create a report for you:
 
 -->
 
-**Prettier 2.6.2**
+**Prettier 2.7.1**
 [Playground link](https://prettier.io/playground/#.....)
 
 ```sh

diff --git a/.github/ISSUE_TEMPLATE/integration.md b/.github/ISSUE_TEMPLATE/integration.md
@@ -20,7 +20,7 @@ BEFORE SUBMITTING AN ISSUE:
 
 **Environments:**
 
-- Prettier Version: 2.6.2
+- Prettier Version: 2.7.1
 - Running Prettier via: <!-- CLI, Node.js API, Browser API, etc. -->
 - Runtime: <!-- Node.js v14, Chrome v83, etc. -->
 - Operating System: <!-- Windows, Linux, macOS, etc. -->

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,48 @@
+# 2.7.1
+
+[diff](https://github.com/prettier/prettier/compare/2.7.0...2.7.1)
+
+#### Keep useful empty lines in description ([#13013](https://github.com/prettier/prettier/pull/13013) by [@chimurai](https://github.com/chimurai))
+
+<!-- prettier-ignore -->
+```graphql
+# Input
+"""
+First line
+
+Second Line
+"""
+type Person {
+  name: String
+}
+
+# Prettier 2.7.0
+"""
+First line
+Second Line
+"""
+type Person {
+  name: String
+}
+
+
+# Prettier 2.7.1
+"""
+First line
+
+Second Line
+"""
+type Person {
+  name: String
+}
+```
+
+# 2.7.0
+
+[diff](https://github.com/prettier/prettier/compare/2.6.2...2.7.0)
+
+🔗 [Release Notes](https://prettier.io/blog/2022/06/14/2.7.0.html)
+
 # 2.6.2
 
 [diff](https://github.com/prettier/prettier/compare/2.6.1...2.6.2)

diff --git a/changelog_unreleased/cli/12561.md b/changelog_unreleased/cli/12561.md
diff --git a/changelog_unreleased/cli/12603.md b/changelog_unreleased/cli/12603.md
diff --git a/changelog_unreleased/cli/12682.md b/changelog_unreleased/cli/12682.md
diff --git a/changelog_unreleased/graphql/12519.md b/changelog_unreleased/graphql/12519.md
diff --git a/changelog_unreleased/graphql/12608.md b/changelog_unreleased/graphql/12608.md
diff --git a/changelog_unreleased/html/12882.md b/changelog_unreleased/html/12882.md
diff --git a/changelog_unreleased/javascript/12746.md b/changelog_unreleased/javascript/12746.md
diff --git a/changelog_unreleased/javascript/12779.md b/changelog_unreleased/javascript/12779.md
diff --git a/changelog_unreleased/javascript/12860.md b/changelog_unreleased/javascript/12860.md
diff --git a/changelog_unreleased/typescript/12706.md b/changelog_unreleased/typescript/12706.md