From f7fb04b0df5b17044d2637e6426f07db6ea3a769 Mon Sep 17 00:00:00 2001
From: Lucas Duailibe <lucasds@gmail.com>
Date: Fri, 7 Jun 2019 11:55:05 -0300
Subject: [PATCH] Release 1.18.2

---
 .github/ISSUE_TEMPLATE/formatting.md  |  2 +-
 .github/ISSUE_TEMPLATE/integration.md |  2 +-
 CHANGELOG.md                          | 11 +++++++++++
 package.json                          |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/formatting.md b/.github/ISSUE_TEMPLATE/formatting.md
index a05161be..14ee3716 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 1.18.1**
+**Prettier 1.18.2**
 [Playground link](https://prettier.io/playground/#.....)
 ```sh
 # Options (if any):
diff --git a/.github/ISSUE_TEMPLATE/integration.md b/.github/ISSUE_TEMPLATE/integration.md
index bedc3d5f..2c3f5e85 100644
--- a/.github/ISSUE_TEMPLATE/integration.md
+++ b/.github/ISSUE_TEMPLATE/integration.md
@@ -19,7 +19,7 @@ BEFORE SUBMITTING AN ISSUE:
 -->
 
 **Environments:**
-- Prettier Version: 1.18.1
+- Prettier Version: 1.18.2
 - Running Prettier via: <!-- CLI, Node.js API, Browser API, etc. -->
 - Runtime: <!-- Node.js v6, Chrome v67, etc. -->
 - Operating System: <!-- Windows, Linux, macOS, etc. -->
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3030c889..4c5b4367 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 1.18.2
+
+[diff](https://github.com/prettier/prettier/compare/1.18.2...1.18.1)
+
+- TypeScript: only add trailing commas in tuples for `--trailing-comma=all` ([#6199] by [@duailibe])
+
+  In Prettier 1.18 we added trailing commas in tuples when `--trailing-comma=all`, but it was also adding for `--trailing-comma=es5`.
+
+  [#6199]: https://github.com/prettier/prettier/pull/6199
+  [@duailibe]: https://github.com/duailibe
+
 # 1.18.1
 
 [diff](https://github.com/prettier/prettier/compare/1.18.1...1.18.0)
diff --git a/package.json b/package.json
index b475dc5e..962de988 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "description": "Prettier is an opinionated code formatter",
   "bin": {
     "prettier": "./bin/prettier.js"