From 18bcaefc773ba0480aef266350c7af3defcf1f0d Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Wed, 26 Aug 2020 13:20:21 +0900
Subject: [PATCH] Release 2.1.1

---
 .github/ISSUE_TEMPLATE/formatting.md          |  2 +-
 .github/ISSUE_TEMPLATE/integration.md         |  2 +-
 CHANGELOG.md                                  | 90 +++++++++++++++++++
 changelog_unreleased/html/pr-9043.md          | 23 -----
 changelog_unreleased/html/pr-9051.md          | 21 -----
 changelog_unreleased/typescript/pr-9044.md    | 13 ---
 changelog_unreleased/vue/pr-9052.md           | 25 ------
 docs/browser.md                               | 12 +--
 package.json                                  |  2 +-
 .../versioned_docs/version-stable/browser.md  | 12 +--
 10 files changed, 105 insertions(+), 97 deletions(-)
 delete mode 100644 changelog_unreleased/html/pr-9043.md
 delete mode 100644 changelog_unreleased/html/pr-9051.md
 delete mode 100644 changelog_unreleased/typescript/pr-9044.md
 delete mode 100644 changelog_unreleased/vue/pr-9052.md

diff --git a/.github/ISSUE_TEMPLATE/formatting.md b/.github/ISSUE_TEMPLATE/formatting.md
index 126650339..6b189dac4 100644
--- a/.github/ISSUE_TEMPLATE/formatting.md
+++ b/.github/ISSUE_TEMPLATE/formatting.md
@@ -26,7 +26,7 @@ Tip! Don't write this stuff manually.
 
 -->
 
-**Prettier 2.1.0**
+**Prettier 2.1.1**
 [Playground link](https://prettier.io/playground/#.....)
 
 ```sh
diff --git a/.github/ISSUE_TEMPLATE/integration.md b/.github/ISSUE_TEMPLATE/integration.md
index 1b4f7c229..86ef35c25 100644
--- a/.github/ISSUE_TEMPLATE/integration.md
+++ b/.github/ISSUE_TEMPLATE/integration.md
@@ -20,7 +20,7 @@ BEFORE SUBMITTING AN ISSUE:
 
 **Environments:**
 
-- Prettier Version: 2.1.0
+- Prettier Version: 2.1.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
index f0dcfc3a8..6751aaf7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,93 @@
+# 2.1.1
+
+[diff](https://github.com/prettier/prettier/compare/2.1.0...2.1.1)
+
+#### Fix format on html with frontMatter ([#9043](https://github.com/prettier/prettier/pull/9043) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```html
+<!-- Input -->
+---
+layout: foo
+---
+
+Test <a
+href="https://prettier.io">abc</a>.
+
+<!-- Prettier stable -->
+TypeError: Cannot read property 'end' of undefined
+  ...
+
+<!-- Prettier master -->
+---
+layout: foo
+---
+
+Test <a href="https://prettier.io">abc</a>.
+```
+
+#### Fix broken format for `...infer T` ([#9044](https://github.com/prettier/prettier/pull/9044) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```typescript
+// Input
+type Tail<T extends any[]> = T extends [infer U, ...infer R] ? R : never;
+
+// Prettier stable
+type Tail<T extends any[]> = T extends [infer U, ...(infer R)] ? R : never;
+
+// Prettier master
+type Tail<T extends any[]> = T extends [infer U, ...infer R] ? R : never;
+```
+
+#### Fix format on `style[lang="sass"]` ([#9051](https://github.com/prettier/prettier/pull/9051) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```jsx
+<!-- Input -->
+<style lang="sass">
+.hero
+  @include background-centered
+</style>
+
+<!-- Prettier stable -->
+<style lang="sass">
+.hero @include background-centered;
+</style>
+
+<!-- Prettier master -->
+<style lang="sass">
+  .hero
+    @include background-centered
+</style>
+```
+
+#### Fix self-closing blocks and blocks with `src` attribute format ([#9052](https://github.com/prettier/prettier/pull/9052), [#9055](https://github.com/prettier/prettier/pull/9055) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```vue
+<!-- Input -->
+<custom lang="markdown" src="./foo.md"></custom>
+<custom lang="markdown" src="./foo.md" />
+<custom lang="markdown" />
+
+<!-- Prettier stable -->
+<custom lang="markdown" src="./foo.md">
+
+</custom>
+<custom lang="markdown" src="./foo.md"
+
+/>
+<custom lang="markdown"
+
+/>
+
+<!-- Prettier master -->
+<custom lang="markdown" src="./foo.md"></custom>
+<custom lang="markdown" src="./foo.md" />
+<custom lang="markdown" />
+```
+
 # 2.1.0
 
 [diff](https://github.com/prettier/prettier/compare/2.0.5...2.1.0)
diff --git a/changelog_unreleased/html/pr-9043.md b/changelog_unreleased/html/pr-9043.md
deleted file mode 100644
index 89b75eafb..000000000
--- a/changelog_unreleased/html/pr-9043.md
+++ /dev/null
@@ -1,23 +0,0 @@
-#### Fix format on html with frontMatter ([#9043](https://github.com/prettier/prettier/pull/9043) by [@fisker](https://github.com/fisker))
-
-<!-- prettier-ignore -->
-```html
-<!-- Input -->
----
-layout: foo
----
-
-Test <a
-href="https://prettier.io">abc</a>.
-
-<!-- Prettier stable -->
-TypeError: Cannot read property 'end' of undefined
-  ...
-
-<!-- Prettier master -->
----
-layout: foo
----
-
-Test <a href="https://prettier.io">abc</a>.
-```
diff --git a/changelog_unreleased/html/pr-9051.md b/changelog_unreleased/html/pr-9051.md
deleted file mode 100644
index 63c99d047..000000000
--- a/changelog_unreleased/html/pr-9051.md
+++ /dev/null
@@ -1,21 +0,0 @@
-#### Fix format on `style[lang="sass"]` ([#9051](https://github.com/prettier/prettier/pull/9051) by [@fisker](https://github.com/fisker))
-
-<!-- prettier-ignore -->
-```jsx
-<!-- Input -->
-<style lang="sass">
-.hero
-  @include background-centered
-</style>
-
-<!-- Prettier stable -->
-<style lang="sass">
-.hero @include background-centered;
-</style>
-
-<!-- Prettier master -->
-<style lang="sass">
-  .hero
-    @include background-centered
-</style>
-```
diff --git a/changelog_unreleased/typescript/pr-9044.md b/changelog_unreleased/typescript/pr-9044.md
deleted file mode 100644
index 879941c71..000000000
--- a/changelog_unreleased/typescript/pr-9044.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#### Fix broken format for `...infer T` ([#9044](https://github.com/prettier/prettier/pull/9044) by [@fisker](https://github.com/fisker))
-
-<!-- prettier-ignore -->
-```typescript
-// Input
-type Tail<T extends any[]> = T extends [infer U, ...infer R] ? R : never;
-
-// Prettier stable
-type Tail<T extends any[]> = T extends [infer U, ...(infer R)] ? R : never;
-
-// Prettier master
-type Tail<T extends any[]> = T extends [infer U, ...infer R] ? R : never;
-```
diff --git a/changelog_unreleased/vue/pr-9052.md b/changelog_unreleased/vue/pr-9052.md
deleted file mode 100644
index c7b8a6459..000000000
--- a/changelog_unreleased/vue/pr-9052.md
+++ /dev/null
@@ -1,25 +0,0 @@
-#### Fix self-closing blocks and blocks with `src` attribute format ([#9052](https://github.com/prettier/prettier/pull/9052), [#9055](https://github.com/prettier/prettier/pull/9055) by [@fisker](https://github.com/fisker))
-
-<!-- prettier-ignore -->
-```vue
-<!-- Input -->
-<custom lang="markdown" src="./foo.md"></custom>
-<custom lang="markdown" src="./foo.md" />
-<custom lang="markdown" />
-
-<!-- Prettier stable -->
-<custom lang="markdown" src="./foo.md">
-
-</custom>
-<custom lang="markdown" src="./foo.md"
-
-/>
-<custom lang="markdown"
-
-/>
-
-<!-- Prettier master -->
-<custom lang="markdown" src="./foo.md"></custom>
-<custom lang="markdown" src="./foo.md" />
-<custom lang="markdown" />
-```
diff --git a/docs/browser.md b/docs/browser.md
index 6c874c679..19c7bfbe1 100644
--- a/docs/browser.md
+++ b/docs/browser.md
@@ -18,8 +18,8 @@ See [Usage](#usage) below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@2.1.0/standalone.js"></script>
-<script src="https://unpkg.com/prettier@2.1.0/parser-graphql.js"></script>
+<script src="https://unpkg.com/prettier@2.1.1/standalone.js"></script>
+<script src="https://unpkg.com/prettier@2.1.1/parser-graphql.js"></script>
 <script>
   prettier.format("query { }", {
     parser: "graphql",
@@ -46,8 +46,8 @@ prettier.format("query { }", {
 
 ```js
 define([
-  "https://unpkg.com/prettier@2.1.0/standalone.js",
-  "https://unpkg.com/prettier@2.1.0/parser-graphql.js",
+  "https://unpkg.com/prettier@2.1.1/standalone.js",
+  "https://unpkg.com/prettier@2.1.1/parser-graphql.js",
 ], (prettier, ...plugins) => {
   prettier.format("query { }", { parser: "graphql", plugins });
 });
@@ -66,7 +66,7 @@ This syntax doesn’t necessarily work in the browser, but it can be used when b
 ### Worker
 
 ```js
-importScripts("https://unpkg.com/prettier@2.1.0/standalone.js");
-importScripts("https://unpkg.com/prettier@2.1.0/parser-graphql.js");
+importScripts("https://unpkg.com/prettier@2.1.1/standalone.js");
+importScripts("https://unpkg.com/prettier@2.1.1/parser-graphql.js");
 prettier.format("query { }", { parser: "graphql", plugins: prettierPlugins });
 ```
diff --git a/package.json b/package.json
index eb1ae3345..8cd1d37db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.2.0-dev",
+  "version": "2.1.1",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin/prettier.js",
   "repository": "prettier/prettier",
diff --git a/website/versioned_docs/version-stable/browser.md b/website/versioned_docs/version-stable/browser.md
index 9407f8846..be62454c3 100644
--- a/website/versioned_docs/version-stable/browser.md
+++ b/website/versioned_docs/version-stable/browser.md
@@ -19,8 +19,8 @@ See [Usage](#usage) below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@2.1.0/standalone.js"></script>
-<script src="https://unpkg.com/prettier@2.1.0/parser-graphql.js"></script>
+<script src="https://unpkg.com/prettier@2.1.1/standalone.js"></script>
+<script src="https://unpkg.com/prettier@2.1.1/parser-graphql.js"></script>
 <script>
   prettier.format("query { }", {
     parser: "graphql",
@@ -47,8 +47,8 @@ prettier.format("query { }", {
 
 ```js
 define([
-  "https://unpkg.com/prettier@2.1.0/standalone.js",
-  "https://unpkg.com/prettier@2.1.0/parser-graphql.js",
+  "https://unpkg.com/prettier@2.1.1/standalone.js",
+  "https://unpkg.com/prettier@2.1.1/parser-graphql.js",
 ], (prettier, ...plugins) => {
   prettier.format("query { }", { parser: "graphql", plugins });
 });
@@ -67,7 +67,7 @@ This syntax doesn’t necessarily work in the browser, but it can be used when b
 ### Worker
 
 ```js
-importScripts("https://unpkg.com/prettier@2.1.0/standalone.js");
-importScripts("https://unpkg.com/prettier@2.1.0/parser-graphql.js");
+importScripts("https://unpkg.com/prettier@2.1.1/standalone.js");
+importScripts("https://unpkg.com/prettier@2.1.1/parser-graphql.js");
 prettier.format("query { }", { parser: "graphql", plugins: prettierPlugins });
 ```