From 3cb0352541c7ce983f89a760628693ee367f0684 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 08:03:44 +0800
Subject: [PATCH 001/299] Build(deps): Bump meriyah from 3.1.2 to 3.1.6 (#9624)

* Build(deps): Bump meriyah from 3.1.2 to 3.1.6

Bumps [meriyah](https://github.com/meriyah/meriyah) from 3.1.2 to 3.1.6.
- [Release notes](https://github.com/meriyah/meriyah/releases)
- [Changelog](https://github.com/meriyah/meriyah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/meriyah/meriyah/compare/v3.1.2...v3.1.6)

Signed-off-by: dependabot[bot] <support@github.com>

* Fix typing

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: fisker <lionkay@gmail.com>
---
 package.json                      |  2 +-
 src/language-js/parser-meriyah.js |  2 ++
 src/language-js/types/estree.d.ts | 16 ++--------------
 yarn.lock                         |  8 ++++----
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 384ff6ab3..e1021de13 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "linguist-languages": "7.11.1",
     "lodash": "4.17.20",
     "mem": "8.0.0",
-    "meriyah": "3.1.2",
+    "meriyah": "3.1.6",
     "minimatch": "3.0.4",
     "minimist": "1.2.5",
     "n-readlines": "1.0.0",
diff --git a/src/language-js/parser-meriyah.js b/src/language-js/parser-meriyah.js
index 32f10e58c..0d9f9f45a 100644
--- a/src/language-js/parser-meriyah.js
+++ b/src/language-js/parser-meriyah.js
@@ -45,6 +45,8 @@ function parseWithOptions(text, module) {
   const { parse } = require("meriyah");
   const comments = [];
   const tokens = [];
+
+  /** @type {any} */
   const ast = parse(text, {
     ...parseOptions,
     module,
diff --git a/src/language-js/types/estree.d.ts b/src/language-js/types/estree.d.ts
index 793932d95..9c19b8866 100644
--- a/src/language-js/types/estree.d.ts
+++ b/src/language-js/types/estree.d.ts
@@ -1,6 +1,7 @@
 import * as ESTree from "estree";
 import * as Babel from "@babel/types";
 import { TSESTree } from "@typescript-eslint/types";
+import { ESTree as Meriyah } from "meriyah";
 import * as NGTree from "angular-estree-parser/lib/types";
 
 type AdditionalFields = {
@@ -14,24 +15,11 @@ type AdditionalFields = {
   leadingComments?: ReadonlyArray<Comment> | Comment[];
 };
 
-type MeriyahComment = {
-  value: string;
-  start: number;
-  end: number;
-  range: number[];
-  type:
-    | "MultiLine"
-    | "SingleLine"
-    | "HashbangComment"
-    | "HTMLOpen"
-    | "HTMLClose";
-};
-
 export type Comment = (
   | ESTree.Comment
   | Babel.Comment
   | TSESTree.Comment
-  | MeriyahComment
+  | Meriyah.Comment
 ) & {
   printed?: boolean;
   trailing?: boolean;
diff --git a/yarn.lock b/yarn.lock
index c77c7e1fc..76eaa538b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5278,10 +5278,10 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-meriyah@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-3.1.2.tgz#42aac8a1e05b186f8e08b74b2ee47ea00306b7b9"
-  integrity sha512-CXPkXT3xdk7KAVdrOV9SDvKUkE8r24aQe4ee/Uj7UJQcoNAS+Bz2QjOpDyrFiLD81GyJ3e5SrKn/125Ow0Ryqg==
+meriyah@3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-3.1.6.tgz#56c9c0edb63f9640c7609a39a413c60b038e4451"
+  integrity sha512-JDOSi6DIItDc33U5N52UdV6P8v+gn+fqZKfbAfHzdWApRQyQWdcvxPvAr9t01bI2rBxGvSrKRQSCg3SkZC1qeg==
 
 micromatch@^3.1.4:
   version "3.1.10"

From 9311334101c95788e6e5efba59e237d6b90bab27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 08:04:15 +0800
Subject: [PATCH 002/299] Build(deps): Bump diff from 4.0.2 to 5.0.0 (#9623)

Bumps [diff](https://github.com/kpdecker/jsdiff) from 4.0.2 to 5.0.0.
- [Release notes](https://github.com/kpdecker/jsdiff/releases)
- [Changelog](https://github.com/kpdecker/jsdiff/blob/master/release-notes.md)
- [Commits](https://github.com/kpdecker/jsdiff/compare/v4.0.2...v5.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e1021de13..d82d06d5b 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "cjk-regex": "2.0.0",
     "cosmiconfig": "7.0.0",
     "dashify": "2.0.0",
-    "diff": "4.0.2",
+    "diff": "5.0.0",
     "editorconfig": "0.15.3",
     "editorconfig-to-prettier": "0.2.0",
     "escape-string-regexp": "4.0.0",
diff --git a/yarn.lock b/yarn.lock
index 76eaa538b..6738d0fa7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2891,10 +2891,10 @@ diff-sequences@^26.6.2:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
   integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
 
-diff@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+diff@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
 
 dir-glob@^3.0.1:
   version "3.0.1"

From 9e9cc85072218048c823c9ab5d93d1eef822dfed Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 10 Nov 2020 09:06:08 +0800
Subject: [PATCH 003/299] Enable `directly-loc-start-end` for all languages
 (#9610)

---
 .eslintrc.yml                             |  3 +--
 src/language-graphql/loc.js               | 17 +++++++++++++++++
 src/language-graphql/parser-graphql.js    | 15 +++------------
 src/language-graphql/printer-graphql.js   | 11 ++++-------
 src/language-html/loc.js                  | 11 +++++++++++
 src/language-html/parser-html.js          |  9 +--------
 src/language-html/printer-html.js         | 15 +++++----------
 src/language-markdown/loc.js              | 11 +++++++++++
 src/language-markdown/parser-markdown.js  |  5 +++--
 src/language-markdown/printer-markdown.js | 10 ++++------
 src/language-markdown/utils.js            |  7 ++++---
 src/language-yaml/loc.js                  | 11 +++++++++++
 src/language-yaml/parser-yaml.js          | 10 +++-------
 src/language-yaml/printer-yaml.js         |  8 +++-----
 14 files changed, 81 insertions(+), 62 deletions(-)
 create mode 100644 src/language-graphql/loc.js
 create mode 100644 src/language-html/loc.js
 create mode 100644 src/language-markdown/loc.js
 create mode 100644 src/language-yaml/loc.js

diff --git a/.eslintrc.yml b/.eslintrc.yml
index ae99a744e..26bc7af25 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -106,7 +106,6 @@ overrides:
     rules:
       prettier-internal-rules/prefer-fast-path-each: error
   - files:
-      - src/language-js/**/*.js
-      - src/language-css/**/*.js
+      - src/language-*/**/*.js
     rules:
       prettier-internal-rules/directly-loc-start-end: error
diff --git a/src/language-graphql/loc.js b/src/language-graphql/loc.js
new file mode 100644
index 000000000..6d5507718
--- /dev/null
+++ b/src/language-graphql/loc.js
@@ -0,0 +1,17 @@
+"use strict";
+
+function locStart(node) {
+  if (typeof node.start === "number") {
+    return node.start;
+  }
+  return node.loc && node.loc.start;
+}
+
+function locEnd(node) {
+  if (typeof node.end === "number") {
+    return node.end;
+  }
+  return node.loc && node.loc.end;
+}
+
+module.exports = { locStart, locEnd };
diff --git a/src/language-graphql/parser-graphql.js b/src/language-graphql/parser-graphql.js
index 60ec5c9bf..5e732eed7 100644
--- a/src/language-graphql/parser-graphql.js
+++ b/src/language-graphql/parser-graphql.js
@@ -2,6 +2,7 @@
 
 const createError = require("../common/parser-create-error");
 const { hasPragma } = require("./pragma");
+const { locStart, locEnd } = require("./loc");
 
 function parseComments(ast) {
   const comments = [];
@@ -77,18 +78,8 @@ module.exports = {
       parse,
       astFormat: "graphql",
       hasPragma,
-      locStart(node) {
-        if (typeof node.start === "number") {
-          return node.start;
-        }
-        return node.loc && node.loc.start;
-      },
-      locEnd(node) {
-        if (typeof node.end === "number") {
-          return node.end;
-        }
-        return node.loc && node.loc.end;
-      },
+      locStart,
+      locEnd,
     },
   },
 };
diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js
index 2b6b2a048..f787ff050 100644
--- a/src/language-graphql/printer-graphql.js
+++ b/src/language-graphql/printer-graphql.js
@@ -12,6 +12,7 @@ const {
 } = require("../document").builders;
 const { hasIgnoreComment, isNextLineEmpty } = require("../common/util");
 const { insertPragma } = require("./pragma");
+const { locStart, locEnd } = require("./loc");
 
 function genericPrint(path, options, print) {
   const n = path.getValue();
@@ -31,11 +32,7 @@ function genericPrint(path, options, print) {
         if (index !== n.definitions.length - 1) {
           parts.push(hardline);
           if (
-            isNextLineEmpty(
-              options.originalText,
-              pathChild.getValue(),
-              options.locEnd
-            )
+            isNextLineEmpty(options.originalText, pathChild.getValue(), locEnd)
           ) {
             parts.push(hardline);
           }
@@ -44,7 +41,7 @@ function genericPrint(path, options, print) {
       return concat([concat(parts), hardline]);
     }
     case "OperationDefinition": {
-      const hasOperation = options.originalText[options.locStart(n)] !== "{";
+      const hasOperation = options.originalText[locStart(n)] !== "{";
       const hasName = !!n.name;
       return concat([
         hasOperation ? n.operation : "",
@@ -627,7 +624,7 @@ function printSequence(sequencePath, options, print) {
     const printed = print(path);
 
     if (
-      isNextLineEmpty(options.originalText, path.getValue(), options.locEnd) &&
+      isNextLineEmpty(options.originalText, path.getValue(), locEnd) &&
       i < count - 1
     ) {
       return concat([printed, hardline]);
diff --git a/src/language-html/loc.js b/src/language-html/loc.js
new file mode 100644
index 000000000..79f8f0c72
--- /dev/null
+++ b/src/language-html/loc.js
@@ -0,0 +1,11 @@
+"use strict";
+
+function locStart(node) {
+  return node.sourceSpan.start.offset;
+}
+
+function locEnd(node) {
+  return node.sourceSpan.end.offset;
+}
+
+module.exports = { locStart, locEnd };
diff --git a/src/language-html/parser-html.js b/src/language-html/parser-html.js
index 994e0f555..f6424a7a1 100644
--- a/src/language-html/parser-html.js
+++ b/src/language-html/parser-html.js
@@ -16,6 +16,7 @@ const {
 const { hasPragma } = require("./pragma");
 const { Node } = require("./ast");
 const { parseIeConditionalComment } = require("./conditional-comment");
+const { locStart, locEnd } = require("./loc");
 
 function ngHtmlParser(
   input,
@@ -347,14 +348,6 @@ function _parse(text, options, parserOptions, shouldParseFrontMatter = true) {
   });
 }
 
-function locStart(node) {
-  return node.sourceSpan.start.offset;
-}
-
-function locEnd(node) {
-  return node.sourceSpan.end.offset;
-}
-
 function createParser({
   recognizeSelfClosing = false,
   normalizeTagName = false,
diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index 0beeea663..e0649c4bb 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -46,6 +46,7 @@ const {
 } = require("./utils");
 const preprocess = require("./preprocess");
 const { insertPragma } = require("./pragma");
+const { locStart, locEnd } = require("./loc");
 const {
   printVueFor,
   printVueSlotScope,
@@ -407,10 +408,7 @@ function genericPrint(path, options, print) {
         printOpeningTagPrefix(node, options),
         concat(
           replaceEndOfLineWith(
-            options.originalText.slice(
-              options.locStart(node),
-              options.locEnd(node)
-            ),
+            options.originalText.slice(locStart(node), locEnd(node)),
             literalline
           )
         ),
@@ -563,12 +561,12 @@ function printChildren(path, options, print) {
           printOpeningTagPrefix(child, options),
           replaceEndOfLineWith(
             options.originalText.slice(
-              options.locStart(child) +
+              locStart(child) +
                 (child.prev &&
                 needsToBorrowNextOpeningTagStartMarker(child.prev)
                   ? printOpeningTagStartMarker(child).length
                   : 0),
-              options.locEnd(child) -
+              locEnd(child) -
                 (child.next && needsToBorrowPrevClosingTagEndMarker(child.next)
                   ? printClosingTagEndMarker(child, options).length
                   : 0)
@@ -698,10 +696,7 @@ function printAttributes(path, options, print) {
     return hasPrettierIgnoreAttribute(attribute)
       ? concat(
           replaceEndOfLineWith(
-            options.originalText.slice(
-              options.locStart(attribute),
-              options.locEnd(attribute)
-            ),
+            options.originalText.slice(locStart(attribute), locEnd(attribute)),
             literalline
           )
         )
diff --git a/src/language-markdown/loc.js b/src/language-markdown/loc.js
new file mode 100644
index 000000000..097ca3b54
--- /dev/null
+++ b/src/language-markdown/loc.js
@@ -0,0 +1,11 @@
+"use strict";
+
+function locStart(node) {
+  return node.position.start.offset;
+}
+
+function locEnd(node) {
+  return node.position.end.offset;
+}
+
+module.exports = { locStart, locEnd };
diff --git a/src/language-markdown/parser-markdown.js b/src/language-markdown/parser-markdown.js
index bb961f103..32499bd34 100644
--- a/src/language-markdown/parser-markdown.js
+++ b/src/language-markdown/parser-markdown.js
@@ -6,6 +6,7 @@ const remarkMath = require("remark-math");
 const footnotes = require("remark-footnotes");
 const { parse: parseFrontMatter } = require("../utils/front-matter");
 const pragma = require("./pragma");
+const { locStart, locEnd } = require("./loc");
 const { mapAst, INLINE_NODE_WRAPPER_TYPES } = require("./utils");
 const mdx = require("./mdx");
 
@@ -158,8 +159,8 @@ function looseItems() {
 const baseParser = {
   astFormat: "mdast",
   hasPragma: pragma.hasPragma,
-  locStart: (node) => node.position.start.offset,
-  locEnd: (node) => node.position.end.offset,
+  locStart,
+  locEnd,
 };
 
 const markdownParser = { ...baseParser, parse: createParse({ isMDX: false }) };
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index ca916505a..e95006c58 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -28,6 +28,7 @@ const {
 const { replaceEndOfLineWith } = require("../common/util");
 const embed = require("./embed");
 const { insertPragma } = require("./pragma");
+const { locStart, locEnd } = require("./loc");
 const preprocess = require("./preprocess");
 const clean = require("./clean");
 const {
@@ -112,7 +113,7 @@ function genericPrint(path, options, print) {
       const isFirstSentence = (node, name, index) =>
         node.type === "sentence" && index === 0;
       const isLastChildAutolink = (node, name, index) =>
-        isAutolink(node.children[index - 1], options);
+        isAutolink(node.children[index - 1]);
 
       if (
         escapedValue !== node.value &&
@@ -147,7 +148,7 @@ function genericPrint(path, options, print) {
     }
     case "emphasis": {
       let style;
-      if (isAutolink(node.children[0], options)) {
+      if (isAutolink(node.children[0])) {
         style = options.originalText[node.position.start.offset];
       } else {
         const parentNode = path.getParentNode();
@@ -463,10 +464,7 @@ function genericPrint(path, options, print) {
     case "inlineMath": {
       // remark-math trims content but we don't want to remove whitespaces
       // since it's very possible that it's recognized as math accidentally
-      return options.originalText.slice(
-        options.locStart(node),
-        options.locEnd(node)
-      );
+      return options.originalText.slice(locStart(node), locEnd(node));
     }
 
     case "tableRow": // handled in "table"
diff --git a/src/language-markdown/utils.js b/src/language-markdown/utils.js
index 7782614ae..4396d48f0 100644
--- a/src/language-markdown/utils.js
+++ b/src/language-markdown/utils.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const { getLast } = require("../common/util");
+const { locStart, locEnd } = require("./loc");
 const {
   cjkPattern,
   kPattern,
@@ -221,15 +222,15 @@ function mapAst(ast, handler) {
   })(ast, null, null);
 }
 
-function isAutolink(node, options) {
+function isAutolink(node) {
   if (!node || node.type !== "link" || node.children.length !== 1) {
     return false;
   }
   const child = node.children[0];
   return (
     child &&
-    options.locStart(node) === options.locStart(child) &&
-    options.locEnd(node) === options.locEnd(child)
+    locStart(node) === locStart(child) &&
+    locEnd(node) === locEnd(child)
   );
 }
 
diff --git a/src/language-yaml/loc.js b/src/language-yaml/loc.js
new file mode 100644
index 000000000..097ca3b54
--- /dev/null
+++ b/src/language-yaml/loc.js
@@ -0,0 +1,11 @@
+"use strict";
+
+function locStart(node) {
+  return node.position.start.offset;
+}
+
+function locEnd(node) {
+  return node.position.end.offset;
+}
+
+module.exports = { locStart, locEnd };
diff --git a/src/language-yaml/parser-yaml.js b/src/language-yaml/parser-yaml.js
index 5b83bd74a..61948c233 100644
--- a/src/language-yaml/parser-yaml.js
+++ b/src/language-yaml/parser-yaml.js
@@ -2,6 +2,7 @@
 
 const createError = require("../common/parser-create-error");
 const { hasPragma } = require("./pragma");
+const { locStart, locEnd } = require("./loc");
 
 function parse(text) {
   try {
@@ -30,13 +31,8 @@ const parser = {
   astFormat: "yaml",
   parse,
   hasPragma,
-  locStart(node) {
-    return node.position.start.offset;
-  },
-  /* istanbul ignore next */
-  locEnd(node) {
-    return node.position.end.offset;
-  },
+  locStart,
+  locEnd,
 };
 
 module.exports = {
diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js
index f13df3580..fa219a50e 100644
--- a/src/language-yaml/printer-yaml.js
+++ b/src/language-yaml/printer-yaml.js
@@ -20,6 +20,7 @@ const {
 } = docBuilders;
 const { replaceEndOfLineWith, isPreviousLineEmpty } = require("../common/util");
 const { insertPragma, isPragma } = require("./pragma");
+const { locStart } = require("./loc");
 const {
   getAncestorCount,
   getBlockValueLineContents,
@@ -140,7 +141,7 @@ function genericPrint(path, options, print) {
                     isPreviousLineEmpty(
                       options.originalText,
                       path.getValue(),
-                      options.locStart
+                      locStart
                     )
                       ? hardline
                       : "",
@@ -626,10 +627,7 @@ function shouldPrintDocumentHeadEndMarker(
      */
     (root.children[0] === document &&
       /---(\s|$)/.test(
-        options.originalText.slice(
-          options.locStart(document),
-          options.locStart(document) + 4
-        )
+        options.originalText.slice(locStart(document), locStart(document) + 4)
       )) ||
     /**
      * %DIRECTIVE

From 60a5729a192926699055b50ba33924fc8bc1cdf5 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 10 Nov 2020 09:12:46 +0800
Subject: [PATCH 004/299] Move prettier-ignore related functions into
 `language-js/` (#9555)

---
 src/common/util.js                            | 19 ------------
 src/language-css/printer-postcss.js           |  2 --
 src/language-graphql/printer-graphql.js       | 13 ++++++--
 src/language-js/comments.js                   | 11 ++++---
 src/language-js/printer-estree.js             |  4 +--
 src/language-js/utils.js                      | 30 ++++++++++++++++---
 .../__snapshots__/jsfmt.spec.js.snap          | 27 +++++++++++++++++
 tests/graphql/prettier-ignore/jsfmt.spec.js   |  1 +
 .../prettier-ignore-comment.graphql           |  7 +++++
 9 files changed, 81 insertions(+), 33 deletions(-)
 create mode 100644 tests/graphql/prettier-ignore/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/graphql/prettier-ignore/jsfmt.spec.js
 create mode 100644 tests/graphql/prettier-ignore/prettier-ignore-comment.graphql

diff --git a/src/common/util.js b/src/common/util.js
index b362b1649..4b9f3e513 100644
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -557,23 +557,6 @@ function getStringWidth(text) {
   return stringWidth(text);
 }
 
-function hasIgnoreComment(path) {
-  const node = path.getValue();
-  return hasNodeIgnoreComment(node);
-}
-
-function hasNodeIgnoreComment(node) {
-  return (
-    node &&
-    ((node.comments &&
-      node.comments.length > 0 &&
-      node.comments.some(
-        (comment) => isNodeIgnoreComment(comment) && !comment.unignore
-      )) ||
-      node.prettierIgnore)
-  );
-}
-
 function isNodeIgnoreComment(comment) {
   return comment.value.trim() === "prettier-ignore";
 }
@@ -683,8 +666,6 @@ module.exports = {
   getPreferredQuote,
   printString,
   printNumber,
-  hasIgnoreComment,
-  hasNodeIgnoreComment,
   isNodeIgnoreComment,
   makeString,
   addLeadingComment,
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index 4818f6241..74b5ec151 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -3,7 +3,6 @@
 const {
   printNumber,
   printString,
-  hasIgnoreComment,
   hasNewline,
   isFrontMatterNode,
   isNextLineEmpty,
@@ -1062,6 +1061,5 @@ module.exports = {
   print: genericPrint,
   embed,
   insertPragma,
-  hasPrettierIgnore: hasIgnoreComment,
   massageAstNode: clean,
 };
diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js
index f787ff050..0101aef7e 100644
--- a/src/language-graphql/printer-graphql.js
+++ b/src/language-graphql/printer-graphql.js
@@ -10,7 +10,7 @@ const {
   indent,
   ifBreak,
 } = require("../document").builders;
-const { hasIgnoreComment, isNextLineEmpty } = require("../common/util");
+const { isNextLineEmpty } = require("../common/util");
 const { insertPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
 
@@ -677,10 +677,19 @@ function printInterfaces(path, options, print) {
 function clean(/*node, newNode , parent*/) {}
 clean.ignoredProperties = new Set(["loc", "comments"]);
 
+function hasPrettierIgnore(path) {
+  const node = path.getValue();
+  return (
+    node &&
+    Array.isArray(node.comments) &&
+    node.comments.some((comment) => comment.value.trim() === "prettier-ignore")
+  );
+}
+
 module.exports = {
   print: genericPrint,
   massageAstNode: clean,
-  hasPrettierIgnore: hasIgnoreComment,
+  hasPrettierIgnore,
   insertPragma,
   printComment,
   canAttachComment,
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index c33bff504..53b337ddd 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -6,13 +6,16 @@ const {
   getNextNonSpaceNonCommentCharacterIndexWithStartIndex,
   getNextNonSpaceNonCommentCharacter,
   hasNewlineInRange,
-  isNodeIgnoreComment,
   addLeadingComment,
   addTrailingComment,
   addDanglingComment,
   getNextNonSpaceNonCommentCharacterIndex,
 } = require("../common/util");
-const { isBlockComment, getFunctionParameters } = require("./utils");
+const {
+  isBlockComment,
+  getFunctionParameters,
+  isPrettierIgnoreComment,
+} = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
 function handleOwnLineComment(comment, text, options, ast, isLastComment) {
@@ -697,7 +700,7 @@ function handleUnionTypeComments(
     (enclosingNode.type === "UnionTypeAnnotation" ||
       enclosingNode.type === "TSUnionType")
   ) {
-    if (isNodeIgnoreComment(comment)) {
+    if (isPrettierIgnoreComment(comment)) {
       followingNode.prettierIgnore = true;
       comment.unignore = true;
     }
@@ -712,7 +715,7 @@ function handleUnionTypeComments(
     followingNode &&
     (followingNode.type === "UnionTypeAnnotation" ||
       followingNode.type === "TSUnionType") &&
-    isNodeIgnoreComment(comment)
+    isPrettierIgnoreComment(comment)
   ) {
     followingNode.types[0].prettierIgnore = true;
     comment.unignore = true;
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 6f3224cc4..add0da277 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -14,8 +14,6 @@ const {
   getStringWidth,
   printString,
   printNumber,
-  hasIgnoreComment,
-  hasNodeIgnoreComment,
   getIndentSize,
   getPreferredQuote,
   isNextLineEmpty,
@@ -68,6 +66,8 @@ const {
   hasPrettierIgnore,
   hasTrailingComment,
   hasTrailingLineComment,
+  hasNodeIgnoreComment,
+  hasIgnoreComment,
   identity,
   isBinaryish,
   isCallOrOptionalCallExpression,
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index 6400b5f2e..d5564efba 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -5,8 +5,6 @@ const {
   getLast,
   hasNewline,
   hasNewlineInRange,
-  hasIgnoreComment,
-  hasNodeIgnoreComment,
   skipWhitespace,
 } = require("../common/util");
 const { locStart, locEnd, hasSameLocStart } = require("./loc");
@@ -843,8 +841,8 @@ function hasJsxIgnoreComment(path) {
     prevSibling.type === "JSXExpressionContainer" &&
     prevSibling.expression.type === "JSXEmptyExpression" &&
     prevSibling.expression.comments &&
-    prevSibling.expression.comments.some(
-      (comment) => comment.value.trim() === "prettier-ignore"
+    prevSibling.expression.comments.some((comment) =>
+      isPrettierIgnoreComment(comment)
     )
   );
 }
@@ -1448,6 +1446,27 @@ function iterateFunctionParametersPath(path, iteratee) {
   }
 }
 
+function isPrettierIgnoreComment(comment) {
+  return comment.value.trim() === "prettier-ignore";
+}
+
+function hasNodeIgnoreComment(node) {
+  return (
+    node &&
+    ((node.comments &&
+      node.comments.length > 0 &&
+      node.comments.some(
+        (comment) => isPrettierIgnoreComment(comment) && !comment.unignore
+      )) ||
+      node.prettierIgnore)
+  );
+}
+
+function hasIgnoreComment(path) {
+  const node = path.getValue();
+  return hasNodeIgnoreComment(node);
+}
+
 module.exports = {
   classChildNeedsASIProtection,
   classPropMayCauseASIProblems,
@@ -1469,10 +1488,13 @@ module.exports = {
   hasPrettierIgnore,
   hasTrailingComment,
   hasTrailingLineComment,
+  hasIgnoreComment,
+  hasNodeIgnoreComment,
   identity,
   isBinaryish,
   isBlockComment,
   isLineComment,
+  isPrettierIgnoreComment,
   isCallOrOptionalCallExpression,
   isEmptyJSXElement,
   isExportDeclaration,
diff --git a/tests/graphql/prettier-ignore/__snapshots__/jsfmt.spec.js.snap b/tests/graphql/prettier-ignore/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..3afabead1
--- /dev/null
+++ b/tests/graphql/prettier-ignore/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`prettier-ignore-comment.graphql format 1`] = `
+====================================options=====================================
+parsers: ["graphql"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+{
+  # prettier-ignore
+  hero {
+       name
+    height
+  }
+}
+
+=====================================output=====================================
+{
+  # prettier-ignore
+  hero {
+       name
+    height
+  }
+}
+
+================================================================================
+`;
diff --git a/tests/graphql/prettier-ignore/jsfmt.spec.js b/tests/graphql/prettier-ignore/jsfmt.spec.js
new file mode 100644
index 000000000..4612e6ac5
--- /dev/null
+++ b/tests/graphql/prettier-ignore/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["graphql"]);
diff --git a/tests/graphql/prettier-ignore/prettier-ignore-comment.graphql b/tests/graphql/prettier-ignore/prettier-ignore-comment.graphql
new file mode 100644
index 000000000..14daa32f3
--- /dev/null
+++ b/tests/graphql/prettier-ignore/prettier-ignore-comment.graphql
@@ -0,0 +1,7 @@
+{
+  # prettier-ignore
+  hero {
+       name
+    height
+  }
+}

From 58d62e094fec78aa6b47518b8931686a4fab292c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 15:11:46 +0800
Subject: [PATCH 005/299] Build(deps): Bump @glimmer/syntax from 0.62.4 to
 0.63.4 (#9635)

Bumps [@glimmer/syntax](https://github.com/glimmerjs/glimmer-vm) from 0.62.4 to 0.63.4.
- [Release notes](https://github.com/glimmerjs/glimmer-vm/releases)
- [Changelog](https://github.com/glimmerjs/glimmer-vm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/glimmerjs/glimmer-vm/compare/v0.62.4...v0.63.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index d82d06d5b..d41d90c71 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "10.2.2",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.5",
-    "@glimmer/syntax": "0.62.4",
+    "@glimmer/syntax": "0.63.4",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "3.10.1",
     "angular-estree-parser": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index 6738d0fa7..30bf2d12c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -908,6 +908,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.63.4":
+  version "0.63.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.63.4.tgz#b375b4346b3d67a17a45825a9c90367d2bf167d4"
+  integrity sha512-XpKKJVqVE9JUcAqEHUu0lwJQZnv3gHPZ93o/xDdyUqnSokipeToHJzehRrhIkknSaiKKyu624fvk0dakQaS5ow==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/reference@0.62.4":
   version "0.62.4"
   resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.62.4.tgz#50dbd0d202ca94f73bbcdfe19ce450ca5c6babdc"
@@ -919,13 +926,13 @@
     "@glimmer/util" "0.62.4"
     "@glimmer/validator" "0.62.4"
 
-"@glimmer/syntax@0.62.4":
-  version "0.62.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.62.4.tgz#9d5ec15584fed85d807762992a1879fe7fe15ae8"
-  integrity sha512-c/c+tqv1Ob+IaiVYe3DfHsLQwk/DZ3RA14gVcrE8Bbqrr7RtmjdKPfgNswiQhx7b+1ygcUhvYUfxfI8nCVswIw==
+"@glimmer/syntax@0.63.4":
+  version "0.63.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.63.4.tgz#87598c50b097ff6beea4e1611549577050d922c5"
+  integrity sha512-ndt2ujQHe8bnwv/x8JpAEBqzWvXClqnevNqlAyywTZR4/ur0SYayFRdN9kI3qzRzX6Psc7lxCAqwp8QyKpUbiQ==
   dependencies:
-    "@glimmer/interfaces" "0.62.4"
-    "@glimmer/util" "0.62.4"
+    "@glimmer/interfaces" "0.63.4"
+    "@glimmer/util" "0.63.4"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
@@ -938,6 +945,15 @@
     "@glimmer/interfaces" "0.62.4"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.63.4":
+  version "0.63.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.63.4.tgz#e051a5b03eb5a04a58a9d393fcd37f25b533c2ab"
+  integrity sha512-D102O0wRdPn6KOHFZ3+GAKj+Wxaou0KMxePspu5lPD9bQYGd7z+epqpRxpYGb5vbZCg8nTT28+qUU5yMh6NpCA==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.63.4"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.62.4":
   version "0.62.4"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.62.4.tgz#80570d3fbf9c9a9e6a50e5c022a073da24d14d85"

From 23ddeac886e7edb4be51f039ce8d1a5d9b7f0256 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 15:13:19 +0800
Subject: [PATCH 006/299] Build(deps-dev): Bump cspell from 4.1.3 to 4.1.5
 (#9633)

Bumps [cspell](https://github.com/streetsidesoftware/cspell) from 4.1.3 to 4.1.5.
- [Release notes](https://github.com/streetsidesoftware/cspell/releases)
- [Commits](https://github.com/streetsidesoftware/cspell/compare/cspell@4.1.3...cspell@4.1.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 486 +++++++++++++++++++++++++--------------------------
 2 files changed, 244 insertions(+), 244 deletions(-)

diff --git a/package.json b/package.json
index d41d90c71..c61a6bd75 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "benchmark": "2.1.4",
     "builtin-modules": "3.1.0",
     "cross-env": "7.0.2",
-    "cspell": "4.1.3",
+    "cspell": "4.1.5",
     "eslint": "7.13.0",
     "eslint-config-prettier": "6.15.0",
     "eslint-formatter-friendly": "7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 30bf2d12c..6976a6a46 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2444,234 +2444,234 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-cspell-dict-aws@^1.0.7:
+cspell-dict-aws@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/cspell-dict-aws/-/cspell-dict-aws-1.0.9.tgz#e9600dfc6973aaccb1f54546308be4763f4e0fac"
+  integrity sha512-DrSXcDEcPK0flggRzP7PgmMcqOKO3TsEv5pClK8MsCHN1GcJB3+FyT683BZu0gcO4RQkj4CjEi2Q5m++fZ30Cg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-bash@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/cspell-dict-aws/-/cspell-dict-aws-1.0.7.tgz#c4b9d26de3ff90bd6e16ba7d347ee99d341adbf1"
-  integrity sha512-/8lvWfwrWuWNe2VPH0v2fLyeKyMBWI/ZkKlB1DwKn/LgzMpjBtdsdZhEAkx0ETBjAXR+bgZnN/QldCWCS1D6wA==
+  resolved "https://registry.yarnpkg.com/cspell-dict-bash/-/cspell-dict-bash-1.0.7.tgz#ff9154dbeaeb45f2ff37209aad42d7fe6e678e9e"
+  integrity sha512-u1TFhmCUNZq86lfGFXCpnKHie8Zm3aarGHBu9/cBZC/NVjXp/6S32EUdiNjJm9t+Rlfb244u2ITTKvLPp/IE/A==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-bash@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/cspell-dict-bash/-/cspell-dict-bash-1.0.5.tgz#3de537b462ec939cfd8f782905a11c042549497a"
-  integrity sha512-fyF+W6AsSauF3TcUoCqesiMlj4tp9+gf5PWEJKV0dujTjO8p5dy4RwCX0I4Zw2nC92Knt4If3L+J/4TlNzJGtw==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-companies@^1.0.30:
-  version "1.0.30"
-  resolved "https://registry.yarnpkg.com/cspell-dict-companies/-/cspell-dict-companies-1.0.30.tgz#d4046ba6cc98ff310783e7370c0df2d336136c02"
-  integrity sha512-h+agGF0t+/rNJdpb5sBTZAHGZL7uKCOJfCLVakYi/9E6juocISTq/zDls/Junb1SKiWulbH8y1CeEMgyKAsCaA==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-cpp@^1.1.29:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/cspell-dict-cpp/-/cspell-dict-cpp-1.1.29.tgz#e4de6d2546b5164cd86e94af431ea864c575996b"
-  integrity sha512-rRSUV53+6oZo5fCiweqq7gwpbV6qXmTfxRo13Dce688w5UaDkSSn9Cz2FEgWqpYZj8l530QtMKeFtmGLgpPBww==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-cryptocurrencies@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cspell-dict-cryptocurrencies/-/cspell-dict-cryptocurrencies-1.0.4.tgz#8d5f8e0cfbc08bb45aee3ca1bc6748814b97e13a"
-  integrity sha512-jIiBmxnEyWfQ6AzXoUCvxt8kUMbsCbngNBHZVMcIf75iUzSkJsZVCVRoIS/G9BYaiw6/i5uj0QEdefX+J71N1A==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-csharp@^1.0.3:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/cspell-dict-csharp/-/cspell-dict-csharp-1.0.5.tgz#fc4c187a2412dd5aaecdb24b48ed8cf7c1741ae3"
-  integrity sha512-BNo5rLAhwCpg5w09+aaInUJozaPv5ND1K/wOwSPrEA9DW8F1EP703ekUxhB0islzYkEcoAuyM7Xu7SKpzh+8PQ==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-css@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/cspell-dict-css/-/cspell-dict-css-1.0.5.tgz#6d83c3773ae92063e4cdb1c5f46960528f138df1"
-  integrity sha512-/rs7ctTiP5Yfh50SNLiiT+aPGkOS57KYaF8QFTAjar0O8lKKK9ghAxoMXgjijTEXoqc0yujOK8yQltcJzTdvog==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-django@^1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/cspell-dict-django/-/cspell-dict-django-1.0.17.tgz#d18ac063eac966ce0ca136cce582ae6477a45abb"
-  integrity sha512-6LdpmyqlGpUwgcGZiUXDJKz6rq4gc5Omkv3NZKJ8fwocdRI6ZD0Vlo3/18PSzD8XSYay1c9pCIr6V6N0fexbYw==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-dotnet@^1.0.16:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/cspell-dict-dotnet/-/cspell-dict-dotnet-1.0.16.tgz#1f429dfd758fb7f9c6871cae26671142e409ca19"
-  integrity sha512-07UbbIuAcj7KDt2cPFwjQRnHplCPyks07/FEpwXc7+WroFdxIbhwqV6d8Ol+DcnIR+1PoK0Ertp8iCBzTHPceA==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-elixir@^1.0.15:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/cspell-dict-elixir/-/cspell-dict-elixir-1.0.15.tgz#dceebd56ce6bfd318bc258a8e1900ddeb252b5b2"
-  integrity sha512-M6tx+1gI1lrtqaF466hFEihj4VRxLnF+ZxweyJZQJ6elR+VvvwRq2SVD8NAgBE3Dr0oU49uxgzdjuZz3S1kD8w==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-en-gb@^1.1.20:
-  version "1.1.20"
-  resolved "https://registry.yarnpkg.com/cspell-dict-en-gb/-/cspell-dict-en-gb-1.1.20.tgz#6f9c28e2629f1e799506f92a30394230ca519b10"
-  integrity sha512-cYsJV6UyIqMal8+NMlg6DHn95LwTdM4wcDkjDDatRqQFhVi5m1yUB+l/JfnIbfYxaz51cJfNqpZSOE2LeF38Vw==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-en_us@^1.2.30:
-  version "1.2.30"
-  resolved "https://registry.yarnpkg.com/cspell-dict-en_us/-/cspell-dict-en_us-1.2.30.tgz#4bfcc38dbcf669a490561e6e2b866be865feb727"
-  integrity sha512-A6tcz4LPBhOQ5uRMx+gjPq4QpgfpMeoMWgd8As41bAoxpun2/ZXe2+A/Gl9GdOF+Zb9o7ccsx10NQDSeodhKgQ==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-filetypes@^1.0.3:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/cspell-dict-filetypes/-/cspell-dict-filetypes-1.1.0.tgz#04dcad32ea000ab145e1f52190da69e9098acca8"
-  integrity sha512-uzLMSUzR3Z1fcX/6VXY3vrdFIR7BzcDTJHa35Y8mSOIt0sWldBh/1uFB9t+TA1+6Og4Rr7n6rSKhGIppGzU4ZA==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-fonts@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/cspell-dict-fonts/-/cspell-dict-fonts-1.0.7.tgz#93ec7d9c5b85af0b87750d76b136553548d559c4"
-  integrity sha512-po4Rb3wEn0PVCLbFBkAWtXd76ljJPzXHDiRCeLjpwr6pjyoBb/S6KvcIBTlgSGWXVQQGdy2XW9ChFtljz1FOOA==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-fullstack@^1.0.31:
+cspell-dict-companies@^1.0.31:
   version "1.0.31"
-  resolved "https://registry.yarnpkg.com/cspell-dict-fullstack/-/cspell-dict-fullstack-1.0.31.tgz#3bf06bc0583fd393b74ccc3f5e3c31fbef43479e"
-  integrity sha512-0xYe5eANBaDPnDsACsf8Vla0qGLspUdk3nPkKU+7LqTUb1LvKAE20As8ihxblD/SxBKsmD5FyLFIhCgYvLb4ng==
+  resolved "https://registry.yarnpkg.com/cspell-dict-companies/-/cspell-dict-companies-1.0.31.tgz#7f8c3c3fb2c70eeb0c9050fea208b75092243f59"
+  integrity sha512-DHn7umIg/Zz79f58PHyTmvEO01UFZmG0226Dgi6bA/haGUV/zR0P72cPLMEsoTUUSzsfkmcQ/8k2lHNEwriLaQ==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-golang@^1.1.16:
-  version "1.1.16"
-  resolved "https://registry.yarnpkg.com/cspell-dict-golang/-/cspell-dict-golang-1.1.16.tgz#fa5741542973ac83c3323f9212ed0d8c67e8b455"
-  integrity sha512-15wd23uwr8jM+3JDsFRsyjmne3psuxDIrrNnM8LWxJuytlm/2d+weXF00XDjMZ/bSDCeyZ8sz08aulr6i9c9cw==
+cspell-dict-cpp@^1.1.33:
+  version "1.1.33"
+  resolved "https://registry.yarnpkg.com/cspell-dict-cpp/-/cspell-dict-cpp-1.1.33.tgz#f0267f62a08c4a435b75c711379661fb2733d004"
+  integrity sha512-wCvVCSQl6k3884oEcpGv77l/B1k2dRl2Koo3xrB7tAADg9n4euuk7BBwN681vtHJjJPQXBqW59qeSCwD14y8sw==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-haskell@^1.0.6:
+cspell-dict-cryptocurrencies@^1.0.6:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cspell-dict-haskell/-/cspell-dict-haskell-1.0.6.tgz#8945c36631230e85aa3952b774851d7b816b36a6"
-  integrity sha512-j0hDxShC/9kU6FLw+3wwxdEvZcoHLYSoPdlGhDvhFwMqReogNwdFf/YrzzlVDasxOD5eY25Arqz0t3L3mB3Efg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-html-symbol-entities@^1.0.15:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/cspell-dict-html-symbol-entities/-/cspell-dict-html-symbol-entities-1.0.15.tgz#50d70ac7632f2ef40a3da7df0c531882403c8ea5"
-  integrity sha512-F956/ormR3VvLjSNrrRdMQu/5cCVr3kYqsplJGxsTLC/ejrXy+HPJQUMMckXi/zG2SrzmLP7Lg6d5QHf5PcHQQ==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-html@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/cspell-dict-html/-/cspell-dict-html-1.1.0.tgz#dee8d75e5d70531b9f207c375423ef495e9eb85e"
-  integrity sha512-KXXqOE6QM/3OdIh0ax0YlfOg/+ogqt7f/WoBTjb+1L2CReYfWsOfYVjuZG+L6j5GW34wnMyq1QYo9APX4NF3nw==
+  resolved "https://registry.yarnpkg.com/cspell-dict-cryptocurrencies/-/cspell-dict-cryptocurrencies-1.0.6.tgz#4e51b16ac7a5f29f8cddd9f256605e6850a243ae"
+  integrity sha512-JAjP6CkVsMH8j2K0s6DozAgk7tBfJ2ixLGy5uOhn7/gx+sIf327p9GZOtlRLzAjN3xc2/nzjJ0Li7zGCFlh5cA==
   dependencies:
     configstore "^5.0.0"
 
-cspell-dict-java@^1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/cspell-dict-java/-/cspell-dict-java-1.0.14.tgz#7a5449730b81c69ed29e7142af8a3d3b486dbcbb"
-  integrity sha512-PemBu/fl4o6PSygaQWYU+ioaLV5qgiBxc0YdqFC2Rxo5g9B6S1yVwf4Vgs+jEJq40gN6I2G/JMw2WlrYj4h4gw==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-latex@^1.0.15:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/cspell-dict-latex/-/cspell-dict-latex-1.0.15.tgz#a74198565dd4eda349382cfbc51f7e30b1a38bed"
-  integrity sha512-4vHniog3px2qMYIYuCKY55eYoAV9xIUsWsUHrOpT+rqmibZijYH0RnST2ZZ2Q9b0gr9C5TSUHVBBSCeRL3dxbA==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-lorem-ipsum@^1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/cspell-dict-lorem-ipsum/-/cspell-dict-lorem-ipsum-1.0.14.tgz#81603b6c074abc0211e789ce9318c42485ad508e"
-  integrity sha512-4xI3naVG8TnNdF23ElLH91KHO/msdiMS7kUCjguD5NNTOOwUiTxqW8YShMzEXQ7YOsXBCqQi7LstFjgEnV84Ow==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-lua@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/cspell-dict-lua/-/cspell-dict-lua-1.0.10.tgz#5293172675c5bb92d25396a850ad66f124ac7247"
-  integrity sha512-+21ca6nsLgLVg/s9GNnsuhEV0JgmkMFXqcV2lvBnTo1NeqPB6CwrcHU2d5OzB6Nnp0M4AbyL727C1EFuX5zLLA==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-node@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cspell-dict-node/-/cspell-dict-node-1.0.3.tgz#5d871b811c315b74fc6aa47df5fb55a4708a205c"
-  integrity sha512-LoSBB63YWIFL6BMpikSHlQ8VILucUpvDAHjFHIKppFpoczK8iubejvBmemDWLMdtEyUKo7sSIrEH4eVojQEHUA==
+cspell-dict-csharp@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cspell-dict-csharp/-/cspell-dict-csharp-1.0.6.tgz#6e3dfc77498ab1313469f390000d1bb90c9e396a"
+  integrity sha512-j/no5CTqhmLh9D23SgtYSS4Nr/k82yOn/+NjIqr6mE2Z57w4vgDxLmfiE7MocDvZGczBkAiHtOgrXLDkOzIkSA==
   dependencies:
     configstore "^5.0.0"
 
-cspell-dict-npm@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/cspell-dict-npm/-/cspell-dict-npm-1.0.5.tgz#a4f11b4b1919479607b56251079c9620298a55a1"
-  integrity sha512-gdEf1obAPnWC9fzU99nCFEV3UGVZ2FSbbsh15hvv9VHe/w5n5RaxQGsd4dDvjdHTYqsRimjX15ppuJb7xjN93Q==
+cspell-dict-css@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cspell-dict-css/-/cspell-dict-css-1.0.6.tgz#3a46feedd3bc386f663621d05d1fbb25f01d1eab"
+  integrity sha512-Io1X4PMdOpY7NVL0fu9uw1NQu9VF4I9ONI1L7t/5Hu19WcljmSTJL7rxKlwqUc4qQ91ICnZwPJ5lztNfcWYe+w==
   dependencies:
     configstore "^5.0.0"
 
-cspell-dict-php@^1.0.15:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/cspell-dict-php/-/cspell-dict-php-1.0.15.tgz#f8273048958eaa110e4fdfdef0a7f12c654be77d"
-  integrity sha512-WDUnTV7jje/Ksl3gtaO7ffiB+LW9Ji9bnq0AvD6iOFOeYcrHjZS9t+23b+oP7mRCdXeGv1/AKtchEMY10iyxBA==
+cspell-dict-django@^1.0.21:
+  version "1.0.21"
+  resolved "https://registry.yarnpkg.com/cspell-dict-django/-/cspell-dict-django-1.0.21.tgz#da3a9539e1af7b962a97a1430b6eb90263879c4f"
+  integrity sha512-wUlSbFC5CDYw+2+oGkgn/hI356LK2Q/K6h6GOBHTKGCNm0K6Pqrb0/LUKSC2CmZ/FvnAbuz3A6298ZVzQ5INAg==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-powershell@^1.0.8:
+cspell-dict-dotnet@^1.0.20:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/cspell-dict-dotnet/-/cspell-dict-dotnet-1.0.20.tgz#f033a535d6663a018b1c65dbf4ca3eb19e17d5fa"
+  integrity sha512-+h73Kvr6/w+jRp/6yHDqkV0lIr4HaVfDwVGqbVeefO+VkAass94CYAuu78HvmgvwovsyEpym0JJDMnftZA4o5A==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-elixir@^1.0.19:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/cspell-dict-elixir/-/cspell-dict-elixir-1.0.19.tgz#45faa865792f7021071a06c7f3fd50e29af69f65"
+  integrity sha512-1NtCgvykvAvzXKunQvaZ8UPTkgPFnYyu5thfayWgJXv1PkHtM2TlrwLqypkskj1z8uWDTtQqHH2DES8OOb2Qeg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-en-gb@^1.1.24:
+  version "1.1.24"
+  resolved "https://registry.yarnpkg.com/cspell-dict-en-gb/-/cspell-dict-en-gb-1.1.24.tgz#b8322f036aa280037e85033eb59639cc50c4e7d0"
+  integrity sha512-fF+doyWNV039760WY08aYcTFfLyPo6BSwXN8gWsPWAc17f0uKI2EGEhF8IrR/kTIqdwyt9tRiZdYNZM7suTPKg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-en_us@^1.2.34:
+  version "1.2.34"
+  resolved "https://registry.yarnpkg.com/cspell-dict-en_us/-/cspell-dict-en_us-1.2.34.tgz#27b89a0e120a894ee24f7a7282345bec1765e9be"
+  integrity sha512-BCiAotkU19/a/FJrhfs3C8c16k6QPGb+KIpQ/sJZQFVTI69nxgGvZ3yidBWS+fo1Q4UDx3atiNEE/cmcY6uZAw==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-filetypes@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/cspell-dict-filetypes/-/cspell-dict-filetypes-1.1.1.tgz#be05b6a28e1ec90d421e73e26f30a905a491e6c3"
+  integrity sha512-X313greGPD/2orACD+x86W6rS+C99voSkm4wwbg6ZxmTGPlNV+hTLmY1jgHsjrE3nzL2Uz1//+N+BE6kzQKguQ==
+  dependencies:
+    configstore "^5.0.0"
+
+cspell-dict-fonts@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/cspell-dict-fonts/-/cspell-dict-fonts-1.0.9.tgz#49bf0f796f881f11ffcac07d748b5ba7e8235412"
+  integrity sha512-tm1VxbWEl08p6TcTZqkB3RbIDJjEHgR4Hs0OmGnX8rASgOw1ogcWWMmTCjE+mxcxmY5zcf0F9Vn8BmEvIwdqog==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-fullstack@^1.0.32:
+  version "1.0.32"
+  resolved "https://registry.yarnpkg.com/cspell-dict-fullstack/-/cspell-dict-fullstack-1.0.32.tgz#8f547d1b78aff0c7ca4c6386db3032bdeb2b94c4"
+  integrity sha512-rC0ae/iDI7cYsxNbYjSgrP8s4wye5NxLHsJSR4GBFO5tlDejHPCVzQO04bRcrrz+vkYk74rVQ0nJ2s67dgXv1g==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-golang@^1.1.20:
+  version "1.1.20"
+  resolved "https://registry.yarnpkg.com/cspell-dict-golang/-/cspell-dict-golang-1.1.20.tgz#0544c6932094335a4a37288cfeb830dbc0372800"
+  integrity sha512-9pdJgWTH5TZpZoxcMksJ2dS3EyD0Ur5sHCEMVnDEfA3EU7dZSiNB+uQQET5aGJGupmSJzLrs0Kc9upS1BZzq1w==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-haskell@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.yarnpkg.com/cspell-dict-powershell/-/cspell-dict-powershell-1.0.8.tgz#d3b9afbc3ae449086f8cd453e082a01a1d511f0d"
-  integrity sha512-Kjcx8XeqBoPaCVg/tbaeIImdLwlScpV9FEakV0ZBDqY2FOh6Wle6wYXVcz77+6EK6ChhS+WTqeoo6ft+oQ3c3A==
+  resolved "https://registry.yarnpkg.com/cspell-dict-haskell/-/cspell-dict-haskell-1.0.8.tgz#82b1fcc50ce5d35eb7c74c174a3a52f7a8c8a49d"
+  integrity sha512-JnTbTX4kZGtV7w2wFNWeR+2JlbE/PW7IDeYjJFG+sX9RXcV32MUM4WkV8L4Ucx7GQpSiJOXp1gVyqWrZOvr3Hg==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-python@^1.0.23:
-  version "1.0.23"
-  resolved "https://registry.yarnpkg.com/cspell-dict-python/-/cspell-dict-python-1.0.23.tgz#c8ebbf4fb892bf66483e9b8ff1e1a4a387825a8f"
-  integrity sha512-nO3boMGkoKbek7LCrz75ZwBJmSOasS9bbhCIYkE9VA8hSr4aempKqCXaI/D4cykIOdBX6H8nvbyXyXxgHBmFLw==
+cspell-dict-html-symbol-entities@^1.0.19:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/cspell-dict-html-symbol-entities/-/cspell-dict-html-symbol-entities-1.0.19.tgz#dc65ecdfffb847fb0cd6f3c61bd822f117cc7fc7"
+  integrity sha512-+L2whNDxODc8F3Pjomm6cr+T2rWtC24Aiemkt9ZWe1Jh8BnTQeYMF1oWgMTmiuEPF5rEGlhXADbNfyrSNJI11Q==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-ruby@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cspell-dict-ruby/-/cspell-dict-ruby-1.0.6.tgz#09bc56863f4430087ad1777dfc62ab2ff8e599ca"
-  integrity sha512-KJp1aD6hck+e03Kp3cq1mc4crPya0a+9MFgD+KTuca0cQ8S9KbwB1/s9BylGifedsb41q3gVFmxavdDAxrigTg==
+cspell-dict-html@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/cspell-dict-html/-/cspell-dict-html-1.1.1.tgz#c83f13ada9c484e33153e985637d10ddad8a2831"
+  integrity sha512-v2Lu7M3K7QcW/2A6PCI04IOW/w6MeuuoukYuFxaBKtHW/PWjhjO0PJaGf/XAtccGed+U+2ppSGLL57YREwPMnw==
   dependencies:
-    configstore "^5.0.1"
+    configstore "^5.0.0"
 
-cspell-dict-rust@^1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/cspell-dict-rust/-/cspell-dict-rust-1.0.14.tgz#58bd526599fd5e77d0527ababebba75f45988247"
-  integrity sha512-dLQwl0JCbXJLGegETNBS1QejW/pNkZf4vCeUwChmLRxciESm61QXYFObks1VE4/h8ayxybdN/mfvLMHOFCmhgA==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-scala@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/cspell-dict-scala/-/cspell-dict-scala-1.0.13.tgz#ae040b008cc84646799368fa9d4c5a85f04a013f"
-  integrity sha512-Z4vode68Tl8W1oD8xbkcWa3+Z6UmbLK+CPbYODLpilojtgq6sPdNN6wL9N1bN4NdJ4hUupoU/ZS3xLi+fxL+Eg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-software-terms@^1.0.18:
+cspell-dict-java@^1.0.18:
   version "1.0.18"
-  resolved "https://registry.yarnpkg.com/cspell-dict-software-terms/-/cspell-dict-software-terms-1.0.18.tgz#7a4651d8d758a31da831a477772f5c2d828c6248"
-  integrity sha512-vi3DPagUre2hyQ6n+pTpOe2HLJlIBWaaazKyHG+/KSWH7pkxQHYvic7bRM6W6enDs5hBQIzBSnxKqaGhbleGDA==
+  resolved "https://registry.yarnpkg.com/cspell-dict-java/-/cspell-dict-java-1.0.18.tgz#2330499e601f117694f850f7b788691900faf25b"
+  integrity sha512-wy8BXuV0g4/OHdrOyIpzQL3DfjLRHKwA7S6CCHTAe3EWqLzE3HCOIgfyat/6gxJu8K8GXJ2A3IqFnIXy+wLB1Q==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-typescript@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/cspell-dict-typescript/-/cspell-dict-typescript-1.0.11.tgz#3c9bf77efb342befe0bfb0f86f30cf0cb0bd0982"
-  integrity sha512-w6IUN6jVrW8SsPT8I9isFD9Tca3qRGegk63+SJZrtgAe9gM6c/HKz34VmS0cYhoZRtCFOuWuNXVFW96mSrErWw==
+cspell-dict-latex@^1.0.19:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/cspell-dict-latex/-/cspell-dict-latex-1.0.19.tgz#c7a441b312fc90b82ebb0e0c50eb35a14505de03"
+  integrity sha512-wjFkbEMCrNANN1XZiBn45yngrqCOkwD7Mha4Un7J1FbYI6fVGX1/+TCcwhMeTvJ+mhOo8VIZUazSm8+pPuOJqQ==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-lorem-ipsum@^1.0.18:
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/cspell-dict-lorem-ipsum/-/cspell-dict-lorem-ipsum-1.0.18.tgz#7f16bf50f93b343c12b9ecbeeeaca3b73da8214b"
+  integrity sha512-fTTEhFktvYG1l6x/pss/i/2DX3XdYk/cLUGUpIjvOe6KpfX7Wk6rnYNyazK3fR2CteRrktsvCPbOqroHYHmfYQ==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-lua@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/cspell-dict-lua/-/cspell-dict-lua-1.0.12.tgz#6c3f5d6492ebd27debbe00eb5ece9baa10f3b6a0"
+  integrity sha512-UmXMehOeWXNB7rzZopx0MO1bf8OXsT9ttSfAKklJWZHJrb6/qbGbJ5RDYNuyv7xZvpoMKNZcRJvxup1p3u0aeg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-node@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/cspell-dict-node/-/cspell-dict-node-1.0.5.tgz#8922bcb4bec86f67a1d8b84ed16823deba059c3d"
+  integrity sha512-oNUO0QHm7N/sqWvgh1RIJf/rOlCFfyBGRmK2ecr9lBtt8DhZ+/BU9RM/ZzVuLY69YdZH0Ghjt4+9LGYpd+x3/w==
+  dependencies:
+    configstore "^5.0.0"
+
+cspell-dict-npm@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cspell-dict-npm/-/cspell-dict-npm-1.0.6.tgz#03be3260fd883c7d47bb13404e768f222b01be27"
+  integrity sha512-nyRUfFQIOgMcmkKZeZuNTVUaJj8mozZXYtd+O3f+SRzEj3zhzSeubenoBfQsEg5naNi3bqEsqKjej83bopRdaQ==
+  dependencies:
+    configstore "^5.0.0"
+
+cspell-dict-php@^1.0.19:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/cspell-dict-php/-/cspell-dict-php-1.0.19.tgz#6bfae10f2c413106450a4d12da429cd37a9343eb"
+  integrity sha512-3LSHgtOFVO0lnUIMnOVWeX/rPoK/trOo6TVEIyottKCdB58SCf1/E/Vw+EhLDolvgvVg5qqjTBf4sx8OXI/hCg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-powershell@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/cspell-dict-powershell/-/cspell-dict-powershell-1.0.10.tgz#9d38a519960cb49d14afc0297fa7e6ffa4e5e1cd"
+  integrity sha512-BwY5UiqwIaHz5WjoXnIp53y6xKCbbihewWTYRZjRsYl0MvfiKnZ1wUQWa8DW/W5gKs+OifYSulgmLWy6N4pYug==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-python@^1.0.27:
+  version "1.0.27"
+  resolved "https://registry.yarnpkg.com/cspell-dict-python/-/cspell-dict-python-1.0.27.tgz#8539f7241ca01cf702d15b273b1811efd4100a06"
+  integrity sha512-VHGa7O9RhJd3Ke2eDmMbzzoU6mDsoXPN24YrfXzcJ3OVEPC2giR42KQIn3Iq2JzEMRBQuOMloSlf4w+0KtPOOg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-ruby@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/cspell-dict-ruby/-/cspell-dict-ruby-1.0.8.tgz#a55676f8cb88c0b6265ee8b17fc9d86474d3e11d"
+  integrity sha512-Z/OJce6A5XbwOM2LL8HUkJP8wPNCKRNf2SzyfHqPTUYHfPpyE7MWFLTKxiZWZ6h9J/tfUyjFnyoAD3GxpjFQ3Q==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-rust@^1.0.18:
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/cspell-dict-rust/-/cspell-dict-rust-1.0.18.tgz#ec79f64ee4beed88f397e4b3c6c81748a449ab04"
+  integrity sha512-Jolr/EDhRYHWedTJ6lZmAozi2uojzv3dCyBvkOB0j6RftlVH0Y6NlPCy593KRLgDES3kmtQCXIJCNj1orIj0PA==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-scala@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/cspell-dict-scala/-/cspell-dict-scala-1.0.17.tgz#d35350edd9909f7520c7b2b6f77543246b9a756d"
+  integrity sha512-ULwdZtIRxxJ8SXxfCbteMstKqs+9HIZC25u2oWwLZmK6fdOGcVE4Z/19tz3vEXeGHOg6rqQVcjAcM5BdaNSHsA==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-software-terms@^1.0.19:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/cspell-dict-software-terms/-/cspell-dict-software-terms-1.0.19.tgz#6d8f4b7b07896432c3952c5ed94c02bfeaa099d7"
+  integrity sha512-Q1QSDZ63kkStP1rUgGw9fjfXZ6gyinRoJKNX3nu7o7W/D6u2+ZOz7UMo/Vahu7+zqVKZ/7mxtNjJcbVhhPBMgA==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-typescript@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/cspell-dict-typescript/-/cspell-dict-typescript-1.0.12.tgz#4b102c9c6237217aeddb8099964c6ac12d82a1e0"
+  integrity sha512-EvqdZEbsmEdCR3svx5/HqGHZdYipg31BZeXKJ63mQ3+/cf3RCOMAbKDuvyGcJFpMS87LUr5vBA5sj0Aiaz3MLQ==
   dependencies:
     configstore "^5.0.1"
 
@@ -2682,57 +2682,57 @@ cspell-glob@^0.1.21:
   dependencies:
     micromatch "^4.0.2"
 
-cspell-io@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-4.1.1.tgz#81b6574564d86c62966ad2a18c273f1454d24b7b"
-  integrity sha512-KCdjroahNSQRrev06As05tF/tQ93EwVb06ziCKpEYI7kBt+ZpN3+vqYxJh9pj8TQs52TvZFhNVySR9NS9aDb2g==
+cspell-io@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-4.1.2.tgz#1683cbac336a84187e67bd5f34bd0deb96cfa563"
+  integrity sha512-FLLojKoCweQPYJBsze9KS9wNI8Cvvp84Zt/pwgNdkiqxPADZEsymIZ8U4xFdL3L+/k+LT2KhJZzxjeTI6/zsNA==
   dependencies:
     iconv-lite "^0.6.2"
     iterable-to-stream "^1.0.1"
 
-cspell-lib@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-4.3.0.tgz#f2285613909b6eaa976efd190c2f3036cd6b7cf7"
-  integrity sha512-TkL7nPGOEHeBlPE6t4I2xJYlrPfw5IjpjWzXFkDFV0EWLDjgXZCHReUPjAqsAfkX98U5qXRVx7z7EsGK4fKREA==
+cspell-lib@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-4.3.2.tgz#f1071322b26b4c9ae10c10802b108d01201b4b2a"
+  integrity sha512-d794ObE18mVblT6DSgvvaFaonkvNv4+HmBnR6IALZxd0AsS8AGxZ33t4o9mgcymiATvAzrZvG0u2zL0/onhNhw==
   dependencies:
     comment-json "^4.1.0"
     configstore "^5.0.1"
-    cspell-dict-aws "^1.0.7"
-    cspell-dict-bash "^1.0.5"
-    cspell-dict-companies "^1.0.30"
-    cspell-dict-cpp "^1.1.29"
-    cspell-dict-cryptocurrencies "^1.0.4"
-    cspell-dict-csharp "^1.0.3"
-    cspell-dict-css "^1.0.5"
-    cspell-dict-django "^1.0.17"
-    cspell-dict-dotnet "^1.0.16"
-    cspell-dict-elixir "^1.0.15"
-    cspell-dict-en-gb "^1.1.20"
-    cspell-dict-en_us "^1.2.30"
-    cspell-dict-filetypes "^1.0.3"
-    cspell-dict-fonts "^1.0.7"
-    cspell-dict-fullstack "^1.0.31"
-    cspell-dict-golang "^1.1.16"
-    cspell-dict-haskell "^1.0.6"
-    cspell-dict-html "^1.1.0"
-    cspell-dict-html-symbol-entities "^1.0.15"
-    cspell-dict-java "^1.0.14"
-    cspell-dict-latex "^1.0.15"
-    cspell-dict-lorem-ipsum "^1.0.14"
-    cspell-dict-lua "^1.0.10"
-    cspell-dict-node "^1.0.3"
-    cspell-dict-npm "^1.0.5"
-    cspell-dict-php "^1.0.15"
-    cspell-dict-powershell "^1.0.8"
-    cspell-dict-python "^1.0.23"
-    cspell-dict-ruby "^1.0.6"
-    cspell-dict-rust "^1.0.14"
-    cspell-dict-scala "^1.0.13"
-    cspell-dict-software-terms "^1.0.18"
-    cspell-dict-typescript "^1.0.11"
-    cspell-io "^4.1.1"
+    cspell-dict-aws "^1.0.9"
+    cspell-dict-bash "^1.0.7"
+    cspell-dict-companies "^1.0.31"
+    cspell-dict-cpp "^1.1.33"
+    cspell-dict-cryptocurrencies "^1.0.6"
+    cspell-dict-csharp "^1.0.6"
+    cspell-dict-css "^1.0.6"
+    cspell-dict-django "^1.0.21"
+    cspell-dict-dotnet "^1.0.20"
+    cspell-dict-elixir "^1.0.19"
+    cspell-dict-en-gb "^1.1.24"
+    cspell-dict-en_us "^1.2.34"
+    cspell-dict-filetypes "^1.1.1"
+    cspell-dict-fonts "^1.0.9"
+    cspell-dict-fullstack "^1.0.32"
+    cspell-dict-golang "^1.1.20"
+    cspell-dict-haskell "^1.0.8"
+    cspell-dict-html "^1.1.1"
+    cspell-dict-html-symbol-entities "^1.0.19"
+    cspell-dict-java "^1.0.18"
+    cspell-dict-latex "^1.0.19"
+    cspell-dict-lorem-ipsum "^1.0.18"
+    cspell-dict-lua "^1.0.12"
+    cspell-dict-node "^1.0.5"
+    cspell-dict-npm "^1.0.6"
+    cspell-dict-php "^1.0.19"
+    cspell-dict-powershell "^1.0.10"
+    cspell-dict-python "^1.0.27"
+    cspell-dict-ruby "^1.0.8"
+    cspell-dict-rust "^1.0.18"
+    cspell-dict-scala "^1.0.17"
+    cspell-dict-software-terms "^1.0.19"
+    cspell-dict-typescript "^1.0.12"
+    cspell-io "^4.1.2"
     cspell-trie-lib "^4.2.2"
-    cspell-util-bundle "^4.1.2"
+    cspell-util-bundle "^4.1.4"
     fs-extra "^9.0.1"
     gensequence "^3.1.1"
     minimatch "^3.0.4"
@@ -2746,21 +2746,21 @@ cspell-trie-lib@^4.2.2:
   dependencies:
     gensequence "^3.1.1"
 
-cspell-util-bundle@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/cspell-util-bundle/-/cspell-util-bundle-4.1.2.tgz#9437df20cca3e72b147098eb33bde85a26d3a394"
-  integrity sha512-PozIUa5aWGED09nTOTxGdPULtKnYgIDZ6JjflqAaEeeMnIKWD+w0XkIiiMTpqOszZT2CbzyI7VJZGUr8x5sopQ==
+cspell-util-bundle@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/cspell-util-bundle/-/cspell-util-bundle-4.1.4.tgz#82f758b39572579b08d97aa1d9eedfd2c56f84d3"
+  integrity sha512-97TZTl3lqrKYVu63mf9FdekbqH6CYHRka4nUbRN0mm9bOv4L68ZE2k/DwcRuqWz7Rrc190oKOWV7USVZutgAeQ==
 
-cspell@4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/cspell/-/cspell-4.1.3.tgz#ba316864e65fdad5efb0ef64277630d75ef9570e"
-  integrity sha512-xOoNMswrkubBlGnVs0xcVOjRGLovKYf1y1vtZOUcnGooGTxX7whBkpd02QSTJttDrwPugR/LbuPD7z25gm6fFw==
+cspell@4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/cspell/-/cspell-4.1.5.tgz#cec599568898ccc401b3564dcdcacc8e519b9c2a"
+  integrity sha512-KIVZzQAMtSVsYGeFP5ljXPgbMor1jR49sVkSEHH2MdGFegTyMJZEVkgcwu7pTS0VRI+6O2k06/K3AKOJeK4WSg==
   dependencies:
     chalk "^4.1.0"
     commander "^6.1.0"
     comment-json "^4.0.6"
     cspell-glob "^0.1.21"
-    cspell-lib "^4.3.0"
+    cspell-lib "^4.3.2"
     fs-extra "^9.0.1"
     gensequence "^3.1.1"
     get-stdin "^8.0.0"

From b7dcd9e633ddbf35dd84ecd51ebcf2ecb11ff4db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 15:14:50 +0800
Subject: [PATCH 007/299] Build(deps): Bump @angular/compiler from 10.2.2 to
 10.2.3 (#9631)

Bumps [@angular/compiler](https://github.com/angular/angular/tree/HEAD/packages/compiler) from 10.2.2 to 10.2.3.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/10.2.3/packages/compiler)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c61a6bd75..42e73e81e 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "bin"
   ],
   "dependencies": {
-    "@angular/compiler": "10.2.2",
+    "@angular/compiler": "10.2.3",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.5",
     "@glimmer/syntax": "0.63.4",
diff --git a/yarn.lock b/yarn.lock
index 6976a6a46..bc523369e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/compiler@10.2.2":
-  version "10.2.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-10.2.2.tgz#020377613e23c03448483be304018ab3ebf549fb"
-  integrity sha512-62wb/aj8ORaUyVcI6cxf07gBc3/hb+bVGl9Yni51e8//G2W7gleyQAXtIeZsT9NHi0KX1nKdXvUVwAoq4u7eHw==
+"@angular/compiler@10.2.3":
+  version "10.2.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-10.2.3.tgz#4f2a42d1b479d323118fe33e1e62594d029ed5f9"
+  integrity sha512-Bg+QbyvJVlfGQpJCagEMkkqoRi2LMQc8iuu+cVYVqQOETLO0LxmkPpMQ/7pRLTNWl36PoYEB7IjUkp+qng8xKg==
   dependencies:
     tslib "^2.0.0"
 

From dcbad8a83986604857689f1e0b6bdfd7e0cabbd5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 08:06:50 +0000
Subject: [PATCH 008/299] Build(deps-dev): Bump @glimmer/reference from 0.62.4
 to 0.63.4 (#9634)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++---------------------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index 42e73e81e..c52695502 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.3",
     "@babel/preset-env": "7.12.1",
     "@babel/types": "7.12.6",
-    "@glimmer/reference": "0.62.4",
+    "@glimmer/reference": "0.63.4",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.1",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index bc523369e..7ad29d7d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -894,20 +894,13 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.62.4":
-  version "0.62.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.62.4.tgz#6b942b6ca0d23141a88fe707f7ce6bcac6709336"
-  integrity sha512-F1vD6+zURXOzFKYUL7Dw+zDasfYKpBWt/7GJ8lUVNJ7XOZQQOOeY8Tr29K4ZUrqu3lByTqyBR46gpE8UdbsJ2w==
+"@glimmer/global-context@0.63.4":
+  version "0.63.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.63.4.tgz#84bb38d66274438458f222dd19d0c141d74fe036"
+  integrity sha512-ZffV34JdF7IMB8XNFWWTRug0IO376vrw4cd3xGGyBBPB3tuwM6HtRZ4jVv0IFHJD7zcHqbK8y+eK8BwksEpvzg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.62.4":
-  version "0.62.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.62.4.tgz#e9027d637a0ea80522f29a241aa819e686c623ae"
-  integrity sha512-x3L9YUL17fRgxFrnUvUYTxgnLoh8BipdqkweUEVA5qdIa1dcidUzHUFtWgRiWZ+dKCJBtxh2ubEwjOfgobpMuQ==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.63.4":
   version "0.63.4"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.63.4.tgz#b375b4346b3d67a17a45825a9c90367d2bf167d4"
@@ -915,16 +908,16 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.62.4":
-  version "0.62.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.62.4.tgz#50dbd0d202ca94f73bbcdfe19ce450ca5c6babdc"
-  integrity sha512-oabqcfZrMB8FoVLZqqD4w0cUcWt1/d8uBGtXKGGNLkrV2smPFJO/rcfFpZq8alMgzqII5F9Q57gRL+qh0AD8og==
+"@glimmer/reference@0.63.4":
+  version "0.63.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.63.4.tgz#3389d74835c10c6df0b7ae223c2f27ac35f44b3f"
+  integrity sha512-4JAWgPXxlD/DCJ2p99e+OPNwEg/FXquv+gk2LXWXzAPb9u5o0GlNaI3liaaC8EB71Mo/+8/8Dx90MsgSRAjNIg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.62.4"
-    "@glimmer/interfaces" "0.62.4"
-    "@glimmer/util" "0.62.4"
-    "@glimmer/validator" "0.62.4"
+    "@glimmer/global-context" "0.63.4"
+    "@glimmer/interfaces" "0.63.4"
+    "@glimmer/util" "0.63.4"
+    "@glimmer/validator" "0.63.4"
 
 "@glimmer/syntax@0.63.4":
   version "0.63.4"
@@ -936,15 +929,6 @@
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.62.4":
-  version "0.62.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.62.4.tgz#2e33dd2a8e3e81f5ffc8325fdc9bebb0e274c421"
-  integrity sha512-7x04I4mQpxveAoEbpFfXFFkYpuJoATHuGdwPjgcQc0nSjAkGDkzIMlRN3stgZAz32eSVj9n7SOXHVtHEhw3cCg==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.62.4"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.63.4":
   version "0.63.4"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.63.4.tgz#e051a5b03eb5a04a58a9d393fcd37f25b533c2ab"
@@ -954,13 +938,13 @@
     "@glimmer/interfaces" "0.63.4"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.62.4":
-  version "0.62.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.62.4.tgz#80570d3fbf9c9a9e6a50e5c022a073da24d14d85"
-  integrity sha512-yZ3cfvbW/S3kAu/EDFCxqMrOp4lWiZ5QxKiDej+GVkuz8yirYVBkf1vZnxogmDyCWLZGvmTr/7QimvQZSHQxVw==
+"@glimmer/validator@0.63.4":
+  version "0.63.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.63.4.tgz#703b4b6011ca41e1b2c7624baf457ad4af7e97d7"
+  integrity sha512-LCaA/lIPDh0yRN7lrBEmvJAZEq32KdMHdKXO4QPU4pEx05JGNxeIvp/WPjxz6MWTydbuCnupu5dKunAx2Pc4xQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.62.4"
+    "@glimmer/global-context" "0.63.4"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From 13c88511da5cd4cba2df40d66b62ea05c4464314 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 11 Nov 2020 10:02:47 +0800
Subject: [PATCH 009/299] Refactor: Add `getCallArguments` and
 `iterateCallArgumentsPath` (#9608)

---
 src/language-js/print/call-arguments.js | 26 ++++++++--------------
 src/language-js/printer-estree.js       | 16 +++++++-------
 src/language-js/utils.js                | 29 +++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/src/language-js/print/call-arguments.js b/src/language-js/print/call-arguments.js
index e36d2d694..0561f1b8b 100644
--- a/src/language-js/print/call-arguments.js
+++ b/src/language-js/print/call-arguments.js
@@ -15,6 +15,8 @@ const {
   isJSXNode,
   isLongCurriedCallExpression,
   shouldPrintComma,
+  getCallArguments,
+  iterateCallArgumentsPath,
 } = require("../utils");
 const { locEnd } = require("../loc");
 
@@ -36,8 +38,8 @@ const {
 function printCallArguments(path, options, print) {
   const node = path.getValue();
   const isDynamicImport = node.type === "ImportExpression";
-  const args = isDynamicImport ? [node.source] : node.arguments;
 
+  const args = getCallArguments(node);
   if (args.length === 0) {
     return concat([
       "(",
@@ -94,7 +96,8 @@ function printCallArguments(path, options, print) {
   let shouldBreakForArrowFunction = false;
   let hasEmptyLineFollowingFirstArg = false;
   const lastArgIndex = args.length - 1;
-  const printArgument = (argPath, index) => {
+  const printedArguments = [];
+  iterateCallArgumentsPath(path, (argPath, index) => {
     const arg = argPath.getNode();
     const parts = [print(argPath)];
 
@@ -116,11 +119,8 @@ function printCallArguments(path, options, print) {
       argPath
     );
 
-    return concat(parts);
-  };
-  const printedArguments = isDynamicImport
-    ? [path.call((path) => printArgument(path, 0), "source")]
-    : path.map(printArgument, "arguments");
+    printedArguments.push(concat(parts));
+  });
 
   const maybeTrailingComma =
     // Dynamic imports cannot have trailing commas
@@ -161,8 +161,7 @@ function printCallArguments(path, options, print) {
 
     // We want to print the last argument with a special flag
     let printedExpanded = [];
-    let i = 0;
-    const printArgument = (argPath) => {
+    iterateCallArgumentsPath(path, (argPath, i) => {
       if (shouldGroupFirst && i === 0) {
         printedExpanded = [
           concat([
@@ -178,14 +177,7 @@ function printCallArguments(path, options, print) {
           .slice(0, -1)
           .concat(argPath.call((p) => print(p, { expandLastArg: true })));
       }
-      i++;
-    };
-
-    if (isDynamicImport) {
-      path.call(printArgument, "source");
-    } else {
-      path.each(printArgument, "arguments");
-    }
+    });
 
     const somePrintedArgumentsWillBreak = printedArguments.some(willBreak);
 
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index add0da277..b98856f8a 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -53,6 +53,8 @@ const {
   classChildNeedsASIProtection,
   classPropMayCauseASIProblems,
   getFunctionParameters,
+  getCallArguments,
+  iterateCallArgumentsPath,
   getLeftSidePathName,
   getParentExportDeclaration,
   getTypeScriptMappedTypeModifier,
@@ -966,7 +968,7 @@ function printPathNoParens(path, options, print, args) {
       const isDynamicImport = n.type === "ImportExpression";
 
       const optional = printOptionalToken(path);
-      const args = isDynamicImport ? [n.source] : n.arguments;
+      const args = getCallArguments(n);
       if (
         // We want to keep CommonJS- and AMD-style require calls, and AMD-style
         // define calls, as a unit.
@@ -982,18 +984,16 @@ function printPathNoParens(path, options, print, args) {
         // e.g. `it('long name', () => {`
         (!isNew && isTestCall(n, path.getParentNode()))
       ) {
+        const printed = [];
+        iterateCallArgumentsPath(path, (argPath) => {
+          printed.push(print(argPath));
+        });
         return concat([
           isNew ? "new " : "",
           path.call(print, "callee"),
           optional,
           printFunctionTypeParameters(path, options, print),
-          concat([
-            "(",
-            isDynamicImport
-              ? path.call(print, "source")
-              : join(", ", path.map(print, "arguments")),
-            ")",
-          ]),
+          concat(["(", join(", ", printed), ")"]),
         ]);
       }
 
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index d5564efba..412c5d09e 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -1446,6 +1446,33 @@ function iterateFunctionParametersPath(path, iteratee) {
   }
 }
 
+const callArgumentsCache = new WeakMap();
+function getCallArguments(node) {
+  if (callArgumentsCache.has(node)) {
+    return callArgumentsCache.get(node);
+  }
+  const args =
+    node.type === "ImportExpression"
+      ? // No parser except `babel` supports `import("./foo.json", { assert: { type: "json" } })` yet,
+        // And `babel` parser it as `CallExpression`
+        // We need add the second argument here
+        [node.source]
+      : node.arguments;
+
+  callArgumentsCache.set(node, args);
+  return args;
+}
+
+function iterateCallArgumentsPath(path, iteratee) {
+  const node = path.getValue();
+  // See comment in `getCallArguments`
+  if (node.type === "ImportExpression") {
+    path.call((sourcePath) => iteratee(sourcePath, 0), "source");
+  } else {
+    path.each(iteratee, "arguments");
+  }
+}
+
 function isPrettierIgnoreComment(comment) {
   return comment.value.trim() === "prettier-ignore";
 }
@@ -1472,6 +1499,8 @@ module.exports = {
   classPropMayCauseASIProblems,
   getFunctionParameters,
   iterateFunctionParametersPath,
+  getCallArguments,
+  iterateCallArgumentsPath,
   hasRestParameter,
   getLeftSidePathName,
   getParentExportDeclaration,

From 6b9c223ced225beae4693b042fe182eb166efe55 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 11 Nov 2020 13:39:39 +0800
Subject: [PATCH 010/299] DRY `FastPath` (#9617)

---
 src/common/fast-path.js | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/common/fast-path.js b/src/common/fast-path.js
index 2b14c7ff2..e2959d3af 100644
--- a/src/common/fast-path.js
+++ b/src/common/fast-path.js
@@ -77,7 +77,7 @@ class FastPath {
   }
 
   // Similar to FastPath.prototype.call, except that the value obtained by
-  // accessing this.getValue()[name1][name2]... should be array-like. The
+  // accessing this.getValue()[name1][name2]... should be array. The
   // callback will be called with a reference to this path object for each
   // element of the array.
   each(callback, ...names) {
@@ -91,11 +91,9 @@ class FastPath {
     }
 
     for (let i = 0; i < value.length; ++i) {
-      if (i in value) {
-        stack.push(i, value[i]);
-        callback(this, i);
-        stack.length -= 2;
-      }
+      stack.push(i, value[i]);
+      callback(this, i);
+      stack.length -= 2;
     }
 
     stack.length = length;
@@ -105,27 +103,10 @@ class FastPath {
   // callback function invocations are stored in an array and returned at
   // the end of the iteration.
   map(callback, ...names) {
-    const { stack } = this;
-    const { length } = stack;
-    let value = getLast(stack);
-
-    for (const name of names) {
-      value = value[name];
-      stack.push(name, value);
-    }
-
-    const result = new Array(value.length);
-
-    for (let i = 0; i < value.length; ++i) {
-      if (i in value) {
-        stack.push(i, value[i]);
-        result[i] = callback(this, i);
-        stack.length -= 2;
-      }
-    }
-
-    stack.length = length;
-
+    const result = [];
+    this.each((path, index) => {
+      result[index] = callback(path, index);
+    }, ...names);
     return result;
   }
 

From 044f0f76dcbc8f81499dfd0238cc7733af82cd91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Nov 2020 05:42:10 +0000
Subject: [PATCH 011/299] Build(deps-dev): Bump babel-loader from 8.1.0 to
 8.2.1 in /website (#9637)

---
 website/package.json |  2 +-
 website/yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/website/package.json b/website/package.json
index 5660dd285..a9c58a5ce 100644
--- a/website/package.json
+++ b/website/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@babel/preset-react": "7.12.5",
     "@sandhose/prettier-animated-logo": "1.0.3",
-    "babel-loader": "8.1.0",
+    "babel-loader": "8.2.1",
     "concurrently": "5.3.0",
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.0",
diff --git a/website/yarn.lock b/website/yarn.lock
index a5cbada72..d8a0305ba 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1525,14 +1525,14 @@ babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-loader@8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
-  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+babel-loader@8.2.1:
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.1.tgz#e53313254677e86f27536f5071d807e01d24ec00"
+  integrity sha512-dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==
   dependencies:
     find-cache-dir "^2.1.0"
     loader-utils "^1.4.0"
-    mkdirp "^0.5.3"
+    make-dir "^2.1.0"
     pify "^4.0.1"
     schema-utils "^2.6.5"
 
@@ -4867,7 +4867,7 @@ mixin-deep@^1.1.3, mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz#5a514b7179259287952881e94410ec5465659f8c"
   integrity sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==

From 6854d67421fb3ee4a5b87b53bdce9679cf11ff34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Nov 2020 06:03:52 +0000
Subject: [PATCH 012/299] Build(deps): Bump @glimmer/syntax from 0.63.4 to
 0.63.5 (#9640)

---
 package.json |  2 +-
 yarn.lock    | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index c52695502..01c730dd4 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "10.2.3",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.5",
-    "@glimmer/syntax": "0.63.4",
+    "@glimmer/syntax": "0.63.5",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "3.10.1",
     "angular-estree-parser": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index 7ad29d7d8..fe4863201 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -908,6 +908,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.63.5.tgz#ac614608ea618022b61b5d09e66089ceffc26e6e"
+  integrity sha512-ogozdIFOSxJ2QBU2NE0pk993qbb/zY1wF4BFL1ZN2GrfDDdaYC5vmDSs+RpbbF6JAjrt4kADXlOocs7dBiX4iQ==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/reference@0.63.4":
   version "0.63.4"
   resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.63.4.tgz#3389d74835c10c6df0b7ae223c2f27ac35f44b3f"
@@ -919,13 +926,13 @@
     "@glimmer/util" "0.63.4"
     "@glimmer/validator" "0.63.4"
 
-"@glimmer/syntax@0.63.4":
-  version "0.63.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.63.4.tgz#87598c50b097ff6beea4e1611549577050d922c5"
-  integrity sha512-ndt2ujQHe8bnwv/x8JpAEBqzWvXClqnevNqlAyywTZR4/ur0SYayFRdN9kI3qzRzX6Psc7lxCAqwp8QyKpUbiQ==
+"@glimmer/syntax@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.63.5.tgz#38ef6e41d9da3474ebc5d704c0e9743367de728e"
+  integrity sha512-w0/X7jQ5tzO6KevzeP1QBEfS2qjc897JlQa+9eMcFkxRxZCH4IVUjyxeRuu9cY0uV16ByVBTFh9fcGPfgaYULQ==
   dependencies:
-    "@glimmer/interfaces" "0.63.4"
-    "@glimmer/util" "0.63.4"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/util" "0.63.5"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
@@ -938,6 +945,15 @@
     "@glimmer/interfaces" "0.63.4"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.63.5.tgz#8f2ed10269fcf6ccaf4cc0338915cc618ed845d0"
+  integrity sha512-9eTXOx3l6N1YySBMe1Vb/F+SGuztgObQCoEVtvxUZ7VB37xTaaUEoZfQVQJyBizFIKIAOvXBhPYCT+cERvN7kw==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.63.5"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.63.4":
   version "0.63.4"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.63.4.tgz#703b4b6011ca41e1b2c7624baf457ad4af7e97d7"

From f86d34ef6c4878ac444d9c8a9a7a7973d340d006 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Nov 2020 07:55:33 +0000
Subject: [PATCH 013/299] Build(deps-dev): Bump @glimmer/reference from 0.63.4
 to 0.63.5 (#9639)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++---------------------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index 01c730dd4..fdf11bf18 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.3",
     "@babel/preset-env": "7.12.1",
     "@babel/types": "7.12.6",
-    "@glimmer/reference": "0.63.4",
+    "@glimmer/reference": "0.63.5",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.1",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index fe4863201..b9a2738b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -894,20 +894,13 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.63.4":
-  version "0.63.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.63.4.tgz#84bb38d66274438458f222dd19d0c141d74fe036"
-  integrity sha512-ZffV34JdF7IMB8XNFWWTRug0IO376vrw4cd3xGGyBBPB3tuwM6HtRZ4jVv0IFHJD7zcHqbK8y+eK8BwksEpvzg==
+"@glimmer/global-context@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.63.5.tgz#4a8da4fee97d13a376549ceecebd16a5ffc8c4f6"
+  integrity sha512-xYsptoxo9ROos83oxG8ZT4e8T2QgsH+FdZxsPZNTN4WLumU2LTkxJQaiosW9q294IVY/mIVhZAohJkfNCvSwug==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.63.4":
-  version "0.63.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.63.4.tgz#b375b4346b3d67a17a45825a9c90367d2bf167d4"
-  integrity sha512-XpKKJVqVE9JUcAqEHUu0lwJQZnv3gHPZ93o/xDdyUqnSokipeToHJzehRrhIkknSaiKKyu624fvk0dakQaS5ow==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.63.5":
   version "0.63.5"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.63.5.tgz#ac614608ea618022b61b5d09e66089ceffc26e6e"
@@ -915,16 +908,16 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.63.4":
-  version "0.63.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.63.4.tgz#3389d74835c10c6df0b7ae223c2f27ac35f44b3f"
-  integrity sha512-4JAWgPXxlD/DCJ2p99e+OPNwEg/FXquv+gk2LXWXzAPb9u5o0GlNaI3liaaC8EB71Mo/+8/8Dx90MsgSRAjNIg==
+"@glimmer/reference@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.63.5.tgz#bc99049c9400994641dea054e58bff61e1e31187"
+  integrity sha512-uE5O5eFcaKedomCDfendXjA7Sh9MYZG5RhadSSA8iD6TUlXxdpIe++tcRzNQOcMwHNbh+Bx7jX50jxtA1ShibQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.63.4"
-    "@glimmer/interfaces" "0.63.4"
-    "@glimmer/util" "0.63.4"
-    "@glimmer/validator" "0.63.4"
+    "@glimmer/global-context" "0.63.5"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/util" "0.63.5"
+    "@glimmer/validator" "0.63.5"
 
 "@glimmer/syntax@0.63.5":
   version "0.63.5"
@@ -936,15 +929,6 @@
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.63.4":
-  version "0.63.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.63.4.tgz#e051a5b03eb5a04a58a9d393fcd37f25b533c2ab"
-  integrity sha512-D102O0wRdPn6KOHFZ3+GAKj+Wxaou0KMxePspu5lPD9bQYGd7z+epqpRxpYGb5vbZCg8nTT28+qUU5yMh6NpCA==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.63.4"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.63.5":
   version "0.63.5"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.63.5.tgz#8f2ed10269fcf6ccaf4cc0338915cc618ed845d0"
@@ -954,13 +938,13 @@
     "@glimmer/interfaces" "0.63.5"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.63.4":
-  version "0.63.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.63.4.tgz#703b4b6011ca41e1b2c7624baf457ad4af7e97d7"
-  integrity sha512-LCaA/lIPDh0yRN7lrBEmvJAZEq32KdMHdKXO4QPU4pEx05JGNxeIvp/WPjxz6MWTydbuCnupu5dKunAx2Pc4xQ==
+"@glimmer/validator@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.63.5.tgz#8d196f1f29191c5ecd60ea5c87d1081f68dff840"
+  integrity sha512-+/YHIKrspDrqnAz4hE+VgIL2O6tZPxKA9KfI5syDcr+zxQeLjC/7ng6AK2g6+w8nHoS5WOABbA/gpH+wTV6ulQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.63.4"
+    "@glimmer/global-context" "0.63.5"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From b5aab4006d689be1fc1514bd6b056d54524b9e11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Nov 2020 19:13:14 +0800
Subject: [PATCH 014/299] Build(deps-dev): Bump babel-loader from 8.1.0 to
 8.2.1 (#9638)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index fdf11bf18..356959c6a 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "@types/node": "14.14.0",
     "@typescript-eslint/types": "3.10.1",
     "babel-jest": "26.6.3",
-    "babel-loader": "8.1.0",
+    "babel-loader": "8.2.1",
     "benchmark": "2.1.4",
     "builtin-modules": "3.1.0",
     "cross-env": "7.0.2",
diff --git a/yarn.lock b/yarn.lock
index b9a2738b0..9ee514fd6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1933,14 +1933,14 @@ babel-jest@26.6.3, babel-jest@^26.6.3:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
-babel-loader@8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
-  integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==
+babel-loader@8.2.1:
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.1.tgz#e53313254677e86f27536f5071d807e01d24ec00"
+  integrity sha512-dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==
   dependencies:
     find-cache-dir "^2.1.0"
     loader-utils "^1.4.0"
-    mkdirp "^0.5.3"
+    make-dir "^2.1.0"
     pify "^4.0.1"
     schema-utils "^2.6.5"
 
@@ -5209,7 +5209,7 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
-make-dir@^2.0.0:
+make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
   integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
@@ -5352,7 +5352,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.1, mkdirp@^0.5.3:
+mkdirp@^0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==

From 46a3213ec89784a600ef7ddf5004e03f3b7f66b1 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 13 Nov 2020 00:07:31 +0800
Subject: [PATCH 015/299] Extract `printTemplateLiteral` (#9646)

---
 src/language-js/print/template-literal.js | 193 ++++++++++++++++++++++
 src/language-js/printer-estree.js         | 172 +------------------
 2 files changed, 195 insertions(+), 170 deletions(-)
 create mode 100644 src/language-js/print/template-literal.js

diff --git a/src/language-js/print/template-literal.js b/src/language-js/print/template-literal.js
new file mode 100644
index 000000000..5be829211
--- /dev/null
+++ b/src/language-js/print/template-literal.js
@@ -0,0 +1,193 @@
+"use strict";
+
+const { getStringWidth, getIndentSize } = require("../../common/util");
+const {
+  builders: {
+    concat,
+    join,
+    hardline,
+    softline,
+    group,
+    indent,
+    align,
+    lineSuffixBoundary,
+    addAlignmentToDoc,
+  },
+  printer: { printDocToString },
+} = require("../../document");
+const {
+  isBinaryish,
+  isJestEachTemplateLiteral,
+  isSimpleTemplateLiteral,
+} = require("../utils");
+
+function printTemplateLiteral(path, print, options) {
+  const node = path.getValue();
+  const parentNode = path.getParentNode();
+
+  if (isJestEachTemplateLiteral(node, parentNode)) {
+    const printed = printJestEachTemplateLiteral(path, options, print);
+    if (printed) {
+      return printed;
+    }
+  }
+  const parts = [];
+
+  let expressions = path.map(print, "expressions");
+  const isSimple = isSimpleTemplateLiteral(node);
+
+  if (isSimple) {
+    expressions = expressions.map(
+      (doc) =>
+        printDocToString(doc, { ...options, printWidth: Infinity }).formatted
+    );
+  }
+
+  parts.push(lineSuffixBoundary, "`");
+
+  path.each((childPath) => {
+    const i = childPath.getName();
+
+    parts.push(print(childPath));
+
+    if (i < expressions.length) {
+      // For a template literal of the following form:
+      //   `someQuery {
+      //     ${call({
+      //       a,
+      //       b,
+      //     })}
+      //   }`
+      // the expression is on its own line (there is a \n in the previous
+      // quasi literal), therefore we want to indent the JavaScript
+      // expression inside at the beginning of ${ instead of the beginning
+      // of the `.
+      const { tabWidth } = options;
+      const quasi = childPath.getValue();
+      const indentSize = getIndentSize(quasi.value.raw, tabWidth);
+
+      let printed = expressions[i];
+
+      if (!isSimple) {
+        const expression = node.expressions[i];
+        // Breaks at the template element boundaries (${ and }) are preferred to breaking
+        // in the middle of a MemberExpression
+        if (
+          (expression.comments && expression.comments.length) ||
+          expression.type === "MemberExpression" ||
+          expression.type === "OptionalMemberExpression" ||
+          expression.type === "ConditionalExpression" ||
+          expression.type === "SequenceExpression" ||
+          expression.type === "TSAsExpression" ||
+          isBinaryish(expression)
+        ) {
+          printed = concat([indent(concat([softline, printed])), softline]);
+        }
+      }
+
+      const aligned =
+        indentSize === 0 && quasi.value.raw.endsWith("\n")
+          ? align(-Infinity, printed)
+          : addAlignmentToDoc(printed, indentSize, tabWidth);
+
+      parts.push(group(concat(["${", aligned, lineSuffixBoundary, "}"])));
+    }
+  }, "quasis");
+
+  parts.push("`");
+
+  return concat(parts);
+}
+
+function printJestEachTemplateLiteral(path, options, print) {
+  /**
+   * a    | b    | expected
+   * ${1} | ${1} | ${2}
+   * ${1} | ${2} | ${3}
+   * ${2} | ${1} | ${3}
+   */
+  const node = path.getNode();
+  const headerNames = node.quasis[0].value.raw.trim().split(/\s*\|\s*/);
+  if (
+    headerNames.length > 1 ||
+    headerNames.some((headerName) => headerName.length !== 0)
+  ) {
+    options.__inJestEach = true;
+    const expressions = path.map(print, "expressions");
+    options.__inJestEach = false;
+    const parts = [];
+    const stringifiedExpressions = expressions.map(
+      (doc) =>
+        "${" +
+        printDocToString(doc, {
+          ...options,
+          printWidth: Infinity,
+          endOfLine: "lf",
+        }).formatted +
+        "}"
+    );
+
+    const tableBody = [{ hasLineBreak: false, cells: [] }];
+    for (let i = 1; i < node.quasis.length; i++) {
+      const row = tableBody[tableBody.length - 1];
+      const correspondingExpression = stringifiedExpressions[i - 1];
+
+      row.cells.push(correspondingExpression);
+      if (correspondingExpression.includes("\n")) {
+        row.hasLineBreak = true;
+      }
+
+      if (node.quasis[i].value.raw.includes("\n")) {
+        tableBody.push({ hasLineBreak: false, cells: [] });
+      }
+    }
+
+    const maxColumnCount = Math.max(
+      headerNames.length,
+      ...tableBody.map((row) => row.cells.length)
+    );
+
+    const maxColumnWidths = Array.from({ length: maxColumnCount }).fill(0);
+    const table = [
+      { cells: headerNames },
+      ...tableBody.filter((row) => row.cells.length !== 0),
+    ];
+    for (const { cells } of table.filter((row) => !row.hasLineBreak)) {
+      cells.forEach((cell, index) => {
+        maxColumnWidths[index] = Math.max(
+          maxColumnWidths[index],
+          getStringWidth(cell)
+        );
+      });
+    }
+
+    parts.push(
+      lineSuffixBoundary,
+      "`",
+      indent(
+        concat([
+          hardline,
+          join(
+            hardline,
+            table.map((row) =>
+              join(
+                " | ",
+                row.cells.map((cell, index) =>
+                  row.hasLineBreak
+                    ? cell
+                    : cell +
+                      " ".repeat(maxColumnWidths[index] - getStringWidth(cell))
+                )
+              )
+            )
+          ),
+        ])
+      ),
+      hardline,
+      "`"
+    );
+    return concat(parts);
+  }
+}
+
+module.exports = printTemplateLiteral;
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index b98856f8a..9f6c22578 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -11,10 +11,8 @@ const {
   hasNewline,
   hasNewlineInRange,
   getLast,
-  getStringWidth,
   printString,
   printNumber,
-  getIndentSize,
   getPreferredQuote,
   isNextLineEmpty,
   getNextNonSpaceNonCommentCharacterIndex,
@@ -34,10 +32,8 @@ const {
     fill,
     ifBreak,
     lineSuffixBoundary,
-    addAlignmentToDoc,
   },
   utils: { willBreak, isLineNext, isEmpty, normalizeParts },
-  printer: { printDocToString },
 } = require("../document");
 const embed = require("./embed");
 const clean = require("./clean");
@@ -78,7 +74,6 @@ const {
   isFlowAnnotationComment,
   isFunctionNotation,
   isGetterOrSetter,
-  isJestEachTemplateLiteral,
   isJSXNode,
   isJSXWhitespaceExpression,
   isLastStatement,
@@ -92,7 +87,6 @@ const {
   isObjectTypePropertyAFunction,
   isSimpleType,
   isSimpleNumber,
-  isSimpleTemplateLiteral,
   isStringLiteral,
   isStringPropSafeToUnquote,
   isTemplateOnItsOwnLine,
@@ -129,6 +123,7 @@ const {
   printFunctionParameters,
   shouldHugFunctionParameters,
 } = require("./print/function-parameters");
+const printTemplateLiteral = require("./print/template-literal");
 
 const needsQuoteProps = new WeakMap();
 
@@ -2233,79 +2228,7 @@ function printPathNoParens(path, options, print, args) {
     case "TemplateElement":
       return join(literalline, n.value.raw.split(/\r?\n/g));
     case "TemplateLiteral": {
-      const parentNode = path.getParentNode();
-
-      if (isJestEachTemplateLiteral(n, parentNode)) {
-        const printed = printJestEachTemplateLiteral(path, options, print);
-        if (printed) {
-          return printed;
-        }
-      }
-
-      let expressions = path.map(print, "expressions");
-      const isSimple = isSimpleTemplateLiteral(n);
-
-      if (isSimple) {
-        expressions = expressions.map(
-          (doc) =>
-            printDocToString(doc, { ...options, printWidth: Infinity })
-              .formatted
-        );
-      }
-
-      parts.push(lineSuffixBoundary, "`");
-
-      path.each((childPath) => {
-        const i = childPath.getName();
-
-        parts.push(print(childPath));
-
-        if (i < expressions.length) {
-          // For a template literal of the following form:
-          //   `someQuery {
-          //     ${call({
-          //       a,
-          //       b,
-          //     })}
-          //   }`
-          // the expression is on its own line (there is a \n in the previous
-          // quasi literal), therefore we want to indent the JavaScript
-          // expression inside at the beginning of ${ instead of the beginning
-          // of the `.
-          const { tabWidth } = options;
-          const quasi = childPath.getValue();
-          const indentSize = getIndentSize(quasi.value.raw, tabWidth);
-
-          let printed = expressions[i];
-
-          if (!isSimple) {
-            // Breaks at the template element boundaries (${ and }) are preferred to breaking
-            // in the middle of a MemberExpression
-            if (
-              (n.expressions[i].comments && n.expressions[i].comments.length) ||
-              n.expressions[i].type === "MemberExpression" ||
-              n.expressions[i].type === "OptionalMemberExpression" ||
-              n.expressions[i].type === "ConditionalExpression" ||
-              n.expressions[i].type === "SequenceExpression" ||
-              n.expressions[i].type === "TSAsExpression" ||
-              isBinaryish(n.expressions[i])
-            ) {
-              printed = concat([indent(concat([softline, printed])), softline]);
-            }
-          }
-
-          const aligned =
-            indentSize === 0 && quasi.value.raw.endsWith("\n")
-              ? align(-Infinity, printed)
-              : addAlignmentToDoc(printed, indentSize, tabWidth);
-
-          parts.push(group(concat(["${", aligned, lineSuffixBoundary, "}"])));
-        }
-      }, "quasis");
-
-      parts.push("`");
-
-      return concat(parts);
+      return printTemplateLiteral(path, print, options);
     }
     case "TaggedTemplateExpression":
       return concat([
@@ -3757,97 +3680,6 @@ function printMethodInternal(path, options, print) {
   return concat(parts);
 }
 
-function printJestEachTemplateLiteral(path, options, print) {
-  /**
-   * a    | b    | expected
-   * ${1} | ${1} | ${2}
-   * ${1} | ${2} | ${3}
-   * ${2} | ${1} | ${3}
-   */
-  const node = path.getNode();
-  const headerNames = node.quasis[0].value.raw.trim().split(/\s*\|\s*/);
-  if (
-    headerNames.length > 1 ||
-    headerNames.some((headerName) => headerName.length !== 0)
-  ) {
-    options.__inJestEach = true;
-    const expressions = path.map(print, "expressions");
-    options.__inJestEach = false;
-    const parts = [];
-    const stringifiedExpressions = expressions.map(
-      (doc) =>
-        "${" +
-        printDocToString(doc, {
-          ...options,
-          printWidth: Infinity,
-          endOfLine: "lf",
-        }).formatted +
-        "}"
-    );
-
-    const tableBody = [{ hasLineBreak: false, cells: [] }];
-    for (let i = 1; i < node.quasis.length; i++) {
-      const row = tableBody[tableBody.length - 1];
-      const correspondingExpression = stringifiedExpressions[i - 1];
-
-      row.cells.push(correspondingExpression);
-      if (correspondingExpression.includes("\n")) {
-        row.hasLineBreak = true;
-      }
-
-      if (node.quasis[i].value.raw.includes("\n")) {
-        tableBody.push({ hasLineBreak: false, cells: [] });
-      }
-    }
-
-    const maxColumnCount = Math.max(
-      headerNames.length,
-      ...tableBody.map((row) => row.cells.length)
-    );
-
-    const maxColumnWidths = Array.from({ length: maxColumnCount }).fill(0);
-    const table = [
-      { cells: headerNames },
-      ...tableBody.filter((row) => row.cells.length !== 0),
-    ];
-    for (const { cells } of table.filter((row) => !row.hasLineBreak)) {
-      cells.forEach((cell, index) => {
-        maxColumnWidths[index] = Math.max(
-          maxColumnWidths[index],
-          getStringWidth(cell)
-        );
-      });
-    }
-
-    parts.push(
-      lineSuffixBoundary,
-      "`",
-      indent(
-        concat([
-          hardline,
-          join(
-            hardline,
-            table.map((row) =>
-              join(
-                " | ",
-                row.cells.map((cell, index) =>
-                  row.hasLineBreak
-                    ? cell
-                    : cell +
-                      " ".repeat(maxColumnWidths[index] - getStringWidth(cell))
-                )
-              )
-            )
-          ),
-        ])
-      ),
-      hardline,
-      "`"
-    );
-    return concat(parts);
-  }
-}
-
 function printTypeAnnotation(path, options, print) {
   const node = path.getValue();
   if (!node.typeAnnotation) {

From d0f813e5d432c7f3baaabc1b038d3b897567056b Mon Sep 17 00:00:00 2001
From: Brian Kim <briankimpossible@gmail.com>
Date: Thu, 12 Nov 2020 19:49:15 -0500
Subject: [PATCH 016/299] =?UTF-8?q?Revert=20#9011,=20don=E2=80=99t=20add?=
 =?UTF-8?q?=20parens=20when=20yielding=20simple=20JSX=20expressions=20(#96?=
 =?UTF-8?q?50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog_unreleased/javascript/pr-9650.md      | 17 +++++++++++++++++
 src/language-js/needs-parens.js                 |  3 ++-
 tests/js/yield/__snapshots__/jsfmt.spec.js.snap |  4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 changelog_unreleased/javascript/pr-9650.md

diff --git a/changelog_unreleased/javascript/pr-9650.md b/changelog_unreleased/javascript/pr-9650.md
new file mode 100644
index 000000000..0cb7db6a2
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-9650.md
@@ -0,0 +1,17 @@
+#### Fix formatting of yielded JSX expressions (#9650 by @brainkim)
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+function* f() {
+  yield <div>generator</div>
+}
+// Prettier stable
+function* f() {
+  yield (<div>generator</div>);
+}
+// Prettier master
+function* f() {
+  yield <div>generator</div>;
+}
+```
diff --git a/src/language-js/needs-parens.js b/src/language-js/needs-parens.js
index a30c38144..044b010ba 100644
--- a/src/language-js/needs-parens.js
+++ b/src/language-js/needs-parens.js
@@ -725,7 +725,8 @@ function needsParens(path, options) {
           parent.type !== "ReturnStatement" &&
           parent.type !== "ThrowStatement" &&
           parent.type !== "TypeCastExpression" &&
-          parent.type !== "VariableDeclarator")
+          parent.type !== "VariableDeclarator" &&
+          parent.type !== "YieldExpression")
       );
     case "TypeAnnotation":
       return (
diff --git a/tests/js/yield/__snapshots__/jsfmt.spec.js.snap b/tests/js/yield/__snapshots__/jsfmt.spec.js.snap
index a2425bb19..67e013e3b 100644
--- a/tests/js/yield/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/yield/__snapshots__/jsfmt.spec.js.snap
@@ -96,7 +96,7 @@ function* f() {
 
 =====================================output=====================================
 function* f() {
-  yield (<div>generator</div>);
+  yield <div>generator</div>;
   yield (
     <div>
       <p>generator</p>
@@ -120,7 +120,7 @@ function* f() {
 
 =====================================output=====================================
 function* f() {
-  yield (<div>generator</div>);
+  yield <div>generator</div>;
   yield (
     <div>
       <p>generator</p>

From 28d914b811e085be100c1a6609d1676885d8e05b Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 13 Nov 2020 09:05:30 +0800
Subject: [PATCH 017/299] Vue: Consistent slot, support Vue3 (#9609)

---
 changelog_unreleased/vue/pr-9609.md           |  73 ++++++++++
 src/language-html/printer-html.js             |  10 +-
 src/language-html/syntax-vue.js               |   6 +-
 src/language-html/utils.js                    |  28 ++++
 src/language-js/html-binding.js               |   2 +-
 .../vue-3/__snapshots__/jsfmt.spec.js.snap    | 109 +++++++++++++++
 tests/vue/vue-3/jsfmt.spec.js                 |   1 +
 tests/vue/vue-3/script-setup.vue              |  18 +++
 tests/vue/vue-3/style-variables.vue           |  18 +++
 .../vue/vue/__snapshots__/jsfmt.spec.js.snap  | 126 ++++++++++++++++--
 tests/vue/vue/attributes.vue                  |  14 +-
 11 files changed, 386 insertions(+), 19 deletions(-)
 create mode 100644 changelog_unreleased/vue/pr-9609.md
 create mode 100644 tests/vue/vue-3/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/vue/vue-3/jsfmt.spec.js
 create mode 100644 tests/vue/vue-3/script-setup.vue
 create mode 100644 tests/vue/vue-3/style-variables.vue

diff --git a/changelog_unreleased/vue/pr-9609.md b/changelog_unreleased/vue/pr-9609.md
new file mode 100644
index 000000000..b55920e4b
--- /dev/null
+++ b/changelog_unreleased/vue/pr-9609.md
@@ -0,0 +1,73 @@
+#### Fix inconsistent formatting for slots, support Vue 3 `script[setup]` and `style[vars]` (#9609 by @fisker)
+
+- [SFC Composition API Syntax Sugar (`<script setup>`)](https://github.com/vuejs/rfcs/blob/sfc-improvements/active-rfcs/0000-sfc-script-setup.md)
+- [SFC State-driven CSS Variables (`<style vars>`)](https://github.com/vuejs/rfcs/blob/sfc-improvements/active-rfcs/0000-sfc-style-variables.md)
+
+<!-- prettier-ignore -->
+```vue
+<!-- Input -->
+<script setup="props, {emit }"></script>
+<style vars="{color }"></style>
+<template>
+  <div>
+<div v-slot="{destructuring:{   a:{b}}}"/>
+<div v-slot:name="{destructuring:{   a:{b}}}"/>
+<div #default="{destructuring:{   a:{b}}}"/>
+<slot slot-scope="{destructuring:{   a:{b}}}"/>
+</div>
+</template>
+
+<!-- Prettier stable -->
+<script setup="props, {emit }"></script>
+<style vars="{color }"></style>
+<template>
+  <div>
+    <div v-slot="{ destructuring: { a: { b } } }" />
+    <div v-slot:name="{ destructuring: { a: { b } } }" />
+    <div #default="{ destructuring: { a: { b } } }" />
+    <slot
+      slot-scope="{
+        destructuring: {
+          a: { b },
+        },
+      }"
+    />
+  </div>
+</template>
+
+<!-- Prettier master -->
+<script setup="props, { emit }"></script>
+<style vars="{ color }"></style>
+<template>
+  <div>
+    <div
+      v-slot="{
+        destructuring: {
+          a: { b },
+        },
+      }"
+    />
+    <div
+      v-slot:name="{
+        destructuring: {
+          a: { b },
+        },
+      }"
+    />
+    <div
+      #default="{
+        destructuring: {
+          a: { b },
+        },
+      }"
+    />
+    <slot
+      slot-scope="{
+        destructuring: {
+          a: { b },
+        },
+      }"
+    />
+  </div>
+</template>
+```
diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index e0649c4bb..8536f98cf 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -36,6 +36,8 @@ const {
   inferScriptParser,
   isVueCustomBlock,
   isVueNonHtmlBlock,
+  isVueSlotAttribute,
+  isVueSfcBindingsAttribute,
   isScriptLikeTag,
   isTextLikeNode,
   preferHardlineAsLeadingSpaces,
@@ -49,7 +51,7 @@ const { insertPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
 const {
   printVueFor,
-  printVueSlotScope,
+  printVueBindings,
   isVueEventBindingExpression,
 } = require("./syntax-vue");
 const { printImgSrcset, printClassNames } = require("./syntax-attribute");
@@ -1078,8 +1080,8 @@ function printEmbeddedAttributeValue(node, originalTextToDoc, options) {
       return printVueFor(getValue(), textToDoc);
     }
 
-    if (node.fullName === "slot-scope") {
-      return printVueSlotScope(getValue(), textToDoc);
+    if (isVueSlotAttribute(node) || isVueSfcBindingsAttribute(node, options)) {
+      return printVueBindings(getValue(), textToDoc);
     }
 
     /**
@@ -1097,7 +1099,7 @@ function printEmbeddedAttributeValue(node, originalTextToDoc, options) {
     /**
      *     v-if="jsExpression"
      */
-    const jsExpressionBindingPatterns = ["^v-", "^#"];
+    const jsExpressionBindingPatterns = ["^v-"];
 
     if (isKeyMatched(vueEventBindingPatterns)) {
       const value = getValue();
diff --git a/src/language-html/syntax-vue.js b/src/language-html/syntax-vue.js
index d5d89789c..1a0ea9b9a 100644
--- a/src/language-html/syntax-vue.js
+++ b/src/language-html/syntax-vue.js
@@ -63,12 +63,12 @@ function parseVueFor(value) {
   };
 }
 
-function printVueSlotScope(value, textToDoc) {
+function printVueBindings(value, textToDoc) {
   return textToDoc(
     `function _(${value}) {}`,
     {
       parser: "babel",
-      __isVueSlotScope: true,
+      __isVueBindings: true,
     },
     { stripTrailingHardline: true }
   );
@@ -90,5 +90,5 @@ function isVueEventBindingExpression(eventBindingValue) {
 module.exports = {
   isVueEventBindingExpression,
   printVueFor,
-  printVueSlotScope,
+  printVueBindings,
 };
diff --git a/src/language-html/utils.js b/src/language-html/utils.js
index 544fe06f6..b5792fcf8 100644
--- a/src/language-html/utils.js
+++ b/src/language-html/utils.js
@@ -637,6 +637,32 @@ function isVueNonHtmlBlock(node, options) {
   );
 }
 
+function isVueSlotAttribute(attribute) {
+  const attributeName = attribute.fullName;
+  return (
+    attributeName.charAt(0) === "#" ||
+    attributeName === "slot-scope" ||
+    attributeName === "v-slot" ||
+    attributeName.startsWith("v-slot:")
+  );
+}
+
+function isVueSfcBindingsAttribute(attribute, options) {
+  const element = attribute.parent;
+  if (!isVueSfcBlock(element, options)) {
+    return false;
+  }
+  const tagName = element.fullName;
+  const attributeName = attribute.fullName;
+
+  return (
+    // https://github.com/vuejs/rfcs/blob/sfc-improvements/active-rfcs/0000-sfc-script-setup.md
+    (tagName === "script" && attributeName === "setup") ||
+    // https://github.com/vuejs/rfcs/blob/sfc-improvements/active-rfcs/0000-sfc-style-variables.md
+    (tagName === "style" && attributeName === "vars")
+  );
+}
+
 module.exports = {
   HTML_ELEMENT_ATTRIBUTES,
   HTML_TAGS,
@@ -660,6 +686,8 @@ module.exports = {
   inferScriptParser,
   isVueCustomBlock,
   isVueNonHtmlBlock,
+  isVueSlotAttribute,
+  isVueSfcBindingsAttribute,
   isDanglingSpaceSensitiveNode,
   isIndentationSensitiveNode,
   isLeadingSpaceSensitiveNode,
diff --git a/src/language-js/html-binding.js b/src/language-js/html-binding.js
index 33f4843c2..65dba36cd 100644
--- a/src/language-js/html-binding.js
+++ b/src/language-js/html-binding.js
@@ -41,7 +41,7 @@ function printHtmlBinding(path, options, print) {
     );
   }
 
-  if (options.__isVueSlotScope) {
+  if (options.__isVueBindings) {
     return path.call(
       (functionDeclarationPath) =>
         join(concat([",", line]), functionDeclarationPath.map(print, "params")),
diff --git a/tests/vue/vue-3/__snapshots__/jsfmt.spec.js.snap b/tests/vue/vue-3/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..6a6a69f9c
--- /dev/null
+++ b/tests/vue/vue-3/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,109 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`script-setup.vue format 1`] = `
+====================================options=====================================
+parsers: ["vue"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<script setup></script>
+<script setup="     foo"></script>
+<script setup="     {row   }"></script>
+<script setup="{destructuring:{   a:{b}}}"></script>
+
+<!-- Not script -->
+<custom setup="     {row   }">Not A script</custom>
+<style setup="     {row   }"></style>
+
+<!-- Not root block -->
+<template>
+<script setup="     {row   }"></script>
+</template>
+
+<!-- Not attribute -->
+<script>
+<setup>{not:{a:attribute}}</setup>
+</script>
+
+=====================================output=====================================
+<script setup></script>
+<script setup="foo"></script>
+<script setup="{ row }"></script>
+<script
+  setup="{
+    destructuring: {
+      a: { b },
+    },
+  }"
+></script>
+
+<!-- Not script -->
+<custom setup="     {row   }">Not A script</custom>
+<style setup="     {row   }"></style>
+
+<!-- Not root block -->
+<template>
+  <script setup="     {row   }"></script>
+</template>
+
+<!-- Not attribute -->
+<script>
+<setup>{not:{a:attribute}}</setup>
+</script>
+
+================================================================================
+`;
+
+exports[`style-variables.vue format 1`] = `
+====================================options=====================================
+parsers: ["vue"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<style vars></style>
+<style vars="     foo"></style>
+<style vars="     {row   }"></style>
+<style vars="{destructuring:{   a:{b}}}"></style>
+
+<!-- Not style -->
+<custom vars="     {row   }">Not A style</custom>
+<script vars="     {row   }"></script>
+
+<!-- Not root block -->
+<template>
+<style vars="     {row   }"></style>
+</template> 
+
+<!-- Not attribute -->
+<style>
+<vars>{not:{a:attribute}}</vars>
+</style>
+
+=====================================output=====================================
+<style vars></style>
+<style vars="foo"></style>
+<style vars="{ row }"></style>
+<style
+  vars="{
+    destructuring: {
+      a: { b },
+    },
+  }"
+></style>
+
+<!-- Not style -->
+<custom vars="     {row   }">Not A style</custom>
+<script vars="     {row   }"></script>
+
+<!-- Not root block -->
+<template>
+  <style vars="     {row   }"></style>
+</template>
+
+<!-- Not attribute -->
+<style>
+<vars>{not:{a:attribute}}</vars>
+</style>
+
+================================================================================
+`;
diff --git a/tests/vue/vue-3/jsfmt.spec.js b/tests/vue/vue-3/jsfmt.spec.js
new file mode 100644
index 000000000..2fd7eede9
--- /dev/null
+++ b/tests/vue/vue-3/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["vue"]);
diff --git a/tests/vue/vue-3/script-setup.vue b/tests/vue/vue-3/script-setup.vue
new file mode 100644
index 000000000..c72ac6578
--- /dev/null
+++ b/tests/vue/vue-3/script-setup.vue
@@ -0,0 +1,18 @@
+<script setup></script>
+<script setup="     foo"></script>
+<script setup="     {row   }"></script>
+<script setup="{destructuring:{   a:{b}}}"></script>
+
+<!-- Not script -->
+<custom setup="     {row   }">Not A script</custom>
+<style setup="     {row   }"></style>
+
+<!-- Not root block -->
+<template>
+<script setup="     {row   }"></script>
+</template>
+
+<!-- Not attribute -->
+<script>
+<setup>{not:{a:attribute}}</setup>
+</script>
diff --git a/tests/vue/vue-3/style-variables.vue b/tests/vue/vue-3/style-variables.vue
new file mode 100644
index 000000000..a490e8e5a
--- /dev/null
+++ b/tests/vue/vue-3/style-variables.vue
@@ -0,0 +1,18 @@
+<style vars></style>
+<style vars="     foo"></style>
+<style vars="     {row   }"></style>
+<style vars="{destructuring:{   a:{b}}}"></style>
+
+<!-- Not style -->
+<custom vars="     {row   }">Not A style</custom>
+<script vars="     {row   }"></script>
+
+<!-- Not root block -->
+<template>
+<style vars="     {row   }"></style>
+</template> 
+
+<!-- Not attribute -->
+<style>
+<vars>{not:{a:attribute}}</vars>
+</style>
diff --git a/tests/vue/vue/__snapshots__/jsfmt.spec.js.snap b/tests/vue/vue/__snapshots__/jsfmt.spec.js.snap
index 6fb95b8ca..c121080d9 100644
--- a/tests/vue/vue/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/vue/vue/__snapshots__/jsfmt.spec.js.snap
@@ -44,8 +44,18 @@ semi: false
   @click="   $emit(   'click'   )   "
   @click="   $emit(   'click'   )  ;"
   @click="   $emit(   'click'   )  ;if(something){for(let i=j;i<100;i++){}}else{}"
-  slot-scope="{row}"
-  slot-scope="{destructuring:{a:{b}}}"
+  slot-scope="     foo"
+  slot-scope="     {row   }"
+  slot-scope="{destructuring:{   a:{b}}}"
+  #default="     foo"
+  #default="     {row   }"
+  #default="{destructuring:{   a:{b}}}"
+  v-slot="     foo"
+  v-slot="     {row   }"
+  v-slot="{destructuring:{   a:{b}}}"
+  v-slot:name="     foo"
+  v-slot:name="     {row   }"
+  v-slot:name="{destructuring:{   a:{b}}}"
   :class="{ longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true }"
   :class="(() => { return 'hello' })()"
   :key="index /* hello */ "
@@ -289,12 +299,34 @@ semi: false
       } else {
       }
     "
+    slot-scope="foo"
     slot-scope="{ row }"
     slot-scope="{
       destructuring: {
         a: { b },
       },
     }"
+    #default="foo"
+    #default="{ row }"
+    #default="{
+      destructuring: {
+        a: { b },
+      },
+    }"
+    v-slot="foo"
+    v-slot="{ row }"
+    v-slot="{
+      destructuring: {
+        a: { b },
+      },
+    }"
+    v-slot:name="foo"
+    v-slot:name="{ row }"
+    v-slot:name="{
+      destructuring: {
+        a: { b },
+      },
+    }"
     :class="{
       longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true,
     }"
@@ -323,7 +355,11 @@ semi: false
     @click="a[1];"
     @click="a['b'];"
     @click="a[null]"
-    #default="{ foo: { bar: { baz } } }"
+    #default="{
+      foo: {
+        bar: { baz },
+      },
+    }"
   ></div>
 </template>
 
@@ -374,8 +410,18 @@ trailingComma: "none"
   @click="   $emit(   'click'   )   "
   @click="   $emit(   'click'   )  ;"
   @click="   $emit(   'click'   )  ;if(something){for(let i=j;i<100;i++){}}else{}"
-  slot-scope="{row}"
-  slot-scope="{destructuring:{a:{b}}}"
+  slot-scope="     foo"
+  slot-scope="     {row   }"
+  slot-scope="{destructuring:{   a:{b}}}"
+  #default="     foo"
+  #default="     {row   }"
+  #default="{destructuring:{   a:{b}}}"
+  v-slot="     foo"
+  v-slot="     {row   }"
+  v-slot="{destructuring:{   a:{b}}}"
+  v-slot:name="     foo"
+  v-slot:name="     {row   }"
+  v-slot:name="{destructuring:{   a:{b}}}"
   :class="{ longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true }"
   :class="(() => { return 'hello' })()"
   :key="index /* hello */ "
@@ -619,12 +665,34 @@ trailingComma: "none"
       } else {
       }
     "
+    slot-scope="foo"
     slot-scope="{ row }"
     slot-scope="{
       destructuring: {
         a: { b }
       }
     }"
+    #default="foo"
+    #default="{ row }"
+    #default="{
+      destructuring: {
+        a: { b }
+      }
+    }"
+    v-slot="foo"
+    v-slot="{ row }"
+    v-slot="{
+      destructuring: {
+        a: { b }
+      }
+    }"
+    v-slot:name="foo"
+    v-slot:name="{ row }"
+    v-slot:name="{
+      destructuring: {
+        a: { b }
+      }
+    }"
     :class="{
       longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true
     }"
@@ -653,7 +721,11 @@ trailingComma: "none"
     @click="a[1];"
     @click="a['b'];"
     @click="a[null]"
-    #default="{ foo: { bar: { baz } } }"
+    #default="{
+      foo: {
+        bar: { baz }
+      }
+    }"
   ></div>
 </template>
 
@@ -703,8 +775,18 @@ printWidth: 80
   @click="   $emit(   'click'   )   "
   @click="   $emit(   'click'   )  ;"
   @click="   $emit(   'click'   )  ;if(something){for(let i=j;i<100;i++){}}else{}"
-  slot-scope="{row}"
-  slot-scope="{destructuring:{a:{b}}}"
+  slot-scope="     foo"
+  slot-scope="     {row   }"
+  slot-scope="{destructuring:{   a:{b}}}"
+  #default="     foo"
+  #default="     {row   }"
+  #default="{destructuring:{   a:{b}}}"
+  v-slot="     foo"
+  v-slot="     {row   }"
+  v-slot="{destructuring:{   a:{b}}}"
+  v-slot:name="     foo"
+  v-slot:name="     {row   }"
+  v-slot:name="{destructuring:{   a:{b}}}"
   :class="{ longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true }"
   :class="(() => { return 'hello' })()"
   :key="index /* hello */ "
@@ -948,12 +1030,34 @@ printWidth: 80
       } else {
       }
     "
+    slot-scope="foo"
     slot-scope="{ row }"
     slot-scope="{
       destructuring: {
         a: { b },
       },
     }"
+    #default="foo"
+    #default="{ row }"
+    #default="{
+      destructuring: {
+        a: { b },
+      },
+    }"
+    v-slot="foo"
+    v-slot="{ row }"
+    v-slot="{
+      destructuring: {
+        a: { b },
+      },
+    }"
+    v-slot:name="foo"
+    v-slot:name="{ row }"
+    v-slot:name="{
+      destructuring: {
+        a: { b },
+      },
+    }"
     :class="{
       longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true,
     }"
@@ -982,7 +1086,11 @@ printWidth: 80
     @click="a[1];"
     @click="a['b'];"
     @click="a[null]"
-    #default="{ foo: { bar: { baz } } }"
+    #default="{
+      foo: {
+        bar: { baz },
+      },
+    }"
   ></div>
 </template>
 
diff --git a/tests/vue/vue/attributes.vue b/tests/vue/vue/attributes.vue
index c057c8ef3..571615012 100644
--- a/tests/vue/vue/attributes.vue
+++ b/tests/vue/vue/attributes.vue
@@ -35,8 +35,18 @@
   @click="   $emit(   'click'   )   "
   @click="   $emit(   'click'   )  ;"
   @click="   $emit(   'click'   )  ;if(something){for(let i=j;i<100;i++){}}else{}"
-  slot-scope="{row}"
-  slot-scope="{destructuring:{a:{b}}}"
+  slot-scope="     foo"
+  slot-scope="     {row   }"
+  slot-scope="{destructuring:{   a:{b}}}"
+  #default="     foo"
+  #default="     {row   }"
+  #default="{destructuring:{   a:{b}}}"
+  v-slot="     foo"
+  v-slot="     {row   }"
+  v-slot="{destructuring:{   a:{b}}}"
+  v-slot:name="     foo"
+  v-slot:name="     {row   }"
+  v-slot:name="{destructuring:{   a:{b}}}"
   :class="{ longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true }"
   :class="(() => { return 'hello' })()"
   :key="index /* hello */ "

From 2a9d0f66d584b7ef1eea24d5bb20922974495d4a Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 13 Nov 2020 09:06:02 +0800
Subject: [PATCH 018/299] Typescript: Fix `prettier-ignore`d mapped types
 (#9551)

Co-authored-by: Georgii Dolzhykov <thorn.mailbox@gmail.com>
---
 changelog_unreleased/typescript/pr-9551.md    |  22 +++
 src/language-js/comments.js                   |  35 +++++
 .../__snapshots__/jsfmt.spec.js.snap          | 140 ++++++++++++++++++
 .../typescript/prettier-ignore/jsfmt.spec.js  |   1 +
 .../prettier-ignore/mapped-types.ts           |  68 +++++++++
 tests_config/run_spec.js                      |   1 +
 6 files changed, 267 insertions(+)
 create mode 100644 changelog_unreleased/typescript/pr-9551.md
 create mode 100644 tests/typescript/prettier-ignore/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/typescript/prettier-ignore/jsfmt.spec.js
 create mode 100644 tests/typescript/prettier-ignore/mapped-types.ts

diff --git a/changelog_unreleased/typescript/pr-9551.md b/changelog_unreleased/typescript/pr-9551.md
new file mode 100644
index 000000000..77ffc2676
--- /dev/null
+++ b/changelog_unreleased/typescript/pr-9551.md
@@ -0,0 +1,22 @@
+#### Fix `prettier-ignore`d mapped types (#9551 by @fisker)
+
+<!-- prettier-ignore -->
+```ts
+// Input
+type a= {
+    // prettier-ignore
+    [A in B]: C  |  D
+  }
+
+// Prettier master
+type a = {
+  // prettier-ignore
+  A in B: C | D;
+};
+
+// Prettier stable
+type a = {
+    // prettier-ignore
+    [A in B]: C  |  D
+  };
+```
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index 53b337ddd..f9088cc4d 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -21,6 +21,13 @@ const { locStart, locEnd } = require("./loc");
 function handleOwnLineComment(comment, text, options, ast, isLastComment) {
   const { precedingNode, enclosingNode, followingNode } = comment;
   return (
+    handleIgnoreComments(
+      text,
+      enclosingNode,
+      precedingNode,
+      followingNode,
+      comment
+    ) ||
     handleLastFunctionArgComments(
       text,
       precedingNode,
@@ -124,6 +131,13 @@ function handleRemainingComment(comment, text, options, ast, isLastComment) {
   const { precedingNode, enclosingNode, followingNode } = comment;
 
   if (
+    handleIgnoreComments(
+      text,
+      enclosingNode,
+      precedingNode,
+      followingNode,
+      comment
+    ) ||
     handleIfStatementComments(
       text,
       precedingNode,
@@ -851,6 +865,27 @@ function handleTSFunctionTrailingComments(
   return false;
 }
 
+function handleIgnoreComments(
+  text,
+  enclosingNode,
+  precedingNode,
+  followingNode,
+  comment
+) {
+  if (
+    isNodeIgnoreComment(comment) &&
+    enclosingNode &&
+    enclosingNode.type === "TSMappedType" &&
+    followingNode &&
+    followingNode.type === "TSTypeParameter" &&
+    followingNode.constraint
+  ) {
+    enclosingNode.prettierIgnore = true;
+    comment.unignore = true;
+    return true;
+  }
+}
+
 function handleTSMappedTypeComments(
   text,
   enclosingNode,
diff --git a/tests/typescript/prettier-ignore/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/prettier-ignore/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..60bdf3b3f
--- /dev/null
+++ b/tests/typescript/prettier-ignore/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,140 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`mapped-types.ts format 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+type a= {
+    // prettier-ignore
+    [A in B]: C  |  D
+  }
+
+type a= {
+    [
+      // prettier-ignore
+      A in B
+    ]: C  |  D
+  }
+
+type a= {
+    [
+      A in
+      // prettier-ignore
+      B
+    ]: C  |  D
+  }
+
+type a= {
+    [A in B]:
+      // prettier-ignore
+      C  |  D
+  }
+
+type a= {
+    [
+      /* prettier-ignore */
+      A in B
+    ]: C  |  D
+  }
+
+type a= {
+    [
+      A in
+      /* prettier-ignore */
+      B
+    ]: C  |  D
+  }
+
+type a= {
+    [A in B]:
+      /* prettier-ignore */
+      C  |  D
+  }
+
+
+type a= {
+    /* prettier-ignore */ [A in B]: C  |  D
+  }
+
+type a= {
+    [/* prettier-ignore */ A in B ]: C  |  D
+  }
+
+type a= {
+    [A in /* prettier-ignore */ B]: C  |  D
+  }
+
+type a= {
+    [A in B]: /* prettier-ignore */ C  |  D
+  }
+
+type a= {
+    /* prettier-ignore */
+    [A in B]: C  |  D
+  }
+
+=====================================output=====================================
+type a = {
+    // prettier-ignore
+    [A in B]: C  |  D
+  };
+
+type a = {
+    [
+      // prettier-ignore
+      A in B
+    ]: C  |  D
+  };
+
+type a = {
+  [A in // prettier-ignore
+  B]: C | D;
+};
+
+type a = {
+  [A in B]: // prettier-ignore
+  C | D;
+};
+
+type a = {
+    [
+      /* prettier-ignore */
+      A in B
+    ]: C  |  D
+  };
+
+type a = {
+  [A in /* prettier-ignore */
+  B]: C | D;
+};
+
+type a = {
+  [A in B]: /* prettier-ignore */
+  C | D;
+};
+
+type a = {
+    /* prettier-ignore */ [A in B]: C  |  D
+  };
+
+type a = {
+    [/* prettier-ignore */ A in B ]: C  |  D
+  };
+
+type a = {
+  [A in /* prettier-ignore */ B]: C | D;
+};
+
+type a = {
+  [A in B /* prettier-ignore */]: C | D;
+};
+
+type a = {
+    /* prettier-ignore */
+    [A in B]: C  |  D
+  };
+
+================================================================================
+`;
diff --git a/tests/typescript/prettier-ignore/jsfmt.spec.js b/tests/typescript/prettier-ignore/jsfmt.spec.js
new file mode 100644
index 000000000..2ea3bb6eb
--- /dev/null
+++ b/tests/typescript/prettier-ignore/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["typescript"]);
diff --git a/tests/typescript/prettier-ignore/mapped-types.ts b/tests/typescript/prettier-ignore/mapped-types.ts
new file mode 100644
index 000000000..5a37a573b
--- /dev/null
+++ b/tests/typescript/prettier-ignore/mapped-types.ts
@@ -0,0 +1,68 @@
+type a= {
+    // prettier-ignore
+    [A in B]: C  |  D
+  }
+
+type a= {
+    [
+      // prettier-ignore
+      A in B
+    ]: C  |  D
+  }
+
+type a= {
+    [
+      A in
+      // prettier-ignore
+      B
+    ]: C  |  D
+  }
+
+type a= {
+    [A in B]:
+      // prettier-ignore
+      C  |  D
+  }
+
+type a= {
+    [
+      /* prettier-ignore */
+      A in B
+    ]: C  |  D
+  }
+
+type a= {
+    [
+      A in
+      /* prettier-ignore */
+      B
+    ]: C  |  D
+  }
+
+type a= {
+    [A in B]:
+      /* prettier-ignore */
+      C  |  D
+  }
+
+
+type a= {
+    /* prettier-ignore */ [A in B]: C  |  D
+  }
+
+type a= {
+    [/* prettier-ignore */ A in B ]: C  |  D
+  }
+
+type a= {
+    [A in /* prettier-ignore */ B]: C  |  D
+  }
+
+type a= {
+    [A in B]: /* prettier-ignore */ C  |  D
+  }
+
+type a= {
+    /* prettier-ignore */
+    [A in B]: C  |  D
+  }
diff --git a/tests_config/run_spec.js b/tests_config/run_spec.js
index 862ad62a9..27e25c9fc 100644
--- a/tests_config/run_spec.js
+++ b/tests_config/run_spec.js
@@ -40,6 +40,7 @@ const unstableTests = new Map(
     ],
     ["js/no-semi/comments.js", (options) => options.semi === false],
     ["flow/no-semi/comments.js", (options) => options.semi === false],
+    "typescript/prettier-ignore/mapped-types.ts",
     "js/comments/html-like/comment.js",
   ].map((fixture) => {
     const [file, isUnstable = () => true] = Array.isArray(fixture)

From 47fbf284df3b6bf0f31f5c9fce534dc7df010402 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 13 Nov 2020 09:06:16 +0800
Subject: [PATCH 019/299] Fix glimmer `locStart` and `locEnd` (#9626)

---
 src/language-handlebars/loc.js             | 11 +++++++
 src/language-handlebars/parser-glimmer.js  | 38 ++++++++++++++--------
 src/language-handlebars/printer-glimmer.js | 15 +++------
 3 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 src/language-handlebars/loc.js

diff --git a/src/language-handlebars/loc.js b/src/language-handlebars/loc.js
new file mode 100644
index 000000000..a1bd54d9d
--- /dev/null
+++ b/src/language-handlebars/loc.js
@@ -0,0 +1,11 @@
+"use strict";
+
+function locStart(node) {
+  return node.loc.start.offset;
+}
+
+function locEnd(node) {
+  return node.loc.end.offset;
+}
+
+module.exports = { locStart, locEnd };
diff --git a/src/language-handlebars/parser-glimmer.js b/src/language-handlebars/parser-glimmer.js
index 3750847f7..3df6859c3 100644
--- a/src/language-handlebars/parser-glimmer.js
+++ b/src/language-handlebars/parser-glimmer.js
@@ -1,6 +1,8 @@
 "use strict";
 
+const LinesAndColumns = require("lines-and-columns").default;
 const createError = require("../common/parser-create-error");
+const { locStart, locEnd } = require("./loc");
 
 /* from the following template: `non-escaped mustache \\{{helper}}`
  * glimmer parser will produce an AST missing a backslash
@@ -17,11 +19,31 @@ function addBackslash(/* options*/) {
   };
 }
 
+// Add `loc.{start,end}.offset`
+function addOffset(text) {
+  const lines = new LinesAndColumns(text);
+  const calculateOffset = ({ line, column }) =>
+    lines.indexForLocation({ line: line - 1, column });
+  return (/* options*/) => ({
+    name: "addOffset",
+    visitor: {
+      All(node) {
+        const { start, end } = node.loc;
+        start.offset = calculateOffset(start);
+        end.offset = calculateOffset(end);
+      },
+    },
+  });
+}
+
 function parse(text) {
   const { preprocess: glimmer } = require("@glimmer/syntax");
   let ast;
   try {
-    ast = glimmer(text, { mode: "codemod", plugins: { ast: [addBackslash] } });
+    ast = glimmer(text, {
+      mode: "codemod",
+      plugins: { ast: [addBackslash, addOffset(text)] },
+    });
   } catch (error) {
     const location = getErrorLocation(error);
 
@@ -59,18 +81,8 @@ module.exports = {
     glimmer: {
       parse,
       astFormat: "glimmer",
-      // TODO: `locStart` and `locEnd` should return a number offset
-      // https://prettier.io/docs/en/plugins.html#parsers
-      // but we need access to the original text to use
-      // `loc.start` and `loc.end` objects to calculate the offset
-      /* istanbul ignore next */
-      locStart(node) {
-        return node.loc && node.loc.start;
-      },
-      /* istanbul ignore next */
-      locEnd(node) {
-        return node.loc && node.loc.end;
-      },
+      locStart,
+      locEnd,
     },
   },
 };
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 21e46762f..2876a2ac7 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -10,8 +10,7 @@ const {
   line,
   softline,
 } = require("../document").builders;
-const locationToOffset = require("../utils/line-column-to-index");
-
+const { locStart, locEnd } = require("./loc");
 const clean = require("./clean");
 const {
   getNextNode,
@@ -37,11 +36,7 @@ function print(path, options, print) {
   }
 
   if (hasPrettierIgnore(path)) {
-    const startOffset = locationToOffset(n.loc.start, options.originalText);
-    const endOffset = locationToOffset(n.loc.end, options.originalText);
-
-    const ignoredText = options.originalText.slice(startOffset, endOffset);
-    return ignoredText;
+    return options.originalText.slice(locStart(n), locEnd(n));
   }
 
   switch (n.type) {
@@ -145,12 +140,10 @@ function print(path, options, print) {
       const isText = n.value.type === "TextNode";
       const isEmptyText = isText && n.value.chars === "";
 
-      // If the text is empty and the value's loc start and end columns are the
+      // If the text is empty and the value's loc start and end offsets are the
       // same, there is no value for this AttrNode and it should be printed
       // without the `=""`. Example: `<img data-test>` -> `<img data-test>`
-      const isEmptyValue =
-        isEmptyText && n.value.loc.start.column === n.value.loc.end.column;
-      if (isEmptyValue) {
+      if (isEmptyText && locStart(n.value) === locEnd(n.value)) {
         return concat([n.name]);
       }
       const value = path.call(print, "value");

From 9b206b56056406f7d7281826c7ac67ac18e763f3 Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Fri, 13 Nov 2020 09:14:07 +0800
Subject: [PATCH 020/299] Fix renamed function `isNodeIgnoreComment` ->
 `isPrettierIgnoreComment`

---
 src/language-js/comments.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index f9088cc4d..925cf0a7d 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -873,7 +873,7 @@ function handleIgnoreComments(
   comment
 ) {
   if (
-    isNodeIgnoreComment(comment) &&
+    isPrettierIgnoreComment(comment) &&
     enclosingNode &&
     enclosingNode.type === "TSMappedType" &&
     followingNode &&

From 4bcf8a3a366a5c7c6297b2e00aed1446ce6e4859 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 13 Nov 2020 19:13:03 +0800
Subject: [PATCH 021/299] Markdown: Fix extra empty line added after empty
 table (#9654)

---
 changelog_unreleased/markdown/pr-9654.md      |  29 ++++
 src/language-markdown/printer-markdown.js     |  35 +++--
 .../__snapshots__/jsfmt.spec.js.snap          | 140 ++++++++++++++++++
 .../markdown/table/empty-table/empty-table.md |  11 ++
 .../markdown/table/empty-table/jsfmt.spec.js  |   4 +
 5 files changed, 201 insertions(+), 18 deletions(-)
 create mode 100644 changelog_unreleased/markdown/pr-9654.md
 create mode 100644 tests/markdown/table/empty-table/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/markdown/table/empty-table/empty-table.md
 create mode 100644 tests/markdown/table/empty-table/jsfmt.spec.js

diff --git a/changelog_unreleased/markdown/pr-9654.md b/changelog_unreleased/markdown/pr-9654.md
new file mode 100644
index 000000000..5028ba8b9
--- /dev/null
+++ b/changelog_unreleased/markdown/pr-9654.md
@@ -0,0 +1,29 @@
+#### Fix extra empty line added after empty table (#9654 by @fisker)
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+Test line 1
+
+| Specify the selected option : | Option 1 |
+| ----------------------------- | -------- |
+
+Test line 6
+
+<!-- Prettier stable -->
+Test line 1
+
+| Specify the selected option : | Option 1 |
+| ----------------------------- | -------- |
+
+
+Test line 6
+
+<!-- Prettier master -->
+Test line 1
+
+| Specify the selected option : | Option 1 |
+| ----------------------------- | -------- |
+
+Test line 6
+```
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index e95006c58..dad7bbec8 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -595,33 +595,32 @@ function printTable(path, options, print) {
       ),
     contents[0].map(() => 3) // minimum width = 3 (---, :--, :-:, --:)
   );
-  const alignedTable = join(hardlineWithoutBreakParent, [
-    printRow(contents[0]),
-    printSeparator(),
-    join(
-      hardlineWithoutBreakParent,
-      contents.slice(1).map((rowContents) => printRow(rowContents))
-    ),
-  ]);
+  const alignedTable = printTableContents(/* isCompact */ false);
 
   if (options.proseWrap !== "never") {
     return concat([breakParent, alignedTable]);
   }
 
   // Only if the --prose-wrap never is set and it exceeds the print width.
-  const compactTable = join(hardlineWithoutBreakParent, [
-    printRow(contents[0], /* isCompact */ true),
-    printSeparator(/* isCompact */ true),
-    join(
-      hardlineWithoutBreakParent,
-      contents
-        .slice(1)
-        .map((rowContents) => printRow(rowContents, /* isCompact */ true))
-    ),
-  ]);
+  const compactTable = printTableContents(/* isCompact */ true);
 
   return concat([breakParent, group(ifBreak(compactTable, alignedTable))]);
 
+  function printTableContents(isCompact) {
+    const parts = [printRow(contents[0], isCompact), printSeparator(isCompact)];
+    if (contents.length > 1) {
+      parts.push(
+        join(
+          hardlineWithoutBreakParent,
+          contents
+            .slice(1)
+            .map((rowContents) => printRow(rowContents, isCompact))
+        )
+      );
+    }
+    return join(hardlineWithoutBreakParent, parts);
+  }
+
   function printSeparator(isCompact) {
     return concat([
       "| ",
diff --git a/tests/markdown/table/empty-table/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/table/empty-table/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..747deca3f
--- /dev/null
+++ b/tests/markdown/table/empty-table/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,140 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`empty-table.md - {"proseWrap":"always"} format 1`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+proseWrap: "always"
+                                                                                | printWidth
+=====================================input======================================
+Text
+
+| Specify the selected option : | Option 1 |
+|:--| --- |
+
+Text
+
+|    Should print as compact table when --proseWrap=never|a long long long long long long long long long long long long long head|
+|---|--:|
+
+Text
+
+=====================================output=====================================
+Text
+
+| Specify the selected option : | Option 1 |
+| :---------------------------- | -------- |
+
+Text
+
+| Should print as compact table when --proseWrap=never | a long long long long long long long long long long long long long head |
+| ---------------------------------------------------- | ----------------------------------------------------------------------: |
+
+Text
+
+================================================================================
+`;
+
+exports[`empty-table.md - {"proseWrap":"never"} format 1`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+proseWrap: "never"
+                                                                                | printWidth
+=====================================input======================================
+Text
+
+| Specify the selected option : | Option 1 |
+|:--| --- |
+
+Text
+
+|    Should print as compact table when --proseWrap=never|a long long long long long long long long long long long long long head|
+|---|--:|
+
+Text
+
+=====================================output=====================================
+Text
+
+| Specify the selected option : | Option 1 |
+| :---------------------------- | -------- |
+
+Text
+
+| Should print as compact table when --proseWrap=never | a long long long long long long long long long long long long long head |
+| --- | --: |
+
+Text
+
+================================================================================
+`;
+
+exports[`empty-table.md - {"proseWrap":"preserve"} format 1`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+proseWrap: "preserve"
+                                                                                | printWidth
+=====================================input======================================
+Text
+
+| Specify the selected option : | Option 1 |
+|:--| --- |
+
+Text
+
+|    Should print as compact table when --proseWrap=never|a long long long long long long long long long long long long long head|
+|---|--:|
+
+Text
+
+=====================================output=====================================
+Text
+
+| Specify the selected option : | Option 1 |
+| :---------------------------- | -------- |
+
+Text
+
+| Should print as compact table when --proseWrap=never | a long long long long long long long long long long long long long head |
+| ---------------------------------------------------- | ----------------------------------------------------------------------: |
+
+Text
+
+================================================================================
+`;
+
+exports[`empty-table.md format 1`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+Text
+
+| Specify the selected option : | Option 1 |
+|:--| --- |
+
+Text
+
+|    Should print as compact table when --proseWrap=never|a long long long long long long long long long long long long long head|
+|---|--:|
+
+Text
+
+=====================================output=====================================
+Text
+
+| Specify the selected option : | Option 1 |
+| :---------------------------- | -------- |
+
+Text
+
+| Should print as compact table when --proseWrap=never | a long long long long long long long long long long long long long head |
+| ---------------------------------------------------- | ----------------------------------------------------------------------: |
+
+Text
+
+================================================================================
+`;
diff --git a/tests/markdown/table/empty-table/empty-table.md b/tests/markdown/table/empty-table/empty-table.md
new file mode 100644
index 000000000..3765cc404
--- /dev/null
+++ b/tests/markdown/table/empty-table/empty-table.md
@@ -0,0 +1,11 @@
+Text
+
+| Specify the selected option : | Option 1 |
+|:--| --- |
+
+Text
+
+|    Should print as compact table when --proseWrap=never|a long long long long long long long long long long long long long head|
+|---|--:|
+
+Text
diff --git a/tests/markdown/table/empty-table/jsfmt.spec.js b/tests/markdown/table/empty-table/jsfmt.spec.js
new file mode 100644
index 000000000..54dea461f
--- /dev/null
+++ b/tests/markdown/table/empty-table/jsfmt.spec.js
@@ -0,0 +1,4 @@
+run_spec(__dirname, ["markdown"]);
+run_spec(__dirname, ["markdown"], { proseWrap: "never" });
+run_spec(__dirname, ["markdown"], { proseWrap: "always" });
+run_spec(__dirname, ["markdown"], { proseWrap: "preserve" });

From 3e20fc244c6b54b445d8a0a99c515953af9e69a2 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sat, 14 Nov 2020 12:45:30 +0800
Subject: [PATCH 022/299] Lint: Report duplicated changelog (#9666)

---
 scripts/lint-changelog.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/lint-changelog.js b/scripts/lint-changelog.js
index 66348a2f0..fbb1a78e5 100644
--- a/scripts/lint-changelog.js
+++ b/scripts/lint-changelog.js
@@ -2,6 +2,7 @@
 "use strict";
 const fs = require("fs");
 const path = require("path");
+const { outdent } = require("outdent");
 
 const CHANGELOG_DIR = "changelog_unreleased";
 const TEMPLATE_FILE = "TEMPLATE.md";
@@ -61,6 +62,7 @@ const template = fs.readFileSync(
 );
 const [templateComment] = template.match(/<!--[\S\s]*?-->/);
 const [templateAuthorLink] = template.match(authorRegex);
+const checkedFiles = new Map();
 
 for (const category of CHANGELOG_CATEGORIES) {
   const files = fs.readdirSync(path.join(CHANGELOG_ROOT, category));
@@ -85,11 +87,21 @@ for (const category of CHANGELOG_CATEGORIES) {
       continue;
     }
     const [, prNumber] = match;
+    const prLink = `#${prNumber}`;
+    if (checkedFiles.has(prNumber)) {
+      showErrorMessage(
+        outdent`
+          Duplicate files for ${prLink} found.
+            - ${checkedFiles.get(prNumber)}
+            - ${displayPath}
+        `
+      );
+    }
+    checkedFiles.set(prNumber, displayPath);
     const content = fs.readFileSync(
       path.join(CHANGELOG_DIR, category, prFile),
       "utf8"
     );
-    const prLink = `#${prNumber}`;
 
     if (!content.includes(prLink)) {
       showErrorMessage(`[${displayPath}]: PR link "${prLink}" is missing.`);

From 7d608bafc7f3a1fd45745c3d58307b58636aa079 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sat, 14 Nov 2020 14:55:07 +0800
Subject: [PATCH 023/299] Rename `preprocess` and `postprocess` file (#9651)

---
 src/language-html/{preprocess.js => print-preprocess.js}     | 0
 src/language-html/printer-html.js                            | 2 +-
 src/language-js/{postprocess.js => parse-postprocess.js}     | 0
 src/language-js/parser-babel.js                              | 2 +-
 src/language-js/parser-espree.js                             | 2 +-
 src/language-js/parser-flow.js                               | 2 +-
 src/language-js/parser-meriyah.js                            | 2 +-
 src/language-js/parser-typescript.js                         | 2 +-
 src/language-js/{preprocess.js => print-preprocess.js}       | 0
 src/language-js/printer-estree-json.js                       | 2 +-
 src/language-js/printer-estree.js                            | 2 +-
 src/language-markdown/{preprocess.js => print-preprocess.js} | 0
 src/language-markdown/printer-markdown.js                    | 2 +-
 13 files changed, 9 insertions(+), 9 deletions(-)
 rename src/language-html/{preprocess.js => print-preprocess.js} (100%)
 rename src/language-js/{postprocess.js => parse-postprocess.js} (100%)
 rename src/language-js/{preprocess.js => print-preprocess.js} (100%)
 rename src/language-markdown/{preprocess.js => print-preprocess.js} (100%)

diff --git a/src/language-html/preprocess.js b/src/language-html/print-preprocess.js
similarity index 100%
rename from src/language-html/preprocess.js
rename to src/language-html/print-preprocess.js
diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index 8536f98cf..4ae1b9dcf 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -46,7 +46,7 @@ const {
   unescapeQuoteEntities,
   isPreLikeNode,
 } = require("./utils");
-const preprocess = require("./preprocess");
+const preprocess = require("./print-preprocess");
 const { insertPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
 const {
diff --git a/src/language-js/postprocess.js b/src/language-js/parse-postprocess.js
similarity index 100%
rename from src/language-js/postprocess.js
rename to src/language-js/parse-postprocess.js
diff --git a/src/language-js/parser-babel.js b/src/language-js/parser-babel.js
index 539571361..b26aa83b8 100644
--- a/src/language-js/parser-babel.js
+++ b/src/language-js/parser-babel.js
@@ -7,7 +7,7 @@ const {
 } = require("../common/util");
 const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
-const postprocess = require("./postprocess");
+const postprocess = require("./parse-postprocess");
 
 function babelOptions({ sourceType, extraPlugins = [] }) {
   return {
diff --git a/src/language-js/parser-espree.js b/src/language-js/parser-espree.js
index 0f637f1d3..ede9745cf 100644
--- a/src/language-js/parser-espree.js
+++ b/src/language-js/parser-espree.js
@@ -3,7 +3,7 @@ const { getShebang } = require("../common/util");
 const createError = require("../common/parser-create-error");
 const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
-const postprocess = require("./postprocess");
+const postprocess = require("./parse-postprocess");
 
 const espreeOptions = {
   range: true,
diff --git a/src/language-js/parser-flow.js b/src/language-js/parser-flow.js
index 201e438a2..f38494d72 100644
--- a/src/language-js/parser-flow.js
+++ b/src/language-js/parser-flow.js
@@ -3,7 +3,7 @@
 const createError = require("../common/parser-create-error");
 const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
-const postprocess = require("./postprocess");
+const postprocess = require("./parse-postprocess");
 
 function parse(text, parsers, opts) {
   // Inline the require to avoid loading all the JS if we don't use it
diff --git a/src/language-js/parser-meriyah.js b/src/language-js/parser-meriyah.js
index 0d9f9f45a..4086ca389 100644
--- a/src/language-js/parser-meriyah.js
+++ b/src/language-js/parser-meriyah.js
@@ -3,7 +3,7 @@
 const createError = require("../common/parser-create-error");
 const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
-const postprocess = require("./postprocess");
+const postprocess = require("./parse-postprocess");
 
 // https://github.com/meriyah/meriyah/blob/4676f60b6c149d7082bde2c9147f9ae2359c8075/src/parser.ts#L185
 const parseOptions = {
diff --git a/src/language-js/parser-typescript.js b/src/language-js/parser-typescript.js
index c7dfb2cbc..1c3221f69 100644
--- a/src/language-js/parser-typescript.js
+++ b/src/language-js/parser-typescript.js
@@ -3,7 +3,7 @@
 const createError = require("../common/parser-create-error");
 const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
-const postprocess = require("./postprocess");
+const postprocess = require("./parse-postprocess");
 
 function parse(text, parsers, opts) {
   const jsx = isProbablyJsx(text);
diff --git a/src/language-js/preprocess.js b/src/language-js/print-preprocess.js
similarity index 100%
rename from src/language-js/preprocess.js
rename to src/language-js/print-preprocess.js
diff --git a/src/language-js/printer-estree-json.js b/src/language-js/printer-estree-json.js
index 63af2bd25..61d90c199 100644
--- a/src/language-js/printer-estree-json.js
+++ b/src/language-js/printer-estree-json.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const { concat, hardline, indent, join } = require("../document").builders;
-const preprocess = require("./preprocess");
+const preprocess = require("./print-preprocess");
 
 function genericPrint(path, options, print) {
   const node = path.getValue();
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 9f6c22578..b6be2237f 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -44,7 +44,7 @@ const {
   printHtmlBinding,
   isVueEventBindingExpression,
 } = require("./html-binding");
-const preprocess = require("./preprocess");
+const preprocess = require("./print-preprocess");
 const {
   classChildNeedsASIProtection,
   classPropMayCauseASIProblems,
diff --git a/src/language-markdown/preprocess.js b/src/language-markdown/print-preprocess.js
similarity index 100%
rename from src/language-markdown/preprocess.js
rename to src/language-markdown/print-preprocess.js
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index dad7bbec8..17a6373a0 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -29,7 +29,7 @@ const { replaceEndOfLineWith } = require("../common/util");
 const embed = require("./embed");
 const { insertPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
-const preprocess = require("./preprocess");
+const preprocess = require("./print-preprocess");
 const clean = require("./clean");
 const {
   getFencedCodeBlockValue,

From 6745a2797571e9c86e6f665d12cda168e921b406 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sat, 14 Nov 2020 15:43:11 +0800
Subject: [PATCH 024/299] Refactor: Reduce comment related functions parameters
 (#9621)

---
 src/language-js/comments.js | 349 +++++++++++-------------------------
 1 file changed, 104 insertions(+), 245 deletions(-)

diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index 925cf0a7d..6dd6b85a6 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -19,159 +19,58 @@ const {
 const { locStart, locEnd } = require("./loc");
 
 function handleOwnLineComment(comment, text, options, ast, isLastComment) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
   return (
-    handleIgnoreComments(
-      text,
-      enclosingNode,
-      precedingNode,
-      followingNode,
-      comment
-    ) ||
-    handleLastFunctionArgComments(
-      text,
-      precedingNode,
-      enclosingNode,
-      followingNode,
-      comment
-    ) ||
-    handleMemberExpressionComments(enclosingNode, followingNode, comment) ||
-    handleIfStatementComments(
-      text,
-      precedingNode,
-      enclosingNode,
-      followingNode,
-      comment
-    ) ||
-    handleWhileComments(
-      text,
-      precedingNode,
-      enclosingNode,
-      followingNode,
-      comment
-    ) ||
-    handleTryStatementComments(
-      enclosingNode,
-      precedingNode,
-      followingNode,
-      comment
-    ) ||
-    handleClassComments(enclosingNode, precedingNode, followingNode, comment) ||
-    handleImportSpecifierComments(enclosingNode, comment) ||
-    handleForComments(enclosingNode, precedingNode, comment) ||
-    handleUnionTypeComments(
-      precedingNode,
-      enclosingNode,
-      followingNode,
-      comment
-    ) ||
-    handleOnlyComments(enclosingNode, ast, comment, isLastComment) ||
-    handleImportDeclarationComments(
-      text,
-      enclosingNode,
-      precedingNode,
-      comment
-    ) ||
-    handleAssignmentPatternComments(enclosingNode, comment) ||
-    handleMethodNameComments(text, enclosingNode, precedingNode, comment) ||
-    handleLabeledStatementComments(enclosingNode, comment)
+    handleIgnoreComments(comment) ||
+    handleLastFunctionArgComments(comment, text) ||
+    handleMemberExpressionComments(comment) ||
+    handleIfStatementComments(comment, text) ||
+    handleWhileComments(comment, text) ||
+    handleTryStatementComments(comment) ||
+    handleClassComments(comment) ||
+    handleImportSpecifierComments(comment) ||
+    handleForComments(comment) ||
+    handleUnionTypeComments(comment) ||
+    handleOnlyComments(comment, ast, isLastComment) ||
+    handleImportDeclarationComments(comment, text) ||
+    handleAssignmentPatternComments(comment) ||
+    handleMethodNameComments(comment, text) ||
+    handleLabeledStatementComments(comment)
   );
 }
 
 function handleEndOfLineComment(comment, text, options, ast, isLastComment) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
   return (
-    handleClosureTypeCastComments(followingNode, comment) ||
-    handleLastFunctionArgComments(
-      text,
-      precedingNode,
-      enclosingNode,
-      followingNode,
-      comment
-    ) ||
-    handleConditionalExpressionComments(
-      enclosingNode,
-      precedingNode,
-      followingNode,
-      comment,
-      text
-    ) ||
-    handleImportSpecifierComments(enclosingNode, comment) ||
-    handleIfStatementComments(
-      text,
-      precedingNode,
-      enclosingNode,
-      followingNode,
-      comment
-    ) ||
-    handleWhileComments(
-      text,
-      precedingNode,
-      enclosingNode,
-      followingNode,
-      comment
-    ) ||
-    handleTryStatementComments(
-      enclosingNode,
-      precedingNode,
-      followingNode,
-      comment
-    ) ||
-    handleClassComments(enclosingNode, precedingNode, followingNode, comment) ||
-    handleLabeledStatementComments(enclosingNode, comment) ||
-    handleCallExpressionComments(precedingNode, enclosingNode, comment) ||
-    handlePropertyComments(enclosingNode, comment) ||
-    handleOnlyComments(enclosingNode, ast, comment, isLastComment) ||
-    handleTypeAliasComments(enclosingNode, followingNode, comment) ||
-    handleVariableDeclaratorComments(enclosingNode, followingNode, comment)
+    handleClosureTypeCastComments(comment) ||
+    handleLastFunctionArgComments(comment, text) ||
+    handleConditionalExpressionComments(comment, text) ||
+    handleImportSpecifierComments(comment) ||
+    handleIfStatementComments(comment, text) ||
+    handleWhileComments(comment, text) ||
+    handleTryStatementComments(comment) ||
+    handleClassComments(comment) ||
+    handleLabeledStatementComments(comment) ||
+    handleCallExpressionComments(comment) ||
+    handlePropertyComments(comment) ||
+    handleOnlyComments(comment, ast, isLastComment) ||
+    handleTypeAliasComments(comment) ||
+    handleVariableDeclaratorComments(comment)
   );
 }
 
 function handleRemainingComment(comment, text, options, ast, isLastComment) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
-
   if (
-    handleIgnoreComments(
-      text,
-      enclosingNode,
-      precedingNode,
-      followingNode,
-      comment
-    ) ||
-    handleIfStatementComments(
-      text,
-      precedingNode,
-      enclosingNode,
-      followingNode,
-      comment
-    ) ||
-    handleWhileComments(
-      text,
-      precedingNode,
-      enclosingNode,
-      followingNode,
-      comment
-    ) ||
-    handleObjectPropertyAssignment(enclosingNode, precedingNode, comment) ||
-    handleCommentInEmptyParens(text, enclosingNode, comment) ||
-    handleMethodNameComments(text, enclosingNode, precedingNode, comment) ||
-    handleOnlyComments(enclosingNode, ast, comment, isLastComment) ||
-    handleCommentAfterArrowParams(text, enclosingNode, comment) ||
-    handleFunctionNameComments(text, enclosingNode, precedingNode, comment) ||
-    handleTSMappedTypeComments(
-      text,
-      enclosingNode,
-      precedingNode,
-      followingNode,
-      comment
-    ) ||
-    handleBreakAndContinueStatementComments(enclosingNode, comment) ||
-    handleTSFunctionTrailingComments(
-      text,
-      enclosingNode,
-      followingNode,
-      comment
-    )
+    handleIgnoreComments(comment) ||
+    handleIfStatementComments(comment, text) ||
+    handleWhileComments(comment, text) ||
+    handleObjectPropertyAssignment(comment) ||
+    handleCommentInEmptyParens(comment, text) ||
+    handleMethodNameComments(comment, text) ||
+    handleOnlyComments(comment, ast, isLastComment) ||
+    handleCommentAfterArrowParams(comment, text) ||
+    handleFunctionNameComments(comment, text) ||
+    handleTSMappedTypeComments(comment) ||
+    handleBreakAndContinueStatementComments(comment) ||
+    handleTSFunctionTrailingComments(comment, text)
   ) {
     return true;
   }
@@ -179,13 +78,13 @@ function handleRemainingComment(comment, text, options, ast, isLastComment) {
 }
 
 function addBlockStatementFirstComment(node, comment) {
-  const body = (node.body || node.properties).filter(
-    (n) => n.type !== "EmptyStatement"
+  const firstNonEmptyNode = (node.body || node.properties).find(
+    ({ type }) => type !== "EmptyStatement"
   );
-  if (body.length === 0) {
-    addDanglingComment(node, comment);
+  if (firstNonEmptyNode) {
+    addLeadingComment(firstNonEmptyNode, comment);
   } else {
-    addLeadingComment(body[0], comment);
+    addDanglingComment(node, comment);
   }
 }
 
@@ -197,7 +96,8 @@ function addBlockOrNotComment(node, comment) {
   }
 }
 
-function handleClosureTypeCastComments(followingNode, comment) {
+function handleClosureTypeCastComments(comment) {
+  const { followingNode } = comment;
   if (followingNode && isTypeCastComment(comment)) {
     addLeadingComment(followingNode, comment);
     return true;
@@ -221,13 +121,8 @@ function handleClosureTypeCastComments(followingNode, comment) {
 //     // comment
 //     ...
 //   }
-function handleIfStatementComments(
-  text,
-  precedingNode,
-  enclosingNode,
-  followingNode,
-  comment
-) {
+function handleIfStatementComments(comment, text) {
+  const { precedingNode, enclosingNode, followingNode } = comment;
   if (
     !enclosingNode ||
     enclosingNode.type !== "IfStatement" ||
@@ -289,13 +184,8 @@ function handleIfStatementComments(
   return false;
 }
 
-function handleWhileComments(
-  text,
-  precedingNode,
-  enclosingNode,
-  followingNode,
-  comment
-) {
+function handleWhileComments(comment, text) {
+  const { precedingNode, enclosingNode, followingNode } = comment;
   if (
     !enclosingNode ||
     enclosingNode.type !== "WhileStatement" ||
@@ -333,12 +223,8 @@ function handleWhileComments(
 }
 
 // Same as IfStatement but for TryStatement
-function handleTryStatementComments(
-  enclosingNode,
-  precedingNode,
-  followingNode,
-  comment
-) {
+function handleTryStatementComments(comment) {
+  const { precedingNode, enclosingNode, followingNode } = comment;
   if (
     !enclosingNode ||
     (enclosingNode.type !== "TryStatement" &&
@@ -371,7 +257,9 @@ function handleTryStatementComments(
   return false;
 }
 
-function handleMemberExpressionComments(enclosingNode, followingNode, comment) {
+function handleMemberExpressionComments(comment) {
+  const { enclosingNode, followingNode } = comment;
+
   if (
     enclosingNode &&
     (enclosingNode.type === "MemberExpression" ||
@@ -386,13 +274,8 @@ function handleMemberExpressionComments(enclosingNode, followingNode, comment) {
   return false;
 }
 
-function handleConditionalExpressionComments(
-  enclosingNode,
-  precedingNode,
-  followingNode,
-  comment,
-  text
-) {
+function handleConditionalExpressionComments(comment, text) {
+  const { precedingNode, enclosingNode, followingNode } = comment;
   const isSameLineAsPrecedingNode =
     precedingNode &&
     !hasNewlineInRange(text, locEnd(precedingNode), locStart(comment));
@@ -410,7 +293,8 @@ function handleConditionalExpressionComments(
   return false;
 }
 
-function handleObjectPropertyAssignment(enclosingNode, precedingNode, comment) {
+function handleObjectPropertyAssignment(comment) {
+  const { precedingNode, enclosingNode } = comment;
   if (
     enclosingNode &&
     (enclosingNode.type === "ObjectProperty" ||
@@ -425,12 +309,8 @@ function handleObjectPropertyAssignment(enclosingNode, precedingNode, comment) {
   return false;
 }
 
-function handleClassComments(
-  enclosingNode,
-  precedingNode,
-  followingNode,
-  comment
-) {
+function handleClassComments(comment) {
+  const { precedingNode, enclosingNode, followingNode } = comment;
   if (
     enclosingNode &&
     (enclosingNode.type === "ClassDeclaration" ||
@@ -480,7 +360,8 @@ function handleClassComments(
   return false;
 }
 
-function handleMethodNameComments(text, enclosingNode, precedingNode, comment) {
+function handleMethodNameComments(comment, text) {
+  const { precedingNode, enclosingNode } = comment;
   // This is only needed for estree parsers (flow, typescript) to attach
   // after a method name:
   // obj = { fn /*comment*/() {} };
@@ -522,16 +403,12 @@ function handleMethodNameComments(text, enclosingNode, precedingNode, comment) {
   return false;
 }
 
-function handleFunctionNameComments(
-  text,
-  enclosingNode,
-  precedingNode,
-  comment
-) {
+function handleFunctionNameComments(comment, text) {
   if (getNextNonSpaceNonCommentCharacter(text, comment, locEnd) !== "(") {
     return false;
   }
 
+  const { precedingNode, enclosingNode } = comment;
   if (
     precedingNode &&
     enclosingNode &&
@@ -547,7 +424,8 @@ function handleFunctionNameComments(
   return false;
 }
 
-function handleCommentAfterArrowParams(text, enclosingNode, comment) {
+function handleCommentAfterArrowParams(comment, text) {
+  const { enclosingNode } = comment;
   if (!(enclosingNode && enclosingNode.type === "ArrowFunctionExpression")) {
     return false;
   }
@@ -561,11 +439,12 @@ function handleCommentAfterArrowParams(text, enclosingNode, comment) {
   return false;
 }
 
-function handleCommentInEmptyParens(text, enclosingNode, comment) {
+function handleCommentInEmptyParens(comment, text) {
   if (getNextNonSpaceNonCommentCharacter(text, comment, locEnd) !== ")") {
     return false;
   }
 
+  const { enclosingNode } = comment;
   // Only add dangling comments to fix the case when no params are present,
   // i.e. a function without any argument.
   if (
@@ -591,13 +470,9 @@ function handleCommentInEmptyParens(text, enclosingNode, comment) {
   return false;
 }
 
-function handleLastFunctionArgComments(
-  text,
-  precedingNode,
-  enclosingNode,
-  followingNode,
-  comment
-) {
+function handleLastFunctionArgComments(comment, text) {
+  const { precedingNode, enclosingNode, followingNode } = comment;
+
   // Flow function type definitions
   if (
     precedingNode &&
@@ -659,7 +534,8 @@ function handleLastFunctionArgComments(
   return false;
 }
 
-function handleImportSpecifierComments(enclosingNode, comment) {
+function handleImportSpecifierComments(comment) {
+  const { enclosingNode } = comment;
   if (enclosingNode && enclosingNode.type === "ImportSpecifier") {
     addLeadingComment(enclosingNode, comment);
     return true;
@@ -667,7 +543,8 @@ function handleImportSpecifierComments(enclosingNode, comment) {
   return false;
 }
 
-function handleLabeledStatementComments(enclosingNode, comment) {
+function handleLabeledStatementComments(comment) {
+  const { enclosingNode } = comment;
   if (enclosingNode && enclosingNode.type === "LabeledStatement") {
     addLeadingComment(enclosingNode, comment);
     return true;
@@ -675,7 +552,8 @@ function handleLabeledStatementComments(enclosingNode, comment) {
   return false;
 }
 
-function handleBreakAndContinueStatementComments(enclosingNode, comment) {
+function handleBreakAndContinueStatementComments(comment) {
+  const { enclosingNode } = comment;
   if (
     enclosingNode &&
     (enclosingNode.type === "ContinueStatement" ||
@@ -688,7 +566,8 @@ function handleBreakAndContinueStatementComments(enclosingNode, comment) {
   return false;
 }
 
-function handleCallExpressionComments(precedingNode, enclosingNode, comment) {
+function handleCallExpressionComments(comment) {
+  const { precedingNode, enclosingNode } = comment;
   if (
     enclosingNode &&
     (enclosingNode.type === "CallExpression" ||
@@ -703,12 +582,8 @@ function handleCallExpressionComments(precedingNode, enclosingNode, comment) {
   return false;
 }
 
-function handleUnionTypeComments(
-  precedingNode,
-  enclosingNode,
-  followingNode,
-  comment
-) {
+function handleUnionTypeComments(comment) {
+  const { precedingNode, enclosingNode, followingNode } = comment;
   if (
     enclosingNode &&
     (enclosingNode.type === "UnionTypeAnnotation" ||
@@ -738,7 +613,8 @@ function handleUnionTypeComments(
   return false;
 }
 
-function handlePropertyComments(enclosingNode, comment) {
+function handlePropertyComments(comment) {
+  const { enclosingNode } = comment;
   if (
     enclosingNode &&
     (enclosingNode.type === "Property" ||
@@ -750,7 +626,8 @@ function handlePropertyComments(enclosingNode, comment) {
   return false;
 }
 
-function handleOnlyComments(enclosingNode, ast, comment, isLastComment) {
+function handleOnlyComments(comment, ast, isLastComment) {
+  const { enclosingNode } = comment;
   // With Flow the enclosingNode is undefined so use the AST instead.
   if (ast && ast.body && ast.body.length === 0) {
     if (isLastComment) {
@@ -776,7 +653,8 @@ function handleOnlyComments(enclosingNode, ast, comment, isLastComment) {
   return false;
 }
 
-function handleForComments(enclosingNode, precedingNode, comment) {
+function handleForComments(comment) {
+  const { enclosingNode } = comment;
   if (
     enclosingNode &&
     (enclosingNode.type === "ForInStatement" ||
@@ -788,12 +666,8 @@ function handleForComments(enclosingNode, precedingNode, comment) {
   return false;
 }
 
-function handleImportDeclarationComments(
-  text,
-  enclosingNode,
-  precedingNode,
-  comment
-) {
+function handleImportDeclarationComments(comment, text) {
+  const { precedingNode, enclosingNode } = comment;
   if (
     precedingNode &&
     precedingNode.type === "ImportSpecifier" &&
@@ -807,7 +681,8 @@ function handleImportDeclarationComments(
   return false;
 }
 
-function handleAssignmentPatternComments(enclosingNode, comment) {
+function handleAssignmentPatternComments(comment) {
+  const { enclosingNode } = comment;
   if (enclosingNode && enclosingNode.type === "AssignmentPattern") {
     addLeadingComment(enclosingNode, comment);
     return true;
@@ -815,7 +690,8 @@ function handleAssignmentPatternComments(enclosingNode, comment) {
   return false;
 }
 
-function handleTypeAliasComments(enclosingNode, followingNode, comment) {
+function handleTypeAliasComments(comment) {
+  const { enclosingNode } = comment;
   if (enclosingNode && enclosingNode.type === "TypeAlias") {
     addLeadingComment(enclosingNode, comment);
     return true;
@@ -823,11 +699,8 @@ function handleTypeAliasComments(enclosingNode, followingNode, comment) {
   return false;
 }
 
-function handleVariableDeclaratorComments(
-  enclosingNode,
-  followingNode,
-  comment
-) {
+function handleVariableDeclaratorComments(comment) {
+  const { enclosingNode, followingNode } = comment;
   if (
     enclosingNode &&
     (enclosingNode.type === "VariableDeclarator" ||
@@ -845,12 +718,8 @@ function handleVariableDeclaratorComments(
   return false;
 }
 
-function handleTSFunctionTrailingComments(
-  text,
-  enclosingNode,
-  followingNode,
-  comment
-) {
+function handleTSFunctionTrailingComments(comment, text) {
+  const { enclosingNode, followingNode } = comment;
   if (
     !followingNode &&
     enclosingNode &&
@@ -865,13 +734,8 @@ function handleTSFunctionTrailingComments(
   return false;
 }
 
-function handleIgnoreComments(
-  text,
-  enclosingNode,
-  precedingNode,
-  followingNode,
-  comment
-) {
+function handleIgnoreComments(comment) {
+  const { enclosingNode, followingNode } = comment;
   if (
     isPrettierIgnoreComment(comment) &&
     enclosingNode &&
@@ -886,13 +750,8 @@ function handleIgnoreComments(
   }
 }
 
-function handleTSMappedTypeComments(
-  text,
-  enclosingNode,
-  precedingNode,
-  followingNode,
-  comment
-) {
+function handleTSMappedTypeComments(comment) {
+  const { precedingNode, enclosingNode, followingNode } = comment;
   if (!enclosingNode || enclosingNode.type !== "TSMappedType") {
     return false;
   }

From 0e4ac80f32f2cf8e64aa60ac24cc05a201c6c0ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Nov 2020 10:51:17 +0000
Subject: [PATCH 025/299] Build(deps-dev): Bump eslint-plugin-jest from 24.1.0
 to 24.1.3 (#9657)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 356959c6a..a0cfe5589 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "eslint-config-prettier": "6.15.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.22.1",
-    "eslint-plugin-jest": "24.1.0",
+    "eslint-plugin-jest": "24.1.3",
     "eslint-plugin-prettier-internal-rules": "file:scripts/tools/eslint-plugin-prettier-internal-rules",
     "eslint-plugin-react": "7.21.5",
     "eslint-plugin-unicorn": "23.0.0",
diff --git a/yarn.lock b/yarn.lock
index 9ee514fd6..df1c7b26c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3153,10 +3153,10 @@ eslint-plugin-import@2.22.1:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-jest@24.1.0:
-  version "24.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.1.0.tgz#6708037d7602e5288ce877fd0103f329dc978361"
-  integrity sha512-827YJ+E8B9PvXu/0eiVSNFfxxndbKv+qE/3GSMhdorCaeaOehtqHGX2YDW9B85TEOre9n/zscledkFW/KbnyGg==
+eslint-plugin-jest@24.1.3:
+  version "24.1.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.1.3.tgz#fa3db864f06c5623ff43485ca6c0e8fc5fe8ba0c"
+  integrity sha512-dNGGjzuEzCE3d5EPZQ/QGtmlMotqnYWD/QpCZ1UuZlrMAdhG5rldh0N0haCvhGnUkSeuORS5VNROwF9Hrgn3Lg==
   dependencies:
     "@typescript-eslint/experimental-utils" "^4.0.1"
 

From fb6b92e7c452a9f555cbefeba6e2a7e83d75f936 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Nov 2020 10:51:29 +0000
Subject: [PATCH 026/299] Build(deps): Bump @glimmer/syntax from 0.63.5 to
 0.64.0 (#9656)

---
 package.json |  2 +-
 yarn.lock    | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index a0cfe5589..c6e1e2e82 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "10.2.3",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.5",
-    "@glimmer/syntax": "0.63.5",
+    "@glimmer/syntax": "0.64.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "3.10.1",
     "angular-estree-parser": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index df1c7b26c..8df84b7a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -908,6 +908,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.64.0.tgz#8d6330ece98e20c97608ec6429fc9732824452bc"
+  integrity sha512-Y7HmwqtBNOzu9RL8N4WGQGGNCIO8REMORewMbnrZtLuFWcdDPCGVlNkxC77GStkHD+V54oEoW9Y+84MLFxkicg==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/reference@0.63.5":
   version "0.63.5"
   resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.63.5.tgz#bc99049c9400994641dea054e58bff61e1e31187"
@@ -919,13 +926,13 @@
     "@glimmer/util" "0.63.5"
     "@glimmer/validator" "0.63.5"
 
-"@glimmer/syntax@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.63.5.tgz#38ef6e41d9da3474ebc5d704c0e9743367de728e"
-  integrity sha512-w0/X7jQ5tzO6KevzeP1QBEfS2qjc897JlQa+9eMcFkxRxZCH4IVUjyxeRuu9cY0uV16ByVBTFh9fcGPfgaYULQ==
+"@glimmer/syntax@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.64.0.tgz#4e665c8936dfb93c17bb53a2f355342fa29662b5"
+  integrity sha512-BVziEjDC7EKvPv4O3B9hfkevihiqZkBlWBkZbTJe45wImfl+6A4KvwP/s8r5u/yAhYnsA3LO77IuoYYr/I08Tg==
   dependencies:
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/util" "0.63.5"
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/util" "0.64.0"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
@@ -938,6 +945,15 @@
     "@glimmer/interfaces" "0.63.5"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.64.0.tgz#872103ebb2313a693161ec69e5b70252b56a6cd5"
+  integrity sha512-evcvCmQ2VUgWQF3ecDwtkwW+D+FL2f4Z0X8XDUgHQTGbA9PkqQRwyyD0WdURVPYpt3YkbR1VLapADll9fjpevg==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.64.0"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.63.5":
   version "0.63.5"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.63.5.tgz#8d196f1f29191c5ecd60ea5c87d1081f68dff840"

From 804684197821fdc40fb7ea160adf00fb03c02062 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Nov 2020 10:51:46 +0000
Subject: [PATCH 027/299] Build(deps): Bump n-readlines from 1.0.0 to 1.0.1
 (#9647)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c6e1e2e82..b9ec9f5a2 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "meriyah": "3.1.6",
     "minimatch": "3.0.4",
     "minimist": "1.2.5",
-    "n-readlines": "1.0.0",
+    "n-readlines": "1.0.1",
     "outdent": "0.7.1",
     "parse-srcset": "ikatyang/parse-srcset#54eb9c1cb21db5c62b4d0e275d7249516df6f0ee",
     "please-upgrade-node": "3.2.0",
diff --git a/yarn.lock b/yarn.lock
index 8df84b7a5..ff31b9ec6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5390,10 +5390,10 @@ multimap@^1.1.0:
   resolved "https://registry.yarnpkg.com/multimap/-/multimap-1.1.0.tgz#5263febc085a1791c33b59bb3afc6a76a2a10ca8"
   integrity sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==
 
-n-readlines@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/n-readlines/-/n-readlines-1.0.0.tgz#c353797f216c253fdfef7e91da4e8b17c29a91a6"
-  integrity sha512-ISDqGcspVu6U3VKqtJZG1uR55SmNNF9uK0EMq1IvNVVZOui6MW6VR0+pIZhqz85ORAGp+4zW+5fJ/SE7bwEibA==
+n-readlines@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/n-readlines/-/n-readlines-1.0.1.tgz#bbb7364d38bc31a170a199f986fcacfa76b95f6e"
+  integrity sha512-z4SyAIVgMy7CkgsoNw7YVz40v0g4+WWvvqy8+ZdHrCtgevcEO758WQyrYcw3XPxcLxF+//RszTz/rO48nzD0wQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"

From e721ef30ea0ae287936b42e29e4d436ddcc5c06a Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Sat, 14 Nov 2020 13:17:01 +0200
Subject: [PATCH 028/299] Flatten function expression parameters in hugged last
 argument (#9662)

Fixes #3376
This was done for arrow functions in #1305 ("Avoid breaking arguments for last arg expansion").
This PR enables the same for function expressions unless the function expression is the only argument.
---
 changelog_unreleased/javascript/pr-9662.md    |  29 ++++
 src/language-js/printer-estree.js             |  15 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 142 ++++++++++++------
 .../function-expression.js                    |  20 +++
 4 files changed, 158 insertions(+), 48 deletions(-)
 create mode 100644 changelog_unreleased/javascript/pr-9662.md
 create mode 100644 tests/js/last-argument-expansion/function-expression.js

diff --git a/changelog_unreleased/javascript/pr-9662.md b/changelog_unreleased/javascript/pr-9662.md
new file mode 100644
index 000000000..ec48a9bb3
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-9662.md
@@ -0,0 +1,29 @@
+#### Flatten function expression parameters in hugged last argument (#9662 by @thorn0)
+
+<!-- prettier-ignore -->
+```jsx
+// Prettier stable
+function* mySagas() {
+  yield effects.takeEvery(rexpress.actionTypes.REQUEST_START, function* ({
+    id
+  }) {
+    console.log(id);
+    yield rexpress.actions(store).writeHead(id, 400);
+    yield rexpress.actions(store).end(id, "pong");
+    console.log("pong");
+  });
+}
+
+// Prettier master
+function* mySagas() {
+  yield effects.takeEvery(
+    rexpress.actionTypes.REQUEST_START,
+    function* ({ id }) {
+      console.log(id);
+      yield rexpress.actions(store).writeHead(id, 400);
+      yield rexpress.actions(store).end(id, "pong");
+      console.log("pong");
+    }
+  );
+}
+```
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index b6be2237f..d9473ed70 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -644,7 +644,16 @@ function printPathNoParens(path, options, print, args) {
       ]);
     case "FunctionDeclaration":
     case "FunctionExpression":
-      parts.push(printFunctionDeclaration(path, print, options));
+      parts.push(
+        printFunctionDeclaration(
+          path,
+          print,
+          options,
+          args &&
+            args.expandLastArg &&
+            getCallArguments(path.getParentNode()).length > 1
+        )
+      );
       if (!n.body) {
         parts.push(semi);
       }
@@ -3736,7 +3745,7 @@ function canPrintParamsWithoutParens(node) {
   );
 }
 
-function printFunctionDeclaration(path, print, options) {
+function printFunctionDeclaration(path, print, options, expandArg) {
   const n = path.getValue();
   const parts = [];
 
@@ -3758,7 +3767,7 @@ function printFunctionDeclaration(path, print, options) {
     printFunctionTypeParameters(path, options, print),
     group(
       concat([
-        printFunctionParameters(path, print, options),
+        printFunctionParameters(path, print, options, expandArg),
         printReturnType(path, print, options),
       ])
     ),
diff --git a/tests/js/last-argument-expansion/__snapshots__/jsfmt.spec.js.snap b/tests/js/last-argument-expansion/__snapshots__/jsfmt.spec.js.snap
index c52a30092..54cf63cff 100644
--- a/tests/js/last-argument-expansion/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/last-argument-expansion/__snapshots__/jsfmt.spec.js.snap
@@ -186,26 +186,26 @@ a(
 
 exports.examples = [
   {
-    render: withGraphQLQuery("node(1234567890){image{uri}}", function (
-      container,
-      data
-    ) {
-      return (
-        <div>
-          <InlineBlock>
-            <img
-              src={data[1234567890].image.uri}
-              style={{
-                position: "absolute",
-                top: "0",
-                left: "0",
-                zIndex: "-1",
-              }}
-            />
-          </InlineBlock>
-        </div>
-      );
-    }),
+    render: withGraphQLQuery(
+      "node(1234567890){image{uri}}",
+      function (container, data) {
+        return (
+          <div>
+            <InlineBlock>
+              <img
+                src={data[1234567890].image.uri}
+                style={{
+                  position: "absolute",
+                  top: "0",
+                  left: "0",
+                  zIndex: "-1",
+                }}
+              />
+            </InlineBlock>
+          </div>
+        );
+      }
+    ),
   },
 ];
 
@@ -217,32 +217,32 @@ someReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReal
   ]
 );
 
-(function webpackUniversalModuleDefinition() {})(this, function (
-  __WEBPACK_EXTERNAL_MODULE_85__,
-  __WEBPACK_EXTERNAL_MODULE_115__
-) {
-  return /******/ (function (modules) {
-    // webpackBootstrap
-    /******/
-  })(
-    /************************************************************************/
-    /******/ [
-      /* 0 */
-      /***/ function (module, exports, __webpack_require__) {
-        /***/
-      },
-      /* 1 */
-      /***/ function (module, exports, __webpack_require__) {
-        /***/
-      },
-      /* 2 */
-      /***/ function (module, exports, __webpack_require__) {
-        /***/
-      },
+(function webpackUniversalModuleDefinition() {})(
+  this,
+  function (__WEBPACK_EXTERNAL_MODULE_85__, __WEBPACK_EXTERNAL_MODULE_115__) {
+    return /******/ (function (modules) {
+      // webpackBootstrap
       /******/
-    ]
-  );
-});
+    })(
+      /************************************************************************/
+      /******/ [
+        /* 0 */
+        /***/ function (module, exports, __webpack_require__) {
+          /***/
+        },
+        /* 1 */
+        /***/ function (module, exports, __webpack_require__) {
+          /***/
+        },
+        /* 2 */
+        /***/ function (module, exports, __webpack_require__) {
+          /***/
+        },
+        /******/
+      ]
+    );
+  }
+);
 
 ================================================================================
 `;
@@ -309,6 +309,58 @@ func(
 ================================================================================
 `;
 
+exports[`function-expression.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+function* mySagas() {
+  yield effects.takeEvery(
+    rexpress.actionTypes.REQUEST_START,
+    function*({ id }) {
+      console.log(id);
+      yield rexpress.actions(store).writeHead(id, 400);
+      yield rexpress.actions(store).end(id, 'pong');
+      console.log('pong');
+    }
+  );
+}
+
+function mySagas2() {
+  return effects.takeEvery(
+    rexpress.actionTypes.REQUEST_START,
+    function({ id }) {
+      console.log(id);
+    }
+  );
+}
+
+=====================================output=====================================
+function* mySagas() {
+  yield effects.takeEvery(
+    rexpress.actionTypes.REQUEST_START,
+    function* ({ id }) {
+      console.log(id);
+      yield rexpress.actions(store).writeHead(id, 400);
+      yield rexpress.actions(store).end(id, "pong");
+      console.log("pong");
+    }
+  );
+}
+
+function mySagas2() {
+  return effects.takeEvery(
+    rexpress.actionTypes.REQUEST_START,
+    function ({ id }) {
+      console.log(id);
+    }
+  );
+}
+
+================================================================================
+`;
+
 exports[`jsx.js format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow"]
diff --git a/tests/js/last-argument-expansion/function-expression.js b/tests/js/last-argument-expansion/function-expression.js
new file mode 100644
index 000000000..dc369091b
--- /dev/null
+++ b/tests/js/last-argument-expansion/function-expression.js
@@ -0,0 +1,20 @@
+function* mySagas() {
+  yield effects.takeEvery(
+    rexpress.actionTypes.REQUEST_START,
+    function*({ id }) {
+      console.log(id);
+      yield rexpress.actions(store).writeHead(id, 400);
+      yield rexpress.actions(store).end(id, 'pong');
+      console.log('pong');
+    }
+  );
+}
+
+function mySagas2() {
+  return effects.takeEvery(
+    rexpress.actionTypes.REQUEST_START,
+    function({ id }) {
+      console.log(id);
+    }
+  );
+}

From ae22b4716ffb2bde0c7ffd0546a3ac93281a960b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Nov 2020 11:51:20 +0000
Subject: [PATCH 029/299] Build(deps): Bump resolve from 1.18.1 to 1.19.0
 (#9641)

---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index b9ec9f5a2..f97576800 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "remark-footnotes": "2.0.0",
     "remark-math": "1.0.6",
     "remark-parse": "8.0.3",
-    "resolve": "1.18.1",
+    "resolve": "1.19.0",
     "semver": "7.3.2",
     "string-width": "4.2.0",
     "typescript": "4.0.5",
diff --git a/yarn.lock b/yarn.lock
index ff31b9ec6..ca5ddd2b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4065,10 +4065,10 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-core-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.0.0.tgz#58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
-  integrity sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==
+is-core-module@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
+  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
   dependencies:
     has "^1.0.3"
 
@@ -6330,12 +6330,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.18.1, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
-  integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==
+resolve@1.19.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
   dependencies:
-    is-core-module "^2.0.0"
+    is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
 ret@~0.1.10:

From e56dbba6c71c941219f04fe199e52615acad2c48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Nov 2020 06:11:16 -0800
Subject: [PATCH 030/299] Build(deps-dev): Bump @glimmer/reference from 0.63.5
 to 0.65.0 (#9675)

---
 package.json |  2 +-
 yarn.lock    | 66 ++++++++++++++++++++++++++--------------------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index f97576800..00580a2af 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.3",
     "@babel/preset-env": "7.12.1",
     "@babel/types": "7.12.6",
-    "@glimmer/reference": "0.63.5",
+    "@glimmer/reference": "0.65.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.1",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index ca5ddd2b7..3d6ad5d4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -894,20 +894,13 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.63.5.tgz#4a8da4fee97d13a376549ceecebd16a5ffc8c4f6"
-  integrity sha512-xYsptoxo9ROos83oxG8ZT4e8T2QgsH+FdZxsPZNTN4WLumU2LTkxJQaiosW9q294IVY/mIVhZAohJkfNCvSwug==
+"@glimmer/global-context@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.65.0.tgz#96d8b99d1a805be72d4dcf5d2eb90cd2ecfff550"
+  integrity sha512-czdgBmQRHFdrpKicZ1qJ0cd2yzNf/T4OV9VT+7dR356At3C7OWU0GJiIfA1IcW7nqS7x27rC8GDsUZm0ntEFRQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.63.5.tgz#ac614608ea618022b61b5d09e66089ceffc26e6e"
-  integrity sha512-ogozdIFOSxJ2QBU2NE0pk993qbb/zY1wF4BFL1ZN2GrfDDdaYC5vmDSs+RpbbF6JAjrt4kADXlOocs7dBiX4iQ==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.64.0":
   version "0.64.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.64.0.tgz#8d6330ece98e20c97608ec6429fc9732824452bc"
@@ -915,16 +908,23 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.63.5.tgz#bc99049c9400994641dea054e58bff61e1e31187"
-  integrity sha512-uE5O5eFcaKedomCDfendXjA7Sh9MYZG5RhadSSA8iD6TUlXxdpIe++tcRzNQOcMwHNbh+Bx7jX50jxtA1ShibQ==
+"@glimmer/interfaces@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.65.0.tgz#e3852efb63fc9f18268991caea4ab362b75ae231"
+  integrity sha512-Ka9/w1u7SjWt8ZKa3Gs9IbFtLLDlaCdCTO7B+/Lat0bxGIctyEAyjxUdVqUwXWO4pMfkEFWKBP3L/t9CRT8sVQ==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/reference@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.65.0.tgz#8863308d0865d45ae1fc5d07d5ccef9da4dff2d7"
+  integrity sha512-Cxb5Q91x+oV494dMtjx/fo5QudFCI1yJ4gg2Uj9hWWp2r8EqRmW2rlboLdnkjBDuY5MMuqwY9I8mc+SSAqQ46w==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.63.5"
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/util" "0.63.5"
-    "@glimmer/validator" "0.63.5"
+    "@glimmer/global-context" "0.65.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/util" "0.65.0"
+    "@glimmer/validator" "0.65.0"
 
 "@glimmer/syntax@0.64.0":
   version "0.64.0"
@@ -936,15 +936,6 @@
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.63.5.tgz#8f2ed10269fcf6ccaf4cc0338915cc618ed845d0"
-  integrity sha512-9eTXOx3l6N1YySBMe1Vb/F+SGuztgObQCoEVtvxUZ7VB37xTaaUEoZfQVQJyBizFIKIAOvXBhPYCT+cERvN7kw==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.63.5"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.64.0":
   version "0.64.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.64.0.tgz#872103ebb2313a693161ec69e5b70252b56a6cd5"
@@ -954,13 +945,22 @@
     "@glimmer/interfaces" "0.64.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.63.5.tgz#8d196f1f29191c5ecd60ea5c87d1081f68dff840"
-  integrity sha512-+/YHIKrspDrqnAz4hE+VgIL2O6tZPxKA9KfI5syDcr+zxQeLjC/7ng6AK2g6+w8nHoS5WOABbA/gpH+wTV6ulQ==
+"@glimmer/util@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.65.0.tgz#8a90382500334e415415bf51b269bc7484b17543"
+  integrity sha512-tfsKVJpCJ5ADWXgpouiitIKlNacWQseYAlppgn8Y6LnzxcywgnumwFObkfzYlFE6Nd1IiymNxgEeSNJKylWl1A==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.65.0"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/validator@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.65.0.tgz#e4411e0a979f002efe236e3bcc91de5f5aaeaed2"
+  integrity sha512-nwFReFT9zOOV+9iSqhNookTfHbOsqqPvtsALXl5Rn4QmtAHFLdehiWyN6ddb/sJwllWq+fNW8DxQdiY1xRwn9A==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.63.5"
+    "@glimmer/global-context" "0.65.0"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From 35a149702472dbb524e13af22beb074e816ec8d7 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 16 Nov 2020 01:03:35 +0800
Subject: [PATCH 031/299] Update `remark-math` to v3 (#7938)

* bump remark-math to 3.0.1

* escape $ only it was escaped in the input

* remove unsupported syntax from tests

remark-math@3 doesn't support text after the closing fence ($$). Such $$ aren't parsed as a closing fence anymore.

* refactor

* add a test

Co-authored-by: Georgii Dolzhykov <thorn.mailbox@gmail.com>
---
 changelog_unreleased/markdown/pr-7938.md      | 19 +++++++++++++
 package.json                                  |  2 +-
 src/language-markdown/print-preprocess.js     | 28 ++++++++-----------
 src/language-markdown/printer-markdown.js     |  2 +-
 .../math/__snapshots__/jsfmt.spec.js.snap     | 17 +++++++----
 tests/markdown/math/math-like.md              |  2 ++
 tests/markdown/math/remark-math.md            |  2 +-
 .../spec/__snapshots__/jsfmt.spec.js.snap     |  2 +-
 yarn.lock                                     | 12 ++++----
 9 files changed, 53 insertions(+), 33 deletions(-)
 create mode 100644 changelog_unreleased/markdown/pr-7938.md

diff --git a/changelog_unreleased/markdown/pr-7938.md b/changelog_unreleased/markdown/pr-7938.md
new file mode 100644
index 000000000..97e0b9d17
--- /dev/null
+++ b/changelog_unreleased/markdown/pr-7938.md
@@ -0,0 +1,19 @@
+#### Update remark-math to 3.0.1; escape dollar signs only if originally escaped (#7938 by @fisker and @thorn0)
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+Paragraph with $14 million.
+
+Paragraph with $14 million.    But if more $dollars on the same line...
+
+<!-- Prettier stable -->
+Paragraph with \$14 million.
+
+Paragraph with $14 million.    But if more $dollars on the same line...
+
+<!-- Prettier master -->
+Paragraph with $14 million.
+
+Paragraph with $14 million. But if more $dollars on the same line...
+```
diff --git a/package.json b/package.json
index 00580a2af..e76adcff4 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "postcss-values-parser": "2.0.1",
     "regexp-util": "1.2.2",
     "remark-footnotes": "2.0.0",
-    "remark-math": "1.0.6",
+    "remark-math": "3.0.1",
     "remark-parse": "8.0.3",
     "resolve": "1.19.0",
     "semver": "7.3.2",
diff --git a/src/language-markdown/print-preprocess.js b/src/language-markdown/print-preprocess.js
index 5b97c7e42..afde0c065 100644
--- a/src/language-markdown/print-preprocess.js
+++ b/src/language-markdown/print-preprocess.js
@@ -39,25 +39,21 @@ function transformInlineCode(ast) {
 }
 
 function restoreUnescapedCharacter(ast, options) {
-  return mapAst(ast, (node) => {
-    return node.type !== "text"
+  return mapAst(ast, (node) =>
+    node.type !== "text" ||
+    node.value === "*" ||
+    node.value === "_" || // handle these cases in printer
+    !isSingleCharRegex.test(node.value) ||
+    node.position.end.offset - node.position.start.offset === node.value.length
       ? node
       : {
           ...node,
-          value:
-            node.value !== "*" &&
-            node.value !== "_" &&
-            node.value !== "$" && // handle these cases in printer
-            isSingleCharRegex.test(node.value) &&
-            node.position.end.offset - node.position.start.offset !==
-              node.value.length
-              ? options.originalText.slice(
-                  node.position.start.offset,
-                  node.position.end.offset
-                )
-              : node.value,
-        };
-  });
+          value: options.originalText.slice(
+            node.position.start.offset,
+            node.position.end.offset
+          ),
+        }
+  );
 }
 
 function mergeContinuousImportExport(ast) {
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index 17a6373a0..5ea2257b8 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -94,7 +94,7 @@ function genericPrint(path, options, print) {
       return printChildren(path, options, print);
     case "word": {
       let escapedValue = node.value
-        .replace(/[$*]/g, "\\$&") // escape all `*` and `$` (math)
+        .replace(/\*/g, "\\$&") // escape all `*`
         .replace(
           new RegExp(
             [
diff --git a/tests/markdown/math/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/math/__snapshots__/jsfmt.spec.js.snap
index 04f8107b4..a7f91efd7 100644
--- a/tests/markdown/math/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/markdown/math/__snapshots__/jsfmt.spec.js.snap
@@ -15,11 +15,11 @@ $
 \\\\\\$
 
 =====================================output=====================================
-\\$
+$
 
 \\$
 
-\\\\\\$
+\\\\$
 
 \\\\\\$
 
@@ -50,9 +50,13 @@ printWidth: 80
 =====================================input======================================
 $10 - $20
 
+Paragraph with $14 million.    But if more $dollars on the same line...
+
 =====================================output=====================================
 $10 - $20
 
+Paragraph with $14 million. But if more $dollars on the same line...
+
 ================================================================================
 `;
 
@@ -136,7 +140,7 @@ $$
 
 $$  must
 \\alpha
-$$  be ignored
+$$
 
 ---
 
@@ -156,7 +160,7 @@ $$
 
 ---
 
-\\$\\alpha\\$
+$\\alpha\\$
 
 ---
 
@@ -168,11 +172,11 @@ $$
 
 ---
 
-\`$\`\\alpha\\$
+\`$\`\\alpha$
 
 ---
 
-\\$\\alpha\`$\` foo
+$\\alpha\`$\` foo
 
 ---
 
@@ -223,6 +227,7 @@ $$
 ---
 
 $$
+must
 \\alpha
 $$
 
diff --git a/tests/markdown/math/math-like.md b/tests/markdown/math/math-like.md
index 832901386..95e606e37 100644
--- a/tests/markdown/math/math-like.md
+++ b/tests/markdown/math/math-like.md
@@ -1 +1,3 @@
 $10 - $20
+
+Paragraph with $14 million.    But if more $dollars on the same line...
diff --git a/tests/markdown/math/remark-math.md b/tests/markdown/math/remark-math.md
index 1c1a6ca92..dbf1828d8 100644
--- a/tests/markdown/math/remark-math.md
+++ b/tests/markdown/math/remark-math.md
@@ -72,7 +72,7 @@ $$
 
 $$  must
 \alpha
-$$  be ignored
+$$
 
 ---
 
diff --git a/tests/markdown/spec/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/spec/__snapshots__/jsfmt.spec.js.snap
index 5af5a7b02..4be0bcab9 100644
--- a/tests/markdown/spec/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/markdown/spec/__snapshots__/jsfmt.spec.js.snap
@@ -10750,7 +10750,7 @@ proseWrap: "always"
 hello $.;'there
 
 =====================================output=====================================
-hello \\$.;'there
+hello $.;'there
 
 ================================================================================
 `;
diff --git a/yarn.lock b/yarn.lock
index 3d6ad5d4a..a9259cae6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6202,12 +6202,10 @@ remark-footnotes@2.0.0:
   resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f"
   integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==
 
-remark-math@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/remark-math/-/remark-math-1.0.6.tgz#49eb3dd15d298734c9ae21673115389793af4d1b"
-  integrity sha512-I43wU/QOQpXvVFXKjA4FHp5xptK65+5F6yolm8+69/JV0EqSOB64wURUZ3JK50JtnTL8FvwLiH2PZ+fvsBxviA==
-  dependencies:
-    trim-trailing-lines "^1.1.0"
+remark-math@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/remark-math/-/remark-math-3.0.1.tgz#85a02a15b15cad34b89a27244d4887b3a95185bb"
+  integrity sha512-epT77R/HK0x7NqrWHdSV75uNLwn8g9qTyMqCRCDujL0vj/6T6+yhdrR7mjELWtkse+Fw02kijAaBuVcHBor1+Q==
 
 remark-parse@8.0.3:
   version "8.0.3"
@@ -7083,7 +7081,7 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
-trim-trailing-lines@^1.0.0, trim-trailing-lines@^1.1.0:
+trim-trailing-lines@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz#7f0739881ff76657b7776e10874128004b625a94"
   integrity sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==

From f9f66711b9ecee811a9f3a6855cb646cf39fea2a Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 16 Nov 2020 01:11:53 +0800
Subject: [PATCH 032/299] Fix comments in `require()` with no argument (#9670)

---
 changelog_unreleased/javascript/pr-9670.md    | 13 ++++
 src/language-js/printer-estree.js             | 16 ++--
 .../__snapshots__/jsfmt.spec.js.snap          | 73 +++++++++++++++++++
 tests/js/call/no-argument/import.js           |  2 +
 tests/js/call/no-argument/jsfmt.spec.js       |  8 ++
 tests/js/call/no-argument/special-cases.js    |  6 ++
 6 files changed, 111 insertions(+), 7 deletions(-)
 create mode 100644 changelog_unreleased/javascript/pr-9670.md
 create mode 100644 tests/js/call/no-argument/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/js/call/no-argument/import.js
 create mode 100644 tests/js/call/no-argument/jsfmt.spec.js
 create mode 100644 tests/js/call/no-argument/special-cases.js

diff --git a/changelog_unreleased/javascript/pr-9670.md b/changelog_unreleased/javascript/pr-9670.md
new file mode 100644
index 000000000..5c79184ec
--- /dev/null
+++ b/changelog_unreleased/javascript/pr-9670.md
@@ -0,0 +1,13 @@
+#### Fix crash on `require(/* comment */)` (#9670 by @fisker)
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+require(/* comment */)
+
+// Prettier stable
+Error: Comment "comment" was not printed. Please report this error!
+
+// Prettier master
+require(/* comment */);
+```
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index d9473ed70..a4f179e3b 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -974,19 +974,21 @@ function printPathNoParens(path, options, print, args) {
       const optional = printOptionalToken(path);
       const args = getCallArguments(n);
       if (
+        // Dangling comments not handled, all these special cases should has argument #9668
+        args.length > 0 &&
         // We want to keep CommonJS- and AMD-style require calls, and AMD-style
         // define calls, as a unit.
         // e.g. `define(["some/lib", (lib) => {`
-        (!isDynamicImport &&
+        ((!isDynamicImport &&
           !isNew &&
           n.callee.type === "Identifier" &&
           (n.callee.name === "require" || n.callee.name === "define")) ||
-        // Template literals as single arguments
-        (args.length === 1 &&
-          isTemplateOnItsOwnLine(args[0], options.originalText)) ||
-        // Keep test declarations on a single line
-        // e.g. `it('long name', () => {`
-        (!isNew && isTestCall(n, path.getParentNode()))
+          // Template literals as single arguments
+          (args.length === 1 &&
+            isTemplateOnItsOwnLine(args[0], options.originalText)) ||
+          // Keep test declarations on a single line
+          // e.g. `it('long name', () => {`
+          (!isNew && isTestCall(n, path.getParentNode())))
       ) {
         const printed = [];
         iterateCallArgumentsPath(path, (argPath) => {
diff --git a/tests/js/call/no-argument/__snapshots__/jsfmt.spec.js.snap b/tests/js/call/no-argument/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..d211bc9a1
--- /dev/null
+++ b/tests/js/call/no-argument/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,73 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`import.js [espree] format 1`] = `
+"Unexpected token ) (1:21)
+> 1 | import(/* comment */)
+    |                     ^
+  2 | new import(/* comment */)
+  3 | "
+`;
+
+exports[`import.js [flow] format 1`] = `
+"Unexpected token \`)\` (1:21)
+> 1 | import(/* comment */)
+    |                     ^
+  2 | new import(/* comment */)
+  3 | "
+`;
+
+exports[`import.js [meriyah] format 1`] = `
+"[1:21]: Unexpected token: ')' (1:21)
+> 1 | import(/* comment */)
+    |                     ^
+  2 | new import(/* comment */)
+  3 | "
+`;
+
+exports[`import.js [typescript] format 1`] = `
+"Expression expected. (2:5)
+  1 | import(/* comment */)
+> 2 | new import(/* comment */)
+    |     ^
+  3 | "
+`;
+
+exports[`import.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+import(/* comment */)
+new import(/* comment */)
+
+=====================================output=====================================
+import(/* comment */);
+new import(/* comment */);
+
+================================================================================
+`;
+
+exports[`special-cases.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+require(/* comment */)
+new require(/* comment */)
+define(/* comment */)
+new define(/* comment */)
+it(/* comment */)
+new it(/* comment */)
+
+=====================================output=====================================
+require(/* comment */);
+new require(/* comment */);
+define(/* comment */);
+new define(/* comment */);
+it(/* comment */);
+new it(/* comment */);
+
+================================================================================
+`;
diff --git a/tests/js/call/no-argument/import.js b/tests/js/call/no-argument/import.js
new file mode 100644
index 000000000..05c1f508b
--- /dev/null
+++ b/tests/js/call/no-argument/import.js
@@ -0,0 +1,2 @@
+import(/* comment */)
+new import(/* comment */)
diff --git a/tests/js/call/no-argument/jsfmt.spec.js b/tests/js/call/no-argument/jsfmt.spec.js
new file mode 100644
index 000000000..7fa97b7ad
--- /dev/null
+++ b/tests/js/call/no-argument/jsfmt.spec.js
@@ -0,0 +1,8 @@
+run_spec(__dirname, ["babel", "flow", "typescript"], {
+  errors: {
+    espree: ["import.js"],
+    meriyah: ["import.js"],
+    flow: ["import.js"],
+    typescript: ["import.js"],
+  },
+});
diff --git a/tests/js/call/no-argument/special-cases.js b/tests/js/call/no-argument/special-cases.js
new file mode 100644
index 000000000..23d50de2a
--- /dev/null
+++ b/tests/js/call/no-argument/special-cases.js
@@ -0,0 +1,6 @@
+require(/* comment */)
+new require(/* comment */)
+define(/* comment */)
+new define(/* comment */)
+it(/* comment */)
+new it(/* comment */)

From dc541cc9b97540ad31d62c686d79610dce4c1a7d Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 16 Nov 2020 01:15:01 +0800
Subject: [PATCH 033/299] JS: Refactor embed (#9653)

---
 src/language-js/embed.js                  | 399 +---------------------
 src/language-js/embed/css.js              | 103 ++++++
 src/language-js/embed/graphql.js          | 114 +++++++
 src/language-js/embed/html.js             | 109 ++++++
 src/language-js/embed/markdown.js         |  42 +++
 src/language-js/print/template-literal.js |  48 ++-
 src/language-js/printer-estree.js         |   2 +-
 7 files changed, 432 insertions(+), 385 deletions(-)
 create mode 100644 src/language-js/embed/css.js
 create mode 100644 src/language-js/embed/graphql.js
 create mode 100644 src/language-js/embed/html.js
 create mode 100644 src/language-js/embed/markdown.js

diff --git a/src/language-js/embed.js b/src/language-js/embed.js
index 9daf9b028..7c7ee3eb9 100644
--- a/src/language-js/embed.js
+++ b/src/language-js/embed.js
@@ -1,31 +1,20 @@
 "use strict";
 
-const {
-  builders: {
-    indent,
-    join,
-    line,
-    hardline,
-    softline,
-    literalline,
-    concat,
-    group,
-    dedentToRoot,
-    lineSuffixBoundary,
-  },
-  utils: { mapDoc, replaceNewlinesWithLiterallines },
-} = require("../document");
 const { isBlockComment } = require("./utils");
 const { hasLeadingComment } = require("./comments");
+const formatMarkdown = require("./embed/markdown");
+const formatCss = require("./embed/css");
+const formatGraphql = require("./embed/graphql");
+const formatHtml = require("./embed/html");
 
-function getParser(path) {
+function getLanguage(path) {
   if (
     isStyledJsx(path) ||
     isStyledComponents(path) ||
     isCssProp(path) ||
     isAngularComponentStyles(path)
   ) {
-    return "scss";
+    return "css";
   }
 
   if (isGraphQL(path)) {
@@ -57,130 +46,25 @@ function embed(path, print, textToDoc, options) {
     return;
   }
 
-  const parser = getParser(path);
-  if (!parser) {
+  const language = getLanguage(path);
+  if (!language) {
     return;
   }
 
-  if (parser === "markdown") {
-    let text = node.quasis[0].value.raw.replace(
-      /((?:\\\\)*)\\`/g,
-      (_, backslashes) => "\\".repeat(backslashes.length / 2) + "`"
-    );
-    const indentation = getIndentation(text);
-    const hasIndent = indentation !== "";
-    if (hasIndent) {
-      text = text.replace(new RegExp(`^${indentation}`, "gm"), "");
-    }
-    const doc = printMarkdown(text, textToDoc);
-    return concat([
-      "`",
-      hasIndent
-        ? indent(concat([softline, doc]))
-        : concat([literalline, dedentToRoot(doc)]),
-      softline,
-      "`",
-    ]);
+  if (language === "markdown") {
+    return formatMarkdown(path, print, textToDoc);
   }
 
-  const expressionDocs = path.map(
-    (path) => printTemplateExpression(path, print),
-    "expressions"
-  );
-
-  if (parser === "scss") {
-    // Get full template literal with expressions replaced by placeholders
-    const rawQuasis = node.quasis.map((q) => q.value.raw);
-    let placeholderID = 0;
-    const text = rawQuasis.reduce((prevVal, currVal, idx) => {
-      return idx === 0
-        ? currVal
-        : prevVal +
-            "@prettier-placeholder-" +
-            placeholderID++ +
-            "-id" +
-            currVal;
-    }, "");
-    const doc = textToDoc(text, { parser }, { stripTrailingHardline: true });
-    return transformCssDoc(doc, node, expressionDocs);
+  if (language === "css") {
+    return formatCss(path, print, textToDoc);
   }
 
-  if (parser === "graphql") {
-    const numQuasis = node.quasis.length;
-    if (numQuasis === 1 && node.quasis[0].value.raw.trim() === "") {
-      return "``";
-    }
-
-    const parts = [];
-
-    for (let i = 0; i < numQuasis; i++) {
-      const templateElement = node.quasis[i];
-      const isFirst = i === 0;
-      const isLast = i === numQuasis - 1;
-      const text = templateElement.value.cooked;
-
-      const lines = text.split("\n");
-      const numLines = lines.length;
-      const expressionDoc = expressionDocs[i];
-
-      const startsWithBlankLine =
-        numLines > 2 && lines[0].trim() === "" && lines[1].trim() === "";
-      const endsWithBlankLine =
-        numLines > 2 &&
-        lines[numLines - 1].trim() === "" &&
-        lines[numLines - 2].trim() === "";
-
-      const commentsAndWhitespaceOnly = lines.every((line) =>
-        /^\s*(?:#[^\n\r]*)?$/.test(line)
-      );
-
-      // Bail out if an interpolation occurs within a comment.
-      if (!isLast && /#[^\n\r]*$/.test(lines[numLines - 1])) {
-        return null;
-      }
-
-      let doc = null;
-
-      if (commentsAndWhitespaceOnly) {
-        doc = printGraphqlComments(lines);
-      } else {
-        doc = textToDoc(text, { parser }, { stripTrailingHardline: true });
-      }
-
-      if (doc) {
-        doc = escapeTemplateCharacters(doc, false);
-        if (!isFirst && startsWithBlankLine) {
-          parts.push("");
-        }
-        parts.push(doc);
-        if (!isLast && endsWithBlankLine) {
-          parts.push("");
-        }
-      } else if (!isFirst && !isLast && startsWithBlankLine) {
-        parts.push("");
-      }
-
-      if (expressionDoc) {
-        parts.push(expressionDoc);
-      }
-    }
-
-    return concat([
-      "`",
-      indent(concat([hardline, join(hardline, parts)])),
-      hardline,
-      "`",
-    ]);
+  if (language === "graphql") {
+    return formatGraphql(path, print, textToDoc);
   }
 
-  if (parser === "html" || parser === "angular") {
-    return printHtmlTemplateLiteral(
-      node,
-      expressionDocs,
-      textToDoc,
-      parser,
-      options
-    );
+  if (language === "html" || language === "angular") {
+    return formatHtml(path, print, textToDoc, options, { parser: language });
   }
 }
 
@@ -200,153 +84,6 @@ function isMarkdown(path) {
   );
 }
 
-function printTemplateExpression(path, print) {
-  const node = path.getValue();
-  let printed = print(path);
-  if (node.comments && node.comments.length) {
-    printed = group(concat([indent(concat([softline, printed])), softline]));
-  }
-  return concat(["${", printed, lineSuffixBoundary, "}"]);
-}
-
-function printMarkdown(text, textToDoc) {
-  const doc = textToDoc(
-    text,
-    { parser: "markdown", __inJsTemplate: true },
-    { stripTrailingHardline: true }
-  );
-  return escapeTemplateCharacters(doc, true);
-}
-
-function getIndentation(str) {
-  const firstMatchedIndent = str.match(/^([^\S\n]*)\S/m);
-  return firstMatchedIndent === null ? "" : firstMatchedIndent[1];
-}
-
-function uncook(cookedValue) {
-  return cookedValue.replace(/([\\`]|\${)/g, "\\$1");
-}
-
-function escapeTemplateCharacters(doc, raw) {
-  return mapDoc(doc, (currentDoc) => {
-    if (!currentDoc.parts) {
-      return currentDoc;
-    }
-
-    const parts = currentDoc.parts.map((part) => {
-      if (typeof part === "string") {
-        return raw ? part.replace(/(\\*)`/g, "$1$1\\`") : uncook(part);
-      }
-
-      return part;
-    });
-
-    return { ...currentDoc, parts };
-  });
-}
-
-function transformCssDoc(quasisDoc, parentNode, expressionDocs) {
-  const isEmpty =
-    parentNode.quasis.length === 1 && !parentNode.quasis[0].value.raw.trim();
-  if (isEmpty) {
-    return "``";
-  }
-
-  const newDoc = replacePlaceholders(quasisDoc, expressionDocs);
-  /* istanbul ignore if */
-  if (!newDoc) {
-    throw new Error("Couldn't insert all the expressions");
-  }
-  return concat(["`", indent(concat([hardline, newDoc])), softline, "`"]);
-}
-
-// Search all the placeholders in the quasisDoc tree
-// and replace them with the expression docs one by one
-// returns a new doc with all the placeholders replaced,
-// or null if it couldn't replace any expression
-function replacePlaceholders(quasisDoc, expressionDocs) {
-  if (!expressionDocs || !expressionDocs.length) {
-    return quasisDoc;
-  }
-
-  let replaceCounter = 0;
-  const newDoc = mapDoc(quasisDoc, (doc) => {
-    if (!doc || !doc.parts || !doc.parts.length) {
-      return doc;
-    }
-
-    let { parts } = doc;
-    const atIndex = parts.indexOf("@");
-    const placeholderIndex = atIndex + 1;
-    if (
-      atIndex > -1 &&
-      typeof parts[placeholderIndex] === "string" &&
-      parts[placeholderIndex].startsWith("prettier-placeholder")
-    ) {
-      // If placeholder is split, join it
-      const at = parts[atIndex];
-      const placeholder = parts[placeholderIndex];
-      const rest = parts.slice(placeholderIndex + 1);
-      parts = parts
-        .slice(0, atIndex)
-        .concat([at + placeholder])
-        .concat(rest);
-    }
-
-    const replacedParts = [];
-    parts.forEach((part) => {
-      if (typeof part !== "string" || !part.includes("@prettier-placeholder")) {
-        replacedParts.push(part);
-        return;
-      }
-
-      // When we have multiple placeholders in one line, like:
-      // ${Child}${Child2}:not(:first-child)
-      part.split(/@prettier-placeholder-(\d+)-id/).forEach((component, idx) => {
-        // The placeholder is always at odd indices
-        if (idx % 2 === 0) {
-          replacedParts.push(replaceNewlinesWithLiterallines(component));
-          return;
-        }
-
-        // The component will always be a number at odd index
-        replacedParts.push(expressionDocs[component]);
-        replaceCounter++;
-      });
-    });
-    return { ...doc, parts: replacedParts };
-  });
-  return expressionDocs.length === replaceCounter ? newDoc : null;
-}
-
-function printGraphqlComments(lines) {
-  const parts = [];
-  let seenComment = false;
-
-  lines
-    .map((textLine) => textLine.trim())
-    .forEach((textLine, i, array) => {
-      // Lines are either whitespace only, or a comment (with potential whitespace
-      // around it). Drop whitespace-only lines.
-      if (textLine === "") {
-        return;
-      }
-
-      if (array[i - 1] === "" && seenComment) {
-        // If a non-first comment is preceded by a blank (whitespace only) line,
-        // add in a blank line.
-        parts.push(concat([hardline, textLine]));
-      } else {
-        parts.push(textLine);
-      }
-
-      seenComment = true;
-    });
-
-  // If `lines` was whitespace only, return `null`.
-  return parts.length === 0 ? null : join(hardline, parts);
-}
-
 /**
  * Template literal in these contexts:
  * <style jsx>{`div{color:red}`}</style>
@@ -555,110 +292,6 @@ function isHtml(path) {
   );
 }
 
-// The counter is needed to distinguish nested embeds.
-let htmlTemplateLiteralCounter = 0;
-
-function printHtmlTemplateLiteral(
-  node,
-  expressionDocs,
-  textToDoc,
-  parser,
-  options
-) {
-  const counter = htmlTemplateLiteralCounter;
-  htmlTemplateLiteralCounter = (htmlTemplateLiteralCounter + 1) >>> 0;
-
-  const composePlaceholder = (index) =>
-    `PRETTIER_HTML_PLACEHOLDER_${index}_${counter}_IN_JS`;
-
-  const text = node.quasis
-    .map((quasi, index, quasis) =>
-      index === quasis.length - 1
-        ? quasi.value.cooked
-        : quasi.value.cooked + composePlaceholder(index)
-    )
-    .join("");
-
-  if (expressionDocs.length === 0 && text.trim().length === 0) {
-    return "``";
-  }
-
-  const placeholderRegex = new RegExp(composePlaceholder("(\\d+)"), "g");
-  let topLevelCount = 0;
-
-  const contentDoc = mapDoc(
-    textToDoc(
-      text,
-      {
-        parser,
-        __onHtmlRoot(root) {
-          topLevelCount = root.children.length;
-        },
-      },
-      { stripTrailingHardline: true }
-    ),
-    (doc) => {
-      if (typeof doc !== "string") {
-        return doc;
-      }
-
-      const parts = [];
-
-      const components = doc.split(placeholderRegex);
-      for (let i = 0; i < components.length; i++) {
-        let component = components[i];
-
-        if (i % 2 === 0) {
-          if (component) {
-            component = uncook(component);
-            if (options.embeddedInHtml) {
-              component = component.replace(/<\/(script)\b/gi, "<\\/$1");
-            }
-            parts.push(component);
-          }
-          continue;
-        }
-
-        const placeholderIndex = +component;
-        parts.push(expressionDocs[placeholderIndex]);
-      }
-
-      return concat(parts);
-    }
-  );
-
-  const leadingWhitespace = /^\s/.test(text) ? " " : "";
-  const trailingWhitespace = /\s$/.test(text) ? " " : "";
-
-  const linebreak =
-    options.htmlWhitespaceSensitivity === "ignore"
-      ? hardline
-      : leadingWhitespace && trailingWhitespace
-      ? line
-      : null;
-
-  if (linebreak) {
-    return group(
-      concat([
-        "`",
-        indent(concat([linebreak, group(contentDoc)])),
-        linebreak,
-        "`",
-      ])
-    );
-  }
-
-  return group(
-    concat([
-      "`",
-      leadingWhitespace,
-      topLevelCount > 1 ? indent(group(contentDoc)) : group(contentDoc),
-      trailingWhitespace,
-      "`",
-    ])
-  );
-}
-
 function hasInvalidCookedValue({ quasis }) {
   return quasis.some(({ value: { cooked } }) => cooked === null);
 }
diff --git a/src/language-js/embed/css.js b/src/language-js/embed/css.js
new file mode 100644
index 000000000..3ee4e1fa3
--- /dev/null
+++ b/src/language-js/embed/css.js
@@ -0,0 +1,103 @@
+"use strict";
+
+const {
+  builders: { indent, hardline, softline, concat },
+  utils: { mapDoc, replaceNewlinesWithLiterallines },
+} = require("../../document");
+const { printTemplateExpressions } = require("../print/template-literal");
+
+function format(path, print, textToDoc) {
+  const node = path.getValue();
+
+  // Get full template literal with expressions replaced by placeholders
+  const rawQuasis = node.quasis.map((q) => q.value.raw);
+  let placeholderID = 0;
+  const text = rawQuasis.reduce((prevVal, currVal, idx) => {
+    return idx === 0
+      ? currVal
+      : prevVal + "@prettier-placeholder-" + placeholderID++ + "-id" + currVal;
+  }, "");
+  const doc = textToDoc(
+    text,
+    { parser: "scss" },
+    { stripTrailingHardline: true }
+  );
+  const expressionDocs = printTemplateExpressions(path, print);
+  return transformCssDoc(doc, node, expressionDocs);
+}
+
+function transformCssDoc(quasisDoc, parentNode, expressionDocs) {
+  const isEmpty =
+    parentNode.quasis.length === 1 && !parentNode.quasis[0].value.raw.trim();
+  if (isEmpty) {
+    return "``";
+  }
+
+  const newDoc = replacePlaceholders(quasisDoc, expressionDocs);
+  /* istanbul ignore if */
+  if (!newDoc) {
+    throw new Error("Couldn't insert all the expressions");
+  }
+  return concat(["`", indent(concat([hardline, newDoc])), softline, "`"]);
+}
+
+// Search all the placeholders in the quasisDoc tree
+// and replace them with the expression docs one by one
+// returns a new doc with all the placeholders replaced,
+// or null if it couldn't replace any expression
+function replacePlaceholders(quasisDoc, expressionDocs) {
+  if (!expressionDocs || !expressionDocs.length) {
+    return quasisDoc;
+  }
+
+  let replaceCounter = 0;
+  const newDoc = mapDoc(quasisDoc, (doc) => {
+    if (!doc || !doc.parts || !doc.parts.length) {
+      return doc;
+    }
+
+    let { parts } = doc;
+    const atIndex = parts.indexOf("@");
+    const placeholderIndex = atIndex + 1;
+    if (
+      atIndex > -1 &&
+      typeof parts[placeholderIndex] === "string" &&
+      parts[placeholderIndex].startsWith("prettier-placeholder")
+    ) {
+      // If placeholder is split, join it
+      const at = parts[atIndex];
+      const placeholder = parts[placeholderIndex];
+      const rest = parts.slice(placeholderIndex + 1);
+      parts = parts
+        .slice(0, atIndex)
+        .concat([at + placeholder])
+        .concat(rest);
+    }
+
+    const replacedParts = [];
+    parts.forEach((part) => {
+      if (typeof part !== "string" || !part.includes("@prettier-placeholder")) {
+        replacedParts.push(part);
+        return;
+      }
+
+      // When we have multiple placeholders in one line, like:
+      // ${Child}${Child2}:not(:first-child)
+      part.split(/@prettier-placeholder-(\d+)-id/).forEach((component, idx) => {
+        // The placeholder is always at odd indices
+        if (idx % 2 === 0) {
+          replacedParts.push(replaceNewlinesWithLiterallines(component));
+          return;
+        }
+
+        // The component will always be a number at odd index
+        replacedParts.push(expressionDocs[component]);
+        replaceCounter++;
+      });
+    });
+    return { ...doc, parts: replacedParts };
+  });
+  return expressionDocs.length === replaceCounter ? newDoc : null;
+}
+
+module.exports = format;
diff --git a/src/language-js/embed/graphql.js b/src/language-js/embed/graphql.js
new file mode 100644
index 000000000..ba0b4efe1
--- /dev/null
+++ b/src/language-js/embed/graphql.js
@@ -0,0 +1,114 @@
+"use strict";
+
+const {
+  builders: { indent, join, hardline, concat },
+} = require("../../document");
+const {
+  escapeTemplateCharacters,
+  printTemplateExpressions,
+} = require("../print/template-literal");
+
+function format(path, print, textToDoc) {
+  const node = path.getValue();
+
+  const numQuasis = node.quasis.length;
+  if (numQuasis === 1 && node.quasis[0].value.raw.trim() === "") {
+    return "``";
+  }
+
+  const expressionDocs = printTemplateExpressions(path, print);
+  const parts = [];
+
+  for (let i = 0; i < numQuasis; i++) {
+    const templateElement = node.quasis[i];
+    const isFirst = i === 0;
+    const isLast = i === numQuasis - 1;
+    const text = templateElement.value.cooked;
+
+    const lines = text.split("\n");
+    const numLines = lines.length;
+    const expressionDoc = expressionDocs[i];
+
+    const startsWithBlankLine =
+      numLines > 2 && lines[0].trim() === "" && lines[1].trim() === "";
+    const endsWithBlankLine =
+      numLines > 2 &&
+      lines[numLines - 1].trim() === "" &&
+      lines[numLines - 2].trim() === "";
+
+    const commentsAndWhitespaceOnly = lines.every((line) =>
+      /^\s*(?:#[^\n\r]*)?$/.test(line)
+    );
+
+    // Bail out if an interpolation occurs within a comment.
+    if (!isLast && /#[^\n\r]*$/.test(lines[numLines - 1])) {
+      return null;
+    }
+
+    let doc = null;
+
+    if (commentsAndWhitespaceOnly) {
+      doc = printGraphqlComments(lines);
+    } else {
+      doc = textToDoc(
+        text,
+        { parser: "graphql" },
+        { stripTrailingHardline: true }
+      );
+    }
+
+    if (doc) {
+      doc = escapeTemplateCharacters(doc, false);
+      if (!isFirst && startsWithBlankLine) {
+        parts.push("");
+      }
+      parts.push(doc);
+      if (!isLast && endsWithBlankLine) {
+        parts.push("");
+      }
+    } else if (!isFirst && !isLast && startsWithBlankLine) {
+      parts.push("");
+    }
+
+    if (expressionDoc) {
+      parts.push(expressionDoc);
+    }
+  }
+
+  return concat([
+    "`",
+    indent(concat([hardline, join(hardline, parts)])),
+    hardline,
+    "`",
+  ]);
+}
+
+function printGraphqlComments(lines) {
+  const parts = [];
+  let seenComment = false;
+
+  lines
+    .map((textLine) => textLine.trim())
+    .forEach((textLine, i, array) => {
+      // Lines are either whitespace only, or a comment (with potential whitespace
+      // around it). Drop whitespace-only lines.
+      if (textLine === "") {
+        return;
+      }
+
+      if (array[i - 1] === "" && seenComment) {
+        // If a non-first comment is preceded by a blank (whitespace only) line,
+        // add in a blank line.
+        parts.push(concat([hardline, textLine]));
+      } else {
+        parts.push(textLine);
+      }
+
+      seenComment = true;
+    });
+
+  // If `lines` was whitespace only, return `null`.
+  return parts.length === 0 ? null : join(hardline, parts);
+}
+
+module.exports = format;
diff --git a/src/language-js/embed/html.js b/src/language-js/embed/html.js
new file mode 100644
index 000000000..f7042de40
--- /dev/null
+++ b/src/language-js/embed/html.js
@@ -0,0 +1,109 @@
+"use strict";
+
+const {
+  builders: { indent, line, hardline, concat, group },
+  utils: { mapDoc },
+} = require("../../document");
+const {
+  printTemplateExpressions,
+  uncookTemplateElementValue,
+} = require("../print/template-literal");
+
+// The counter is needed to distinguish nested embeds.
+let htmlTemplateLiteralCounter = 0;
+function format(path, print, textToDoc, options, { parser }) {
+  const node = path.getValue();
+  const counter = htmlTemplateLiteralCounter;
+  htmlTemplateLiteralCounter = (htmlTemplateLiteralCounter + 1) >>> 0;
+
+  const composePlaceholder = (index) =>
+    `PRETTIER_HTML_PLACEHOLDER_${index}_${counter}_IN_JS`;
+
+  const text = node.quasis
+    .map((quasi, index, quasis) =>
+      index === quasis.length - 1
+        ? quasi.value.cooked
+        : quasi.value.cooked + composePlaceholder(index)
+    )
+    .join("");
+
+  const expressionDocs = printTemplateExpressions(path, print);
+  if (expressionDocs.length === 0 && text.trim().length === 0) {
+    return "``";
+  }
+
+  const placeholderRegex = new RegExp(composePlaceholder("(\\d+)"), "g");
+  let topLevelCount = 0;
+  const doc = textToDoc(
+    text,
+    {
+      parser,
+      __onHtmlRoot(root) {
+        topLevelCount = root.children.length;
+      },
+    },
+    { stripTrailingHardline: true }
+  );
+
+  const contentDoc = mapDoc(doc, (doc) => {
+    if (typeof doc !== "string") {
+      return doc;
+    }
+
+    const parts = [];
+
+    const components = doc.split(placeholderRegex);
+    for (let i = 0; i < components.length; i++) {
+      let component = components[i];
+
+      if (i % 2 === 0) {
+        if (component) {
+          component = uncookTemplateElementValue(component);
+          if (options.embeddedInHtml) {
+            component = component.replace(/<\/(script)\b/gi, "<\\/$1");
+          }
+          parts.push(component);
+        }
+        continue;
+      }
+
+      const placeholderIndex = +component;
+      parts.push(expressionDocs[placeholderIndex]);
+    }
+
+    return concat(parts);
+  });
+
+  const leadingWhitespace = /^\s/.test(text) ? " " : "";
+  const trailingWhitespace = /\s$/.test(text) ? " " : "";
+
+  const linebreak =
+    options.htmlWhitespaceSensitivity === "ignore"
+      ? hardline
+      : leadingWhitespace && trailingWhitespace
+      ? line
+      : null;
+
+  if (linebreak) {
+    return group(
+      concat([
+        "`",
+        indent(concat([linebreak, group(contentDoc)])),
+        linebreak,
+        "`",
+      ])
+    );
+  }
+
+  return group(
+    concat([
+      "`",
+      leadingWhitespace,
+      topLevelCount > 1 ? indent(group(contentDoc)) : group(contentDoc),
+      trailingWhitespace,
+      "`",
+    ])
+  );
+}
+
+module.exports = format;
diff --git a/src/language-js/embed/markdown.js b/src/language-js/embed/markdown.js
new file mode 100644
index 000000000..2cef8f5d9
--- /dev/null
+++ b/src/language-js/embed/markdown.js
@@ -0,0 +1,42 @@
+"use strict";
+
+const {
+  builders: { indent, softline, literalline, concat, dedentToRoot },
+} = require("../../document");
+const { escapeTemplateCharacters } = require("../print/template-literal");
+
+function format(path, print, textToDoc) {
+  const node = path.getValue();
+  let text = node.quasis[0].value.raw.replace(
+    /((?:\\\\)*)\\`/g,
+    (_, backslashes) => "\\".repeat(backslashes.length / 2) + "`"
+  );
+  const indentation = getIndentation(text);
+  const hasIndent = indentation !== "";
+  if (hasIndent) {
+    text = text.replace(new RegExp(`^${indentation}`, "gm"), "");
+  }
+  const doc = escapeTemplateCharacters(
+    textToDoc(
+      text,
+      { parser: "markdown", __inJsTemplate: true },
+      { stripTrailingHardline: true }
+    ),
+    true
+  );
+  return concat([
+    "`",
+    hasIndent
+      ? indent(concat([softline, doc]))
+      : concat([literalline, dedentToRoot(doc)]),
+    softline,
+    "`",
+  ]);
+}
+
+function getIndentation(str) {
+  const firstMatchedIndent = str.match(/^([^\S\n]*)\S/m);
+  return firstMatchedIndent === null ? "" : firstMatchedIndent[1];
+}
+
+module.exports = format;
diff --git a/src/language-js/print/template-literal.js b/src/language-js/print/template-literal.js
index 5be829211..2ef4d77f9 100644
--- a/src/language-js/print/template-literal.js
+++ b/src/language-js/print/template-literal.js
@@ -14,6 +14,7 @@ const {
     addAlignmentToDoc,
   },
   printer: { printDocToString },
+  utils: { mapDoc },
 } = require("../../document");
 const {
   isBinaryish,
@@ -190,4 +191,49 @@ function printJestEachTemplateLiteral(path, options, print) {
   }
 }
 
-module.exports = printTemplateLiteral;
+function printTemplateExpression(path, print) {
+  const node = path.getValue();
+  let printed = print(path);
+  if (node.comments && node.comments.length) {
+    printed = group(concat([indent(concat([softline, printed])), softline]));
+  }
+  return concat(["${", printed, lineSuffixBoundary, "}"]);
+}
+
+function printTemplateExpressions(path, print) {
+  return path.map(
+    (path) => printTemplateExpression(path, print),
+    "expressions"
+  );
+}
+
+function escapeTemplateCharacters(doc, raw) {
+  return mapDoc(doc, (currentDoc) => {
+    if (!currentDoc.parts) {
+      return currentDoc;
+    }
+
+    const parts = currentDoc.parts.map((part) => {
+      if (typeof part === "string") {
+        return raw
+          ? part.replace(/(\\*)`/g, "$1$1\\`")
+          : uncookTemplateElementValue(part);
+      }
+
+      return part;
+    });
+
+    return { ...currentDoc, parts };
+  });
+}
+
+function uncookTemplateElementValue(cookedValue) {
+  return cookedValue.replace(/([\\`]|\${)/g, "\\$1");
+}
+
+module.exports = {
+  printTemplateLiteral,
+  printTemplateExpressions,
+  escapeTemplateCharacters,
+  uncookTemplateElementValue,
+};
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index a4f179e3b..a6b8c0bc3 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -123,7 +123,7 @@ const {
   printFunctionParameters,
   shouldHugFunctionParameters,
 } = require("./print/function-parameters");
-const printTemplateLiteral = require("./print/template-literal");
+const { printTemplateLiteral } = require("./print/template-literal");
 
 const needsQuoteProps = new WeakMap();
 

From ef6a2c5f8a448bb16bcbaeab06f29e2be98a958d Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 16 Nov 2020 08:56:45 +0800
Subject: [PATCH 034/299] Refactor: Simplify markdown table print (#9660)

---
 src/language-markdown/printer-markdown.js | 115 ++++++++--------------
 1 file changed, 43 insertions(+), 72 deletions(-)

diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index 5ea2257b8..ec0644bc1 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -41,6 +41,10 @@ const {
   isAutolink,
 } = require("./utils");
 
+/**
+ * @typedef {import("../document").Doc} Doc
+ */
+
 const TRAILING_HARDLINE_NODES = new Set(["importExport"]);
 const SINGLE_LINE_NODE_TYPES = ["heading", "tableCell", "link", "wikiLink"];
 const SIBLING_NODE_TYPES = new Set([
@@ -577,37 +581,34 @@ function printTable(path, options, print) {
   const hardlineWithoutBreakParent = hardline.parts[0];
   const node = path.getValue();
 
-  // { [rowIndex: number]: { [columnIndex: number]: string } }
+  const columnMaxWidths = [];
+  // { [rowIndex: number]: { [columnIndex: number]: {text: string, width: number} } }
   const contents = path.map(
     (rowPath) =>
-      rowPath.map(
-        (cellPath) => printDocToString(cellPath.call(print), options).formatted,
-        "children"
-      ),
+      rowPath.map((cellPath, columnIndex) => {
+        const text = printDocToString(cellPath.call(print), options).formatted;
+        const width = getStringWidth(text);
+        columnMaxWidths[columnIndex] = Math.max(
+          columnMaxWidths[columnIndex] || 3, // minimum width = 3 (---, :--, :-:, --:)
+          width
+        );
+        return { text, width };
+      }, "children"),
     "children"
   );
 
-  // Get the width of each column
-  const columnMaxWidths = contents.reduce(
-    (currentWidths, rowContents) =>
-      currentWidths.map((width, columnIndex) =>
-        Math.max(width, getStringWidth(rowContents[columnIndex]))
-      ),
-    contents[0].map(() => 3) // minimum width = 3 (---, :--, :-:, --:)
-  );
   const alignedTable = printTableContents(/* isCompact */ false);
-
   if (options.proseWrap !== "never") {
     return concat([breakParent, alignedTable]);
   }
 
   // Only if the --prose-wrap never is set and it exceeds the print width.
   const compactTable = printTableContents(/* isCompact */ true);
-
   return concat([breakParent, group(ifBreak(compactTable, alignedTable))]);
 
   function printTableContents(isCompact) {
-    const parts = [printRow(contents[0], isCompact), printSeparator(isCompact)];
+    /** @type{Doc[]} */
+    const parts = [printRow(contents[0], isCompact), printAlign(isCompact)];
     if (contents.length > 1) {
       parts.push(
         join(
@@ -621,66 +622,36 @@ function printTable(path, options, print) {
     return join(hardlineWithoutBreakParent, parts);
   }
 
-  function printSeparator(isCompact) {
-    return concat([
-      "| ",
-      join(
-        " | ",
-        columnMaxWidths.map((width, index) => {
-          const spaces = isCompact ? 3 : width;
-          switch (node.align[index]) {
-            case "left":
-              return ":" + "-".repeat(spaces - 1);
-            case "right":
-              return "-".repeat(spaces - 1) + ":";
-            case "center":
-              return ":" + "-".repeat(spaces - 2) + ":";
-            default:
-              return "-".repeat(spaces);
-          }
-        })
-      ),
-      " |",
-    ]);
+  function printAlign(isCompact) {
+    const align = columnMaxWidths.map((width, index) => {
+      const align = node.align[index];
+      const first = align === "center" || align === "left" ? ":" : "-";
+      const last = align === "center" || align === "right" ? ":" : "-";
+      const middle = isCompact ? "-" : "-".repeat(width - 2);
+      return `${first}${middle}${last}`;
+    });
+
+    return `| ${align.join(" | ")} |`;
   }
 
   function printRow(rowContents, isCompact) {
-    return concat([
-      "| ",
-      join(
-        " | ",
-        isCompact
-          ? rowContents
-          : rowContents.map((rowContent, columnIndex) => {
-              switch (node.align[columnIndex]) {
-                case "right":
-                  return alignRight(rowContent, columnMaxWidths[columnIndex]);
-                case "center":
-                  return alignCenter(rowContent, columnMaxWidths[columnIndex]);
-                default:
-                  return alignLeft(rowContent, columnMaxWidths[columnIndex]);
-              }
-            })
-      ),
-      " |",
-    ]);
-  }
+    const columns = rowContents.map(({ text, width }, columnIndex) => {
+      if (isCompact) {
+        return text;
+      }
+      const spaces = columnMaxWidths[columnIndex] - width;
+      const align = node.align[columnIndex];
+      let before = 0;
+      if (align === "right") {
+        before = spaces;
+      } else if (align === "center") {
+        before = Math.floor(spaces / 2);
+      }
+      const after = spaces - before;
+      return `${" ".repeat(before)}${text}${" ".repeat(after)}`;
+    });
 
-  function alignLeft(text, width) {
-    const spaces = width - getStringWidth(text);
-    return concat([text, " ".repeat(spaces)]);
-  }
-
-  function alignRight(text, width) {
-    const spaces = width - getStringWidth(text);
-    return concat([" ".repeat(spaces), text]);
-  }
-
-  function alignCenter(text, width) {
-    const spaces = width - getStringWidth(text);
-    const left = Math.floor(spaces / 2);
-    const right = spaces - left;
-    return concat([" ".repeat(left), text, " ".repeat(right)]);
+    return `| ${columns.join(" | ")} |`;
   }
 }
 

From fe789dc1d1014a9612949289310f42f36189845b Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Mon, 16 Nov 2020 14:17:36 +0900
Subject: [PATCH 035/299] Reuse dirPath variable (#9683)

---
 scripts/draft-blog-post.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/draft-blog-post.js b/scripts/draft-blog-post.js
index 39f48c59a..2477a35d1 100644
--- a/scripts/draft-blog-post.js
+++ b/scripts/draft-blog-post.js
@@ -57,7 +57,7 @@ for (const dir of dirs) {
   }
 
   category.entries = fs
-    .readdirSync(path.join(changelogUnreleasedDir, dir.name))
+    .readdirSync(dirPath)
     .filter((fileName) => /^pr-\d+\.md$/.test(fileName))
     .map((fileName) => {
       const [title, ...rest] = fs

From 8c85a1a35bdc0ede7ea22b13fedc9076ccd195e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Nov 2020 14:44:19 +0800
Subject: [PATCH 036/299] Build(deps): Bump flow-parser from 0.137.0 to 0.138.0
 (#9688)

Bumps [flow-parser](https://github.com/facebook/flow) from 0.137.0 to 0.138.0.
- [Release notes](https://github.com/facebook/flow/releases)
- [Changelog](https://github.com/facebook/flow/blob/master/Changelog.md)
- [Commits](https://github.com/facebook/flow/compare/v0.137.0...v0.138.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e76adcff4..c49a83944 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "fast-glob": "3.2.4",
     "fast-json-stable-stringify": "2.1.0",
     "find-parent-dir": "0.3.0",
-    "flow-parser": "0.137.0",
+    "flow-parser": "0.138.0",
     "get-stdin": "8.0.0",
     "globby": "11.0.1",
     "graphql": "15.4.0",
diff --git a/yarn.lock b/yarn.lock
index a9259cae6..0f96e8f78 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3605,10 +3605,10 @@ flatten@^1.0.2:
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
   integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
-flow-parser@0.137.0:
-  version "0.137.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.137.0.tgz#8c05612ff9344648d8bcdeaa4c58d131e875d842"
-  integrity sha512-i3KXJZ8lhlQI0n+BoZzIeH/rv+fNvAiu1i9/s64MklBV+HuhFbycUML7367J2eng0gapLnwvYPFNaPZys8POsA==
+flow-parser@0.138.0:
+  version "0.138.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.138.0.tgz#2d9818f6b804d66f90949dfa8b4892f3a0af546d"
+  integrity sha512-LFnTyjrv39UvCWl8NOcpByr/amj8a5k5z7isO2wv4T43nNrUnHQwX3rarTz9zcpHXkDAQv6X4MfQ4ZzJUptpbw==
 
 for-in@^1.0.2:
   version "1.0.2"

From 8f5464d07b87f9e21a4a2947eb81fec86fdd1f15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Nov 2020 14:44:47 +0800
Subject: [PATCH 037/299] Build(deps-dev): Bump cspell from 4.1.5 to 4.2.0
 (#9684)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 58 ++++++++++++++++++++++++++--------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index c49a83944..592b8c40b 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "benchmark": "2.1.4",
     "builtin-modules": "3.1.0",
     "cross-env": "7.0.2",
-    "cspell": "4.1.5",
+    "cspell": "4.2.0",
     "eslint": "7.13.0",
     "eslint-config-prettier": "6.15.0",
     "eslint-formatter-friendly": "7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 0f96e8f78..d1f92f697 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2675,25 +2675,25 @@ cspell-dict-typescript@^1.0.12:
   dependencies:
     configstore "^5.0.1"
 
-cspell-glob@^0.1.21:
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-0.1.21.tgz#a2993fa485fdc4ec3df128d11592cdcc10ac0e93"
-  integrity sha512-+xwxxB0QZRKKgehZP0Jp48mBKiYa3RkGb0XgxcBrEZr9u0GBLOYUDi6iDox9VR+/rihvUvQKt8tTRGsMyNKe0A==
+cspell-glob@^0.1.23:
+  version "0.1.23"
+  resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-0.1.23.tgz#63256b384ca2f010f02a8039a8e5f4b8c2e38156"
+  integrity sha512-Q6iBxMvxXtPB358jvw3sMSC9AcNecZcQ2aD3oYhmgXYJRxX3TDij/3iXMrDkTAKcZx8V2BBZQJo/aJxkYnP0/A==
   dependencies:
     micromatch "^4.0.2"
 
-cspell-io@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-4.1.2.tgz#1683cbac336a84187e67bd5f34bd0deb96cfa563"
-  integrity sha512-FLLojKoCweQPYJBsze9KS9wNI8Cvvp84Zt/pwgNdkiqxPADZEsymIZ8U4xFdL3L+/k+LT2KhJZzxjeTI6/zsNA==
+cspell-io@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-4.1.4.tgz#945b527c7e8f06c3c0329991bdcf63b6d04400b2"
+  integrity sha512-qWVBUpu/+HzWwyjBiAxYGgv/w5w5290kYBtT5D42qQ9x/GxTjrq3AILCeWOOh/JtU4XmpiI2QUuyWEsxLSldZw==
   dependencies:
     iconv-lite "^0.6.2"
     iterable-to-stream "^1.0.1"
 
-cspell-lib@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-4.3.2.tgz#f1071322b26b4c9ae10c10802b108d01201b4b2a"
-  integrity sha512-d794ObE18mVblT6DSgvvaFaonkvNv4+HmBnR6IALZxd0AsS8AGxZ33t4o9mgcymiATvAzrZvG0u2zL0/onhNhw==
+cspell-lib@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-4.3.4.tgz#471048dac762eb712c5390073ec7f61bf74690c0"
+  integrity sha512-ykbrrAiOwh8Q0X4H5tFuTvtKg+L2nthPgN/5eiw7y1SM8DU8/LVGavDI47qcJ4HJSwuSwZ4RH60Ol1Q5zwqh/Q==
   dependencies:
     comment-json "^4.1.0"
     configstore "^5.0.1"
@@ -2730,37 +2730,37 @@ cspell-lib@^4.3.2:
     cspell-dict-scala "^1.0.17"
     cspell-dict-software-terms "^1.0.19"
     cspell-dict-typescript "^1.0.12"
-    cspell-io "^4.1.2"
-    cspell-trie-lib "^4.2.2"
-    cspell-util-bundle "^4.1.4"
+    cspell-io "^4.1.4"
+    cspell-trie-lib "^4.2.4"
+    cspell-util-bundle "^4.1.6"
     fs-extra "^9.0.1"
     gensequence "^3.1.1"
     minimatch "^3.0.4"
     resolve-from "^5.0.0"
     vscode-uri "^2.1.2"
 
-cspell-trie-lib@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-4.2.2.tgz#0d3a2d6c8343a7f08fb78111f2a48ca2db8d5f6b"
-  integrity sha512-FKwubuKs7XhFIAZN8Twh4RUSKc1h2X+EHsaSu8Y4E9QIcz5vBKooejCC3HTCgTzARXbX4pw0HazehSDqjraE+g==
+cspell-trie-lib@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-4.2.4.tgz#4a2f6368b63317ece6ad5cec33fc4fe404c44dfd"
+  integrity sha512-a+jknY90yav3yGndN9PDQLUeo9nFiGZ2a8j9NSiMkieRnFCHmH7iHOwwoXxiMJ6x4+0zeyhSYF1pXuNA7eE2pw==
   dependencies:
     gensequence "^3.1.1"
 
-cspell-util-bundle@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/cspell-util-bundle/-/cspell-util-bundle-4.1.4.tgz#82f758b39572579b08d97aa1d9eedfd2c56f84d3"
-  integrity sha512-97TZTl3lqrKYVu63mf9FdekbqH6CYHRka4nUbRN0mm9bOv4L68ZE2k/DwcRuqWz7Rrc190oKOWV7USVZutgAeQ==
+cspell-util-bundle@^4.1.6:
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/cspell-util-bundle/-/cspell-util-bundle-4.1.6.tgz#6bc54fe8e73e282f4dbe2e7683cc43e339cf9029"
+  integrity sha512-wpCmiZRNRZ1fEXuColE2qeX15qicfhgwibSt5zNm77PZYhgkSLam52nIgGlnzSQCCFtOp8iaUeUQy40lJ0V+3Q==
 
-cspell@4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/cspell/-/cspell-4.1.5.tgz#cec599568898ccc401b3564dcdcacc8e519b9c2a"
-  integrity sha512-KIVZzQAMtSVsYGeFP5ljXPgbMor1jR49sVkSEHH2MdGFegTyMJZEVkgcwu7pTS0VRI+6O2k06/K3AKOJeK4WSg==
+cspell@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/cspell/-/cspell-4.2.0.tgz#01fffa15dc7d102315edc67fa0b385decd4ee2d1"
+  integrity sha512-5hKiPYapirbSoCuPpTXnDLA47c4vMV3U+ScFP56YF4lhQiz7yAJnNrgK31RiMHkv/pIUIlnuaKZYDD/7fgEgxg==
   dependencies:
     chalk "^4.1.0"
     commander "^6.1.0"
     comment-json "^4.0.6"
-    cspell-glob "^0.1.21"
-    cspell-lib "^4.3.2"
+    cspell-glob "^0.1.23"
+    cspell-lib "^4.3.4"
     fs-extra "^9.0.1"
     gensequence "^3.1.1"
     get-stdin "^8.0.0"

From c454d7783582ff51174d63dd0833601c71a3237a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Nov 2020 14:50:54 +0800
Subject: [PATCH 038/299] Build(deps-dev): Bump rollup from 2.33.1 to 2.33.2
 (#9686)

Bumps [rollup](https://github.com/rollup/rollup) from 2.33.1 to 2.33.2.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v2.33.1...v2.33.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 592b8c40b..440880dab 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "path-browserify": "1.0.1",
     "prettier": "2.1.2",
     "rimraf": "3.0.2",
-    "rollup": "2.33.1",
+    "rollup": "2.33.2",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-terser": "7.0.2",
     "shelljs": "0.8.4",
diff --git a/yarn.lock b/yarn.lock
index d1f92f697..23f0a2e35 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6389,10 +6389,10 @@ rollup-pluginutils@^2.3.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@2.33.1:
-  version "2.33.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.1.tgz#802795164164ee63cd47769d8879c33ec8ae0c40"
-  integrity sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==
+rollup@2.33.2:
+  version "2.33.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.2.tgz#c4c76cd405a7605e6ebe90976398c46d4c2ea166"
+  integrity sha512-QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw==
   optionalDependencies:
     fsevents "~2.1.2"
 

From 73613720164b5928648de26c7e5aa605d11b12cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Nov 2020 14:51:14 +0800
Subject: [PATCH 039/299] Build(deps): Bump @glimmer/syntax from 0.64.0 to
 0.65.0 (#9685)

Bumps [@glimmer/syntax](https://github.com/glimmerjs/glimmer-vm) from 0.64.0 to 0.65.0.
- [Release notes](https://github.com/glimmerjs/glimmer-vm/releases)
- [Changelog](https://github.com/glimmerjs/glimmer-vm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/glimmerjs/glimmer-vm/compare/v0.64.0...v0.65.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 28 ++++++----------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 440880dab..17c7ccbf2 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "10.2.3",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.5",
-    "@glimmer/syntax": "0.64.0",
+    "@glimmer/syntax": "0.65.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "3.10.1",
     "angular-estree-parser": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index 23f0a2e35..84968eee6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -901,13 +901,6 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.64.0.tgz#8d6330ece98e20c97608ec6429fc9732824452bc"
-  integrity sha512-Y7HmwqtBNOzu9RL8N4WGQGGNCIO8REMORewMbnrZtLuFWcdDPCGVlNkxC77GStkHD+V54oEoW9Y+84MLFxkicg==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.65.0":
   version "0.65.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.65.0.tgz#e3852efb63fc9f18268991caea4ab362b75ae231"
@@ -926,25 +919,16 @@
     "@glimmer/util" "0.65.0"
     "@glimmer/validator" "0.65.0"
 
-"@glimmer/syntax@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.64.0.tgz#4e665c8936dfb93c17bb53a2f355342fa29662b5"
-  integrity sha512-BVziEjDC7EKvPv4O3B9hfkevihiqZkBlWBkZbTJe45wImfl+6A4KvwP/s8r5u/yAhYnsA3LO77IuoYYr/I08Tg==
+"@glimmer/syntax@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.65.0.tgz#a4fd943ca558e15c77619d49a4d4500dd252868c"
+  integrity sha512-juVFrA62oFdr2FSxLMb7c3j7KU/onQlC7c4E9rnkivXqE7EmNGI7/+I48L/DsMmDOZDOf4bIhjeCWbXNB4dS9g==
   dependencies:
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/util" "0.64.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/util" "0.65.0"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.64.0.tgz#872103ebb2313a693161ec69e5b70252b56a6cd5"
-  integrity sha512-evcvCmQ2VUgWQF3ecDwtkwW+D+FL2f4Z0X8XDUgHQTGbA9PkqQRwyyD0WdURVPYpt3YkbR1VLapADll9fjpevg==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.64.0"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.65.0":
   version "0.65.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.65.0.tgz#8a90382500334e415415bf51b269bc7484b17543"

From 76c6d977fb19923832f59c5b5c47c6125df14d62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Nov 2020 15:19:35 +0800
Subject: [PATCH 040/299] Build(deps): Bump linguist-languages from 7.11.1 to
 7.12.1 (#9687)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: fisker <lionkay@gmail.com>
---
 package.json                                              | 2 +-
 .../__tests__/__snapshots__/support-info.js.snap          | 1 +
 yarn.lock                                                 | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 17c7ccbf2..49c1b927f 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "json5": "2.1.3",
     "leven": "3.1.0",
     "lines-and-columns": "1.1.6",
-    "linguist-languages": "7.11.1",
+    "linguist-languages": "7.12.1",
     "lodash": "4.17.20",
     "mem": "8.0.0",
     "meriyah": "3.1.6",
diff --git a/tests_integration/__tests__/__snapshots__/support-info.js.snap b/tests_integration/__tests__/__snapshots__/support-info.js.snap
index 5d9431681..b368e7d1e 100644
--- a/tests_integration/__tests__/__snapshots__/support-info.js.snap
+++ b/tests_integration/__tests__/__snapshots__/support-info.js.snap
@@ -495,6 +495,7 @@ exports[`CLI --support-info (stdout) 1`] = `
         \\".jscsrc\\",
         \\".jshintrc\\",
         \\".jslintrc\\",
+        \\"devcontainer.json\\",
         \\"jsconfig.json\\",
         \\"language-configuration.json\\",
         \\"tsconfig.json\\",
diff --git a/yarn.lock b/yarn.lock
index 84968eee6..26d604b14 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5098,10 +5098,10 @@ lines-and-columns@1.1.6, lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
-linguist-languages@7.11.1:
-  version "7.11.1"
-  resolved "https://registry.yarnpkg.com/linguist-languages/-/linguist-languages-7.11.1.tgz#69938a526bb6090c2fc173d0e440693bb0667818"
-  integrity sha512-+cRUk+1WTbydcdzipXQER2iilX+wMrb1LPkbkGuDP/IcGPJRDmOZH6Olf1iH6sHlHwPnJYiNJH39YsFCVZxvUQ==
+linguist-languages@7.12.1:
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/linguist-languages/-/linguist-languages-7.12.1.tgz#bf4928f25953ce3e00369cf956ac4d016923d55f"
+  integrity sha512-+2CmUIeNOvJ7MWn6MY5h7mpDcw62MjKjXKC1wH0zLYnDQnn/0/+j3LcWO0v4+M9Vh/yqbt0codmlA7Z82bDnLA==
 
 load-json-file@^2.0.0:
   version "2.0.0"

From 386759c6f7d51ba1a608e6487ad2839407f27265 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 16 Nov 2020 15:19:50 +0800
Subject: [PATCH 041/299] Test: Allow multiple parsers in error test (#9648)

---
 .../__snapshots__/jsfmt.spec.js.snap          |  4 +-
 tests/misc/errors/babel-flow/jsfmt.spec.js    |  3 +-
 .../babel-ts/__snapshots__/jsfmt.spec.js.snap |  6 +--
 .../__snapshots__/jsfmt.spec.js.snap          |  2 +-
 .../flow/__snapshots__/jsfmt.spec.js.snap     | 16 +++----
 .../graphql/__snapshots__/jsfmt.spec.js.snap  |  2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |  6 +--
 .../invalid/__snapshots__/jsfmt.spec.js.snap  | 42 ++++++++---------
 tests/misc/errors/invalid/jsfmt.spec.js       | 23 +++------
 .../js/__snapshots__/jsfmt.spec.js.snap       | 40 ++++++++--------
 .../json/__snapshots__/jsfmt.spec.js.snap     | 12 ++---
 .../less/__snapshots__/jsfmt.spec.js.snap     |  6 +--
 .../__snapshots__/jsfmt.spec.js.snap          | 26 +++++-----
 .../vue/__snapshots__/jsfmt.spec.js.snap      |  6 +--
 .../yaml/__snapshots__/jsfmt.spec.js.snap     |  2 +-
 tests_config/run_spec.js                      | 47 ++++++++++---------
 16 files changed, 119 insertions(+), 124 deletions(-)

diff --git a/tests/misc/errors/babel-flow/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/babel-flow/__snapshots__/jsfmt.spec.js.snap
index d3842ea9e..dbf1f0a6c 100644
--- a/tests/misc/errors/babel-flow/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/babel-flow/__snapshots__/jsfmt.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`async-arrow-invalid.js error test 1`] = `
+exports[`async-arrow-invalid.js [babel] format 1`] = `
 "Type parameters must come after the async keyword, e.g. instead of \`<T> async (3:1)
   1 | // https://github.com/babel/babel/pull/11979
   2 | 
@@ -9,7 +9,7 @@ exports[`async-arrow-invalid.js error test 1`] = `
   4 | "
 `;
 
-exports[`async-arrow-invalid.js error test 2`] = `
+exports[`async-arrow-invalid.js [babel-flow] format 1`] = `
 "Type parameters must come after the async keyword, e.g. instead of \`<T> async (3:1)
   1 | // https://github.com/babel/babel/pull/11979
   2 | 
diff --git a/tests/misc/errors/babel-flow/jsfmt.spec.js b/tests/misc/errors/babel-flow/jsfmt.spec.js
index 2ecb070a2..30c9667cc 100644
--- a/tests/misc/errors/babel-flow/jsfmt.spec.js
+++ b/tests/misc/errors/babel-flow/jsfmt.spec.js
@@ -1,2 +1 @@
-run_spec(__dirname, ["babel-flow"]);
-run_spec(__dirname, ["babel"]);
+run_spec(__dirname, ["babel-flow", "babel"]);
diff --git a/tests/misc/errors/babel-ts/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/babel-ts/__snapshots__/jsfmt.spec.js.snap
index e5c310454..f700fa83d 100644
--- a/tests/misc/errors/babel-ts/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/babel-ts/__snapshots__/jsfmt.spec.js.snap
@@ -1,20 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`type-annotation-expr-statement.ts error test 1`] = `
+exports[`type-annotation-expr-statement.ts [babel-ts] format 1`] = `
 "Did not expect a type annotation here. (1:3)
 > 1 | (a: T);
     |   ^
   2 | "
 `;
 
-exports[`type-annotation-func.ts error test 1`] = `
+exports[`type-annotation-func.ts [babel-ts] format 1`] = `
 "Did not expect a type annotation here. (1:10)
 > 1 | func<T>(a: T);
     |          ^
   2 | "
 `;
 
-exports[`type-annotation-in-jsx.tsx error test 1`] = `
+exports[`type-annotation-in-jsx.tsx [babel-ts] format 1`] = `
 "Did not expect a type annotation here. (3:22)
   1 | function Foo() {
   2 |   return (
diff --git a/tests/misc/errors/broken-plugin/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/broken-plugin/__snapshots__/jsfmt.spec.js.snap
index f96ac1f0f..d305d8102 100644
--- a/tests/misc/errors/broken-plugin/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/broken-plugin/__snapshots__/jsfmt.spec.js.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`snippet: #0 error test 1`] = `"Comment \\"comment\\" was not printed. Please report this error!"`;
+exports[`snippet: #0 [missing-comments] format 1`] = `"Comment \\"comment\\" was not printed. Please report this error!"`;
diff --git a/tests/misc/errors/flow/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/flow/__snapshots__/jsfmt.spec.js.snap
index 1055035e4..dc8b03d92 100644
--- a/tests/misc/errors/flow/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/flow/__snapshots__/jsfmt.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`async-arrow-invalid.js error test 1`] = `
+exports[`async-arrow-invalid.js [flow] format 1`] = `
 "Unexpected token ILLEGAL (4:1)
   2 | 
   3 | <T> async () => {}
@@ -8,42 +8,42 @@ exports[`async-arrow-invalid.js error test 1`] = `
     | ^"
 `;
 
-exports[`default-escaped.js error test 1`] = `
+exports[`default-escaped.js [flow] format 1`] = `
 "Unexpected identifier, expected the token \`{\` (1:8)
 > 1 | export asyn\\\\u{63} from \\"async\\";
     |        ^^^^^^^^^^
   2 | "
 `;
 
-exports[`dynamic-import.js error test 1`] = `
+exports[`dynamic-import.js [flow] format 1`] = `
 "Unexpected token \`,\`, expected the token \`)\` (1:24)
 > 1 | import('./prettier.mjs', {})
     |                        ^
   2 | "
 `;
 
-exports[`function-async.js error test 1`] = `
+exports[`function-async.js [flow] format 1`] = `
 "Unexpected token \`;\`, expected the token \`=>\` (2:11)
   1 | // Flow can't parse this since \`v0.128.0\`, #8661
 > 2 | async<T>();
     |           ^"
 `;
 
-exports[`module-attributes-dynamic.js error test 1`] = `
+exports[`module-attributes-dynamic.js [flow] format 1`] = `
 "Unexpected token \`,\`, expected the token \`)\` (1:18)
 > 1 | import(\\"foo.json\\", { with: { type: \\"json\\" } })
     |                  ^
   2 | "
 `;
 
-exports[`module-attributes-static.js error test 1`] = `
+exports[`module-attributes-static.js [flow] format 1`] = `
 "Unexpected token \`with\`, expected the token \`;\` (1:28)
 > 1 | import foo from \\"foo.json\\" with type: \\"json\\";
     |                            ^^^^
   2 | "
 `;
 
-exports[`newline-before-arrow.js error test 1`] = `
+exports[`newline-before-arrow.js [flow] format 1`] = `
 "Illegal newline before arrow (2:1)
   1 | async x
 > 2 | => x
@@ -51,7 +51,7 @@ exports[`newline-before-arrow.js error test 1`] = `
   3 | "
 `;
 
-exports[`number.js error test 1`] = `
+exports[`number.js [flow] format 1`] = `
 "Unexpected token ILLEGAL (3:5)
   1 | // https://github.com/babel/babel/pull/11854
   2 | 
diff --git a/tests/misc/errors/graphql/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/graphql/__snapshots__/jsfmt.spec.js.snap
index b76ad98e9..0db971b0a 100644
--- a/tests/misc/errors/graphql/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/graphql/__snapshots__/jsfmt.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`type-interfaces.graphql error test 1`] = `
+exports[`type-interfaces.graphql [graphql] format 1`] = `
 "Syntax Error: Unexpected \\"|\\". (5:21)
   3 | # which will break seperator detection added in #7305
   4 | 
diff --git a/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
index cc16a9652..bc710fce6 100644
--- a/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`invalid.hbs error test 1`] = `
+exports[`invalid.hbs [glimmer] format 1`] = `
 "Parse error on line 2:
 <A >x, {{@name}
 --------------^
@@ -11,7 +11,7 @@ Expecting 'CLOSE_RAW_BLOCK', 'CLOSE', 'CLOSE_UNESCAPED', 'OPEN_SEXPR', 'CLOSE_SE
   3 | "
 `;
 
-exports[`invalid-2.hbs error test 1`] = `
+exports[`invalid-2.hbs [glimmer] format 1`] = `
 "Unclosed element \`@name\` (on line 3). (3:0)
   1 | <a>
   2 | 
@@ -19,7 +19,7 @@ exports[`invalid-2.hbs error test 1`] = `
   4 | "
 `;
 
-exports[`invalid-3.hbs error test 1`] = `
+exports[`invalid-3.hbs [glimmer] format 1`] = `
 "Parse error on line 3:
 <a>{{}}
 -----^
diff --git a/tests/misc/errors/invalid/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/invalid/__snapshots__/jsfmt.spec.js.snap
index 0c8fd5a18..80ad23314 100644
--- a/tests/misc/errors/invalid/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/invalid/__snapshots__/jsfmt.spec.js.snap
@@ -1,37 +1,37 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`snippet: #0 error test 1`] = `
+exports[`snippet: #0 [babel] format 1`] = `
 "Unexpected token, expected \\"(\\" (1:5)
 > 1 | for each (a in b) {}
     |     ^"
 `;
 
-exports[`snippet: #0 error test 2`] = `
+exports[`snippet: #0 [babel-flow] format 1`] = `
+"Unexpected token, expected \\"(\\" (1:5)
+> 1 | for each (a in b) {}
+    |     ^"
+`;
+
+exports[`snippet: #0 [babel-ts] format 1`] = `
+"Unexpected token, expected \\"(\\" (1:5)
+> 1 | for each (a in b) {}
+    |     ^"
+`;
+
+exports[`snippet: #0 [espree] format 1`] = `
+"Unexpected token each (1:5)
+> 1 | for each (a in b) {}
+    |     ^"
+`;
+
+exports[`snippet: #0 [flow] format 1`] = `
 "Unexpected identifier, expected the token \`(\` (1:5)
 > 1 | for each (a in b) {}
     |     ^^^^"
 `;
 
-exports[`snippet: #0 error test 3`] = `
+exports[`snippet: #0 [typescript] format 1`] = `
 "'(' expected. (1:5)
 > 1 | for each (a in b) {}
     |     ^"
 `;
-
-exports[`snippet: #0 error test 4`] = `
-"Unexpected token, expected \\"(\\" (1:5)
-> 1 | for each (a in b) {}
-    |     ^"
-`;
-
-exports[`snippet: #0 error test 5`] = `
-"Unexpected token, expected \\"(\\" (1:5)
-> 1 | for each (a in b) {}
-    |     ^"
-`;
-
-exports[`snippet: #0 error test 6`] = `
-"Unexpected token each (1:5)
-> 1 | for each (a in b) {}
-    |     ^"
-`;
diff --git a/tests/misc/errors/invalid/jsfmt.spec.js b/tests/misc/errors/invalid/jsfmt.spec.js
index a8e44852b..7912c9794 100644
--- a/tests/misc/errors/invalid/jsfmt.spec.js
+++ b/tests/misc/errors/invalid/jsfmt.spec.js
@@ -1,16 +1,7 @@
-for (const parser of [
-  "babel",
-  "flow",
-  "typescript",
-  "babel-flow",
-  "babel-ts",
-  "espree",
-]) {
-  run_spec(
-    {
-      dirname: __dirname,
-      snippets: ["for each (a in b) {}"],
-    },
-    [parser]
-  );
-}
+run_spec(
+  {
+    dirname: __dirname,
+    snippets: ["for each (a in b) {}"],
+  },
+  ["babel", "flow", "typescript", "babel-flow", "babel-ts", "espree"]
+);
diff --git a/tests/misc/errors/js/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/js/__snapshots__/jsfmt.spec.js.snap
index 8c01590d2..783e27cbf 100644
--- a/tests/misc/errors/js/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/js/__snapshots__/jsfmt.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`html-like-comments.js error test 1`] = `
+exports[`html-like-comments.js [babel] format 1`] = `
 "Unexpected token (3:1)
   1 | // Only support HTML-like comment in HTML
   2 | alert(
@@ -11,28 +11,28 @@ exports[`html-like-comments.js error test 1`] = `
   6 | "
 `;
 
-exports[`import-assertions-for-export-without-from.js error test 1`] = `
+exports[`import-assertions-for-export-without-from.js [babel] format 1`] = `
 "Unexpected token, expected \\";\\" (1:16)
 > 1 | export { foo } assert { type: \\"json\\" };
     |                ^
   2 | "
 `;
 
-exports[`import-assertions-with-parens.js error test 1`] = `
+exports[`import-assertions-with-parens.js [babel] format 1`] = `
 "Unexpected token (1:19)
 > 1 | import \\"x\\" assert ({type: 'json'});
     |                   ^
   2 | "
 `;
 
-exports[`module-attributes.js error test 1`] = `
+exports[`module-attributes.js [babel] format 1`] = `
 "Unexpected token, expected \\";\\" (1:28)
 > 1 | import foo from \\"foo.json\\" with type: \\"json\\";
     |                            ^
   2 | "
 `;
 
-exports[`no-for-in-init-concise-binary-in.js error test 1`] = `
+exports[`no-for-in-init-concise-binary-in.js [babel] format 1`] = `
 "Unexpected token, expected \\")\\" (3:18)
   1 | // https://github.com/babel/babel/pull/11931
   2 | 
@@ -41,7 +41,7 @@ exports[`no-for-in-init-concise-binary-in.js error test 1`] = `
   4 | "
 `;
 
-exports[`partial-template-strings.js error test 1`] = `
+exports[`partial-template-strings.js [babel] format 1`] = `
 "Unexpected token (6:42)
   4 | 
   5 | const Diagnostics = {
@@ -52,43 +52,43 @@ exports[`partial-template-strings.js error test 1`] = `
   9 | Diagnostics.name_not_found(\\"foo\\"); // \\"'foo' not found.\\""
 `;
 
-exports[`snippet: #0 error test 1`] = `
+exports[`snippet: #0 [babel] format 1`] = `
 "Binding should be performed on object property. (1:3)
 > 1 | ::%DebugPrint(null)
     |   ^"
 `;
 
-exports[`snippet: #1 error test 1`] = `
+exports[`snippet: #1 [babel] format 1`] = `
 "Unexpected token (1:3)
 > 1 | a.%DebugPrint();
     |   ^"
 `;
 
-exports[`snippet: #2 error test 1`] = `
+exports[`snippet: #2 [babel] format 1`] = `
 "Unexpected token (1:11)
 > 1 | const i = %DebugPrint;
     |           ^"
 `;
 
-exports[`snippet: #3 error test 1`] = `
+exports[`snippet: #3 [babel] format 1`] = `
 "Unexpected token (1:7)
 > 1 | f(x + ?)
     |       ^"
 `;
 
-exports[`snippet: #4 error test 1`] = `
+exports[`snippet: #4 [babel] format 1`] = `
 "Unexpected token (1:5)
 > 1 | x + ?
     |     ^"
 `;
 
-exports[`snippet: #5 error test 1`] = `
+exports[`snippet: #5 [babel] format 1`] = `
 "Unexpected token (1:1)
 > 1 | ?.f()
     | ^"
 `;
 
-exports[`snippet: #6 error test 1`] = `
+exports[`snippet: #6 [babel] format 1`] = `
 "Unexpected token (5:12)
   3 | 
   4 |   static isC(obj) {
@@ -98,43 +98,43 @@ exports[`snippet: #6 error test 1`] = `
   7 | }"
 `;
 
-exports[`snippet: #7 error test 1`] = `
+exports[`snippet: #7 [babel] format 1`] = `
 "Unexpected token (1:7)
 > 1 | const #{ a, b } = #{ a: 1, b: 2 };
     |       ^"
 `;
 
-exports[`snippet: #8 error test 1`] = `
+exports[`snippet: #8 [babel] format 1`] = `
 "Unexpected token (1:7)
 > 1 | const #[a, b] = #[1, 2];
     |       ^"
 `;
 
-exports[`snippet: #9 error test 1`] = `
+exports[`snippet: #9 [babel] format 1`] = `
 "Tuple expressions starting with '[|' are only allowed when the 'syntaxType' option of the 'recordAndTuple' plugin is set to 'bar' (1:1)
 > 1 | [| 1 |]
     | ^"
 `;
 
-exports[`snippet: #10 error test 1`] = `
+exports[`snippet: #10 [babel] format 1`] = `
 "Invalid decimal (1:1)
 > 1 | 0b101011101m;
     | ^"
 `;
 
-exports[`snippet: #11 error test 1`] = `
+exports[`snippet: #11 [babel] format 1`] = `
 "Invalid decimal (1:1)
 > 1 | 0x16432m;
     | ^"
 `;
 
-exports[`snippet: #12 error test 1`] = `
+exports[`snippet: #12 [babel] format 1`] = `
 "Invalid decimal (1:1)
 > 1 | 0o16432m;
     | ^"
 `;
 
-exports[`static-import-source-should-not-has-extra-token.js error test 1`] = `
+exports[`static-import-source-should-not-has-extra-token.js [babel] format 1`] = `
 "Unexpected token (4:16)
   2 | // be parenthesized, that accidentally break #8016
   3 | 
diff --git a/tests/misc/errors/json/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/json/__snapshots__/jsfmt.spec.js.snap
index 3c7fb6bc4..c39a1a644 100644
--- a/tests/misc/errors/json/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/json/__snapshots__/jsfmt.spec.js.snap
@@ -1,36 +1,36 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`snippet: #0 error test 1`] = `
+exports[`snippet: #0 [json-stringify] format 1`] = `
 "ObjectProperty with shorthand=true is not allowed in JSON. (1:2)
 > 1 | {foo}
     |  ^"
 `;
 
-exports[`snippet: #1 error test 1`] = `
+exports[`snippet: #1 [json-stringify] format 1`] = `
 "ObjectProperty with computed=true is not allowed in JSON. (1:2)
 > 1 | {[\\"foo\\"]:\\"bar\\"}
     |  ^"
 `;
 
-exports[`snippet: #2 error test 1`] = `
+exports[`snippet: #2 [json-stringify] format 1`] = `
 "UnaryExpression with operator=\\"~\\" is not allowed in JSON. (1:9)
 > 1 | {\\"foo\\": ~1}
     |         ^"
 `;
 
-exports[`snippet: #3 error test 1`] = `
+exports[`snippet: #3 [json-stringify] format 1`] = `
 "LogicalExpression is not allowed in JSON. (1:9)
 > 1 | {\\"foo\\": false || \\"bar\\"}
     |         ^"
 `;
 
-exports[`snippet: #4 error test 1`] = `
+exports[`snippet: #4 [json-stringify] format 1`] = `
 "Identifier is not allowed in JSON. (1:9)
 > 1 | {\\"foo\\": undefined}
     |         ^"
 `;
 
-exports[`snippet: #5 error test 1`] = `
+exports[`snippet: #5 [json-stringify] format 1`] = `
 "ArrowFunctionExpression is not allowed in JSON. (1:9)
 > 1 | {\\"foo\\": () => {}}
     |         ^"
diff --git a/tests/misc/errors/less/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/less/__snapshots__/jsfmt.spec.js.snap
index ae6a1f615..1d010b2d6 100644
--- a/tests/misc/errors/less/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/less/__snapshots__/jsfmt.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`inline-comment.less error test 1`] = `
+exports[`inline-comment.less [less] format 1`] = `
 "CssSyntaxError: Unknown word (5:4)
   3 | a{
   4 | 	prop
@@ -11,7 +11,7 @@ exports[`inline-comment.less error test 1`] = `
   8 | }"
 `;
 
-exports[`open-double-quote.less error test 1`] = `
+exports[`open-double-quote.less [less] format 1`] = `
 "CssSyntaxError: Unclosed string (2:17)
   1 | a {
 > 2 | background: url(\\"
@@ -20,7 +20,7 @@ exports[`open-double-quote.less error test 1`] = `
   4 | "
 `;
 
-exports[`open-sigle-quote.less error test 1`] = `
+exports[`open-sigle-quote.less [less] format 1`] = `
 "CssSyntaxError: Unclosed string (2:17)
   1 | a {
 > 2 | background: url('
diff --git a/tests/misc/errors/typescript/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/typescript/__snapshots__/jsfmt.spec.js.snap
index 6b75a8729..a5ea5bf94 100644
--- a/tests/misc/errors/typescript/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/typescript/__snapshots__/jsfmt.spec.js.snap
@@ -1,20 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`default-escaped.ts error test 1`] = `
+exports[`default-escaped.ts [typescript] format 1`] = `
 "Declaration or statement expected. (1:1)
 > 1 | export asyn\\\\u{63} from \\"async\\";
     | ^
   2 | "
 `;
 
-exports[`dynamic-import.ts error test 1`] = `
+exports[`dynamic-import.ts [typescript] format 1`] = `
 "Dynamic import must have one specifier as an argument. (1:8)
 > 1 | import('./prettier.mjs', {})
     |        ^
   2 | "
 `;
 
-exports[`invalid-jsx-1.ts error test 1`] = `
+exports[`invalid-jsx-1.ts [typescript] format 1`] = `
 "Unexpected token. Did you mean \`{'>'}\` or \`&gt;\`? (3:45)
   1 | // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-9.html#-and--are-now-invalid-jsx-text-characters
   2 | 
@@ -23,23 +23,23 @@ exports[`invalid-jsx-1.ts error test 1`] = `
   4 | "
 `;
 
-exports[`issue-8773.ts error test 1`] = `"Comment \\"comment\\" was not printed. Please report this error!"`;
+exports[`issue-8773.ts [typescript] format 1`] = `"Comment \\"comment\\" was not printed. Please report this error!"`;
 
-exports[`module-attributes-dynamic.ts error test 1`] = `
+exports[`module-attributes-dynamic.ts [typescript] format 1`] = `
 "Dynamic import must have one specifier as an argument. (1:8)
 > 1 | import(\\"foo.json\\", { with: { type: \\"json\\" } })
     |        ^
   2 | "
 `;
 
-exports[`module-attributes-static.ts error test 1`] = `
+exports[`module-attributes-static.ts [typescript] format 1`] = `
 "';' expected. (1:28)
 > 1 | import foo from \\"foo.json\\" with type: \\"json\\";
     |                            ^
   2 | "
 `;
 
-exports[`newline-before-arrow.ts error test 1`] = `
+exports[`newline-before-arrow.ts [typescript] format 1`] = `
 "';' expected. (1:7)
 > 1 | async x
     |       ^
@@ -47,37 +47,37 @@ exports[`newline-before-arrow.ts error test 1`] = `
   3 | "
 `;
 
-exports[`snippet: #0 error test 1`] = `
+exports[`snippet: #0 [typescript] format 1`] = `
 "Unexpected token. Did you mean \`{'}'}\` or \`&rbrace;\`? (1:15)
 > 1 | let x1 = <div>}</div>;
     |               ^"
 `;
 
-exports[`snippet: #1 error test 1`] = `
+exports[`snippet: #1 [typescript] format 1`] = `
 "Unexpected token. Did you mean \`{'>'}\` or \`&gt;\`? (1:15)
 > 1 | let x2 = <div>></div>;
     |               ^"
 `;
 
-exports[`snippet: #2 error test 1`] = `
+exports[`snippet: #2 [typescript] format 1`] = `
 "':' expected. (1:21)
 > 1 | let x3 = <div>{\\"foo\\"}}</div>;
     |                     ^"
 `;
 
-exports[`snippet: #3 error test 1`] = `
+exports[`snippet: #3 [typescript] format 1`] = `
 "':' expected. (1:21)
 > 1 | let x4 = <div>{\\"foo\\"}></div>;
     |                     ^"
 `;
 
-exports[`snippet: #4 error test 1`] = `
+exports[`snippet: #4 [typescript] format 1`] = `
 "Expression expected. (1:15)
 > 1 | let x5 = <div>}{\\"foo\\"}</div>;
     |               ^"
 `;
 
-exports[`snippet: #5 error test 1`] = `
+exports[`snippet: #5 [typescript] format 1`] = `
 "Expression expected. (1:15)
 > 1 | let x6 = <div>>{\\"foo\\"}</div>;
     |               ^"
diff --git a/tests/misc/errors/vue/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/vue/__snapshots__/jsfmt.spec.js.snap
index 1ec225d39..b78064eac 100644
--- a/tests/misc/errors/vue/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/vue/__snapshots__/jsfmt.spec.js.snap
@@ -1,13 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`unclosed_tag.vue error test 1`] = `
+exports[`unclosed_tag.vue [vue] format 1`] = `
 "Unexpected character \\"EOF\\" (2:1)
   1 | <div
 > 2 | 
     | ^"
 `;
 
-exports[`unclosed_tag_in_template.vue error test 1`] = `
+exports[`unclosed_tag_in_template.vue [vue] format 1`] = `
 "Unexpected character \\"/\\" (4:2)
   2 |   <p>Templates are formatted as well...
   3 |     </
@@ -16,7 +16,7 @@ exports[`unclosed_tag_in_template.vue error test 1`] = `
   5 | "
 `;
 
-exports[`upper-case.html error test 1`] = `
+exports[`upper-case.html [vue] format 1`] = `
 "Void elements do not have end tags \\"Input\\" (8:21)
    6 |   <div id=\\"app\\">
    7 |     <!-- when vue parse use for html, Input should not treat as component -->
diff --git a/tests/misc/errors/yaml/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/yaml/__snapshots__/jsfmt.spec.js.snap
index 0fdb2e7c2..f33b25c05 100644
--- a/tests/misc/errors/yaml/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/yaml/__snapshots__/jsfmt.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`block-scalar-with-spaces-only.yml error test 1`] = `
+exports[`block-scalar-with-spaces-only.yml [yaml] format 1`] = `
 "Block scalars with more-indented leading empty lines must use an explicit indentation indicator (1:21)
 > 1 | empty block scalar: >
     |                     ^
diff --git a/tests_config/run_spec.js b/tests_config/run_spec.js
index 27e25c9fc..d2e2a1f04 100644
--- a/tests_config/run_spec.js
+++ b/tests_config/run_spec.js
@@ -70,6 +70,10 @@ const isUnstable = (filename, options) => {
 
 const shouldThrowOnFormat = (filename, options) => {
   const { errors = {} } = options;
+  if (errors === true) {
+    return true;
+  }
+
   const files = errors[options.parser];
 
   if (files === true || (Array.isArray(files) && files.includes(filename))) {
@@ -98,6 +102,9 @@ function runSpec(fixtures, parsers, options) {
   // - syntax parser hasn't supported yet
   // - syntax errors that should throws
   const IS_ERROR_TESTS = isTestDirectory(dirname, "misc/errors");
+  if (IS_ERROR_TESTS) {
+    options = { errors: true, ...options };
+  }
 
   if (IS_PARSER_INFERENCE_TESTS) {
     parsers = [undefined];
@@ -146,16 +153,18 @@ function runSpec(fixtures, parsers, options) {
   const [parser] = parsers;
   const allParsers = [...parsers];
 
-  if (parsers.includes("typescript") && !parsers.includes("babel-ts")) {
-    allParsers.push("babel-ts");
-  }
-
-  if (parsers.includes("babel") && isTestDirectory(dirname, "js")) {
-    if (!parsers.includes("espree") && !espreeDisabledTests.has(dirname)) {
-      allParsers.push("espree");
+  if (!IS_ERROR_TESTS) {
+    if (parsers.includes("typescript") && !parsers.includes("babel-ts")) {
+      allParsers.push("babel-ts");
     }
-    if (!parsers.includes("meriyah") && !meriyahDisabledTests.has(dirname)) {
-      allParsers.push("meriyah");
+
+    if (parsers.includes("babel") && isTestDirectory(dirname, "js")) {
+      if (!parsers.includes("espree") && !espreeDisabledTests.has(dirname)) {
+        allParsers.push("espree");
+      }
+      if (!parsers.includes("meriyah") && !meriyahDisabledTests.has(dirname)) {
+        allParsers.push("meriyah");
+      }
     }
   }
 
@@ -173,16 +182,9 @@ function runSpec(fixtures, parsers, options) {
         filepath: filename,
         parser,
       };
-      const formatWithMainParser = () => format(code, formatOptions);
-
-      if (IS_ERROR_TESTS) {
-        test("error test", () => {
-          expect(formatWithMainParser).toThrowErrorMatchingSnapshot();
-        });
-        return;
-      }
-
-      const mainParserFormatResult = formatWithMainParser();
+      const mainParserFormatResult = shouldThrowOnFormat(name, formatOptions)
+        ? { options: formatOptions, error: true }
+        : format(code, formatOptions);
 
       for (const currentParser of allParsers) {
         runTest({
@@ -214,8 +216,11 @@ function runTest({
   let formatResult = mainParserFormatResult;
   let formatTestTitle = "format";
 
-  // Verify parsers
-  if (parser !== parsers[0]) {
+  // Verify parsers or error tests
+  if (
+    mainParserFormatResult.error ||
+    mainParserFormatOptions.parser !== parser
+  ) {
     formatTestTitle = `[${parser}] format`;
     formatOptions = { ...mainParserFormatResult.options, parser };
     const runFormat = () => format(code, formatOptions);

From ed49bf10a00dde513679576e2a4abe04fb2eac73 Mon Sep 17 00:00:00 2001
From: Florent Chehab <florent.chehab@gmail.com>
Date: Mon, 16 Nov 2020 11:27:34 +0100
Subject: [PATCH 042/299] Moved pre-commit support to
 github.com/pre-commit/mirrors-prettier (#8937)

Co-authored-by: fisker Cheung <lionkay@gmail.com>
Co-authored-by: sosukesuzuki <aosukeke@gmail.com>
---
 .pre-commit-hooks.yaml                             | 7 +++++--
 docs/precommit.md                                  | 4 ++--
 website/versioned_docs/version-stable/precommit.md | 4 +++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml
index ac74494a2..510d631cb 100644
--- a/.pre-commit-hooks.yaml
+++ b/.pre-commit-hooks.yaml
@@ -1,4 +1,7 @@
+# Remove this file after year 2020
+
 - id: prettier
   name: prettier
-  entry: prettier --write --list-different --ignore-unknown
-  language: node
+  entry: Prettier support for pre-commit has been moved to https://github.com/pre-commit/mirrors-prettier, please use the new repository.
+  language: fail
+  pass_filenames: false
diff --git a/docs/precommit.md b/docs/precommit.md
index 24627270f..66f32326a 100644
--- a/docs/precommit.md
+++ b/docs/precommit.md
@@ -61,13 +61,13 @@ Read more at the [pretty-quick](https://github.com/azz/pretty-quick) repo.
 Copy the following config into your `.pre-commit-config.yaml` file:
 
 ```yaml
-- repo: https://github.com/prettier/prettier
+- repo: https://github.com/pre-commit/mirrors-prettier
   rev: "" # Use the sha or tag you want to point at
   hooks:
     - id: prettier
 ```
 
-Read more at the [pre-commit](https://pre-commit.com) website.
+Read more at [mirror of prettier package for pre-commit](https://github.com/pre-commit/mirrors-prettier) and the [pre-commit](https://pre-commit.com) website.
 
 ## Option 4. [git-format-staged](https://github.com/hallettj/git-format-staged)
 
diff --git a/website/versioned_docs/version-stable/precommit.md b/website/versioned_docs/version-stable/precommit.md
index 9ea0cf8fe..4a0d7a6a7 100644
--- a/website/versioned_docs/version-stable/precommit.md
+++ b/website/versioned_docs/version-stable/precommit.md
@@ -62,12 +62,14 @@ Read more at the [pretty-quick](https://github.com/azz/pretty-quick) repo.
 Copy the following config into your `.pre-commit-config.yaml` file:
 
 ```yaml
-- repo: https://github.com/prettier/prettier
+- repo: https://github.com/pre-commit/mirrors-prettier
   rev: "" # Use the sha or tag you want to point at
   hooks:
     - id: prettier
 ```
 
+Read more at [mirror of prettier package for pre-commit](https://github.com/pre-commit/mirrors-prettier) and the [pre-commit](https://pre-commit.com) website.
+
 Read more at the [pre-commit](https://pre-commit.com) website.
 
 ## Option 4. [git-format-staged](https://github.com/hallettj/git-format-staged)

From e73576a64b2ce0f71873216be1cda46ec78aef4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Nov 2020 07:59:26 +0000
Subject: [PATCH 043/299] Build(deps): Bump @glimmer/syntax from 0.65.0 to
 0.66.0 (#9693)

---
 package.json                                  |  2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |  9 +++++-
 yarn.lock                                     | 28 +++++++++++++++----
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 49c1b927f..48d2655ca 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "10.2.3",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.5",
-    "@glimmer/syntax": "0.65.0",
+    "@glimmer/syntax": "0.66.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "3.10.1",
     "angular-estree-parser": "2.2.1",
diff --git a/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
index bc710fce6..ab5091dd0 100644
--- a/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
@@ -12,10 +12,17 @@ Expecting 'CLOSE_RAW_BLOCK', 'CLOSE', 'CLOSE_UNESCAPED', 'OPEN_SEXPR', 'CLOSE_SE
 `;
 
 exports[`invalid-2.hbs [glimmer] format 1`] = `
-"Unclosed element \`@name\` (on line 3). (3:0)
+"Syntax Error: Unclosed element \`@name\`: 
+
+|
+|  <{@name>
+|
+
+(error occurred in 'an unknown module' @ line 3 : column 0) (3:0)
   1 | <a>
   2 | 
 > 3 | <{@name>
+    | ^^^^^^^^
   4 | "
 `;
 
diff --git a/yarn.lock b/yarn.lock
index 26d604b14..22b186279 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -908,6 +908,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.66.0.tgz#f281e1985d6b7f63648d960cc2745c68562fdb92"
+  integrity sha512-fw1pO6oyczSKeTPR6anrSI4OarLlaAR0SSDAhsYrINXfW7Xd/U/es7i6VE1JjLSZqfnsAxjNOFDe0lA5lmV/dw==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/reference@0.65.0":
   version "0.65.0"
   resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.65.0.tgz#8863308d0865d45ae1fc5d07d5ccef9da4dff2d7"
@@ -919,13 +926,13 @@
     "@glimmer/util" "0.65.0"
     "@glimmer/validator" "0.65.0"
 
-"@glimmer/syntax@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.65.0.tgz#a4fd943ca558e15c77619d49a4d4500dd252868c"
-  integrity sha512-juVFrA62oFdr2FSxLMb7c3j7KU/onQlC7c4E9rnkivXqE7EmNGI7/+I48L/DsMmDOZDOf4bIhjeCWbXNB4dS9g==
+"@glimmer/syntax@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.66.0.tgz#d38561be48f6c4deeb94c24a1344a3426bb7e925"
+  integrity sha512-sgGQvoLprHjGV/TW2WY5wTmJaUjkHHgXhRJp+nLL5+JVC1zoR/mbGJk2Wfbj/R5D3pKzPln08HsSdXKj9Dl36g==
   dependencies:
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/util" "0.65.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/util" "0.66.0"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
@@ -938,6 +945,15 @@
     "@glimmer/interfaces" "0.65.0"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.66.0.tgz#c457951951f4ea1d5a1d63fa11c9ffeae8efa4f6"
+  integrity sha512-4J3sihRKZ7N4igk2BZGryC/E6qIy+20d3Dl9+jYhsM8SdviPm+PtFy7tdJsb3E+u/yITqHnvzt7+Cr+VtlT7KA==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.66.0"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.65.0":
   version "0.65.0"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.65.0.tgz#e4411e0a979f002efe236e3bcc91de5f5aaeaed2"

From 688a06d35a51245986b661d8153b76b99b11c231 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Nov 2020 18:55:04 +0800
Subject: [PATCH 044/299] Build(deps-dev): Bump @glimmer/reference from 0.65.0
 to 0.66.0 (#9695)

Bumps @glimmer/reference from 0.65.0 to 0.66.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++---------------------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index 48d2655ca..e02482f24 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.3",
     "@babel/preset-env": "7.12.1",
     "@babel/types": "7.12.6",
-    "@glimmer/reference": "0.65.0",
+    "@glimmer/reference": "0.66.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.1",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index 22b186279..192bbf370 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -894,20 +894,13 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.65.0.tgz#96d8b99d1a805be72d4dcf5d2eb90cd2ecfff550"
-  integrity sha512-czdgBmQRHFdrpKicZ1qJ0cd2yzNf/T4OV9VT+7dR356At3C7OWU0GJiIfA1IcW7nqS7x27rC8GDsUZm0ntEFRQ==
+"@glimmer/global-context@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.66.0.tgz#4efc0d90ffc33a07e2f86b1462e71541f4e36cdd"
+  integrity sha512-3kaSDZptEF3dmCO/rcQptJ0qZQub8ax1C19+IkuBnTbeYOEgdW61rPFdApqAzY/EydMjBmxZRLhS/IMRx4wJcQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.65.0.tgz#e3852efb63fc9f18268991caea4ab362b75ae231"
-  integrity sha512-Ka9/w1u7SjWt8ZKa3Gs9IbFtLLDlaCdCTO7B+/Lat0bxGIctyEAyjxUdVqUwXWO4pMfkEFWKBP3L/t9CRT8sVQ==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.66.0":
   version "0.66.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.66.0.tgz#f281e1985d6b7f63648d960cc2745c68562fdb92"
@@ -915,16 +908,16 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.65.0.tgz#8863308d0865d45ae1fc5d07d5ccef9da4dff2d7"
-  integrity sha512-Cxb5Q91x+oV494dMtjx/fo5QudFCI1yJ4gg2Uj9hWWp2r8EqRmW2rlboLdnkjBDuY5MMuqwY9I8mc+SSAqQ46w==
+"@glimmer/reference@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.66.0.tgz#3d1acb1755fe6c1660275aec7482cbc9935a656c"
+  integrity sha512-HNY2bxx+2/i5jEDQO5tVX3TZGVzCfpvVE5whkNxS+vDTV+E3KACWvxNz4e3cKbA98tYoZJjGw/jWOhgak3Bbvg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.65.0"
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/util" "0.65.0"
-    "@glimmer/validator" "0.65.0"
+    "@glimmer/global-context" "0.66.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/util" "0.66.0"
+    "@glimmer/validator" "0.66.0"
 
 "@glimmer/syntax@0.66.0":
   version "0.66.0"
@@ -936,15 +929,6 @@
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.65.0.tgz#8a90382500334e415415bf51b269bc7484b17543"
-  integrity sha512-tfsKVJpCJ5ADWXgpouiitIKlNacWQseYAlppgn8Y6LnzxcywgnumwFObkfzYlFE6Nd1IiymNxgEeSNJKylWl1A==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.65.0"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.66.0":
   version "0.66.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.66.0.tgz#c457951951f4ea1d5a1d63fa11c9ffeae8efa4f6"
@@ -954,13 +938,13 @@
     "@glimmer/interfaces" "0.66.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.65.0.tgz#e4411e0a979f002efe236e3bcc91de5f5aaeaed2"
-  integrity sha512-nwFReFT9zOOV+9iSqhNookTfHbOsqqPvtsALXl5Rn4QmtAHFLdehiWyN6ddb/sJwllWq+fNW8DxQdiY1xRwn9A==
+"@glimmer/validator@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.66.0.tgz#a127e6f9e36a41665f6bbb8d6635412db8160824"
+  integrity sha512-9xZK3Z8kIbTa3UoDU3lxel5AeQvr9bI6hQSbx21E2sO7R7dnozWM0GQjvnjCeyU5JLGJH/YKpeItZFhHhbDvtQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.65.0"
+    "@glimmer/global-context" "0.66.0"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From 1fb2188eb228846e3450747ab9b5fc81a24b0e17 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Nov 2020 18:57:06 +0800
Subject: [PATCH 045/299] Build(deps): Bump codecov/codecov-action from v1.0.14
 to v1.0.15 (#9692)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/dev-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml
index f8a2a2d5c..343651405 100644
--- a/.github/workflows/dev-test.yml
+++ b/.github/workflows/dev-test.yml
@@ -62,7 +62,7 @@ jobs:
         run: yarn test --maxWorkers=2
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@v1.0.14
+        uses: codecov/codecov-action@v1.0.15
         if: matrix.ENABLE_CODE_COVERAGE
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -76,7 +76,7 @@ jobs:
           PRETTIER_FALLBACK_RESOLVE: true
 
       - name: Upload Coverage (PRETTIER_FALLBACK_RESOLVE)
-        uses: codecov/codecov-action@v1.0.14
+        uses: codecov/codecov-action@v1.0.15
         if: matrix.ENABLE_CODE_COVERAGE
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

From 85e5cfaf2fcd6477fcee77e5290d3f8fb2f91ac0 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 17 Nov 2020 21:38:50 +0800
Subject: [PATCH 046/299] YAML: Fix comments in `flowMapping` and
 `flowSequence` (#9669)

---
 changelog_unreleased/yaml/pr-9669.md          | 60 ++++++++++++++
 src/language-yaml/printer-yaml.js             | 14 +++-
 .../comment/__snapshots__/jsfmt.spec.js.snap  | 78 +++++++++++++++++++
 tests/yaml/comment/flow-sequence-mapping.yml  | 33 ++++++++
 4 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/yaml/pr-9669.md
 create mode 100644 tests/yaml/comment/flow-sequence-mapping.yml

diff --git a/changelog_unreleased/yaml/pr-9669.md b/changelog_unreleased/yaml/pr-9669.md
new file mode 100644
index 000000000..70aa1fba0
--- /dev/null
+++ b/changelog_unreleased/yaml/pr-9669.md
@@ -0,0 +1,60 @@
+#### Fix comments inside `flowMapping` and `flowSequence` (#9669 by @fisker)
+
+<!-- prettier-ignore -->
+```yaml
+# Input
+a:
+  [
+    a, b,
+    # comment
+  ]
+
+b:
+  # prettier-ignore
+  {
+    a: 1, b: 2,
+    # comment
+  }
+
+# Prettier stable
+a: [a, b]
+  # comment
+
+b:
+  # prettier-ignore
+  {
+    a: 1, b: 2,
+    # comment
+  }
+  # comment
+
+
+# Prettier stable (second format)
+a:
+  [a, b]
+  # comment
+
+b:
+  # prettier-ignore
+  {
+    a: 1, b: 2,
+    # comment
+  }
+  # comment
+  # comment
+
+
+# Prettier master
+a: [
+    a,
+    b,
+    # comment
+  ]
+
+b:
+  # prettier-ignore
+  {
+    a: 1, b: 2,
+    # comment
+  }
+```
diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js
index fa219a50e..fa13a5081 100644
--- a/src/language-yaml/printer-yaml.js
+++ b/src/language-yaml/printer-yaml.js
@@ -527,6 +527,12 @@ function _print(node, parentNode, path, options, print) {
               )
             ),
             ifBreak(",", ""),
+            hasEndComments(node)
+              ? concat([
+                  hardline,
+                  join(hardline, path.map(print, "endComments")),
+                ])
+              : "",
           ])
         ),
         isLastItemEmptyMappingItem ? "" : bracketSpacing,
@@ -703,7 +709,13 @@ function needsSpaceInFrontOfMappingValue(node) {
 
 function shouldPrintEndComments(node) {
   return (
-    hasEndComments(node) && !isNode(node, ["documentHead", "documentBody"])
+    hasEndComments(node) &&
+    !isNode(node, [
+      "documentHead",
+      "documentBody",
+      "flowMapping",
+      "flowSequence",
+    ])
   );
 }
 
diff --git a/tests/yaml/comment/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/comment/__snapshots__/jsfmt.spec.js.snap
index 9e899d762..40c5720ed 100644
--- a/tests/yaml/comment/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/yaml/comment/__snapshots__/jsfmt.spec.js.snap
@@ -108,6 +108,84 @@ A:
 ================================================================================
 `;
 
+exports[`flow-sequence-mapping.yml format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+    a:
+      [
+        check-format, check-lint,
+        check-spelling,
+        # coverage,
+        # install-and-run-from-git,
+      ]
+
+    b:
+      {
+        a: check-format, b: check-lint,
+        c: check-spelling,
+        # d: coverage,
+        # e: install-and-run-from-git,
+      }
+
+    d:
+      # prettier-ignore
+      [
+        check-format, check-lint,
+        check-spelling,
+        # coverage,
+        # install-and-run-from-git,
+      ]
+
+    e:
+      # prettier-ignore
+      {
+        a: check-format, b: check-lint,
+        c: check-spelling,
+        # d: coverage,
+        # e: install-and-run-from-git,
+      }
+
+=====================================output=====================================
+a: [
+    check-format,
+    check-lint,
+    check-spelling,
+    # coverage,
+    # install-and-run-from-git,
+  ]
+
+b: {
+    a: check-format,
+    b: check-lint,
+    c: check-spelling,
+    # d: coverage,
+    # e: install-and-run-from-git,
+  }
+
+d:
+  # prettier-ignore
+  [
+        check-format, check-lint,
+        check-spelling,
+        # coverage,
+        # install-and-run-from-git,
+      ]
+
+e:
+  # prettier-ignore
+  {
+        a: check-format, b: check-lint,
+        c: check-spelling,
+        # d: coverage,
+        # e: install-and-run-from-git,
+      }
+
+================================================================================
+`;
+
 exports[`in-empty-item-without-newlline.yml format 1`] = `
 ====================================options=====================================
 parsers: ["yaml"]
diff --git a/tests/yaml/comment/flow-sequence-mapping.yml b/tests/yaml/comment/flow-sequence-mapping.yml
new file mode 100644
index 000000000..6a2e1d952
--- /dev/null
+++ b/tests/yaml/comment/flow-sequence-mapping.yml
@@ -0,0 +1,33 @@
+    a:
+      [
+        check-format, check-lint,
+        check-spelling,
+        # coverage,
+        # install-and-run-from-git,
+      ]
+
+    b:
+      {
+        a: check-format, b: check-lint,
+        c: check-spelling,
+        # d: coverage,
+        # e: install-and-run-from-git,
+      }
+
+    d:
+      # prettier-ignore
+      [
+        check-format, check-lint,
+        check-spelling,
+        # coverage,
+        # install-and-run-from-git,
+      ]
+
+    e:
+      # prettier-ignore
+      {
+        a: check-format, b: check-lint,
+        c: check-spelling,
+        # d: coverage,
+        # e: install-and-run-from-git,
+      }

From 702f543635d26ae9547e967c2ed43e998e5ff1eb Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 18 Nov 2020 09:05:56 +0800
Subject: [PATCH 047/299] YAML: Apply `trailingComma` option (#9665)

---
 changelog_unreleased/yaml/pr-9665.md          |  46 ++++
 src/language-yaml/printer-yaml.js             |   4 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 184 +++++++++++++
 .../trailing-comma/flow-mapping.yml           |  19 ++
 .../flow-mapping/trailing-comma/jsfmt.spec.js |   4 +
 .../__snapshots__/jsfmt.spec.js.snap          | 192 +++++++++++++
 .../trailing-comma/flow-sequence.yml          |  19 ++
 .../trailing-comma/jsfmt.spec.js              |   4 +
 .../__snapshots__/jsfmt.spec.js.snap          | 252 ++++++++++++++++++
 tests/yaml/json/trailing-comma/jsfmt.spec.js  |   4 +
 tests/yaml/json/trailing-comma/json.yml       |  26 ++
 11 files changed, 753 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/yaml/pr-9665.md
 create mode 100644 tests/yaml/flow-mapping/trailing-comma/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/yaml/flow-mapping/trailing-comma/flow-mapping.yml
 create mode 100644 tests/yaml/flow-mapping/trailing-comma/jsfmt.spec.js
 create mode 100644 tests/yaml/flow-sequence/trailing-comma/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/yaml/flow-sequence/trailing-comma/flow-sequence.yml
 create mode 100644 tests/yaml/flow-sequence/trailing-comma/jsfmt.spec.js
 create mode 100644 tests/yaml/json/trailing-comma/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/yaml/json/trailing-comma/jsfmt.spec.js
 create mode 100644 tests/yaml/json/trailing-comma/json.yml

diff --git a/changelog_unreleased/yaml/pr-9665.md b/changelog_unreleased/yaml/pr-9665.md
new file mode 100644
index 000000000..5e9990203
--- /dev/null
+++ b/changelog_unreleased/yaml/pr-9665.md
@@ -0,0 +1,46 @@
+#### Apply `trailingComma` option (#9665 by @fisker)
+
+When `--trailing-comma=none`, should not add trailing comma to flowMapping and flowSequence.
+
+<!-- prettier-ignore -->
+```yaml
+# Input
+flow-mapping:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  }
+flow-sequence:
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ]
+
+# Prettier stable
+mapping:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here",
+  }
+flow-sequence:
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here",
+  ]
+
+# Prettier master
+flow-mapping:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  }
+flow-sequence:
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here"
+  ]
+```
diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js
index fa13a5081..4177c3b3e 100644
--- a/src/language-yaml/printer-yaml.js
+++ b/src/language-yaml/printer-yaml.js
@@ -499,6 +499,8 @@ function _print(node, parentNode, path, options, print) {
           lastItem.type === "flowMappingItem" &&
           isEmptyNode(lastItem.key) &&
           isEmptyNode(lastItem.value))(getLast(node.children));
+      const trailingComma =
+        options.trailingComma === "none" ? "" : ifBreak(",", "");
       return concat([
         openMarker,
         indent(
@@ -526,7 +528,7 @@ function _print(node, parentNode, path, options, print) {
                 "children"
               )
             ),
-            ifBreak(",", ""),
+            trailingComma,
             hasEndComments(node)
               ? concat([
                   hardline,
diff --git a/tests/yaml/flow-mapping/trailing-comma/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/flow-mapping/trailing-comma/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..2a5515d04
--- /dev/null
+++ b/tests/yaml/flow-mapping/trailing-comma/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,184 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`flow-mapping.yml - {"trailingComma":"all"} format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+trailingComma: "all"
+                                                                                | printWidth
+=====================================input======================================
+failing:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  }
+
+expected:
+  {
+    "object-fits-within-print-width": "",
+    "TEST": "comma NOT here"
+  }
+
+---
+
+does not suffice: >
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  }
+
+=====================================output=====================================
+failing:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here",
+  }
+
+expected: { "object-fits-within-print-width": "", "TEST": "comma NOT here" }
+
+---
+does not suffice: >
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  }
+
+================================================================================
+`;
+
+exports[`flow-mapping.yml - {"trailingComma":"es5"} format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+trailingComma: "es5"
+                                                                                | printWidth
+=====================================input======================================
+failing:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  }
+
+expected:
+  {
+    "object-fits-within-print-width": "",
+    "TEST": "comma NOT here"
+  }
+
+---
+
+does not suffice: >
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  }
+
+=====================================output=====================================
+failing:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here",
+  }
+
+expected: { "object-fits-within-print-width": "", "TEST": "comma NOT here" }
+
+---
+does not suffice: >
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  }
+
+================================================================================
+`;
+
+exports[`flow-mapping.yml - {"trailingComma":"none"} format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+trailingComma: "none"
+                                                                                | printWidth
+=====================================input======================================
+failing:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  }
+
+expected:
+  {
+    "object-fits-within-print-width": "",
+    "TEST": "comma NOT here"
+  }
+
+---
+
+does not suffice: >
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  }
+
+=====================================output=====================================
+failing:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  }
+
+expected: { "object-fits-within-print-width": "", "TEST": "comma NOT here" }
+
+---
+does not suffice: >
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  }
+
+================================================================================
+`;
+
+exports[`flow-mapping.yml format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+failing:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  }
+
+expected:
+  {
+    "object-fits-within-print-width": "",
+    "TEST": "comma NOT here"
+  }
+
+---
+
+does not suffice: >
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  }
+
+=====================================output=====================================
+failing:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here",
+  }
+
+expected: { "object-fits-within-print-width": "", "TEST": "comma NOT here" }
+
+---
+does not suffice: >
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  }
+
+================================================================================
+`;
diff --git a/tests/yaml/flow-mapping/trailing-comma/flow-mapping.yml b/tests/yaml/flow-mapping/trailing-comma/flow-mapping.yml
new file mode 100644
index 000000000..103e9c803
--- /dev/null
+++ b/tests/yaml/flow-mapping/trailing-comma/flow-mapping.yml
@@ -0,0 +1,19 @@
+failing:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  }
+
+expected:
+  {
+    "object-fits-within-print-width": "",
+    "TEST": "comma NOT here"
+  }
+
+---
+
+does not suffice: >
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  }
diff --git a/tests/yaml/flow-mapping/trailing-comma/jsfmt.spec.js b/tests/yaml/flow-mapping/trailing-comma/jsfmt.spec.js
new file mode 100644
index 000000000..6bdc1ebe6
--- /dev/null
+++ b/tests/yaml/flow-mapping/trailing-comma/jsfmt.spec.js
@@ -0,0 +1,4 @@
+run_spec(__dirname, ["yaml"]);
+run_spec(__dirname, ["yaml"], { trailingComma: "none" });
+run_spec(__dirname, ["yaml"], { trailingComma: "es5" });
+run_spec(__dirname, ["yaml"], { trailingComma: "all" });
diff --git a/tests/yaml/flow-sequence/trailing-comma/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/flow-sequence/trailing-comma/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..a21a27c5b
--- /dev/null
+++ b/tests/yaml/flow-sequence/trailing-comma/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,192 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`flow-sequence.yml - {"trailingComma":"all"} format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+trailingComma: "all"
+                                                                                | printWidth
+=====================================input======================================
+failing:
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ]
+
+expected:
+  [
+    "object-fits-within-print-width", "",
+    "TEST", "comma NOT here"
+  ]
+
+---
+
+does not suffice: >
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+
+=====================================output=====================================
+failing:
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here",
+  ]
+
+expected: ["object-fits-within-print-width", "", "TEST", "comma NOT here"]
+
+---
+does not suffice: >
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+
+================================================================================
+`;
+
+exports[`flow-sequence.yml - {"trailingComma":"es5"} format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+trailingComma: "es5"
+                                                                                | printWidth
+=====================================input======================================
+failing:
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ]
+
+expected:
+  [
+    "object-fits-within-print-width", "",
+    "TEST", "comma NOT here"
+  ]
+
+---
+
+does not suffice: >
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+
+=====================================output=====================================
+failing:
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here",
+  ]
+
+expected: ["object-fits-within-print-width", "", "TEST", "comma NOT here"]
+
+---
+does not suffice: >
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+
+================================================================================
+`;
+
+exports[`flow-sequence.yml - {"trailingComma":"none"} format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+trailingComma: "none"
+                                                                                | printWidth
+=====================================input======================================
+failing:
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ]
+
+expected:
+  [
+    "object-fits-within-print-width", "",
+    "TEST", "comma NOT here"
+  ]
+
+---
+
+does not suffice: >
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+
+=====================================output=====================================
+failing:
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here"
+  ]
+
+expected: ["object-fits-within-print-width", "", "TEST", "comma NOT here"]
+
+---
+does not suffice: >
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+
+================================================================================
+`;
+
+exports[`flow-sequence.yml format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+failing:
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ]
+
+expected:
+  [
+    "object-fits-within-print-width", "",
+    "TEST", "comma NOT here"
+  ]
+
+---
+
+does not suffice: >
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+
+=====================================output=====================================
+failing:
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here",
+  ]
+
+expected: ["object-fits-within-print-width", "", "TEST", "comma NOT here"]
+
+---
+does not suffice: >
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+
+================================================================================
+`;
diff --git a/tests/yaml/flow-sequence/trailing-comma/flow-sequence.yml b/tests/yaml/flow-sequence/trailing-comma/flow-sequence.yml
new file mode 100644
index 000000000..769ff94ba
--- /dev/null
+++ b/tests/yaml/flow-sequence/trailing-comma/flow-sequence.yml
@@ -0,0 +1,19 @@
+failing:
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ]
+
+expected:
+  [
+    "object-fits-within-print-width", "",
+    "TEST", "comma NOT here"
+  ]
+
+---
+
+does not suffice: >
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
diff --git a/tests/yaml/flow-sequence/trailing-comma/jsfmt.spec.js b/tests/yaml/flow-sequence/trailing-comma/jsfmt.spec.js
new file mode 100644
index 000000000..6bdc1ebe6
--- /dev/null
+++ b/tests/yaml/flow-sequence/trailing-comma/jsfmt.spec.js
@@ -0,0 +1,4 @@
+run_spec(__dirname, ["yaml"]);
+run_spec(__dirname, ["yaml"], { trailingComma: "none" });
+run_spec(__dirname, ["yaml"], { trailingComma: "es5" });
+run_spec(__dirname, ["yaml"], { trailingComma: "all" });
diff --git a/tests/yaml/json/trailing-comma/__snapshots__/jsfmt.spec.js.snap b/tests/yaml/json/trailing-comma/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..9580a7a6b
--- /dev/null
+++ b/tests/yaml/json/trailing-comma/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,252 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`json.yml - {"trailingComma":"all"} format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+trailingComma: "all"
+                                                                                | printWidth
+=====================================input======================================
+[
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  },
+  {
+    "object-fits-within-print-width": "",
+    "TEST": "comma NOT here"
+  },
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  },
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ],
+  [
+    "object-fits-within-print-width", "",
+    "TEST", "comma NOT here"
+  ],
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+]
+
+=====================================output=====================================
+[
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here",
+  },
+  { "object-fits-within-print-width": "", "TEST": "comma NOT here" },
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'",
+  },
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here",
+  ],
+  ["object-fits-within-print-width", "", "TEST", "comma NOT here"],
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma NOT here — but object's now a string due to '>'",
+  ],
+]
+
+================================================================================
+`;
+
+exports[`json.yml - {"trailingComma":"es5"} format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+trailingComma: "es5"
+                                                                                | printWidth
+=====================================input======================================
+[
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  },
+  {
+    "object-fits-within-print-width": "",
+    "TEST": "comma NOT here"
+  },
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  },
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ],
+  [
+    "object-fits-within-print-width", "",
+    "TEST", "comma NOT here"
+  ],
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+]
+
+=====================================output=====================================
+[
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here",
+  },
+  { "object-fits-within-print-width": "", "TEST": "comma NOT here" },
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'",
+  },
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here",
+  ],
+  ["object-fits-within-print-width", "", "TEST", "comma NOT here"],
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma NOT here — but object's now a string due to '>'",
+  ],
+]
+
+================================================================================
+`;
+
+exports[`json.yml - {"trailingComma":"none"} format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+trailingComma: "none"
+                                                                                | printWidth
+=====================================input======================================
+[
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  },
+  {
+    "object-fits-within-print-width": "",
+    "TEST": "comma NOT here"
+  },
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  },
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ],
+  [
+    "object-fits-within-print-width", "",
+    "TEST", "comma NOT here"
+  ],
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+]
+
+=====================================output=====================================
+[
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  },
+  { "object-fits-within-print-width": "", "TEST": "comma NOT here" },
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  },
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here"
+  ],
+  ["object-fits-within-print-width", "", "TEST", "comma NOT here"],
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma NOT here — but object's now a string due to '>'"
+  ]
+]
+
+================================================================================
+`;
+
+exports[`json.yml format 1`] = `
+====================================options=====================================
+parsers: ["yaml"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+[
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  },
+  {
+    "object-fits-within-print-width": "",
+    "TEST": "comma NOT here"
+  },
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  },
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ],
+  [
+    "object-fits-within-print-width", "",
+    "TEST", "comma NOT here"
+  ],
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+]
+
+=====================================output=====================================
+[
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here",
+  },
+  { "object-fits-within-print-width": "", "TEST": "comma NOT here" },
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'",
+  },
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here",
+  ],
+  ["object-fits-within-print-width", "", "TEST", "comma NOT here"],
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma NOT here — but object's now a string due to '>'",
+  ],
+]
+
+================================================================================
+`;
diff --git a/tests/yaml/json/trailing-comma/jsfmt.spec.js b/tests/yaml/json/trailing-comma/jsfmt.spec.js
new file mode 100644
index 000000000..6bdc1ebe6
--- /dev/null
+++ b/tests/yaml/json/trailing-comma/jsfmt.spec.js
@@ -0,0 +1,4 @@
+run_spec(__dirname, ["yaml"]);
+run_spec(__dirname, ["yaml"], { trailingComma: "none" });
+run_spec(__dirname, ["yaml"], { trailingComma: "es5" });
+run_spec(__dirname, ["yaml"], { trailingComma: "all" });
diff --git a/tests/yaml/json/trailing-comma/json.yml b/tests/yaml/json/trailing-comma/json.yml
new file mode 100644
index 000000000..c317d3820
--- /dev/null
+++ b/tests/yaml/json/trailing-comma/json.yml
@@ -0,0 +1,26 @@
+[
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  },
+  {
+    "object-fits-within-print-width": "",
+    "TEST": "comma NOT here"
+  },
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma NOT here — but object's now a string due to '>'"
+  },
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ],
+  [
+    "object-fits-within-print-width", "",
+    "TEST", "comma NOT here"
+  ],
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma NOT here — but object's now a string due to '>'"
+  ]
+]

From 4cc149248a78491eecacccce7e04b82e751afb64 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Wed, 18 Nov 2020 10:59:58 +0900
Subject: [PATCH 048/299] Support TypeScript 4.1 via typescript-estree (#9636)

* Update typescript and typescript-estree

* Add AST transformation for TSTemplateLiteralType

* Update tests for template-literal-types

* Fix transformChainExpression

* Update tests for key-remapping-in-mapped-types

* Implement recoverInvalidDecorators

* Update changelog

* Avoid typecheck error

* Add os.platform() shim

* Update config.js

* Update config.js

* Shim os.cpus

* Update `process.versions.node`

* Attempt to fix build

* Update ts parserOptions

* Fix code style

* Remove `errorOnUnknownASTType`, fix code style

* Use `[] ||` instead of `[] //`

* Fix hack

* Add invalid tests

* checkMissingDecorators

* Update tests

* Fix tests

* Add comment

* Revert "Implement recoverInvalidDecorators"

This reverts commit 27e7b46ed41df36fb585791117c85e1b2dab932c.

* Add ref pr link

* Simplify logic

* Don't transform `TSTemplateLiteralType`

* Add `TSTemplateLiteralType` as simple type

* Fix tests

* Update comments

* Add comment

* Fix logic

* Minor tweak

* use multiple parsers

* Update @typescript-eslint/typescript-estree to v4.8.0

* Switch to `parseWithNodeMaps`

* Rename `esNode` -> `esTreeNode`

* Update @typescript-eslint/typescript-estree to 4.8.1-alpha.1

* Use @typescript-eslint/typescript-estree 4.8.1

Co-authored-by: fisker Cheung <lionkay@gmail.com>
---
 changelog_unreleased/typescript/pr-9473.md    |  4 +-
 package.json                                  |  4 +-
 scripts/build/config.js                       |  5 +
 scripts/build/shims/os.mjs                    |  2 +
 src/language-graphql/printer-graphql.js       | 11 +--
 src/language-handlebars/printer-glimmer.js    | 11 +--
 src/language-js/parse-postprocess.js          | 59 +++++++++++-
 src/language-js/parser-typescript.js          | 17 ++--
 src/language-js/print/template-literal.js     | 15 ++-
 src/language-js/printer-estree-json.js        |  4 +-
 src/language-js/printer-estree.js             |  1 +
 src/language-js/utils.js                      | 11 ++-
 src/main/comments.js                          | 20 ++--
 .../__snapshots__/jsfmt.spec.js.snap          | 96 +++++++++++++++++++
 .../decorator.ts                              |  0
 .../invalid-typescript-decorators/enums.ts    |  9 ++
 .../invalid-typescript-decorators/function.ts |  4 +
 .../interface.ts                              |  4 +-
 .../jsfmt.spec.js                             |  1 +
 .../__snapshots__/jsfmt.spec.js.snap          | 30 ------
 .../conformance/types/decorator/jsfmt.spec.js |  1 -
 .../__snapshots__/jsfmt.spec.js.snap          | 35 -------
 tests/typescript/decorators/jsfmt.spec.js     |  4 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 10 --
 .../jsfmt.spec.js                             |  4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |  9 --
 .../template-literal-types/jsfmt.spec.js      |  4 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 36 +++++++
 .../typeparams/consistent/jsfmt.spec.js       |  8 +-
 .../consistent/template-literal-types.ts      |  1 +
 .../typeparams/consistent/typescript-only.ts  |  2 +-
 yarn.lock                                     | 50 +++++-----
 32 files changed, 304 insertions(+), 168 deletions(-)
 create mode 100644 tests/misc/errors/invalid-typescript-decorators/__snapshots__/jsfmt.spec.js.snap
 rename tests/{typescript/conformance/types/decorator => misc/errors/invalid-typescript-decorators}/decorator.ts (100%)
 create mode 100644 tests/misc/errors/invalid-typescript-decorators/enums.ts
 create mode 100644 tests/misc/errors/invalid-typescript-decorators/function.ts
 rename tests/{typescript/decorators => misc/errors/invalid-typescript-decorators}/interface.ts (55%)
 create mode 100644 tests/misc/errors/invalid-typescript-decorators/jsfmt.spec.js
 delete mode 100644 tests/typescript/conformance/types/decorator/__snapshots__/jsfmt.spec.js.snap
 delete mode 100644 tests/typescript/conformance/types/decorator/jsfmt.spec.js
 create mode 100644 tests/typescript/typeparams/consistent/template-literal-types.ts

diff --git a/changelog_unreleased/typescript/pr-9473.md b/changelog_unreleased/typescript/pr-9473.md
index ed18101ee..1c0f69efd 100644
--- a/changelog_unreleased/typescript/pr-9473.md
+++ b/changelog_unreleased/typescript/pr-9473.md
@@ -1,6 +1,4 @@
-#### [HIGHLIGHT]Support TypeScript 4.1 via Babel (#9473 by @sosukesuzuki)
-
-`--parser=babel-ts` is required.
+#### [HIGHLIGHT]Support TypeScript 4.1 (#9473, #9636 by @sosukesuzuki)
 
 ##### Key Remapping In Mapped Types
 
diff --git a/package.json b/package.json
index e02482f24..fd5977015 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@babel/parser": "7.12.5",
     "@glimmer/syntax": "0.66.0",
     "@iarna/toml": "2.2.5",
-    "@typescript-eslint/typescript-estree": "3.10.1",
+    "@typescript-eslint/typescript-estree": "4.8.1",
     "angular-estree-parser": "2.2.1",
     "angular-html-parser": "1.7.1",
     "camelcase": "6.2.0",
@@ -78,7 +78,7 @@
     "resolve": "1.19.0",
     "semver": "7.3.2",
     "string-width": "4.2.0",
-    "typescript": "4.0.5",
+    "typescript": "4.1.1-rc",
     "unicode-regex": "3.0.0",
     "unified": "9.2.0",
     "vnopts": "1.0.2",
diff --git a/scripts/build/config.js b/scripts/build/config.js
index 5e527e6a4..c154f53d5 100644
--- a/scripts/build/config.js
+++ b/scripts/build/config.js
@@ -40,6 +40,11 @@ const parsers = [
       // `TypeScript`, `toolsVersion`, `globalThis`
       'typeof process === "undefined" || process.browser': "false",
       'typeof globalThis === "object"': "true",
+      // `@typescript-eslint/typescript-estree` v4
+      'require("globby")': "{}",
+      "extra.projects = prepareAndTransformProjects(":
+        "extra.projects = [] || prepareAndTransformProjects(",
+      "process.versions.node": "'999.999.999'",
     },
   },
   {
diff --git a/scripts/build/shims/os.mjs b/scripts/build/shims/os.mjs
index 17621df9f..27e543d96 100644
--- a/scripts/build/shims/os.mjs
+++ b/scripts/build/shims/os.mjs
@@ -1,3 +1,5 @@
 export default {
   EOL: "\n",
+  platform: () => "browser",
+  cpus: () => [{ model: "Prettier" }],
 };
diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js
index 0101aef7e..28cc63a8f 100644
--- a/src/language-graphql/printer-graphql.js
+++ b/src/language-graphql/printer-graphql.js
@@ -1,15 +1,8 @@
 "use strict";
 
 const {
-  concat,
-  join,
-  hardline,
-  line,
-  softline,
-  group,
-  indent,
-  ifBreak,
-} = require("../document").builders;
+  builders: { concat, join, hardline, line, softline, group, indent, ifBreak },
+} = require("../document");
 const { isNextLineEmpty } = require("../common/util");
 const { insertPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 2876a2ac7..ff63ca325 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -1,15 +1,8 @@
 "use strict";
 
 const {
-  concat,
-  group,
-  hardline,
-  ifBreak,
-  indent,
-  join,
-  line,
-  softline,
-} = require("../document").builders;
+  builders: { concat, group, hardline, ifBreak, indent, join, line, softline },
+} = require("../document");
 const { locStart, locEnd } = require("./loc");
 const clean = require("./clean");
 const {
diff --git a/src/language-js/parse-postprocess.js b/src/language-js/parse-postprocess.js
index 3efece636..9aa82f603 100644
--- a/src/language-js/parse-postprocess.js
+++ b/src/language-js/parse-postprocess.js
@@ -5,6 +5,7 @@ const {
   getNextNonSpaceNonCommentCharacter,
   getShebang,
 } = require("../common/util");
+const createError = require("../common/parser-create-error");
 const { composeLoc, locStart, locEnd } = require("./loc");
 const { isTypeCastComment } = require("./comments");
 
@@ -17,6 +18,50 @@ function postprocess(ast, options) {
     includeShebang(ast, options);
   }
 
+  // Invalid decorators are removed since `@typescript-eslint/typescript-estree` v4
+  // https://github.com/typescript-eslint/typescript-eslint/pull/2375
+  if (options.parser === "typescript" && options.originalText.includes("@")) {
+    const {
+      esTreeNodeToTSNodeMap,
+      tsNodeToESTreeNodeMap,
+    } = options.tsParseResult;
+    ast = visitNode(ast, (node) => {
+      const tsNode = esTreeNodeToTSNodeMap.get(node);
+      if (!tsNode) {
+        return;
+      }
+      const tsDecorators = tsNode.decorators;
+      if (!Array.isArray(tsDecorators)) {
+        return;
+      }
+      // `esTreeNodeToTSNodeMap.get(ClassBody)` and `esTreeNodeToTSNodeMap.get(ClassDeclaration)` has the same tsNode
+      const esTreeNode = tsNodeToESTreeNodeMap.get(tsNode);
+      if (esTreeNode !== node) {
+        return;
+      }
+      const esTreeDecorators = esTreeNode.decorators;
+      if (
+        !Array.isArray(esTreeDecorators) ||
+        esTreeDecorators.length !== tsDecorators.length ||
+        tsDecorators.some((tsDecorator) => {
+          const esTreeDecorator = tsNodeToESTreeNodeMap.get(tsDecorator);
+          return (
+            !esTreeDecorator || !esTreeDecorators.includes(esTreeDecorator)
+          );
+        })
+      ) {
+        const { start, end } = esTreeNode.loc;
+        throw createError(
+          "Leading decorators must be attached to a class declaration",
+          {
+            start: { line: start.line, column: start.column + 1 },
+            end: { line: end.line, column: end.column + 1 },
+          }
+        );
+      }
+    });
+  }
+
   // Keep Babel's non-standard ParenthesizedExpression nodes only if they have Closure-style type cast comments.
   if (
     options.parser !== "typescript" &&
@@ -146,9 +191,9 @@ function postprocess(ast, options) {
   }
 }
 
-// This is a workaround to transform `ChainExpression` from `espree` into
-// `babel` shape AST, we should do the opposite, since `ChainExpression` is the
-// standard `estree` AST for `optional chaining`
+// This is a workaround to transform `ChainExpression` from `espree`, `meriyah`,
+// and `typescript` into `babel` shape AST, we should do the opposite,
+// since `ChainExpression` is the standard `estree` AST for `optional chaining`
 // https://github.com/estree/estree/blob/master/es2020.md
 function transformChainExpression(node) {
   if (node.type === "CallExpression") {
@@ -158,6 +203,10 @@ function transformChainExpression(node) {
     node.type = "OptionalMemberExpression";
     node.object = transformChainExpression(node.object);
   }
+  // typescript
+  else if (node.type === "TSNonNullExpression") {
+    node.expression = transformChainExpression(node.expression);
+  }
   return node;
 }
 
@@ -180,6 +229,10 @@ function visitNode(node, fn) {
     node[key] = visitNode(child, fn);
   }
 
+  if (Array.isArray(node)) {
+    return node;
+  }
+
   return fn(node) || node;
 }
 
diff --git a/src/language-js/parser-typescript.js b/src/language-js/parser-typescript.js
index 1c3221f69..bf60d724a 100644
--- a/src/language-js/parser-typescript.js
+++ b/src/language-js/parser-typescript.js
@@ -7,14 +7,14 @@ const postprocess = require("./parse-postprocess");
 
 function parse(text, parsers, opts) {
   const jsx = isProbablyJsx(text);
-  let ast;
+  let result;
   try {
     // Try passing with our best guess first.
-    ast = tryParseTypeScript(text, jsx);
+    result = tryParseTypeScript(text, jsx);
   } catch (firstError) {
     try {
       // But if we get it wrong, try the opposite.
-      ast = tryParseTypeScript(text, !jsx);
+      result = tryParseTypeScript(text, !jsx);
     } catch (secondError) {
       // Suppose our guess is correct, throw the first error
       const { message, lineNumber, column } = firstError;
@@ -30,12 +30,16 @@ function parse(text, parsers, opts) {
     }
   }
 
-  return postprocess(ast, { ...opts, originalText: text });
+  return postprocess(result.ast, {
+    ...opts,
+    originalText: text,
+    tsParseResult: result,
+  });
 }
 
 function tryParseTypeScript(text, jsx) {
-  const parser = require("@typescript-eslint/typescript-estree");
-  return parser.parse(text, {
+  const { parseWithNodeMaps } = require("@typescript-eslint/typescript-estree");
+  return parseWithNodeMaps(text, {
     // `jest@<=26.4.2` rely on `loc`
     // https://github.com/facebook/jest/issues/10444
     loc: true,
@@ -45,6 +49,7 @@ function tryParseTypeScript(text, jsx) {
     jsx,
     tokens: true,
     loggerFn: false,
+    project: [],
   });
 }
 
diff --git a/src/language-js/print/template-literal.js b/src/language-js/print/template-literal.js
index 2ef4d77f9..157ddc018 100644
--- a/src/language-js/print/template-literal.js
+++ b/src/language-js/print/template-literal.js
@@ -24,17 +24,24 @@ const {
 
 function printTemplateLiteral(path, print, options) {
   const node = path.getValue();
-  const parentNode = path.getParentNode();
+  const isTemplateLiteral = node.type === "TemplateLiteral";
 
-  if (isJestEachTemplateLiteral(node, parentNode)) {
+  if (
+    isTemplateLiteral &&
+    isJestEachTemplateLiteral(node, path.getParentNode())
+  ) {
     const printed = printJestEachTemplateLiteral(path, options, print);
     if (printed) {
       return printed;
     }
   }
+  let expressionsKey = "expressions";
+  if (node.type === "TSTemplateLiteralType") {
+    expressionsKey = "types";
+  }
   const parts = [];
 
-  let expressions = path.map(print, "expressions");
+  let expressions = path.map(print, expressionsKey);
   const isSimple = isSimpleTemplateLiteral(node);
 
   if (isSimple) {
@@ -70,7 +77,7 @@ function printTemplateLiteral(path, print, options) {
       let printed = expressions[i];
 
       if (!isSimple) {
-        const expression = node.expressions[i];
+        const expression = node[expressionsKey][i];
         // Breaks at the template element boundaries (${ and }) are preferred to breaking
         // in the middle of a MemberExpression
         if (
diff --git a/src/language-js/printer-estree-json.js b/src/language-js/printer-estree-json.js
index 61d90c199..4ba8849ba 100644
--- a/src/language-js/printer-estree-json.js
+++ b/src/language-js/printer-estree-json.js
@@ -1,6 +1,8 @@
 "use strict";
 
-const { concat, hardline, indent, join } = require("../document").builders;
+const {
+  builders: { concat, hardline, indent, join },
+} = require("../document");
 const preprocess = require("./print-preprocess");
 
 function genericPrint(path, options, print) {
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index a6b8c0bc3..4657fa348 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -2238,6 +2238,7 @@ function printPathNoParens(path, options, print, args) {
       return concat(parts);
     case "TemplateElement":
       return join(literalline, n.value.raw.split(/\r?\n/g));
+    case "TSTemplateLiteralType":
     case "TemplateLiteral": {
       return printTemplateLiteral(path, print, options);
     }
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index 412c5d09e..a98e8c8b6 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -464,6 +464,7 @@ const simpleTypeAnnotations = new Set([
   "BigIntLiteralTypeAnnotation",
   "NumberLiteralTypeAnnotation",
   "TSLiteralType",
+  "TSTemplateLiteralType",
   // flow only, `empty`, `mixed`
   "EmptyTypeAnnotation",
   "MixedTypeAnnotation",
@@ -647,11 +648,17 @@ function isNgForOf(node, index, parentNode) {
  * @returns {boolean}
  */
 function isSimpleTemplateLiteral(node) {
-  if (node.expressions.length === 0) {
+  let expressionsKey = "expressions";
+  if (node.type === "TSTemplateLiteralType") {
+    expressionsKey = "types";
+  }
+  const expressions = node[expressionsKey];
+
+  if (expressions.length === 0) {
     return false;
   }
 
-  return node.expressions.every((expr) => {
+  return expressions.every((expr) => {
     // Disallow comments since printDocToString can't print them here
     if (expr.comments) {
       return false;
diff --git a/src/main/comments.js b/src/main/comments.js
index acb834360..98209cc3b 100644
--- a/src/main/comments.js
+++ b/src/main/comments.js
@@ -4,15 +4,17 @@
 const assert = require("assert");
 
 const {
-  concat,
-  line,
-  hardline,
-  breakParent,
-  indent,
-  lineSuffix,
-  join,
-  cursor,
-} = require("../document").builders;
+  builders: {
+    concat,
+    line,
+    hardline,
+    breakParent,
+    indent,
+    lineSuffix,
+    join,
+    cursor,
+  },
+} = require("../document");
 
 const {
   hasNewline,
diff --git a/tests/misc/errors/invalid-typescript-decorators/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/invalid-typescript-decorators/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..3d93c7204
--- /dev/null
+++ b/tests/misc/errors/invalid-typescript-decorators/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,96 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`decorator.ts [babel-ts] format 1`] = `
+"Leading decorators must be attached to a class declaration (4:1)
+  2 | 
+  3 | @dec
+> 4 | enum E {}
+    | ^
+  5 | "
+`;
+
+exports[`decorator.ts [typescript] format 1`] = `
+"Leading decorators must be attached to a class declaration (3:1)
+  1 | declare function dec<T>(target: T): T;
+  2 | 
+> 3 | @dec
+    | ^^^^
+> 4 | enum E {}
+    | ^^^^^^^^^^
+  5 | "
+`;
+
+exports[`enums.ts [babel-ts] format 1`] = `
+"Leading decorators must be attached to a class declaration (4:1)
+  2 | 
+  3 | @decorator()
+> 4 | enum Direction {
+    | ^
+  5 |                Up = 1,
+  6 |   Down,
+  7 |   Left,"
+`;
+
+exports[`enums.ts [typescript] format 1`] = `
+"Leading decorators must be attached to a class declaration (3:1)
+   1 | // https://github.com/typescript-eslint/typescript-eslint/pull/2375
+   2 | 
+>  3 | @decorator()
+     | ^^^^^^^^^^^^
+>  4 | enum Direction {
+     | ^^^^^^^^^^^^^^^^
+>  5 |                Up = 1,
+     | ^^^^^^^^^^^^^^^^
+>  6 |   Down,
+     | ^^^^^^^^^^^^^^^^
+>  7 |   Left,
+     | ^^^^^^^^^^^^^^^^
+>  8 |   Right
+     | ^^^^^^^^^^^^^^^^
+>  9 | }
+     | ^^
+  10 | "
+`;
+
+exports[`function.ts [babel-ts] format 1`] = `
+"Leading decorators must be attached to a class declaration (4:1)
+  2 | 
+  3 | @decorator()
+> 4 | function foo(      ){}
+    | ^
+  5 | "
+`;
+
+exports[`function.ts [typescript] format 1`] = `
+"Leading decorators must be attached to a class declaration (3:1)
+  1 | // https://github.com/typescript-eslint/typescript-eslint/pull/2375
+  2 | 
+> 3 | @decorator()
+    | ^^^^^^^^^^^^
+> 4 | function foo(      ){}
+    | ^^^^^^^^^^^^^^^^^^^^^^^
+  5 | "
+`;
+
+exports[`interface.ts [babel-ts] format 1`] = `
+"Leading decorators must be attached to a class declaration (5:1)
+  3 | 
+  4 | @hello()
+> 5 | interface MyInterface {id: string;
+    | ^
+  6 | }
+  7 | "
+`;
+
+exports[`interface.ts [typescript] format 1`] = `
+"Leading decorators must be attached to a class declaration (4:1)
+  2 | // #4632
+  3 | 
+> 4 | @hello()
+    | ^^^^^^^^
+> 5 | interface MyInterface {id: string;
+    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> 6 | }
+    | ^^
+  7 | "
+`;
diff --git a/tests/typescript/conformance/types/decorator/decorator.ts b/tests/misc/errors/invalid-typescript-decorators/decorator.ts
similarity index 100%
rename from tests/typescript/conformance/types/decorator/decorator.ts
rename to tests/misc/errors/invalid-typescript-decorators/decorator.ts
diff --git a/tests/misc/errors/invalid-typescript-decorators/enums.ts b/tests/misc/errors/invalid-typescript-decorators/enums.ts
new file mode 100644
index 000000000..6db307060
--- /dev/null
+++ b/tests/misc/errors/invalid-typescript-decorators/enums.ts
@@ -0,0 +1,9 @@
+// https://github.com/typescript-eslint/typescript-eslint/pull/2375
+
+@decorator()
+enum Direction {
+               Up = 1,
+  Down,
+  Left,
+  Right
+}
diff --git a/tests/misc/errors/invalid-typescript-decorators/function.ts b/tests/misc/errors/invalid-typescript-decorators/function.ts
new file mode 100644
index 000000000..038ebafbc
--- /dev/null
+++ b/tests/misc/errors/invalid-typescript-decorators/function.ts
@@ -0,0 +1,4 @@
+// https://github.com/typescript-eslint/typescript-eslint/pull/2375
+
+@decorator()
+function foo(      ){}
diff --git a/tests/typescript/decorators/interface.ts b/tests/misc/errors/invalid-typescript-decorators/interface.ts
similarity index 55%
rename from tests/typescript/decorators/interface.ts
rename to tests/misc/errors/invalid-typescript-decorators/interface.ts
index de7bb11c0..ffd85a50a 100644
--- a/tests/typescript/decorators/interface.ts
+++ b/tests/misc/errors/invalid-typescript-decorators/interface.ts
@@ -1,6 +1,6 @@
 // invalid place but shouldn't be removed
+// #4632
 
 @hello()
-interface MyInterface {
-  id: string;
+interface MyInterface {id: string;
 }
diff --git a/tests/misc/errors/invalid-typescript-decorators/jsfmt.spec.js b/tests/misc/errors/invalid-typescript-decorators/jsfmt.spec.js
new file mode 100644
index 000000000..aff59cd2f
--- /dev/null
+++ b/tests/misc/errors/invalid-typescript-decorators/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["typescript", "babel-ts"]);
diff --git a/tests/typescript/conformance/types/decorator/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/conformance/types/decorator/__snapshots__/jsfmt.spec.js.snap
deleted file mode 100644
index 38c86cce3..000000000
--- a/tests/typescript/conformance/types/decorator/__snapshots__/jsfmt.spec.js.snap
+++ /dev/null
@@ -1,30 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`decorator.ts [babel-ts] format 1`] = `
-"Leading decorators must be attached to a class declaration (4:1)
-  2 | 
-  3 | @dec
-> 4 | enum E {}
-    | ^
-  5 | "
-`;
-
-exports[`decorator.ts format 1`] = `
-====================================options=====================================
-parsers: ["typescript"]
-printWidth: 80
-                                                                                | printWidth
-=====================================input======================================
-declare function dec<T>(target: T): T;
-
-@dec
-enum E {}
-
-=====================================output=====================================
-declare function dec<T>(target: T): T;
-
-@dec
-enum E {}
-
-================================================================================
-`;
diff --git a/tests/typescript/conformance/types/decorator/jsfmt.spec.js b/tests/typescript/conformance/types/decorator/jsfmt.spec.js
deleted file mode 100644
index 4c48f7a81..000000000
--- a/tests/typescript/conformance/types/decorator/jsfmt.spec.js
+++ /dev/null
@@ -1 +0,0 @@
-run_spec(__dirname, ["typescript"], { errors: { "babel-ts": true } });
diff --git a/tests/typescript/decorators/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/decorators/__snapshots__/jsfmt.spec.js.snap
index e0d418a98..2d5808521 100644
--- a/tests/typescript/decorators/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/decorators/__snapshots__/jsfmt.spec.js.snap
@@ -395,38 +395,3 @@ class MyContainerComponent {
 
 ================================================================================
 `;
-
-exports[`interface.ts [babel-ts] format 1`] = `
-"Leading decorators must be attached to a class declaration (4:1)
-  2 | 
-  3 | @hello()
-> 4 | interface MyInterface {
-    | ^
-  5 |   id: string;
-  6 | }
-  7 | "
-`;
-
-exports[`interface.ts format 1`] = `
-====================================options=====================================
-parsers: ["typescript"]
-printWidth: 80
-                                                                                | printWidth
-=====================================input======================================
-// invalid place but shouldn't be removed
-
-@hello()
-interface MyInterface {
-  id: string;
-}
-
-=====================================output=====================================
-// invalid place but shouldn't be removed
-
-@hello()
-interface MyInterface {
-  id: string;
-}
-
-================================================================================
-`;
diff --git a/tests/typescript/decorators/jsfmt.spec.js b/tests/typescript/decorators/jsfmt.spec.js
index ac047e1b5..2ea3bb6eb 100644
--- a/tests/typescript/decorators/jsfmt.spec.js
+++ b/tests/typescript/decorators/jsfmt.spec.js
@@ -1,3 +1 @@
-run_spec(__dirname, ["typescript"], {
-  errors: { "babel-ts": ["interface.ts"] },
-});
+run_spec(__dirname, ["typescript"]);
diff --git a/tests/typescript/key-remapping-in-mapped-types/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/key-remapping-in-mapped-types/__snapshots__/jsfmt.spec.js.snap
index b46fb4526..6d6725530 100644
--- a/tests/typescript/key-remapping-in-mapped-types/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/key-remapping-in-mapped-types/__snapshots__/jsfmt.spec.js.snap
@@ -1,15 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`key-remapping.ts [typescript] format 1`] = `
-"']' expected. (2:17)
-  1 | type MappedTypeWithNewKeys<T> = {
-> 2 |   [K in keyof T as NewKeyType]: T[K]
-    |                 ^
-  3 | };
-  4 |   
-  5 | type RemoveKindField<T> = {"
-`;
-
 exports[`key-remapping.ts format 1`] = `
 ====================================options=====================================
 parsers: ["babel-ts", "typescript"]
diff --git a/tests/typescript/key-remapping-in-mapped-types/jsfmt.spec.js b/tests/typescript/key-remapping-in-mapped-types/jsfmt.spec.js
index 1b122de11..92b81c22b 100644
--- a/tests/typescript/key-remapping-in-mapped-types/jsfmt.spec.js
+++ b/tests/typescript/key-remapping-in-mapped-types/jsfmt.spec.js
@@ -1,3 +1 @@
-run_spec(__dirname, ["babel-ts", "typescript"], {
-  errors: { typescript: true },
-});
+run_spec(__dirname, ["babel-ts", "typescript"]);
diff --git a/tests/typescript/template-literal-types/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/template-literal-types/__snapshots__/jsfmt.spec.js.snap
index de4070dd9..8c4448154 100644
--- a/tests/typescript/template-literal-types/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/template-literal-types/__snapshots__/jsfmt.spec.js.snap
@@ -1,14 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`template-literal-types.ts [typescript] format 1`] = `
-"Type expected. (1:8)
-> 1 | let x: \`foo-\${infer bar}\`;
-    |        ^
-  2 | type HelloWorld = \`\${Hello}, \${World}\`
-  3 | type SeussFish = \`\${Quantity | Color} fish\`;
-  4 | declare function setAlignment(value: \`\${VerticalAlignment}-\${HorizontalAlignment}\`): void;"
-`;
-
 exports[`template-literal-types.ts format 1`] = `
 ====================================options=====================================
 parsers: ["babel-ts", "typescript"]
diff --git a/tests/typescript/template-literal-types/jsfmt.spec.js b/tests/typescript/template-literal-types/jsfmt.spec.js
index 1b122de11..92b81c22b 100644
--- a/tests/typescript/template-literal-types/jsfmt.spec.js
+++ b/tests/typescript/template-literal-types/jsfmt.spec.js
@@ -1,3 +1 @@
-run_spec(__dirname, ["babel-ts", "typescript"], {
-  errors: { typescript: true },
-});
+run_spec(__dirname, ["babel-ts", "typescript"]);
diff --git a/tests/typescript/typeparams/consistent/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/typeparams/consistent/__snapshots__/jsfmt.spec.js.snap
index bc59c79cf..7a227a5e0 100644
--- a/tests/typescript/typeparams/consistent/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/typeparams/consistent/__snapshots__/jsfmt.spec.js.snap
@@ -71,6 +71,41 @@ const foo12: Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 ================================================================================
 `;
 
+exports[`template-literal-types.ts [babel] format 1`] = `
+"Unexpected token (1:84)
+> 1 | const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<\`Hello, \${keyof World}\`> = a;
+    |                                                                                    ^
+  2 | "
+`;
+
+exports[`template-literal-types.ts [babel-flow] format 1`] = `
+"Unexpected token (1:84)
+> 1 | const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<\`Hello, \${keyof World}\`> = a;
+    |                                                                                    ^
+  2 | "
+`;
+
+exports[`template-literal-types.ts [flow] format 1`] = `
+"Unexpected token \`\`\` (1:84)
+> 1 | const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<\`Hello, \${keyof World}\`> = a;
+    |                                                                                    ^
+  2 | "
+`;
+
+exports[`template-literal-types.ts format 1`] = `
+====================================options=====================================
+parsers: ["typescript", "flow", "babel-flow", "babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<\`Hello, \${keyof World}\`> = a;
+
+=====================================output=====================================
+const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<\`Hello, \${keyof World}\`> = a;
+
+================================================================================
+`;
+
 exports[`typescript-only.ts format 1`] = `
 ====================================options=====================================
 parsers: ["typescript", "flow", "babel-flow", "babel"]
@@ -81,6 +116,7 @@ const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<object> = a;
 const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<undefined> = a;
 const foo4: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<unknown> = a;
+
 =====================================output=====================================
 const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<never> = a;
 const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<object> = a;
diff --git a/tests/typescript/typeparams/consistent/jsfmt.spec.js b/tests/typescript/typeparams/consistent/jsfmt.spec.js
index 61cd597f9..9990099dc 100644
--- a/tests/typescript/typeparams/consistent/jsfmt.spec.js
+++ b/tests/typescript/typeparams/consistent/jsfmt.spec.js
@@ -1 +1,7 @@
-run_spec(__dirname, ["typescript", "flow", "babel-flow", "babel"]);
+run_spec(__dirname, ["typescript", "flow", "babel-flow", "babel"], {
+  errors: {
+    flow: ["template-literal-types.ts"],
+    "babel-flow": ["template-literal-types.ts"],
+    babel: ["template-literal-types.ts"],
+  },
+});
diff --git a/tests/typescript/typeparams/consistent/template-literal-types.ts b/tests/typescript/typeparams/consistent/template-literal-types.ts
new file mode 100644
index 000000000..06c888eee
--- /dev/null
+++ b/tests/typescript/typeparams/consistent/template-literal-types.ts
@@ -0,0 +1 @@
+const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<`Hello, ${keyof World}`> = a;
diff --git a/tests/typescript/typeparams/consistent/typescript-only.ts b/tests/typescript/typeparams/consistent/typescript-only.ts
index fcea89f2a..68a5b3628 100644
--- a/tests/typescript/typeparams/consistent/typescript-only.ts
+++ b/tests/typescript/typeparams/consistent/typescript-only.ts
@@ -1,4 +1,4 @@
 const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<never> = a;
 const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<object> = a;
 const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<undefined> = a;
-const foo4: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<unknown> = a;
\ No newline at end of file
+const foo4: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<unknown> = a;
diff --git a/yarn.lock b/yarn.lock
index 192bbf370..34783333d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1465,19 +1465,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2"
   integrity sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg==
 
-"@typescript-eslint/typescript-estree@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz#fd0061cc38add4fad45136d654408569f365b853"
-  integrity sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==
-  dependencies:
-    "@typescript-eslint/types" "3.10.1"
-    "@typescript-eslint/visitor-keys" "3.10.1"
-    debug "^4.1.1"
-    glob "^7.1.6"
-    is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+"@typescript-eslint/types@4.8.1":
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.8.1.tgz#23829c73c5fc6f4fcd5346a7780b274f72fee222"
+  integrity sha512-ave2a18x2Y25q5K05K/U3JQIe2Av4+TNi/2YuzyaXLAsDx6UZkz1boZ7nR/N6Wwae2PpudTZmHFXqu7faXfHmA==
 
 "@typescript-eslint/typescript-estree@4.0.1":
   version "4.0.1"
@@ -1493,12 +1484,19 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/visitor-keys@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz#cd4274773e3eb63b2e870ac602274487ecd1e931"
-  integrity sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==
+"@typescript-eslint/typescript-estree@4.8.1":
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.1.tgz#7307e3f2c9e95df7daa8dc0a34b8c43b7ec0dd32"
+  integrity sha512-bJ6Fn/6tW2g7WIkCWh3QRlaSU7CdUUK52shx36/J7T5oTQzANvi6raoTsbwGM11+7eBbeem8hCCKbyvAc0X3sQ==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    "@typescript-eslint/types" "4.8.1"
+    "@typescript-eslint/visitor-keys" "4.8.1"
+    debug "^4.1.1"
+    globby "^11.0.1"
+    is-glob "^4.0.1"
+    lodash "^4.17.15"
+    semver "^7.3.2"
+    tsutils "^3.17.1"
 
 "@typescript-eslint/visitor-keys@4.0.1":
   version "4.0.1"
@@ -1508,6 +1506,14 @@
     "@typescript-eslint/types" "4.0.1"
     eslint-visitor-keys "^2.0.0"
 
+"@typescript-eslint/visitor-keys@4.8.1":
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.1.tgz#794f68ee292d1b2e3aa9690ebedfcb3a8c90e3c3"
+  integrity sha512-3nrwXFdEYALQh/zW8rFwP4QltqsanCDz4CwWMPiIZmwlk9GlvBeueEIbq05SEq4ganqM0g9nh02xXgv5XI3PeQ==
+  dependencies:
+    "@typescript-eslint/types" "4.8.1"
+    eslint-visitor-keys "^2.0.0"
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -7165,10 +7171,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
-  integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==
+typescript@4.1.1-rc:
+  version "4.1.1-rc"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.1-rc.tgz#4a335244b9b2754995849ca4b607c74d6ee73719"
+  integrity sha512-tgNcFrLIjlaMWEc7bKC0bxLNIt8BIAauY/HLUOQDyTP75HGskETtXOt46x4EKAHRKhWVLMc7yM02puTHa/yhCA==
 
 unherit@^1.0.4:
   version "1.1.3"

From f2b4965a6ac84626349774e57dba5e38c43a8c7a Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Wed, 18 Nov 2020 13:45:44 +0900
Subject: [PATCH 049/299] Add clean-changelog-unreleased step to release script
 (#9682)

---
 ...ost-intro.md => BLOG_POST_INTRO_TEMPLATE.md} |  0
 scripts/clean-changelog-unreleased.js           | 17 +++++++++++++++++
 scripts/draft-blog-post.js                      |  7 +++++++
 scripts/lint-changelog.js                       |  4 +++-
 4 files changed, 27 insertions(+), 1 deletion(-)
 rename changelog_unreleased/{blog-post-intro.md => BLOG_POST_INTRO_TEMPLATE.md} (100%)
 create mode 100644 scripts/clean-changelog-unreleased.js

diff --git a/changelog_unreleased/blog-post-intro.md b/changelog_unreleased/BLOG_POST_INTRO_TEMPLATE.md
similarity index 100%
rename from changelog_unreleased/blog-post-intro.md
rename to changelog_unreleased/BLOG_POST_INTRO_TEMPLATE.md
diff --git a/scripts/clean-changelog-unreleased.js b/scripts/clean-changelog-unreleased.js
new file mode 100644
index 000000000..9a8b02c47
--- /dev/null
+++ b/scripts/clean-changelog-unreleased.js
@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const globby = require("globby");
+
+const changelogUnreleasedDir = path.join(__dirname, "../changelog_unreleased");
+
+const files = globby.sync(["blog-post-intro.md", "*/*.md"], {
+  cwd: changelogUnreleasedDir,
+  absolute: true,
+});
+for (const file of files) {
+  fs.unlinkSync(file);
+}
diff --git a/scripts/draft-blog-post.js b/scripts/draft-blog-post.js
index 2477a35d1..2a3daad2a 100644
--- a/scripts/draft-blog-post.js
+++ b/scripts/draft-blog-post.js
@@ -9,7 +9,14 @@ const semver = require("semver");
 
 const changelogUnreleasedDir = path.join(__dirname, "../changelog_unreleased");
 const blogDir = path.join(__dirname, "../website/blog");
+const introTemplateFile = path.join(
+  changelogUnreleasedDir,
+  "BLOG_POST_INTRO_TEMPLATE.md"
+);
 const introFile = path.join(changelogUnreleasedDir, "blog-post-intro.md");
+if (!fs.existsSync(introFile)) {
+  fs.copyFileSync(introTemplateFile, introFile);
+}
 const previousVersion = require("prettier/package.json").version;
 const version = require("../package.json").version.replace(/-.+/, "");
 const postGlob = path.join(blogDir, `????-??-??-${version}.md`);
diff --git a/scripts/lint-changelog.js b/scripts/lint-changelog.js
index fbb1a78e5..401cbf494 100644
--- a/scripts/lint-changelog.js
+++ b/scripts/lint-changelog.js
@@ -6,6 +6,7 @@ const { outdent } = require("outdent");
 
 const CHANGELOG_DIR = "changelog_unreleased";
 const TEMPLATE_FILE = "TEMPLATE.md";
+const BLOG_POST_INTRO_TEMPLATE_FILE = "BLOG_POST_INTRO_TEMPLATE.md";
 const BLOG_POST_INTRO_FILE = "blog-post-intro.md";
 const CHANGELOG_CATEGORIES = [
   "angular",
@@ -38,6 +39,7 @@ for (const file of files) {
   if (
     file !== TEMPLATE_FILE &&
     file !== BLOG_POST_INTRO_FILE &&
+    file !== BLOG_POST_INTRO_TEMPLATE_FILE &&
     !CHANGELOG_CATEGORIES.includes(file)
   ) {
     showErrorMessage(`Please remove "${file}" from "${CHANGELOG_DIR}".`);
@@ -45,7 +47,7 @@ for (const file of files) {
 }
 for (const file of [
   TEMPLATE_FILE,
-  BLOG_POST_INTRO_FILE,
+  BLOG_POST_INTRO_TEMPLATE_FILE,
   ...CHANGELOG_CATEGORIES,
 ]) {
   if (!files.includes(file)) {

From f512cd4737789aa9ef074b622d5e8a137941ce28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Nov 2020 14:43:02 +0800
Subject: [PATCH 050/299] Build(deps-dev): Bump webpack from 5.4.0 to 5.5.0
 (#9706)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fd5977015..2498a62a4 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "synchronous-promise": "2.0.15",
     "tempy": "1.0.0",
     "terser-webpack-plugin": "5.0.3",
-    "webpack": "5.4.0"
+    "webpack": "5.5.0"
   },
   "scripts": {
     "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
diff --git a/yarn.lock b/yarn.lock
index 34783333d..dfc6ea430 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7452,10 +7452,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.4.0.tgz#4fdc6ec8a0ff9160701fb8f2eb8d06b33ecbae0f"
-  integrity sha512-udpYTyqz8toTTdaOsL2QKPLeZLt2IEm9qY7yTXuFEQhKu5bk0yQD9BtAdVQksmz4jFbbWOiWmm3NHarO0zr/ng==
+webpack@5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.5.0.tgz#250b3fdc1d876c7e58269d1406e7f9790af04f06"
+  integrity sha512-gyr7VE8zXJP81ZvS8+5dDphS2kaE0r8bpVWX6SxkBlzlX3hYfBS96kaltuf2cYK/BKJlUw5Aex/fKC34HUn+hA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From 2f0062234cbc527406e79e44bc8f686416befd57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Nov 2020 14:43:29 +0800
Subject: [PATCH 051/299] Build(deps-dev): Bump webpack from 5.4.0 to 5.5.0 in
 /website (#9705)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index a9c58a5ce..ddd455db6 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.0",
     "svgo": "1.3.2",
-    "webpack": "5.4.0",
+    "webpack": "5.5.0",
     "webpack-cli": "4.2.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index d8a0305ba..f82c822c7 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -7373,10 +7373,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.4.0.tgz#4fdc6ec8a0ff9160701fb8f2eb8d06b33ecbae0f"
-  integrity sha512-udpYTyqz8toTTdaOsL2QKPLeZLt2IEm9qY7yTXuFEQhKu5bk0yQD9BtAdVQksmz4jFbbWOiWmm3NHarO0zr/ng==
+webpack@5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.5.0.tgz#250b3fdc1d876c7e58269d1406e7f9790af04f06"
+  integrity sha512-gyr7VE8zXJP81ZvS8+5dDphS2kaE0r8bpVWX6SxkBlzlX3hYfBS96kaltuf2cYK/BKJlUw5Aex/fKC34HUn+hA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From 35a484ec1dca767147e2a88588284e56bab33d8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Nov 2020 15:22:34 +0800
Subject: [PATCH 052/299] Build(deps-dev): Bump cspell from 4.2.0 to 4.2.2
 (#9708)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 58 ++++++++++++++++++++++++++--------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 2498a62a4..104ad156d 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "benchmark": "2.1.4",
     "builtin-modules": "3.1.0",
     "cross-env": "7.0.2",
-    "cspell": "4.2.0",
+    "cspell": "4.2.2",
     "eslint": "7.13.0",
     "eslint-config-prettier": "6.15.0",
     "eslint-formatter-friendly": "7.0.0",
diff --git a/yarn.lock b/yarn.lock
index dfc6ea430..91bf0a870 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2665,25 +2665,25 @@ cspell-dict-typescript@^1.0.12:
   dependencies:
     configstore "^5.0.1"
 
-cspell-glob@^0.1.23:
-  version "0.1.23"
-  resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-0.1.23.tgz#63256b384ca2f010f02a8039a8e5f4b8c2e38156"
-  integrity sha512-Q6iBxMvxXtPB358jvw3sMSC9AcNecZcQ2aD3oYhmgXYJRxX3TDij/3iXMrDkTAKcZx8V2BBZQJo/aJxkYnP0/A==
+cspell-glob@^0.1.25:
+  version "0.1.25"
+  resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-0.1.25.tgz#5d55b03ac5e7a379d435ebd5685178806b0c372f"
+  integrity sha512-/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg==
   dependencies:
     micromatch "^4.0.2"
 
-cspell-io@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-4.1.4.tgz#945b527c7e8f06c3c0329991bdcf63b6d04400b2"
-  integrity sha512-qWVBUpu/+HzWwyjBiAxYGgv/w5w5290kYBtT5D42qQ9x/GxTjrq3AILCeWOOh/JtU4XmpiI2QUuyWEsxLSldZw==
+cspell-io@^4.1.6:
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-4.1.6.tgz#d3300a08fc4ebcd87748b620f4cfdcbc6f238aa5"
+  integrity sha512-S8Fk1uBrZGt9vcztKQkMIi2qpGT1R0eqTZ+5v5++nZDkryKkix8iTkNldH7cxIvqTQU9Tr7afFI/0RXSEEn8Eg==
   dependencies:
     iconv-lite "^0.6.2"
     iterable-to-stream "^1.0.1"
 
-cspell-lib@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-4.3.4.tgz#471048dac762eb712c5390073ec7f61bf74690c0"
-  integrity sha512-ykbrrAiOwh8Q0X4H5tFuTvtKg+L2nthPgN/5eiw7y1SM8DU8/LVGavDI47qcJ4HJSwuSwZ4RH60Ol1Q5zwqh/Q==
+cspell-lib@^4.3.6:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-4.3.6.tgz#fd06b8a85204ea2d35d837ac1385c231c1baa889"
+  integrity sha512-Bm7AEdbjy5rNqGdOulTZVV/P6eUweDivYIZss29T3j3dUFu99spG73zGmKVxTddB7RNdb4MsfLwtnZvWXr98IA==
   dependencies:
     comment-json "^4.1.0"
     configstore "^5.0.1"
@@ -2720,37 +2720,37 @@ cspell-lib@^4.3.4:
     cspell-dict-scala "^1.0.17"
     cspell-dict-software-terms "^1.0.19"
     cspell-dict-typescript "^1.0.12"
-    cspell-io "^4.1.4"
-    cspell-trie-lib "^4.2.4"
-    cspell-util-bundle "^4.1.6"
+    cspell-io "^4.1.6"
+    cspell-trie-lib "^4.2.6"
+    cspell-util-bundle "^4.1.8"
     fs-extra "^9.0.1"
     gensequence "^3.1.1"
     minimatch "^3.0.4"
     resolve-from "^5.0.0"
     vscode-uri "^2.1.2"
 
-cspell-trie-lib@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-4.2.4.tgz#4a2f6368b63317ece6ad5cec33fc4fe404c44dfd"
-  integrity sha512-a+jknY90yav3yGndN9PDQLUeo9nFiGZ2a8j9NSiMkieRnFCHmH7iHOwwoXxiMJ6x4+0zeyhSYF1pXuNA7eE2pw==
+cspell-trie-lib@^4.2.6:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-4.2.6.tgz#48e0abee2702400ab15998a55a79d4484e5ecaaa"
+  integrity sha512-glf6Yk1PxRxTFpQIkBk5G4ljpGUBzJORJe1yFHuiZ29mY5gHL0D7+i5rULa2dFU/5WJ24SFojHUXd1fLCBjUOQ==
   dependencies:
     gensequence "^3.1.1"
 
-cspell-util-bundle@^4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/cspell-util-bundle/-/cspell-util-bundle-4.1.6.tgz#6bc54fe8e73e282f4dbe2e7683cc43e339cf9029"
-  integrity sha512-wpCmiZRNRZ1fEXuColE2qeX15qicfhgwibSt5zNm77PZYhgkSLam52nIgGlnzSQCCFtOp8iaUeUQy40lJ0V+3Q==
+cspell-util-bundle@^4.1.8:
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/cspell-util-bundle/-/cspell-util-bundle-4.1.8.tgz#c57ffb8fc87f57852a2302553e54a5da94a28ca4"
+  integrity sha512-Cm9fG7dsdveKEtWAN8TgljhW8OU7OQX4vX3ZFg6o9FQfo6rNoX8nwyxXRq60YjbKNBf1d6/ZSozsqS4vq2uLzQ==
 
-cspell@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/cspell/-/cspell-4.2.0.tgz#01fffa15dc7d102315edc67fa0b385decd4ee2d1"
-  integrity sha512-5hKiPYapirbSoCuPpTXnDLA47c4vMV3U+ScFP56YF4lhQiz7yAJnNrgK31RiMHkv/pIUIlnuaKZYDD/7fgEgxg==
+cspell@4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/cspell/-/cspell-4.2.2.tgz#cecc6b82c733fb859444a04f9d8df0dd652f692e"
+  integrity sha512-NqObIP0ljFs/f//pA4D8rwqC9XHW2TY3CMNunp0nPQzVk/GanIqTEtMDZEZrVG1wnxHEndUIHlw05+rEYejkQg==
   dependencies:
     chalk "^4.1.0"
     commander "^6.1.0"
     comment-json "^4.0.6"
-    cspell-glob "^0.1.23"
-    cspell-lib "^4.3.4"
+    cspell-glob "^0.1.25"
+    cspell-lib "^4.3.6"
     fs-extra "^9.0.1"
     gensequence "^3.1.1"
     get-stdin "^8.0.0"

From bb60b08f9e438ae3a5f6996166c16239ffeb9e9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Nov 2020 08:35:32 +0000
Subject: [PATCH 053/299] Build(deps-dev): Bump @typescript-eslint/types from
 3.10.1 to 4.8.1 (#9707)

---
 package.json                      |  2 +-
 src/language-js/types/estree.d.ts | 10 ++--------
 yarn.lock                         |  5 -----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 104ad156d..ffe071e62 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@rollup/plugin-replace": "2.3.4",
     "@types/estree": "0.0.45",
     "@types/node": "14.14.0",
-    "@typescript-eslint/types": "3.10.1",
+    "@typescript-eslint/types": "4.8.1",
     "babel-jest": "26.6.3",
     "babel-loader": "8.2.1",
     "benchmark": "2.1.4",
diff --git a/src/language-js/types/estree.d.ts b/src/language-js/types/estree.d.ts
index 9c19b8866..9690345a4 100644
--- a/src/language-js/types/estree.d.ts
+++ b/src/language-js/types/estree.d.ts
@@ -43,10 +43,7 @@ export type CallExpression = (
 ) &
   AdditionalFields;
 
-export type OptionalCallExpression = (
-  | Babel.OptionalCallExpression
-  | TSESTree.OptionalCallExpression
-) &
+export type OptionalCallExpression = Babel.OptionalCallExpression &
   AdditionalFields;
 
 export type MemberExpression = (
@@ -56,10 +53,7 @@ export type MemberExpression = (
 ) &
   AdditionalFields;
 
-export type OptionalMemberExpression = (
-  | Babel.OptionalMemberExpression
-  | TSESTree.OptionalMemberExpression
-) &
+export type OptionalMemberExpression = Babel.OptionalMemberExpression &
   AdditionalFields;
 
 export type Expression = (
diff --git a/yarn.lock b/yarn.lock
index 91bf0a870..927ebfbeb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1455,11 +1455,6 @@
     "@typescript-eslint/types" "4.0.1"
     "@typescript-eslint/visitor-keys" "4.0.1"
 
-"@typescript-eslint/types@3.10.1":
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
-  integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==
-
 "@typescript-eslint/types@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2"

From 9d06174d55b9826fe9133c041d0f0104fef45624 Mon Sep 17 00:00:00 2001
From: Dang Mai <contact@dangmai.net>
Date: Wed, 18 Nov 2020 05:58:46 -0500
Subject: [PATCH 054/299] Fix #9702 - Flush line suffix contents at the end of
 document (#9703)

* Failing test case for flushing line-suffix contents

* Flush remaining line-suffix contents at the end of document
---
 src/document/doc-printer.js                   |  7 ++++++
 .../__tests__/plugin-flush-line-suffix.js     | 14 +++++++++++
 .../plugins/flushLineSuffix/file.foo          |  1 +
 .../plugins/flushLineSuffix/plugin.js         | 25 +++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 tests_integration/__tests__/plugin-flush-line-suffix.js
 create mode 100644 tests_integration/plugins/flushLineSuffix/file.foo
 create mode 100644 tests_integration/plugins/flushLineSuffix/plugin.js

diff --git a/src/document/doc-printer.js b/src/document/doc-printer.js
index 1886571aa..541063c49 100644
--- a/src/document/doc-printer.js
+++ b/src/document/doc-printer.js
@@ -526,6 +526,13 @@ function printDocToString(doc, options) {
         default:
       }
     }
+
+    // Flush remaining line-suffix contents at the end of the document, in case
+    // there is no new line after the line-suffix.
+    if (cmds.length === 0 && lineSuffix.length) {
+      cmds.push(...lineSuffix.reverse());
+      lineSuffix = [];
+    }
   }
 
   const cursorPlaceholderIndex = out.indexOf(cursor.placeholder);
diff --git a/tests_integration/__tests__/plugin-flush-line-suffix.js b/tests_integration/__tests__/plugin-flush-line-suffix.js
new file mode 100644
index 000000000..e60ab5adb
--- /dev/null
+++ b/tests_integration/__tests__/plugin-flush-line-suffix.js
@@ -0,0 +1,14 @@
+"use strict";
+
+const runPrettier = require("../runPrettier");
+
+describe("flush all line-suffix content", () => {
+  runPrettier("plugins/flushLineSuffix", ["*.foo", "--plugin=./plugin"], {
+    ignoreLineEndings: true,
+  }).test({
+    stdout: "contents",
+    stderr: "",
+    status: 0,
+    write: [],
+  });
+});
diff --git a/tests_integration/plugins/flushLineSuffix/file.foo b/tests_integration/plugins/flushLineSuffix/file.foo
new file mode 100644
index 000000000..12f00e90b
--- /dev/null
+++ b/tests_integration/plugins/flushLineSuffix/file.foo
@@ -0,0 +1 @@
+contents
diff --git a/tests_integration/plugins/flushLineSuffix/plugin.js b/tests_integration/plugins/flushLineSuffix/plugin.js
new file mode 100644
index 000000000..4690948ab
--- /dev/null
+++ b/tests_integration/plugins/flushLineSuffix/plugin.js
@@ -0,0 +1,25 @@
+"use strict";
+
+const prettier = require("prettier-local");
+const { lineSuffix } = prettier.doc.builders;
+
+module.exports = {
+  languages: [
+    {
+      name: "foo",
+      parsers: ["foo-parser"],
+      extensions: [".foo"]
+    }
+  ],
+  parsers: {
+    "foo-parser": {
+      parse: text => ({ text }),
+      astFormat: "foo-ast"
+    }
+  },
+  printers: {
+    "foo-ast": {
+      print: path => lineSuffix(path.getValue().text.trim())
+    }
+  }
+};

From c74420ec1c91c6e876555fdb74b0228100b084db Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 18 Nov 2020 19:03:52 +0800
Subject: [PATCH 055/299] Refactor: Improve location compare (#9709)

---
 src/main/comments.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/comments.js b/src/main/comments.js
index 98209cc3b..3d362d160 100644
--- a/src/main/comments.js
+++ b/src/main/comments.js
@@ -93,6 +93,8 @@ function getSortedChildNodes(node, options, resultArray) {
 // least one of which is guaranteed to be defined.
 function decorateComment(node, comment, options) {
   const { locStart, locEnd } = options;
+  const commentStart = locStart(comment);
+  const commentEnd = locEnd(comment);
 
   const childNodes = getSortedChildNodes(node, options);
   let precedingNode;
@@ -103,11 +105,10 @@ function decorateComment(node, comment, options) {
   while (left < right) {
     const middle = (left + right) >> 1;
     const child = childNodes[middle];
+    const start = locStart(child);
+    const end = locEnd(child);
 
-    if (
-      locStart(child) - locStart(comment) <= 0 &&
-      locEnd(comment) - locEnd(child) <= 0
-    ) {
+    if (start <= commentStart && commentEnd <= end) {
       // The comment is completely contained by this child node.
       comment.enclosingNode = child;
 
@@ -115,7 +116,7 @@ function decorateComment(node, comment, options) {
       return; // Abandon the binary search at this level.
     }
 
-    if (locEnd(child) - locStart(comment) <= 0) {
+    if (start <= commentStart) {
       // This child node falls completely before the comment.
       // Because we will never consider this node or any nodes
       // before it again, this node must be the closest preceding
@@ -125,7 +126,7 @@ function decorateComment(node, comment, options) {
       continue;
     }
 
-    if (locEnd(comment) - locStart(child) <= 0) {
+    if (commentEnd <= start) {
       // This child node falls completely after the comment.
       // Because we will never consider this node or any nodes after
       // it again, this node must be the closest following node we

From 693b9a1f6f8105b1a11d4e371bd4b6a445c12c8b Mon Sep 17 00:00:00 2001
From: Benny Neugebauer <bn@bennyn.de>
Date: Wed, 18 Nov 2020 12:04:37 +0100
Subject: [PATCH 056/299] Fix link to GitHub profile (#9712)

---
 website/blog/2020-08-24-2.1.0.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/blog/2020-08-24-2.1.0.md b/website/blog/2020-08-24-2.1.0.md
index b164a5a23..215b2102c 100644
--- a/website/blog/2020-08-24-2.1.0.md
+++ b/website/blog/2020-08-24-2.1.0.md
@@ -12,7 +12,7 @@ This release adds a new `--embedded-language-formatting` option, supports new Ja
 
 ### API
 
-#### Add --embedded-language-formatting={auto,off} option ([#7875](https://github.com/prettier/prettier/pull/7875) by [@bakkot](https://github.com/bakkot), [#8825](https://github.com/prettier/prettier/pull/8825) by [@fisker](https://github.com/fiskers))
+#### Add --embedded-language-formatting={auto,off} option ([#7875](https://github.com/prettier/prettier/pull/7875) by [@bakkot](https://github.com/bakkot), [#8825](https://github.com/prettier/prettier/pull/8825) by [@fisker](https://github.com/fisker))
 
 When Prettier identifies cases where it looks like you've placed some code it knows how to format within a string in another file, like in a tagged template in JavaScript with a tag named `html` or in code blocks in Markdown, it will try to format that code by default.
 

From 1064b55f23ce900d9ed33bcf97e0ec959c924cfc Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 18 Nov 2020 19:51:45 +0800
Subject: [PATCH 057/299] Remove unused parenStart (#9699)

---
 src/language-js/parse-postprocess.js | 6 +-----
 src/language-js/types/estree.d.ts    | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/language-js/parse-postprocess.js b/src/language-js/parse-postprocess.js
index 9aa82f603..0d8c34733 100644
--- a/src/language-js/parse-postprocess.js
+++ b/src/language-js/parse-postprocess.js
@@ -96,11 +96,7 @@ function postprocess(ast, options) {
 
         const start = locStart(node);
         if (!startOffsetsOfTypeCastedNodes.has(start)) {
-          if (!expression.extra) {
-            expression.extra = {};
-          }
-          expression.extra.parenthesized = true;
-          expression.extra.parenStart = start;
+          expression.extra = { ...expression.extra, parenthesized: true };
           return expression;
         }
       }
diff --git a/src/language-js/types/estree.d.ts b/src/language-js/types/estree.d.ts
index 9690345a4..e3f9b3d3b 100644
--- a/src/language-js/types/estree.d.ts
+++ b/src/language-js/types/estree.d.ts
@@ -7,7 +7,6 @@ import * as NGTree from "angular-estree-parser/lib/types";
 type AdditionalFields = {
   extra?: {
     parenthesized?: boolean;
-    parenStart?: number;
     raw?: string;
   };
   comments?: Comment[];

From f532bf2b495a19540e45d9ed32a6693fca8bceea Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 19 Nov 2020 08:58:56 +0800
Subject: [PATCH 058/299] Refactor: Module releated format (#9691)

---
 src/language-js/print/module.js               | 232 +++++++++++++++++-
 src/language-js/printer-estree.js             | 151 ++----------
 .../comments/__snapshots__/jsfmt.spec.js.snap |  12 +-
 3 files changed, 241 insertions(+), 154 deletions(-)

diff --git a/src/language-js/print/module.js b/src/language-js/print/module.js
index 107677341..b1b23a6b0 100644
--- a/src/language-js/print/module.js
+++ b/src/language-js/print/module.js
@@ -1,28 +1,181 @@
 "use strict";
 
 const {
-  builders: { concat, softline, group, indent, join, line, ifBreak },
+  builders: { concat, softline, group, indent, join, line, ifBreak, hardline },
 } = require("../../document");
+const { printDanglingComments } = require("../../main/comments");
 
-const { shouldPrintComma } = require("../utils");
+const {
+  hasDanglingComments,
+  shouldPrintComma,
+  needsHardlineAfterDanglingComment,
+} = require("../utils");
+const { locStart, hasSameLoc } = require("../loc");
 
 /**
  * @typedef {import("../../document").Doc} Doc
  */
 
+function printImportDeclaration(path, options, print) {
+  const node = path.getValue();
+  const semi = options.semi ? ";" : "";
+  /** @type{Doc[]} */
+  const parts = [];
+
+  const { importKind } = node;
+
+  parts.push("import");
+
+  if (importKind && importKind !== "value") {
+    parts.push(" ", importKind);
+  }
+
+  parts.push(
+    printModuleSpecifiers(path, options, print),
+    printModuleSource(path, options, print),
+    printImportAssertions(path, options, print)
+  );
+
+  parts.push(semi);
+
+  return concat(parts);
+}
+
+function printExportDeclaration(path, options, print) {
+  const node = path.getValue();
+  /** @type{Doc[]} */
+  const parts = [];
+
+  const { type, exportKind, declaration } = node;
+  if (type === "DeclareExportDeclaration") {
+    parts.push("declare ");
+  }
+
+  parts.push("export");
+
+  const isDefaultExport = node.default || type === "ExportDefaultDeclaration";
+  if (isDefaultExport) {
+    parts.push(" default");
+  }
+
+  if (hasDanglingComments(node)) {
+    parts.push(
+      " ",
+      printDanglingComments(path, options, /* sameIndent */ true)
+    );
+
+    if (needsHardlineAfterDanglingComment(node)) {
+      parts.push(hardline);
+    }
+  }
+
+  if (declaration) {
+    parts.push(" ", path.call(print, "declaration"));
+  } else {
+    parts.push(
+      exportKind === "type" ? " type" : "",
+      printModuleSpecifiers(path, options, print),
+      printModuleSource(path, options, print),
+      printImportAssertions(path, options, print)
+    );
+  }
+
+  if (shouldExportDeclarationPrintSemi(node, options)) {
+    parts.push(";");
+  }
+
+  return concat(parts);
+}
+
+function printExportAllDeclaration(path, options, print) {
+  const node = path.getValue();
+  let semi = options.semi ? ";" : "";
+  /** @type{Doc[]} */
+  const parts = [];
+
+  const { type, exportKind, exported } = node;
+  if (type === "DeclareExportAllDeclaration") {
+    parts.push("declare ");
+    semi = "";
+  }
+
+  parts.push("export");
+
+  if (exportKind === "type") {
+    parts.push(" type");
+  }
+
+  parts.push(" *");
+
+  if (exported) {
+    parts.push(" as ", path.call(print, "exported"));
+  }
+
+  parts.push(
+    printModuleSource(path, options, print),
+    printImportAssertions(path, options, print),
+    semi
+  );
+
+  return concat(parts);
+}
+
+function shouldExportDeclarationPrintSemi(node, options) {
+  if (!options.semi) {
+    return false;
+  }
+
+  const { type, declaration } = node;
+  const isDefaultExport = node.default || type === "ExportDefaultDeclaration";
+  if (!declaration) {
+    return true;
+  }
+
+  const { type: declarationType } = declaration;
+  if (
+    isDefaultExport &&
+    declarationType !== "ClassDeclaration" &&
+    declarationType !== "FunctionDeclaration" &&
+    declarationType !== "TSInterfaceDeclaration" &&
+    declarationType !== "DeclareClass" &&
+    declarationType !== "DeclareFunction" &&
+    declarationType !== "TSDeclareFunction" &&
+    declarationType !== "EnumDeclaration"
+  ) {
+    return true;
+  }
+  return false;
+}
+
 function printModuleSource(path, options, print) {
   const node = path.getValue();
-  return node.source ? concat([" from ", path.call(print, "source")]) : "";
+
+  if (!node.source) {
+    return "";
+  }
+
+  /** @type{Doc[]} */
+  const parts = [];
+  if (!shouldNotPrintSpecifiers(node, options)) {
+    parts.push(" from");
+  }
+  parts.push(" ", path.call(print, "source"));
+
+  return concat(parts);
 }
 
 function printModuleSpecifiers(path, options, print) {
   const node = path.getValue();
 
+  if (shouldNotPrintSpecifiers(node, options)) {
+    return "";
+  }
+
   /** @type{Doc[]} */
-  const parts = [node.type === "ImportDeclaration" ? " " : ""];
+  const parts = [" "];
 
   if (node.specifiers && node.specifiers.length > 0) {
-    const standalonesSpecifiers = [];
+    const standaloneSpecifiers = [];
     const groupedSpecifiers = [];
 
     path.each((specifierPath) => {
@@ -33,7 +186,7 @@ function printModuleSpecifiers(path, options, print) {
         specifierType === "ImportNamespaceSpecifier" ||
         specifierType === "ImportDefaultSpecifier"
       ) {
-        standalonesSpecifiers.push(print(specifierPath));
+        standaloneSpecifiers.push(print(specifierPath));
       } else if (
         specifierType === "ExportSpecifier" ||
         specifierType === "ImportSpecifier"
@@ -47,16 +200,16 @@ function printModuleSpecifiers(path, options, print) {
       }
     }, "specifiers");
 
-    parts.push(join(", ", standalonesSpecifiers));
+    parts.push(join(", ", standaloneSpecifiers));
 
     if (groupedSpecifiers.length !== 0) {
-      if (standalonesSpecifiers.length !== 0) {
+      if (standaloneSpecifiers.length !== 0) {
         parts.push(", ");
       }
 
       const canBreak =
         groupedSpecifiers.length > 1 ||
-        standalonesSpecifiers.length > 0 ||
+        standaloneSpecifiers.length > 0 ||
         node.specifiers.some((node) => node.comments);
 
       if (canBreak) {
@@ -94,6 +247,23 @@ function printModuleSpecifiers(path, options, print) {
   return concat(parts);
 }
 
+function shouldNotPrintSpecifiers(node, options) {
+  const { type, importKind, source, specifiers } = node;
+
+  if (
+    type !== "ImportDeclaration" ||
+    (Array.isArray(specifiers) && specifiers.length > 0) ||
+    importKind === "type"
+  ) {
+    return false;
+  }
+
+  // TODO: check tokens
+  return !/{\s*}/.test(
+    options.originalText.slice(locStart(node), locStart(source))
+  );
+}
+
 function printImportAssertions(path, options, print) {
   const node = path.getNode();
   if (Array.isArray(node.assertions) && node.assertions.length !== 0) {
@@ -108,8 +278,46 @@ function printImportAssertions(path, options, print) {
   return "";
 }
 
+function printModuleSpecifier(path, options, print) {
+  const node = path.getNode();
+
+  const { type, importKind } = node;
+  /** @type{Doc[]} */
+  const parts = [];
+  if (type === "ImportSpecifier" && importKind) {
+    parts.push(importKind, " ");
+  }
+
+  const isImport = type.startsWith("Import");
+  const leftSideProperty = isImport ? "imported" : "local";
+  const rightSideProperty = isImport ? "local" : "exported";
+  let left = "";
+  let right = "";
+  if (
+    type === "ExportNamespaceSpecifier" ||
+    type === "ImportNamespaceSpecifier"
+  ) {
+    left = "*";
+  } else if (node[leftSideProperty]) {
+    left = path.call(print, leftSideProperty);
+  }
+
+  if (
+    node[rightSideProperty] &&
+    (!node[leftSideProperty] ||
+      // import {a as a} from '.'
+      !hasSameLoc(node[leftSideProperty], node[rightSideProperty]))
+  ) {
+    right = path.call(print, rightSideProperty);
+  }
+
+  parts.push(left, left && right ? " as " : "", right);
+  return concat(parts);
+}
+
 module.exports = {
-  printModuleSource,
-  printModuleSpecifiers,
-  printImportAssertions,
+  printImportDeclaration,
+  printExportDeclaration,
+  printExportAllDeclaration,
+  printModuleSpecifier,
 };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 4657fa348..44065793b 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -103,7 +103,7 @@ const {
   shouldFlatten,
   startsWithNoLookaheadToken,
 } = require("./utils");
-const { locStart, locEnd, hasSameLoc } = require("./loc");
+const { locStart, locEnd } = require("./loc");
 
 const printMemberChain = require("./print/member-chain");
 const printCallArguments = require("./print/call-arguments");
@@ -114,9 +114,10 @@ const {
   printBindExpressionCallee,
 } = require("./print/misc");
 const {
-  printModuleSource,
-  printModuleSpecifiers,
-  printImportAssertions,
+  printImportDeclaration,
+  printExportDeclaration,
+  printExportAllDeclaration,
+  printModuleSpecifier,
 } = require("./print/module");
 const printTernaryOperator = require("./print/ternary");
 const {
@@ -807,93 +808,24 @@ function printPathNoParens(path, options, print, args) {
       }
       return concat(parts);
     }
-    case "ImportSpecifier":
-      if (n.importKind) {
-        parts.push(path.call(print, "importKind"), " ");
-      }
-
-      parts.push(path.call(print, "imported"));
-
-      if (n.local && !hasSameLoc(n.local, n.imported)) {
-        parts.push(" as ", path.call(print, "local"));
-      }
-
-      return concat(parts);
-    case "ExportSpecifier": {
-      parts.push(path.call(print, "local"));
-
-      if (n.exported && !hasSameLoc(n.local, n.exported)) {
-        parts.push(" as ", path.call(print, "exported"));
-      }
-
-      return concat(parts);
-    }
-    case "ImportNamespaceSpecifier":
-      parts.push("* as ");
-      parts.push(path.call(print, "local"));
-      return concat(parts);
-    case "ImportDefaultSpecifier":
-      return path.call(print, "local");
     case "TSExportAssignment":
       return concat(["export = ", path.call(print, "expression"), semi]);
     case "ExportDefaultDeclaration":
     case "ExportNamedDeclaration":
-      return printExportDeclaration(path, options, print);
     case "DeclareExportDeclaration":
-      return concat(["declare ", printExportDeclaration(path, options, print)]);
+      return printExportDeclaration(path, options, print);
     case "ExportAllDeclaration":
-      parts.push("export");
-
-      if (n.exportKind === "type") {
-        parts.push(" type");
-      }
-
-      parts.push(" *");
-
-      if (n.exported) {
-        parts.push(" as ", path.call(print, "exported"));
-      }
-
-      parts.push(
-        printModuleSource(path, options, print),
-        printImportAssertions(path, options, print),
-        semi
-      );
-
-      return concat(parts);
-
+    case "DeclareExportAllDeclaration":
+      return printExportAllDeclaration(path, options, print);
+    case "ImportDeclaration":
+      return printImportDeclaration(path, options, print);
+    case "ImportSpecifier":
+    case "ExportSpecifier":
+    case "ImportNamespaceSpecifier":
     case "ExportNamespaceSpecifier":
-      return concat(["* as ", path.call(print, "exported")]);
+    case "ImportDefaultSpecifier":
     case "ExportDefaultSpecifier":
-      return path.call(print, "exported");
-    case "ImportDeclaration": {
-      parts.push("import");
-
-      if (n.importKind && n.importKind !== "value") {
-        parts.push(" ", n.importKind);
-      }
-
-      if (n.specifiers && n.specifiers.length > 0) {
-        parts.push(printModuleSpecifiers(path, options, print));
-        parts.push(printModuleSource(path, options, print));
-      } else if (
-        (n.importKind && n.importKind === "type") ||
-        // import {} from 'x'
-        /{\s*}/.test(
-          options.originalText.slice(locStart(n), locStart(n.source))
-        )
-      ) {
-        parts.push(" {}", printModuleSource(path, options, print));
-      } else {
-        parts.push(" ", path.call(print, "source"));
-      }
-
-      parts.push(printImportAssertions(path, options, print));
-
-      parts.push(semi);
-
-      return concat(parts);
-    }
+      return printModuleSpecifier(path, options, print);
     case "ImportAttribute":
       return concat([path.call(print, "key"), ": ", path.call(print, "value")]);
     case "Import":
@@ -2350,11 +2282,6 @@ function printPathNoParens(path, options, print, args) {
       ]);
     case "DeclareVariable":
       return printFlowDeclaration(path, ["var ", path.call(print, "id"), semi]);
-    case "DeclareExportAllDeclaration":
-      return concat([
-        "declare export *",
-        printModuleSource(path, options, print),
-      ]);
     case "DeclareOpaqueType":
     case "OpaqueType": {
       parts.push(
@@ -3808,54 +3735,6 @@ function printReturnType(path, print, options) {
   return concat(parts);
 }
 
-function printExportDeclaration(path, options, print) {
-  const decl = path.getValue();
-
-  const semi = options.semi ? ";" : "";
-
-  /** @type{Doc[]} */
-  const parts = ["export "];
-
-  const isDefault = decl.default || decl.type === "ExportDefaultDeclaration";
-
-  if (isDefault) {
-    parts.push("default ");
-  }
-
-  parts.push(
-    comments.printDanglingComments(path, options, /* sameIndent */ true)
-  );
-
-  if (needsHardlineAfterDanglingComment(decl)) {
-    parts.push(hardline);
-  }
-
-  if (decl.declaration) {
-    parts.push(path.call(print, "declaration"));
-
-    if (
-      isDefault &&
-      decl.declaration.type !== "ClassDeclaration" &&
-      decl.declaration.type !== "FunctionDeclaration" &&
-      decl.declaration.type !== "TSInterfaceDeclaration" &&
-      decl.declaration.type !== "DeclareClass" &&
-      decl.declaration.type !== "DeclareFunction" &&
-      decl.declaration.type !== "TSDeclareFunction" &&
-      decl.declaration.type !== "EnumDeclaration"
-    ) {
-      parts.push(semi);
-    }
-  } else {
-    parts.push(decl.exportKind === "type" ? "type " : "");
-    parts.push(printModuleSpecifiers(path, options, print));
-    parts.push(printModuleSource(path, options, print));
-    parts.push(printImportAssertions(path, options, print));
-    parts.push(semi);
-  }
-
-  return concat(parts);
-}
-
 function printFlowDeclaration(path, parts) {
   const parentExportDecl = getParentExportDeclaration(path);
 
diff --git a/tests/js/comments/__snapshots__/jsfmt.spec.js.snap b/tests/js/comments/__snapshots__/jsfmt.spec.js.snap
index 46bb3bfb7..aec6bbbce 100644
--- a/tests/js/comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/comments/__snapshots__/jsfmt.spec.js.snap
@@ -1175,7 +1175,7 @@ function d() {
 }
 new Thing(/* dangling */)
 Thing(/* dangling */)
-export /* dangling */{}
+export /* dangling */ {}
 
 ================================================================================
 `;
@@ -1213,7 +1213,7 @@ function d() {
 }
 new Thing(/* dangling */);
 Thing(/* dangling */);
-export /* dangling */{};
+export /* dangling */ {};
 
 ================================================================================
 `;
@@ -1476,9 +1476,9 @@ export {
 
 =====================================output=====================================
 export //comment
-{}
+ {}
 
-export /* comment */{}
+export /* comment */ {}
 
 const foo = ""
 export {
@@ -1532,9 +1532,9 @@ export {
 
 =====================================output=====================================
 export //comment
-{};
+ {};
 
-export /* comment */{};
+export /* comment */ {};
 
 const foo = "";
 export {

From dcd92726d23a0c68a086f04b1568bb30c5a549e0 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 19 Nov 2020 08:59:25 +0800
Subject: [PATCH 059/299] Extract array and object print (#9698)

---
 src/language-js/print/array.js           | 132 ++++++++
 src/language-js/print/object.js          | 239 ++++++++++++++
 src/language-js/print/type-annotation.js |  68 ++++
 src/language-js/printer-estree.js        | 403 +----------------------
 4 files changed, 450 insertions(+), 392 deletions(-)
 create mode 100644 src/language-js/print/array.js
 create mode 100644 src/language-js/print/object.js
 create mode 100644 src/language-js/print/type-annotation.js

diff --git a/src/language-js/print/array.js b/src/language-js/print/array.js
new file mode 100644
index 000000000..0ce6db81b
--- /dev/null
+++ b/src/language-js/print/array.js
@@ -0,0 +1,132 @@
+"use strict";
+
+const { printDanglingComments } = require("../../main/comments");
+const {
+  builders: { concat, line, softline, group, indent, ifBreak },
+} = require("../../document");
+const { getLast, isNextLineEmpty } = require("../../common/util");
+const { hasDanglingComments, shouldPrintComma } = require("../utils");
+const { locEnd } = require("../loc");
+
+const { printOptionalToken } = require("./misc");
+const { printTypeAnnotation } = require("./type-annotation");
+
+/** @typedef {import("../../document").Doc} Doc */
+
+function printArray(path, options, print) {
+  const n = path.getValue();
+  /** @type{Doc[]} */
+  const parts = [];
+
+  const openBracket = n.type === "TupleExpression" ? "#[" : "[";
+  const closeBracket = "]";
+  if (n.elements.length === 0) {
+    if (!hasDanglingComments(n)) {
+      parts.push(openBracket, closeBracket);
+    } else {
+      parts.push(
+        group(
+          concat([
+            openBracket,
+            printDanglingComments(path, options),
+            softline,
+            closeBracket,
+          ])
+        )
+      );
+    }
+  } else {
+    const lastElem = getLast(n.elements);
+    const canHaveTrailingComma = !(lastElem && lastElem.type === "RestElement");
+
+    // JavaScript allows you to have empty elements in an array which
+    // changes its length based on the number of commas. The algorithm
+    // is that if the last argument is null, we need to force insert
+    // a comma to ensure JavaScript recognizes it.
+    //   [,].length === 1
+    //   [1,].length === 1
+    //   [1,,].length === 2
+    //
+    // Note that getLast returns null if the array is empty, but
+    // we already check for an empty array just above so we are safe
+    const needsForcedTrailingComma = canHaveTrailingComma && lastElem === null;
+
+    const shouldBreak =
+      !options.__inJestEach &&
+      n.elements.length > 1 &&
+      n.elements.every((element, i, elements) => {
+        const elementType = element && element.type;
+        if (
+          elementType !== "ArrayExpression" &&
+          elementType !== "ObjectExpression"
+        ) {
+          return false;
+        }
+
+        const nextElement = elements[i + 1];
+        if (nextElement && elementType !== nextElement.type) {
+          return false;
+        }
+
+        const itemsKey =
+          elementType === "ArrayExpression" ? "elements" : "properties";
+
+        return element[itemsKey] && element[itemsKey].length > 1;
+      });
+
+    parts.push(
+      group(
+        concat([
+          openBracket,
+          indent(
+            concat([
+              softline,
+              printArrayItems(path, options, "elements", print),
+            ])
+          ),
+          needsForcedTrailingComma ? "," : "",
+          ifBreak(
+            canHaveTrailingComma &&
+              !needsForcedTrailingComma &&
+              shouldPrintComma(options)
+              ? ","
+              : ""
+          ),
+          printDanglingComments(path, options, /* sameIndent */ true),
+          softline,
+          closeBracket,
+        ]),
+        { shouldBreak }
+      )
+    );
+  }
+
+  parts.push(
+    printOptionalToken(path),
+    printTypeAnnotation(path, options, print)
+  );
+
+  return concat(parts);
+}
+
+function printArrayItems(path, options, printPath, print) {
+  const printedElements = [];
+  let separatorParts = [];
+
+  path.each((childPath) => {
+    printedElements.push(concat(separatorParts));
+    printedElements.push(group(print(childPath)));
+
+    separatorParts = [",", line];
+    if (
+      childPath.getValue() &&
+      isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)
+    ) {
+      separatorParts.push(softline);
+    }
+  }, printPath);
+
+  return concat(printedElements);
+}
+
+module.exports = { printArray, printArrayItems };
diff --git a/src/language-js/print/object.js b/src/language-js/print/object.js
new file mode 100644
index 000000000..e6f949e6c
--- /dev/null
+++ b/src/language-js/print/object.js
@@ -0,0 +1,239 @@
+"use strict";
+
+const { printDanglingComments } = require("../../main/comments");
+const {
+  builders: { concat, line, softline, group, indent, ifBreak, hardline },
+} = require("../../document");
+const {
+  getLast,
+  isNextLineEmpty,
+  hasNewlineInRange,
+  hasNewline,
+} = require("../../common/util");
+const {
+  hasDanglingComments,
+  shouldPrintComma,
+  hasNodeIgnoreComment,
+  isBlockComment,
+} = require("../utils");
+const { locStart, locEnd } = require("../loc");
+
+const { printOptionalToken } = require("./misc");
+const { shouldHugFunctionParameters } = require("./function-parameters");
+const { printTypeAnnotation, shouldHugType } = require("./type-annotation");
+
+/** @typedef {import("../../document").Doc} Doc */
+
+function printObject(path, options, print) {
+  const semi = options.semi ? ";" : "";
+  const n = path.getValue();
+
+  let propertiesField;
+
+  if (n.type === "TSTypeLiteral") {
+    propertiesField = "members";
+  } else if (n.type === "TSInterfaceBody") {
+    propertiesField = "body";
+  } else {
+    propertiesField = "properties";
+  }
+
+  const isTypeAnnotation = n.type === "ObjectTypeAnnotation";
+  const fields = [];
+  if (isTypeAnnotation) {
+    fields.push("indexers", "callProperties", "internalSlots");
+  }
+  fields.push(propertiesField);
+
+  const firstProperty = fields
+    .map((field) => n[field][0])
+    .sort((a, b) => locStart(a) - locStart(b))[0];
+
+  const parent = path.getParentNode(0);
+  const isFlowInterfaceLikeBody =
+    isTypeAnnotation &&
+    parent &&
+    (parent.type === "InterfaceDeclaration" ||
+      parent.type === "DeclareInterface" ||
+      parent.type === "DeclareClass") &&
+    path.getName() === "body";
+  const shouldBreak =
+    n.type === "TSInterfaceBody" ||
+    isFlowInterfaceLikeBody ||
+    (n.type === "ObjectPattern" &&
+      parent.type !== "FunctionDeclaration" &&
+      parent.type !== "FunctionExpression" &&
+      parent.type !== "ArrowFunctionExpression" &&
+      parent.type !== "ObjectMethod" &&
+      parent.type !== "ClassMethod" &&
+      parent.type !== "ClassPrivateMethod" &&
+      parent.type !== "AssignmentPattern" &&
+      parent.type !== "CatchClause" &&
+      n.properties.some(
+        (property) =>
+          property.value &&
+          (property.value.type === "ObjectPattern" ||
+            property.value.type === "ArrayPattern")
+      )) ||
+    (n.type !== "ObjectPattern" &&
+      firstProperty &&
+      hasNewlineInRange(
+        options.originalText,
+        locStart(n),
+        locStart(firstProperty)
+      ));
+
+  const separator = isFlowInterfaceLikeBody
+    ? ";"
+    : n.type === "TSInterfaceBody" || n.type === "TSTypeLiteral"
+    ? ifBreak(semi, ";")
+    : ",";
+  const leftBrace = n.type === "RecordExpression" ? "#{" : n.exact ? "{|" : "{";
+  const rightBrace = n.exact ? "|}" : "}";
+
+  // Unfortunately, things are grouped together in the ast can be
+  // interleaved in the source code. So we need to reorder them before
+  // printing them.
+  const propsAndLoc = [];
+  fields.forEach((field) => {
+    path.each((childPath) => {
+      const node = childPath.getValue();
+      propsAndLoc.push({
+        node,
+        printed: print(childPath),
+        loc: locStart(node),
+      });
+    }, field);
+  });
+
+  let separatorParts = [];
+  const props = propsAndLoc
+    .sort((a, b) => a.loc - b.loc)
+    .map((prop) => {
+      const result = concat(separatorParts.concat(group(prop.printed)));
+      separatorParts = [separator, line];
+      if (
+        (prop.node.type === "TSPropertySignature" ||
+          prop.node.type === "TSMethodSignature" ||
+          prop.node.type === "TSConstructSignatureDeclaration") &&
+        hasNodeIgnoreComment(prop.node)
+      ) {
+        separatorParts.shift();
+      }
+      if (isNextLineEmpty(options.originalText, prop.node, locEnd)) {
+        separatorParts.push(hardline);
+      }
+      return result;
+    });
+
+  if (n.inexact) {
+    let printed;
+    if (hasDanglingComments(n)) {
+      const hasLineComments = !n.comments.every((comment) =>
+        isBlockComment(comment)
+      );
+      const printedDanglingComments = printDanglingComments(
+        path,
+        options,
+        /* sameIndent */ true
+      );
+      printed = concat([
+        printedDanglingComments,
+        hasLineComments ||
+        hasNewline(
+          options.originalText,
+          locEnd(n.comments[n.comments.length - 1])
+        )
+          ? hardline
+          : line,
+        "...",
+      ]);
+    } else {
+      printed = "...";
+    }
+    props.push(concat(separatorParts.concat(printed)));
+  }
+
+  const lastElem = getLast(n[propertiesField]);
+
+  const canHaveTrailingSeparator = !(
+    n.inexact ||
+    (lastElem && lastElem.type === "RestElement") ||
+    (lastElem &&
+      (lastElem.type === "TSPropertySignature" ||
+        lastElem.type === "TSCallSignatureDeclaration" ||
+        lastElem.type === "TSMethodSignature" ||
+        lastElem.type === "TSConstructSignatureDeclaration") &&
+      hasNodeIgnoreComment(lastElem))
+  );
+
+  let content;
+  if (props.length === 0) {
+    if (!hasDanglingComments(n)) {
+      return concat([
+        leftBrace,
+        rightBrace,
+        printTypeAnnotation(path, options, print),
+      ]);
+    }
+
+    content = group(
+      concat([
+        leftBrace,
+        printDanglingComments(path, options),
+        softline,
+        rightBrace,
+        printOptionalToken(path),
+        printTypeAnnotation(path, options, print),
+      ])
+    );
+  } else {
+    content = concat([
+      leftBrace,
+      indent(concat([options.bracketSpacing ? line : softline, concat(props)])),
+      ifBreak(
+        canHaveTrailingSeparator &&
+          (separator !== "," || shouldPrintComma(options))
+          ? separator
+          : ""
+      ),
+      concat([options.bracketSpacing ? line : softline, rightBrace]),
+      printOptionalToken(path),
+      printTypeAnnotation(path, options, print),
+    ]);
+  }
+
+  // If we inline the object as first argument of the parent, we don't want
+  // to create another group so that the object breaks before the return
+  // type
+  if (
+    path.match(
+      (node) => node.type === "ObjectPattern" && !node.decorators,
+      (node, name, number) =>
+        shouldHugFunctionParameters(node) &&
+        (name === "params" ||
+          name === "parameters" ||
+          name === "this" ||
+          name === "rest") &&
+        number === 0
+    ) ||
+    path.match(
+      shouldHugType,
+      (node, name) => name === "typeAnnotation",
+      (node, name) => name === "typeAnnotation",
+      (node, name, number) =>
+        shouldHugFunctionParameters(node) &&
+        (name === "params" ||
+          name === "parameters" ||
+          name === "this" ||
+          name === "rest") &&
+        number === 0
+    )
+  ) {
+    return content;
+  }
+
+  return group(content, { shouldBreak });
+}
+
+module.exports = { printObject };
diff --git a/src/language-js/print/type-annotation.js b/src/language-js/print/type-annotation.js
new file mode 100644
index 000000000..483a447bb
--- /dev/null
+++ b/src/language-js/print/type-annotation.js
@@ -0,0 +1,68 @@
+"use strict";
+const {
+  builders: { concat },
+} = require("../../document");
+const {
+  isFlowAnnotationComment,
+  isSimpleType,
+  isObjectType,
+} = require("../utils");
+
+function printTypeAnnotation(path, options, print) {
+  const node = path.getValue();
+  if (!node.typeAnnotation) {
+    return "";
+  }
+
+  const parentNode = path.getParentNode();
+  const isDefinite =
+    node.definite ||
+    (parentNode &&
+      parentNode.type === "VariableDeclarator" &&
+      parentNode.definite);
+
+  const isFunctionDeclarationIdentifier =
+    parentNode.type === "DeclareFunction" && parentNode.id === node;
+
+  if (isFlowAnnotationComment(options.originalText, node.typeAnnotation)) {
+    return concat([" /*: ", path.call(print, "typeAnnotation"), " */"]);
+  }
+
+  return concat([
+    isFunctionDeclarationIdentifier ? "" : isDefinite ? "!: " : ": ",
+    path.call(print, "typeAnnotation"),
+  ]);
+}
+
+function shouldHugType(node) {
+  if (isSimpleType(node) || isObjectType(node)) {
+    return true;
+  }
+
+  if (node.type === "UnionTypeAnnotation" || node.type === "TSUnionType") {
+    const voidCount = node.types.filter(
+      (n) =>
+        n.type === "VoidTypeAnnotation" ||
+        n.type === "TSVoidKeyword" ||
+        n.type === "NullLiteralTypeAnnotation" ||
+        n.type === "TSNullKeyword"
+    ).length;
+
+    const hasObject = node.types.some(
+      (n) =>
+        n.type === "ObjectTypeAnnotation" ||
+        n.type === "TSTypeLiteral" ||
+        // This is a bit aggressive but captures Array<{x}>
+        n.type === "GenericTypeAnnotation" ||
+        n.type === "TSTypeReference"
+    );
+
+    if (node.types.length - 1 === voidCount && hasObject) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+module.exports = { printTypeAnnotation, shouldHugType };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 44065793b..073cc6bad 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -64,7 +64,6 @@ const {
   hasPrettierIgnore,
   hasTrailingComment,
   hasTrailingLineComment,
-  hasNodeIgnoreComment,
   hasIgnoreComment,
   identity,
   isBinaryish,
@@ -85,7 +84,6 @@ const {
   isNumericLiteral,
   isObjectType,
   isObjectTypePropertyAFunction,
-  isSimpleType,
   isSimpleNumber,
   isStringLiteral,
   isStringPropSafeToUnquote,
@@ -120,11 +118,14 @@ const {
   printModuleSpecifier,
 } = require("./print/module");
 const printTernaryOperator = require("./print/ternary");
-const {
-  printFunctionParameters,
-  shouldHugFunctionParameters,
-} = require("./print/function-parameters");
+const { printFunctionParameters } = require("./print/function-parameters");
 const { printTemplateLiteral } = require("./print/template-literal");
+const { printArray, printArrayItems } = require("./print/array");
+const { printObject } = require("./print/object");
+const {
+  printTypeAnnotation,
+  shouldHugType,
+} = require("./print/type-annotation");
 
 const needsQuoteProps = new WeakMap();
 
@@ -997,217 +998,8 @@ function printPathNoParens(path, options, print, args) {
     case "ObjectTypeAnnotation":
     case "TSInterfaceBody":
     case "TSTypeLiteral":
-    case "RecordExpression": {
-      let propertiesField;
-
-      if (n.type === "TSTypeLiteral") {
-        propertiesField = "members";
-      } else if (n.type === "TSInterfaceBody") {
-        propertiesField = "body";
-      } else {
-        propertiesField = "properties";
-      }
-
-      const isTypeAnnotation = n.type === "ObjectTypeAnnotation";
-      const fields = [];
-      if (isTypeAnnotation) {
-        fields.push("indexers", "callProperties", "internalSlots");
-      }
-      fields.push(propertiesField);
-
-      const firstProperty = fields
-        .map((field) => n[field][0])
-        .sort((a, b) => locStart(a) - locStart(b))[0];
-
-      const parent = path.getParentNode(0);
-      const isFlowInterfaceLikeBody =
-        isTypeAnnotation &&
-        parent &&
-        (parent.type === "InterfaceDeclaration" ||
-          parent.type === "DeclareInterface" ||
-          parent.type === "DeclareClass") &&
-        path.getName() === "body";
-      const shouldBreak =
-        n.type === "TSInterfaceBody" ||
-        isFlowInterfaceLikeBody ||
-        (n.type === "ObjectPattern" &&
-          parent.type !== "FunctionDeclaration" &&
-          parent.type !== "FunctionExpression" &&
-          parent.type !== "ArrowFunctionExpression" &&
-          parent.type !== "ObjectMethod" &&
-          parent.type !== "ClassMethod" &&
-          parent.type !== "ClassPrivateMethod" &&
-          parent.type !== "AssignmentPattern" &&
-          parent.type !== "CatchClause" &&
-          n.properties.some(
-            (property) =>
-              property.value &&
-              (property.value.type === "ObjectPattern" ||
-                property.value.type === "ArrayPattern")
-          )) ||
-        (n.type !== "ObjectPattern" &&
-          firstProperty &&
-          hasNewlineInRange(
-            options.originalText,
-            locStart(n),
-            locStart(firstProperty)
-          ));
-
-      const separator = isFlowInterfaceLikeBody
-        ? ";"
-        : n.type === "TSInterfaceBody" || n.type === "TSTypeLiteral"
-        ? ifBreak(semi, ";")
-        : ",";
-      const leftBrace =
-        n.type === "RecordExpression" ? "#{" : n.exact ? "{|" : "{";
-      const rightBrace = n.exact ? "|}" : "}";
-
-      // Unfortunately, things are grouped together in the ast can be
-      // interleaved in the source code. So we need to reorder them before
-      // printing them.
-      const propsAndLoc = [];
-      fields.forEach((field) => {
-        path.each((childPath) => {
-          const node = childPath.getValue();
-          propsAndLoc.push({
-            node,
-            printed: print(childPath),
-            loc: locStart(node),
-          });
-        }, field);
-      });
-
-      let separatorParts = [];
-      const props = propsAndLoc
-        .sort((a, b) => a.loc - b.loc)
-        .map((prop) => {
-          const result = concat(separatorParts.concat(group(prop.printed)));
-          separatorParts = [separator, line];
-          if (
-            (prop.node.type === "TSPropertySignature" ||
-              prop.node.type === "TSMethodSignature" ||
-              prop.node.type === "TSConstructSignatureDeclaration") &&
-            hasNodeIgnoreComment(prop.node)
-          ) {
-            separatorParts.shift();
-          }
-          if (isNextLineEmpty(options.originalText, prop.node, locEnd)) {
-            separatorParts.push(hardline);
-          }
-          return result;
-        });
-
-      if (n.inexact) {
-        let printed;
-        if (hasDanglingComments(n)) {
-          const hasLineComments = !n.comments.every((comment) =>
-            isBlockComment(comment)
-          );
-          const printedDanglingComments = comments.printDanglingComments(
-            path,
-            options,
-            /* sameIndent */ true
-          );
-          printed = concat([
-            printedDanglingComments,
-            hasLineComments ||
-            hasNewline(
-              options.originalText,
-              locEnd(n.comments[n.comments.length - 1])
-            )
-              ? hardline
-              : line,
-            "...",
-          ]);
-        } else {
-          printed = "...";
-        }
-        props.push(concat(separatorParts.concat(printed)));
-      }
-
-      const lastElem = getLast(n[propertiesField]);
-
-      const canHaveTrailingSeparator = !(
-        n.inexact ||
-        (lastElem && lastElem.type === "RestElement") ||
-        (lastElem &&
-          (lastElem.type === "TSPropertySignature" ||
-            lastElem.type === "TSCallSignatureDeclaration" ||
-            lastElem.type === "TSMethodSignature" ||
-            lastElem.type === "TSConstructSignatureDeclaration") &&
-          hasNodeIgnoreComment(lastElem))
-      );
-
-      let content;
-      if (props.length === 0) {
-        if (!hasDanglingComments(n)) {
-          return concat([
-            leftBrace,
-            rightBrace,
-            printTypeAnnotation(path, options, print),
-          ]);
-        }
-
-        content = group(
-          concat([
-            leftBrace,
-            comments.printDanglingComments(path, options),
-            softline,
-            rightBrace,
-            printOptionalToken(path),
-            printTypeAnnotation(path, options, print),
-          ])
-        );
-      } else {
-        content = concat([
-          leftBrace,
-          indent(
-            concat([options.bracketSpacing ? line : softline, concat(props)])
-          ),
-          ifBreak(
-            canHaveTrailingSeparator &&
-              (separator !== "," || shouldPrintComma(options))
-              ? separator
-              : ""
-          ),
-          concat([options.bracketSpacing ? line : softline, rightBrace]),
-          printOptionalToken(path),
-          printTypeAnnotation(path, options, print),
-        ]);
-      }
-
-      // If we inline the object as first argument of the parent, we don't want
-      // to create another group so that the object breaks before the return
-      // type
-      if (
-        path.match(
-          (node) => node.type === "ObjectPattern" && !node.decorators,
-          (node, name, number) =>
-            shouldHugFunctionParameters(node) &&
-            (name === "params" ||
-              name === "parameters" ||
-              name === "this" ||
-              name === "rest") &&
-            number === 0
-        ) ||
-        path.match(
-          shouldHugType,
-          (node, name) => name === "typeAnnotation",
-          (node, name) => name === "typeAnnotation",
-          (node, name, number) =>
-            shouldHugFunctionParameters(node) &&
-            (name === "params" ||
-              name === "parameters" ||
-              name === "this" ||
-              name === "rest") &&
-            number === 0
-        )
-      ) {
-        return content;
-      }
-
-      return group(content, { shouldBreak });
-    }
+    case "RecordExpression":
+      return printObject(path, options, print);
     // Babel 6
     case "ObjectProperty": // Non-standard AST node type.
     case "Property":
@@ -1262,104 +1054,8 @@ function printPathNoParens(path, options, print, args) {
       ]);
     case "ArrayExpression":
     case "ArrayPattern":
-    case "TupleExpression": {
-      const openBracket = n.type === "TupleExpression" ? "#[" : "[";
-      const closeBracket = "]";
-      if (n.elements.length === 0) {
-        if (!hasDanglingComments(n)) {
-          parts.push(openBracket, closeBracket);
-        } else {
-          parts.push(
-            group(
-              concat([
-                openBracket,
-                comments.printDanglingComments(path, options),
-                softline,
-                closeBracket,
-              ])
-            )
-          );
-        }
-      } else {
-        const lastElem = getLast(n.elements);
-        const canHaveTrailingComma = !(
-          lastElem && lastElem.type === "RestElement"
-        );
-
-        // JavaScript allows you to have empty elements in an array which
-        // changes its length based on the number of commas. The algorithm
-        // is that if the last argument is null, we need to force insert
-        // a comma to ensure JavaScript recognizes it.
-        //   [,].length === 1
-        //   [1,].length === 1
-        //   [1,,].length === 2
-        //
-        // Note that getLast returns null if the array is empty, but
-        // we already check for an empty array just above so we are safe
-        const needsForcedTrailingComma =
-          canHaveTrailingComma && lastElem === null;
-
-        const shouldBreak =
-          !options.__inJestEach &&
-          n.elements.length > 1 &&
-          n.elements.every((element, i, elements) => {
-            const elementType = element && element.type;
-            if (
-              elementType !== "ArrayExpression" &&
-              elementType !== "ObjectExpression"
-            ) {
-              return false;
-            }
-
-            const nextElement = elements[i + 1];
-            if (nextElement && elementType !== nextElement.type) {
-              return false;
-            }
-
-            const itemsKey =
-              elementType === "ArrayExpression" ? "elements" : "properties";
-
-            return element[itemsKey] && element[itemsKey].length > 1;
-          });
-
-        parts.push(
-          group(
-            concat([
-              openBracket,
-              indent(
-                concat([
-                  softline,
-                  printArrayItems(path, options, "elements", print),
-                ])
-              ),
-              needsForcedTrailingComma ? "," : "",
-              ifBreak(
-                canHaveTrailingComma &&
-                  !needsForcedTrailingComma &&
-                  shouldPrintComma(options)
-                  ? ","
-                  : ""
-              ),
-              comments.printDanglingComments(
-                path,
-                options,
-                /* sameIndent */ true
-              ),
-              softline,
-              closeBracket,
-            ]),
-            { shouldBreak }
-          )
-        );
-      }
-
-      parts.push(
-        printOptionalToken(path),
-        printTypeAnnotation(path, options, print)
-      );
-
-      return concat(parts);
-    }
+    case "TupleExpression":
+      return printArray(path, options, print);
     case "SequenceExpression": {
       const parent = path.getParentNode(0);
       if (
@@ -3619,32 +3315,6 @@ function printMethodInternal(path, options, print) {
   return concat(parts);
 }
 
-function printTypeAnnotation(path, options, print) {
-  const node = path.getValue();
-  if (!node.typeAnnotation) {
-    return "";
-  }
-
-  const parentNode = path.getParentNode();
-  const isDefinite =
-    node.definite ||
-    (parentNode &&
-      parentNode.type === "VariableDeclarator" &&
-      parentNode.definite);
-
-  const isFunctionDeclarationIdentifier =
-    parentNode.type === "DeclareFunction" && parentNode.id === node;
-
-  if (isFlowAnnotationComment(options.originalText, node.typeAnnotation)) {
-    return concat([" /*: ", path.call(print, "typeAnnotation"), " */"]);
-  }
-
-  return concat([
-    isFunctionDeclarationIdentifier ? "" : isDefinite ? "!: " : ": ",
-    path.call(print, "typeAnnotation"),
-  ]);
-}
-
 function shouldPrintParamsWithoutParens(path, options) {
   if (options.arrowParens === "always") {
     return false;
@@ -4673,57 +4343,6 @@ function stmtNeedsASIProtection(path, options) {
   );
 }
 
-function shouldHugType(node) {
-  if (isSimpleType(node) || isObjectType(node)) {
-    return true;
-  }
-
-  if (node.type === "UnionTypeAnnotation" || node.type === "TSUnionType") {
-    const voidCount = node.types.filter(
-      (n) =>
-        n.type === "VoidTypeAnnotation" ||
-        n.type === "TSVoidKeyword" ||
-        n.type === "NullLiteralTypeAnnotation" ||
-        n.type === "TSNullKeyword"
-    ).length;
-
-    const hasObject = node.types.some(
-      (n) =>
-        n.type === "ObjectTypeAnnotation" ||
-        n.type === "TSTypeLiteral" ||
-        // This is a bit aggressive but captures Array<{x}>
-        n.type === "GenericTypeAnnotation" ||
-        n.type === "TSTypeReference"
-    );
-
-    if (node.types.length - 1 === voidCount && hasObject) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-function printArrayItems(path, options, printPath, print) {
-  const printedElements = [];
-  let separatorParts = [];
-
-  path.each((childPath) => {
-    printedElements.push(concat(separatorParts));
-    printedElements.push(group(print(childPath)));
-
-    separatorParts = [",", line];
-    if (
-      childPath.getValue() &&
-      isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)
-    ) {
-      separatorParts.push(softline);
-    }
-  }, printPath);
-
-  return concat(printedElements);
-}
-
 function printReturnAndThrowArgument(path, options, print) {
   const node = path.getValue();
   const semi = options.semi ? ";" : "";

From 91690a376ef72aea14da459bbab0b14aa60def04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Nov 2020 16:09:25 +0800
Subject: [PATCH 060/299] Build(deps-dev): Bump webpack from 5.5.0 to 5.5.1
 (#9718)

Bumps [webpack](https://github.com/webpack/webpack) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.5.0...v5.5.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ffe071e62..89995e309 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "synchronous-promise": "2.0.15",
     "tempy": "1.0.0",
     "terser-webpack-plugin": "5.0.3",
-    "webpack": "5.5.0"
+    "webpack": "5.5.1"
   },
   "scripts": {
     "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
diff --git a/yarn.lock b/yarn.lock
index 927ebfbeb..a564456ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7447,10 +7447,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.5.0.tgz#250b3fdc1d876c7e58269d1406e7f9790af04f06"
-  integrity sha512-gyr7VE8zXJP81ZvS8+5dDphS2kaE0r8bpVWX6SxkBlzlX3hYfBS96kaltuf2cYK/BKJlUw5Aex/fKC34HUn+hA==
+webpack@5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.5.1.tgz#d6537f85554a0e59f15e6e683af11befdd0476aa"
+  integrity sha512-v4RzZP9BG2xxMLhxcFIo89M+nyIqGjh35Bhm5EE+I2N8y3dc9jT5OSb1HewUMkzMPyyDscOkVD6pSn6EMtTwNQ==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From ca9aac8997eb1221c6a91505e8d7a2945284d8d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Nov 2020 16:36:21 +0800
Subject: [PATCH 061/299] Build(deps-dev): Bump webpack from 5.5.0 to 5.5.1 in
 /website (#9716)

Bumps [webpack](https://github.com/webpack/webpack) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.5.0...v5.5.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index ddd455db6..6c50b1157 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.0",
     "svgo": "1.3.2",
-    "webpack": "5.5.0",
+    "webpack": "5.5.1",
     "webpack-cli": "4.2.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index f82c822c7..f25f1d395 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -7373,10 +7373,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.5.0.tgz#250b3fdc1d876c7e58269d1406e7f9790af04f06"
-  integrity sha512-gyr7VE8zXJP81ZvS8+5dDphS2kaE0r8bpVWX6SxkBlzlX3hYfBS96kaltuf2cYK/BKJlUw5Aex/fKC34HUn+hA==
+webpack@5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.5.1.tgz#d6537f85554a0e59f15e6e683af11befdd0476aa"
+  integrity sha512-v4RzZP9BG2xxMLhxcFIo89M+nyIqGjh35Bhm5EE+I2N8y3dc9jT5OSb1HewUMkzMPyyDscOkVD6pSn6EMtTwNQ==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From 7acaa554e92330fabae038b73048efc5384df65f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Nov 2020 16:37:30 +0800
Subject: [PATCH 062/299] Build(deps-dev): Bump rollup from 2.33.2 to 2.33.3
 (#9717)

Bumps [rollup](https://github.com/rollup/rollup) from 2.33.2 to 2.33.3.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v2.33.2...v2.33.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 89995e309..1638c07b0 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "path-browserify": "1.0.1",
     "prettier": "2.1.2",
     "rimraf": "3.0.2",
-    "rollup": "2.33.2",
+    "rollup": "2.33.3",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-terser": "7.0.2",
     "shelljs": "0.8.4",
diff --git a/yarn.lock b/yarn.lock
index a564456ed..69e5adab4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6374,10 +6374,10 @@ rollup-pluginutils@^2.3.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@2.33.2:
-  version "2.33.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.2.tgz#c4c76cd405a7605e6ebe90976398c46d4c2ea166"
-  integrity sha512-QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw==
+rollup@2.33.3:
+  version "2.33.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.3.tgz#ae72ce31f992b09a580072951bfea76e9df17342"
+  integrity sha512-RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w==
   optionalDependencies:
     fsevents "~2.1.2"
 

From b12e869333b6361a766d4e4bc8c94299040c0936 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 19 Nov 2020 18:33:50 +0800
Subject: [PATCH 063/299] Extract JSX related print functions (#9714)

---
 src/language-js/comments.js       |  32 ++
 src/language-js/print/jsx.js      | 721 +++++++++++++++++++++++++++++
 src/language-js/printer-estree.js | 730 ++----------------------------
 3 files changed, 781 insertions(+), 702 deletions(-)
 create mode 100644 src/language-js/print/jsx.js

diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index 6dd6b85a6..ea999d16b 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -15,6 +15,10 @@ const {
   isBlockComment,
   getFunctionParameters,
   isPrettierIgnoreComment,
+  isJSXNode,
+  hasFlowShorthandAnnotationComment,
+  hasFlowAnnotationComment,
+  hasIgnoreComment,
 } = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
@@ -857,6 +861,33 @@ function isTypeCastComment(comment) {
   );
 }
 
+function willPrintOwnComments(path /*, options */) {
+  const node = path.getValue();
+  const parent = path.getParentNode();
+
+  return (
+    ((node &&
+      (isJSXNode(node) ||
+        hasFlowShorthandAnnotationComment(node) ||
+        (parent &&
+          (parent.type === "CallExpression" ||
+            parent.type === "OptionalCallExpression") &&
+          (hasFlowAnnotationComment(node.leadingComments) ||
+            hasFlowAnnotationComment(node.trailingComments))))) ||
+      (parent &&
+        (parent.type === "JSXSpreadAttribute" ||
+          parent.type === "JSXSpreadChild" ||
+          parent.type === "UnionTypeAnnotation" ||
+          parent.type === "TSUnionType" ||
+          ((parent.type === "ClassDeclaration" ||
+            parent.type === "ClassExpression") &&
+            parent.superClass === node)))) &&
+    (!hasIgnoreComment(path) ||
+      parent.type === "UnionTypeAnnotation" ||
+      parent.type === "TSUnionType")
+  );
+}
+
 module.exports = {
   handleOwnLineComment,
   handleEndOfLineComment,
@@ -865,4 +896,5 @@ module.exports = {
   isTypeCastComment,
   getGapRegex,
   getCommentChildNodes,
+  willPrintOwnComments,
 };
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
new file mode 100644
index 000000000..4c21a063e
--- /dev/null
+++ b/src/language-js/print/jsx.js
@@ -0,0 +1,721 @@
+"use strict";
+
+const { printComments, printDanglingComments } = require("../../main/comments");
+const {
+  builders: {
+    concat,
+    line,
+    hardline,
+    softline,
+    group,
+    indent,
+    conditionalGroup,
+    fill,
+    ifBreak,
+    lineSuffixBoundary,
+  },
+  utils: { willBreak, isLineNext, isEmpty },
+} = require("../../document");
+
+const { getLast, getPreferredQuote } = require("../../common/util");
+const {
+  hasTrailingComment,
+  isEmptyJSXElement,
+  isJSXWhitespaceExpression,
+  isJSXNode,
+  isMeaningfulJSXText,
+  matchJsxWhitespaceRegex,
+  rawText,
+  isLiteral,
+  isCallOrOptionalCallExpression,
+  isStringLiteral,
+  isBinaryish,
+  isBlockComment,
+} = require("../utils");
+const pathNeedsParens = require("../needs-parens");
+const { willPrintOwnComments } = require("../comments");
+
+// JSX expands children from the inside-out, instead of the outside-in.
+// This is both to break children before attributes,
+// and to ensure that when children break, their parents do as well.
+//
+// Any element that is written without any newlines and fits on a single line
+// is left that way.
+// Not only that, any user-written-line containing multiple JSX siblings
+// should also be kept on one line if possible,
+// so each user-written-line is wrapped in its own group.
+//
+// Elements that contain newlines or don't fit on a single line (recursively)
+// are fully-split, using hardline and shouldBreak: true.
+//
+// To support that case properly, all leading and trailing spaces
+// are stripped from the list of children, and replaced with a single hardline.
+function printJsxElementInternal(path, options, print) {
+  const n = path.getValue();
+
+  if (n.type === "JSXElement" && isEmptyJSXElement(n)) {
+    return concat([
+      path.call(print, "openingElement"),
+      path.call(print, "closingElement"),
+    ]);
+  }
+
+  const openingLines =
+    n.type === "JSXElement"
+      ? path.call(print, "openingElement")
+      : path.call(print, "openingFragment");
+  const closingLines =
+    n.type === "JSXElement"
+      ? path.call(print, "closingElement")
+      : path.call(print, "closingFragment");
+
+  if (
+    n.children.length === 1 &&
+    n.children[0].type === "JSXExpressionContainer" &&
+    (n.children[0].expression.type === "TemplateLiteral" ||
+      n.children[0].expression.type === "TaggedTemplateExpression")
+  ) {
+    return concat([
+      openingLines,
+      concat(path.map(print, "children")),
+      closingLines,
+    ]);
+  }
+
+  // Convert `{" "}` to text nodes containing a space.
+  // This makes it easy to turn them into `jsxWhitespace` which
+  // can then print as either a space or `{" "}` when breaking.
+  n.children = n.children.map((child) => {
+    if (isJSXWhitespaceExpression(child)) {
+      return {
+        type: "JSXText",
+        value: " ",
+        raw: " ",
+      };
+    }
+    return child;
+  });
+
+  const containsTag = n.children.filter(isJSXNode).length > 0;
+  const containsMultipleExpressions =
+    n.children.filter((child) => child.type === "JSXExpressionContainer")
+      .length > 1;
+  const containsMultipleAttributes =
+    n.type === "JSXElement" && n.openingElement.attributes.length > 1;
+
+  // Record any breaks. Should never go from true to false, only false to true.
+  let forcedBreak =
+    willBreak(openingLines) ||
+    containsTag ||
+    containsMultipleAttributes ||
+    containsMultipleExpressions;
+
+  const isMdxBlock = path.getParentNode().rootMarker === "mdx";
+
+  const rawJsxWhitespace = options.singleQuote ? "{' '}" : '{" "}';
+  const jsxWhitespace = isMdxBlock
+    ? concat([" "])
+    : ifBreak(concat([rawJsxWhitespace, softline]), " ");
+
+  const isFacebookTranslationTag =
+    n.openingElement &&
+    n.openingElement.name &&
+    n.openingElement.name.name === "fbt";
+
+  const children = printJSXChildren(
+    path,
+    options,
+    print,
+    jsxWhitespace,
+    isFacebookTranslationTag
+  );
+
+  const containsText = n.children.some((child) => isMeaningfulJSXText(child));
+
+  // We can end up we multiple whitespace elements with empty string
+  // content between them.
+  // We need to remove empty whitespace and softlines before JSX whitespace
+  // to get the correct output.
+  for (let i = children.length - 2; i >= 0; i--) {
+    const isPairOfEmptyStrings = children[i] === "" && children[i + 1] === "";
+    const isPairOfHardlines =
+      children[i] === hardline &&
+      children[i + 1] === "" &&
+      children[i + 2] === hardline;
+    const isLineFollowedByJSXWhitespace =
+      (children[i] === softline || children[i] === hardline) &&
+      children[i + 1] === "" &&
+      children[i + 2] === jsxWhitespace;
+    const isJSXWhitespaceFollowedByLine =
+      children[i] === jsxWhitespace &&
+      children[i + 1] === "" &&
+      (children[i + 2] === softline || children[i + 2] === hardline);
+    const isDoubleJSXWhitespace =
+      children[i] === jsxWhitespace &&
+      children[i + 1] === "" &&
+      children[i + 2] === jsxWhitespace;
+    const isPairOfHardOrSoftLines =
+      (children[i] === softline &&
+        children[i + 1] === "" &&
+        children[i + 2] === hardline) ||
+      (children[i] === hardline &&
+        children[i + 1] === "" &&
+        children[i + 2] === softline);
+
+    if (
+      (isPairOfHardlines && containsText) ||
+      isPairOfEmptyStrings ||
+      isLineFollowedByJSXWhitespace ||
+      isDoubleJSXWhitespace ||
+      isPairOfHardOrSoftLines
+    ) {
+      children.splice(i, 2);
+    } else if (isJSXWhitespaceFollowedByLine) {
+      children.splice(i + 1, 2);
+    }
+  }
+
+  // Trim trailing lines (or empty strings)
+  while (
+    children.length &&
+    (isLineNext(getLast(children)) || isEmpty(getLast(children)))
+  ) {
+    children.pop();
+  }
+
+  // Trim leading lines (or empty strings)
+  while (
+    children.length &&
+    (isLineNext(children[0]) || isEmpty(children[0])) &&
+    (isLineNext(children[1]) || isEmpty(children[1]))
+  ) {
+    children.shift();
+    children.shift();
+  }
+
+  // Tweak how we format children if outputting this element over multiple lines.
+  // Also detect whether we will force this element to output over multiple lines.
+  const multilineChildren = [];
+  children.forEach((child, i) => {
+    // There are a number of situations where we need to ensure we display
+    // whitespace as `{" "}` when outputting this element over multiple lines.
+    if (child === jsxWhitespace) {
+      if (i === 1 && children[i - 1] === "") {
+        if (children.length === 2) {
+          // Solitary whitespace
+          multilineChildren.push(rawJsxWhitespace);
+          return;
+        }
+        // Leading whitespace
+        multilineChildren.push(concat([rawJsxWhitespace, hardline]));
+        return;
+      } else if (i === children.length - 1) {
+        // Trailing whitespace
+        multilineChildren.push(rawJsxWhitespace);
+        return;
+      } else if (children[i - 1] === "" && children[i - 2] === hardline) {
+        // Whitespace after line break
+        multilineChildren.push(rawJsxWhitespace);
+        return;
+      }
+    }
+
+    multilineChildren.push(child);
+
+    if (willBreak(child)) {
+      forcedBreak = true;
+    }
+  });
+
+  // If there is text we use `fill` to fit as much onto each line as possible.
+  // When there is no text (just tags and expressions) we use `group`
+  // to output each on a separate line.
+  const content = containsText
+    ? fill(multilineChildren)
+    : group(concat(multilineChildren), { shouldBreak: true });
+
+  if (isMdxBlock) {
+    return content;
+  }
+
+  const multiLineElem = group(
+    concat([
+      openingLines,
+      indent(concat([hardline, content])),
+      hardline,
+      closingLines,
+    ])
+  );
+
+  if (forcedBreak) {
+    return multiLineElem;
+  }
+
+  return conditionalGroup([
+    group(concat([openingLines, concat(children), closingLines])),
+    multiLineElem,
+  ]);
+}
+
+// JSX Children are strange, mostly for two reasons:
+// 1. JSX reads newlines into string values, instead of skipping them like JS
+// 2. up to one whitespace between elements within a line is significant,
+//    but not between lines.
+//
+// Leading, trailing, and lone whitespace all need to
+// turn themselves into the rather ugly `{' '}` when breaking.
+//
+// We print JSX using the `fill` doc primitive.
+// This requires that we give it an array of alternating
+// content and whitespace elements.
+// To ensure this we add dummy `""` content elements as needed.
+function printJSXChildren(
+  path,
+  options,
+  print,
+  jsxWhitespace,
+  isFacebookTranslationTag
+) {
+  const n = path.getValue();
+  const children = [];
+
+  path.each((childPath, i) => {
+    const child = childPath.getValue();
+    if (isLiteral(child)) {
+      const text = rawText(child);
+
+      // Contains a non-whitespace character
+      if (isMeaningfulJSXText(child)) {
+        const words = text.split(matchJsxWhitespaceRegex);
+
+        // Starts with whitespace
+        if (words[0] === "") {
+          children.push("");
+          words.shift();
+          if (/\n/.test(words[0])) {
+            const next = n.children[i + 1];
+            children.push(
+              separatorWithWhitespace(
+                isFacebookTranslationTag,
+                words[1],
+                child,
+                next
+              )
+            );
+          } else {
+            children.push(jsxWhitespace);
+          }
+          words.shift();
+        }
+
+        let endWhitespace;
+        // Ends with whitespace
+        if (getLast(words) === "") {
+          words.pop();
+          endWhitespace = words.pop();
+        }
+
+        // This was whitespace only without a new line.
+        if (words.length === 0) {
+          return;
+        }
+
+        words.forEach((word, i) => {
+          if (i % 2 === 1) {
+            children.push(line);
+          } else {
+            children.push(word);
+          }
+        });
+
+        if (endWhitespace !== undefined) {
+          if (/\n/.test(endWhitespace)) {
+            const next = n.children[i + 1];
+            children.push(
+              separatorWithWhitespace(
+                isFacebookTranslationTag,
+                getLast(children),
+                child,
+                next
+              )
+            );
+          } else {
+            children.push(jsxWhitespace);
+          }
+        } else {
+          const next = n.children[i + 1];
+          children.push(
+            separatorNoWhitespace(
+              isFacebookTranslationTag,
+              getLast(children),
+              child,
+              next
+            )
+          );
+        }
+      } else if (/\n/.test(text)) {
+        // Keep (up to one) blank line between tags/expressions/text.
+        // Note: We don't keep blank lines between text elements.
+        if (text.match(/\n/g).length > 1) {
+          children.push("");
+          children.push(hardline);
+        }
+      } else {
+        children.push("");
+        children.push(jsxWhitespace);
+      }
+    } else {
+      const printedChild = print(childPath);
+      children.push(printedChild);
+
+      const next = n.children[i + 1];
+      const directlyFollowedByMeaningfulText =
+        next && isMeaningfulJSXText(next);
+      if (directlyFollowedByMeaningfulText) {
+        const firstWord = rawText(next)
+          .trim()
+          .split(matchJsxWhitespaceRegex)[0];
+        children.push(
+          separatorNoWhitespace(
+            isFacebookTranslationTag,
+            firstWord,
+            child,
+            next
+          )
+        );
+      } else {
+        children.push(hardline);
+      }
+    }
+  }, "children");
+
+  return children;
+}
+
+function separatorNoWhitespace(
+  isFacebookTranslationTag,
+  child,
+  childNode,
+  nextNode
+) {
+  if (isFacebookTranslationTag) {
+    return "";
+  }
+
+  if (
+    (childNode.type === "JSXElement" && !childNode.closingElement) ||
+    (nextNode && nextNode.type === "JSXElement" && !nextNode.closingElement)
+  ) {
+    return child.length === 1 ? softline : hardline;
+  }
+
+  return softline;
+}
+
+function separatorWithWhitespace(
+  isFacebookTranslationTag,
+  child,
+  childNode,
+  nextNode
+) {
+  if (isFacebookTranslationTag) {
+    return hardline;
+  }
+
+  if (child.length === 1) {
+    return (childNode.type === "JSXElement" && !childNode.closingElement) ||
+      (nextNode && nextNode.type === "JSXElement" && !nextNode.closingElement)
+      ? hardline
+      : softline;
+  }
+
+  return hardline;
+}
+
+function maybeWrapJSXElementInParens(path, elem, options) {
+  const parent = path.getParentNode();
+  /* istanbul ignore next */
+  if (!parent) {
+    return elem;
+  }
+
+  const NO_WRAP_PARENTS = {
+    ArrayExpression: true,
+    JSXAttribute: true,
+    JSXElement: true,
+    JSXExpressionContainer: true,
+    JSXFragment: true,
+    ExpressionStatement: true,
+    CallExpression: true,
+    OptionalCallExpression: true,
+    ConditionalExpression: true,
+    JsExpressionRoot: true,
+  };
+  if (NO_WRAP_PARENTS[parent.type]) {
+    return elem;
+  }
+
+  const shouldBreak = path.match(
+    undefined,
+    (node) => node.type === "ArrowFunctionExpression",
+    isCallOrOptionalCallExpression,
+    (node) => node.type === "JSXExpressionContainer"
+  );
+
+  const needsParens = pathNeedsParens(path, options);
+
+  return group(
+    concat([
+      needsParens ? "" : ifBreak("("),
+      indent(concat([softline, elem])),
+      softline,
+      needsParens ? "" : ifBreak(")"),
+    ]),
+    { shouldBreak }
+  );
+}
+
+function printJsxAttribute(path, options, print) {
+  const n = path.getValue();
+  const parts = [];
+  parts.push(path.call(print, "name"));
+
+  if (n.value) {
+    let res;
+    if (isStringLiteral(n.value)) {
+      const raw = rawText(n.value);
+      // Unescape all quotes so we get an accurate preferred quote
+      let final = raw.replace(/&apos;/g, "'").replace(/&quot;/g, '"');
+      const quote = getPreferredQuote(
+        final,
+        options.jsxSingleQuote ? "'" : '"'
+      );
+      const escape = quote === "'" ? "&apos;" : "&quot;";
+      final = final.slice(1, -1).replace(new RegExp(quote, "g"), escape);
+      res = concat([quote, final, quote]);
+    } else {
+      res = path.call(print, "value");
+    }
+    parts.push("=", res);
+  }
+
+  return concat(parts);
+}
+
+function printJsxExpressionContainer(path, options, print) {
+  const n = path.getValue();
+  const parent = path.getParentNode(0);
+
+  const hasComments = n.expression.comments && n.expression.comments.length > 0;
+
+  const shouldInline =
+    n.expression.type === "JSXEmptyExpression" ||
+    (!hasComments &&
+      (n.expression.type === "ArrayExpression" ||
+        n.expression.type === "ObjectExpression" ||
+        n.expression.type === "ArrowFunctionExpression" ||
+        n.expression.type === "CallExpression" ||
+        n.expression.type === "OptionalCallExpression" ||
+        n.expression.type === "FunctionExpression" ||
+        n.expression.type === "TemplateLiteral" ||
+        n.expression.type === "TaggedTemplateExpression" ||
+        n.expression.type === "DoExpression" ||
+        (isJSXNode(parent) &&
+          (n.expression.type === "ConditionalExpression" ||
+            isBinaryish(n.expression)))));
+
+  if (shouldInline) {
+    return group(
+      concat(["{", path.call(print, "expression"), lineSuffixBoundary, "}"])
+    );
+  }
+
+  return group(
+    concat([
+      "{",
+      indent(concat([softline, path.call(print, "expression")])),
+      softline,
+      lineSuffixBoundary,
+      "}",
+    ])
+  );
+}
+
+function printJsxOpeningElement(path, options, print) {
+  const n = path.getValue();
+
+  const nameHasComments =
+    (n.name && n.name.comments && n.name.comments.length > 0) ||
+    (n.typeParameters &&
+      n.typeParameters.comments &&
+      n.typeParameters.comments.length > 0);
+
+  // Don't break self-closing elements with no attributes and no comments
+  if (n.selfClosing && !n.attributes.length && !nameHasComments) {
+    return concat([
+      "<",
+      path.call(print, "name"),
+      path.call(print, "typeParameters"),
+      " />",
+    ]);
+  }
+
+  // don't break up opening elements with a single long text attribute
+  if (
+    n.attributes &&
+    n.attributes.length === 1 &&
+    n.attributes[0].value &&
+    isStringLiteral(n.attributes[0].value) &&
+    !n.attributes[0].value.value.includes("\n") &&
+    // We should break for the following cases:
+    // <div
+    //   // comment
+    //   attr="value"
+    // >
+    // <div
+    //   attr="value"
+    //   // comment
+    // >
+    !nameHasComments &&
+    (!n.attributes[0].comments || !n.attributes[0].comments.length)
+  ) {
+    return group(
+      concat([
+        "<",
+        path.call(print, "name"),
+        path.call(print, "typeParameters"),
+        " ",
+        concat(path.map(print, "attributes")),
+        n.selfClosing ? " />" : ">",
+      ])
+    );
+  }
+
+  const lastAttrHasTrailingComments =
+    n.attributes.length && hasTrailingComment(getLast(n.attributes));
+
+  const bracketSameLine =
+    // Simple tags (no attributes and no comment in tag name) should be
+    // kept unbroken regardless of `jsxBracketSameLine`
+    (!n.attributes.length && !nameHasComments) ||
+    (options.jsxBracketSameLine &&
+      // We should print the bracket in a new line for the following cases:
+      // <div
+      //   // comment
+      // >
+      // <div
+      //   attr // comment
+      // >
+      (!nameHasComments || n.attributes.length) &&
+      !lastAttrHasTrailingComments);
+
+  // We should print the opening element expanded if any prop value is a
+  // string literal with newlines
+  const shouldBreak =
+    n.attributes &&
+    n.attributes.some(
+      (attr) =>
+        attr.value &&
+        isStringLiteral(attr.value) &&
+        attr.value.value.includes("\n")
+    );
+
+  return group(
+    concat([
+      "<",
+      path.call(print, "name"),
+      path.call(print, "typeParameters"),
+      concat([
+        indent(
+          concat(path.map((attr) => concat([line, print(attr)]), "attributes"))
+        ),
+        n.selfClosing ? line : bracketSameLine ? ">" : softline,
+      ]),
+      n.selfClosing ? "/>" : bracketSameLine ? "" : ">",
+    ]),
+    { shouldBreak }
+  );
+}
+
+function printJsxClosingElement(path, options, print) {
+  return concat(["</", path.call(print, "name"), ">"]);
+}
+
+function printJsxOpeningClosingFragment(path, options /*, print*/) {
+  const n = path.getValue();
+  const hasComment = n.comments && n.comments.length;
+  const hasOwnLineComment =
+    hasComment && !n.comments.every((comment) => isBlockComment(comment));
+  const isOpeningFragment = n.type === "JSXOpeningFragment";
+  return concat([
+    isOpeningFragment ? "<" : "</",
+    indent(
+      concat([
+        hasOwnLineComment
+          ? hardline
+          : hasComment && !isOpeningFragment
+          ? " "
+          : "",
+        printDanglingComments(path, options, true),
+      ])
+    ),
+    hasOwnLineComment ? hardline : "",
+    ">",
+  ]);
+}
+
+function printJsxElement(path, options, print) {
+  const elem = printComments(
+    path,
+    () => printJsxElementInternal(path, options, print),
+    options
+  );
+  return maybeWrapJSXElementInParens(path, elem, options);
+}
+
+function printJsxEmptyExpression(path, options /*, print*/) {
+  const n = path.getValue();
+  const requiresHardline =
+    n.comments && !n.comments.every((comment) => isBlockComment(comment));
+
+  return concat([
+    printDanglingComments(path, options, /* sameIndent */ !requiresHardline),
+    requiresHardline ? hardline : "",
+  ]);
+}
+
+// `JSXSpreadAttribute` and `JSXSpreadChild`
+function printJsxSpreadAttribute(path, options, print) {
+  const n = path.getValue();
+  return concat([
+    "{",
+    path.call(
+      (p) => {
+        const printed = concat(["...", print(p)]);
+        const n = p.getValue();
+        if (!n.comments || !n.comments.length || !willPrintOwnComments(p)) {
+          return printed;
+        }
+        return concat([
+          indent(concat([softline, printComments(p, () => printed, options)])),
+          softline,
+        ]);
+      },
+      n.type === "JSXSpreadAttribute" ? "argument" : "expression"
+    ),
+    "}",
+  ]);
+}
+
+module.exports = {
+  printJsxElement,
+  printJsxAttribute,
+  printJsxOpeningElement,
+  printJsxClosingElement,
+  printJsxOpeningClosingFragment,
+  printJsxExpressionContainer,
+  printJsxEmptyExpression,
+  printJsxSpreadAttribute,
+  // Alias
+  printJsxSpreadChild: printJsxSpreadAttribute,
+};
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 073cc6bad..f254c19b2 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -13,7 +13,6 @@ const {
   getLast,
   printString,
   printNumber,
-  getPreferredQuote,
   isNextLineEmpty,
   getNextNonSpaceNonCommentCharacterIndex,
 } = require("../common/util");
@@ -29,11 +28,9 @@ const {
     indent,
     align,
     conditionalGroup,
-    fill,
     ifBreak,
-    lineSuffixBoundary,
   },
-  utils: { willBreak, isLineNext, isEmpty, normalizeParts },
+  utils: { isEmpty, normalizeParts },
 } = require("../document");
 const embed = require("./embed");
 const clean = require("./clean");
@@ -64,20 +61,16 @@ const {
   hasPrettierIgnore,
   hasTrailingComment,
   hasTrailingLineComment,
-  hasIgnoreComment,
   identity,
   isBinaryish,
   isCallOrOptionalCallExpression,
-  isEmptyJSXElement,
   isExportDeclaration,
   isFlowAnnotationComment,
   isFunctionNotation,
   isGetterOrSetter,
   isJSXNode,
-  isJSXWhitespaceExpression,
   isLastStatement,
   isLiteral,
-  isMeaningfulJSXText,
   isMemberExpressionChain,
   isMemberish,
   isNgForOf,
@@ -93,7 +86,6 @@ const {
   isTSXFile,
   isBlockComment,
   isLineComment,
-  matchJsxWhitespaceRegex,
   needsHardlineAfterDanglingComment,
   rawText,
   returnArgumentHasLeadingComment,
@@ -126,6 +118,17 @@ const {
   printTypeAnnotation,
   shouldHugType,
 } = require("./print/type-annotation");
+const {
+  printJsxElement,
+  printJsxAttribute,
+  printJsxOpeningElement,
+  printJsxClosingElement,
+  printJsxOpeningClosingFragment,
+  printJsxExpressionContainer,
+  printJsxEmptyExpression,
+  printJsxSpreadAttribute,
+  printJsxSpreadChild,
+} = require("./print/jsx");
 
 const needsQuoteProps = new WeakMap();
 
@@ -1536,28 +1539,7 @@ function printPathNoParens(path, options, print, args) {
     case "DebuggerStatement":
       return concat(["debugger", semi]);
     case "JSXAttribute":
-      parts.push(path.call(print, "name"));
-
-      if (n.value) {
-        let res;
-        if (isStringLiteral(n.value)) {
-          const raw = rawText(n.value);
-          // Unescape all quotes so we get an accurate preferred quote
-          let final = raw.replace(/&apos;/g, "'").replace(/&quot;/g, '"');
-          const quote = getPreferredQuote(
-            final,
-            options.jsxSingleQuote ? "'" : '"'
-          );
-          const escape = quote === "'" ? "&apos;" : "&quot;";
-          final = final.slice(1, -1).replace(new RegExp(quote, "g"), escape);
-          res = concat([quote, final, quote]);
-        } else {
-          res = path.call(print, "value");
-        }
-        parts.push("=", res);
-      }
-
-      return concat(parts);
+      return printJsxAttribute(path, options, print);
     case "JSXIdentifier":
       return "" + n.name;
     case "JSXNamespacedName":
@@ -1573,215 +1555,26 @@ function printPathNoParens(path, options, print, args) {
     case "TSQualifiedName":
       return join(".", [path.call(print, "left"), path.call(print, "right")]);
     case "JSXSpreadAttribute":
-    case "JSXSpreadChild": {
-      return concat([
-        "{",
-        path.call(
-          (p) => {
-            const printed = concat(["...", print(p)]);
-            const n = p.getValue();
-            if (!n.comments || !n.comments.length || !willPrintOwnComments(p)) {
-              return printed;
-            }
-            return concat([
-              indent(
-                concat([
-                  softline,
-                  comments.printComments(p, () => printed, options),
-                ])
-              ),
-              softline,
-            ]);
-          },
-          n.type === "JSXSpreadAttribute" ? "argument" : "expression"
-        ),
-        "}",
-      ]);
-    }
-    case "JSXExpressionContainer": {
-      const parent = path.getParentNode(0);
-
-      const hasComments =
-        n.expression.comments && n.expression.comments.length > 0;
-
-      const shouldInline =
-        n.expression.type === "JSXEmptyExpression" ||
-        (!hasComments &&
-          (n.expression.type === "ArrayExpression" ||
-            n.expression.type === "ObjectExpression" ||
-            n.expression.type === "ArrowFunctionExpression" ||
-            n.expression.type === "CallExpression" ||
-            n.expression.type === "OptionalCallExpression" ||
-            n.expression.type === "FunctionExpression" ||
-            n.expression.type === "TemplateLiteral" ||
-            n.expression.type === "TaggedTemplateExpression" ||
-            n.expression.type === "DoExpression" ||
-            (isJSXNode(parent) &&
-              (n.expression.type === "ConditionalExpression" ||
-                isBinaryish(n.expression)))));
-
-      if (shouldInline) {
-        return group(
-          concat(["{", path.call(print, "expression"), lineSuffixBoundary, "}"])
-        );
-      }
-
-      return group(
-        concat([
-          "{",
-          indent(concat([softline, path.call(print, "expression")])),
-          softline,
-          lineSuffixBoundary,
-          "}",
-        ])
-      );
-    }
+      return printJsxSpreadAttribute(path, options, print);
+    case "JSXSpreadChild":
+      return printJsxSpreadChild(path, options, print);
+    case "JSXExpressionContainer":
+      return printJsxExpressionContainer(path, options, print);
     case "JSXFragment":
-    case "JSXElement": {
-      const elem = comments.printComments(
-        path,
-        () => printJSXElement(path, options, print),
-        options
-      );
-      return maybeWrapJSXElementInParens(path, elem, options);
-    }
-    case "JSXOpeningElement": {
-      const n = path.getValue();
-
-      const nameHasComments =
-        (n.name && n.name.comments && n.name.comments.length > 0) ||
-        (n.typeParameters &&
-          n.typeParameters.comments &&
-          n.typeParameters.comments.length > 0);
-
-      // Don't break self-closing elements with no attributes and no comments
-      if (n.selfClosing && !n.attributes.length && !nameHasComments) {
-        return concat([
-          "<",
-          path.call(print, "name"),
-          path.call(print, "typeParameters"),
-          " />",
-        ]);
-      }
-
-      // don't break up opening elements with a single long text attribute
-      if (
-        n.attributes &&
-        n.attributes.length === 1 &&
-        n.attributes[0].value &&
-        isStringLiteral(n.attributes[0].value) &&
-        !n.attributes[0].value.value.includes("\n") &&
-        // We should break for the following cases:
-        // <div
-        //   // comment
-        //   attr="value"
-        // >
-        // <div
-        //   attr="value"
-        //   // comment
-        // >
-        !nameHasComments &&
-        (!n.attributes[0].comments || !n.attributes[0].comments.length)
-      ) {
-        return group(
-          concat([
-            "<",
-            path.call(print, "name"),
-            path.call(print, "typeParameters"),
-            " ",
-            concat(path.map(print, "attributes")),
-            n.selfClosing ? " />" : ">",
-          ])
-        );
-      }
-
-      const lastAttrHasTrailingComments =
-        n.attributes.length && hasTrailingComment(getLast(n.attributes));
-
-      const bracketSameLine =
-        // Simple tags (no attributes and no comment in tag name) should be
-        // kept unbroken regardless of `jsxBracketSameLine`
-        (!n.attributes.length && !nameHasComments) ||
-        (options.jsxBracketSameLine &&
-          // We should print the bracket in a new line for the following cases:
-          // <div
-          //   // comment
-          // >
-          // <div
-          //   attr // comment
-          // >
-          (!nameHasComments || n.attributes.length) &&
-          !lastAttrHasTrailingComments);
-
-      // We should print the opening element expanded if any prop value is a
-      // string literal with newlines
-      const shouldBreak =
-        n.attributes &&
-        n.attributes.some(
-          (attr) =>
-            attr.value &&
-            isStringLiteral(attr.value) &&
-            attr.value.value.includes("\n")
-        );
-
-      return group(
-        concat([
-          "<",
-          path.call(print, "name"),
-          path.call(print, "typeParameters"),
-          concat([
-            indent(
-              concat(
-                path.map((attr) => concat([line, print(attr)]), "attributes")
-              )
-            ),
-            n.selfClosing ? line : bracketSameLine ? ">" : softline,
-          ]),
-          n.selfClosing ? "/>" : bracketSameLine ? "" : ">",
-        ]),
-        { shouldBreak }
-      );
-    }
+    case "JSXElement":
+      return printJsxElement(path, options, print);
+    case "JSXOpeningElement":
+      return printJsxOpeningElement(path, options, print);
     case "JSXClosingElement":
-      return concat(["</", path.call(print, "name"), ">"]);
+      return printJsxClosingElement(path, options, print);
     case "JSXOpeningFragment":
-    case "JSXClosingFragment": {
-      const hasComment = n.comments && n.comments.length;
-      const hasOwnLineComment =
-        hasComment && !n.comments.every((comment) => isBlockComment(comment));
-      const isOpeningFragment = n.type === "JSXOpeningFragment";
-      return concat([
-        isOpeningFragment ? "<" : "</",
-        indent(
-          concat([
-            hasOwnLineComment
-              ? hardline
-              : hasComment && !isOpeningFragment
-              ? " "
-              : "",
-            comments.printDanglingComments(path, options, true),
-          ])
-        ),
-        hasOwnLineComment ? hardline : "",
-        ">",
-      ]);
-    }
+    case "JSXClosingFragment":
+      return printJsxOpeningClosingFragment(path, options /*, print*/);
     case "JSXText":
       /* istanbul ignore next */
       throw new Error("JSXTest should be handled by JSXElement");
-    case "JSXEmptyExpression": {
-      const requiresHardline =
-        n.comments && !n.comments.every((comment) => isBlockComment(comment));
-
-      return concat([
-        comments.printDanglingComments(
-          path,
-          options,
-          /* sameIndent */ !requiresHardline
-        ),
-        requiresHardline ? hardline : "",
-      ]);
-    }
+    case "JSXEmptyExpression":
+      return printJsxEmptyExpression(path, options /*, print*/);
     case "ClassBody":
       if (!n.comments && n.body.length === 0) {
         return "{}";
@@ -3634,446 +3427,6 @@ function printClass(path, options, print) {
   return parts;
 }
 
-function separatorNoWhitespace(
-  isFacebookTranslationTag,
-  child,
-  childNode,
-  nextNode
-) {
-  if (isFacebookTranslationTag) {
-    return "";
-  }
-
-  if (
-    (childNode.type === "JSXElement" && !childNode.closingElement) ||
-    (nextNode && nextNode.type === "JSXElement" && !nextNode.closingElement)
-  ) {
-    return child.length === 1 ? softline : hardline;
-  }
-
-  return softline;
-}
-
-function separatorWithWhitespace(
-  isFacebookTranslationTag,
-  child,
-  childNode,
-  nextNode
-) {
-  if (isFacebookTranslationTag) {
-    return hardline;
-  }
-
-  if (child.length === 1) {
-    return (childNode.type === "JSXElement" && !childNode.closingElement) ||
-      (nextNode && nextNode.type === "JSXElement" && !nextNode.closingElement)
-      ? hardline
-      : softline;
-  }
-
-  return hardline;
-}
-
-// JSX Children are strange, mostly for two reasons:
-// 1. JSX reads newlines into string values, instead of skipping them like JS
-// 2. up to one whitespace between elements within a line is significant,
-//    but not between lines.
-//
-// Leading, trailing, and lone whitespace all need to
-// turn themselves into the rather ugly `{' '}` when breaking.
-//
-// We print JSX using the `fill` doc primitive.
-// This requires that we give it an array of alternating
-// content and whitespace elements.
-// To ensure this we add dummy `""` content elements as needed.
-function printJSXChildren(
-  path,
-  options,
-  print,
-  jsxWhitespace,
-  isFacebookTranslationTag
-) {
-  const n = path.getValue();
-  const children = [];
-
-  path.each((childPath, i) => {
-    const child = childPath.getValue();
-    if (isLiteral(child)) {
-      const text = rawText(child);
-
-      // Contains a non-whitespace character
-      if (isMeaningfulJSXText(child)) {
-        const words = text.split(matchJsxWhitespaceRegex);
-
-        // Starts with whitespace
-        if (words[0] === "") {
-          children.push("");
-          words.shift();
-          if (/\n/.test(words[0])) {
-            const next = n.children[i + 1];
-            children.push(
-              separatorWithWhitespace(
-                isFacebookTranslationTag,
-                words[1],
-                child,
-                next
-              )
-            );
-          } else {
-            children.push(jsxWhitespace);
-          }
-          words.shift();
-        }
-
-        let endWhitespace;
-        // Ends with whitespace
-        if (getLast(words) === "") {
-          words.pop();
-          endWhitespace = words.pop();
-        }
-
-        // This was whitespace only without a new line.
-        if (words.length === 0) {
-          return;
-        }
-
-        words.forEach((word, i) => {
-          if (i % 2 === 1) {
-            children.push(line);
-          } else {
-            children.push(word);
-          }
-        });
-
-        if (endWhitespace !== undefined) {
-          if (/\n/.test(endWhitespace)) {
-            const next = n.children[i + 1];
-            children.push(
-              separatorWithWhitespace(
-                isFacebookTranslationTag,
-                getLast(children),
-                child,
-                next
-              )
-            );
-          } else {
-            children.push(jsxWhitespace);
-          }
-        } else {
-          const next = n.children[i + 1];
-          children.push(
-            separatorNoWhitespace(
-              isFacebookTranslationTag,
-              getLast(children),
-              child,
-              next
-            )
-          );
-        }
-      } else if (/\n/.test(text)) {
-        // Keep (up to one) blank line between tags/expressions/text.
-        // Note: We don't keep blank lines between text elements.
-        if (text.match(/\n/g).length > 1) {
-          children.push("");
-          children.push(hardline);
-        }
-      } else {
-        children.push("");
-        children.push(jsxWhitespace);
-      }
-    } else {
-      const printedChild = print(childPath);
-      children.push(printedChild);
-
-      const next = n.children[i + 1];
-      const directlyFollowedByMeaningfulText =
-        next && isMeaningfulJSXText(next);
-      if (directlyFollowedByMeaningfulText) {
-        const firstWord = rawText(next)
-          .trim()
-          .split(matchJsxWhitespaceRegex)[0];
-        children.push(
-          separatorNoWhitespace(
-            isFacebookTranslationTag,
-            firstWord,
-            child,
-            next
-          )
-        );
-      } else {
-        children.push(hardline);
-      }
-    }
-  }, "children");
-
-  return children;
-}
-
-// JSX expands children from the inside-out, instead of the outside-in.
-// This is both to break children before attributes,
-// and to ensure that when children break, their parents do as well.
-//
-// Any element that is written without any newlines and fits on a single line
-// is left that way.
-// Not only that, any user-written-line containing multiple JSX siblings
-// should also be kept on one line if possible,
-// so each user-written-line is wrapped in its own group.
-//
-// Elements that contain newlines or don't fit on a single line (recursively)
-// are fully-split, using hardline and shouldBreak: true.
-//
-// To support that case properly, all leading and trailing spaces
-// are stripped from the list of children, and replaced with a single hardline.
-function printJSXElement(path, options, print) {
-  const n = path.getValue();
-
-  if (n.type === "JSXElement" && isEmptyJSXElement(n)) {
-    return concat([
-      path.call(print, "openingElement"),
-      path.call(print, "closingElement"),
-    ]);
-  }
-
-  const openingLines =
-    n.type === "JSXElement"
-      ? path.call(print, "openingElement")
-      : path.call(print, "openingFragment");
-  const closingLines =
-    n.type === "JSXElement"
-      ? path.call(print, "closingElement")
-      : path.call(print, "closingFragment");
-
-  if (
-    n.children.length === 1 &&
-    n.children[0].type === "JSXExpressionContainer" &&
-    (n.children[0].expression.type === "TemplateLiteral" ||
-      n.children[0].expression.type === "TaggedTemplateExpression")
-  ) {
-    return concat([
-      openingLines,
-      concat(path.map(print, "children")),
-      closingLines,
-    ]);
-  }
-
-  // Convert `{" "}` to text nodes containing a space.
-  // This makes it easy to turn them into `jsxWhitespace` which
-  // can then print as either a space or `{" "}` when breaking.
-  n.children = n.children.map((child) => {
-    if (isJSXWhitespaceExpression(child)) {
-      return {
-        type: "JSXText",
-        value: " ",
-        raw: " ",
-      };
-    }
-    return child;
-  });
-
-  const containsTag = n.children.filter(isJSXNode).length > 0;
-  const containsMultipleExpressions =
-    n.children.filter((child) => child.type === "JSXExpressionContainer")
-      .length > 1;
-  const containsMultipleAttributes =
-    n.type === "JSXElement" && n.openingElement.attributes.length > 1;
-
-  // Record any breaks. Should never go from true to false, only false to true.
-  let forcedBreak =
-    willBreak(openingLines) ||
-    containsTag ||
-    containsMultipleAttributes ||
-    containsMultipleExpressions;
-
-  const isMdxBlock = path.getParentNode().rootMarker === "mdx";
-
-  const rawJsxWhitespace = options.singleQuote ? "{' '}" : '{" "}';
-  const jsxWhitespace = isMdxBlock
-    ? concat([" "])
-    : ifBreak(concat([rawJsxWhitespace, softline]), " ");
-
-  const isFacebookTranslationTag =
-    n.openingElement &&
-    n.openingElement.name &&
-    n.openingElement.name.name === "fbt";
-
-  const children = printJSXChildren(
-    path,
-    options,
-    print,
-    jsxWhitespace,
-    isFacebookTranslationTag
-  );
-
-  const containsText = n.children.some((child) => isMeaningfulJSXText(child));
-
-  // We can end up we multiple whitespace elements with empty string
-  // content between them.
-  // We need to remove empty whitespace and softlines before JSX whitespace
-  // to get the correct output.
-  for (let i = children.length - 2; i >= 0; i--) {
-    const isPairOfEmptyStrings = children[i] === "" && children[i + 1] === "";
-    const isPairOfHardlines =
-      children[i] === hardline &&
-      children[i + 1] === "" &&
-      children[i + 2] === hardline;
-    const isLineFollowedByJSXWhitespace =
-      (children[i] === softline || children[i] === hardline) &&
-      children[i + 1] === "" &&
-      children[i + 2] === jsxWhitespace;
-    const isJSXWhitespaceFollowedByLine =
-      children[i] === jsxWhitespace &&
-      children[i + 1] === "" &&
-      (children[i + 2] === softline || children[i + 2] === hardline);
-    const isDoubleJSXWhitespace =
-      children[i] === jsxWhitespace &&
-      children[i + 1] === "" &&
-      children[i + 2] === jsxWhitespace;
-    const isPairOfHardOrSoftLines =
-      (children[i] === softline &&
-        children[i + 1] === "" &&
-        children[i + 2] === hardline) ||
-      (children[i] === hardline &&
-        children[i + 1] === "" &&
-        children[i + 2] === softline);
-
-    if (
-      (isPairOfHardlines && containsText) ||
-      isPairOfEmptyStrings ||
-      isLineFollowedByJSXWhitespace ||
-      isDoubleJSXWhitespace ||
-      isPairOfHardOrSoftLines
-    ) {
-      children.splice(i, 2);
-    } else if (isJSXWhitespaceFollowedByLine) {
-      children.splice(i + 1, 2);
-    }
-  }
-
-  // Trim trailing lines (or empty strings)
-  while (
-    children.length &&
-    (isLineNext(getLast(children)) || isEmpty(getLast(children)))
-  ) {
-    children.pop();
-  }
-
-  // Trim leading lines (or empty strings)
-  while (
-    children.length &&
-    (isLineNext(children[0]) || isEmpty(children[0])) &&
-    (isLineNext(children[1]) || isEmpty(children[1]))
-  ) {
-    children.shift();
-    children.shift();
-  }
-
-  // Tweak how we format children if outputting this element over multiple lines.
-  // Also detect whether we will force this element to output over multiple lines.
-  const multilineChildren = [];
-  children.forEach((child, i) => {
-    // There are a number of situations where we need to ensure we display
-    // whitespace as `{" "}` when outputting this element over multiple lines.
-    if (child === jsxWhitespace) {
-      if (i === 1 && children[i - 1] === "") {
-        if (children.length === 2) {
-          // Solitary whitespace
-          multilineChildren.push(rawJsxWhitespace);
-          return;
-        }
-        // Leading whitespace
-        multilineChildren.push(concat([rawJsxWhitespace, hardline]));
-        return;
-      } else if (i === children.length - 1) {
-        // Trailing whitespace
-        multilineChildren.push(rawJsxWhitespace);
-        return;
-      } else if (children[i - 1] === "" && children[i - 2] === hardline) {
-        // Whitespace after line break
-        multilineChildren.push(rawJsxWhitespace);
-        return;
-      }
-    }
-
-    multilineChildren.push(child);
-
-    if (willBreak(child)) {
-      forcedBreak = true;
-    }
-  });
-
-  // If there is text we use `fill` to fit as much onto each line as possible.
-  // When there is no text (just tags and expressions) we use `group`
-  // to output each on a separate line.
-  const content = containsText
-    ? fill(multilineChildren)
-    : group(concat(multilineChildren), { shouldBreak: true });
-
-  if (isMdxBlock) {
-    return content;
-  }
-
-  const multiLineElem = group(
-    concat([
-      openingLines,
-      indent(concat([hardline, content])),
-      hardline,
-      closingLines,
-    ])
-  );
-
-  if (forcedBreak) {
-    return multiLineElem;
-  }
-
-  return conditionalGroup([
-    group(concat([openingLines, concat(children), closingLines])),
-    multiLineElem,
-  ]);
-}
-
-function maybeWrapJSXElementInParens(path, elem, options) {
-  const parent = path.getParentNode();
-  /* istanbul ignore next */
-  if (!parent) {
-    return elem;
-  }
-
-  const NO_WRAP_PARENTS = {
-    ArrayExpression: true,
-    JSXAttribute: true,
-    JSXElement: true,
-    JSXExpressionContainer: true,
-    JSXFragment: true,
-    ExpressionStatement: true,
-    CallExpression: true,
-    OptionalCallExpression: true,
-    ConditionalExpression: true,
-    JsExpressionRoot: true,
-  };
-  if (NO_WRAP_PARENTS[parent.type]) {
-    return elem;
-  }
-
-  const shouldBreak = path.match(
-    undefined,
-    (node) => node.type === "ArrowFunctionExpression",
-    isCallOrOptionalCallExpression,
-    (node) => node.type === "JSXExpressionContainer"
-  );
-
-  const needsParens = pathNeedsParens(path, options);
-
-  return group(
-    concat([
-      needsParens ? "" : ifBreak("("),
-      indent(concat([softline, elem])),
-      softline,
-      needsParens ? "" : ifBreak(")"),
-    ]),
-    { shouldBreak }
-  );
-}
-
 function shouldInlineLogicalExpression(node) {
   if (node.type !== "LogicalExpression") {
     return false;
@@ -4399,33 +3752,6 @@ function printReturnAndThrowArgument(path, options, print) {
   return concat(parts);
 }
 
-function willPrintOwnComments(path /*, options */) {
-  const node = path.getValue();
-  const parent = path.getParentNode();
-
-  return (
-    ((node &&
-      (isJSXNode(node) ||
-        hasFlowShorthandAnnotationComment(node) ||
-        (parent &&
-          (parent.type === "CallExpression" ||
-            parent.type === "OptionalCallExpression") &&
-          (hasFlowAnnotationComment(node.leadingComments) ||
-            hasFlowAnnotationComment(node.trailingComments))))) ||
-      (parent &&
-        (parent.type === "JSXSpreadAttribute" ||
-          parent.type === "JSXSpreadChild" ||
-          parent.type === "UnionTypeAnnotation" ||
-          parent.type === "TSUnionType" ||
-          ((parent.type === "ClassDeclaration" ||
-            parent.type === "ClassExpression") &&
-            parent.superClass === node)))) &&
-    (!hasIgnoreComment(path) ||
-      parent.type === "UnionTypeAnnotation" ||
-      parent.type === "TSUnionType")
-  );
-}
-
 function canAttachComment(node) {
   return (
     node.type &&
@@ -4509,7 +3835,7 @@ module.exports = {
   insertPragma,
   massageAstNode: clean,
   hasPrettierIgnore,
-  willPrintOwnComments,
+  willPrintOwnComments: handleComments.willPrintOwnComments,
   canAttachComment,
   printComment,
   isBlockComment,

From 87dab58b3ac41d57ae9232187490085d37cb660e Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 19 Nov 2020 18:52:35 +0800
Subject: [PATCH 064/299] Extract printClass and printTypeParameters (#9713)

---
 src/language-js/print/class.js           | 143 ++++++++++++
 src/language-js/print/type-parameters.js | 100 ++++++++
 src/language-js/printer-estree.js        | 280 ++++-------------------
 3 files changed, 288 insertions(+), 235 deletions(-)
 create mode 100644 src/language-js/print/class.js
 create mode 100644 src/language-js/print/type-parameters.js

diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
new file mode 100644
index 000000000..f5b44069e
--- /dev/null
+++ b/src/language-js/print/class.js
@@ -0,0 +1,143 @@
+"use strict";
+
+const { printComments, printDanglingComments } = require("../../main/comments");
+const {
+  builders: { concat, join, line, hardline, softline, group, indent, ifBreak },
+} = require("../../document");
+const { hasTrailingComment, hasTrailingLineComment } = require("../utils");
+const { getTypeParametersGroupId } = require("./type-parameters");
+
+function printClass(path, options, print) {
+  const n = path.getValue();
+  const parts = [];
+
+  if (n.abstract) {
+    parts.push("abstract ");
+  }
+
+  parts.push("class");
+
+  // Keep old behaviour of extends in same line
+  // If there is only on extends and there are not comments
+  const groupMode =
+    (n.id && hasTrailingComment(n.id)) ||
+    (n.superClass &&
+      n.superClass.comments &&
+      n.superClass.comments.length !== 0) ||
+    (n.extends && n.extends.length !== 0) || // DeclareClass
+    (n.mixins && n.mixins.length !== 0) ||
+    (n.implements && n.implements.length !== 0);
+
+  const partsGroup = [];
+  const extendsParts = [];
+
+  if (n.id) {
+    partsGroup.push(" ", path.call(print, "id"));
+  }
+
+  partsGroup.push(path.call(print, "typeParameters"));
+
+  if (n.superClass) {
+    const printed = concat([
+      "extends ",
+      printSuperClass(path, options, print),
+      path.call(print, "superTypeParameters"),
+    ]);
+    const printedWithComments = path.call(
+      (superClass) => printComments(superClass, () => printed, options),
+      "superClass"
+    );
+    if (groupMode) {
+      extendsParts.push(line, group(printedWithComments));
+    } else {
+      extendsParts.push(" ", printedWithComments);
+    }
+  } else {
+    extendsParts.push(printList(path, options, print, "extends"));
+  }
+
+  extendsParts.push(printList(path, options, print, "mixins"));
+  extendsParts.push(printList(path, options, print, "implements"));
+
+  if (groupMode) {
+    const printedExtends = concat(extendsParts);
+    if (shouldIndentOnlyHeritageClauses(n)) {
+      parts.push(
+        group(
+          concat(
+            partsGroup.concat(ifBreak(indent(printedExtends), printedExtends))
+          )
+        )
+      );
+    } else {
+      parts.push(group(indent(concat(partsGroup.concat(printedExtends)))));
+    }
+  } else {
+    parts.push(...partsGroup, ...extendsParts);
+  }
+
+  parts.push(" ", path.call(print, "body"));
+
+  return concat(parts);
+}
+
+function hasMultipleHeritage(node) {
+  return (
+    ["superClass", "extends", "mixins", "implements"].filter(
+      (key) => !!node[key]
+    ).length > 1
+  );
+}
+
+function shouldIndentOnlyHeritageClauses(node) {
+  return (
+    node.typeParameters &&
+    !hasTrailingLineComment(node.typeParameters) &&
+    !hasMultipleHeritage(node)
+  );
+}
+
+function printList(path, options, print, listName) {
+  const n = path.getValue();
+  if (!n[listName] || n[listName].length === 0) {
+    return "";
+  }
+
+  const printedLeadingComments = printDanglingComments(
+    path,
+    options,
+    /* sameIndent */ true,
+    ({ marker }) => marker === listName
+  );
+  return concat([
+    shouldIndentOnlyHeritageClauses(n)
+      ? ifBreak(" ", line, {
+          groupId: getTypeParametersGroupId(n.typeParameters),
+        })
+      : line,
+    printedLeadingComments,
+    printedLeadingComments && hardline,
+    listName,
+    group(
+      indent(
+        concat([line, join(concat([",", line]), path.map(print, listName))])
+      )
+    ),
+  ]);
+}
+
+function printSuperClass(path, options, print) {
+  const printed = path.call(print, "superClass");
+  const parent = path.getParentNode();
+  if (parent && parent.type === "AssignmentExpression") {
+    return concat([
+      ifBreak("("),
+      indent(concat([softline, printed])),
+      softline,
+      ifBreak(")"),
+    ]);
+  }
+  return printed;
+}
+
+module.exports = { printClass };
diff --git a/src/language-js/print/type-parameters.js b/src/language-js/print/type-parameters.js
new file mode 100644
index 000000000..f4c53039f
--- /dev/null
+++ b/src/language-js/print/type-parameters.js
@@ -0,0 +1,100 @@
+"use strict";
+
+const { printDanglingComments } = require("../../main/comments");
+const {
+  builders: { concat, join, line, hardline, softline, group, indent, ifBreak },
+} = require("../../document");
+const {
+  hasDanglingComments,
+  isTestCall,
+  isBlockComment,
+  shouldPrintComma,
+} = require("../utils");
+const { shouldHugType } = require("./type-annotation");
+
+const typeParametersGroupIds = new WeakMap();
+function getTypeParametersGroupId(node) {
+  if (!typeParametersGroupIds.has(node)) {
+    typeParametersGroupIds.set(node, Symbol("typeParameters"));
+  }
+  return typeParametersGroupIds.get(node);
+}
+
+function printTypeParameters(path, options, print, paramsKey) {
+  const n = path.getValue();
+
+  if (!n[paramsKey]) {
+    return "";
+  }
+
+  // for TypeParameterDeclaration typeParameters is a single node
+  if (!Array.isArray(n[paramsKey])) {
+    return path.call(print, paramsKey);
+  }
+
+  const grandparent = path.getNode(2);
+  const isParameterInTestCall = grandparent != null && isTestCall(grandparent);
+
+  const shouldInline =
+    isParameterInTestCall ||
+    n[paramsKey].length === 0 ||
+    (n[paramsKey].length === 1 &&
+      (shouldHugType(n[paramsKey][0]) ||
+        (n[paramsKey][0].type === "GenericTypeAnnotation" &&
+          shouldHugType(n[paramsKey][0].id)) ||
+        (n[paramsKey][0].type === "TSTypeReference" &&
+          shouldHugType(n[paramsKey][0].typeName)) ||
+        n[paramsKey][0].type === "NullableTypeAnnotation"));
+
+  if (shouldInline) {
+    return concat([
+      "<",
+      join(", ", path.map(print, paramsKey)),
+      printDanglingCommentsForInline(path, options),
+      ">",
+    ]);
+  }
+
+  return group(
+    concat([
+      "<",
+      indent(
+        concat([
+          softline,
+          join(concat([",", line]), path.map(print, paramsKey)),
+        ])
+      ),
+      ifBreak(
+        options.parser !== "typescript" &&
+          options.parser !== "babel-ts" &&
+          shouldPrintComma(options, "all")
+          ? ","
+          : ""
+      ),
+      softline,
+      ">",
+    ]),
+    { id: getTypeParametersGroupId(n) }
+  );
+}
+
+function printDanglingCommentsForInline(path, options) {
+  const n = path.getValue();
+  if (!hasDanglingComments(n)) {
+    return "";
+  }
+  const hasOnlyBlockComments = n.comments.every((comment) =>
+    isBlockComment(comment)
+  );
+  const printed = printDanglingComments(
+    path,
+    options,
+    /* sameIndent */ hasOnlyBlockComments
+  );
+  if (hasOnlyBlockComments) {
+    return printed;
+  }
+  return concat([printed, hardline]);
+}
+
+module.exports = { printTypeParameters, getTypeParametersGroupId };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index f254c19b2..cdfde7259 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -129,6 +129,11 @@ const {
   printJsxSpreadAttribute,
   printJsxSpreadChild,
 } = require("./print/jsx");
+const { printClass } = require("./print/class");
+const {
+  printTypeParameters,
+  getTypeParametersGroupId,
+} = require("./print/type-parameters");
 
 const needsQuoteProps = new WeakMap();
 
@@ -1646,7 +1651,7 @@ function printPathNoParens(path, options, print, args) {
       if (n.declare) {
         parts.push("declare ");
       }
-      parts.push(concat(printClass(path, options, print)));
+      parts.push(printClass(path, options, print));
       return concat(parts);
     case "TSInterfaceHeritage":
     case "TSExpressionWithTypeArguments": // Babel AST
@@ -1748,29 +1753,41 @@ function printPathNoParens(path, options, print, args) {
         semi,
       ]);
     case "DeclareFunction":
-      return printFlowDeclaration(path, [
-        "function ",
-        path.call(print, "id"),
-        n.predicate ? " " : "",
-        path.call(print, "predicate"),
-        semi,
-      ]);
+      return printFlowDeclaration(
+        path,
+        concat([
+          "function ",
+          path.call(print, "id"),
+          n.predicate ? " " : "",
+          path.call(print, "predicate"),
+          semi,
+        ])
+      );
     case "DeclareModule":
-      return printFlowDeclaration(path, [
-        "module ",
-        path.call(print, "id"),
-        " ",
-        path.call(print, "body"),
-      ]);
+      return printFlowDeclaration(
+        path,
+        concat([
+          "module ",
+          path.call(print, "id"),
+          " ",
+          path.call(print, "body"),
+        ])
+      );
     case "DeclareModuleExports":
-      return printFlowDeclaration(path, [
-        "module.exports",
-        ": ",
-        path.call(print, "typeAnnotation"),
-        semi,
-      ]);
+      return printFlowDeclaration(
+        path,
+        concat([
+          "module.exports",
+          ": ",
+          path.call(print, "typeAnnotation"),
+          semi,
+        ])
+      );
     case "DeclareVariable":
-      return printFlowDeclaration(path, ["var ", path.call(print, "id"), semi]);
+      return printFlowDeclaration(
+        path,
+        concat(["var ", path.call(print, "id"), semi])
+      );
     case "DeclareOpaqueType":
     case "OpaqueType": {
       parts.push(
@@ -1790,7 +1807,7 @@ function printPathNoParens(path, options, print, args) {
       parts.push(semi);
 
       if (n.type === "DeclareOpaqueType") {
-        return printFlowDeclaration(path, parts);
+        return printFlowDeclaration(path, concat(parts));
       }
 
       return concat(parts);
@@ -3198,19 +3215,18 @@ function printReturnType(path, print, options) {
   return concat(parts);
 }
 
-function printFlowDeclaration(path, parts) {
+function printFlowDeclaration(path, printed) {
   const parentExportDecl = getParentExportDeclaration(path);
 
   if (parentExportDecl) {
     assert.strictEqual(parentExportDecl.type, "DeclareExportDeclaration");
-  } else {
-    // If the parent node has type DeclareExportDeclaration, then it
-    // will be responsible for printing the "declare" token. Otherwise
-    // it needs to be printed with this non-exported declaration node.
-    parts.unshift("declare ");
+    return printed;
   }
 
-  return concat(parts);
+  // If the parent node has type DeclareExportDeclaration, then it
+  // will be responsible for printing the "declare" token. Otherwise
+  // it needs to be printed with this non-exported declaration node.
+  return concat(["declare ", printed]);
 }
 
 function printTypeScriptModifiers(path, options, print) {
@@ -3221,212 +3237,6 @@ function printTypeScriptModifiers(path, options, print) {
   return concat([join(" ", path.map(print, "modifiers")), " "]);
 }
 
-const typeParametersGroupIds = new WeakMap();
-function getTypeParametersGroupId(node) {
-  if (!typeParametersGroupIds.has(node)) {
-    typeParametersGroupIds.set(node, Symbol("typeParameters"));
-  }
-  return typeParametersGroupIds.get(node);
-}
-
-function printTypeParameters(path, options, print, paramsKey) {
-  const n = path.getValue();
-
-  if (!n[paramsKey]) {
-    return "";
-  }
-
-  // for TypeParameterDeclaration typeParameters is a single node
-  if (!Array.isArray(n[paramsKey])) {
-    return path.call(print, paramsKey);
-  }
-
-  const grandparent = path.getNode(2);
-  const isParameterInTestCall = grandparent != null && isTestCall(grandparent);
-
-  const shouldInline =
-    isParameterInTestCall ||
-    n[paramsKey].length === 0 ||
-    (n[paramsKey].length === 1 &&
-      (shouldHugType(n[paramsKey][0]) ||
-        (n[paramsKey][0].type === "GenericTypeAnnotation" &&
-          shouldHugType(n[paramsKey][0].id)) ||
-        (n[paramsKey][0].type === "TSTypeReference" &&
-          shouldHugType(n[paramsKey][0].typeName)) ||
-        n[paramsKey][0].type === "NullableTypeAnnotation"));
-
-  function printDanglingCommentsForInline(n) {
-    if (!hasDanglingComments(n)) {
-      return "";
-    }
-    const hasOnlyBlockComments = n.comments.every((comment) =>
-      isBlockComment(comment)
-    );
-    const printed = comments.printDanglingComments(
-      path,
-      options,
-      /* sameIndent */ hasOnlyBlockComments
-    );
-    if (hasOnlyBlockComments) {
-      return printed;
-    }
-    return concat([printed, hardline]);
-  }
-
-  if (shouldInline) {
-    return concat([
-      "<",
-      join(", ", path.map(print, paramsKey)),
-      printDanglingCommentsForInline(n),
-      ">",
-    ]);
-  }
-
-  return group(
-    concat([
-      "<",
-      indent(
-        concat([
-          softline,
-          join(concat([",", line]), path.map(print, paramsKey)),
-        ])
-      ),
-      ifBreak(
-        options.parser !== "typescript" &&
-          options.parser !== "babel-ts" &&
-          shouldPrintComma(options, "all")
-          ? ","
-          : ""
-      ),
-      softline,
-      ">",
-    ]),
-    { id: getTypeParametersGroupId(n) }
-  );
-}
-
-function printClass(path, options, print) {
-  const n = path.getValue();
-  const parts = [];
-
-  if (n.abstract) {
-    parts.push("abstract ");
-  }
-
-  parts.push("class");
-
-  // Keep old behaviour of extends in same line
-  // If there is only on extends and there are not comments
-  const groupMode =
-    (n.id && hasTrailingComment(n.id)) ||
-    (n.superClass &&
-      n.superClass.comments &&
-      n.superClass.comments.length !== 0) ||
-    (n.extends && n.extends.length !== 0) || // DeclareClass
-    (n.mixins && n.mixins.length !== 0) ||
-    (n.implements && n.implements.length !== 0);
-
-  const partsGroup = [];
-  const extendsParts = [];
-
-  if (n.id) {
-    partsGroup.push(" ", path.call(print, "id"));
-  }
-
-  partsGroup.push(path.call(print, "typeParameters"));
-
-  const hasMultipleHeritage =
-    ["superClass", "extends", "mixins", "implements"].filter((key) => !!n[key])
-      .length > 1;
-  const shouldIndentOnlyHeritageClauses =
-    n.typeParameters &&
-    !hasTrailingLineComment(n.typeParameters) &&
-    !hasMultipleHeritage;
-
-  function printList(listName) {
-    if (n[listName] && n[listName].length !== 0) {
-      const printedLeadingComments = comments.printDanglingComments(
-        path,
-        options,
-        /* sameIndent */ true,
-        ({ marker }) => marker === listName
-      );
-      extendsParts.push(
-        shouldIndentOnlyHeritageClauses
-          ? ifBreak(" ", line, {
-              groupId: getTypeParametersGroupId(n.typeParameters),
-            })
-          : line,
-        printedLeadingComments,
-        printedLeadingComments && hardline,
-        listName,
-        group(
-          indent(
-            concat([line, join(concat([",", line]), path.map(print, listName))])
-          )
-        )
-      );
-    }
-  }
-
-  if (n.superClass) {
-    const printSuperClass = (path) => {
-      const printed = path.call(print, "superClass");
-      const parent = path.getParentNode();
-      if (parent && parent.type === "AssignmentExpression") {
-        return concat([
-          ifBreak("("),
-          indent(concat([softline, printed])),
-          softline,
-          ifBreak(")"),
-        ]);
-      }
-      return printed;
-    };
-    const printed = concat([
-      "extends ",
-      printSuperClass(path),
-      path.call(print, "superTypeParameters"),
-    ]);
-    const printedWithComments = path.call(
-      (superClass) =>
-        comments.printComments(superClass, () => printed, options),
-      "superClass"
-    );
-    if (groupMode) {
-      extendsParts.push(line, group(printedWithComments));
-    } else {
-      extendsParts.push(" ", printedWithComments);
-    }
-  } else {
-    printList("extends");
-  }
-
-  printList("mixins");
-  printList("implements");
-
-  if (groupMode) {
-    const printedExtends = concat(extendsParts);
-    if (shouldIndentOnlyHeritageClauses) {
-      parts.push(
-        group(
-          concat(
-            partsGroup.concat(ifBreak(indent(printedExtends), printedExtends))
-          )
-        )
-      );
-    } else {
-      parts.push(group(indent(concat(partsGroup.concat(printedExtends)))));
-    }
-  } else {
-    parts.push(...partsGroup, ...extendsParts);
-  }
-
-  parts.push(" ", path.call(print, "body"));
-
-  return parts;
-}
-
 function shouldInlineLogicalExpression(node) {
   if (node.type !== "LogicalExpression") {
     return false;

From c03a38e8de078eaa50385842258969a2ceeb2986 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 19 Nov 2020 23:27:58 +0800
Subject: [PATCH 065/299] Extract function related functions (#9721)

---
 src/language-js/print/class.js    |  26 +-
 src/language-js/print/function.js | 354 +++++++++++++++++++++++
 src/language-js/print/misc.js     |  14 +-
 src/language-js/print/property.js | 100 +++++++
 src/language-js/printer-estree.js | 455 +-----------------------------
 5 files changed, 507 insertions(+), 442 deletions(-)
 create mode 100644 src/language-js/print/function.js
 create mode 100644 src/language-js/print/property.js

diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
index f5b44069e..2e48dfeb1 100644
--- a/src/language-js/print/class.js
+++ b/src/language-js/print/class.js
@@ -6,6 +6,8 @@ const {
 } = require("../../document");
 const { hasTrailingComment, hasTrailingLineComment } = require("../utils");
 const { getTypeParametersGroupId } = require("./type-parameters");
+const { printMethod } = require("./function");
+const { printDecorators } = require("./misc");
 
 function printClass(path, options, print) {
   const n = path.getValue();
@@ -140,4 +142,26 @@ function printSuperClass(path, options, print) {
   return printed;
 }
 
-module.exports = { printClass };
+function printClassMethod(path, options, print) {
+  const n = path.getValue();
+  const parts = [];
+
+  if (n.decorators && n.decorators.length !== 0) {
+    parts.push(printDecorators(path, options, print));
+  }
+  if (n.accessibility) {
+    parts.push(n.accessibility + " ");
+  }
+  if (n.static) {
+    parts.push("static ");
+  }
+  if (n.type === "TSAbstractMethodDefinition" || n.abstract) {
+    parts.push("abstract ");
+  }
+
+  parts.push(printMethod(path, options, print));
+
+  return concat(parts);
+}
+
+module.exports = { printClass, printClassMethod };
diff --git a/src/language-js/print/function.js b/src/language-js/print/function.js
new file mode 100644
index 000000000..94f247e3d
--- /dev/null
+++ b/src/language-js/print/function.js
@@ -0,0 +1,354 @@
+"use strict";
+
+/** @type {import("assert")} */
+const assert = require("assert");
+const { printDanglingComments } = require("../../main/comments");
+const {
+  getNextNonSpaceNonCommentCharacterIndex,
+} = require("../../common/util");
+const {
+  builders: { concat, line, softline, group, indent, ifBreak, hardline },
+} = require("../../document");
+const {
+  getFunctionParameters,
+  hasDanglingComments,
+  hasLeadingOwnLineComment,
+  isFlowAnnotationComment,
+  isJSXNode,
+  isTemplateOnItsOwnLine,
+  shouldPrintComma,
+  startsWithNoLookaheadToken,
+  returnArgumentHasLeadingComment,
+  isBinaryish,
+  isLineComment,
+} = require("../utils");
+const { locEnd } = require("../loc");
+const { printFunctionParameters } = require("./function-parameters");
+const { printPropertyKey } = require("./property");
+const { printFunctionTypeParameters } = require("./misc");
+
+function printFunctionDeclaration(path, print, options, expandArg) {
+  const n = path.getValue();
+  const parts = [];
+
+  if (n.async) {
+    parts.push("async ");
+  }
+
+  if (n.generator) {
+    parts.push("function* ");
+  } else {
+    parts.push("function ");
+  }
+
+  if (n.id) {
+    parts.push(path.call(print, "id"));
+  }
+
+  parts.push(
+    printFunctionTypeParameters(path, options, print),
+    group(
+      concat([
+        printFunctionParameters(path, print, options, expandArg),
+        printReturnType(path, print, options),
+      ])
+    ),
+    n.body ? " " : "",
+    path.call(print, "body")
+  );
+
+  return concat(parts);
+}
+
+function printMethod(path, options, print) {
+  const node = path.getNode();
+  const { kind } = node;
+  const value = node.value || node;
+  const parts = [];
+
+  if (!kind || kind === "init" || kind === "method" || kind === "constructor") {
+    if (value.async) {
+      parts.push("async ");
+    }
+  } else {
+    assert.ok(kind === "get" || kind === "set");
+
+    parts.push(kind, " ");
+  }
+
+  // A `getter`/`setter` can't be a generator, but it's recoverable
+  if (value.generator) {
+    parts.push("*");
+  }
+
+  parts.push(
+    printPropertyKey(path, options, print),
+    node.optional || node.key.optional ? "?" : "",
+    node === value
+      ? printMethodInternal(path, options, print)
+      : path.call((path) => printMethodInternal(path, options, print), "value")
+  );
+
+  return concat(parts);
+}
+
+function printMethodInternal(path, options, print) {
+  const parts = [
+    printFunctionTypeParameters(path, options, print),
+    group(
+      concat([
+        printFunctionParameters(path, print, options),
+        printReturnType(path, print, options),
+      ])
+    ),
+  ];
+
+  if (path.getNode().body) {
+    parts.push(" ", path.call(print, "body"));
+  } else {
+    parts.push(options.semi ? ";" : "");
+  }
+
+  return concat(parts);
+}
+
+function printArrowFunctionExpression(path, options, print, args) {
+  const n = path.getValue();
+  const parts = [];
+
+  if (n.async) {
+    parts.push("async ");
+  }
+
+  if (shouldPrintParamsWithoutParens(path, options)) {
+    parts.push(path.call(print, "params", 0));
+  } else {
+    parts.push(
+      group(
+        concat([
+          printFunctionParameters(
+            path,
+            print,
+            options,
+            /* expandLast */ args &&
+              (args.expandLastArg || args.expandFirstArg),
+            /* printTypeParams */ true
+          ),
+          printReturnType(path, print, options),
+        ])
+      )
+    );
+  }
+
+  const dangling = printDanglingComments(
+    path,
+    options,
+    /* sameIndent */ true,
+    (comment) => {
+      const nextCharacter = getNextNonSpaceNonCommentCharacterIndex(
+        options.originalText,
+        comment,
+        locEnd
+      );
+      return (
+        nextCharacter !== false &&
+        options.originalText.slice(nextCharacter, nextCharacter + 2) === "=>"
+      );
+    }
+  );
+  if (dangling) {
+    parts.push(" ", dangling);
+  }
+
+  parts.push(" =>");
+
+  const body = path.call((bodyPath) => print(bodyPath, args), "body");
+
+  // We want to always keep these types of nodes on the same line
+  // as the arrow.
+  if (
+    !hasLeadingOwnLineComment(options.originalText, n.body) &&
+    (n.body.type === "ArrayExpression" ||
+      n.body.type === "ObjectExpression" ||
+      n.body.type === "BlockStatement" ||
+      isJSXNode(n.body) ||
+      isTemplateOnItsOwnLine(n.body, options.originalText) ||
+      n.body.type === "ArrowFunctionExpression" ||
+      n.body.type === "DoExpression")
+  ) {
+    return group(concat([concat(parts), " ", body]));
+  }
+
+  // We handle sequence expressions as the body of arrows specially,
+  // so that the required parentheses end up on their own lines.
+  if (n.body.type === "SequenceExpression") {
+    return group(
+      concat([
+        concat(parts),
+        group(concat([" (", indent(concat([softline, body])), softline, ")"])),
+      ])
+    );
+  }
+
+  // if the arrow function is expanded as last argument, we are adding a
+  // level of indentation and need to add a softline to align the closing )
+  // with the opening (, or if it's inside a JSXExpression (e.g. an attribute)
+  // we should align the expression's closing } with the line with the opening {.
+  const shouldAddSoftLine =
+    ((args && args.expandLastArg) ||
+      path.getParentNode().type === "JSXExpressionContainer") &&
+    !(n.comments && n.comments.length);
+
+  const printTrailingComma =
+    args && args.expandLastArg && shouldPrintComma(options, "all");
+
+  // In order to avoid confusion between
+  // a => a ? a : a
+  // a <= a ? a : a
+  const shouldAddParens =
+    n.body.type === "ConditionalExpression" &&
+    !startsWithNoLookaheadToken(n.body, /* forbidFunctionAndClass */ false);
+
+  return group(
+    concat([
+      concat(parts),
+      group(
+        concat([
+          indent(
+            concat([
+              line,
+              shouldAddParens ? ifBreak("", "(") : "",
+              body,
+              shouldAddParens ? ifBreak("", ")") : "",
+            ])
+          ),
+          shouldAddSoftLine
+            ? concat([ifBreak(printTrailingComma ? "," : ""), softline])
+            : "",
+        ])
+      ),
+    ])
+  );
+}
+
+function canPrintParamsWithoutParens(node) {
+  const parameters = getFunctionParameters(node);
+  return (
+    parameters.length === 1 &&
+    !node.typeParameters &&
+    !hasDanglingComments(node) &&
+    parameters[0].type === "Identifier" &&
+    !parameters[0].typeAnnotation &&
+    !parameters[0].comments &&
+    !parameters[0].optional &&
+    !node.predicate &&
+    !node.returnType
+  );
+}
+
+function shouldPrintParamsWithoutParens(path, options) {
+  if (options.arrowParens === "always") {
+    return false;
+  }
+
+  if (options.arrowParens === "avoid") {
+    const node = path.getValue();
+    return canPrintParamsWithoutParens(node);
+  }
+
+  // Fallback default; should be unreachable
+  /* istanbul ignore next */
+  return false;
+}
+
+function printReturnType(path, print, options) {
+  const n = path.getValue();
+  const returnType = path.call(print, "returnType");
+
+  if (
+    n.returnType &&
+    isFlowAnnotationComment(options.originalText, n.returnType)
+  ) {
+    return concat([" /*: ", returnType, " */"]);
+  }
+
+  const parts = [returnType];
+
+  // prepend colon to TypeScript type annotation
+  if (n.returnType && n.returnType.typeAnnotation) {
+    parts.unshift(": ");
+  }
+
+  if (n.predicate) {
+    // The return type will already add the colon, but otherwise we
+    // need to do it ourselves
+    parts.push(n.returnType ? " " : ": ", path.call(print, "predicate"));
+  }
+
+  return concat(parts);
+}
+
+// `ReturnStatement` and `ThrowStatement`
+function printReturnAndThrowArgument(path, options, print) {
+  const node = path.getValue();
+  const semi = options.semi ? ";" : "";
+  const parts = [];
+
+  if (node.argument) {
+    if (returnArgumentHasLeadingComment(options, node.argument)) {
+      parts.push(
+        concat([
+          " (",
+          indent(concat([hardline, path.call(print, "argument")])),
+          hardline,
+          ")",
+        ])
+      );
+    } else if (
+      isBinaryish(node.argument) ||
+      node.argument.type === "SequenceExpression"
+    ) {
+      parts.push(
+        group(
+          concat([
+            ifBreak(" (", " "),
+            indent(concat([softline, path.call(print, "argument")])),
+            softline,
+            ifBreak(")"),
+          ])
+        )
+      );
+    } else {
+      parts.push(" ", path.call(print, "argument"));
+    }
+  }
+
+  const lastComment =
+    Array.isArray(node.comments) && node.comments[node.comments.length - 1];
+  const isLastCommentLine = lastComment && isLineComment(lastComment);
+
+  if (isLastCommentLine) {
+    parts.push(semi);
+  }
+
+  if (hasDanglingComments(node)) {
+    parts.push(
+      " ",
+      printDanglingComments(path, options, /* sameIndent */ true)
+    );
+  }
+
+  if (!isLastCommentLine) {
+    parts.push(semi);
+  }
+
+  return concat(parts);
+}
+
+module.exports = {
+  printFunctionDeclaration,
+  printArrowFunctionExpression,
+  printMethod,
+  printReturnAndThrowArgument,
+  shouldPrintParamsWithoutParens,
+};
diff --git a/src/language-js/print/misc.js b/src/language-js/print/misc.js
index ac74bbce8..488ff3a14 100644
--- a/src/language-js/print/misc.js
+++ b/src/language-js/print/misc.js
@@ -3,8 +3,9 @@
 const { isNumericLiteral } = require("../utils");
 
 const {
-  builders: { concat, softline, group, indent },
+  builders: { concat, softline, group, indent, join, line, hardline },
 } = require("../../document");
+const { hasNewlineBetweenOrAfterDecorators } = require("../utils");
 
 function printOptionalToken(path) {
   const node = path.getValue();
@@ -58,9 +59,20 @@ function printBindExpressionCallee(path, options, print) {
   return concat(["::", path.call(print, "callee")]);
 }
 
+function printDecorators(path, options, print) {
+  const node = path.getValue();
+  return group(
+    concat([
+      join(line, path.map(print, "decorators")),
+      hasNewlineBetweenOrAfterDecorators(node, options) ? hardline : line,
+    ])
+  );
+}
+
 module.exports = {
   printOptionalToken,
   printFunctionTypeParameters,
   printMemberLookup,
   printBindExpressionCallee,
+  printDecorators,
 };
diff --git a/src/language-js/print/property.js b/src/language-js/print/property.js
new file mode 100644
index 000000000..722880b2e
--- /dev/null
+++ b/src/language-js/print/property.js
@@ -0,0 +1,100 @@
+"use strict";
+
+const { printComments } = require("../../main/comments");
+const { printString, printNumber } = require("../../common/util");
+const {
+  builders: { concat },
+} = require("../../document");
+const {
+  isNumericLiteral,
+  isSimpleNumber,
+  isStringLiteral,
+  isStringPropSafeToUnquote,
+  rawText,
+} = require("../utils");
+
+const needsQuoteProps = new WeakMap();
+
+function printPropertyKey(path, options, print) {
+  const node = path.getNode();
+
+  if (node.computed) {
+    return concat(["[", path.call(print, "key"), "]"]);
+  }
+
+  const parent = path.getParentNode();
+  const { key } = node;
+
+  if (
+    node.type === "ClassPrivateProperty" &&
+    // flow has `Identifier` key, and babel has `PrivateName` key
+    key.type === "Identifier"
+  ) {
+    return concat(["#", path.call(print, "key")]);
+  }
+
+  if (options.quoteProps === "consistent" && !needsQuoteProps.has(parent)) {
+    const objectHasStringProp = (
+      parent.properties ||
+      parent.body ||
+      parent.members
+    ).some(
+      (prop) =>
+        !prop.computed &&
+        prop.key &&
+        isStringLiteral(prop.key) &&
+        !isStringPropSafeToUnquote(prop, options)
+    );
+    needsQuoteProps.set(parent, objectHasStringProp);
+  }
+
+  if (
+    (key.type === "Identifier" ||
+      (isNumericLiteral(key) &&
+        isSimpleNumber(printNumber(rawText(key))) &&
+        // Avoid converting 999999999999999999999 to 1e+21, 0.99999999999999999 to 1 and 1.0 to 1.
+        String(key.value) === printNumber(rawText(key)) &&
+        // Quoting number keys is safe in JS and Flow, but not in TypeScript (as
+        // mentioned in `isStringPropSafeToUnquote`).
+        !(options.parser === "typescript" || options.parser === "babel-ts"))) &&
+    (options.parser === "json" ||
+      (options.quoteProps === "consistent" && needsQuoteProps.get(parent)))
+  ) {
+    // a -> "a"
+    // 1 -> "1"
+    // 1.5 -> "1.5"
+    const prop = printString(
+      JSON.stringify(
+        key.type === "Identifier" ? key.name : key.value.toString()
+      ),
+      options
+    );
+    return path.call(
+      (keyPath) => printComments(keyPath, () => prop, options),
+      "key"
+    );
+  }
+
+  if (
+    isStringPropSafeToUnquote(node, options) &&
+    (options.quoteProps === "as-needed" ||
+      (options.quoteProps === "consistent" && !needsQuoteProps.get(parent)))
+  ) {
+    // 'a' -> a
+    // '1' -> 1
+    // '1.5' -> 1.5
+    return path.call(
+      (keyPath) =>
+        printComments(
+          keyPath,
+          () => (/^\d/.test(key.value) ? printNumber(key.value) : key.value),
+          options
+        ),
+      "key"
+    );
+  }
+
+  return path.call(print, "key");
+}
+
+module.exports = { printPropertyKey };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index cdfde7259..261457b6a 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -14,7 +14,6 @@ const {
   printString,
   printNumber,
   isNextLineEmpty,
-  getNextNonSpaceNonCommentCharacterIndex,
 } = require("../common/util");
 const {
   builders: {
@@ -65,7 +64,6 @@ const {
   isBinaryish,
   isCallOrOptionalCallExpression,
   isExportDeclaration,
-  isFlowAnnotationComment,
   isFunctionNotation,
   isGetterOrSetter,
   isJSXNode,
@@ -74,12 +72,9 @@ const {
   isMemberExpressionChain,
   isMemberish,
   isNgForOf,
-  isNumericLiteral,
   isObjectType,
   isObjectTypePropertyAFunction,
-  isSimpleNumber,
   isStringLiteral,
-  isStringPropSafeToUnquote,
   isTemplateOnItsOwnLine,
   isTestCall,
   isTheOnlyJSXElementInMarkdown,
@@ -88,10 +83,8 @@ const {
   isLineComment,
   needsHardlineAfterDanglingComment,
   rawText,
-  returnArgumentHasLeadingComment,
   shouldPrintComma,
   shouldFlatten,
-  startsWithNoLookaheadToken,
 } = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
@@ -102,6 +95,7 @@ const {
   printFunctionTypeParameters,
   printMemberLookup,
   printBindExpressionCallee,
+  printDecorators,
 } = require("./print/misc");
 const {
   printImportDeclaration,
@@ -129,13 +123,19 @@ const {
   printJsxSpreadAttribute,
   printJsxSpreadChild,
 } = require("./print/jsx");
-const { printClass } = require("./print/class");
+const { printClass, printClassMethod } = require("./print/class");
 const {
   printTypeParameters,
   getTypeParametersGroupId,
 } = require("./print/type-parameters");
-
-const needsQuoteProps = new WeakMap();
+const { printPropertyKey } = require("./print/property");
+const {
+  printFunctionDeclaration,
+  printArrowFunctionExpression,
+  printMethod,
+  printReturnAndThrowArgument,
+  shouldPrintParamsWithoutParens,
+} = require("./print/function");
 
 let uid = 0;
 
@@ -247,16 +247,6 @@ function genericPrint(path, options, printPath, args) {
   return concat(parts);
 }
 
-function printDecorators(path, options, print) {
-  const node = path.getValue();
-  return group(
-    concat([
-      join(line, path.map(print, "decorators")),
-      hasNewlineBetweenOrAfterDecorators(node, options) ? hardline : line,
-    ])
-  );
-}
-
 function printPathNoParens(path, options, print, args) {
   const n = path.getValue();
   const semi = options.semi ? ";" : "";
@@ -668,124 +658,8 @@ function printPathNoParens(path, options, print, args) {
         parts.push(semi);
       }
       return concat(parts);
-    case "ArrowFunctionExpression": {
-      if (n.async) {
-        parts.push("async ");
-      }
-
-      if (shouldPrintParamsWithoutParens(path, options)) {
-        parts.push(path.call(print, "params", 0));
-      } else {
-        parts.push(
-          group(
-            concat([
-              printFunctionParameters(
-                path,
-                print,
-                options,
-                /* expandLast */ args &&
-                  (args.expandLastArg || args.expandFirstArg),
-                /* printTypeParams */ true
-              ),
-              printReturnType(path, print, options),
-            ])
-          )
-        );
-      }
-
-      const dangling = comments.printDanglingComments(
-        path,
-        options,
-        /* sameIndent */ true,
-        (comment) => {
-          const nextCharacter = getNextNonSpaceNonCommentCharacterIndex(
-            options.originalText,
-            comment,
-            locEnd
-          );
-          return (
-            nextCharacter !== false &&
-            options.originalText.slice(nextCharacter, nextCharacter + 2) ===
-              "=>"
-          );
-        }
-      );
-      if (dangling) {
-        parts.push(" ", dangling);
-      }
-
-      parts.push(" =>");
-
-      const body = path.call((bodyPath) => print(bodyPath, args), "body");
-
-      // We want to always keep these types of nodes on the same line
-      // as the arrow.
-      if (
-        !hasLeadingOwnLineComment(options.originalText, n.body) &&
-        (n.body.type === "ArrayExpression" ||
-          n.body.type === "ObjectExpression" ||
-          n.body.type === "BlockStatement" ||
-          isJSXNode(n.body) ||
-          isTemplateOnItsOwnLine(n.body, options.originalText) ||
-          n.body.type === "ArrowFunctionExpression" ||
-          n.body.type === "DoExpression")
-      ) {
-        return group(concat([concat(parts), " ", body]));
-      }
-
-      // We handle sequence expressions as the body of arrows specially,
-      // so that the required parentheses end up on their own lines.
-      if (n.body.type === "SequenceExpression") {
-        return group(
-          concat([
-            concat(parts),
-            group(
-              concat([" (", indent(concat([softline, body])), softline, ")"])
-            ),
-          ])
-        );
-      }
-
-      // if the arrow function is expanded as last argument, we are adding a
-      // level of indentation and need to add a softline to align the closing )
-      // with the opening (, or if it's inside a JSXExpression (e.g. an attribute)
-      // we should align the expression's closing } with the line with the opening {.
-      const shouldAddSoftLine =
-        ((args && args.expandLastArg) ||
-          path.getParentNode().type === "JSXExpressionContainer") &&
-        !(n.comments && n.comments.length);
-
-      const printTrailingComma =
-        args && args.expandLastArg && shouldPrintComma(options, "all");
-
-      // In order to avoid confusion between
-      // a => a ? a : a
-      // a <= a ? a : a
-      const shouldAddParens =
-        n.body.type === "ConditionalExpression" &&
-        !startsWithNoLookaheadToken(n.body, /* forbidFunctionAndClass */ false);
-
-      return group(
-        concat([
-          concat(parts),
-          group(
-            concat([
-              indent(
-                concat([
-                  line,
-                  shouldAddParens ? ifBreak("", "(") : "",
-                  body,
-                  shouldAddParens ? ifBreak("", ")") : "",
-                ])
-              ),
-              shouldAddSoftLine
-                ? concat([ifBreak(printTrailingComma ? "," : ""), softline])
-                : "",
-            ])
-          ),
-        ])
-      );
-    }
+    case "ArrowFunctionExpression":
+      return printArrowFunctionExpression(path, options, print, args);
     case "YieldExpression":
       parts.push("yield");
 
@@ -900,9 +774,10 @@ function printPathNoParens(path, options, print, args) {
 
       return concat(parts);
     }
+    case "ThrowStatement":
     case "ReturnStatement":
       return concat([
-        "return",
+        n.type === "ReturnStatement" ? "return" : "throw",
         printReturnAndThrowArgument(path, options, print),
       ]);
     case "NewExpression":
@@ -1036,22 +911,7 @@ function printPathNoParens(path, options, print, args) {
     case "MethodDefinition":
     case "TSAbstractMethodDefinition":
     case "TSDeclareMethod":
-      if (n.decorators && n.decorators.length !== 0) {
-        parts.push(printDecorators(path, options, print));
-      }
-      if (n.accessibility) {
-        parts.push(n.accessibility + " ");
-      }
-      if (n.static) {
-        parts.push("static ");
-      }
-      if (n.type === "TSAbstractMethodDefinition" || n.abstract) {
-        parts.push("abstract ");
-      }
-
-      parts.push(printMethod(path, options, print));
-
-      return concat(parts);
+      return printClassMethod(path, options, print);
     case "ObjectMethod":
       return printMethod(path, options, print);
     case "Decorator":
@@ -1475,11 +1335,6 @@ function printPathNoParens(path, options, print, args) {
       }
 
       return concat(["catch ", path.call(print, "body")]);
-    case "ThrowStatement":
-      return concat([
-        "throw",
-        printReturnAndThrowArgument(path, options, print),
-      ]);
     // Note: ignoring n.lexical because it has no printing consequences.
     case "SwitchStatement":
       return concat([
@@ -2991,230 +2846,6 @@ function printStatementSequence(path, options, print) {
   return join(hardline, printed);
 }
 
-function printPropertyKey(path, options, print) {
-  const node = path.getNode();
-
-  if (node.computed) {
-    return concat(["[", path.call(print, "key"), "]"]);
-  }
-
-  const parent = path.getParentNode();
-  const { key } = node;
-
-  if (
-    node.type === "ClassPrivateProperty" &&
-    // flow has `Identifier` key, and babel has `PrivateName` key
-    key.type === "Identifier"
-  ) {
-    return concat(["#", path.call(print, "key")]);
-  }
-
-  if (options.quoteProps === "consistent" && !needsQuoteProps.has(parent)) {
-    const objectHasStringProp = (
-      parent.properties ||
-      parent.body ||
-      parent.members
-    ).some(
-      (prop) =>
-        !prop.computed &&
-        prop.key &&
-        isStringLiteral(prop.key) &&
-        !isStringPropSafeToUnquote(prop, options)
-    );
-    needsQuoteProps.set(parent, objectHasStringProp);
-  }
-
-  if (
-    (key.type === "Identifier" ||
-      (isNumericLiteral(key) &&
-        isSimpleNumber(printNumber(rawText(key))) &&
-        // Avoid converting 999999999999999999999 to 1e+21, 0.99999999999999999 to 1 and 1.0 to 1.
-        String(key.value) === printNumber(rawText(key)) &&
-        // Quoting number keys is safe in JS and Flow, but not in TypeScript (as
-        // mentioned in `isStringPropSafeToUnquote`).
-        !(options.parser === "typescript" || options.parser === "babel-ts"))) &&
-    (options.parser === "json" ||
-      (options.quoteProps === "consistent" && needsQuoteProps.get(parent)))
-  ) {
-    // a -> "a"
-    // 1 -> "1"
-    // 1.5 -> "1.5"
-    const prop = printString(
-      JSON.stringify(
-        key.type === "Identifier" ? key.name : key.value.toString()
-      ),
-      options
-    );
-    return path.call(
-      (keyPath) => comments.printComments(keyPath, () => prop, options),
-      "key"
-    );
-  }
-
-  if (
-    isStringPropSafeToUnquote(node, options) &&
-    (options.quoteProps === "as-needed" ||
-      (options.quoteProps === "consistent" && !needsQuoteProps.get(parent)))
-  ) {
-    // 'a' -> a
-    // '1' -> 1
-    // '1.5' -> 1.5
-    return path.call(
-      (keyPath) =>
-        comments.printComments(
-          keyPath,
-          () => (/^\d/.test(key.value) ? printNumber(key.value) : key.value),
-          options
-        ),
-      "key"
-    );
-  }
-
-  return path.call(print, "key");
-}
-
-function printMethod(path, options, print) {
-  const node = path.getNode();
-  const { kind } = node;
-  const value = node.value || node;
-  const parts = [];
-
-  if (!kind || kind === "init" || kind === "method" || kind === "constructor") {
-    if (value.async) {
-      parts.push("async ");
-    }
-  } else {
-    assert.ok(kind === "get" || kind === "set");
-
-    parts.push(kind, " ");
-  }
-
-  // A `getter`/`setter` can't be a generator, but it's recoverable
-  if (value.generator) {
-    parts.push("*");
-  }
-
-  parts.push(
-    printPropertyKey(path, options, print),
-    node.optional || node.key.optional ? "?" : "",
-    node === value
-      ? printMethodInternal(path, options, print)
-      : path.call((path) => printMethodInternal(path, options, print), "value")
-  );
-
-  return concat(parts);
-}
-
-function printMethodInternal(path, options, print) {
-  const parts = [
-    printFunctionTypeParameters(path, options, print),
-    group(
-      concat([
-        printFunctionParameters(path, print, options),
-        printReturnType(path, print, options),
-      ])
-    ),
-  ];
-
-  if (path.getNode().body) {
-    parts.push(" ", path.call(print, "body"));
-  } else {
-    parts.push(options.semi ? ";" : "");
-  }
-
-  return concat(parts);
-}
-
-function shouldPrintParamsWithoutParens(path, options) {
-  if (options.arrowParens === "always") {
-    return false;
-  }
-
-  if (options.arrowParens === "avoid") {
-    const node = path.getValue();
-    return canPrintParamsWithoutParens(node);
-  }
-
-  // Fallback default; should be unreachable
-  /* istanbul ignore next */
-  return false;
-}
-
-function canPrintParamsWithoutParens(node) {
-  const parameters = getFunctionParameters(node);
-  return (
-    parameters.length === 1 &&
-    !node.typeParameters &&
-    !hasDanglingComments(node) &&
-    parameters[0].type === "Identifier" &&
-    !parameters[0].typeAnnotation &&
-    !parameters[0].comments &&
-    !parameters[0].optional &&
-    !node.predicate &&
-    !node.returnType
-  );
-}
-
-function printFunctionDeclaration(path, print, options, expandArg) {
-  const n = path.getValue();
-  const parts = [];
-
-  if (n.async) {
-    parts.push("async ");
-  }
-
-  if (n.generator) {
-    parts.push("function* ");
-  } else {
-    parts.push("function ");
-  }
-
-  if (n.id) {
-    parts.push(path.call(print, "id"));
-  }
-
-  parts.push(
-    printFunctionTypeParameters(path, options, print),
-    group(
-      concat([
-        printFunctionParameters(path, print, options, expandArg),
-        printReturnType(path, print, options),
-      ])
-    ),
-    n.body ? " " : "",
-    path.call(print, "body")
-  );
-
-  return concat(parts);
-}
-
-function printReturnType(path, print, options) {
-  const n = path.getValue();
-  const returnType = path.call(print, "returnType");
-
-  if (
-    n.returnType &&
-    isFlowAnnotationComment(options.originalText, n.returnType)
-  ) {
-    return concat([" /*: ", returnType, " */"]);
-  }
-
-  const parts = [returnType];
-
-  // prepend colon to TypeScript type annotation
-  if (n.returnType && n.returnType.typeAnnotation) {
-    parts.unshift(": ");
-  }
-
-  if (n.predicate) {
-    // The return type will already add the colon, but otherwise we
-    // need to do it ourselves
-    parts.push(n.returnType ? " " : ": ", path.call(print, "predicate"));
-  }
-
-  return concat(parts);
-}
-
 function printFlowDeclaration(path, printed) {
   const parentExportDecl = getParentExportDeclaration(path);
 
@@ -3506,62 +3137,6 @@ function stmtNeedsASIProtection(path, options) {
   );
 }
 
-function printReturnAndThrowArgument(path, options, print) {
-  const node = path.getValue();
-  const semi = options.semi ? ";" : "";
-  const parts = [];
-
-  if (node.argument) {
-    if (returnArgumentHasLeadingComment(options, node.argument)) {
-      parts.push(
-        concat([
-          " (",
-          indent(concat([hardline, path.call(print, "argument")])),
-          hardline,
-          ")",
-        ])
-      );
-    } else if (
-      isBinaryish(node.argument) ||
-      node.argument.type === "SequenceExpression"
-    ) {
-      parts.push(
-        group(
-          concat([
-            ifBreak(" (", " "),
-            indent(concat([softline, path.call(print, "argument")])),
-            softline,
-            ifBreak(")"),
-          ])
-        )
-      );
-    } else {
-      parts.push(" ", path.call(print, "argument"));
-    }
-  }
-
-  const lastComment =
-    Array.isArray(node.comments) && node.comments[node.comments.length - 1];
-  const isLastCommentLine = lastComment && isLineComment(lastComment);
-
-  if (isLastCommentLine) {
-    parts.push(semi);
-  }
-
-  if (hasDanglingComments(node)) {
-    parts.push(
-      " ",
-      comments.printDanglingComments(path, options, /* sameIndent */ true)
-    );
-  }
-
-  if (!isLastCommentLine) {
-    parts.push(semi);
-  }
-
-  return concat(parts);
-}
-
 function canAttachComment(node) {
   return (
     node.type &&

From 05236cf64dca26a308dc4f928c61713e0b5e7dc5 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 19 Nov 2020 23:46:51 +0800
Subject: [PATCH 066/299] Extract printInterface and printCallExpression
 (#9715)

---
 src/language-js/print/call-expression.js | 103 +++++++++++++
 src/language-js/print/interface.js       |  83 +++++++++++
 src/language-js/print/misc.js            |  16 +-
 src/language-js/printer-estree.js        | 180 +----------------------
 4 files changed, 207 insertions(+), 175 deletions(-)
 create mode 100644 src/language-js/print/call-expression.js
 create mode 100644 src/language-js/print/interface.js

diff --git a/src/language-js/print/call-expression.js b/src/language-js/print/call-expression.js
new file mode 100644
index 000000000..11d683863
--- /dev/null
+++ b/src/language-js/print/call-expression.js
@@ -0,0 +1,103 @@
+"use strict";
+
+const {
+  builders: { concat, join, group },
+} = require("../../document");
+const pathNeedsParens = require("../needs-parens");
+const {
+  getCallArguments,
+  hasFlowAnnotationComment,
+  isCallOrOptionalCallExpression,
+  isMemberish,
+  isTemplateOnItsOwnLine,
+  isTestCall,
+  iterateCallArgumentsPath,
+} = require("../utils");
+const printMemberChain = require("./member-chain");
+const printCallArguments = require("./call-arguments");
+const { printOptionalToken, printFunctionTypeParameters } = require("./misc");
+
+function printCallExpression(path, options, print) {
+  const n = path.getValue();
+  const isNew = n.type === "NewExpression";
+  const isDynamicImport = n.type === "ImportExpression";
+
+  const optional = printOptionalToken(path);
+  const args = getCallArguments(n);
+  if (
+    // Dangling comments not handled, all these special cases should has argument #9668
+    args.length > 0 &&
+    // We want to keep CommonJS- and AMD-style require calls, and AMD-style
+    // define calls, as a unit.
+    // e.g. `define(["some/lib", (lib) => {`
+    ((!isDynamicImport &&
+      !isNew &&
+      n.callee.type === "Identifier" &&
+      (n.callee.name === "require" || n.callee.name === "define")) ||
+      // Template literals as single arguments
+      (args.length === 1 &&
+        isTemplateOnItsOwnLine(args[0], options.originalText)) ||
+      // Keep test declarations on a single line
+      // e.g. `it('long name', () => {`
+      (!isNew && isTestCall(n, path.getParentNode())))
+  ) {
+    const printed = [];
+    iterateCallArgumentsPath(path, (argPath) => {
+      printed.push(print(argPath));
+    });
+    return concat([
+      isNew ? "new " : "",
+      path.call(print, "callee"),
+      optional,
+      printFunctionTypeParameters(path, options, print),
+      concat(["(", join(", ", printed), ")"]),
+    ]);
+  }
+
+  // Inline Flow annotation comments following Identifiers in Call nodes need to
+  // stay with the Identifier. For example:
+  //
+  // foo /*:: <SomeGeneric> */(bar);
+  //
+  // Here, we ensure that such comments stay between the Identifier and the Callee.
+  const isIdentifierWithFlowAnnotation =
+    (options.parser === "babel" || options.parser === "babel-flow") &&
+    n.callee &&
+    n.callee.type === "Identifier" &&
+    hasFlowAnnotationComment(n.callee.trailingComments);
+  if (isIdentifierWithFlowAnnotation) {
+    n.callee.trailingComments[0].printed = true;
+  }
+
+  // We detect calls on member lookups and possibly print them in a
+  // special chain format. See `printMemberChain` for more info.
+  if (
+    !isDynamicImport &&
+    !isNew &&
+    isMemberish(n.callee) &&
+    !path.call((path) => pathNeedsParens(path, options), "callee")
+  ) {
+    return printMemberChain(path, options, print);
+  }
+
+  const contents = concat([
+    isNew ? "new " : "",
+    isDynamicImport ? "import" : path.call(print, "callee"),
+    optional,
+    isIdentifierWithFlowAnnotation
+      ? `/*:: ${n.callee.trailingComments[0].value.slice(2).trim()} */`
+      : "",
+    printFunctionTypeParameters(path, options, print),
+    printCallArguments(path, options, print),
+  ]);
+
+  // We group here when the callee is itself a call expression.
+  // See `isLongCurriedCallExpression` for more info.
+  if (isDynamicImport || isCallOrOptionalCallExpression(n.callee)) {
+    return group(contents);
+  }
+
+  return contents;
+}
+
+module.exports = { printCallExpression };
diff --git a/src/language-js/print/interface.js b/src/language-js/print/interface.js
new file mode 100644
index 000000000..17b6164b1
--- /dev/null
+++ b/src/language-js/print/interface.js
@@ -0,0 +1,83 @@
+"use strict";
+
+const {
+  builders: { concat, join, line, group, indent, ifBreak },
+} = require("../../document");
+const {
+  hasTrailingComment,
+  hasTrailingLineComment,
+  identity,
+} = require("../utils");
+const { getTypeParametersGroupId } = require("./type-parameters");
+const { printTypeScriptModifiers } = require("./misc");
+
+function printInterface(path, options, print) {
+  const n = path.getValue();
+  const parts = [];
+  if (n.type === "DeclareInterface" || n.declare) {
+    parts.push("declare ");
+  }
+
+  if (n.type === "TSInterfaceDeclaration") {
+    parts.push(
+      n.abstract ? "abstract " : "",
+      printTypeScriptModifiers(path, options, print)
+    );
+  }
+
+  parts.push("interface");
+
+  const partsGroup = [];
+  const extendsParts = [];
+
+  if (n.type !== "InterfaceTypeAnnotation") {
+    partsGroup.push(
+      " ",
+      path.call(print, "id"),
+      path.call(print, "typeParameters")
+    );
+  }
+
+  const shouldIndentOnlyHeritageClauses =
+    n.typeParameters && !hasTrailingLineComment(n.typeParameters);
+
+  if (n.extends && n.extends.length !== 0) {
+    extendsParts.push(
+      shouldIndentOnlyHeritageClauses
+        ? ifBreak(" ", line, {
+            groupId: getTypeParametersGroupId(n.typeParameters),
+          })
+        : line,
+      "extends ",
+      (n.extends.length === 1 ? identity : indent)(
+        join(concat([",", line]), path.map(print, "extends"))
+      )
+    );
+  }
+
+  if (
+    (n.id && hasTrailingComment(n.id)) ||
+    (n.extends && n.extends.length !== 0)
+  ) {
+    const printedExtends = concat(extendsParts);
+    if (shouldIndentOnlyHeritageClauses) {
+      parts.push(
+        group(
+          concat(
+            partsGroup.concat(ifBreak(indent(printedExtends), printedExtends))
+          )
+        )
+      );
+    } else {
+      parts.push(group(indent(concat(partsGroup.concat(printedExtends)))));
+    }
+  } else {
+    parts.push(...partsGroup, ...extendsParts);
+  }
+
+  parts.push(" ", path.call(print, "body"));
+
+  return group(concat(parts));
+}
+
+module.exports = { printInterface };
diff --git a/src/language-js/print/misc.js b/src/language-js/print/misc.js
index 488ff3a14..11cc31df7 100644
--- a/src/language-js/print/misc.js
+++ b/src/language-js/print/misc.js
@@ -1,11 +1,12 @@
 "use strict";
 
-const { isNumericLiteral } = require("../utils");
-
 const {
   builders: { concat, softline, group, indent, join, line, hardline },
 } = require("../../document");
-const { hasNewlineBetweenOrAfterDecorators } = require("../utils");
+const {
+  hasNewlineBetweenOrAfterDecorators,
+  isNumericLiteral,
+} = require("../utils");
 
 function printOptionalToken(path) {
   const node = path.getValue();
@@ -59,6 +60,14 @@ function printBindExpressionCallee(path, options, print) {
   return concat(["::", path.call(print, "callee")]);
 }
 
+function printTypeScriptModifiers(path, options, print) {
+  const n = path.getValue();
+  if (!n.modifiers || !n.modifiers.length) {
+    return "";
+  }
+  return concat([join(" ", path.map(print, "modifiers")), " "]);
+}
+
 function printDecorators(path, options, print) {
   const node = path.getValue();
   return group(
@@ -74,5 +83,6 @@ module.exports = {
   printFunctionTypeParameters,
   printMemberLookup,
   printBindExpressionCallee,
+  printTypeScriptModifiers,
   printDecorators,
 };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 261457b6a..69f214f35 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -46,12 +46,10 @@ const {
   classPropMayCauseASIProblems,
   getFunctionParameters,
   getCallArguments,
-  iterateCallArgumentsPath,
   getLeftSidePathName,
   getParentExportDeclaration,
   getTypeScriptMappedTypeModifier,
   hasDanglingComments,
-  hasFlowAnnotationComment,
   hasFlowShorthandAnnotationComment,
   hasLeadingOwnLineComment,
   hasNakedLeftSide,
@@ -60,9 +58,7 @@ const {
   hasPrettierIgnore,
   hasTrailingComment,
   hasTrailingLineComment,
-  identity,
   isBinaryish,
-  isCallOrOptionalCallExpression,
   isExportDeclaration,
   isFunctionNotation,
   isGetterOrSetter,
@@ -70,13 +66,10 @@ const {
   isLastStatement,
   isLiteral,
   isMemberExpressionChain,
-  isMemberish,
   isNgForOf,
   isObjectType,
   isObjectTypePropertyAFunction,
   isStringLiteral,
-  isTemplateOnItsOwnLine,
-  isTestCall,
   isTheOnlyJSXElementInMarkdown,
   isTSXFile,
   isBlockComment,
@@ -88,13 +81,11 @@ const {
 } = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
-const printMemberChain = require("./print/member-chain");
-const printCallArguments = require("./print/call-arguments");
 const {
   printOptionalToken,
-  printFunctionTypeParameters,
   printMemberLookup,
   printBindExpressionCallee,
+  printTypeScriptModifiers,
   printDecorators,
 } = require("./print/misc");
 const {
@@ -124,10 +115,7 @@ const {
   printJsxSpreadChild,
 } = require("./print/jsx");
 const { printClass, printClassMethod } = require("./print/class");
-const {
-  printTypeParameters,
-  getTypeParametersGroupId,
-} = require("./print/type-parameters");
+const { printTypeParameters } = require("./print/type-parameters");
 const { printPropertyKey } = require("./print/property");
 const {
   printFunctionDeclaration,
@@ -136,6 +124,8 @@ const {
   printReturnAndThrowArgument,
   shouldPrintParamsWithoutParens,
 } = require("./print/function");
+const { printCallExpression } = require("./print/call-expression");
+const { printInterface } = require("./print/interface");
 
 let uid = 0;
 
@@ -783,88 +773,8 @@ function printPathNoParens(path, options, print, args) {
     case "NewExpression":
     case "ImportExpression":
     case "OptionalCallExpression":
-    case "CallExpression": {
-      const isNew = n.type === "NewExpression";
-      const isDynamicImport = n.type === "ImportExpression";
-
-      const optional = printOptionalToken(path);
-      const args = getCallArguments(n);
-      if (
-        // Dangling comments not handled, all these special cases should has argument #9668
-        args.length > 0 &&
-        // We want to keep CommonJS- and AMD-style require calls, and AMD-style
-        // define calls, as a unit.
-        // e.g. `define(["some/lib", (lib) => {`
-        ((!isDynamicImport &&
-          !isNew &&
-          n.callee.type === "Identifier" &&
-          (n.callee.name === "require" || n.callee.name === "define")) ||
-          // Template literals as single arguments
-          (args.length === 1 &&
-            isTemplateOnItsOwnLine(args[0], options.originalText)) ||
-          // Keep test declarations on a single line
-          // e.g. `it('long name', () => {`
-          (!isNew && isTestCall(n, path.getParentNode())))
-      ) {
-        const printed = [];
-        iterateCallArgumentsPath(path, (argPath) => {
-          printed.push(print(argPath));
-        });
-        return concat([
-          isNew ? "new " : "",
-          path.call(print, "callee"),
-          optional,
-          printFunctionTypeParameters(path, options, print),
-          concat(["(", join(", ", printed), ")"]),
-        ]);
-      }
-
-      // Inline Flow annotation comments following Identifiers in Call nodes need to
-      // stay with the Identifier. For example:
-      //
-      // foo /*:: <SomeGeneric> */(bar);
-      //
-      // Here, we ensure that such comments stay between the Identifier and the Callee.
-      const isIdentifierWithFlowAnnotation =
-        (options.parser === "babel" || options.parser === "babel-flow") &&
-        n.callee &&
-        n.callee.type === "Identifier" &&
-        hasFlowAnnotationComment(n.callee.trailingComments);
-      if (isIdentifierWithFlowAnnotation) {
-        n.callee.trailingComments[0].printed = true;
-      }
-
-      // We detect calls on member lookups and possibly print them in a
-      // special chain format. See `printMemberChain` for more info.
-      if (
-        !isDynamicImport &&
-        !isNew &&
-        isMemberish(n.callee) &&
-        !path.call((path) => pathNeedsParens(path, options), "callee")
-      ) {
-        return printMemberChain(path, options, print);
-      }
-
-      const contents = concat([
-        isNew ? "new " : "",
-        isDynamicImport ? "import" : path.call(print, "callee"),
-        optional,
-        isIdentifierWithFlowAnnotation
-          ? `/*:: ${n.callee.trailingComments[0].value.slice(2).trim()} */`
-          : "",
-        printFunctionTypeParameters(path, options, print),
-        printCallArguments(path, options, print),
-      ]);
-
-      // We group here when the callee is itself a call expression.
-      // See `isLongCurriedCallExpression` for more info.
-      if (isDynamicImport || isCallOrOptionalCallExpression(n.callee)) {
-        return group(contents);
-      }
-
-      return contents;
-    }
-
+    case "CallExpression":
+      return printCallExpression(path, options, print);
     case "ObjectTypeInternalSlot":
       return concat([
         n.static ? "static " : "",
@@ -1842,74 +1752,8 @@ function printPathNoParens(path, options, print, args) {
     case "DeclareInterface":
     case "InterfaceDeclaration":
     case "InterfaceTypeAnnotation":
-    case "TSInterfaceDeclaration": {
-      if (n.type === "DeclareInterface" || n.declare) {
-        parts.push("declare ");
-      }
-
-      if (n.type === "TSInterfaceDeclaration") {
-        parts.push(
-          n.abstract ? "abstract " : "",
-          printTypeScriptModifiers(path, options, print)
-        );
-      }
-
-      parts.push("interface");
-
-      const partsGroup = [];
-      const extendsParts = [];
-
-      if (n.type !== "InterfaceTypeAnnotation") {
-        partsGroup.push(
-          " ",
-          path.call(print, "id"),
-          path.call(print, "typeParameters")
-        );
-      }
-
-      const shouldIndentOnlyHeritageClauses =
-        n.typeParameters && !hasTrailingLineComment(n.typeParameters);
-
-      if (n.extends && n.extends.length !== 0) {
-        extendsParts.push(
-          shouldIndentOnlyHeritageClauses
-            ? ifBreak(" ", line, {
-                groupId: getTypeParametersGroupId(n.typeParameters),
-              })
-            : line,
-          "extends ",
-          (n.extends.length === 1 ? identity : indent)(
-            join(concat([",", line]), path.map(print, "extends"))
-          )
-        );
-      }
-
-      if (
-        (n.id && hasTrailingComment(n.id)) ||
-        (n.extends && n.extends.length !== 0)
-      ) {
-        const printedExtends = concat(extendsParts);
-        if (shouldIndentOnlyHeritageClauses) {
-          parts.push(
-            group(
-              concat(
-                partsGroup.concat(
-                  ifBreak(indent(printedExtends), printedExtends)
-                )
-              )
-            )
-          );
-        } else {
-          parts.push(group(indent(concat(partsGroup.concat(printedExtends)))));
-        }
-      } else {
-        parts.push(...partsGroup, ...extendsParts);
-      }
-
-      parts.push(" ", path.call(print, "body"));
-
-      return group(concat(parts));
-    }
+    case "TSInterfaceDeclaration":
+      return printInterface(path, options, print);
     case "ClassImplements":
     case "InterfaceExtends":
       return concat([
@@ -2860,14 +2704,6 @@ function printFlowDeclaration(path, printed) {
   return concat(["declare ", printed]);
 }
 
-function printTypeScriptModifiers(path, options, print) {
-  const n = path.getValue();
-  if (!n.modifiers || !n.modifiers.length) {
-    return "";
-  }
-  return concat([join(" ", path.map(print, "modifiers")), " "]);
-}
-
 function shouldInlineLogicalExpression(node) {
   if (node.type !== "LogicalExpression") {
     return false;

From 92d31d1b30ceeda381164dc1ae26b5bc0eefe8a5 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 20 Nov 2020 00:36:48 +0800
Subject: [PATCH 067/299] Extract `printAssignment`,
 `printBinaryishExpression`, and `printComment` (#9722)

---
 src/language-js/print/assignment.js |  95 ++++++
 src/language-js/print/binaryish.js  | 308 +++++++++++++++++++
 src/language-js/print/comment.js    |  74 +++++
 src/language-js/print/misc.js       |  18 ++
 src/language-js/printer-estree.js   | 462 +---------------------------
 5 files changed, 510 insertions(+), 447 deletions(-)
 create mode 100644 src/language-js/print/assignment.js
 create mode 100644 src/language-js/print/binaryish.js
 create mode 100644 src/language-js/print/comment.js

diff --git a/src/language-js/print/assignment.js b/src/language-js/print/assignment.js
new file mode 100644
index 000000000..5088c610a
--- /dev/null
+++ b/src/language-js/print/assignment.js
@@ -0,0 +1,95 @@
+"use strict";
+
+const {
+  builders: { concat, line, group, indent },
+} = require("../../document");
+const {
+  hasLeadingOwnLineComment,
+  isBinaryish,
+  isMemberExpressionChain,
+  isStringLiteral,
+} = require("../utils");
+const { shouldInlineLogicalExpression } = require("./binaryish");
+
+function printAssignment(
+  leftNode,
+  printedLeft,
+  operator,
+  rightNode,
+  printedRight,
+  options
+) {
+  if (!rightNode) {
+    return printedLeft;
+  }
+
+  const printed = printAssignmentRight(
+    leftNode,
+    rightNode,
+    printedRight,
+    options
+  );
+
+  return group(concat([printedLeft, operator, printed]));
+}
+
+function printAssignmentExpression(path, options, print) {
+  const n = path.getValue();
+  return printAssignment(
+    n.left,
+    path.call(print, "left"),
+    concat([" ", n.operator]),
+    n.right,
+    path.call(print, "right"),
+    options
+  );
+}
+
+function printVariableDeclarator(path, options, print) {
+  const n = path.getValue();
+  return printAssignment(
+    n.id,
+    path.call(print, "id"),
+    " =",
+    n.init,
+    n.init && path.call(print, "init"),
+    options
+  );
+}
+
+function printAssignmentRight(leftNode, rightNode, printedRight, options) {
+  if (hasLeadingOwnLineComment(options.originalText, rightNode)) {
+    return indent(concat([line, printedRight]));
+  }
+
+  const canBreak =
+    (isBinaryish(rightNode) && !shouldInlineLogicalExpression(rightNode)) ||
+    (rightNode.type === "ConditionalExpression" &&
+      isBinaryish(rightNode.test) &&
+      !shouldInlineLogicalExpression(rightNode.test)) ||
+    rightNode.type === "StringLiteralTypeAnnotation" ||
+    (rightNode.type === "ClassExpression" &&
+      rightNode.decorators &&
+      rightNode.decorators.length) ||
+    ((leftNode.type === "Identifier" ||
+      isStringLiteral(leftNode) ||
+      leftNode.type === "MemberExpression") &&
+      (isStringLiteral(rightNode) || isMemberExpressionChain(rightNode)) &&
+      // do not put values on a separate line from the key in json
+      options.parser !== "json" &&
+      options.parser !== "json5") ||
+    rightNode.type === "SequenceExpression";
+
+  if (canBreak) {
+    return group(indent(concat([line, printedRight])));
+  }
+
+  return concat([" ", printedRight]);
+}
+
+module.exports = {
+  printVariableDeclarator,
+  printAssignmentExpression,
+  printAssignment,
+  printAssignmentRight,
+};
diff --git a/src/language-js/print/binaryish.js b/src/language-js/print/binaryish.js
new file mode 100644
index 000000000..f6edc26a5
--- /dev/null
+++ b/src/language-js/print/binaryish.js
@@ -0,0 +1,308 @@
+"use strict";
+
+const { printComments } = require("../../main/comments");
+const { getLast } = require("../../common/util");
+const {
+  builders: { concat, join, line, softline, group, indent, align, ifBreak },
+  utils: { normalizeParts },
+} = require("../../document");
+const {
+  hasLeadingOwnLineComment,
+  hasTrailingLineComment,
+  isBinaryish,
+  isJSXNode,
+  shouldFlatten,
+} = require("../utils");
+
+/** @typedef {import("../../document").Doc} Doc */
+
+let uid = 0;
+function printBinaryishExpression(path, options, print) {
+  const n = path.getValue();
+  const parent = path.getParentNode();
+  const parentParent = path.getParentNode(1);
+  const isInsideParenthesis =
+    n !== parent.body &&
+    (parent.type === "IfStatement" ||
+      parent.type === "WhileStatement" ||
+      parent.type === "SwitchStatement" ||
+      parent.type === "DoWhileStatement");
+
+  const parts = printBinaryishExpressions(
+    path,
+    print,
+    options,
+    /* isNested */ false,
+    isInsideParenthesis
+  );
+
+  //   if (
+  //     this.hasPlugin("dynamicImports") && this.lookahead().type === tt.parenLeft
+  //   ) {
+  //
+  // looks super weird, we want to break the children if the parent breaks
+  //
+  //   if (
+  //     this.hasPlugin("dynamicImports") &&
+  //     this.lookahead().type === tt.parenLeft
+  //   ) {
+  if (isInsideParenthesis) {
+    return concat(parts);
+  }
+
+  // Break between the parens in
+  // unaries or in a member or specific call expression, i.e.
+  //
+  //   (
+  //     a &&
+  //     b &&
+  //     c
+  //   ).call()
+  if (
+    ((parent.type === "CallExpression" ||
+      parent.type === "OptionalCallExpression") &&
+      parent.callee === n) ||
+    parent.type === "UnaryExpression" ||
+    ((parent.type === "MemberExpression" ||
+      parent.type === "OptionalMemberExpression") &&
+      !parent.computed)
+  ) {
+    return group(concat([indent(concat([softline, concat(parts)])), softline]));
+  }
+
+  // Avoid indenting sub-expressions in some cases where the first sub-expression is already
+  // indented accordingly. We should indent sub-expressions where the first case isn't indented.
+  const shouldNotIndent =
+    parent.type === "ReturnStatement" ||
+    parent.type === "ThrowStatement" ||
+    (parent.type === "JSXExpressionContainer" &&
+      parentParent.type === "JSXAttribute") ||
+    (n.operator !== "|" && parent.type === "JsExpressionRoot") ||
+    (n.type !== "NGPipeExpression" &&
+      ((parent.type === "NGRoot" && options.parser === "__ng_binding") ||
+        (parent.type === "NGMicrosyntaxExpression" &&
+          parentParent.type === "NGMicrosyntax" &&
+          parentParent.body.length === 1))) ||
+    (n === parent.body && parent.type === "ArrowFunctionExpression") ||
+    (n !== parent.body && parent.type === "ForStatement") ||
+    (parent.type === "ConditionalExpression" &&
+      parentParent.type !== "ReturnStatement" &&
+      parentParent.type !== "ThrowStatement" &&
+      parentParent.type !== "CallExpression" &&
+      parentParent.type !== "OptionalCallExpression") ||
+    parent.type === "TemplateLiteral";
+
+  const shouldIndentIfInlining =
+    parent.type === "AssignmentExpression" ||
+    parent.type === "VariableDeclarator" ||
+    parent.type === "ClassProperty" ||
+    parent.type === "FieldDefinition" ||
+    parent.type === "TSAbstractClassProperty" ||
+    parent.type === "ClassPrivateProperty" ||
+    parent.type === "ObjectProperty" ||
+    parent.type === "Property";
+
+  const samePrecedenceSubExpression =
+    isBinaryish(n.left) && shouldFlatten(n.operator, n.left.operator);
+
+  if (
+    shouldNotIndent ||
+    (shouldInlineLogicalExpression(n) && !samePrecedenceSubExpression) ||
+    (!shouldInlineLogicalExpression(n) && shouldIndentIfInlining)
+  ) {
+    return group(concat(parts));
+  }
+
+  if (parts.length === 0) {
+    return "";
+  }
+
+  // If the right part is a JSX node, we include it in a separate group to
+  // prevent it breaking the whole chain, so we can print the expression like:
+  //
+  //   foo && bar && (
+  //     <Foo>
+  //       <Bar />
+  //     </Foo>
+  //   )
+
+  const hasJSX = isJSXNode(n.right);
+
+  const firstGroupIndex = parts.findIndex(
+    (part) => typeof part !== "string" && part.type === "group"
+  );
+
+  // Separate the leftmost expression, possibly with its leading comments.
+  const headParts = parts.slice(
+    0,
+    firstGroupIndex === -1 ? 1 : firstGroupIndex + 1
+  );
+
+  const rest = concat(parts.slice(headParts.length, hasJSX ? -1 : undefined));
+
+  const groupId = Symbol("logicalChain-" + ++uid);
+
+  const chain = group(
+    concat([
+      // Don't include the initial expression in the indentation
+      // level. The first item is guaranteed to be the first
+      // left-most expression.
+      ...headParts,
+      indent(rest),
+    ]),
+    { id: groupId }
+  );
+
+  if (!hasJSX) {
+    return chain;
+  }
+
+  const jsxPart = getLast(parts);
+  return group(concat([chain, ifBreak(indent(jsxPart), jsxPart, { groupId })]));
+}
+
+// For binary expressions to be consistent, we need to group
+// subsequent operators with the same precedence level under a single
+// group. Otherwise they will be nested such that some of them break
+// onto new lines but not all. Operators with the same precedence
+// level should either all break or not. Because we group them by
+// precedence level and the AST is structured based on precedence
+// level, things are naturally broken up correctly, i.e. `&&` is
+// broken before `+`.
+function printBinaryishExpressions(
+  path,
+  print,
+  options,
+  isNested,
+  isInsideParenthesis
+) {
+  /** @type{Doc[]} */
+  let parts = [];
+
+  const node = path.getValue();
+
+  // We treat BinaryExpression and LogicalExpression nodes the same.
+  if (isBinaryish(node)) {
+    // Put all operators with the same precedence level in the same
+    // group. The reason we only need to do this with the `left`
+    // expression is because given an expression like `1 + 2 - 3`, it
+    // is always parsed like `((1 + 2) - 3)`, meaning the `left` side
+    // is where the rest of the expression will exist. Binary
+    // expressions on the right side mean they have a difference
+    // precedence level and should be treated as a separate group, so
+    // print them normally. (This doesn't hold for the `**` operator,
+    // which is unique in that it is right-associative.)
+    if (shouldFlatten(node.operator, node.left.operator)) {
+      // Flatten them out by recursively calling this function.
+      parts = parts.concat(
+        path.call(
+          (left) =>
+            printBinaryishExpressions(
+              left,
+              print,
+              options,
+              /* isNested */ true,
+              isInsideParenthesis
+            ),
+          "left"
+        )
+      );
+    } else {
+      parts.push(group(path.call(print, "left")));
+    }
+
+    const shouldInline = shouldInlineLogicalExpression(node);
+    const lineBeforeOperator =
+      (node.operator === "|>" ||
+        node.type === "NGPipeExpression" ||
+        (node.operator === "|" && options.parser === "__vue_expression")) &&
+      !hasLeadingOwnLineComment(options.originalText, node.right);
+
+    const operator = node.type === "NGPipeExpression" ? "|" : node.operator;
+    const rightSuffix =
+      node.type === "NGPipeExpression" && node.arguments.length !== 0
+        ? group(
+            indent(
+              concat([
+                softline,
+                ": ",
+                join(
+                  concat([softline, ":", ifBreak(" ")]),
+                  path
+                    .map(print, "arguments")
+                    .map((arg) => align(2, group(arg)))
+                ),
+              ])
+            )
+          )
+        : "";
+
+    const right = shouldInline
+      ? concat([operator, " ", path.call(print, "right"), rightSuffix])
+      : concat([
+          lineBeforeOperator ? line : "",
+          operator,
+          lineBeforeOperator ? " " : line,
+          path.call(print, "right"),
+          rightSuffix,
+        ]);
+
+    // If there's only a single binary expression, we want to create a group
+    // in order to avoid having a small right part like -1 be on its own line.
+    const parent = path.getParentNode();
+    const shouldBreak = hasTrailingLineComment(node.left);
+    const shouldGroup =
+      shouldBreak ||
+      (!(isInsideParenthesis && node.type === "LogicalExpression") &&
+        parent.type !== node.type &&
+        node.left.type !== node.type &&
+        node.right.type !== node.type);
+
+    parts.push(
+      lineBeforeOperator ? "" : " ",
+      shouldGroup ? group(right, { shouldBreak }) : right
+    );
+
+    // The root comments are already printed, but we need to manually print
+    // the other ones since we don't call the normal print on BinaryExpression,
+    // only for the left and right parts
+    if (isNested && node.comments) {
+      parts = normalizeParts(
+        printComments(path, () => concat(parts), options).parts
+      );
+    }
+  } else {
+    // Our stopping case. Simply print the node normally.
+    parts.push(group(path.call(print)));
+  }
+
+  return parts;
+}
+
+function shouldInlineLogicalExpression(node) {
+  if (node.type !== "LogicalExpression") {
+    return false;
+  }
+
+  if (
+    node.right.type === "ObjectExpression" &&
+    node.right.properties.length !== 0
+  ) {
+    return true;
+  }
+
+  if (
+    node.right.type === "ArrayExpression" &&
+    node.right.elements.length !== 0
+  ) {
+    return true;
+  }
+
+  if (isJSXNode(node.right)) {
+    return true;
+  }
+
+  return false;
+}
+
+module.exports = { printBinaryishExpression, shouldInlineLogicalExpression };
diff --git a/src/language-js/print/comment.js b/src/language-js/print/comment.js
new file mode 100644
index 000000000..b41b1236c
--- /dev/null
+++ b/src/language-js/print/comment.js
@@ -0,0 +1,74 @@
+"use strict";
+
+const { hasNewline } = require("../../common/util");
+const {
+  builders: { concat, join, hardline },
+} = require("../../document");
+
+const { isLineComment, isBlockComment } = require("../utils");
+const { locStart, locEnd } = require("../loc");
+
+function printComment(commentPath, options) {
+  const comment = commentPath.getValue();
+
+  if (isLineComment(comment)) {
+    // Supports `//`, `#!`, `<!--`, and `-->`
+    return options.originalText
+      .slice(locStart(comment), locEnd(comment))
+      .trimEnd();
+  }
+
+  if (isBlockComment(comment)) {
+    if (isIndentableBlockComment(comment)) {
+      const printed = printIndentableBlockComment(comment);
+      // We need to prevent an edge case of a previous trailing comment
+      // printed as a `lineSuffix` which causes the comments to be
+      // interleaved. See https://github.com/prettier/prettier/issues/4412
+      if (
+        comment.trailing &&
+        !hasNewline(options.originalText, locStart(comment), {
+          backwards: true,
+        })
+      ) {
+        return concat([hardline, printed]);
+      }
+      return printed;
+    }
+
+    const commentEnd = locEnd(comment);
+    const isInsideFlowComment =
+      options.originalText.slice(commentEnd - 3, commentEnd) === "*-/";
+    return "/*" + comment.value + (isInsideFlowComment ? "*-/" : "*/");
+  }
+
+  /* istanbul ignore next */
+  throw new Error("Not a comment: " + JSON.stringify(comment));
+}
+
+function isIndentableBlockComment(comment) {
+  // If the comment has multiple lines and every line starts with a star
+  // we can fix the indentation of each line. The stars in the `/*` and
+  // `*/` delimiters are not included in the comment value, so add them
+  // back first.
+  const lines = `*${comment.value}*`.split("\n");
+  return lines.length > 1 && lines.every((line) => line.trim()[0] === "*");
+}
+
+function printIndentableBlockComment(comment) {
+  const lines = comment.value.split("\n");
+
+  return concat([
+    "/*",
+    join(
+      hardline,
+      lines.map((line, index) =>
+        index === 0
+          ? line.trimEnd()
+          : " " + (index < lines.length - 1 ? line.trim() : line.trimStart())
+      )
+    ),
+    "*/",
+  ]);
+}
+
+module.exports = { printComment };
diff --git a/src/language-js/print/misc.js b/src/language-js/print/misc.js
index 11cc31df7..2a8ccbdfe 100644
--- a/src/language-js/print/misc.js
+++ b/src/language-js/print/misc.js
@@ -1,11 +1,14 @@
 "use strict";
 
+/** @type {import("assert")} */
+const assert = require("assert");
 const {
   builders: { concat, softline, group, indent, join, line, hardline },
 } = require("../../document");
 const {
   hasNewlineBetweenOrAfterDecorators,
   isNumericLiteral,
+  getParentExportDeclaration,
 } = require("../utils");
 
 function printOptionalToken(path) {
@@ -78,6 +81,20 @@ function printDecorators(path, options, print) {
   );
 }
 
+function printFlowDeclaration(path, printed) {
+  const parentExportDecl = getParentExportDeclaration(path);
+
+  if (parentExportDecl) {
+    assert.strictEqual(parentExportDecl.type, "DeclareExportDeclaration");
+    return printed;
+  }
+
+  // If the parent node has type DeclareExportDeclaration, then it
+  // will be responsible for printing the "declare" token. Otherwise
+  // it needs to be printed with this non-exported declaration node.
+  return concat(["declare ", printed]);
+}
+
 module.exports = {
   printOptionalToken,
   printFunctionTypeParameters,
@@ -85,4 +102,5 @@ module.exports = {
   printBindExpressionCallee,
   printTypeScriptModifiers,
   printDecorators,
+  printFlowDeclaration,
 };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 69f214f35..c5e7825f7 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -29,7 +29,7 @@ const {
     conditionalGroup,
     ifBreak,
   },
-  utils: { isEmpty, normalizeParts },
+  utils: { isEmpty },
 } = require("../document");
 const embed = require("./embed");
 const clean = require("./clean");
@@ -57,27 +57,21 @@ const {
   hasNgSideEffect,
   hasPrettierIgnore,
   hasTrailingComment,
-  hasTrailingLineComment,
-  isBinaryish,
   isExportDeclaration,
   isFunctionNotation,
   isGetterOrSetter,
   isJSXNode,
   isLastStatement,
   isLiteral,
-  isMemberExpressionChain,
   isNgForOf,
   isObjectType,
   isObjectTypePropertyAFunction,
-  isStringLiteral,
   isTheOnlyJSXElementInMarkdown,
   isTSXFile,
   isBlockComment,
-  isLineComment,
   needsHardlineAfterDanglingComment,
   rawText,
   shouldPrintComma,
-  shouldFlatten,
 } = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
@@ -87,6 +81,7 @@ const {
   printBindExpressionCallee,
   printTypeScriptModifiers,
   printDecorators,
+  printFlowDeclaration,
 } = require("./print/misc");
 const {
   printImportDeclaration,
@@ -126,8 +121,14 @@ const {
 } = require("./print/function");
 const { printCallExpression } = require("./print/call-expression");
 const { printInterface } = require("./print/interface");
-
-let uid = 0;
+const {
+  printVariableDeclarator,
+  printAssignmentExpression,
+  printAssignment,
+  printAssignmentRight,
+} = require("./print/assignment");
+const { printBinaryishExpression } = require("./print/binaryish");
+const { printComment } = require("./print/comment");
 
 function genericPrint(path, options, printPath, args) {
   const node = path.getValue();
@@ -357,164 +358,13 @@ function printPathNoParens(path, options, print, args) {
       );
     }
     case "AssignmentExpression":
-      return printAssignment(
-        n.left,
-        path.call(print, "left"),
-        concat([" ", n.operator]),
-        n.right,
-        path.call(print, "right"),
-        options
-      );
+      return printAssignmentExpression(path, options, print);
+    case "VariableDeclarator":
+      return printVariableDeclarator(path, options, print);
     case "BinaryExpression":
     case "LogicalExpression":
-    case "NGPipeExpression": {
-      const parent = path.getParentNode();
-      const parentParent = path.getParentNode(1);
-      const isInsideParenthesis =
-        n !== parent.body &&
-        (parent.type === "IfStatement" ||
-          parent.type === "WhileStatement" ||
-          parent.type === "SwitchStatement" ||
-          parent.type === "DoWhileStatement");
-
-      const parts = printBinaryishExpressions(
-        path,
-        print,
-        options,
-        /* isNested */ false,
-        isInsideParenthesis
-      );
-
-      //   if (
-      //     this.hasPlugin("dynamicImports") && this.lookahead().type === tt.parenLeft
-      //   ) {
-      //
-      // looks super weird, we want to break the children if the parent breaks
-      //
-      //   if (
-      //     this.hasPlugin("dynamicImports") &&
-      //     this.lookahead().type === tt.parenLeft
-      //   ) {
-      if (isInsideParenthesis) {
-        return concat(parts);
-      }
-
-      // Break between the parens in
-      // unaries or in a member or specific call expression, i.e.
-      //
-      //   (
-      //     a &&
-      //     b &&
-      //     c
-      //   ).call()
-      if (
-        ((parent.type === "CallExpression" ||
-          parent.type === "OptionalCallExpression") &&
-          parent.callee === n) ||
-        parent.type === "UnaryExpression" ||
-        ((parent.type === "MemberExpression" ||
-          parent.type === "OptionalMemberExpression") &&
-          !parent.computed)
-      ) {
-        return group(
-          concat([indent(concat([softline, concat(parts)])), softline])
-        );
-      }
-
-      // Avoid indenting sub-expressions in some cases where the first sub-expression is already
-      // indented accordingly. We should indent sub-expressions where the first case isn't indented.
-      const shouldNotIndent =
-        parent.type === "ReturnStatement" ||
-        parent.type === "ThrowStatement" ||
-        (parent.type === "JSXExpressionContainer" &&
-          parentParent.type === "JSXAttribute") ||
-        (n.operator !== "|" && parent.type === "JsExpressionRoot") ||
-        (n.type !== "NGPipeExpression" &&
-          ((parent.type === "NGRoot" && options.parser === "__ng_binding") ||
-            (parent.type === "NGMicrosyntaxExpression" &&
-              parentParent.type === "NGMicrosyntax" &&
-              parentParent.body.length === 1))) ||
-        (n === parent.body && parent.type === "ArrowFunctionExpression") ||
-        (n !== parent.body && parent.type === "ForStatement") ||
-        (parent.type === "ConditionalExpression" &&
-          parentParent.type !== "ReturnStatement" &&
-          parentParent.type !== "ThrowStatement" &&
-          parentParent.type !== "CallExpression" &&
-          parentParent.type !== "OptionalCallExpression") ||
-        parent.type === "TemplateLiteral";
-
-      const shouldIndentIfInlining =
-        parent.type === "AssignmentExpression" ||
-        parent.type === "VariableDeclarator" ||
-        parent.type === "ClassProperty" ||
-        parent.type === "FieldDefinition" ||
-        parent.type === "TSAbstractClassProperty" ||
-        parent.type === "ClassPrivateProperty" ||
-        parent.type === "ObjectProperty" ||
-        parent.type === "Property";
-
-      const samePrecedenceSubExpression =
-        isBinaryish(n.left) && shouldFlatten(n.operator, n.left.operator);
-
-      if (
-        shouldNotIndent ||
-        (shouldInlineLogicalExpression(n) && !samePrecedenceSubExpression) ||
-        (!shouldInlineLogicalExpression(n) && shouldIndentIfInlining)
-      ) {
-        return group(concat(parts));
-      }
-
-      if (parts.length === 0) {
-        return "";
-      }
-
-      // If the right part is a JSX node, we include it in a separate group to
-      // prevent it breaking the whole chain, so we can print the expression like:
-      //
-      //   foo && bar && (
-      //     <Foo>
-      //       <Bar />
-      //     </Foo>
-      //   )
-
-      const hasJSX = isJSXNode(n.right);
-
-      const firstGroupIndex = parts.findIndex(
-        (part) => typeof part !== "string" && part.type === "group"
-      );
-
-      // Separate the leftmost expression, possibly with its leading comments.
-      const headParts = parts.slice(
-        0,
-        firstGroupIndex === -1 ? 1 : firstGroupIndex + 1
-      );
-
-      const rest = concat(
-        parts.slice(headParts.length, hasJSX ? -1 : undefined)
-      );
-
-      const groupId = Symbol("logicalChain-" + ++uid);
-
-      const chain = group(
-        concat([
-          // Don't include the initial expression in the indentation
-          // level. The first item is guaranteed to be the first
-          // left-most expression.
-          ...headParts,
-          indent(rest),
-        ]),
-        { id: groupId }
-      );
-
-      if (!hasJSX) {
-        return chain;
-      }
-
-      const jsxPart = getLast(parts);
-      return group(
-        concat([chain, ifBreak(indent(jsxPart), jsxPart, { groupId })])
-      );
-    }
+    case "NGPipeExpression":
+      return printBinaryishExpression(path, options, print);
     case "AssignmentPattern":
       return concat([
         path.call(print, "left"),
@@ -1002,15 +852,6 @@ function printPathNoParens(path, options, print, args) {
 
       return group(concat(parts));
     }
-    case "VariableDeclarator":
-      return printAssignment(
-        n.id,
-        path.call(print, "id"),
-        " =",
-        n.init,
-        n.init && path.call(print, "init"),
-        options
-      );
     case "WithStatement":
       return group(
         concat([
@@ -2690,216 +2531,6 @@ function printStatementSequence(path, options, print) {
   return join(hardline, printed);
 }
 
-function printFlowDeclaration(path, printed) {
-  const parentExportDecl = getParentExportDeclaration(path);
-
-  if (parentExportDecl) {
-    assert.strictEqual(parentExportDecl.type, "DeclareExportDeclaration");
-    return printed;
-  }
-
-  // If the parent node has type DeclareExportDeclaration, then it
-  // will be responsible for printing the "declare" token. Otherwise
-  // it needs to be printed with this non-exported declaration node.
-  return concat(["declare ", printed]);
-}
-
-function shouldInlineLogicalExpression(node) {
-  if (node.type !== "LogicalExpression") {
-    return false;
-  }
-
-  if (
-    node.right.type === "ObjectExpression" &&
-    node.right.properties.length !== 0
-  ) {
-    return true;
-  }
-
-  if (
-    node.right.type === "ArrayExpression" &&
-    node.right.elements.length !== 0
-  ) {
-    return true;
-  }
-
-  if (isJSXNode(node.right)) {
-    return true;
-  }
-
-  return false;
-}
-
-// For binary expressions to be consistent, we need to group
-// subsequent operators with the same precedence level under a single
-// group. Otherwise they will be nested such that some of them break
-// onto new lines but not all. Operators with the same precedence
-// level should either all break or not. Because we group them by
-// precedence level and the AST is structured based on precedence
-// level, things are naturally broken up correctly, i.e. `&&` is
-// broken before `+`.
-function printBinaryishExpressions(
-  path,
-  print,
-  options,
-  isNested,
-  isInsideParenthesis
-) {
-  /** @type{Doc[]} */
-  let parts = [];
-
-  const node = path.getValue();
-
-  // We treat BinaryExpression and LogicalExpression nodes the same.
-  if (isBinaryish(node)) {
-    // Put all operators with the same precedence level in the same
-    // group. The reason we only need to do this with the `left`
-    // expression is because given an expression like `1 + 2 - 3`, it
-    // is always parsed like `((1 + 2) - 3)`, meaning the `left` side
-    // is where the rest of the expression will exist. Binary
-    // expressions on the right side mean they have a difference
-    // precedence level and should be treated as a separate group, so
-    // print them normally. (This doesn't hold for the `**` operator,
-    // which is unique in that it is right-associative.)
-    if (shouldFlatten(node.operator, node.left.operator)) {
-      // Flatten them out by recursively calling this function.
-      parts = parts.concat(
-        path.call(
-          (left) =>
-            printBinaryishExpressions(
-              left,
-              print,
-              options,
-              /* isNested */ true,
-              isInsideParenthesis
-            ),
-          "left"
-        )
-      );
-    } else {
-      parts.push(group(path.call(print, "left")));
-    }
-
-    const shouldInline = shouldInlineLogicalExpression(node);
-    const lineBeforeOperator =
-      (node.operator === "|>" ||
-        node.type === "NGPipeExpression" ||
-        (node.operator === "|" && options.parser === "__vue_expression")) &&
-      !hasLeadingOwnLineComment(options.originalText, node.right);
-
-    const operator = node.type === "NGPipeExpression" ? "|" : node.operator;
-    const rightSuffix =
-      node.type === "NGPipeExpression" && node.arguments.length !== 0
-        ? group(
-            indent(
-              concat([
-                softline,
-                ": ",
-                join(
-                  concat([softline, ":", ifBreak(" ")]),
-                  path
-                    .map(print, "arguments")
-                    .map((arg) => align(2, group(arg)))
-                ),
-              ])
-            )
-          )
-        : "";
-
-    const right = shouldInline
-      ? concat([operator, " ", path.call(print, "right"), rightSuffix])
-      : concat([
-          lineBeforeOperator ? line : "",
-          operator,
-          lineBeforeOperator ? " " : line,
-          path.call(print, "right"),
-          rightSuffix,
-        ]);
-
-    // If there's only a single binary expression, we want to create a group
-    // in order to avoid having a small right part like -1 be on its own line.
-    const parent = path.getParentNode();
-    const shouldBreak = hasTrailingLineComment(node.left);
-    const shouldGroup =
-      shouldBreak ||
-      (!(isInsideParenthesis && node.type === "LogicalExpression") &&
-        parent.type !== node.type &&
-        node.left.type !== node.type &&
-        node.right.type !== node.type);
-
-    parts.push(
-      lineBeforeOperator ? "" : " ",
-      shouldGroup ? group(right, { shouldBreak }) : right
-    );
-
-    // The root comments are already printed, but we need to manually print
-    // the other ones since we don't call the normal print on BinaryExpression,
-    // only for the left and right parts
-    if (isNested && node.comments) {
-      parts = normalizeParts(
-        comments.printComments(path, () => concat(parts), options).parts
-      );
-    }
-  } else {
-    // Our stopping case. Simply print the node normally.
-    parts.push(group(path.call(print)));
-  }
-
-  return parts;
-}
-
-function printAssignmentRight(leftNode, rightNode, printedRight, options) {
-  if (hasLeadingOwnLineComment(options.originalText, rightNode)) {
-    return indent(concat([line, printedRight]));
-  }
-
-  const canBreak =
-    (isBinaryish(rightNode) && !shouldInlineLogicalExpression(rightNode)) ||
-    (rightNode.type === "ConditionalExpression" &&
-      isBinaryish(rightNode.test) &&
-      !shouldInlineLogicalExpression(rightNode.test)) ||
-    rightNode.type === "StringLiteralTypeAnnotation" ||
-    (rightNode.type === "ClassExpression" &&
-      rightNode.decorators &&
-      rightNode.decorators.length) ||
-    ((leftNode.type === "Identifier" ||
-      isStringLiteral(leftNode) ||
-      leftNode.type === "MemberExpression") &&
-      (isStringLiteral(rightNode) || isMemberExpressionChain(rightNode)) &&
-      // do not put values on a separate line from the key in json
-      options.parser !== "json" &&
-      options.parser !== "json5") ||
-    rightNode.type === "SequenceExpression";
-
-  if (canBreak) {
-    return group(indent(concat([line, printedRight])));
-  }
-
-  return concat([" ", printedRight]);
-}
-
-function printAssignment(
-  leftNode,
-  printedLeft,
-  operator,
-  rightNode,
-  printedRight,
-  options
-) {
-  if (!rightNode) {
-    return printedLeft;
-  }
-
-  const printed = printAssignmentRight(
-    leftNode,
-    rightNode,
-    printedRight,
-    options
-  );
-
-  return group(concat([printedLeft, operator, printed]));
-}
-
 function adjustClause(node, clause, forceSpace) {
   if (node.type === "EmptyStatement") {
     return ";";
@@ -2986,69 +2617,6 @@ function canAttachComment(node) {
   );
 }
 
-function printComment(commentPath, options) {
-  const comment = commentPath.getValue();
-
-  if (isLineComment(comment)) {
-    // Supports `//`, `#!`, `<!--`, and `-->`
-    return options.originalText
-      .slice(locStart(comment), locEnd(comment))
-      .trimEnd();
-  }
-
-  if (isBlockComment(comment)) {
-    if (isIndentableBlockComment(comment)) {
-      const printed = printIndentableBlockComment(comment);
-      // We need to prevent an edge case of a previous trailing comment
-      // printed as a `lineSuffix` which causes the comments to be
-      // interleaved. See https://github.com/prettier/prettier/issues/4412
-      if (
-        comment.trailing &&
-        !hasNewline(options.originalText, locStart(comment), {
-          backwards: true,
-        })
-      ) {
-        return concat([hardline, printed]);
-      }
-      return printed;
-    }
-
-    const commentEnd = locEnd(comment);
-    const isInsideFlowComment =
-      options.originalText.slice(commentEnd - 3, commentEnd) === "*-/";
-    return "/*" + comment.value + (isInsideFlowComment ? "*-/" : "*/");
-  }
-
-  /* istanbul ignore next */
-  throw new Error("Not a comment: " + JSON.stringify(comment));
-}
-
-function isIndentableBlockComment(comment) {
-  // If the comment has multiple lines and every line starts with a star
-  // we can fix the indentation of each line. The stars in the `/*` and
-  // `*/` delimiters are not included in the comment value, so add them
-  // back first.
-  const lines = `*${comment.value}*`.split("\n");
-  return lines.length > 1 && lines.every((line) => line.trim()[0] === "*");
-}
-
-function printIndentableBlockComment(comment) {
-  const lines = comment.value.split("\n");
-
-  return concat([
-    "/*",
-    join(
-      hardline,
-      lines.map((line, index) =>
-        index === 0
-          ? line.trimEnd()
-          : " " + (index < lines.length - 1 ? line.trim() : line.trimStart())
-      )
-    ),
-    "*/",
-  ]);
-}
-
 module.exports = {
   preprocess,
   print: genericPrint,

From 002dc6c45fd3f57d29e3f051e4a6362d32a8842f Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 20 Nov 2020 02:02:46 +0800
Subject: [PATCH 068/299] Extract `printStatementSequence`,
 `printMemberExpression`, and `printBlock` (#9723)

---
 src/language-js/print/block.js        |  76 ++++++++
 src/language-js/print/member-chain.js |   2 +-
 src/language-js/print/member.js       |  67 ++++++++
 src/language-js/print/misc.js         |  35 ++--
 src/language-js/print/statement.js    | 151 ++++++++++++++++
 src/language-js/printer-estree.js     | 239 +-------------------------
 6 files changed, 316 insertions(+), 254 deletions(-)
 create mode 100644 src/language-js/print/block.js
 create mode 100644 src/language-js/print/member.js
 create mode 100644 src/language-js/print/statement.js

diff --git a/src/language-js/print/block.js b/src/language-js/print/block.js
new file mode 100644
index 000000000..b4a7f5051
--- /dev/null
+++ b/src/language-js/print/block.js
@@ -0,0 +1,76 @@
+"use strict";
+
+const { printDanglingComments } = require("../../main/comments");
+const { isNextLineEmpty } = require("../../common/util");
+const {
+  builders: { concat, hardline, indent },
+} = require("../../document");
+const { hasDanglingComments } = require("../utils");
+const { locEnd } = require("../loc");
+
+const { printStatementSequence } = require("./statement");
+
+/** @typedef {import("../../document").Doc} Doc */
+
+function printBlock(path, options, print) {
+  const n = path.getValue();
+  const parts = [];
+  const semi = options.semi ? ";" : "";
+  const naked = path.call((bodyPath) => {
+    return printStatementSequence(bodyPath, options, print);
+  }, "body");
+
+  if (n.type === "StaticBlock") {
+    parts.push("static ");
+  }
+
+  const hasContent = n.body.some((node) => node.type !== "EmptyStatement");
+  const hasDirectives = n.directives && n.directives.length > 0;
+
+  const parent = path.getParentNode();
+  const parentParent = path.getParentNode(1);
+  if (
+    !hasContent &&
+    !hasDirectives &&
+    !hasDanglingComments(n) &&
+    (parent.type === "ArrowFunctionExpression" ||
+      parent.type === "FunctionExpression" ||
+      parent.type === "FunctionDeclaration" ||
+      parent.type === "ObjectMethod" ||
+      parent.type === "ClassMethod" ||
+      parent.type === "ClassPrivateMethod" ||
+      parent.type === "ForStatement" ||
+      parent.type === "WhileStatement" ||
+      parent.type === "DoWhileStatement" ||
+      parent.type === "DoExpression" ||
+      (parent.type === "CatchClause" && !parentParent.finalizer) ||
+      parent.type === "TSModuleDeclaration" ||
+      parent.type === "TSDeclareFunction" ||
+      n.type === "StaticBlock")
+  ) {
+    return concat([...parts, "{}"]);
+  }
+
+  parts.push("{");
+
+  // Babel 6
+  if (hasDirectives) {
+    path.each((childPath) => {
+      parts.push(indent(concat([hardline, print(childPath), semi])));
+      if (isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)) {
+        parts.push(hardline);
+      }
+    }, "directives");
+  }
+
+  if (hasContent) {
+    parts.push(indent(concat([hardline, naked])));
+  }
+
+  parts.push(printDanglingComments(path, options));
+  parts.push(hardline, "}");
+
+  return concat(parts);
+}
+
+module.exports = { printBlock };
diff --git a/src/language-js/print/member-chain.js b/src/language-js/print/member-chain.js
index 9bb2333dd..16247fdb3 100644
--- a/src/language-js/print/member-chain.js
+++ b/src/language-js/print/member-chain.js
@@ -35,10 +35,10 @@ const {
   utils: { willBreak },
 } = require("../../document");
 const printCallArguments = require("./call-arguments");
+const { printMemberLookup } = require("./member");
 const {
   printOptionalToken,
   printFunctionTypeParameters,
-  printMemberLookup,
   printBindExpressionCallee,
 } = require("./misc");
 
diff --git a/src/language-js/print/member.js b/src/language-js/print/member.js
new file mode 100644
index 000000000..78201b27f
--- /dev/null
+++ b/src/language-js/print/member.js
@@ -0,0 +1,67 @@
+"use strict";
+
+const {
+  builders: { concat, softline, group, indent },
+} = require("../../document");
+const { isNumericLiteral } = require("../utils");
+const { printOptionalToken } = require("./misc");
+
+function printMemberExpression(path, options, print) {
+  const n = path.getValue();
+
+  const parent = path.getParentNode();
+  let firstNonMemberParent;
+  let i = 0;
+  do {
+    firstNonMemberParent = path.getParentNode(i);
+    i++;
+  } while (
+    firstNonMemberParent &&
+    (firstNonMemberParent.type === "MemberExpression" ||
+      firstNonMemberParent.type === "OptionalMemberExpression" ||
+      firstNonMemberParent.type === "TSNonNullExpression")
+  );
+
+  const shouldInline =
+    (firstNonMemberParent &&
+      (firstNonMemberParent.type === "NewExpression" ||
+        firstNonMemberParent.type === "BindExpression" ||
+        (firstNonMemberParent.type === "VariableDeclarator" &&
+          firstNonMemberParent.id.type !== "Identifier") ||
+        (firstNonMemberParent.type === "AssignmentExpression" &&
+          firstNonMemberParent.left.type !== "Identifier"))) ||
+    n.computed ||
+    (n.object.type === "Identifier" &&
+      n.property.type === "Identifier" &&
+      parent.type !== "MemberExpression" &&
+      parent.type !== "OptionalMemberExpression");
+
+  return concat([
+    path.call(print, "object"),
+    shouldInline
+      ? printMemberLookup(path, options, print)
+      : group(
+          indent(concat([softline, printMemberLookup(path, options, print)]))
+        ),
+  ]);
+}
+
+function printMemberLookup(path, options, print) {
+  const property = path.call(print, "property");
+  const n = path.getValue();
+  const optional = printOptionalToken(path);
+
+  if (!n.computed) {
+    return concat([optional, ".", property]);
+  }
+
+  if (!n.property || isNumericLiteral(n.property)) {
+    return concat([optional, "[", property, "]"]);
+  }
+
+  return group(
+    concat([optional, "[", indent(concat([softline, property])), softline, "]"])
+  );
+}
+
+module.exports = { printMemberExpression, printMemberLookup };
diff --git a/src/language-js/print/misc.js b/src/language-js/print/misc.js
index 2a8ccbdfe..4d30c8889 100644
--- a/src/language-js/print/misc.js
+++ b/src/language-js/print/misc.js
@@ -3,11 +3,10 @@
 /** @type {import("assert")} */
 const assert = require("assert");
 const {
-  builders: { concat, softline, group, indent, join, line, hardline },
+  builders: { concat, group, indent, join, line, hardline },
 } = require("../../document");
 const {
   hasNewlineBetweenOrAfterDecorators,
-  isNumericLiteral,
   getParentExportDeclaration,
 } = require("../utils");
 
@@ -41,24 +40,6 @@ function printFunctionTypeParameters(path, options, print) {
   return "";
 }
 
-function printMemberLookup(path, options, print) {
-  const property = path.call(print, "property");
-  const n = path.getValue();
-  const optional = printOptionalToken(path);
-
-  if (!n.computed) {
-    return concat([optional, ".", property]);
-  }
-
-  if (!n.property || isNumericLiteral(n.property)) {
-    return concat([optional, "[", property, "]"]);
-  }
-
-  return group(
-    concat([optional, "[", indent(concat([softline, property])), softline, "]"])
-  );
-}
-
 function printBindExpressionCallee(path, options, print) {
   return concat(["::", path.call(print, "callee")]);
 }
@@ -95,12 +76,24 @@ function printFlowDeclaration(path, printed) {
   return concat(["declare ", printed]);
 }
 
+function adjustClause(node, clause, forceSpace) {
+  if (node.type === "EmptyStatement") {
+    return ";";
+  }
+
+  if (node.type === "BlockStatement" || forceSpace) {
+    return concat([" ", clause]);
+  }
+
+  return indent(concat([line, clause]));
+}
+
 module.exports = {
   printOptionalToken,
   printFunctionTypeParameters,
-  printMemberLookup,
   printBindExpressionCallee,
   printTypeScriptModifiers,
   printDecorators,
   printFlowDeclaration,
+  adjustClause,
 };
diff --git a/src/language-js/print/statement.js b/src/language-js/print/statement.js
new file mode 100644
index 000000000..a4a95c909
--- /dev/null
+++ b/src/language-js/print/statement.js
@@ -0,0 +1,151 @@
+"use strict";
+
+const { isNextLineEmpty } = require("../../common/util");
+const {
+  builders: { concat, join, hardline },
+} = require("../../document");
+const pathNeedsParens = require("../needs-parens");
+const {
+  classChildNeedsASIProtection,
+  classPropMayCauseASIProblems,
+  getLeftSidePathName,
+  hasNakedLeftSide,
+  isJSXNode,
+  isLastStatement,
+  isTheOnlyJSXElementInMarkdown,
+} = require("../utils");
+const { locEnd } = require("../loc");
+const { shouldPrintParamsWithoutParens } = require("./function");
+
+/** @typedef {import("../../document").Doc} Doc */
+
+function printStatement({ path, index, bodyNode, isClass }, options, print) {
+  const node = path.getValue();
+
+  // Just in case the AST has been modified to contain falsy
+  // "statements," it's safer simply to skip them.
+  /* istanbul ignore if */
+  if (!node) {
+    return;
+  }
+
+  // Skip printing EmptyStatement nodes to avoid leaving stray
+  // semicolons lying around.
+  if (node.type === "EmptyStatement") {
+    return;
+  }
+
+  const printed = print(path);
+  const text = options.originalText;
+  const parts = [];
+
+  // in no-semi mode, prepend statement with semicolon if it might break ASI
+  // don't prepend the only JSX element in a program with semicolon
+  if (
+    !options.semi &&
+    !isClass &&
+    !isTheOnlyJSXElementInMarkdown(options, path) &&
+    statementNeedsASIProtection(path, options)
+  ) {
+    if (node.comments && node.comments.some((comment) => comment.leading)) {
+      parts.push(print(path, { needsSemi: true }));
+    } else {
+      parts.push(";", printed);
+    }
+  } else {
+    parts.push(printed);
+  }
+
+  if (!options.semi && isClass) {
+    if (classPropMayCauseASIProblems(path)) {
+      parts.push(";");
+    } else if (
+      node.type === "ClassProperty" ||
+      node.type === "FieldDefinition"
+    ) {
+      const nextChild = bodyNode.body[index + 1];
+      if (classChildNeedsASIProtection(nextChild)) {
+        parts.push(";");
+      }
+    }
+  }
+
+  if (isNextLineEmpty(text, node, locEnd) && !isLastStatement(path)) {
+    parts.push(hardline);
+  }
+
+  return concat(parts);
+}
+
+function printStatementSequence(path, options, print) {
+  const bodyNode = path.getNode();
+  const isClass = bodyNode.type === "ClassBody";
+
+  const printed = path
+    .map((statementPath, index) =>
+      printStatement(
+        {
+          path,
+          index,
+          bodyNode,
+          isClass,
+        },
+        options,
+        print
+      )
+    )
+    .filter(Boolean);
+
+  return join(hardline, printed);
+}
+
+function statementNeedsASIProtection(path, options) {
+  const node = path.getNode();
+
+  if (node.type !== "ExpressionStatement") {
+    return false;
+  }
+
+  return path.call(
+    (childPath) => expressionNeedsASIProtection(childPath, options),
+    "expression"
+  );
+}
+
+function expressionNeedsASIProtection(path, options) {
+  const node = path.getValue();
+
+  const maybeASIProblem =
+    pathNeedsParens(path, options) ||
+    node.type === "ParenthesizedExpression" ||
+    node.type === "TypeCastExpression" ||
+    (node.type === "ArrowFunctionExpression" &&
+      !shouldPrintParamsWithoutParens(path, options)) ||
+    node.type === "ArrayExpression" ||
+    node.type === "ArrayPattern" ||
+    (node.type === "UnaryExpression" &&
+      node.prefix &&
+      (node.operator === "+" || node.operator === "-")) ||
+    node.type === "TemplateLiteral" ||
+    node.type === "TemplateElement" ||
+    isJSXNode(node) ||
+    (node.type === "BindExpression" && !node.object) ||
+    node.type === "RegExpLiteral" ||
+    (node.type === "Literal" && node.pattern) ||
+    (node.type === "Literal" && node.regex);
+
+  if (maybeASIProblem) {
+    return true;
+  }
+
+  if (!hasNakedLeftSide(node)) {
+    return false;
+  }
+
+  return path.call(
+    (childPath) => expressionNeedsASIProtection(childPath, options),
+    ...getLeftSidePathName(path, node)
+  );
+}
+
+module.exports = { printStatementSequence };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index c5e7825f7..025e7775e 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -42,17 +42,13 @@ const {
 } = require("./html-binding");
 const preprocess = require("./print-preprocess");
 const {
-  classChildNeedsASIProtection,
-  classPropMayCauseASIProblems,
   getFunctionParameters,
   getCallArguments,
-  getLeftSidePathName,
   getParentExportDeclaration,
   getTypeScriptMappedTypeModifier,
   hasDanglingComments,
   hasFlowShorthandAnnotationComment,
   hasLeadingOwnLineComment,
-  hasNakedLeftSide,
   hasNewlineBetweenOrAfterDecorators,
   hasNgSideEffect,
   hasPrettierIgnore,
@@ -60,8 +56,6 @@ const {
   isExportDeclaration,
   isFunctionNotation,
   isGetterOrSetter,
-  isJSXNode,
-  isLastStatement,
   isLiteral,
   isNgForOf,
   isObjectType,
@@ -77,11 +71,11 @@ const { locStart, locEnd } = require("./loc");
 
 const {
   printOptionalToken,
-  printMemberLookup,
   printBindExpressionCallee,
   printTypeScriptModifiers,
   printDecorators,
   printFlowDeclaration,
+  adjustClause,
 } = require("./print/misc");
 const {
   printImportDeclaration,
@@ -117,7 +111,6 @@ const {
   printArrowFunctionExpression,
   printMethod,
   printReturnAndThrowArgument,
-  shouldPrintParamsWithoutParens,
 } = require("./print/function");
 const { printCallExpression } = require("./print/call-expression");
 const { printInterface } = require("./print/interface");
@@ -128,6 +121,9 @@ const {
   printAssignmentRight,
 } = require("./print/assignment");
 const { printBinaryishExpression } = require("./print/binaryish");
+const { printStatementSequence } = require("./print/statement");
+const { printMemberExpression } = require("./print/member");
+const { printBlock } = require("./print/block");
 const { printComment } = require("./print/comment");
 
 function genericPrint(path, options, printPath, args) {
@@ -404,43 +400,7 @@ function printPathNoParens(path, options, print, args) {
     }
     case "OptionalMemberExpression":
     case "MemberExpression": {
-      const parent = path.getParentNode();
-      let firstNonMemberParent;
-      let i = 0;
-      do {
-        firstNonMemberParent = path.getParentNode(i);
-        i++;
-      } while (
-        firstNonMemberParent &&
-        (firstNonMemberParent.type === "MemberExpression" ||
-          firstNonMemberParent.type === "OptionalMemberExpression" ||
-          firstNonMemberParent.type === "TSNonNullExpression")
-      );
-
-      const shouldInline =
-        (firstNonMemberParent &&
-          (firstNonMemberParent.type === "NewExpression" ||
-            firstNonMemberParent.type === "BindExpression" ||
-            (firstNonMemberParent.type === "VariableDeclarator" &&
-              firstNonMemberParent.id.type !== "Identifier") ||
-            (firstNonMemberParent.type === "AssignmentExpression" &&
-              firstNonMemberParent.left.type !== "Identifier"))) ||
-        n.computed ||
-        (n.object.type === "Identifier" &&
-          n.property.type === "Identifier" &&
-          parent.type !== "MemberExpression" &&
-          parent.type !== "OptionalMemberExpression");
-
-      return concat([
-        path.call(print, "object"),
-        shouldInline
-          ? printMemberLookup(path, options, print)
-          : group(
-              indent(
-                concat([softline, printMemberLookup(path, options, print)])
-              )
-            ),
-      ]);
+      return printMemberExpression(path, options, print);
     }
     case "MetaProperty":
       return concat([
@@ -555,65 +515,8 @@ function printPathNoParens(path, options, print, args) {
       return "import";
     case "TSModuleBlock":
     case "BlockStatement":
-    case "StaticBlock": {
-      const naked = path.call((bodyPath) => {
-        return printStatementSequence(bodyPath, options, print);
-      }, "body");
-
-      if (n.type === "StaticBlock") {
-        parts.push("static ");
-      }
-
-      const hasContent = n.body.some((node) => node.type !== "EmptyStatement");
-      const hasDirectives = n.directives && n.directives.length > 0;
-
-      const parent = path.getParentNode();
-      const parentParent = path.getParentNode(1);
-      if (
-        !hasContent &&
-        !hasDirectives &&
-        !hasDanglingComments(n) &&
-        (parent.type === "ArrowFunctionExpression" ||
-          parent.type === "FunctionExpression" ||
-          parent.type === "FunctionDeclaration" ||
-          parent.type === "ObjectMethod" ||
-          parent.type === "ClassMethod" ||
-          parent.type === "ClassPrivateMethod" ||
-          parent.type === "ForStatement" ||
-          parent.type === "WhileStatement" ||
-          parent.type === "DoWhileStatement" ||
-          parent.type === "DoExpression" ||
-          (parent.type === "CatchClause" && !parentParent.finalizer) ||
-          parent.type === "TSModuleDeclaration" ||
-          parent.type === "TSDeclareFunction" ||
-          n.type === "StaticBlock")
-      ) {
-        return concat([...parts, "{}"]);
-      }
-
-      parts.push("{");
-
-      // Babel 6
-      if (hasDirectives) {
-        path.each((childPath) => {
-          parts.push(indent(concat([hardline, print(childPath), semi])));
-          if (
-            isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)
-          ) {
-            parts.push(hardline);
-          }
-        }, "directives");
-      }
-
-      if (hasContent) {
-        parts.push(indent(concat([hardline, naked])));
-      }
-
-      parts.push(comments.printDanglingComments(path, options));
-      parts.push(hardline, "}");
-
-      return concat(parts);
-    }
+    case "StaticBlock":
+      return printBlock(path, options, print);
     case "ThrowStatement":
     case "ReturnStatement":
       return concat([
@@ -2464,85 +2367,6 @@ function printPathNoParens(path, options, print, args) {
   }
 }
 
-function printStatementSequence(path, options, print) {
-  const printed = [];
-
-  const bodyNode = path.getNode();
-  const isClass = bodyNode.type === "ClassBody";
-
-  path.each((stmtPath, i) => {
-    const stmt = stmtPath.getValue();
-
-    // Just in case the AST has been modified to contain falsy
-    // "statements," it's safer simply to skip them.
-    /* istanbul ignore if */
-    if (!stmt) {
-      return;
-    }
-
-    // Skip printing EmptyStatement nodes to avoid leaving stray
-    // semicolons lying around.
-    if (stmt.type === "EmptyStatement") {
-      return;
-    }
-
-    const stmtPrinted = print(stmtPath);
-    const text = options.originalText;
-    const parts = [];
-
-    // in no-semi mode, prepend statement with semicolon if it might break ASI
-    // don't prepend the only JSX element in a program with semicolon
-    if (
-      !options.semi &&
-      !isClass &&
-      !isTheOnlyJSXElementInMarkdown(options, stmtPath) &&
-      stmtNeedsASIProtection(stmtPath, options)
-    ) {
-      if (stmt.comments && stmt.comments.some((comment) => comment.leading)) {
-        parts.push(print(stmtPath, { needsSemi: true }));
-      } else {
-        parts.push(";", stmtPrinted);
-      }
-    } else {
-      parts.push(stmtPrinted);
-    }
-
-    if (!options.semi && isClass) {
-      if (classPropMayCauseASIProblems(stmtPath)) {
-        parts.push(";");
-      } else if (
-        stmt.type === "ClassProperty" ||
-        stmt.type === "FieldDefinition"
-      ) {
-        const nextChild = bodyNode.body[i + 1];
-        if (classChildNeedsASIProtection(nextChild)) {
-          parts.push(";");
-        }
-      }
-    }
-
-    if (isNextLineEmpty(text, stmt, locEnd) && !isLastStatement(stmtPath)) {
-      parts.push(hardline);
-    }
-
-    printed.push(concat(parts));
-  });
-
-  return join(hardline, printed);
-}
-
-function adjustClause(node, clause, forceSpace) {
-  if (node.type === "EmptyStatement") {
-    return ";";
-  }
-
-  if (node.type === "BlockStatement" || forceSpace) {
-    return concat([" ", clause]);
-  }
-
-  return indent(concat([line, clause]));
-}
-
 function nodeStr(node, options, isFlowOrTypeScriptDirectiveLiteral) {
   const raw = rawText(node);
   const isDirectiveLiteral =
@@ -2555,55 +2379,6 @@ function printRegex(node) {
   return `/${node.pattern}/${flags}`;
 }
 
-function exprNeedsASIProtection(path, options) {
-  const node = path.getValue();
-
-  const maybeASIProblem =
-    pathNeedsParens(path, options) ||
-    node.type === "ParenthesizedExpression" ||
-    node.type === "TypeCastExpression" ||
-    (node.type === "ArrowFunctionExpression" &&
-      !shouldPrintParamsWithoutParens(path, options)) ||
-    node.type === "ArrayExpression" ||
-    node.type === "ArrayPattern" ||
-    (node.type === "UnaryExpression" &&
-      node.prefix &&
-      (node.operator === "+" || node.operator === "-")) ||
-    node.type === "TemplateLiteral" ||
-    node.type === "TemplateElement" ||
-    isJSXNode(node) ||
-    (node.type === "BindExpression" && !node.object) ||
-    node.type === "RegExpLiteral" ||
-    (node.type === "Literal" && node.pattern) ||
-    (node.type === "Literal" && node.regex);
-
-  if (maybeASIProblem) {
-    return true;
-  }
-
-  if (!hasNakedLeftSide(node)) {
-    return false;
-  }
-
-  return path.call(
-    (childPath) => exprNeedsASIProtection(childPath, options),
-    ...getLeftSidePathName(path, node)
-  );
-}
-
-function stmtNeedsASIProtection(path, options) {
-  const node = path.getNode();
-
-  if (node.type !== "ExpressionStatement") {
-    return false;
-  }
-
-  return path.call(
-    (childPath) => exprNeedsASIProtection(childPath, options),
-    "expression"
-  );
-}
-
 function canAttachComment(node) {
   return (
     node.type &&

From 9bc90cfe7d2b1531ae1249baffe43ed318bd12a4 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Fri, 20 Nov 2020 11:35:29 +0900
Subject: [PATCH 069/299] Update to typescript 4.1.2 (#9725)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1638c07b0..1047d267e 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "resolve": "1.19.0",
     "semver": "7.3.2",
     "string-width": "4.2.0",
-    "typescript": "4.1.1-rc",
+    "typescript": "4.1.2",
     "unicode-regex": "3.0.0",
     "unified": "9.2.0",
     "vnopts": "1.0.2",
diff --git a/yarn.lock b/yarn.lock
index 69e5adab4..76319a93c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7166,10 +7166,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@4.1.1-rc:
-  version "4.1.1-rc"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.1-rc.tgz#4a335244b9b2754995849ca4b607c74d6ee73719"
-  integrity sha512-tgNcFrLIjlaMWEc7bKC0bxLNIt8BIAauY/HLUOQDyTP75HGskETtXOt46x4EKAHRKhWVLMc7yM02puTHa/yhCA==
+typescript@4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
+  integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
 
 unherit@^1.0.4:
   version "1.1.3"

From 42b2195e713236f2d43dd95add7301d63f7f6b0c Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Fri, 20 Nov 2020 13:44:18 +0900
Subject: [PATCH 070/299] Release 2.2.0

---
 .github/ISSUE_TEMPLATE/formatting.md          |  2 +-
 .github/ISSUE_TEMPLATE/integration.md         |  2 +-
 CHANGELOG.md                                  |  6 +++++
 docs/browser.md                               | 12 ++++-----
 package.json                                  |  2 +-
 .../versioned_docs/version-stable/browser.md  | 25 +++++++++++--------
 .../versioned_docs/version-stable/options.md  |  1 +
 .../versioned_docs/version-stable/plugins.md  | 10 +++++++-
 .../version-stable/precommit.md               |  2 --
 9 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/formatting.md b/.github/ISSUE_TEMPLATE/formatting.md
index ba91ba43f..af8efd889 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.2**
+**Prettier 2.2.0**
 [Playground link](https://prettier.io/playground/#.....)
 
 ```sh
diff --git a/.github/ISSUE_TEMPLATE/integration.md b/.github/ISSUE_TEMPLATE/integration.md
index 73e97d703..eea91394d 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.2
+- Prettier Version: 2.2.0
 - 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 6270e1b7c..b1d3f6130 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2.2.0
+
+[diff](https://github.com/prettier/prettier/compare/2.1.2...2.2.0)
+
+🔗 [Release Notes](https://prettier.io/blog/2020/11/20/2.2.0.html)
+
 # 2.1.2
 
 [diff](https://github.com/prettier/prettier/compare/2.1.1...2.1.2)
diff --git a/docs/browser.md b/docs/browser.md
index 96d81c1a6..92f7a67a7 100644
--- a/docs/browser.md
+++ b/docs/browser.md
@@ -23,8 +23,8 @@ See [Usage](#usage) below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@2.1.2/standalone.js"></script>
-<script src="https://unpkg.com/prettier@2.1.2/parser-graphql.js"></script>
+<script src="https://unpkg.com/prettier@2.2.0/standalone.js"></script>
+<script src="https://unpkg.com/prettier@2.2.0/parser-graphql.js"></script>
 <script>
   prettier.format("query { }", {
     parser: "graphql",
@@ -51,8 +51,8 @@ prettier.format("query { }", {
 
 ```js
 define([
-  "https://unpkg.com/prettier@2.1.2/standalone.js",
-  "https://unpkg.com/prettier@2.1.2/parser-graphql.js",
+  "https://unpkg.com/prettier@2.2.0/standalone.js",
+  "https://unpkg.com/prettier@2.2.0/parser-graphql.js",
 ], (prettier, ...plugins) => {
   prettier.format("query { }", { parser: "graphql", plugins });
 });
@@ -71,7 +71,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.2/standalone.js");
-importScripts("https://unpkg.com/prettier@2.1.2/parser-graphql.js");
+importScripts("https://unpkg.com/prettier@2.2.0/standalone.js");
+importScripts("https://unpkg.com/prettier@2.2.0/parser-graphql.js");
 prettier.format("query { }", { parser: "graphql", plugins: prettierPlugins });
 ```
diff --git a/package.json b/package.json
index 1047d267e..d8905ad99 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.2.0-dev",
+  "version": "2.2.0",
   "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 67d5cbcc4..9d4f8ad45 100644
--- a/website/versioned_docs/version-stable/browser.md
+++ b/website/versioned_docs/version-stable/browser.md
@@ -4,13 +4,18 @@ title: Browser
 original_id: browser
 ---
 
-Run Prettier in the browser with the `standalone.js` UMD bundle shipped in the NPM package (starting in version 1.13). The UMD bundle only formats the code and has no support for config files, ignore files, CLI usage, or automatic loading of plugins.
+Run Prettier in the browser using its **standalone** version. This version only formats the code and has no support for config files, ignore files, CLI usage, or automatic loading of plugins.
+
+The standalone version comes as:
+
+- ES modules: `esm/standalone.mjs`, starting in version 2.2
+- UMD: `standalone.js`, starting in version 1.13
 
 The [`browser` field](https://github.com/defunctzombie/package-browser-field-spec) in Prettier’s `package.json` points to `standalone.js`. That’s why you can just `import` or `require` the `prettier` module to access Prettier’s API, and your code can stay compatible with both Node and the browser as long as webpack or another bundler that supports the `browser` field is used. This is especially convenient for [plugins](plugins.md).
 
 ### `prettier.format(code, options)`
 
-Unlike the `format` function from the [main API](api.md#prettierformatsource--options), this function does not load plugins automatically, so a `plugins` property is required if you want to load plugins. Additionally, the parsers included in the Prettier package won’t be loaded automatically, so you need to load them before using them.
+Unlike the `format` function from the [main API](api.md#prettierformatsource--options), this function does not load plugins automatically, so a `plugins` property is required if you want to load plugins. Additionally, the parsers included in the Prettier package won’t be loaded automatically, so you need to load them as plugins before using them.
 
 See [Usage](#usage) below for examples.
 
@@ -19,8 +24,8 @@ See [Usage](#usage) below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@2.1.2/standalone.js"></script>
-<script src="https://unpkg.com/prettier@2.1.2/parser-graphql.js"></script>
+<script src="https://unpkg.com/prettier@2.2.0/standalone.js"></script>
+<script src="https://unpkg.com/prettier@2.2.0/parser-graphql.js"></script>
 <script>
   prettier.format("query { }", {
     parser: "graphql",
@@ -34,8 +39,8 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
 ### ES Modules
 
 ```js
-import prettier from "prettier/standalone";
-import parserGraphql from "prettier/parser-graphql";
+import prettier from "https://unpkg.com/prettier/esm/standalone.mjs";
+import parserGraphql from "https://unpkg.com/prettier/esm/parser-graphql.mjs";
 
 prettier.format("query { }", {
   parser: "graphql",
@@ -47,8 +52,8 @@ prettier.format("query { }", {
 
 ```js
 define([
-  "https://unpkg.com/prettier@2.1.2/standalone.js",
-  "https://unpkg.com/prettier@2.1.2/parser-graphql.js",
+  "https://unpkg.com/prettier@2.2.0/standalone.js",
+  "https://unpkg.com/prettier@2.2.0/parser-graphql.js",
 ], (prettier, ...plugins) => {
   prettier.format("query { }", { parser: "graphql", plugins });
 });
@@ -67,7 +72,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.2/standalone.js");
-importScripts("https://unpkg.com/prettier@2.1.2/parser-graphql.js");
+importScripts("https://unpkg.com/prettier@2.2.0/standalone.js");
+importScripts("https://unpkg.com/prettier@2.2.0/parser-graphql.js");
 prettier.format("query { }", { parser: "graphql", plugins: prettierPlugins });
 ```
diff --git a/website/versioned_docs/version-stable/options.md b/website/versioned_docs/version-stable/options.md
index c643c92c6..8791162a8 100644
--- a/website/versioned_docs/version-stable/options.md
+++ b/website/versioned_docs/version-stable/options.md
@@ -212,6 +212,7 @@ Valid options:
 - `"babel-ts"` (similar to `"typescript"` but uses Babel and its TypeScript plugin) _First available in v2.0.0_
 - `"flow"` (via [flow-parser](https://github.com/facebook/flow/tree/master/src/parser))
 - `"typescript"` (via [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint)) _First available in v1.4.0_
+- `"espree"` (via [espree](https://github.com/eslint/espree)) _First available in v2.2.0_
 - `"css"` (via [postcss-scss](https://github.com/postcss/postcss-scss) and [postcss-less](https://github.com/shellscape/postcss-less), autodetects which to use) _First available in v1.7.1_
 - `"scss"` (same parsers as `"css"`, prefers postcss-scss) _First available in v1.7.1_
 - `"less"` (same parsers as `"css"`, prefers postcss-less) _First available in v1.7.1_
diff --git a/website/versioned_docs/version-stable/plugins.md b/website/versioned_docs/version-stable/plugins.md
index 479ef5b23..61cba34b0 100644
--- a/website/versioned_docs/version-stable/plugins.md
+++ b/website/versioned_docs/version-stable/plugins.md
@@ -48,7 +48,9 @@ Providing at least one path to `--plugin-search-dir`/`pluginSearchDirs` turns of
 
 - [`prettier-plugin-apex`](https://github.com/dangmai/prettier-plugin-apex) by [**@dangmai**](https://github.com/dangmai)
 - [`prettier-plugin-elm`](https://github.com/gicentre/prettier-plugin-elm) by [**@giCentre**](https://github.com/gicentre)
+- [`prettier-plugin-go-template`](https://github.com/NiklasPor/prettier-plugin-go-template) by [**@NiklasPor**](https://github.com/NiklasPor)
 - [`prettier-plugin-java`](https://github.com/jhipster/prettier-java) by [**@JHipster**](https://github.com/jhipster)
+- [`prettier-plugin-jsdoc`](https://github.com/hosseinmd/prettier-plugin-jsdoc) by [**@hosseinmd**](https://github.com/hosseinmd)
 - [`prettier-plugin-kotlin`](https://github.com/Angry-Potato/prettier-plugin-kotlin) by [**@Angry-Potato**](https://github.com/Angry-Potato)
 - [`prettier-plugin-package`](https://github.com/shellscape/prettier-plugin-package) by [**@shellscape**](https://github.com/shellscape)
 - [`prettier-plugin-packagejson`](https://github.com/matzkoh/prettier-plugin-packagejson) by [**@matzkoh**](https://github.com/matzkoh)
@@ -56,11 +58,17 @@ Providing at least one path to `--plugin-search-dir`/`pluginSearchDirs` turns of
 - [`prettier-plugin-properties`](https://github.com/eemeli/prettier-plugin-properties) by [**@eemeli**](https://github.com/eemeli)
 - [`prettier-plugin-solidity`](https://github.com/prettier-solidity/prettier-plugin-solidity) by [**@mattiaerre**](https://github.com/mattiaerre)
 - [`prettier-plugin-svelte`](https://github.com/UnwrittenFun/prettier-plugin-svelte) by [**@UnwrittenFun**](https://github.com/UnwrittenFun)
+- [`prettier-plugin-tailwind`](https://github.com/Acidic9/prettier-plugin-tailwind) by [**@Acidic9**](https://github.com/Acidic9)
 - [`prettier-plugin-toml`](https://github.com/bd82/toml-tools/tree/master/packages/prettier-plugin-toml) by [**@bd82**](https://github.com/bd82)
-- [`prettier-plugin-organize-imports`](https://github.com/simonhaenisch/prettier-plugin-organize-imports) by [**@simonhaenisch**](https://github.com/simonhaenisch)
 - [`prettier-plugin-pkg`](https://github.com/rx-ts/prettier/tree/master/packages/pkg) by [**@JounQin**](https://github.com/JounQin)
 - [`prettier-plugin-sh`](https://github.com/rx-ts/prettier/tree/master/packages/sh) by [**@JounQin**](https://github.com/JounQin)
 
+## Experimental Plugins
+
+These plugins provide functionality not supported with Plugin API. Use with caution.
+
+- [`prettier-plugin-organize-imports`](https://github.com/simonhaenisch/prettier-plugin-organize-imports) by [**@simonhaenisch**](https://github.com/simonhaenisch)
+
 ## Developing Plugins
 
 Prettier plugins are regular JavaScript modules with five exports:
diff --git a/website/versioned_docs/version-stable/precommit.md b/website/versioned_docs/version-stable/precommit.md
index 4a0d7a6a7..e05199069 100644
--- a/website/versioned_docs/version-stable/precommit.md
+++ b/website/versioned_docs/version-stable/precommit.md
@@ -70,8 +70,6 @@ Copy the following config into your `.pre-commit-config.yaml` file:
 
 Read more at [mirror of prettier package for pre-commit](https://github.com/pre-commit/mirrors-prettier) and the [pre-commit](https://pre-commit.com) website.
 
-Read more at the [pre-commit](https://pre-commit.com) website.
-
 ## Option 4. [git-format-staged](https://github.com/hallettj/git-format-staged)
 
 **Use Case:** Great for when you want to format partially-staged files, and other options do not provide a good fit for your project.

From cf354c205de9841a2d306387473dac369359ca2b Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Fri, 20 Nov 2020 13:51:46 +0900
Subject: [PATCH 071/299] Bump Prettier dependency to 2.2.0

---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index d8905ad99..fd7478a6e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.2.0",
+  "version": "2.3.0-dev",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin/prettier.js",
   "repository": "prettier/prettier",
@@ -119,7 +119,7 @@
     "jest-watch-typeahead": "0.6.1",
     "npm-run-all": "4.1.5",
     "path-browserify": "1.0.1",
-    "prettier": "2.1.2",
+    "prettier": "2.2.0",
     "rimraf": "3.0.2",
     "rollup": "2.33.3",
     "rollup-plugin-node-globals": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 76319a93c..0baa4dc83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5952,10 +5952,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.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
-  integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
+prettier@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b"
+  integrity sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==
 
 pretty-format@^26.1.0:
   version "26.1.0"

From 117583991c12a77fcd77d01d407a03a1ce8f2362 Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Fri, 20 Nov 2020 13:51:46 +0900
Subject: [PATCH 072/299] Git blame ignore 2.2.0

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 6dba27551..f513724fa 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -5,6 +5,8 @@
 # See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
 
 # Prettier bump after release
+# 2.2.0
+cf354c205de9841a2d306387473dac369359ca2b
 # 2.1.2
 c4d3014b95122f4ad19c319a9b3f5f9625d6003f
 # 2.1.1

From 2d9897a6b8589088ace0f53728f391ecd13b0d36 Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Fri, 20 Nov 2020 13:51:58 +0900
Subject: [PATCH 073/299] Update dependents count

---
 website/pages/en/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index 283cea632..c2b451f45 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -297,7 +297,7 @@ const UsersSection = ({ language }) => {
             <div style={{ marginLeft: ".7em", width: "260px" }}>
               <p>
                 More than{" "}
-                <strong data-placeholder="dependent-github">2 million</strong>{" "}
+                <strong data-placeholder="dependent-github">2.2 million</strong>{" "}
                 dependent repositories on GitHub
               </p>
               <Button href="https://github.com/prettier/prettier/network/dependents">

From d2b9b083ca0c4a2d918cf3a4918e3b39ac189d70 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Fri, 20 Nov 2020 13:54:09 +0900
Subject: [PATCH 074/299] Add 2.2 blog post (#9589)

* Generate draft via script

* Add description

* Mention about pre-commit

* Remove pr-9209.md

* Mention about pre-commit

* Add pr-8937.md

* Update pr-9473

* Update pr-9473

* Update intro file

* Add links to TS 4.1

* Update blog-post

* Move pre-commit support to pre-commit repo

* Fix BLOG_POST_INTRO_TEMPLATE.md

* re-generate draft

* Fix switching versions and re-generate draft

* Update links for TS 4.1

* Update draft

Co-authored-by: fisker Cheung <lionkay@gmail.com>
---
 changelog_unreleased/blog-post-intro.md    |    7 +
 changelog_unreleased/cli/pr-8937.md        |   12 +
 changelog_unreleased/css/pr-9209.md        |   42 -
 changelog_unreleased/flow/pr-9543.md       |    4 +-
 changelog_unreleased/flow/pr-9563.md       |    4 +-
 changelog_unreleased/typescript/pr-9473.md |   14 +-
 changelog_unreleased/typescript/pr-9484.md |    4 +-
 changelog_unreleased/typescript/pr-9521.md |    6 +-
 changelog_unreleased/typescript/pr-9551.md |    4 +-
 website/blog/2020-11-20-2.2.0.md           | 1135 ++++++++++++++++++++
 10 files changed, 1172 insertions(+), 60 deletions(-)
 create mode 100644 changelog_unreleased/blog-post-intro.md
 create mode 100644 changelog_unreleased/cli/pr-8937.md
 delete mode 100644 changelog_unreleased/css/pr-9209.md
 create mode 100644 website/blog/2020-11-20-2.2.0.md

diff --git a/changelog_unreleased/blog-post-intro.md b/changelog_unreleased/blog-post-intro.md
new file mode 100644
index 000000000..166e4bd1a
--- /dev/null
+++ b/changelog_unreleased/blog-post-intro.md
@@ -0,0 +1,7 @@
+---
+author: "Sosuke Suzuki (@sosukesuzuki)"
+authorURL: "https://github.com/sosukesuzuki"
+title: "Prettier 2.2: new JavaScript parsers, TS 4.1 and ESM standalone bundles"
+---
+
+This release supports new JavaScript parsers [espree](https://github.com/eslint/espree) and [meriyah](https://github.com/meriyah/meriyah), supports [TypeScript 4.1](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1-rc/), ships ESM standalone bundles for modern browsers, and includes many bug fixes and improvements!
diff --git a/changelog_unreleased/cli/pr-8937.md b/changelog_unreleased/cli/pr-8937.md
new file mode 100644
index 000000000..ad053189b
--- /dev/null
+++ b/changelog_unreleased/cli/pr-8937.md
@@ -0,0 +1,12 @@
+#### Move [pre-commit](https://github.com/pre-commit/pre-commit) support to github.com/pre-commit/mirrors-prettier ([#8937](https://github.com/prettier/prettier/pull/8937) by [@FloChehab](https://github.com/FloChehab))
+
+`pre-commit` support has moved to https://github.com/pre-commit/mirrors-prettier, please update your `.pre-commit-config.yaml` file .
+
+```diff
+- - repo: https://github.com/prettier/prettier
++ - repo: https://github.com/pre-commit/mirrors-prettier
+-   rev: "2.2.0"
++   rev: "v2.2.0"
+    hooks:
+     - id: prettier
+```
diff --git a/changelog_unreleased/css/pr-9209.md b/changelog_unreleased/css/pr-9209.md
deleted file mode 100644
index 2a3f7f244..000000000
--- a/changelog_unreleased/css/pr-9209.md
+++ /dev/null
@@ -1,42 +0,0 @@
-#### Improve formatting for custom properties (#9209 by @fisker)
-
-Thanks to [`PostCSS 8.0`](https://github.com/postcss/postcss/releases/tag/8.0.0), we can handle these edge cases on custom properties.
-
-<!-- prettier-ignore -->
-```css
-/* Input */
-:root {
-  --empty: ;
-  --JSON: [1, "2", {"three": {"a":1}}, [4]];
-  --javascript: function(rule) { console.log(rule) };
-}
-
-@supports (--element(".minwidth", { "minWidth": 300 })) {
-  [--self] {
-    background: greenyellow;
-  }
-}
-
-/* Prettier stable */
-SyntaxError: (postcss) CssSyntaxError Missed semicolon (3:20)
-  1 | :root {
-  2 |   --empty: ;
-> 3 |   --JSON: [1, "2", {"three": {"a":1}}, [4]];
-    |                    ^
-  4 |   --javascript: function(rule) { console.log(rule) };
-  5 | }
-  6 |
-
-/* Prettier master */
-:root {
-  --empty: ;
-  --JSON: [1, "2", {"three": {"a": 1}}, [4]];
-  --javascript: function(rule) {console.log(rule)};
-}
-
-@supports (--element(".minwidth", {"minWidth": 300})) {
-  [--self] {
-    background: greenyellow;
-  }
-}
-```
diff --git a/changelog_unreleased/flow/pr-9543.md b/changelog_unreleased/flow/pr-9543.md
index bc6582b49..c328264ae 100644
--- a/changelog_unreleased/flow/pr-9543.md
+++ b/changelog_unreleased/flow/pr-9543.md
@@ -7,7 +7,7 @@ const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<"STRING"> = a;
 const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<0> = a;
 
-// Prettier master
+// Prettier stable
 const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<
   symbol
 > = a;
@@ -18,7 +18,7 @@ const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
   0
 > = a;
 
-// Prettier stable (typescript and flow parser)
+// Prettier master (typescript and flow parser)
 const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<symbol> = a
 const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<"STRING"> = a;
 const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<0> = a;
diff --git a/changelog_unreleased/flow/pr-9563.md b/changelog_unreleased/flow/pr-9563.md
index 8260bb391..0c843229d 100644
--- a/changelog_unreleased/flow/pr-9563.md
+++ b/changelog_unreleased/flow/pr-9563.md
@@ -8,13 +8,13 @@ class Foo {
   bar( data: Array<string>) {}
 }
 
-// Prettier master
+// Prettier stable
 foo/*:: <bar> */(baz);
 class Foo {
   bar(data: Array/*:: <string> */) {}
 }
 
-// Prettier stable
+// Prettier master
 foo/*:: <bar> */(baz);
 class Foo {
   bar(data: Array<string>) {}
diff --git a/changelog_unreleased/typescript/pr-9473.md b/changelog_unreleased/typescript/pr-9473.md
index 1c0f69efd..bba25de1b 100644
--- a/changelog_unreleased/typescript/pr-9473.md
+++ b/changelog_unreleased/typescript/pr-9473.md
@@ -1,6 +1,6 @@
-#### [HIGHLIGHT]Support TypeScript 4.1 (#9473, #9636 by @sosukesuzuki)
+#### [HIGHLIGHT]Support [TypeScript 4.1](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1/) (#9473, #9636 by @sosukesuzuki)
 
-##### Key Remapping In Mapped Types
+##### [Key Remapping In Mapped Types](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1/#key-remapping-in-mapped-types)
 
 ```ts
 // Input
@@ -8,31 +8,31 @@ type MappedTypeWithNewKeys<T> = {
   [K in keyof T as NewKeyType]: T[K]
 };
 
-// Prettier master
+// Prettier stable
 SyntaxError: Unexpected token, expected "]" (2:17)
   1 | type MappedTypeWithNewKeys<T> = {
 > 2 |   [K in keyof T as NewKeyType]: T[K]
     |                 ^
   3 | };
 
-// Prettier stable
+// Prettier master
 type MappedTypeWithNewKeys<T> = {
   [K in keyof T as NewKeyType]: T[K]
 };
 ```
 
-##### Template Literal Types
+##### [Template Literal Types](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1/#template-literal-types)
 
 ```ts
 // Input
 type HelloWorld = `Hello, ${keyof World}`
 
-// Prettier master
+// Prettier stable
 SyntaxError: Unexpected token, expected "}" (1:35)
 > 1 | type HelloWorld = `Hello, ${keyof World}`
     |                                   ^
 
-// Prettier stable
+// Prettier master
 type HelloWorld = `Hello, ${keyof World}`;
 
 ```
diff --git a/changelog_unreleased/typescript/pr-9484.md b/changelog_unreleased/typescript/pr-9484.md
index 7b2634ce7..5b0ad899a 100644
--- a/changelog_unreleased/typescript/pr-9484.md
+++ b/changelog_unreleased/typescript/pr-9484.md
@@ -5,9 +5,9 @@
 // Input
 foo = { bar: (a = b) };
 
-// Prettier master
+// Prettier stable
 foo = { bar: a = b };
 
-// Prettier stable
+// Prettier master
 foo = { bar: (a = b) };
 ```
diff --git a/changelog_unreleased/typescript/pr-9521.md b/changelog_unreleased/typescript/pr-9521.md
index 9d63819f9..6229c17cf 100644
--- a/changelog_unreleased/typescript/pr-9521.md
+++ b/changelog_unreleased/typescript/pr-9521.md
@@ -7,18 +7,18 @@ const name: SomeGeneric<
   Pick<Config, "ONE_LONG_PROP" | "ANOTHER_LONG_PROP">
 > = null;
 
-// Prettier master (--parser=typescript)
+// Prettier stable (--parser=typescript)
 const name: SomeGeneric<Pick<
   Config,
   "ONE_LONG_PROP" | "ANOTHER_LONG_PROP"
 >> = null;
 
-// Prettier master (--parser=flow)
+// Prettier stable (--parser=flow)
 const name: SomeGeneric<
   Pick<Config, "ONE_LONG_PROP" | "ANOTHER_LONG_PROP">
 > = null;
 
-// Prettier stable (typescript and flow parser)
+// Prettier master (typescript and flow parser)
 const name: SomeGeneric<
   Pick<Config, "ONE_LONG_PROP" | "ANOTHER_LONG_PROP">
 > = null;
diff --git a/changelog_unreleased/typescript/pr-9551.md b/changelog_unreleased/typescript/pr-9551.md
index 77ffc2676..83394a7f8 100644
--- a/changelog_unreleased/typescript/pr-9551.md
+++ b/changelog_unreleased/typescript/pr-9551.md
@@ -8,13 +8,13 @@ type a= {
     [A in B]: C  |  D
   }
 
-// Prettier master
+// Prettier stable
 type a = {
   // prettier-ignore
   A in B: C | D;
 };
 
-// Prettier stable
+// Prettier master
 type a = {
     // prettier-ignore
     [A in B]: C  |  D
diff --git a/website/blog/2020-11-20-2.2.0.md b/website/blog/2020-11-20-2.2.0.md
new file mode 100644
index 000000000..03f05691e
--- /dev/null
+++ b/website/blog/2020-11-20-2.2.0.md
@@ -0,0 +1,1135 @@
+---
+author: "Sosuke Suzuki (@sosukesuzuki)"
+authorURL: "https://github.com/sosukesuzuki"
+title: "Prettier 2.2: new JavaScript parsers, TS 4.1 and ESM standalone bundles"
+---
+
+This release supports new JavaScript parsers [espree](https://github.com/eslint/espree) and [meriyah](https://github.com/meriyah/meriyah), supports [TypeScript 4.1](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1-rc/), ships ESM standalone bundles for modern browsers, and includes many bug fixes and improvements!
+
+<!--truncate-->
+
+## Highlights
+
+### JavaScript
+
+#### Add `espree` and `meriyah` parser ([#9000](https://github.com/prettier/prettier/pull/9000), [#9514](https://github.com/prettier/prettier/pull/9514) by [@fisker](https://github.com/fisker))
+
+Two new values for the `parser` option has been added:
+
+- [`espree`](https://github.com/eslint/espree) - which is the default parser used by [`ESLint`](https://github.com/eslint/eslint).
+
+  Note that `espree` only works for [Finished ECMAScript Proposals](https://github.com/tc39/proposals/blob/master/finished-proposals.md), and is stricter than the `babel` parser.
+
+- [`meriyah`](https://github.com/meriyah/meriyah) - A [fast](https://meriyah.github.io/meriyah/performance/) JavaScript parser, successor of [cherow](https://github.com/cherow/cherow).
+
+### TypeScript
+
+#### Support [TypeScript 4.1](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1/) ([#9473](https://github.com/prettier/prettier/pull/9473), [#9636](https://github.com/prettier/prettier/pull/9636) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+##### [Key Remapping In Mapped Types](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1/#key-remapping-in-mapped-types)
+
+```ts
+// Input
+type MappedTypeWithNewKeys<T> = {
+  [K in keyof T as NewKeyType]: T[K]
+};
+
+// Prettier 2.1
+SyntaxError: Unexpected token, expected "]" (2:17)
+  1 | type MappedTypeWithNewKeys<T> = {
+> 2 |   [K in keyof T as NewKeyType]: T[K]
+    |                 ^
+  3 | };
+
+// Prettier 2.2
+type MappedTypeWithNewKeys<T> = {
+  [K in keyof T as NewKeyType]: T[K]
+};
+```
+
+##### [Template Literal Types](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1/#template-literal-types)
+
+```ts
+// Input
+type HelloWorld = `Hello, ${keyof World}`
+
+// Prettier 2.1
+SyntaxError: Unexpected token, expected "}" (1:35)
+> 1 | type HelloWorld = `Hello, ${keyof World}`
+    |                                   ^
+
+// Prettier 2.2
+type HelloWorld = `Hello, ${keyof World}`;
+
+```
+
+### API
+
+#### ESM standalone bundles ([#8983](https://github.com/prettier/prettier/pull/8983) by [@Monchi](https://github.com/Monchi), [@fisker](https://github.com/fisker))
+
+Prettier now also comes as ES modules, which can be directly used in modern browsers:
+
+```js
+import prettier from "https://unpkg.com/prettier/esm/standalone.mjs";
+import parserGraphql from "https://unpkg.com/prettier/esm/parser-graphql.mjs";
+
+prettier.format("query {     }", {
+  parser: "graphql",
+  plugins: [parserGraphql],
+});
+```
+
+## Other changes
+
+### JavaScript
+
+#### Respect spacing between template values in embedded CSS ([#9078](https://github.com/prettier/prettier/pull/9078) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+<!-- prettier-ignore -->
+```js
+// Input
+const style = css`
+  width: ${size}${sizeUnit};
+`;
+
+// Prettier 2.1
+const style = css`
+  width: ${size} ${sizeUnit};
+`;
+
+// Prettier 2.2
+const style = css`
+  width: ${size}${sizeUnit};
+`;
+
+```
+
+#### Fix comments inside template literals with embedded syntax ([#9278](https://github.com/prettier/prettier/pull/9278) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```js
+// Input
+html`${
+      foo
+  /* comment */
+}`;
+html`
+${
+      foo
+  /* comment */
+}
+`;
+graphql`${
+      foo
+  /* comment */
+}`;
+css`${
+      foo
+  /* comment */
+}`;
+
+// Prettier 2.1
+html`${foo}`;
+/* comment */
+html`
+  ${foo}
+  /* comment */
+`;
+graphql`
+  ${foo}
+  /* comment */
+`;
+css`
+  ${foo}
+  /* comment */
+`;
+
+
+// Prettier 2.2
+html`${
+  foo
+  /* comment */
+}`;
+html`
+${
+  foo
+  /* comment */
+}
+`;
+graphql`${
+  foo
+  /* comment */
+}`;
+css`${
+  foo
+  /* comment */
+}`;
+```
+
+#### Improve formatting for assignments of classes with long superclass names ([#9341](https://github.com/prettier/prettier/pull/9341) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+This improves the formatting for [Google Closure Library namespaces](https://developers.google.com/closure/library/docs/introduction#names).
+
+<!-- prettier-ignore -->
+```js
+// Input
+aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends (
+  aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg1
+) {
+  method () {
+    console.log("foo");
+  }
+};
+
+// Prettier 2.1
+aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends aaaaaaaa
+  .bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg1 {
+  method() {
+    console.log("foo");
+  }
+};
+
+// Prettier 2.2
+aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends (
+  aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg1
+) {
+  method() {
+    console.log("foo");
+  }
+};
+
+```
+
+#### Fix placement of leading comments for bodies of `while` statements ([#9345](https://github.com/prettier/prettier/pull/9345) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+<!-- prettier-ignore -->
+```js
+// Input
+while(1) // Comment
+  foo();
+
+// Prettier 2.1
+while (
+  1 // Comment
+)
+  foo();
+
+// Prettier 2.2
+while (1)
+  // Comment
+  foo();
+
+```
+
+#### Update to `@babel/parser` 7.12 ([#9408](https://github.com/prettier/prettier/pull/9408), [#9476](https://github.com/prettier/prettier/pull/9476), [#9597](https://github.com/prettier/prettier/pull/9597) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+Updated the JavaScript parser to [`@babel/parser` 7.12](https://babeljs.io/blog/2020/10/15/7.12.0). This fixes several bugs and supports some new syntax.
+
+##### Support Import Assertions
+
+[The "module attributes" proposal supported on 2.1](https://prettier.io/blog/2020/08/24/2.1.0.html#support-es-module-attributes-and-json-modules-8436httpsgithubcomprettierprettierpull8436-by-fiskerhttpsgithubcomfisker) has been significantly changed and also renamed to "import assertions".
+
+```js
+import foo from "./foo.json" assert { type: "json" };
+```
+
+##### Support imports and exports with string names
+
+```js
+let happy = "happy";
+export { happy as "😃" };
+```
+
+##### Support class static blocks
+
+```js
+class C {
+  static #x = 42;
+  static y;
+  static {
+    try {
+      this.y = doSomethingWith(this.#x);
+    } catch {
+      this.y = "unknown";
+    }
+  }
+}
+```
+
+#### Keep HTML and Markdown invalid template literals as is ([#9431](https://github.com/prettier/prettier/pull/9431) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```js
+// Input
+foo = html`<div>\u{prettier}</div>`;
+foo = html`\u{prettier}${foo}pr\u{0065}ttier`;
+foo = markdown`# \u{prettier}\u{0065}`;
+
+// Prettier 2.1
+foo = html``;
+foo = html`null${foo}prettier`;
+foo = markdown`
+# \u{prettier}\u{0065}
+`;
+
+// Prettier 2.2
+foo = html`<div>\u{prettier}</div>`;
+foo = html`\u{prettier}${foo}pr\u{0065}ttier`;
+foo = markdown`# \u{prettier}\u{0065}`;
+```
+
+#### Fix formatting for `import {a as a}` and `export {a as a}` ([#9435](https://github.com/prettier/prettier/pull/9435) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```js
+// Input
+import { a as a } from "a";
+export { b as b } from "b";
+
+// Prettier 2.1
+import { a } from "a";
+export { b } from "b";
+
+// Prettier 2.2
+import { a as a } from "a";
+export { b as b } from "b";
+```
+
+#### Fix formatting of yielded JSX expressions ([#9650](https://github.com/prettier/prettier/pull/9650) by [@brainkim](https://github.com/brainkim))
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+function* f() {
+  yield <div>generator</div>
+}
+// Prettier 2.1
+function* f() {
+  yield (<div>generator</div>);
+}
+// Prettier 2.2
+function* f() {
+  yield <div>generator</div>;
+}
+```
+
+#### Flatten function expression parameters in hugged last argument ([#9662](https://github.com/prettier/prettier/pull/9662) by [@thorn0](https://github.com/thorn0))
+
+<!-- prettier-ignore -->
+```jsx
+// Prettier 2.1
+function* mySagas() {
+  yield effects.takeEvery(rexpress.actionTypes.REQUEST_START, function* ({
+    id
+  }) {
+    console.log(id);
+    yield rexpress.actions(store).writeHead(id, 400);
+    yield rexpress.actions(store).end(id, "pong");
+    console.log("pong");
+  });
+}
+
+// Prettier 2.2
+function* mySagas() {
+  yield effects.takeEvery(
+    rexpress.actionTypes.REQUEST_START,
+    function* ({ id }) {
+      console.log(id);
+      yield rexpress.actions(store).writeHead(id, 400);
+      yield rexpress.actions(store).end(id, "pong");
+      console.log("pong");
+    }
+  );
+}
+```
+
+#### Fix crash on `require(/* comment */)` ([#9670](https://github.com/prettier/prettier/pull/9670) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+require(/* comment */)
+
+// Prettier 2.1
+Error: Comment "comment" was not printed. Please report this error!
+
+// Prettier 2.2
+require(/* comment */);
+```
+
+### TypeScript
+
+#### Preserve the last separator in ignored object types and interfaces ([#9318](https://github.com/prettier/prettier/pull/9318) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+<!-- prettier-ignore -->
+```ts
+// Input
+let x: {
+  // prettier-ignore
+  y: z;
+};
+
+// Prettier 2.1
+let x: {
+  // prettier-ignore
+  y: z;;
+};
+
+// Prettier 2.2
+let x: {
+  // prettier-ignore
+  y: z;
+};
+```
+
+#### Add parens around assignments in object literal properties ([#9484](https://github.com/prettier/prettier/pull/9484) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```ts
+// Input
+foo = { bar: (a = b) };
+
+// Prettier 2.1
+foo = { bar: a = b };
+
+// Prettier 2.2
+foo = { bar: (a = b) };
+```
+
+#### Fix inconsistencies in formatting of types between `typescript` and `flow` ([#9521](https://github.com/prettier/prettier/pull/9521) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```ts
+// Input
+const name: SomeGeneric<
+  Pick<Config, "ONE_LONG_PROP" | "ANOTHER_LONG_PROP">
+> = null;
+
+// Prettier 2.1 (--parser=typescript)
+const name: SomeGeneric<Pick<
+  Config,
+  "ONE_LONG_PROP" | "ANOTHER_LONG_PROP"
+>> = null;
+
+// Prettier 2.1 (--parser=flow)
+const name: SomeGeneric<
+  Pick<Config, "ONE_LONG_PROP" | "ANOTHER_LONG_PROP">
+> = null;
+
+// Prettier 2.2 (typescript and flow parser)
+const name: SomeGeneric<
+  Pick<Config, "ONE_LONG_PROP" | "ANOTHER_LONG_PROP">
+> = null;
+```
+
+#### Fix `prettier-ignore`d mapped types ([#9551](https://github.com/prettier/prettier/pull/9551) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```ts
+// Input
+type a= {
+    // prettier-ignore
+    [A in B]: C  |  D
+  }
+
+// Prettier 2.1
+type a = {
+  // prettier-ignore
+  A in B: C | D;
+};
+
+// Prettier 2.2
+type a = {
+    // prettier-ignore
+    [A in B]: C  |  D
+  };
+```
+
+### Flow
+
+#### Switch the `babel` parser to `babel-flow` if the `@flow` pragma is found ([#9071](https://github.com/prettier/prettier/pull/9071) by [@fisker](https://github.com/fisker))
+
+In practice, this means that as long as your Flow files have the pragma, it's safe to use the `.js` extension for them. Prettier will correctly parse and print them without any additional configuration. Previously, the pragma was recognized by the parser, but there existed minor correctness issues with the printer. E.g. it's not safe to unquote number keys in Flow.
+
+<!-- prettier-ignore -->
+```jsx
+// Input (with --parser babel)
+// @flow
+f<T>({ "2": 2 })
+
+// Prettier 2.1
+// @flow
+f<T>({ 2: 2 });
+
+// Prettier 2.2
+// @flow
+f<T>({ "2": 2 });
+```
+
+#### Enums with unknown members ([#9432](https://github.com/prettier/prettier/pull/9432) by [@gkz](https://github.com/gkz))
+
+Previously, was not supported. Now, the following is formatted:
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+enum E {
+  A,
+  B,
+  ...
+}
+
+// Prettier 2.1: parse error
+
+// Prettier 2.2
+enum E {
+  A,
+  B,
+  ...
+}
+```
+
+#### `this` parameter annotations ([#9457](https://github.com/prettier/prettier/pull/9457) by [@dsainati1](https://github.com/dsainati1), [#9489](https://github.com/prettier/prettier/pull/9489) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+function f(this: string, a: number) {
+}
+
+type T = (this: boolean, a: number) => boolean;
+
+// Prettier 2.1
+function f(this: string, a: number) {}
+
+type T = (a: number) => boolean;
+
+// Prettier 2.2
+function f(this: string, a: number) {
+}
+
+type T = (this: boolean, a: number) => boolean;
+```
+
+#### Support `BigIntLiteralTypeAnnotation` and `BigIntTypeAnnotation` ([#9523](https://github.com/prettier/prettier/pull/9523) by [@fisker](https://github.com/fisker))
+
+Add support for `BigIntLiteralTypeAnnotation` and `BigIntTypeAnnotation` in Flow.
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+const foo: bigint = 1n;
+const bar: baz<1n> = 1n;
+
+// Prettier 2.1
+Error: unknown type: "BigIntTypeAnnotation"
+    at ...
+
+// Prettier 2.2
+const foo: bigint = 1n;
+const bar: baz<1n> = 1n;
+```
+
+#### Treat more simple types as non-breaking in generic type annotations ([#9543](https://github.com/prettier/prettier/pull/9543) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<symbol> = a
+const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<"STRING"> = a;
+const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<0> = a;
+
+// Prettier 2.1
+const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<
+  symbol
+> = a;
+const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<
+  "STRING"
+> = a;
+const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<
+  0
+> = a;
+
+// Prettier 2.2 (typescript and flow parser)
+const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<symbol> = a
+const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<"STRING"> = a;
+const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<0> = a;
+```
+
+#### Fix missing parentheses around `prettier-ignore`d type assertions ([#9553](https://github.com/prettier/prettier/pull/9553) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+transform(
+  // prettier-ignore
+  (pointTransformer: (Point => Point))
+);
+
+// Prettier 2.1
+transform(
+  // prettier-ignore
+  pointTransformer: (Point => Point)
+);
+
+// Prettier 2.2
+transform(
+  // prettier-ignore
+  (pointTransformer: (Point => Point))
+);
+```
+
+#### Improve comment types detection ([#9563](https://github.com/prettier/prettier/pull/9563) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+foo/*::<bar>*/(baz);
+class Foo {
+  bar( data: Array<string>) {}
+}
+
+// Prettier 2.1
+foo/*:: <bar> */(baz);
+class Foo {
+  bar(data: Array/*:: <string> */) {}
+}
+
+// Prettier 2.2
+foo/*:: <bar> */(baz);
+class Foo {
+  bar(data: Array<string>) {}
+}
+```
+
+### Less
+
+#### Fix comments in value lists ([#9356](https://github.com/prettier/prettier/pull/9356) by [@thorn0](https://github.com/thorn0))
+
+<!-- prettier-ignore -->
+```less
+// Input
+@test-space-separated: #aaaaaa // Start with A
+  #bbbbbb // then some B
+  #cccccc; // and round it out with C
+
+// Prettier 2.1
+@test-space-separated: #aaaaaa a // Start with
+  #bbbbbb b // then some
+  #cccccc; // and round it out with C
+
+// Prettier 2.2
+@test-space-separated: #aaaaaa // Start with A
+  #bbbbbb // then some B
+  #cccccc; // and round it out with C
+```
+
+### HTML
+
+#### Fix crash on reading `Node.sourceSpan` ([#9368](https://github.com/prettier/prettier/pull/9368) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```html
+<!-- Input -->
+<strong>a</strong>-<strong>b</strong>-
+
+<!-- Prettier 2.1 -->
+TypeError: Cannot read property 'line' of undefined
+    at forceNextEmptyLine ...
+
+<!-- Prettier 2.2 -->
+<strong>a</strong>-<strong>b</strong>-
+```
+
+### Vue
+
+#### Fix inconsistent formatting for `v-for` ([#9225](https://github.com/prettier/prettier/pull/9225) by [@zweimach](https://github.com/zweimach))
+
+<!-- prettier-ignore -->
+```vue
+<!-- Input -->
+<template>
+  <div
+    v-for="({ longLongProp=42, anotherLongLongProp='Hello, World!' }, index) of longLongLongLongLongLongLongLongList"
+  ></div>
+  <div
+    v-for="({firstValue, secondValue, thirdValue, fourthValue, fifthValue, sixthValue}, objectKey, index) in objectWithAVeryVeryVeryVeryLongName"
+  ></div>
+</template>
+
+<!-- Prettier 2.1 -->
+<template>
+  <div
+    v-for="({ longLongProp = 42, anotherLongLongProp = 'Hello, World!' },
+    index) of longLongLongLongLongLongLongLongList"
+  ></div>
+  <div
+    v-for="({
+      firstValue,
+      secondValue,
+      thirdValue,
+      fourthValue,
+      fifthValue,
+      sixthValue,
+    },
+    objectKey,
+    index) in objectWithAVeryVeryVeryVeryLongName"
+  ></div>
+</template>
+
+<!-- Prettier 2.2 -->
+<template>
+  <div
+    v-for="(
+      { longLongProp = 42, anotherLongLongProp = 'Hello, World!' }, index
+    ) of longLongLongLongLongLongLongLongList"
+  ></div>
+  <div
+    v-for="(
+      {
+        firstValue,
+        secondValue,
+        thirdValue,
+        fourthValue,
+        fifthValue,
+        sixthValue,
+      },
+      objectKey,
+      index
+    ) in objectWithAVeryVeryVeryVeryLongName"
+  ></div>
+</template>
+```
+
+#### Fix inconsistent formatting for slots, support Vue 3 `script[setup]` and `style[vars]` ([#9609](https://github.com/prettier/prettier/pull/9609) by [@fisker](https://github.com/fisker))
+
+- [SFC Composition API Syntax Sugar (`<script setup>`)](https://github.com/vuejs/rfcs/blob/sfc-improvements/active-rfcs/0000-sfc-script-setup.md)
+- [SFC State-driven CSS Variables (`<style vars>`)](https://github.com/vuejs/rfcs/blob/sfc-improvements/active-rfcs/0000-sfc-style-variables.md)
+
+<!-- prettier-ignore -->
+```vue
+<!-- Input -->
+<script setup="props, {emit }"></script>
+<style vars="{color }"></style>
+<template>
+  <div>
+<div v-slot="{destructuring:{   a:{b}}}"/>
+<div v-slot:name="{destructuring:{   a:{b}}}"/>
+<div #default="{destructuring:{   a:{b}}}"/>
+<slot slot-scope="{destructuring:{   a:{b}}}"/>
+</div>
+</template>
+
+<!-- Prettier 2.1 -->
+<script setup="props, {emit }"></script>
+<style vars="{color }"></style>
+<template>
+  <div>
+    <div v-slot="{ destructuring: { a: { b } } }" />
+    <div v-slot:name="{ destructuring: { a: { b } } }" />
+    <div #default="{ destructuring: { a: { b } } }" />
+    <slot
+      slot-scope="{
+        destructuring: {
+          a: { b },
+        },
+      }"
+    />
+  </div>
+</template>
+
+<!-- Prettier 2.2 -->
+<script setup="props, { emit }"></script>
+<style vars="{ color }"></style>
+<template>
+  <div>
+    <div
+      v-slot="{
+        destructuring: {
+          a: { b },
+        },
+      }"
+    />
+    <div
+      v-slot:name="{
+        destructuring: {
+          a: { b },
+        },
+      }"
+    />
+    <div
+      #default="{
+        destructuring: {
+          a: { b },
+        },
+      }"
+    />
+    <slot
+      slot-scope="{
+        destructuring: {
+          a: { b },
+        },
+      }"
+    />
+  </div>
+</template>
+```
+
+### Handlebars (alpha)
+
+#### Fix unstable newlines after `<Textarea />` ([#9403](https://github.com/prettier/prettier/pull/9403) by [@fisker](https://github.com/fisker), fixes in `simple-html-tokenizer` by [@rwjblue](https://github.com/rwjblue))
+
+<!-- prettier-ignore -->
+```handlebars
+// Input
+<Textarea />
+{{#if true}}
+  Test
+{{/if}}
+
+// Prettier 2.1
+<Textarea />
+
+{{#if true}}
+  Test
+{{/if}}
+
+// Prettier 2.1 (second format)
+<Textarea />
+{{#if true}}
+  Test
+{{/if}}
+
+// Prettier 2.2
+<Textarea />
+{{#if true}}
+  Test
+{{/if}}
+```
+
+### Markdown
+
+#### Update remark-math to 3.0.1; escape dollar signs only if originally escaped ([#7938](https://github.com/prettier/prettier/pull/7938) by [@fisker](https://github.com/fisker) and [@thorn0](https://github.com/thorn0))
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+Paragraph with $14 million.
+
+Paragraph with $14 million.    But if more $dollars on the same line...
+
+<!-- Prettier 2.1 -->
+Paragraph with \$14 million.
+
+Paragraph with $14 million.    But if more $dollars on the same line...
+
+<!-- Prettier 2.2 -->
+Paragraph with $14 million.
+
+Paragraph with $14 million. But if more $dollars on the same line...
+```
+
+#### Fix missing blank lines in fenced code blocks lacking the closing fence ([#8786](https://github.com/prettier/prettier/pull/8786) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```markdown
+require("prettier").format("```a\n\n\n\n", { parser: "markdown" });
+
+<!-- Prettier 2.1 -->
+'```a\n\n```\n'
+
+<!-- Prettier 2.2 -->
+'```a\n\n\n\n```\n'
+```
+
+#### Add support for `[[wiki-style]]` links ([#9275](https://github.com/prettier/prettier/pull/9275) by [@iamrecursion](https://github.com/iamrecursion))
+
+1.  Support for `[[wiki-style]]` links ensures that they do not get broken by
+    the prettier formatting by being wrapped over multiple lines.
+2.  The contents of the link (between the `[[]]` brackets) are treated as raw
+    text. This is because the various tools that rely on the `[[]]` syntax do not
+    agree on what is allowable between them.
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+If I have a prose that forces a wiki link to end up crossing the [[line width limit]] like this. It's wrapped into an invalid state.
+
+<!-- Prettier 2.1 -->
+If I have a prose that forces a wiki link to end up crossing the [[line width
+limit]] like this. It's wrapped into an invalid state.
+
+<!-- Prettier 2.2 -->
+If I have a prose that forces a wiki link to end up crossing the
+[[line width limit]] like this. It's wrapped into an invalid state.
+```
+
+#### Align code block language detection with other popular tools ([#9365](https://github.com/prettier/prettier/pull/9365) by [@kachkaev](https://github.com/kachkaev))
+
+Since [Prettier 1.12](https://prettier.io/blog/2018/04/11/1.12.0.html#support-fenced-codeblock-lang-followed-by-attributes-4153httpsgithubcomprettierprettierpull4153-by-ikatyanghttpsgithubcomikatyang), code blocks starting like ` ```js {something=something} ` are detected as JavaScript ones and are therefore formatted.
+Back in the day, not many tools used to separate the language from the metadata, so [it was decided](https://github.com/prettier/prettier/pull/4783) to make whitespace optional and thus detect ` ```js{something=something} ` as JavaScript too.
+
+With the release of [Remark](https://github.com/remarkjs/remark) v8 (which is used by Prettier), code block language detection and formatting became inconsistent in [several rare edge cases](https://github.com/prettier/prettier/issues/9155).
+Besides, [it was noticed](https://github.com/gicentre/litvis/issues/50) that Prettier‘s formatting behaviour mismatched syntax highlighting in VSCode.
+To encourage consistency between different tools and to better align with the [Commonmark spec](https://spec.commonmark.org/0.29/#fenced-code-blocks), use of whitespace between the language name and the metadata was made compulsory.
+
+<!-- prettier-ignore -->
+````markdown
+<!-- Input -->
+```js {something=something}
+console.log    (    "hello world"    );
+```
+
+```js{something=something}
+console.log    (    "hello world"    );
+```
+
+<!-- Prettier 2.1 -->
+```js {something=something}
+console.log("hello world");
+```
+
+```js{something=something}
+console.log("hello world");
+```
+
+<!-- Prettier 2.2 -->
+```js {something=something}
+console.log("hello world");
+```
+
+```js{something=something}
+console.log    (    "hello world"    );
+```
+````
+
+#### Fix extra empty line added after empty table ([#9654](https://github.com/prettier/prettier/pull/9654) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+Test line 1
+
+| Specify the selected option : | Option 1 |
+| ----------------------------- | -------- |
+
+Test line 6
+
+<!-- Prettier 2.1 -->
+Test line 1
+
+| Specify the selected option : | Option 1 |
+| ----------------------------- | -------- |
+
+
+Test line 6
+
+<!-- Prettier 2.2 -->
+Test line 1
+
+| Specify the selected option : | Option 1 |
+| ----------------------------- | -------- |
+
+Test line 6
+```
+
+### MDX
+
+#### Fix extra empty lines in JSX ([#9267](https://github.com/prettier/prettier/pull/9267) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+# title
+
+<Jsx>
+
+text
+
+</Jsx>
+
+<!-- Prettier 2.1 -->
+# title
+
+<Jsx>
+
+
+text
+
+</Jsx>
+
+
+(Extra empty lines added after `<Jsx>` and `</Jsx>`)
+
+<!-- Prettier 2.2 -->
+# title
+
+<Jsx>
+
+text
+
+</Jsx>
+```
+
+### YAML
+
+#### Apply `trailingComma` option ([#9665](https://github.com/prettier/prettier/pull/9665) by [@fisker](https://github.com/fisker))
+
+When `--trailing-comma=none`, should not add trailing comma to flowMapping and flowSequence.
+
+<!-- prettier-ignore -->
+```yaml
+# Input
+flow-mapping:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  }
+flow-sequence:
+  [
+    "object-does-not-fit-within-print-width", "------",
+    "TEST", "comma IS added here"
+  ]
+
+# Prettier 2.1
+mapping:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here",
+  }
+flow-sequence:
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here",
+  ]
+
+# Prettier 2.2
+flow-mapping:
+  {
+    "object-does-not-fit-within-print-width": "------",
+    "TEST": "comma IS added here"
+  }
+flow-sequence:
+  [
+    "object-does-not-fit-within-print-width",
+    "------",
+    "TEST",
+    "comma IS added here"
+  ]
+```
+
+#### Fix comments inside `flowMapping` and `flowSequence` ([#9669](https://github.com/prettier/prettier/pull/9669) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```yaml
+# Input
+a:
+  [
+    a, b,
+    # comment
+  ]
+
+b:
+  # prettier-ignore
+  {
+    a: 1, b: 2,
+    # comment
+  }
+
+# Prettier 2.1
+a: [a, b]
+  # comment
+
+b:
+  # prettier-ignore
+  {
+    a: 1, b: 2,
+    # comment
+  }
+  # comment
+
+
+# Prettier 2.1 (second format)
+a:
+  [a, b]
+  # comment
+
+b:
+  # prettier-ignore
+  {
+    a: 1, b: 2,
+    # comment
+  }
+  # comment
+  # comment
+
+
+# Prettier 2.2
+a: [
+    a,
+    b,
+    # comment
+  ]
+
+b:
+  # prettier-ignore
+  {
+    a: 1, b: 2,
+    # comment
+  }
+```
+
+### API
+
+#### Stop inferring the parser to be `json` for `.jsonl` files ([#9371](https://github.com/prettier/prettier/pull/9371) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```console
+// Prettier 2.1
+$ prettier --check .
+Checking formatting...
+[error] bad.jsonl: SyntaxError: Unexpected token (2:1)
+[error]   1 | '{"type": "t/f", "head": "England", "relation": "invaded", "tail": "United States"}'
+[error] > 2 | '{"type": "t/f", "head": "England", "relation": "attacked", "tail": "Baltimore"}'
+[error]     | ^
+[error]   3 |
+All matched files use Prettier code style!
+
+// Prettier 2.2
+$ prettier --check .
+Checking formatting...
+All matched files use Prettier code style!
+```
+
+### CLI
+
+#### Move [pre-commit](https://github.com/pre-commit/pre-commit) support to github.com/pre-commit/mirrors-prettier ([#8937](https://github.com/prettier/prettier/pull/8937) by [@FloChehab](https://github.com/FloChehab))
+
+`pre-commit` support has moved to https://github.com/pre-commit/mirrors-prettier, please update your `.pre-commit-config.yaml` file .
+
+```diff
+- - repo: https://github.com/prettier/prettier
++ - repo: https://github.com/pre-commit/mirrors-prettier
+-   rev: "2.2.0"
++   rev: "v2.2.0"
+    hooks:
+     - id: prettier
+```
+
+#### Fix: error on directories and files with numeric names ([#9298](https://github.com/prettier/prettier/pull/9298) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```console
+$ cat 1/index.js
+hello('world')
+
+// Prettier 2.1
+$ prettier 1
+[error] The "path" argument must be of type string. Received type number (1)
+
+// Prettier 2.2
+$ prettier 1
+hello("world");
+```

From 28cc1908fd8fd1d8d62b62ce55d735325dd5f118 Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Fri, 20 Nov 2020 14:01:22 +0900
Subject: [PATCH 075/299] Clean changelog_unreleased

---
 changelog_unreleased/api/pr-8983.md        | 13 ----
 changelog_unreleased/api/pr-9371.md        | 19 ------
 changelog_unreleased/blog-post-intro.md    |  7 ---
 changelog_unreleased/cli/pr-8937.md        | 12 ----
 changelog_unreleased/cli/pr-9298.md        | 15 -----
 changelog_unreleased/flow/pr-9071.md       | 18 ------
 changelog_unreleased/flow/pr-9432.md       | 22 -------
 changelog_unreleased/flow/pr-9457.md       | 21 -------
 changelog_unreleased/flow/pr-9523.md       | 18 ------
 changelog_unreleased/flow/pr-9543.md       | 25 --------
 changelog_unreleased/flow/pr-9553.md       | 22 -------
 changelog_unreleased/flow/pr-9563.md       | 22 -------
 changelog_unreleased/handlebars/pr-9403.md | 29 ---------
 changelog_unreleased/html/pr-9368.md       | 14 -----
 changelog_unreleased/javascript/pr-9000.md |  9 ---
 changelog_unreleased/javascript/pr-9078.md | 20 ------
 changelog_unreleased/javascript/pr-9278.md | 61 ------------------
 changelog_unreleased/javascript/pr-9341.md | 33 ----------
 changelog_unreleased/javascript/pr-9345.md | 20 ------
 changelog_unreleased/javascript/pr-9408.md | 34 ----------
 changelog_unreleased/javascript/pr-9431.md | 21 -------
 changelog_unreleased/javascript/pr-9435.md | 16 -----
 changelog_unreleased/javascript/pr-9650.md | 17 -----
 changelog_unreleased/javascript/pr-9662.md | 29 ---------
 changelog_unreleased/javascript/pr-9670.md | 13 ----
 changelog_unreleased/less/pr-9356.md       | 19 ------
 changelog_unreleased/markdown/pr-7938.md   | 19 ------
 changelog_unreleased/markdown/pr-8786.md   | 12 ----
 changelog_unreleased/markdown/pr-9275.md   | 21 -------
 changelog_unreleased/markdown/pr-9365.md   | 38 -----------
 changelog_unreleased/markdown/pr-9654.md   | 29 ---------
 changelog_unreleased/mdx/pr-9267.md        | 35 -----------
 changelog_unreleased/typescript/pr-9318.md | 22 -------
 changelog_unreleased/typescript/pr-9473.md | 38 -----------
 changelog_unreleased/typescript/pr-9484.md | 13 ----
 changelog_unreleased/typescript/pr-9521.md | 25 --------
 changelog_unreleased/typescript/pr-9551.md | 22 -------
 changelog_unreleased/vue/pr-9225.md        | 57 -----------------
 changelog_unreleased/vue/pr-9609.md        | 73 ----------------------
 changelog_unreleased/yaml/pr-9665.md       | 46 --------------
 changelog_unreleased/yaml/pr-9669.md       | 60 ------------------
 41 files changed, 1059 deletions(-)
 delete mode 100644 changelog_unreleased/api/pr-8983.md
 delete mode 100644 changelog_unreleased/api/pr-9371.md
 delete mode 100644 changelog_unreleased/blog-post-intro.md
 delete mode 100644 changelog_unreleased/cli/pr-8937.md
 delete mode 100644 changelog_unreleased/cli/pr-9298.md
 delete mode 100644 changelog_unreleased/flow/pr-9071.md
 delete mode 100644 changelog_unreleased/flow/pr-9432.md
 delete mode 100644 changelog_unreleased/flow/pr-9457.md
 delete mode 100644 changelog_unreleased/flow/pr-9523.md
 delete mode 100644 changelog_unreleased/flow/pr-9543.md
 delete mode 100644 changelog_unreleased/flow/pr-9553.md
 delete mode 100644 changelog_unreleased/flow/pr-9563.md
 delete mode 100644 changelog_unreleased/handlebars/pr-9403.md
 delete mode 100644 changelog_unreleased/html/pr-9368.md
 delete mode 100644 changelog_unreleased/javascript/pr-9000.md
 delete mode 100644 changelog_unreleased/javascript/pr-9078.md
 delete mode 100644 changelog_unreleased/javascript/pr-9278.md
 delete mode 100644 changelog_unreleased/javascript/pr-9341.md
 delete mode 100644 changelog_unreleased/javascript/pr-9345.md
 delete mode 100644 changelog_unreleased/javascript/pr-9408.md
 delete mode 100644 changelog_unreleased/javascript/pr-9431.md
 delete mode 100644 changelog_unreleased/javascript/pr-9435.md
 delete mode 100644 changelog_unreleased/javascript/pr-9650.md
 delete mode 100644 changelog_unreleased/javascript/pr-9662.md
 delete mode 100644 changelog_unreleased/javascript/pr-9670.md
 delete mode 100644 changelog_unreleased/less/pr-9356.md
 delete mode 100644 changelog_unreleased/markdown/pr-7938.md
 delete mode 100644 changelog_unreleased/markdown/pr-8786.md
 delete mode 100644 changelog_unreleased/markdown/pr-9275.md
 delete mode 100644 changelog_unreleased/markdown/pr-9365.md
 delete mode 100644 changelog_unreleased/markdown/pr-9654.md
 delete mode 100644 changelog_unreleased/mdx/pr-9267.md
 delete mode 100644 changelog_unreleased/typescript/pr-9318.md
 delete mode 100644 changelog_unreleased/typescript/pr-9473.md
 delete mode 100644 changelog_unreleased/typescript/pr-9484.md
 delete mode 100644 changelog_unreleased/typescript/pr-9521.md
 delete mode 100644 changelog_unreleased/typescript/pr-9551.md
 delete mode 100644 changelog_unreleased/vue/pr-9225.md
 delete mode 100644 changelog_unreleased/vue/pr-9609.md
 delete mode 100644 changelog_unreleased/yaml/pr-9665.md
 delete mode 100644 changelog_unreleased/yaml/pr-9669.md

diff --git a/changelog_unreleased/api/pr-8983.md b/changelog_unreleased/api/pr-8983.md
deleted file mode 100644
index 4282ea7a0..000000000
--- a/changelog_unreleased/api/pr-8983.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#### [HIGHLIGHT]ESM standalone bundles ([#8983](https://github.com/prettier/prettier/pull/8983) by [@Monchi](https://github.com/Monchi), [@fisker](https://github.com/fisker))
-
-Prettier now also comes as ES modules, which can be directly used in modern browsers:
-
-```js
-import prettier from "https://unpkg.com/prettier/esm/standalone.mjs";
-import parserGraphql from "https://unpkg.com/prettier/esm/parser-graphql.mjs";
-
-prettier.format("query {     }", {
-  parser: "graphql",
-  plugins: [parserGraphql],
-});
-```
diff --git a/changelog_unreleased/api/pr-9371.md b/changelog_unreleased/api/pr-9371.md
deleted file mode 100644
index 22af5459e..000000000
--- a/changelog_unreleased/api/pr-9371.md
+++ /dev/null
@@ -1,19 +0,0 @@
-#### Stop inferring the parser to be `json` for `.jsonl` files (#9371 by @fisker)
-
-<!-- prettier-ignore -->
-```console
-// Prettier stable
-$ prettier --check .
-Checking formatting...
-[error] bad.jsonl: SyntaxError: Unexpected token (2:1)
-[error]   1 | '{"type": "t/f", "head": "England", "relation": "invaded", "tail": "United States"}'
-[error] > 2 | '{"type": "t/f", "head": "England", "relation": "attacked", "tail": "Baltimore"}'
-[error]     | ^
-[error]   3 |
-All matched files use Prettier code style!
-
-// Prettier master
-$ prettier --check .
-Checking formatting...
-All matched files use Prettier code style!
-```
diff --git a/changelog_unreleased/blog-post-intro.md b/changelog_unreleased/blog-post-intro.md
deleted file mode 100644
index 166e4bd1a..000000000
--- a/changelog_unreleased/blog-post-intro.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-author: "Sosuke Suzuki (@sosukesuzuki)"
-authorURL: "https://github.com/sosukesuzuki"
-title: "Prettier 2.2: new JavaScript parsers, TS 4.1 and ESM standalone bundles"
----
-
-This release supports new JavaScript parsers [espree](https://github.com/eslint/espree) and [meriyah](https://github.com/meriyah/meriyah), supports [TypeScript 4.1](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1-rc/), ships ESM standalone bundles for modern browsers, and includes many bug fixes and improvements!
diff --git a/changelog_unreleased/cli/pr-8937.md b/changelog_unreleased/cli/pr-8937.md
deleted file mode 100644
index ad053189b..000000000
--- a/changelog_unreleased/cli/pr-8937.md
+++ /dev/null
@@ -1,12 +0,0 @@
-#### Move [pre-commit](https://github.com/pre-commit/pre-commit) support to github.com/pre-commit/mirrors-prettier ([#8937](https://github.com/prettier/prettier/pull/8937) by [@FloChehab](https://github.com/FloChehab))
-
-`pre-commit` support has moved to https://github.com/pre-commit/mirrors-prettier, please update your `.pre-commit-config.yaml` file .
-
-```diff
-- - repo: https://github.com/prettier/prettier
-+ - repo: https://github.com/pre-commit/mirrors-prettier
--   rev: "2.2.0"
-+   rev: "v2.2.0"
-    hooks:
-     - id: prettier
-```
diff --git a/changelog_unreleased/cli/pr-9298.md b/changelog_unreleased/cli/pr-9298.md
deleted file mode 100644
index d402fa7d5..000000000
--- a/changelog_unreleased/cli/pr-9298.md
+++ /dev/null
@@ -1,15 +0,0 @@
-#### Fix: error on directories and files with numeric names (#9298 by @fisker)
-
-<!-- prettier-ignore -->
-```console
-$ cat 1/index.js
-hello('world')
-
-// Prettier stable
-$ prettier 1
-[error] The "path" argument must be of type string. Received type number (1)
-
-// Prettier master
-$ prettier 1
-hello("world");
-```
diff --git a/changelog_unreleased/flow/pr-9071.md b/changelog_unreleased/flow/pr-9071.md
deleted file mode 100644
index 7859461a5..000000000
--- a/changelog_unreleased/flow/pr-9071.md
+++ /dev/null
@@ -1,18 +0,0 @@
-#### Switch the `babel` parser to `babel-flow` if the `@flow` pragma is found (#9071 by @fisker)
-
-In practice, this means that as long as your Flow files have the pragma, it's safe to use the `.js` extension for them. Prettier will correctly parse and print them without any additional configuration. Previously, the pragma was recognized by the parser, but there existed minor correctness issues with the printer. E.g. it's not safe to unquote number keys in Flow.
-
-<!-- prettier-ignore -->
-```jsx
-// Input (with --parser babel)
-// @flow
-f<T>({ "2": 2 })
-
-// Prettier stable
-// @flow
-f<T>({ 2: 2 });
-
-// Prettier master
-// @flow
-f<T>({ "2": 2 });
-```
diff --git a/changelog_unreleased/flow/pr-9432.md b/changelog_unreleased/flow/pr-9432.md
deleted file mode 100644
index a677ea504..000000000
--- a/changelog_unreleased/flow/pr-9432.md
+++ /dev/null
@@ -1,22 +0,0 @@
-#### Enums with unknown members (#9432 by @gkz)
-
-Previously, was not supported. Now, the following is formatted:
-
-<!-- prettier-ignore -->
-```jsx
-// Input
-enum E {
-  A,
-  B,
-  ...
-}
-
-// Prettier stable: parse error
-
-// Prettier master
-enum E {
-  A,
-  B,
-  ...
-}
-```
diff --git a/changelog_unreleased/flow/pr-9457.md b/changelog_unreleased/flow/pr-9457.md
deleted file mode 100644
index 7899e4fa5..000000000
--- a/changelog_unreleased/flow/pr-9457.md
+++ /dev/null
@@ -1,21 +0,0 @@
-#### `this` parameter annotations (#9457 by @dsainati1, #9489 by @fisker)
-
-<!-- prettier-ignore -->
-```jsx
-// Input
-function f(this: string, a: number) {
-}
-
-type T = (this: boolean, a: number) => boolean;
-
-// Prettier stable
-function f(this: string, a: number) {}
-
-type T = (a: number) => boolean;
-
-// Prettier master
-function f(this: string, a: number) {
-}
-
-type T = (this: boolean, a: number) => boolean;
-```
diff --git a/changelog_unreleased/flow/pr-9523.md b/changelog_unreleased/flow/pr-9523.md
deleted file mode 100644
index da75c9926..000000000
--- a/changelog_unreleased/flow/pr-9523.md
+++ /dev/null
@@ -1,18 +0,0 @@
-#### Support `BigIntLiteralTypeAnnotation` and `BigIntTypeAnnotation` (#9523 by @fisker)
-
-Add support for `BigIntLiteralTypeAnnotation` and `BigIntTypeAnnotation` in Flow.
-
-<!-- prettier-ignore -->
-```jsx
-// Input
-const foo: bigint = 1n;
-const bar: baz<1n> = 1n;
-
-// Prettier stable
-Error: unknown type: "BigIntTypeAnnotation"
-    at ...
-
-// Prettier master
-const foo: bigint = 1n;
-const bar: baz<1n> = 1n;
-```
diff --git a/changelog_unreleased/flow/pr-9543.md b/changelog_unreleased/flow/pr-9543.md
deleted file mode 100644
index c328264ae..000000000
--- a/changelog_unreleased/flow/pr-9543.md
+++ /dev/null
@@ -1,25 +0,0 @@
-#### Treat more simple types as non-breaking in generic type annotations (#9543 by @fisker)
-
-<!-- prettier-ignore -->
-```jsx
-// Input
-const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<symbol> = a
-const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<"STRING"> = a;
-const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<0> = a;
-
-// Prettier stable
-const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<
-  symbol
-> = a;
-const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<
-  "STRING"
-> = a;
-const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<
-  0
-> = a;
-
-// Prettier master (typescript and flow parser)
-const foo1: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<symbol> = a
-const foo2: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<"STRING"> = a;
-const foo3: Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo<0> = a;
-```
diff --git a/changelog_unreleased/flow/pr-9553.md b/changelog_unreleased/flow/pr-9553.md
deleted file mode 100644
index a041ea4fb..000000000
--- a/changelog_unreleased/flow/pr-9553.md
+++ /dev/null
@@ -1,22 +0,0 @@
-#### Fix missing parentheses around `prettier-ignore`d type assertions (#9553 by @fisker)
-
-<!-- prettier-ignore -->
-```jsx
-// Input
-transform(
-  // prettier-ignore
-  (pointTransformer: (Point => Point))
-);
-
-// Prettier stable
-transform(
-  // prettier-ignore
-  pointTransformer: (Point => Point)
-);
-
-// Prettier master
-transform(
-  // prettier-ignore
-  (pointTransformer: (Point => Point))
-);
-```
diff --git a/changelog_unreleased/flow/pr-9563.md b/changelog_unreleased/flow/pr-9563.md
deleted file mode 100644
index 0c843229d..000000000
--- a/changelog_unreleased/flow/pr-9563.md
+++ /dev/null
@@ -1,22 +0,0 @@
-#### Improve comment types detection (#9563 by @fisker)
-
-<!-- prettier-ignore -->
-```jsx
-// Input
-foo/*::<bar>*/(baz);
-class Foo {
-  bar( data: Array<string>) {}
-}
-
-// Prettier stable
-foo/*:: <bar> */(baz);
-class Foo {
-  bar(data: Array/*:: <string> */) {}
-}
-
-// Prettier master
-foo/*:: <bar> */(baz);
-class Foo {
-  bar(data: Array<string>) {}
-}
-```
diff --git a/changelog_unreleased/handlebars/pr-9403.md b/changelog_unreleased/handlebars/pr-9403.md
deleted file mode 100644
index b8afd996b..000000000
--- a/changelog_unreleased/handlebars/pr-9403.md
+++ /dev/null
@@ -1,29 +0,0 @@
-#### Fix unstable newlines after `<Textarea />` (#9403 by @fisker, fixes in `simple-html-tokenizer` by @rwjblue)
-
-<!-- prettier-ignore -->
-```handlebars
-// Input
-<Textarea />
-{{#if true}}
-  Test
-{{/if}}
-
-// Prettier stable
-<Textarea />
-
-{{#if true}}
-  Test
-{{/if}}
-
-// Prettier stable (second format)
-<Textarea />
-{{#if true}}
-  Test
-{{/if}}
-
-// Prettier master
-<Textarea />
-{{#if true}}
-  Test
-{{/if}}
-```
diff --git a/changelog_unreleased/html/pr-9368.md b/changelog_unreleased/html/pr-9368.md
deleted file mode 100644
index b1cd4da3d..000000000
--- a/changelog_unreleased/html/pr-9368.md
+++ /dev/null
@@ -1,14 +0,0 @@
-#### Fix crash on reading `Node.sourceSpan` (#9368 by @fisker)
-
-<!-- prettier-ignore -->
-```html
-<!-- Input -->
-<strong>a</strong>-<strong>b</strong>-
-
-<!-- Prettier stable -->
-TypeError: Cannot read property 'line' of undefined
-    at forceNextEmptyLine ...
-
-<!-- Prettier master -->
-<strong>a</strong>-<strong>b</strong>-
-```
diff --git a/changelog_unreleased/javascript/pr-9000.md b/changelog_unreleased/javascript/pr-9000.md
deleted file mode 100644
index 283afdd1e..000000000
--- a/changelog_unreleased/javascript/pr-9000.md
+++ /dev/null
@@ -1,9 +0,0 @@
-#### [HIGHLIGHT]Add `espree` and `meriyah` parser (#9000, #9514 by @fisker)
-
-Two new values for the `parser` option has been added:
-
-- [`espree`](https://github.com/eslint/espree) - which is the default parser used by [`ESLint`](https://github.com/eslint/eslint).
-
-  Note that `espree` only works for [Finished ECMAScript Proposals](https://github.com/tc39/proposals/blob/master/finished-proposals.md), and is stricter than the `babel` parser.
-
-- [`meriyah`](https://github.com/meriyah/meriyah) - A [fast](https://meriyah.github.io/meriyah/performance/) JavaScript parser, successor of [cherow](https://github.com/cherow/cherow).
diff --git a/changelog_unreleased/javascript/pr-9078.md b/changelog_unreleased/javascript/pr-9078.md
deleted file mode 100644
index c0f8aef0b..000000000
--- a/changelog_unreleased/javascript/pr-9078.md
+++ /dev/null
@@ -1,20 +0,0 @@
-#### Respect spacing between template values in embedded CSS (#9078 by @sosukesuzuki)
-
-<!-- prettier-ignore -->
-```js
-// Input
-const style = css`
-  width: ${size}${sizeUnit};
-`;
-
-// Prettier stable
-const style = css`
-  width: ${size} ${sizeUnit};
-`;
-
-// Prettier master
-const style = css`
-  width: ${size}${sizeUnit};
-`;
-
-```
diff --git a/changelog_unreleased/javascript/pr-9278.md b/changelog_unreleased/javascript/pr-9278.md
deleted file mode 100644
index ede3ac621..000000000
--- a/changelog_unreleased/javascript/pr-9278.md
+++ /dev/null
@@ -1,61 +0,0 @@
-#### Fix comments inside template literals with embedded syntax (#9278 by @fisker)
-
-<!-- prettier-ignore -->
-```js
-// Input
-html`${
-      foo
-  /* comment */
-}`;
-html`
-${
-      foo
-  /* comment */
-}
-`;
-graphql`${
-      foo
-  /* comment */
-}`;
-css`${
-      foo
-  /* comment */
-}`;
-
-// Prettier stable
-html`${foo}`;
-/* comment */
-html`
-  ${foo}
-  /* comment */
-`;
-graphql`
-  ${foo}
-  /* comment */
-`;
-css`
-  ${foo}
-  /* comment */
-`;
-
-
-// Prettier master
-html`${
-  foo
-  /* comment */
-}`;
-html`
-${
-  foo
-  /* comment */
-}
-`;
-graphql`${
-  foo
-  /* comment */
-}`;
-css`${
-  foo
-  /* comment */
-}`;
-```
diff --git a/changelog_unreleased/javascript/pr-9341.md b/changelog_unreleased/javascript/pr-9341.md
deleted file mode 100644
index aeb46aeff..000000000
--- a/changelog_unreleased/javascript/pr-9341.md
+++ /dev/null
@@ -1,33 +0,0 @@
-#### Improve formatting for assignments of classes with long superclass names (#9341 by @sosukesuzuki)
-
-This improves the formatting for [Google Closure Library namespaces](https://developers.google.com/closure/library/docs/introduction#names).
-
-<!-- prettier-ignore -->
-```js
-// Input
-aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends (
-  aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg1
-) {
-  method () {
-    console.log("foo");
-  }
-};
-
-// Prettier stable
-aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends aaaaaaaa
-  .bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg1 {
-  method() {
-    console.log("foo");
-  }
-};
-
-// Prettier master
-aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends (
-  aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg1
-) {
-  method() {
-    console.log("foo");
-  }
-};
-
-```
diff --git a/changelog_unreleased/javascript/pr-9345.md b/changelog_unreleased/javascript/pr-9345.md
deleted file mode 100644
index 57ac2fa5f..000000000
--- a/changelog_unreleased/javascript/pr-9345.md
+++ /dev/null
@@ -1,20 +0,0 @@
-#### Fix placement of leading comments for bodies of `while` statements (#9345 by @sosukesuzuki)
-
-<!-- prettier-ignore -->
-```js
-// Input
-while(1) // Comment
-  foo();
-
-// Prettier stable
-while (
-  1 // Comment
-)
-  foo();
-
-// Prettier master
-while (1)
-  // Comment
-  foo();
-
-```
diff --git a/changelog_unreleased/javascript/pr-9408.md b/changelog_unreleased/javascript/pr-9408.md
deleted file mode 100644
index 0444bb337..000000000
--- a/changelog_unreleased/javascript/pr-9408.md
+++ /dev/null
@@ -1,34 +0,0 @@
-#### Update to `@babel/parser` 7.12 (#9408, #9476, #9597 by @sosukesuzuki)
-
-Updated the JavaScript parser to [`@babel/parser` 7.12](https://babeljs.io/blog/2020/10/15/7.12.0). This fixes several bugs and supports some new syntax.
-
-##### Support Import Assertions
-
-[The "module attributes" proposal supported on 2.1](https://prettier.io/blog/2020/08/24/2.1.0.html#support-es-module-attributes-and-json-modules-8436httpsgithubcomprettierprettierpull8436-by-fiskerhttpsgithubcomfisker) has been significantly changed and also renamed to "import assertions".
-
-```js
-import foo from "./foo.json" assert { type: "json" };
-```
-
-##### Support imports and exports with string names
-
-```js
-let happy = "happy";
-export { happy as "😃" };
-```
-
-##### Support class static blocks
-
-```js
-class C {
-  static #x = 42;
-  static y;
-  static {
-    try {
-      this.y = doSomethingWith(this.#x);
-    } catch {
-      this.y = "unknown";
-    }
-  }
-}
-```
diff --git a/changelog_unreleased/javascript/pr-9431.md b/changelog_unreleased/javascript/pr-9431.md
deleted file mode 100644
index 0056c7ce6..000000000
--- a/changelog_unreleased/javascript/pr-9431.md
+++ /dev/null
@@ -1,21 +0,0 @@
-#### Keep HTML and Markdown invalid template literals as is (#9431 by @fisker)
-
-<!-- prettier-ignore -->
-```js
-// Input
-foo = html`<div>\u{prettier}</div>`;
-foo = html`\u{prettier}${foo}pr\u{0065}ttier`;
-foo = markdown`# \u{prettier}\u{0065}`;
-
-// Prettier stable
-foo = html``;
-foo = html`null${foo}prettier`;
-foo = markdown`
-# \u{prettier}\u{0065}
-`;
-
-// Prettier master
-foo = html`<div>\u{prettier}</div>`;
-foo = html`\u{prettier}${foo}pr\u{0065}ttier`;
-foo = markdown`# \u{prettier}\u{0065}`;
-```
diff --git a/changelog_unreleased/javascript/pr-9435.md b/changelog_unreleased/javascript/pr-9435.md
deleted file mode 100644
index d856535a8..000000000
--- a/changelog_unreleased/javascript/pr-9435.md
+++ /dev/null
@@ -1,16 +0,0 @@
-#### Fix formatting for `import {a as a}` and `export {a as a}` (#9435 by @fisker)
-
-<!-- prettier-ignore -->
-```js
-// Input
-import { a as a } from "a";
-export { b as b } from "b";
-
-// Prettier stable
-import { a } from "a";
-export { b } from "b";
-
-// Prettier master
-import { a as a } from "a";
-export { b as b } from "b";
-```
diff --git a/changelog_unreleased/javascript/pr-9650.md b/changelog_unreleased/javascript/pr-9650.md
deleted file mode 100644
index 0cb7db6a2..000000000
--- a/changelog_unreleased/javascript/pr-9650.md
+++ /dev/null
@@ -1,17 +0,0 @@
-#### Fix formatting of yielded JSX expressions (#9650 by @brainkim)
-
-<!-- prettier-ignore -->
-```jsx
-// Input
-function* f() {
-  yield <div>generator</div>
-}
-// Prettier stable
-function* f() {
-  yield (<div>generator</div>);
-}
-// Prettier master
-function* f() {
-  yield <div>generator</div>;
-}
-```
diff --git a/changelog_unreleased/javascript/pr-9662.md b/changelog_unreleased/javascript/pr-9662.md
deleted file mode 100644
index ec48a9bb3..000000000
--- a/changelog_unreleased/javascript/pr-9662.md
+++ /dev/null
@@ -1,29 +0,0 @@
-#### Flatten function expression parameters in hugged last argument (#9662 by @thorn0)
-
-<!-- prettier-ignore -->
-```jsx
-// Prettier stable
-function* mySagas() {
-  yield effects.takeEvery(rexpress.actionTypes.REQUEST_START, function* ({
-    id
-  }) {
-    console.log(id);
-    yield rexpress.actions(store).writeHead(id, 400);
-    yield rexpress.actions(store).end(id, "pong");
-    console.log("pong");
-  });
-}
-
-// Prettier master
-function* mySagas() {
-  yield effects.takeEvery(
-    rexpress.actionTypes.REQUEST_START,
-    function* ({ id }) {
-      console.log(id);
-      yield rexpress.actions(store).writeHead(id, 400);
-      yield rexpress.actions(store).end(id, "pong");
-      console.log("pong");
-    }
-  );
-}
-```
diff --git a/changelog_unreleased/javascript/pr-9670.md b/changelog_unreleased/javascript/pr-9670.md
deleted file mode 100644
index 5c79184ec..000000000
--- a/changelog_unreleased/javascript/pr-9670.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#### Fix crash on `require(/* comment */)` (#9670 by @fisker)
-
-<!-- prettier-ignore -->
-```jsx
-// Input
-require(/* comment */)
-
-// Prettier stable
-Error: Comment "comment" was not printed. Please report this error!
-
-// Prettier master
-require(/* comment */);
-```
diff --git a/changelog_unreleased/less/pr-9356.md b/changelog_unreleased/less/pr-9356.md
deleted file mode 100644
index 9fe070c57..000000000
--- a/changelog_unreleased/less/pr-9356.md
+++ /dev/null
@@ -1,19 +0,0 @@
-#### Fix comments in value lists (#9356 by @thorn0)
-
-<!-- prettier-ignore -->
-```less
-// Input
-@test-space-separated: #aaaaaa // Start with A
-  #bbbbbb // then some B
-  #cccccc; // and round it out with C
-
-// Prettier stable
-@test-space-separated: #aaaaaa a // Start with
-  #bbbbbb b // then some
-  #cccccc; // and round it out with C
-
-// Prettier master
-@test-space-separated: #aaaaaa // Start with A
-  #bbbbbb // then some B
-  #cccccc; // and round it out with C
-```
diff --git a/changelog_unreleased/markdown/pr-7938.md b/changelog_unreleased/markdown/pr-7938.md
deleted file mode 100644
index 97e0b9d17..000000000
--- a/changelog_unreleased/markdown/pr-7938.md
+++ /dev/null
@@ -1,19 +0,0 @@
-#### Update remark-math to 3.0.1; escape dollar signs only if originally escaped (#7938 by @fisker and @thorn0)
-
-<!-- prettier-ignore -->
-```markdown
-<!-- Input -->
-Paragraph with $14 million.
-
-Paragraph with $14 million.    But if more $dollars on the same line...
-
-<!-- Prettier stable -->
-Paragraph with \$14 million.
-
-Paragraph with $14 million.    But if more $dollars on the same line...
-
-<!-- Prettier master -->
-Paragraph with $14 million.
-
-Paragraph with $14 million. But if more $dollars on the same line...
-```
diff --git a/changelog_unreleased/markdown/pr-8786.md b/changelog_unreleased/markdown/pr-8786.md
deleted file mode 100644
index 77af10af8..000000000
--- a/changelog_unreleased/markdown/pr-8786.md
+++ /dev/null
@@ -1,12 +0,0 @@
-#### Fix missing blank lines in fenced code blocks lacking the closing fence ([#8786](https://github.com/prettier/prettier/pull/8786) by [@fisker](https://github.com/fisker))
-
-<!-- prettier-ignore -->
-```markdown
-require("prettier").format("```a\n\n\n\n", { parser: "markdown" });
-
-<!-- Prettier stable -->
-'```a\n\n```\n'
-
-<!-- Prettier master -->
-'```a\n\n\n\n```\n'
-```
diff --git a/changelog_unreleased/markdown/pr-9275.md b/changelog_unreleased/markdown/pr-9275.md
deleted file mode 100644
index 7f5664d10..000000000
--- a/changelog_unreleased/markdown/pr-9275.md
+++ /dev/null
@@ -1,21 +0,0 @@
-#### Add support for `[[wiki-style]]` links (#9275 by @iamrecursion)
-
-1.  Support for `[[wiki-style]]` links ensures that they do not get broken by
-    the prettier formatting by being wrapped over multiple lines.
-2.  The contents of the link (between the `[[]]` brackets) are treated as raw
-    text. This is because the various tools that rely on the `[[]]` syntax do not
-    agree on what is allowable between them.
-
-<!-- prettier-ignore -->
-```markdown
-<!-- Input -->
-If I have a prose that forces a wiki link to end up crossing the [[line width limit]] like this. It's wrapped into an invalid state.
-
-<!-- Prettier stable -->
-If I have a prose that forces a wiki link to end up crossing the [[line width
-limit]] like this. It's wrapped into an invalid state.
-
-<!-- Prettier master -->
-If I have a prose that forces a wiki link to end up crossing the
-[[line width limit]] like this. It's wrapped into an invalid state.
-```
diff --git a/changelog_unreleased/markdown/pr-9365.md b/changelog_unreleased/markdown/pr-9365.md
deleted file mode 100644
index 25241c3c0..000000000
--- a/changelog_unreleased/markdown/pr-9365.md
+++ /dev/null
@@ -1,38 +0,0 @@
-#### Align code block language detection with other popular tools (#9365 by @kachkaev)
-
-Since [Prettier 1.12](https://prettier.io/blog/2018/04/11/1.12.0.html#support-fenced-codeblock-lang-followed-by-attributes-4153httpsgithubcomprettierprettierpull4153-by-ikatyanghttpsgithubcomikatyang), code blocks starting like ` ```js {something=something} ` are detected as JavaScript ones and are therefore formatted.
-Back in the day, not many tools used to separate the language from the metadata, so [it was decided](https://github.com/prettier/prettier/pull/4783) to make whitespace optional and thus detect ` ```js{something=something} ` as JavaScript too.
-
-With the release of [Remark](https://github.com/remarkjs/remark) v8 (which is used by Prettier), code block language detection and formatting became inconsistent in [several rare edge cases](https://github.com/prettier/prettier/issues/9155).
-Besides, [it was noticed](https://github.com/gicentre/litvis/issues/50) that Prettier‘s formatting behaviour mismatched syntax highlighting in VSCode.
-To encourage consistency between different tools and to better align with the [Commonmark spec](https://spec.commonmark.org/0.29/#fenced-code-blocks), use of whitespace between the language name and the metadata was made compulsory.
-
-<!-- prettier-ignore -->
-````markdown
-<!-- Input -->
-```js {something=something}
-console.log    (    "hello world"    );
-```
-
-```js{something=something}
-console.log    (    "hello world"    );
-```
-
-<!-- Prettier stable -->
-```js {something=something}
-console.log("hello world");
-```
-
-```js{something=something}
-console.log("hello world");
-```
-
-<!-- Prettier master -->
-```js {something=something}
-console.log("hello world");
-```
-
-```js{something=something}
-console.log    (    "hello world"    );
-```
-````
diff --git a/changelog_unreleased/markdown/pr-9654.md b/changelog_unreleased/markdown/pr-9654.md
deleted file mode 100644
index 5028ba8b9..000000000
--- a/changelog_unreleased/markdown/pr-9654.md
+++ /dev/null
@@ -1,29 +0,0 @@
-#### Fix extra empty line added after empty table (#9654 by @fisker)
-
-<!-- prettier-ignore -->
-```markdown
-<!-- Input -->
-Test line 1
-
-| Specify the selected option : | Option 1 |
-| ----------------------------- | -------- |
-
-Test line 6
-
-<!-- Prettier stable -->
-Test line 1
-
-| Specify the selected option : | Option 1 |
-| ----------------------------- | -------- |
-
-
-Test line 6
-
-<!-- Prettier master -->
-Test line 1
-
-| Specify the selected option : | Option 1 |
-| ----------------------------- | -------- |
-
-Test line 6
-```
diff --git a/changelog_unreleased/mdx/pr-9267.md b/changelog_unreleased/mdx/pr-9267.md
deleted file mode 100644
index ee5743c27..000000000
--- a/changelog_unreleased/mdx/pr-9267.md
+++ /dev/null
@@ -1,35 +0,0 @@
-#### Fix extra empty lines in JSX (#9267 by @fisker)
-
-<!-- prettier-ignore -->
-```markdown
-<!-- Input -->
-# title
-
-<Jsx>
-
-text
-
-</Jsx>
-
-<!-- Prettier stable -->
-# title
-
-<Jsx>
-
-
-text
-
-</Jsx>
-
-
-(Extra empty lines added after `<Jsx>` and `</Jsx>`)
-
-<!-- Prettier master -->
-# title
-
-<Jsx>
-
-text
-
-</Jsx>
-```
diff --git a/changelog_unreleased/typescript/pr-9318.md b/changelog_unreleased/typescript/pr-9318.md
deleted file mode 100644
index 3de4c1322..000000000
--- a/changelog_unreleased/typescript/pr-9318.md
+++ /dev/null
@@ -1,22 +0,0 @@
-#### Preserve the last separator in ignored object types and interfaces (#9318 by @sosukesuzuki)
-
-<!-- prettier-ignore -->
-```ts
-// Input
-let x: {
-  // prettier-ignore
-  y: z;
-};
-
-// Prettier stable
-let x: {
-  // prettier-ignore
-  y: z;;
-};
-
-// Prettier master
-let x: {
-  // prettier-ignore
-  y: z;
-};
-```
diff --git a/changelog_unreleased/typescript/pr-9473.md b/changelog_unreleased/typescript/pr-9473.md
deleted file mode 100644
index bba25de1b..000000000
--- a/changelog_unreleased/typescript/pr-9473.md
+++ /dev/null
@@ -1,38 +0,0 @@
-#### [HIGHLIGHT]Support [TypeScript 4.1](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1/) (#9473, #9636 by @sosukesuzuki)
-
-##### [Key Remapping In Mapped Types](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1/#key-remapping-in-mapped-types)
-
-```ts
-// Input
-type MappedTypeWithNewKeys<T> = {
-  [K in keyof T as NewKeyType]: T[K]
-};
-
-// Prettier stable
-SyntaxError: Unexpected token, expected "]" (2:17)
-  1 | type MappedTypeWithNewKeys<T> = {
-> 2 |   [K in keyof T as NewKeyType]: T[K]
-    |                 ^
-  3 | };
-
-// Prettier master
-type MappedTypeWithNewKeys<T> = {
-  [K in keyof T as NewKeyType]: T[K]
-};
-```
-
-##### [Template Literal Types](https://devblogs.microsoft.com/typescript/announcing-typescript-4-1/#template-literal-types)
-
-```ts
-// Input
-type HelloWorld = `Hello, ${keyof World}`
-
-// Prettier stable
-SyntaxError: Unexpected token, expected "}" (1:35)
-> 1 | type HelloWorld = `Hello, ${keyof World}`
-    |                                   ^
-
-// Prettier master
-type HelloWorld = `Hello, ${keyof World}`;
-
-```
diff --git a/changelog_unreleased/typescript/pr-9484.md b/changelog_unreleased/typescript/pr-9484.md
deleted file mode 100644
index 5b0ad899a..000000000
--- a/changelog_unreleased/typescript/pr-9484.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#### Add parens around assignments in object literal properties (#9484 by @fisker)
-
-<!-- prettier-ignore -->
-```ts
-// Input
-foo = { bar: (a = b) };
-
-// Prettier stable
-foo = { bar: a = b };
-
-// Prettier master
-foo = { bar: (a = b) };
-```
diff --git a/changelog_unreleased/typescript/pr-9521.md b/changelog_unreleased/typescript/pr-9521.md
deleted file mode 100644
index 6229c17cf..000000000
--- a/changelog_unreleased/typescript/pr-9521.md
+++ /dev/null
@@ -1,25 +0,0 @@
-#### Fix inconsistencies in formatting of types between `typescript` and `flow` (#9521 by @fisker)
-
-<!-- prettier-ignore -->
-```ts
-// Input
-const name: SomeGeneric<
-  Pick<Config, "ONE_LONG_PROP" | "ANOTHER_LONG_PROP">
-> = null;
-
-// Prettier stable (--parser=typescript)
-const name: SomeGeneric<Pick<
-  Config,
-  "ONE_LONG_PROP" | "ANOTHER_LONG_PROP"
->> = null;
-
-// Prettier stable (--parser=flow)
-const name: SomeGeneric<
-  Pick<Config, "ONE_LONG_PROP" | "ANOTHER_LONG_PROP">
-> = null;
-
-// Prettier master (typescript and flow parser)
-const name: SomeGeneric<
-  Pick<Config, "ONE_LONG_PROP" | "ANOTHER_LONG_PROP">
-> = null;
-```
diff --git a/changelog_unreleased/typescript/pr-9551.md b/changelog_unreleased/typescript/pr-9551.md
deleted file mode 100644
index 83394a7f8..000000000
--- a/changelog_unreleased/typescript/pr-9551.md
+++ /dev/null
@@ -1,22 +0,0 @@
-#### Fix `prettier-ignore`d mapped types (#9551 by @fisker)
-
-<!-- prettier-ignore -->
-```ts
-// Input
-type a= {
-    // prettier-ignore
-    [A in B]: C  |  D
-  }
-
-// Prettier stable
-type a = {
-  // prettier-ignore
-  A in B: C | D;
-};
-
-// Prettier master
-type a = {
-    // prettier-ignore
-    [A in B]: C  |  D
-  };
-```
diff --git a/changelog_unreleased/vue/pr-9225.md b/changelog_unreleased/vue/pr-9225.md
deleted file mode 100644
index 480739ec9..000000000
--- a/changelog_unreleased/vue/pr-9225.md
+++ /dev/null
@@ -1,57 +0,0 @@
-#### Fix inconsistent formatting for `v-for` (#9225 by @zweimach)
-
-<!-- prettier-ignore -->
-```vue
-<!-- Input -->
-<template>
-  <div
-    v-for="({ longLongProp=42, anotherLongLongProp='Hello, World!' }, index) of longLongLongLongLongLongLongLongList"
-  ></div>
-  <div
-    v-for="({firstValue, secondValue, thirdValue, fourthValue, fifthValue, sixthValue}, objectKey, index) in objectWithAVeryVeryVeryVeryLongName"
-  ></div>
-</template>
-
-<!-- Prettier stable -->
-<template>
-  <div
-    v-for="({ longLongProp = 42, anotherLongLongProp = 'Hello, World!' },
-    index) of longLongLongLongLongLongLongLongList"
-  ></div>
-  <div
-    v-for="({
-      firstValue,
-      secondValue,
-      thirdValue,
-      fourthValue,
-      fifthValue,
-      sixthValue,
-    },
-    objectKey,
-    index) in objectWithAVeryVeryVeryVeryLongName"
-  ></div>
-</template>
-
-<!-- Prettier master -->
-<template>
-  <div
-    v-for="(
-      { longLongProp = 42, anotherLongLongProp = 'Hello, World!' }, index
-    ) of longLongLongLongLongLongLongLongList"
-  ></div>
-  <div
-    v-for="(
-      {
-        firstValue,
-        secondValue,
-        thirdValue,
-        fourthValue,
-        fifthValue,
-        sixthValue,
-      },
-      objectKey,
-      index
-    ) in objectWithAVeryVeryVeryVeryLongName"
-  ></div>
-</template>
-```
diff --git a/changelog_unreleased/vue/pr-9609.md b/changelog_unreleased/vue/pr-9609.md
deleted file mode 100644
index b55920e4b..000000000
--- a/changelog_unreleased/vue/pr-9609.md
+++ /dev/null
@@ -1,73 +0,0 @@
-#### Fix inconsistent formatting for slots, support Vue 3 `script[setup]` and `style[vars]` (#9609 by @fisker)
-
-- [SFC Composition API Syntax Sugar (`<script setup>`)](https://github.com/vuejs/rfcs/blob/sfc-improvements/active-rfcs/0000-sfc-script-setup.md)
-- [SFC State-driven CSS Variables (`<style vars>`)](https://github.com/vuejs/rfcs/blob/sfc-improvements/active-rfcs/0000-sfc-style-variables.md)
-
-<!-- prettier-ignore -->
-```vue
-<!-- Input -->
-<script setup="props, {emit }"></script>
-<style vars="{color }"></style>
-<template>
-  <div>
-<div v-slot="{destructuring:{   a:{b}}}"/>
-<div v-slot:name="{destructuring:{   a:{b}}}"/>
-<div #default="{destructuring:{   a:{b}}}"/>
-<slot slot-scope="{destructuring:{   a:{b}}}"/>
-</div>
-</template>
-
-<!-- Prettier stable -->
-<script setup="props, {emit }"></script>
-<style vars="{color }"></style>
-<template>
-  <div>
-    <div v-slot="{ destructuring: { a: { b } } }" />
-    <div v-slot:name="{ destructuring: { a: { b } } }" />
-    <div #default="{ destructuring: { a: { b } } }" />
-    <slot
-      slot-scope="{
-        destructuring: {
-          a: { b },
-        },
-      }"
-    />
-  </div>
-</template>
-
-<!-- Prettier master -->
-<script setup="props, { emit }"></script>
-<style vars="{ color }"></style>
-<template>
-  <div>
-    <div
-      v-slot="{
-        destructuring: {
-          a: { b },
-        },
-      }"
-    />
-    <div
-      v-slot:name="{
-        destructuring: {
-          a: { b },
-        },
-      }"
-    />
-    <div
-      #default="{
-        destructuring: {
-          a: { b },
-        },
-      }"
-    />
-    <slot
-      slot-scope="{
-        destructuring: {
-          a: { b },
-        },
-      }"
-    />
-  </div>
-</template>
-```
diff --git a/changelog_unreleased/yaml/pr-9665.md b/changelog_unreleased/yaml/pr-9665.md
deleted file mode 100644
index 5e9990203..000000000
--- a/changelog_unreleased/yaml/pr-9665.md
+++ /dev/null
@@ -1,46 +0,0 @@
-#### Apply `trailingComma` option (#9665 by @fisker)
-
-When `--trailing-comma=none`, should not add trailing comma to flowMapping and flowSequence.
-
-<!-- prettier-ignore -->
-```yaml
-# Input
-flow-mapping:
-  {
-    "object-does-not-fit-within-print-width": "------",
-    "TEST": "comma IS added here"
-  }
-flow-sequence:
-  [
-    "object-does-not-fit-within-print-width", "------",
-    "TEST", "comma IS added here"
-  ]
-
-# Prettier stable
-mapping:
-  {
-    "object-does-not-fit-within-print-width": "------",
-    "TEST": "comma IS added here",
-  }
-flow-sequence:
-  [
-    "object-does-not-fit-within-print-width",
-    "------",
-    "TEST",
-    "comma IS added here",
-  ]
-
-# Prettier master
-flow-mapping:
-  {
-    "object-does-not-fit-within-print-width": "------",
-    "TEST": "comma IS added here"
-  }
-flow-sequence:
-  [
-    "object-does-not-fit-within-print-width",
-    "------",
-    "TEST",
-    "comma IS added here"
-  ]
-```
diff --git a/changelog_unreleased/yaml/pr-9669.md b/changelog_unreleased/yaml/pr-9669.md
deleted file mode 100644
index 70aa1fba0..000000000
--- a/changelog_unreleased/yaml/pr-9669.md
+++ /dev/null
@@ -1,60 +0,0 @@
-#### Fix comments inside `flowMapping` and `flowSequence` (#9669 by @fisker)
-
-<!-- prettier-ignore -->
-```yaml
-# Input
-a:
-  [
-    a, b,
-    # comment
-  ]
-
-b:
-  # prettier-ignore
-  {
-    a: 1, b: 2,
-    # comment
-  }
-
-# Prettier stable
-a: [a, b]
-  # comment
-
-b:
-  # prettier-ignore
-  {
-    a: 1, b: 2,
-    # comment
-  }
-  # comment
-
-
-# Prettier stable (second format)
-a:
-  [a, b]
-  # comment
-
-b:
-  # prettier-ignore
-  {
-    a: 1, b: 2,
-    # comment
-  }
-  # comment
-  # comment
-
-
-# Prettier master
-a: [
-    a,
-    b,
-    # comment
-  ]
-
-b:
-  # prettier-ignore
-  {
-    a: 1, b: 2,
-    # comment
-  }
-```

From 81303dab8c85765ae87b9921536cde8954d37a9f Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Fri, 20 Nov 2020 13:24:02 +0800
Subject: [PATCH 076/299] Docs: Add missing `meriyah` parser

---
 docs/options.md                                  | 1 +
 website/versioned_docs/version-stable/options.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/options.md b/docs/options.md
index 9dc4220f9..194684803 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -212,6 +212,7 @@ Valid options:
 - `"flow"` (via [flow-parser](https://github.com/facebook/flow/tree/master/src/parser))
 - `"typescript"` (via [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint)) _First available in v1.4.0_
 - `"espree"` (via [espree](https://github.com/eslint/espree)) _First available in v2.2.0_
+- `"meriyah"` (via [espree](https://github.com/meriyah/meriyah)) _First available in v2.2.0_
 - `"css"` (via [postcss-scss](https://github.com/postcss/postcss-scss) and [postcss-less](https://github.com/shellscape/postcss-less), autodetects which to use) _First available in v1.7.1_
 - `"scss"` (same parsers as `"css"`, prefers postcss-scss) _First available in v1.7.1_
 - `"less"` (same parsers as `"css"`, prefers postcss-less) _First available in v1.7.1_
diff --git a/website/versioned_docs/version-stable/options.md b/website/versioned_docs/version-stable/options.md
index 8791162a8..de7d73198 100644
--- a/website/versioned_docs/version-stable/options.md
+++ b/website/versioned_docs/version-stable/options.md
@@ -213,6 +213,7 @@ Valid options:
 - `"flow"` (via [flow-parser](https://github.com/facebook/flow/tree/master/src/parser))
 - `"typescript"` (via [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint)) _First available in v1.4.0_
 - `"espree"` (via [espree](https://github.com/eslint/espree)) _First available in v2.2.0_
+- `"meriyah"` (via [espree](https://github.com/meriyah/meriyah)) _First available in v2.2.0_
 - `"css"` (via [postcss-scss](https://github.com/postcss/postcss-scss) and [postcss-less](https://github.com/shellscape/postcss-less), autodetects which to use) _First available in v1.7.1_
 - `"scss"` (same parsers as `"css"`, prefers postcss-scss) _First available in v1.7.1_
 - `"less"` (same parsers as `"css"`, prefers postcss-less) _First available in v1.7.1_

From 114fe2e6cc0864e9f9e9f24379aaf424be8b3e7a Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Fri, 20 Nov 2020 13:34:43 +0800
Subject: [PATCH 077/299] Fix typo

---
 docs/options.md                                  | 2 +-
 website/versioned_docs/version-stable/options.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/options.md b/docs/options.md
index 194684803..d380c51f3 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -212,7 +212,7 @@ Valid options:
 - `"flow"` (via [flow-parser](https://github.com/facebook/flow/tree/master/src/parser))
 - `"typescript"` (via [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint)) _First available in v1.4.0_
 - `"espree"` (via [espree](https://github.com/eslint/espree)) _First available in v2.2.0_
-- `"meriyah"` (via [espree](https://github.com/meriyah/meriyah)) _First available in v2.2.0_
+- `"meriyah"` (via [meriyah](https://github.com/meriyah/meriyah)) _First available in v2.2.0_
 - `"css"` (via [postcss-scss](https://github.com/postcss/postcss-scss) and [postcss-less](https://github.com/shellscape/postcss-less), autodetects which to use) _First available in v1.7.1_
 - `"scss"` (same parsers as `"css"`, prefers postcss-scss) _First available in v1.7.1_
 - `"less"` (same parsers as `"css"`, prefers postcss-less) _First available in v1.7.1_
diff --git a/website/versioned_docs/version-stable/options.md b/website/versioned_docs/version-stable/options.md
index de7d73198..1941ae386 100644
--- a/website/versioned_docs/version-stable/options.md
+++ b/website/versioned_docs/version-stable/options.md
@@ -213,7 +213,7 @@ Valid options:
 - `"flow"` (via [flow-parser](https://github.com/facebook/flow/tree/master/src/parser))
 - `"typescript"` (via [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint)) _First available in v1.4.0_
 - `"espree"` (via [espree](https://github.com/eslint/espree)) _First available in v2.2.0_
-- `"meriyah"` (via [espree](https://github.com/meriyah/meriyah)) _First available in v2.2.0_
+- `"meriyah"` (via [meriyah](https://github.com/meriyah/meriyah)) _First available in v2.2.0_
 - `"css"` (via [postcss-scss](https://github.com/postcss/postcss-scss) and [postcss-less](https://github.com/shellscape/postcss-less), autodetects which to use) _First available in v1.7.1_
 - `"scss"` (same parsers as `"css"`, prefers postcss-scss) _First available in v1.7.1_
 - `"less"` (same parsers as `"css"`, prefers postcss-less) _First available in v1.7.1_

From 74ec6a25f394065ad9ac136b3e8da6e2ff88843d Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 20 Nov 2020 13:54:14 +0800
Subject: [PATCH 078/299] Remove changelog filename `pr-` prefix (#9667)

---
 changelog_unreleased/TEMPLATE.md          | 2 +-
 scripts/draft-blog-post.js                | 2 +-
 scripts/lint-changelog.js                 | 4 ++--
 scripts/release/steps/update-changelog.js | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/changelog_unreleased/TEMPLATE.md b/changelog_unreleased/TEMPLATE.md
index 4700d04e1..4e961c104 100644
--- a/changelog_unreleased/TEMPLATE.md
+++ b/changelog_unreleased/TEMPLATE.md
@@ -6,7 +6,7 @@
    - For TypeScript specific syntax, choose `typescript/`.
    - If your PR applies to multiple languages, such as TypeScript/Flow, choose one folder and mention which languages it applies to.
 
-2. In your chosen folder, create a file with your PR number: `pr-XXXX.md`. For example: `typescript/pr-6728.md`.
+2. In your chosen folder, create a file with your PR number: `XXXX.md`. For example: `typescript/6728.md`.
 
 3. Copy the content below and paste it in your new file.
 
diff --git a/scripts/draft-blog-post.js b/scripts/draft-blog-post.js
index 2a3daad2a..b71290e35 100644
--- a/scripts/draft-blog-post.js
+++ b/scripts/draft-blog-post.js
@@ -65,7 +65,7 @@ for (const dir of dirs) {
 
   category.entries = fs
     .readdirSync(dirPath)
-    .filter((fileName) => /^pr-\d+\.md$/.test(fileName))
+    .filter((fileName) => /^\d+\.md$/.test(fileName))
     .map((fileName) => {
       const [title, ...rest] = fs
         .readFileSync(path.join(dirPath, fileName), "utf8")
diff --git a/scripts/lint-changelog.js b/scripts/lint-changelog.js
index 401cbf494..f7548a247 100644
--- a/scripts/lint-changelog.js
+++ b/scripts/lint-changelog.js
@@ -79,12 +79,12 @@ for (const category of CHANGELOG_CATEGORIES) {
       continue;
     }
 
-    const match = prFile.match(/^pr-(\d{4,})\.md$/);
+    const match = prFile.match(/^(\d{4,})\.md$/);
     const displayPath = `${CHANGELOG_DIR}/${category}/${prFile}`;
 
     if (!match) {
       showErrorMessage(
-        `[${displayPath}]: Filename is not in form of "pr-{PR_NUMBER}.md".`
+        `[${displayPath}]: Filename is not in form of "{PR_NUMBER}.md".`
       );
       continue;
     }
diff --git a/scripts/release/steps/update-changelog.js b/scripts/release/steps/update-changelog.js
index 76cfad53a..3f8adf195 100644
--- a/scripts/release/steps/update-changelog.js
+++ b/scripts/release/steps/update-changelog.js
@@ -56,7 +56,7 @@ module.exports = async function ({ version, previousVersion }) {
       outdentString(chalk`
         {yellow.bold A manual step is necessary.}
 
-        You can copy the entries from {bold changelog_unreleased/*/pr-*.md} to {bold CHANGELOG.md}
+        You can copy the entries from {bold changelog_unreleased/*/*.md} to {bold CHANGELOG.md}
         and update it accordingly.
 
         You don't need to commit the file, the script will take care of that.

From cc2932d8b0d6169726a6c057ff3b29194cc34d49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Nov 2020 14:44:56 +0800
Subject: [PATCH 079/299] Build(deps-dev): Bump webpack from 5.5.1 to 5.6.0
 (#9729)

Bumps [webpack](https://github.com/webpack/webpack) from 5.5.1 to 5.6.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.5.1...v5.6.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fd7478a6e..c5a670d72 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "synchronous-promise": "2.0.15",
     "tempy": "1.0.0",
     "terser-webpack-plugin": "5.0.3",
-    "webpack": "5.5.1"
+    "webpack": "5.6.0"
   },
   "scripts": {
     "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
diff --git a/yarn.lock b/yarn.lock
index 0baa4dc83..b7756773e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7447,10 +7447,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.5.1:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.5.1.tgz#d6537f85554a0e59f15e6e683af11befdd0476aa"
-  integrity sha512-v4RzZP9BG2xxMLhxcFIo89M+nyIqGjh35Bhm5EE+I2N8y3dc9jT5OSb1HewUMkzMPyyDscOkVD6pSn6EMtTwNQ==
+webpack@5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.6.0.tgz#282d10434c403b070ed91d459b385e873b51a07d"
+  integrity sha512-SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From 2381f5aedb47dbc3ab005ac82d4ea08f1ba6dce0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Nov 2020 14:45:27 +0800
Subject: [PATCH 080/299] Build(deps-dev): Bump webpack from 5.5.1 to 5.6.0 in
 /website (#9728)

Bumps [webpack](https://github.com/webpack/webpack) from 5.5.1 to 5.6.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.5.1...v5.6.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index 6c50b1157..d8ceb3435 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.0",
     "svgo": "1.3.2",
-    "webpack": "5.5.1",
+    "webpack": "5.6.0",
     "webpack-cli": "4.2.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index f25f1d395..daa596098 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -7373,10 +7373,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.5.1:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.5.1.tgz#d6537f85554a0e59f15e6e683af11befdd0476aa"
-  integrity sha512-v4RzZP9BG2xxMLhxcFIo89M+nyIqGjh35Bhm5EE+I2N8y3dc9jT5OSb1HewUMkzMPyyDscOkVD6pSn6EMtTwNQ==
+webpack@5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.6.0.tgz#282d10434c403b070ed91d459b385e873b51a07d"
+  integrity sha512-SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From 4ae69300e70110d42adcd7250485ab3399bf11e3 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sat, 21 Nov 2020 13:18:53 +0800
Subject: [PATCH 081/299] Update PULL_REQUEST_TEMPLATE.md (#9737)

* Remove PULL_REQUEST_TEMPLATE.md `pr-` prefix

* Add heading

* Add a comment to remind not remove playground link
---
 .github/PULL_REQUEST_TEMPLATE.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6ef9e89f7..4f0d98099 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,17 @@
+## Description
+
 <!-- Please provide a brief summary of your changes: -->
 
+## Checklist
+
 <!-- Please ensure you’ve done all of these things (if applicable). -->
 <!-- You can replace the `[ ]` with `[x]` to mark each task as done. -->
 
 - [ ] I’ve added tests to confirm my change works.
-- [ ] (If changing the API or CLI) I’ve documented the changes I’ve made (in the `docs/` directory)
-- [ ] (If the change is user-facing) I’ve added my changes to `changelog_unreleased/*/pr-XXXX.md` file following `changelog_unreleased/TEMPLATE.md`.
+- [ ] (If changing the API or CLI) I’ve documented the changes I’ve made (in the `docs/` directory).
+- [ ] (If the change is user-facing) I’ve added my changes to `changelog_unreleased/*/XXXX.md` file following `changelog_unreleased/TEMPLATE.md`.
 - [ ] I’ve read the [contributing guidelines](https://github.com/prettier/prettier/blob/master/CONTRIBUTING.md).
 
+<!-- Please DO NOT remove the playground link -->
+
 **✨[Try the playground for this PR](https://prettier.io/playground-redirect)✨**

From 8b7658236a296a1d4bd132bd44776717b3fd5879 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sat, 21 Nov 2020 13:20:14 +0800
Subject: [PATCH 082/299] Refactor JS printer (#9730)

---
 src/language-js/print/angular.js            | 127 ++++++++++++
 src/language-js/{ => print}/html-binding.js |   2 +-
 src/language-js/print/jsx.js                |  56 +++++-
 src/language-js/print/type-parameters.js    |  64 +++++-
 src/language-js/printer-estree.js           | 212 ++------------------
 src/language-js/utils.js                    |  30 ---
 6 files changed, 259 insertions(+), 232 deletions(-)
 create mode 100644 src/language-js/print/angular.js
 rename src/language-js/{ => print}/html-binding.js (98%)

diff --git a/src/language-js/print/angular.js b/src/language-js/print/angular.js
new file mode 100644
index 000000000..b370d1f8c
--- /dev/null
+++ b/src/language-js/print/angular.js
@@ -0,0 +1,127 @@
+"use strict";
+
+const {
+  builders: { concat, join, line, group },
+} = require("../../document");
+const { hasNode } = require("../utils");
+const { printBinaryishExpression } = require("./binaryish");
+
+/** @typedef {import("../../common/fast-path")} FastPath */
+
+function printAngular(path, options, print) {
+  const n = path.getValue();
+  switch (n.type) {
+    case "NGRoot":
+      return concat(
+        [].concat(
+          path.call(print, "node"),
+          !n.node.comments || n.node.comments.length === 0
+            ? []
+            : concat([" //", n.node.comments[0].value.trimEnd()])
+        )
+      );
+    case "NGPipeExpression":
+      return printBinaryishExpression(path, options, print);
+    case "NGChainedExpression":
+      return group(
+        join(
+          concat([";", line]),
+          path.map(
+            (childPath) =>
+              hasNgSideEffect(childPath)
+                ? print(childPath)
+                : concat(["(", print(childPath), ")"]),
+            "expressions"
+          )
+        )
+      );
+    case "NGEmptyExpression":
+      return "";
+    case "NGQuotedExpression":
+      return concat([n.prefix, ": ", n.value.trim()]);
+    case "NGMicrosyntax":
+      return concat(
+        path.map(
+          (childPath, index) =>
+            concat([
+              index === 0
+                ? ""
+                : isNgForOf(childPath.getValue(), index, n)
+                ? " "
+                : concat([";", line]),
+              print(childPath),
+            ]),
+          "body"
+        )
+      );
+    case "NGMicrosyntaxKey":
+      return /^[$_a-z][\w$]*(-[$_a-z][\w$])*$/i.test(n.name)
+        ? n.name
+        : JSON.stringify(n.name);
+    case "NGMicrosyntaxExpression":
+      return concat([
+        path.call(print, "expression"),
+        n.alias === null ? "" : concat([" as ", path.call(print, "alias")]),
+      ]);
+    case "NGMicrosyntaxKeyedExpression": {
+      const index = path.getName();
+      const parentNode = path.getParentNode();
+      const shouldNotPrintColon =
+        isNgForOf(n, index, parentNode) ||
+        (((index === 1 && (n.key.name === "then" || n.key.name === "else")) ||
+          (index === 2 &&
+            n.key.name === "else" &&
+            parentNode.body[index - 1].type ===
+              "NGMicrosyntaxKeyedExpression" &&
+            parentNode.body[index - 1].key.name === "then")) &&
+          parentNode.body[0].type === "NGMicrosyntaxExpression");
+      return concat([
+        path.call(print, "key"),
+        shouldNotPrintColon ? " " : ": ",
+        path.call(print, "expression"),
+      ]);
+    }
+    case "NGMicrosyntaxLet":
+      return concat([
+        "let ",
+        path.call(print, "key"),
+        n.value === null ? "" : concat([" = ", path.call(print, "value")]),
+      ]);
+    case "NGMicrosyntaxAs":
+      return concat([
+        path.call(print, "key"),
+        " as ",
+        path.call(print, "alias"),
+      ]);
+  }
+}
+
+function isNgForOf(node, index, parentNode) {
+  return (
+    node.type === "NGMicrosyntaxKeyedExpression" &&
+    node.key.name === "of" &&
+    index === 1 &&
+    parentNode.body[0].type === "NGMicrosyntaxLet" &&
+    parentNode.body[0].value === null
+  );
+}
+
+/** identify if an angular expression seems to have side effects */
+/**
+ * @param {FastPath} path
+ * @returns {boolean}
+ */
+function hasNgSideEffect(path) {
+  return hasNode(path.getValue(), (node) => {
+    switch (node.type) {
+      case undefined:
+        return false;
+      case "CallExpression":
+      case "OptionalCallExpression":
+      case "AssignmentExpression":
+        return true;
+    }
+  });
+}
+
+module.exports = { printAngular };
diff --git a/src/language-js/html-binding.js b/src/language-js/print/html-binding.js
similarity index 98%
rename from src/language-js/html-binding.js
rename to src/language-js/print/html-binding.js
index 65dba36cd..ebf1cbf18 100644
--- a/src/language-js/html-binding.js
+++ b/src/language-js/print/html-binding.js
@@ -2,7 +2,7 @@
 
 const {
   builders: { concat, join, line, group, softline, indent },
-} = require("../document");
+} = require("../../document");
 
 function printHtmlBinding(path, options, print) {
   const node = path.getValue();
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index 4c21a063e..06551ac27 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -13,6 +13,7 @@ const {
     fill,
     ifBreak,
     lineSuffixBoundary,
+    join,
   },
   utils: { willBreak, isLineNext, isEmpty },
 } = require("../../document");
@@ -707,15 +708,50 @@ function printJsxSpreadAttribute(path, options, print) {
   ]);
 }
 
+function printJsx(path, options, print) {
+  const n = path.getValue();
+  switch (n.type) {
+    case "JSXAttribute":
+      return printJsxAttribute(path, options, print);
+    case "JSXIdentifier":
+      return "" + n.name;
+    case "JSXNamespacedName":
+      return join(":", [
+        path.call(print, "namespace"),
+        path.call(print, "name"),
+      ]);
+    case "JSXMemberExpression":
+      return join(".", [
+        path.call(print, "object"),
+        path.call(print, "property"),
+      ]);
+    case "JSXSpreadAttribute":
+      return printJsxSpreadAttribute(path, options, print);
+    case "JSXSpreadChild": {
+      // Same as `printJsxSpreadAttribute`
+      const printJsxSpreadChild = printJsxSpreadAttribute;
+      return printJsxSpreadChild(path, options, print);
+    }
+    case "JSXExpressionContainer":
+      return printJsxExpressionContainer(path, options, print);
+    case "JSXFragment":
+    case "JSXElement":
+      return printJsxElement(path, options, print);
+    case "JSXOpeningElement":
+      return printJsxOpeningElement(path, options, print);
+    case "JSXClosingElement":
+      return printJsxClosingElement(path, options, print);
+    case "JSXOpeningFragment":
+    case "JSXClosingFragment":
+      return printJsxOpeningClosingFragment(path, options /*, print*/);
+    case "JSXEmptyExpression":
+      return printJsxEmptyExpression(path, options /*, print*/);
+    case "JSXText":
+      /* istanbul ignore next */
+      throw new Error("JSXTest should be handled by JSXElement");
+  }
+}
+
 module.exports = {
-  printJsxElement,
-  printJsxAttribute,
-  printJsxOpeningElement,
-  printJsxClosingElement,
-  printJsxOpeningClosingFragment,
-  printJsxExpressionContainer,
-  printJsxEmptyExpression,
-  printJsxSpreadAttribute,
-  // Alias
-  printJsxSpreadChild: printJsxSpreadAttribute,
+  printJsx,
 };
diff --git a/src/language-js/print/type-parameters.js b/src/language-js/print/type-parameters.js
index f4c53039f..2fe3029c6 100644
--- a/src/language-js/print/type-parameters.js
+++ b/src/language-js/print/type-parameters.js
@@ -8,7 +8,9 @@ const {
   hasDanglingComments,
   isTestCall,
   isBlockComment,
+  isTSXFile,
   shouldPrintComma,
+  getFunctionParameters,
 } = require("../utils");
 const { shouldHugType } = require("./type-annotation");
 
@@ -97,4 +99,64 @@ function printDanglingCommentsForInline(path, options) {
   return concat([printed, hardline]);
 }
 
-module.exports = { printTypeParameters, getTypeParametersGroupId };
+function printTypeParameter(path, options, print) {
+  const n = path.getValue();
+  const parts = [];
+  const parent = path.getParentNode();
+  if (parent.type === "TSMappedType") {
+    parts.push("[", path.call(print, "name"));
+    if (n.constraint) {
+      parts.push(" in ", path.call(print, "constraint"));
+    }
+    if (parent.nameType) {
+      parts.push(
+        " as ",
+        path.callParent((path) => {
+          return path.call(print, "nameType");
+        })
+      );
+    }
+    parts.push("]");
+    return concat(parts);
+  }
+
+  if (n.variance) {
+    parts.push(path.call(print, "variance"));
+  }
+
+  parts.push(path.call(print, "name"));
+
+  if (n.bound) {
+    parts.push(": ");
+    parts.push(path.call(print, "bound"));
+  }
+
+  if (n.constraint) {
+    parts.push(" extends ", path.call(print, "constraint"));
+  }
+
+  if (n.default) {
+    parts.push(" = ", path.call(print, "default"));
+  }
+
+  // Keep comma if the file extension is .tsx and
+  // has one type parameter that isn't extend with any types.
+  // Because, otherwise formatted result will be invalid as tsx.
+  const grandParent = path.getNode(2);
+  if (
+    getFunctionParameters(parent).length === 1 &&
+    isTSXFile(options) &&
+    !n.constraint &&
+    grandParent.type === "ArrowFunctionExpression"
+  ) {
+    parts.push(",");
+  }
+
+  return concat(parts);
+}
+
+module.exports = {
+  printTypeParameter,
+  printTypeParameters,
+  getTypeParametersGroupId,
+};
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 025e7775e..eda0fc57d 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -36,13 +36,8 @@ const clean = require("./clean");
 const { insertPragma } = require("./pragma");
 const handleComments = require("./comments");
 const pathNeedsParens = require("./needs-parens");
-const {
-  printHtmlBinding,
-  isVueEventBindingExpression,
-} = require("./html-binding");
 const preprocess = require("./print-preprocess");
 const {
-  getFunctionParameters,
   getCallArguments,
   getParentExportDeclaration,
   getTypeScriptMappedTypeModifier,
@@ -50,18 +45,15 @@ const {
   hasFlowShorthandAnnotationComment,
   hasLeadingOwnLineComment,
   hasNewlineBetweenOrAfterDecorators,
-  hasNgSideEffect,
   hasPrettierIgnore,
   hasTrailingComment,
   isExportDeclaration,
   isFunctionNotation,
   isGetterOrSetter,
   isLiteral,
-  isNgForOf,
   isObjectType,
   isObjectTypePropertyAFunction,
   isTheOnlyJSXElementInMarkdown,
-  isTSXFile,
   isBlockComment,
   needsHardlineAfterDanglingComment,
   rawText,
@@ -69,6 +61,12 @@ const {
 } = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
+const {
+  printHtmlBinding,
+  isVueEventBindingExpression,
+} = require("./print/html-binding");
+const { printAngular } = require("./print/angular");
+const { printJsx } = require("./print/jsx");
 const {
   printOptionalToken,
   printBindExpressionCallee,
@@ -92,19 +90,11 @@ const {
   printTypeAnnotation,
   shouldHugType,
 } = require("./print/type-annotation");
-const {
-  printJsxElement,
-  printJsxAttribute,
-  printJsxOpeningElement,
-  printJsxClosingElement,
-  printJsxOpeningClosingFragment,
-  printJsxExpressionContainer,
-  printJsxEmptyExpression,
-  printJsxSpreadAttribute,
-  printJsxSpreadChild,
-} = require("./print/jsx");
 const { printClass, printClassMethod } = require("./print/class");
-const { printTypeParameters } = require("./print/type-parameters");
+const {
+  printTypeParameter,
+  printTypeParameters,
+} = require("./print/type-parameters");
 const { printPropertyKey } = require("./print/property");
 const {
   printFunctionDeclaration,
@@ -251,6 +241,16 @@ function printPathNoParens(path, options, print, args) {
     return htmlBinding;
   }
 
+  const printedAngular = printAngular(path, options, print);
+  if (typeof printedAngular !== "undefined") {
+    return printedAngular;
+  }
+
+  const printedJsx = printJsx(path, options, print);
+  if (typeof printedJsx !== "undefined") {
+    return printedJsx;
+  }
+
   /** @type{Doc[]} */
   let parts = [];
 
@@ -359,7 +359,6 @@ function printPathNoParens(path, options, print, args) {
       return printVariableDeclarator(path, options, print);
     case "BinaryExpression":
     case "LogicalExpression":
-    case "NGPipeExpression":
       return printBinaryishExpression(path, options, print);
     case "AssignmentPattern":
       return concat([
@@ -1052,43 +1051,8 @@ function printPathNoParens(path, options, print, args) {
     // JSX extensions below.
     case "DebuggerStatement":
       return concat(["debugger", semi]);
-    case "JSXAttribute":
-      return printJsxAttribute(path, options, print);
-    case "JSXIdentifier":
-      return "" + n.name;
-    case "JSXNamespacedName":
-      return join(":", [
-        path.call(print, "namespace"),
-        path.call(print, "name"),
-      ]);
-    case "JSXMemberExpression":
-      return join(".", [
-        path.call(print, "object"),
-        path.call(print, "property"),
-      ]);
     case "TSQualifiedName":
       return join(".", [path.call(print, "left"), path.call(print, "right")]);
-    case "JSXSpreadAttribute":
-      return printJsxSpreadAttribute(path, options, print);
-    case "JSXSpreadChild":
-      return printJsxSpreadChild(path, options, print);
-    case "JSXExpressionContainer":
-      return printJsxExpressionContainer(path, options, print);
-    case "JSXFragment":
-    case "JSXElement":
-      return printJsxElement(path, options, print);
-    case "JSXOpeningElement":
-      return printJsxOpeningElement(path, options, print);
-    case "JSXClosingElement":
-      return printJsxClosingElement(path, options, print);
-    case "JSXOpeningFragment":
-    case "JSXClosingFragment":
-      return printJsxOpeningClosingFragment(path, options /*, print*/);
-    case "JSXText":
-      /* istanbul ignore next */
-      throw new Error("JSXTest should be handled by JSXElement");
-    case "JSXEmptyExpression":
-      return printJsxEmptyExpression(path, options /*, print*/);
     case "ClassBody":
       if (!n.comments && n.body.length === 0) {
         return "{}";
@@ -1743,59 +1707,8 @@ function printPathNoParens(path, options, print, args) {
       return printTypeParameters(path, options, print, "params");
 
     case "TSTypeParameter":
-    case "TypeParameter": {
-      const parent = path.getParentNode();
-      if (parent.type === "TSMappedType") {
-        parts.push("[", path.call(print, "name"));
-        if (n.constraint) {
-          parts.push(" in ", path.call(print, "constraint"));
-        }
-        if (parent.nameType) {
-          parts.push(
-            " as ",
-            path.callParent((path) => {
-              return path.call(print, "nameType");
-            })
-          );
-        }
-        parts.push("]");
-        return concat(parts);
-      }
-
-      if (n.variance) {
-        parts.push(path.call(print, "variance"));
-      }
-
-      parts.push(path.call(print, "name"));
-
-      if (n.bound) {
-        parts.push(": ");
-        parts.push(path.call(print, "bound"));
-      }
-
-      if (n.constraint) {
-        parts.push(" extends ", path.call(print, "constraint"));
-      }
-
-      if (n.default) {
-        parts.push(" = ", path.call(print, "default"));
-      }
-
-      // Keep comma if the file extension is .tsx and
-      // has one type parameter that isn't extend with any types.
-      // Because, otherwise formatted result will be invalid as tsx.
-      const grandParent = path.getNode(2);
-      if (
-        getFunctionParameters(parent).length === 1 &&
-        isTSXFile(options) &&
-        !n.constraint &&
-        grandParent.type === "ArrowFunctionExpression"
-      ) {
-        parts.push(",");
-      }
-
-      return concat(parts);
-    }
+    case "TypeParameter":
+      return printTypeParameter(path, options, print);
     case "TypeofTypeAnnotation":
       return concat(["typeof ", path.call(print, "argument")]);
     case "InferredPredicate":
@@ -2251,87 +2164,6 @@ function printPathNoParens(path, options, print, args) {
 
       return concat(parts);
 
-    case "NGRoot":
-      return concat(
-        [].concat(
-          path.call(print, "node"),
-          !n.node.comments || n.node.comments.length === 0
-            ? []
-            : concat([" //", n.node.comments[0].value.trimEnd()])
-        )
-      );
-    case "NGChainedExpression":
-      return group(
-        join(
-          concat([";", line]),
-          path.map(
-            (childPath) =>
-              hasNgSideEffect(childPath)
-                ? print(childPath)
-                : concat(["(", print(childPath), ")"]),
-            "expressions"
-          )
-        )
-      );
-    case "NGEmptyExpression":
-      return "";
-    case "NGQuotedExpression":
-      return concat([n.prefix, ": ", n.value.trim()]);
-    case "NGMicrosyntax":
-      return concat(
-        path.map(
-          (childPath, index) =>
-            concat([
-              index === 0
-                ? ""
-                : isNgForOf(childPath.getValue(), index, n)
-                ? " "
-                : concat([";", line]),
-              print(childPath),
-            ]),
-          "body"
-        )
-      );
-    case "NGMicrosyntaxKey":
-      return /^[$_a-z][\w$]*(-[$_a-z][\w$])*$/i.test(n.name)
-        ? n.name
-        : JSON.stringify(n.name);
-    case "NGMicrosyntaxExpression":
-      return concat([
-        path.call(print, "expression"),
-        n.alias === null ? "" : concat([" as ", path.call(print, "alias")]),
-      ]);
-    case "NGMicrosyntaxKeyedExpression": {
-      const index = path.getName();
-      const parentNode = path.getParentNode();
-      const shouldNotPrintColon =
-        isNgForOf(n, index, parentNode) ||
-        (((index === 1 && (n.key.name === "then" || n.key.name === "else")) ||
-          (index === 2 &&
-            n.key.name === "else" &&
-            parentNode.body[index - 1].type ===
-              "NGMicrosyntaxKeyedExpression" &&
-            parentNode.body[index - 1].key.name === "then")) &&
-          parentNode.body[0].type === "NGMicrosyntaxExpression");
-      return concat([
-        path.call(print, "key"),
-        shouldNotPrintColon ? " " : ": ",
-        path.call(print, "expression"),
-      ]);
-    }
-    case "NGMicrosyntaxLet":
-      return concat([
-        "let ",
-        path.call(print, "key"),
-        n.value === null ? "" : concat([" = ", path.call(print, "value")]),
-      ]);
-    case "NGMicrosyntaxAs":
-      return concat([
-        path.call(print, "key"),
-        " as ",
-        path.call(print, "alias"),
-      ]);
-
     case "PipelineBareFunction":
       return path.call(print, "callee");
     case "PipelineTopicExpression":
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index a98e8c8b6..16184d372 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -614,34 +614,6 @@ function hasDanglingComments(node) {
   );
 }
 
-/** identify if an angular expression seems to have side effects */
-/**
- * @param {FastPath} path
- * @returns {boolean}
- */
-function hasNgSideEffect(path) {
-  return hasNode(path.getValue(), (node) => {
-    switch (node.type) {
-      case undefined:
-        return false;
-      case "CallExpression":
-      case "OptionalCallExpression":
-      case "AssignmentExpression":
-        return true;
-    }
-  });
-}
-
-function isNgForOf(node, index, parentNode) {
-  return (
-    node.type === "NGMicrosyntaxKeyedExpression" &&
-    node.key.name === "of" &&
-    index === 1 &&
-    parentNode.body[0].type === "NGMicrosyntaxLet" &&
-    parentNode.body[0].value === null
-  );
-}
-
 /**
  *
  * @param {any} node
@@ -1519,7 +1491,6 @@ module.exports = {
   hasLeadingOwnLineComment,
   hasNakedLeftSide,
   hasNewlineBetweenOrAfterDecorators,
-  hasNgSideEffect,
   hasNode,
   hasPrettierIgnore,
   hasTrailingComment,
@@ -1549,7 +1520,6 @@ module.exports = {
   isMeaningfulJSXText,
   isMemberExpressionChain,
   isMemberish,
-  isNgForOf,
   isNumericLiteral,
   isObjectType,
   isObjectTypePropertyAFunction,

From f9c32016a71ea8afdeb73133d7269b85a3a0d596 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sat, 21 Nov 2020 16:34:03 +0800
Subject: [PATCH 083/299] Refactor: Stop mutating comments during
 `decorateComment` (#9726)

---
 src/language-js/comments.js       | 331 ++++++++++++++++++++----------
 src/language-js/printer-estree.js |   2 +
 src/main/comments.js              | 123 +++++------
 3 files changed, 284 insertions(+), 172 deletions(-)

diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index ea999d16b..0433fe3c6 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -22,66 +22,96 @@ const {
 } = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
-function handleOwnLineComment(comment, text, options, ast, isLastComment) {
-  return (
-    handleIgnoreComments(comment) ||
-    handleLastFunctionArgComments(comment, text) ||
-    handleMemberExpressionComments(comment) ||
-    handleIfStatementComments(comment, text) ||
-    handleWhileComments(comment, text) ||
-    handleTryStatementComments(comment) ||
-    handleClassComments(comment) ||
-    handleImportSpecifierComments(comment) ||
-    handleForComments(comment) ||
-    handleUnionTypeComments(comment) ||
-    handleOnlyComments(comment, ast, isLastComment) ||
-    handleImportDeclarationComments(comment, text) ||
-    handleAssignmentPatternComments(comment) ||
-    handleMethodNameComments(comment, text) ||
-    handleLabeledStatementComments(comment)
-  );
+/**
+ * @typedef {import("./types/estree").Node} Node
+ * @typedef {import("./types/estree").Comment} Comment
+ * @typedef {import("../common/fast-path")} FastPath
+ *
+ * @typedef {Object} CommentContext
+ * @property {Comment} comment
+ * @property {Node} precedingNode
+ * @property {Node} enclosingNode
+ * @property {Node} followingNode
+ * @property {string} text
+ * @property {any} options
+ * @property {Node} ast
+ * @property {boolean} isLastComment
+ */
+
+/**
+ * @param {CommentContext} context
+ * @returns {boolean}
+ */
+function handleOwnLineComment(context) {
+  return [
+    handleIgnoreComments,
+    handleLastFunctionArgComments,
+    handleMemberExpressionComments,
+    handleIfStatementComments,
+    handleWhileComments,
+    handleTryStatementComments,
+    handleClassComments,
+    handleImportSpecifierComments,
+    handleForComments,
+    handleUnionTypeComments,
+    handleOnlyComments,
+    handleImportDeclarationComments,
+    handleAssignmentPatternComments,
+    handleMethodNameComments,
+    handleLabeledStatementComments,
+  ].some((fn) => fn(context));
 }
 
-function handleEndOfLineComment(comment, text, options, ast, isLastComment) {
-  return (
-    handleClosureTypeCastComments(comment) ||
-    handleLastFunctionArgComments(comment, text) ||
-    handleConditionalExpressionComments(comment, text) ||
-    handleImportSpecifierComments(comment) ||
-    handleIfStatementComments(comment, text) ||
-    handleWhileComments(comment, text) ||
-    handleTryStatementComments(comment) ||
-    handleClassComments(comment) ||
-    handleLabeledStatementComments(comment) ||
-    handleCallExpressionComments(comment) ||
-    handlePropertyComments(comment) ||
-    handleOnlyComments(comment, ast, isLastComment) ||
-    handleTypeAliasComments(comment) ||
-    handleVariableDeclaratorComments(comment)
-  );
+/**
+ * @param {CommentContext} context
+ * @returns {boolean}
+ */
+function handleEndOfLineComment(context) {
+  return [
+    handleClosureTypeCastComments,
+    handleLastFunctionArgComments,
+    handleConditionalExpressionComments,
+    handleImportSpecifierComments,
+    handleIfStatementComments,
+    handleWhileComments,
+    handleTryStatementComments,
+    handleClassComments,
+    handleLabeledStatementComments,
+    handleCallExpressionComments,
+    handlePropertyComments,
+    handleOnlyComments,
+    handleTypeAliasComments,
+    handleVariableDeclaratorComments,
+  ].some((fn) => fn(context));
 }
 
-function handleRemainingComment(comment, text, options, ast, isLastComment) {
-  if (
-    handleIgnoreComments(comment) ||
-    handleIfStatementComments(comment, text) ||
-    handleWhileComments(comment, text) ||
-    handleObjectPropertyAssignment(comment) ||
-    handleCommentInEmptyParens(comment, text) ||
-    handleMethodNameComments(comment, text) ||
-    handleOnlyComments(comment, ast, isLastComment) ||
-    handleCommentAfterArrowParams(comment, text) ||
-    handleFunctionNameComments(comment, text) ||
-    handleTSMappedTypeComments(comment) ||
-    handleBreakAndContinueStatementComments(comment) ||
-    handleTSFunctionTrailingComments(comment, text)
-  ) {
-    return true;
-  }
-  return false;
+/**
+ * @param {CommentContext} context
+ * @returns {boolean}
+ */
+function handleRemainingComment(context) {
+  return [
+    handleIgnoreComments,
+    handleIfStatementComments,
+    handleWhileComments,
+    handleObjectPropertyAssignment,
+    handleCommentInEmptyParens,
+    handleMethodNameComments,
+    handleOnlyComments,
+    handleCommentAfterArrowParams,
+    handleFunctionNameComments,
+    handleTSMappedTypeComments,
+    handleBreakAndContinueStatementComments,
+    handleTSFunctionTrailingComments,
+  ].some((fn) => fn(context));
 }
 
+/**
+ * @param {Node} node
+ * @returns {void}
+ */
 function addBlockStatementFirstComment(node, comment) {
+  // @ts-ignore
   const firstNonEmptyNode = (node.body || node.properties).find(
     ({ type }) => type !== "EmptyStatement"
   );
@@ -92,6 +122,10 @@ function addBlockStatementFirstComment(node, comment) {
   }
 }
 
+/**
+ * @param {Node} node
+ * @returns {void}
+ */
 function addBlockOrNotComment(node, comment) {
   if (node.type === "BlockStatement") {
     addBlockStatementFirstComment(node, comment);
@@ -100,8 +134,7 @@ function addBlockOrNotComment(node, comment) {
   }
 }
 
-function handleClosureTypeCastComments(comment) {
-  const { followingNode } = comment;
+function handleClosureTypeCastComments({ comment, followingNode }) {
   if (followingNode && isTypeCastComment(comment)) {
     addLeadingComment(followingNode, comment);
     return true;
@@ -125,8 +158,13 @@ function handleClosureTypeCastComments(comment) {
 //     // comment
 //     ...
 //   }
-function handleIfStatementComments(comment, text) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
+function handleIfStatementComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  followingNode,
+  text,
+}) {
   if (
     !enclosingNode ||
     enclosingNode.type !== "IfStatement" ||
@@ -188,8 +226,13 @@ function handleIfStatementComments(comment, text) {
   return false;
 }
 
-function handleWhileComments(comment, text) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
+function handleWhileComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  followingNode,
+  text,
+}) {
   if (
     !enclosingNode ||
     enclosingNode.type !== "WhileStatement" ||
@@ -227,8 +270,12 @@ function handleWhileComments(comment, text) {
 }
 
 // Same as IfStatement but for TryStatement
-function handleTryStatementComments(comment) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
+function handleTryStatementComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  followingNode,
+}) {
   if (
     !enclosingNode ||
     (enclosingNode.type !== "TryStatement" &&
@@ -261,9 +308,11 @@ function handleTryStatementComments(comment) {
   return false;
 }
 
-function handleMemberExpressionComments(comment) {
-  const { enclosingNode, followingNode } = comment;
-
+function handleMemberExpressionComments({
+  comment,
+  enclosingNode,
+  followingNode,
+}) {
   if (
     enclosingNode &&
     (enclosingNode.type === "MemberExpression" ||
@@ -278,8 +327,13 @@ function handleMemberExpressionComments(comment) {
   return false;
 }
 
-function handleConditionalExpressionComments(comment, text) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
+function handleConditionalExpressionComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  followingNode,
+  text,
+}) {
   const isSameLineAsPrecedingNode =
     precedingNode &&
     !hasNewlineInRange(text, locEnd(precedingNode), locStart(comment));
@@ -297,8 +351,11 @@ function handleConditionalExpressionComments(comment, text) {
   return false;
 }
 
-function handleObjectPropertyAssignment(comment) {
-  const { precedingNode, enclosingNode } = comment;
+function handleObjectPropertyAssignment({
+  comment,
+  precedingNode,
+  enclosingNode,
+}) {
   if (
     enclosingNode &&
     (enclosingNode.type === "ObjectProperty" ||
@@ -313,8 +370,12 @@ function handleObjectPropertyAssignment(comment) {
   return false;
 }
 
-function handleClassComments(comment) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
+function handleClassComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  followingNode,
+}) {
   if (
     enclosingNode &&
     (enclosingNode.type === "ClassDeclaration" ||
@@ -364,8 +425,12 @@ function handleClassComments(comment) {
   return false;
 }
 
-function handleMethodNameComments(comment, text) {
-  const { precedingNode, enclosingNode } = comment;
+function handleMethodNameComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  text,
+}) {
   // This is only needed for estree parsers (flow, typescript) to attach
   // after a method name:
   // obj = { fn /*comment*/() {} };
@@ -407,12 +472,15 @@ function handleMethodNameComments(comment, text) {
   return false;
 }
 
-function handleFunctionNameComments(comment, text) {
+function handleFunctionNameComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  text,
+}) {
   if (getNextNonSpaceNonCommentCharacter(text, comment, locEnd) !== "(") {
     return false;
   }
-
-  const { precedingNode, enclosingNode } = comment;
   if (
     precedingNode &&
     enclosingNode &&
@@ -428,8 +496,7 @@ function handleFunctionNameComments(comment, text) {
   return false;
 }
 
-function handleCommentAfterArrowParams(comment, text) {
-  const { enclosingNode } = comment;
+function handleCommentAfterArrowParams({ comment, enclosingNode, text }) {
   if (!(enclosingNode && enclosingNode.type === "ArrowFunctionExpression")) {
     return false;
   }
@@ -443,12 +510,11 @@ function handleCommentAfterArrowParams(comment, text) {
   return false;
 }
 
-function handleCommentInEmptyParens(comment, text) {
+function handleCommentInEmptyParens({ comment, enclosingNode, text }) {
   if (getNextNonSpaceNonCommentCharacter(text, comment, locEnd) !== ")") {
     return false;
   }
 
-  const { enclosingNode } = comment;
   // Only add dangling comments to fix the case when no params are present,
   // i.e. a function without any argument.
   if (
@@ -474,9 +540,13 @@ function handleCommentInEmptyParens(comment, text) {
   return false;
 }
 
-function handleLastFunctionArgComments(comment, text) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
-
+function handleLastFunctionArgComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  followingNode,
+  text,
+}) {
   // Flow function type definitions
   if (
     precedingNode &&
@@ -538,8 +608,7 @@ function handleLastFunctionArgComments(comment, text) {
   return false;
 }
 
-function handleImportSpecifierComments(comment) {
-  const { enclosingNode } = comment;
+function handleImportSpecifierComments({ comment, enclosingNode }) {
   if (enclosingNode && enclosingNode.type === "ImportSpecifier") {
     addLeadingComment(enclosingNode, comment);
     return true;
@@ -547,8 +616,7 @@ function handleImportSpecifierComments(comment) {
   return false;
 }
 
-function handleLabeledStatementComments(comment) {
-  const { enclosingNode } = comment;
+function handleLabeledStatementComments({ comment, enclosingNode }) {
   if (enclosingNode && enclosingNode.type === "LabeledStatement") {
     addLeadingComment(enclosingNode, comment);
     return true;
@@ -556,8 +624,7 @@ function handleLabeledStatementComments(comment) {
   return false;
 }
 
-function handleBreakAndContinueStatementComments(comment) {
-  const { enclosingNode } = comment;
+function handleBreakAndContinueStatementComments({ comment, enclosingNode }) {
   if (
     enclosingNode &&
     (enclosingNode.type === "ContinueStatement" ||
@@ -570,8 +637,11 @@ function handleBreakAndContinueStatementComments(comment) {
   return false;
 }
 
-function handleCallExpressionComments(comment) {
-  const { precedingNode, enclosingNode } = comment;
+function handleCallExpressionComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+}) {
   if (
     enclosingNode &&
     (enclosingNode.type === "CallExpression" ||
@@ -586,8 +656,12 @@ function handleCallExpressionComments(comment) {
   return false;
 }
 
-function handleUnionTypeComments(comment) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
+function handleUnionTypeComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  followingNode,
+}) {
   if (
     enclosingNode &&
     (enclosingNode.type === "UnionTypeAnnotation" ||
@@ -617,8 +691,7 @@ function handleUnionTypeComments(comment) {
   return false;
 }
 
-function handlePropertyComments(comment) {
-  const { enclosingNode } = comment;
+function handlePropertyComments({ comment, enclosingNode }) {
   if (
     enclosingNode &&
     (enclosingNode.type === "Property" ||
@@ -630,8 +703,7 @@ function handlePropertyComments(comment) {
   return false;
 }
 
-function handleOnlyComments(comment, ast, isLastComment) {
-  const { enclosingNode } = comment;
+function handleOnlyComments({ comment, enclosingNode, ast, isLastComment }) {
   // With Flow the enclosingNode is undefined so use the AST instead.
   if (ast && ast.body && ast.body.length === 0) {
     if (isLastComment) {
@@ -657,8 +729,7 @@ function handleOnlyComments(comment, ast, isLastComment) {
   return false;
 }
 
-function handleForComments(comment) {
-  const { enclosingNode } = comment;
+function handleForComments({ comment, enclosingNode }) {
   if (
     enclosingNode &&
     (enclosingNode.type === "ForInStatement" ||
@@ -670,8 +741,12 @@ function handleForComments(comment) {
   return false;
 }
 
-function handleImportDeclarationComments(comment, text) {
-  const { precedingNode, enclosingNode } = comment;
+function handleImportDeclarationComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  text,
+}) {
   if (
     precedingNode &&
     precedingNode.type === "ImportSpecifier" &&
@@ -685,8 +760,7 @@ function handleImportDeclarationComments(comment, text) {
   return false;
 }
 
-function handleAssignmentPatternComments(comment) {
-  const { enclosingNode } = comment;
+function handleAssignmentPatternComments({ comment, enclosingNode }) {
   if (enclosingNode && enclosingNode.type === "AssignmentPattern") {
     addLeadingComment(enclosingNode, comment);
     return true;
@@ -694,8 +768,7 @@ function handleAssignmentPatternComments(comment) {
   return false;
 }
 
-function handleTypeAliasComments(comment) {
-  const { enclosingNode } = comment;
+function handleTypeAliasComments({ comment, enclosingNode }) {
   if (enclosingNode && enclosingNode.type === "TypeAlias") {
     addLeadingComment(enclosingNode, comment);
     return true;
@@ -703,8 +776,11 @@ function handleTypeAliasComments(comment) {
   return false;
 }
 
-function handleVariableDeclaratorComments(comment) {
-  const { enclosingNode, followingNode } = comment;
+function handleVariableDeclaratorComments({
+  comment,
+  enclosingNode,
+  followingNode,
+}) {
   if (
     enclosingNode &&
     (enclosingNode.type === "VariableDeclarator" ||
@@ -722,8 +798,12 @@ function handleVariableDeclaratorComments(comment) {
   return false;
 }
 
-function handleTSFunctionTrailingComments(comment, text) {
-  const { enclosingNode, followingNode } = comment;
+function handleTSFunctionTrailingComments({
+  comment,
+  enclosingNode,
+  followingNode,
+  text,
+}) {
   if (
     !followingNode &&
     enclosingNode &&
@@ -738,8 +818,7 @@ function handleTSFunctionTrailingComments(comment, text) {
   return false;
 }
 
-function handleIgnoreComments(comment) {
-  const { enclosingNode, followingNode } = comment;
+function handleIgnoreComments({ comment, enclosingNode, followingNode }) {
   if (
     isPrettierIgnoreComment(comment) &&
     enclosingNode &&
@@ -754,8 +833,12 @@ function handleIgnoreComments(comment) {
   }
 }
 
-function handleTSMappedTypeComments(comment) {
-  const { precedingNode, enclosingNode, followingNode } = comment;
+function handleTSMappedTypeComments({
+  comment,
+  precedingNode,
+  enclosingNode,
+  followingNode,
+}) {
   if (!enclosingNode || enclosingNode.type !== "TSMappedType") {
     return false;
   }
@@ -782,8 +865,8 @@ function handleTSMappedTypeComments(comment) {
 }
 
 /**
- * @param {any} node
- * @param {(comment: any) => boolean} fn
+ * @param {Node} node
+ * @param {(comment: Comment) => boolean} fn
  * @returns boolean
  */
 function hasLeadingComment(node, fn = () => true) {
@@ -796,6 +879,10 @@ function hasLeadingComment(node, fn = () => true) {
   return false;
 }
 
+/**
+ * @param {Node} node
+ * @returns {boolean}
+ */
 function isRealFunctionLikeNode(node) {
   return (
     node.type === "ArrowFunctionExpression" ||
@@ -813,6 +900,10 @@ function isRealFunctionLikeNode(node) {
   );
 }
 
+/**
+ * @param {Node} enclosingNode
+ * @returns {RegExp | void}
+ */
 function getGapRegex(enclosingNode) {
   if (
     enclosingNode &&
@@ -825,6 +916,10 @@ function getGapRegex(enclosingNode) {
   }
 }
 
+/**
+ * @param {any} node
+ * @returns {Node[] | void}
+ */
 function getCommentChildNodes(node, options) {
   // Prevent attaching comments to FunctionExpression in this case:
   //     class Foo {
@@ -850,6 +945,10 @@ function getCommentChildNodes(node, options) {
   }
 }
 
+/**
+ * @param {Comment} comment
+ * @returns {boolean}
+ */
 function isTypeCastComment(comment) {
   return (
     isBlockComment(comment) &&
@@ -861,6 +960,10 @@ function isTypeCastComment(comment) {
   );
 }
 
+/**
+ * @param {FastPath} path
+ * @returns {boolean}
+ */
 function willPrintOwnComments(path /*, options */) {
   const node = path.getValue();
   const parent = path.getParentNode();
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index eda0fc57d..b512dba0c 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -2236,6 +2236,8 @@ module.exports = {
   printComment,
   isBlockComment,
   handleComments: {
+    // TODO: Make this as default behavior
+    avoidAstMutation: true,
     ownLine: handleComments.handleOwnLineComment,
     endOfLine: handleComments.handleEndOfLineComment,
     remaining: handleComments.handleRemainingComment,
diff --git a/src/main/comments.js b/src/main/comments.js
index 3d362d160..6094568e2 100644
--- a/src/main/comments.js
+++ b/src/main/comments.js
@@ -91,7 +91,7 @@ function getSortedChildNodes(node, options, resultArray) {
 // As efficiently as possible, decorate the comment object with
 // .precedingNode, .enclosingNode, and/or .followingNode properties, at
 // least one of which is guaranteed to be defined.
-function decorateComment(node, comment, options) {
+function decorateComment(node, comment, options, enclosingNode) {
   const { locStart, locEnd } = options;
   const commentStart = locStart(comment);
   const commentEnd = locEnd(comment);
@@ -108,12 +108,10 @@ function decorateComment(node, comment, options) {
     const start = locStart(child);
     const end = locEnd(child);
 
+    // The comment is completely contained by this child node.
     if (start <= commentStart && commentEnd <= end) {
-      // The comment is completely contained by this child node.
-      comment.enclosingNode = child;
-
-      decorateComment(child, comment, options);
-      return; // Abandon the binary search at this level.
+      // Abandon the binary search at this level.
+      return decorateComment(child, comment, options, child);
     }
 
     if (start <= commentStart) {
@@ -142,11 +140,8 @@ function decorateComment(node, comment, options) {
 
   // We don't want comments inside of different expressions inside of the same
   // template literal to move to another expression.
-  if (
-    comment.enclosingNode &&
-    comment.enclosingNode.type === "TemplateLiteral"
-  ) {
-    const { quasis } = comment.enclosingNode;
+  if (enclosingNode && enclosingNode.type === "TemplateLiteral") {
+    const { quasis } = enclosingNode;
     const commentIndex = findExpressionIndexForComment(
       quasis,
       comment,
@@ -169,22 +164,28 @@ function decorateComment(node, comment, options) {
     }
   }
 
-  if (precedingNode) {
-    comment.precedingNode = precedingNode;
-  }
-
-  if (followingNode) {
-    comment.followingNode = followingNode;
-  }
+  return { enclosingNode, precedingNode, followingNode };
 }
 
+const returnFalse = () => false;
 function attach(comments, ast, text, options) {
   if (!Array.isArray(comments)) {
     return;
   }
 
   const tiesToBreak = [];
-  const { locStart, locEnd } = options;
+  const {
+    locStart,
+    locEnd,
+    printer: { handleComments = {} },
+  } = options;
+  // TODO: Make this as default behavior
+  const {
+    avoidAstMutation,
+    ownLine: handleOwnLineComment = returnFalse,
+    endOfLine: handleEndOfLineComment = returnFalse,
+    remaining: handleRemainingComment = returnFalse,
+  } = handleComments;
 
   comments.forEach((comment, i) => {
     if (
@@ -203,30 +204,34 @@ function attach(comments, ast, text, options) {
       }
     }
 
-    decorateComment(ast, comment, options);
-    const { precedingNode, enclosingNode, followingNode } = comment;
-
-    const pluginHandleOwnLineComment =
-      options.printer.handleComments && options.printer.handleComments.ownLine
-        ? options.printer.handleComments.ownLine
-        : () => false;
-    const pluginHandleEndOfLineComment =
-      options.printer.handleComments && options.printer.handleComments.endOfLine
-        ? options.printer.handleComments.endOfLine
-        : () => false;
-    const pluginHandleRemainingComment =
-      options.printer.handleComments && options.printer.handleComments.remaining
-        ? options.printer.handleComments.remaining
-        : () => false;
-
     const isLastComment = comments.length - 1 === i;
+    const decorated = decorateComment(ast, comment, options);
+    const { precedingNode, enclosingNode, followingNode } = decorated;
+    const context = {
+      comment,
+      precedingNode,
+      enclosingNode,
+      followingNode,
+      text,
+      options,
+      ast,
+      isLastComment,
+    };
+
+    let args;
+    if (avoidAstMutation) {
+      args = [context];
+    } else {
+      comment.enclosingNode = enclosingNode;
+      comment.precedingNode = precedingNode;
+      comment.followingNode = followingNode;
+      args = [comment, text, options, ast, isLastComment];
+    }
 
     if (hasNewline(text, locStart(comment), { backwards: true })) {
       // If a comment exists on its own line, prefer a leading comment.
       // We also need to check if it's the first line of the file.
-      if (
-        pluginHandleOwnLineComment(comment, text, options, ast, isLastComment)
-      ) {
+      if (handleOwnLineComment(...args)) {
         // We're good
       } else if (followingNode) {
         // Always a leading comment.
@@ -241,9 +246,7 @@ function attach(comments, ast, text, options) {
         addDanglingComment(ast, comment);
       }
     } else if (hasNewline(text, locEnd(comment))) {
-      if (
-        pluginHandleEndOfLineComment(comment, text, options, ast, isLastComment)
-      ) {
+      if (handleEndOfLineComment(...args)) {
         // We're good
       } else if (precedingNode) {
         // There is content before this comment on the same line, but
@@ -259,9 +262,7 @@ function attach(comments, ast, text, options) {
         addDanglingComment(ast, comment);
       }
     } else {
-      if (
-        pluginHandleRemainingComment(comment, text, options, ast, isLastComment)
-      ) {
+      if (handleRemainingComment(...args)) {
         // We're good
       } else if (precedingNode && followingNode) {
         // Otherwise, text exists both before and after the comment on
@@ -272,11 +273,11 @@ function attach(comments, ast, text, options) {
         const tieCount = tiesToBreak.length;
         if (tieCount > 0) {
           const lastTie = tiesToBreak[tieCount - 1];
-          if (lastTie.followingNode !== comment.followingNode) {
+          if (lastTie.followingNode !== followingNode) {
             breakTies(tiesToBreak, text, options);
           }
         }
-        tiesToBreak.push(comment);
+        tiesToBreak.push(context);
       } else if (precedingNode) {
         addTrailingComment(precedingNode, comment);
       } else if (followingNode) {
@@ -293,14 +294,16 @@ function attach(comments, ast, text, options) {
 
   breakTies(tiesToBreak, text, options);
 
-  comments.forEach((comment) => {
-    // These node references were useful for breaking ties, but we
-    // don't need them anymore, and they create cycles in the AST that
-    // may lead to infinite recursion if we don't delete them here.
-    delete comment.precedingNode;
-    delete comment.enclosingNode;
-    delete comment.followingNode;
-  });
+  if (!avoidAstMutation) {
+    comments.forEach((comment) => {
+      // These node references were useful for breaking ties, but we
+      // don't need them anymore, and they create cycles in the AST that
+      // may lead to infinite recursion if we don't delete them here.
+      delete comment.precedingNode;
+      delete comment.enclosingNode;
+      delete comment.followingNode;
+    });
+  }
 }
 
 function breakTies(tiesToBreak, text, options) {
@@ -328,9 +331,13 @@ function breakTies(tiesToBreak, text, options) {
     indexOfFirstLeadingComment > 0;
     --indexOfFirstLeadingComment
   ) {
-    const comment = tiesToBreak[indexOfFirstLeadingComment - 1];
-    assert.strictEqual(comment.precedingNode, precedingNode);
-    assert.strictEqual(comment.followingNode, followingNode);
+    const {
+      comment,
+      precedingNode: currentCommentEnclosingNode,
+      followingNode: currentCommentFollowingNode,
+    } = tiesToBreak[indexOfFirstLeadingComment - 1];
+    assert.strictEqual(currentCommentEnclosingNode, precedingNode);
+    assert.strictEqual(currentCommentFollowingNode, followingNode);
 
     const gap = text.slice(options.locEnd(comment), gapEndPos);
 
@@ -343,7 +350,7 @@ function breakTies(tiesToBreak, text, options) {
     }
   }
 
-  tiesToBreak.forEach((comment, i) => {
+  tiesToBreak.forEach(({ comment }, i) => {
     if (i < indexOfFirstLeadingComment) {
       addTrailingComment(precedingNode, comment);
     } else {

From 4f330f0a78610143b6b6bb55f9b69fc07b31ce43 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sat, 21 Nov 2020 16:34:28 +0800
Subject: [PATCH 084/299] Fix comments inside JSX end tag (#9711)

---
 changelog_unreleased/javascript/9711.md       |  18 +++
 src/language-js/print/jsx.js                  |  27 +++-
 .../comments/__snapshots__/jsfmt.spec.js.snap | 128 ++++++++++++++++++
 tests/jsx/comments/in-end-tag.js              |  49 +++++++
 tests/jsx/comments/jsfmt.spec.js              |   3 +
 5 files changed, 224 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/javascript/9711.md
 create mode 100644 tests/jsx/comments/in-end-tag.js

diff --git a/changelog_unreleased/javascript/9711.md b/changelog_unreleased/javascript/9711.md
new file mode 100644
index 000000000..3793f3c30
--- /dev/null
+++ b/changelog_unreleased/javascript/9711.md
@@ -0,0 +1,18 @@
+#### Fix comments inside JSX end tag (#9711 by @fisker)
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+<a><// comment
+/a>;
+
+// Prettier stable
+<a></// comment
+a>;
+
+// Prettier master
+<a></
+  // comment
+  a
+>;
+```
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index 06551ac27..b25913e9c 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -32,6 +32,7 @@ const {
   isStringLiteral,
   isBinaryish,
   isBlockComment,
+  isLineComment,
 } = require("../utils");
 const pathNeedsParens = require("../needs-parens");
 const { willPrintOwnComments } = require("../comments");
@@ -639,7 +640,31 @@ function printJsxOpeningElement(path, options, print) {
 }
 
 function printJsxClosingElement(path, options, print) {
-  return concat(["</", path.call(print, "name"), ">"]);
+  const n = path.getValue();
+  const parts = [];
+
+  parts.push("</");
+
+  const printed = path.call(print, "name");
+  if (
+    Array.isArray(n.name.comments) &&
+    n.name.comments.some((comment) => comment.leading && isLineComment(comment))
+  ) {
+    parts.push(indent(concat([hardline, printed])), hardline);
+  } else if (
+    Array.isArray(n.name.comments) &&
+    n.name.comments.some(
+      (comment) => comment.leading && isBlockComment(comment)
+    )
+  ) {
+    parts.push(" ", printed);
+  } else {
+    parts.push(printed);
+  }
+
+  parts.push(">");
+
+  return concat(parts);
 }
 
 function printJsxOpeningClosingFragment(path, options /*, print*/) {
diff --git a/tests/jsx/comments/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/comments/__snapshots__/jsfmt.spec.js.snap
index a67f88537..cd3f81c5d 100644
--- a/tests/jsx/comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx/comments/__snapshots__/jsfmt.spec.js.snap
@@ -27,6 +27,134 @@ const render = (items) => (
 ================================================================================
 `;
 
+exports[`in-end-tag.js - {"jsxBracketSameLine":true} [typescript] format 1`] = `
+"Identifier expected. (2:6)
+  1 | /* =========== before slash =========== */
+> 2 | <a><// line
+    |      ^
+  3 | /a>;
+  4 | <a></* block */
+  5 | /a>;"
+`;
+
+exports[`in-end-tag.js - {"jsxBracketSameLine":true} format 1`] = `
+====================================options=====================================
+jsxBracketSameLine: true
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+/* =========== before slash =========== */
+<a><// line
+/a>;
+<a></* block */
+/a>;
+
+<><// line
+/>;
+<></* block */
+/>;
+
+/* =========== after slash =========== */
+<a></ // line
+a>;
+<a></ /* block */
+a>;
+
+<></ // line
+>;
+<></ /* block */
+>;
+
+/* =========== after name =========== */
+<a></a // line
+>;
+<a></a /* block */
+>;
+
+
+/* =========== block =========== */
+<a></a /* block */>;
+<></ /* block */>;
+
+/* =========== multiple ===========  */
+<a><// line 1
+// line 2
+/a>;
+<a></* block1 */ /* block2 */
+/a>;
+<a></* block */ // line
+/a>;
+
+<><// line 1
+// line 2
+/>;
+<></* block1 */ /* block2 */
+/>;
+<></* block */ // line
+/>;
+=====================================output=====================================
+/* =========== before slash =========== */
+<a></
+  // line
+  a
+>;
+<a></ /* block */
+a>;
+
+<></
+  // line
+>;
+<></ /* block */>;
+
+/* =========== after slash =========== */
+<a></
+  // line
+  a
+>;
+<a></ /* block */
+a>;
+
+<></
+  // line
+>;
+<></ /* block */>;
+
+/* =========== after name =========== */
+<a></a>; // line
+<a></a /* block */>;
+
+/* =========== block =========== */
+<a></a /* block */>;
+<></ /* block */>;
+
+/* =========== multiple ===========  */
+<a></
+  // line 1
+  // line 2
+  a
+>;
+<a></ /* block1 */ /* block2 */
+a>;
+<a></
+  /* block */ // line
+  a
+>;
+
+<></
+  // line 1
+  // line 2
+>;
+<></ /* block1 */
+  /* block2 */>;
+<></
+  /* block */
+  // line
+>;
+
+================================================================================
+`;
+
 exports[`in-tags.js - {"jsxBracketSameLine":true} format 1`] = `
 ====================================options=====================================
 jsxBracketSameLine: true
diff --git a/tests/jsx/comments/in-end-tag.js b/tests/jsx/comments/in-end-tag.js
new file mode 100644
index 000000000..6c0cb6efe
--- /dev/null
+++ b/tests/jsx/comments/in-end-tag.js
@@ -0,0 +1,49 @@
+/* =========== before slash =========== */
+<a><// line
+/a>;
+<a></* block */
+/a>;
+
+<><// line
+/>;
+<></* block */
+/>;
+
+/* =========== after slash =========== */
+<a></ // line
+a>;
+<a></ /* block */
+a>;
+
+<></ // line
+>;
+<></ /* block */
+>;
+
+/* =========== after name =========== */
+<a></a // line
+>;
+<a></a /* block */
+>;
+
+
+/* =========== block =========== */
+<a></a /* block */>;
+<></ /* block */>;
+
+/* =========== multiple ===========  */
+<a><// line 1
+// line 2
+/a>;
+<a></* block1 */ /* block2 */
+/a>;
+<a></* block */ // line
+/a>;
+
+<><// line 1
+// line 2
+/>;
+<></* block1 */ /* block2 */
+/>;
+<></* block */ // line
+/>;
\ No newline at end of file
diff --git a/tests/jsx/comments/jsfmt.spec.js b/tests/jsx/comments/jsfmt.spec.js
index 7cec70314..39e36879a 100644
--- a/tests/jsx/comments/jsfmt.spec.js
+++ b/tests/jsx/comments/jsfmt.spec.js
@@ -1,3 +1,6 @@
 run_spec(__dirname, ["flow", "babel", "typescript"], {
   jsxBracketSameLine: true,
+  errors: {
+    typescript: ["in-end-tag.js"],
+  },
 });

From 3208b948fc7072fb3a3c2f1b17e936cf44e7d97b Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Sun, 22 Nov 2020 09:24:22 +0900
Subject: [PATCH 085/299] Fix formatting for AssignmentExpression with
 ClassExpression (#9741)

* Fix formatting for asignment with superClass

* Add tests

* Changelog

* For only AssignmentExpression

* Remove unnecesary ifBreak
---
 changelog_unreleased/javascript/9741.md       | 27 +++++++++++++++++++
 src/language-js/print/class.js                | 14 +++++-----
 .../classes/__snapshots__/jsfmt.spec.js.snap  | 16 ++++++++---
 tests/js/classes/assignment.js                |  6 +++++
 4 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 changelog_unreleased/javascript/9741.md

diff --git a/changelog_unreleased/javascript/9741.md b/changelog_unreleased/javascript/9741.md
new file mode 100644
index 000000000..94caafe8c
--- /dev/null
+++ b/changelog_unreleased/javascript/9741.md
@@ -0,0 +1,27 @@
+#### Fix formatting for AssignmentExpression with ClassExpression (#9741 by @sosukesuzuki)
+
+<!-- prettier-ignore -->
+```js
+// Input
+module.exports = class A extends B {
+  method() {
+    console.log("foo");
+  }
+};
+
+// Prettier stable
+module.exports = class A extends (
+  B
+) {
+  method() {
+    console.log("foo");
+  }
+};
+
+// Prettier master
+module.exports = class A extends B {
+  method() {
+    console.log("foo");
+  }
+};
+```
diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
index 2e48dfeb1..ecefce26c 100644
--- a/src/language-js/print/class.js
+++ b/src/language-js/print/class.js
@@ -131,13 +131,13 @@ function printList(path, options, print, listName) {
 function printSuperClass(path, options, print) {
   const printed = path.call(print, "superClass");
   const parent = path.getParentNode();
-  if (parent && parent.type === "AssignmentExpression") {
-    return concat([
-      ifBreak("("),
-      indent(concat([softline, printed])),
-      softline,
-      ifBreak(")"),
-    ]);
+  if (parent.type === "AssignmentExpression") {
+    return group(
+      ifBreak(
+        concat(["(", indent(concat([softline, printed])), softline, ")"]),
+        printed
+      )
+    );
   }
   return printed;
 }
diff --git a/tests/js/classes/__snapshots__/jsfmt.spec.js.snap b/tests/js/classes/__snapshots__/jsfmt.spec.js.snap
index 2025489e6..44873cab8 100644
--- a/tests/js/classes/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/classes/__snapshots__/jsfmt.spec.js.snap
@@ -32,6 +32,12 @@ foo = class extends aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggg
   }
 };
 
+module.exports = class A extends B {
+  method () {
+    console.log("foo");
+  }
+};
+
 =====================================output=====================================
 aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends (
   aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg1
@@ -41,9 +47,7 @@ aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends
   }
 };
 
-foo = class extends (
-  bar
-) {
+foo = class extends bar {
   method() {
     console.log("foo");
   }
@@ -65,6 +69,12 @@ foo = class extends (
   }
 };
 
+module.exports = class A extends B {
+  method() {
+    console.log("foo");
+  }
+};
+
 ================================================================================
 `;
 
diff --git a/tests/js/classes/assignment.js b/tests/js/classes/assignment.js
index dc0f6c4b6..56f7348cc 100644
--- a/tests/js/classes/assignment.js
+++ b/tests/js/classes/assignment.js
@@ -23,3 +23,9 @@ foo = class extends aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggg
     console.log("foo");
   }
 };
+
+module.exports = class A extends B {
+  method () {
+    console.log("foo");
+  }
+};

From c5e3eb6fabe2fb0e45a94098ccb877632d052a22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Nov 2020 13:35:07 +0800
Subject: [PATCH 086/299] Build(deps-dev): Bump @babel/preset-react from 7.12.5
 to 7.12.7 in /website (#9745)

Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.12.5 to 7.12.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.7/packages/babel-preset-react)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 40 ++++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/website/package.json b/website/package.json
index d8ceb3435..bdfc9adb8 100644
--- a/website/package.json
+++ b/website/package.json
@@ -16,7 +16,7 @@
     "react-dom": "17.0.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.12.5",
+    "@babel/preset-react": "7.12.7",
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.2.1",
     "concurrently": "5.3.0",
diff --git a/website/yarn.lock b/website/yarn.lock
index daa596098..0ccd81db8 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -78,10 +78,10 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-react-jsx-experimental@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.1.tgz#1f1ad4c95f1d059856d2fdbc0763489d020cd02d"
-  integrity sha512-82to8lR7TofZWbTd3IEZT1xNHfeU/Ef4rDm/GLXddzqDh+yQ19QuGSzqww51aNxVH8rwfRIzL0EUQsvODVhtyw==
+"@babel/helper-builder-react-jsx-experimental@^7.12.4":
+  version "7.12.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
+  integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-module-imports" "^7.12.1"
@@ -736,12 +736,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx-development@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz#677de5b96da310430d6cfb7fee16a1603afa3d56"
-  integrity sha512-1JJusg3iPgsZDthyWiCr3KQiGs31ikU/mSf2N2dSYEAO0GEImmVUbWf0VoSDGDFTAn5Dj4DUiR6SdIXHY7tELA==
+"@babel/plugin-transform-react-jsx-development@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz#4c2a647de79c7e2b16bfe4540677ba3121e82a08"
+  integrity sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg==
   dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.12.1"
+    "@babel/helper-builder-react-jsx-experimental" "^7.12.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.12.1"
 
@@ -759,13 +759,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz#39ede0e30159770561b6963be143e40af3bde00c"
-  integrity sha512-2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ==
+"@babel/plugin-transform-react-jsx@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz#8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f"
+  integrity sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.10.4"
-    "@babel/helper-builder-react-jsx-experimental" "^7.12.1"
+    "@babel/helper-builder-react-jsx-experimental" "^7.12.4"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.12.1"
 
@@ -937,15 +937,15 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@7.12.5", "@babel/preset-react@^7.9.4":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.5.tgz#d45625f65d53612078a43867c5c6750e78772c56"
-  integrity sha512-jcs++VPrgyFehkMezHtezS2BpnUlR7tQFAyesJn1vGTO9aTFZrgIQrA5YydlTwxbcjMwkFY6i04flCigRRr3GA==
+"@babel/preset-react@7.12.7", "@babel/preset-react@^7.9.4":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz#36d61d83223b07b6ac4ec55cf016abb0f70be83b"
+  integrity sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-react-display-name" "^7.12.1"
-    "@babel/plugin-transform-react-jsx" "^7.12.5"
-    "@babel/plugin-transform-react-jsx-development" "^7.12.5"
+    "@babel/plugin-transform-react-jsx" "^7.12.7"
+    "@babel/plugin-transform-react-jsx-development" "^7.12.7"
     "@babel/plugin-transform-react-jsx-self" "^7.12.1"
     "@babel/plugin-transform-react-jsx-source" "^7.12.1"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"

From f254314feb539a13fc0044ee757e828b56998a45 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 23 Nov 2020 13:57:13 +0800
Subject: [PATCH 087/299] Use meriyah (#9731)

Co-authored-by: Georgii Dolzhykov <thorn.mailbox@gmail.com>
---
 .prettierrc                      | 8 +++++++-
 src/cli/util.js                  | 3 ++-
 src/index.js                     | 9 ++++-----
 tests/.prettierrc                | 1 +
 tests_integration/.prettierrc    | 1 +
 tests_integration/runPrettier.js | 4 ++--
 6 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 tests/.prettierrc
 create mode 100644 tests_integration/.prettierrc

diff --git a/.prettierrc b/.prettierrc
index 0967ef424..7c80702fa 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1 +1,7 @@
-{}
+overrides:
+  - files: "**/*.{js,mjs}"
+    options:
+      parser: meriyah
+  - files: ".prettierrc"
+    options:
+      parser: yaml
diff --git a/src/cli/util.js b/src/cli/util.js
index 7ffaf85b7..a95a4b580 100644
--- a/src/cli/util.js
+++ b/src/cli/util.js
@@ -918,6 +918,7 @@ function createDetailedOptionMap(supportOptions) {
 
 /** @returns {Context} */
 function createContext(args) {
+  /** @type {Context} */
   const context = { args, stack: [] };
 
   updateContextArgv(context);
@@ -931,7 +932,7 @@ function createContext(args) {
     context.argv["plugin-search-dir"]
   );
 
-  return /** @type {Context} */ (context);
+  return context;
 }
 
 function initContext(context) {
diff --git a/src/index.js b/src/index.js
index abb4ae4a0..143b39934 100644
--- a/src/index.js
+++ b/src/index.js
@@ -56,11 +56,10 @@ module.exports = {
     plugins.clearCache();
   },
 
-  getFileInfo: /** @type {typeof getFileInfo} */ (withPlugins(getFileInfo)),
-  getSupportInfo: /** @type {typeof getSupportInfo} */ (withPlugins(
-    getSupportInfo,
-    0
-  )),
+  /** @type {typeof getFileInfo} */
+  getFileInfo: withPlugins(getFileInfo),
+  /** @type {typeof getSupportInfo} */
+  getSupportInfo: withPlugins(getSupportInfo, 0),
 
   version,
 
diff --git a/tests/.prettierrc b/tests/.prettierrc
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/tests/.prettierrc
@@ -0,0 +1 @@
+{}
diff --git a/tests_integration/.prettierrc b/tests_integration/.prettierrc
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/tests_integration/.prettierrc
@@ -0,0 +1 @@
+{}
diff --git a/tests_integration/runPrettier.js b/tests_integration/runPrettier.js
index c14d3d37e..ce568c462 100644
--- a/tests_integration/runPrettier.js
+++ b/tests_integration/runPrettier.js
@@ -84,7 +84,7 @@ function runPrettier(dir, args, options) {
     .mockImplementation((moduleName, options) =>
       require("cosmiconfig").cosmiconfig(moduleName, {
         ...options,
-        stopDir: __dirname,
+        stopDir: path.join(__dirname, "cli"),
       })
     );
   jest
@@ -92,7 +92,7 @@ function runPrettier(dir, args, options) {
     .mockImplementation((moduleName, options) =>
       require("cosmiconfig").cosmiconfigSync(moduleName, {
         ...options,
-        stopDir: __dirname,
+        stopDir: path.join(__dirname, "cli"),
       })
     );
   jest

From 3f0181363f6491e739e51508660f62b75043ddb7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Nov 2020 06:07:58 +0000
Subject: [PATCH 088/299] Build(deps-dev): Bump @babel/preset-env from 7.12.1
 to 7.12.7 (#9749)

---
 package.json |   2 +-
 yarn.lock    | 135 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index c5a670d72..9cae633bb 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.12.3",
-    "@babel/preset-env": "7.12.1",
+    "@babel/preset-env": "7.12.7",
     "@babel/types": "7.12.6",
     "@glimmer/reference": "0.66.0",
     "@rollup/plugin-alias": "3.1.1",
diff --git a/yarn.lock b/yarn.lock
index b7756773e..e164f194e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23,10 +23,10 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/compat-data@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.1.tgz#d7386a689aa0ddf06255005b4b991988021101a0"
-  integrity sha512-725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==
+"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
+  integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
 "@babel/core@7.12.3", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
   version "7.12.3"
@@ -74,14 +74,14 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-compilation-targets@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz#310e352888fbdbdd8577be8dfdd2afb9e7adcf50"
-  integrity sha512-jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==
+"@babel/helper-compilation-targets@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
+  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
   dependencies:
-    "@babel/compat-data" "^7.12.1"
+    "@babel/compat-data" "^7.12.5"
     "@babel/helper-validator-option" "^7.12.1"
-    browserslist "^4.12.0"
+    browserslist "^4.14.5"
     semver "^5.5.0"
 
 "@babel/helper-create-class-features-plugin@^7.12.1":
@@ -151,12 +151,12 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
-"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz#1644c01591a15a2f084dd6d092d9430eb1d1216c"
-  integrity sha512-ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==
+"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.12.5"
 
 "@babel/helper-module-transforms@^7.12.1":
   version "7.12.1"
@@ -339,10 +339,10 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-numeric-separator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz#0e2c6774c4ce48be412119b4d693ac777f7685a6"
-  integrity sha512-MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==
+"@babel/plugin-proposal-numeric-separator@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
+  integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
@@ -364,10 +364,10 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797"
-  integrity sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==
+"@babel/plugin-proposal-optional-chaining@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
+  integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
@@ -700,13 +700,12 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
-"@babel/plugin-transform-sticky-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf"
-  integrity sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==
+"@babel/plugin-transform-sticky-regex@^7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
+  integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-regex" "^7.10.4"
 
 "@babel/plugin-transform-template-literals@^7.12.1":
   version "7.12.1"
@@ -737,14 +736,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/preset-env@7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
-  integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==
+"@babel/preset-env@7.12.7":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
+  integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
   dependencies:
-    "@babel/compat-data" "^7.12.1"
-    "@babel/helper-compilation-targets" "^7.12.1"
-    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/compat-data" "^7.12.7"
+    "@babel/helper-compilation-targets" "^7.12.5"
+    "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-validator-option" "^7.12.1"
     "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
@@ -754,10 +753,10 @@
     "@babel/plugin-proposal-json-strings" "^7.12.1"
     "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
-    "@babel/plugin-proposal-numeric-separator" "^7.12.1"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.7"
     "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
     "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
     "@babel/plugin-proposal-private-methods" "^7.12.1"
     "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
@@ -799,14 +798,14 @@
     "@babel/plugin-transform-reserved-words" "^7.12.1"
     "@babel/plugin-transform-shorthand-properties" "^7.12.1"
     "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/plugin-transform-sticky-regex" "^7.12.1"
+    "@babel/plugin-transform-sticky-regex" "^7.12.7"
     "@babel/plugin-transform-template-literals" "^7.12.1"
     "@babel/plugin-transform-typeof-symbol" "^7.12.1"
     "@babel/plugin-transform-unicode-escapes" "^7.12.1"
     "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.12.1"
-    core-js-compat "^3.6.2"
+    "@babel/types" "^7.12.7"
+    core-js-compat "^3.7.0"
     semver "^5.5.0"
 
 "@babel/preset-modules@^0.1.3":
@@ -851,7 +850,7 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@7.12.6", "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@7.12.6":
   version "7.12.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
   integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==
@@ -860,6 +859,15 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
+  integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -2078,7 +2086,7 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.8.5:
+browserslist@^4.14.5:
   version "4.14.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
   integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
@@ -2088,6 +2096,17 @@ browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.8.5:
     escalade "^3.1.0"
     node-releases "^1.1.61"
 
+browserslist@^4.14.6:
+  version "4.14.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
+  integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
+  dependencies:
+    caniuse-lite "^1.0.30001157"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.591"
+    escalade "^3.1.1"
+    node-releases "^1.1.66"
+
 bser@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -2145,6 +2164,11 @@ caniuse-lite@^1.0.30001135:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz#dc97c7ed918ab33bf8706ddd5e387287e015d637"
   integrity sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==
 
+caniuse-lite@^1.0.30001157:
+  version "1.0.30001159"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz#bebde28f893fa9594dadcaa7d6b8e2aa0299df20"
+  integrity sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -2301,6 +2325,11 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+colorette@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -2373,12 +2402,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.6.2:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
-  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
+core-js-compat@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz#8479c5d3d672d83f1f5ab94cf353e57113e065ed"
+  integrity sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==
   dependencies:
-    browserslist "^4.8.5"
+    browserslist "^4.14.6"
     semver "7.0.0"
 
 core-util-is@1.0.2, core-util-is@^1.0.2:
@@ -2968,6 +2997,11 @@ electron-to-chromium@^1.3.571:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz#e6671936f4571a874eb26e2e833aa0b2c0b776e0"
   integrity sha512-z4gU6dA1CbBJsAErW5swTGAaU2TBzc2mPAonJb00zqW1rOraDo2zfBMDRvaz9cVic+0JEZiYbHWPw/fTaZlG2Q==
 
+electron-to-chromium@^1.3.591:
+  version "1.3.603"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz#1b71bec27fb940eccd79245f6824c63d5f7e8abf"
+  integrity sha512-J8OHxOeJkoSLgBXfV9BHgKccgfLMHh+CoeRo6wJsi6m0k3otaxS/5vrHpMNSEYY4MISwewqanPOuhAtuE8riQQ==
+
 emittery@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451"
@@ -3061,7 +3095,7 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-escalade@^3.1.0:
+escalade@^3.1.0, escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
@@ -5439,6 +5473,11 @@ node-releases@^1.1.61:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
   integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
 
+node-releases@^1.1.66:
+  version "1.1.67"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
+  integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
+
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"

From a11a2ee8829a8a303b761c94f00446ea5dc9dc3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Nov 2020 06:10:19 +0000
Subject: [PATCH 089/299] Build(deps-dev): Bump eslint from 7.13.0 to 7.14.0
 (#9751)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9cae633bb..ca068effd 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "builtin-modules": "3.1.0",
     "cross-env": "7.0.2",
     "cspell": "4.2.2",
-    "eslint": "7.13.0",
+    "eslint": "7.14.0",
     "eslint-config-prettier": "6.15.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.22.1",
diff --git a/yarn.lock b/yarn.lock
index e164f194e..8fbc2aad2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3269,10 +3269,10 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@7.13.0:
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz#7f180126c0dcdef327bfb54b211d7802decc08da"
-  integrity sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==
+eslint@7.14.0:
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz#2d2cac1d28174c510a97b377f122a5507958e344"
+  integrity sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@eslint/eslintrc" "^0.2.1"

From 923b281b0773603d839efa8f35cb82cbf72afd1c Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 23 Nov 2020 16:48:04 +0800
Subject: [PATCH 090/299] Refactor class related functions (#9754)

---
 src/language-js/print/class.js    |  99 ++++++++++++++++++++++++-
 src/language-js/print/flow.js     |  14 ++++
 src/language-js/print/misc.js     |  18 +----
 src/language-js/printer-estree.js | 117 +++++++-----------------------
 4 files changed, 137 insertions(+), 111 deletions(-)
 create mode 100644 src/language-js/print/flow.js

diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
index ecefce26c..3fc72ced8 100644
--- a/src/language-js/print/class.js
+++ b/src/language-js/print/class.js
@@ -4,15 +4,27 @@ const { printComments, printDanglingComments } = require("../../main/comments");
 const {
   builders: { concat, join, line, hardline, softline, group, indent, ifBreak },
 } = require("../../document");
-const { hasTrailingComment, hasTrailingLineComment } = require("../utils");
+const {
+  hasTrailingComment,
+  hasTrailingLineComment,
+  hasNewlineBetweenOrAfterDecorators,
+} = require("../utils");
 const { getTypeParametersGroupId } = require("./type-parameters");
 const { printMethod } = require("./function");
-const { printDecorators } = require("./misc");
+const { printOptionalToken } = require("./misc");
+const { printStatementSequence } = require("./statement");
+const { printPropertyKey } = require("./property");
+const { printTypeAnnotation } = require("./type-annotation");
+const { printAssignmentRight } = require("./assignment");
 
 function printClass(path, options, print) {
   const n = path.getValue();
   const parts = [];
 
+  if (n.declare) {
+    parts.push("declare ");
+  }
+
   if (n.abstract) {
     parts.push("abstract ");
   }
@@ -164,4 +176,85 @@ function printClassMethod(path, options, print) {
   return concat(parts);
 }
 
-module.exports = { printClass, printClassMethod };
+function printClassBody(path, options, print) {
+  const n = path.getValue();
+  if (!n.comments && n.body.length === 0) {
+    return "{}";
+  }
+
+  return concat([
+    "{",
+    n.body.length > 0
+      ? indent(
+          concat([
+            hardline,
+            path.call((bodyPath) => {
+              return printStatementSequence(bodyPath, options, print);
+            }, "body"),
+          ])
+        )
+      : printDanglingComments(path, options),
+    hardline,
+    "}",
+  ]);
+}
+
+function printClassProperty(path, options, print) {
+  const n = path.getValue();
+  const parts = [];
+  const semi = options.semi ? ";" : "";
+
+  if (n.decorators && n.decorators.length !== 0) {
+    parts.push(printDecorators(path, options, print));
+  }
+  if (n.accessibility) {
+    parts.push(n.accessibility + " ");
+  }
+  if (n.declare) {
+    parts.push("declare ");
+  }
+  if (n.static) {
+    parts.push("static ");
+  }
+  if (n.type === "TSAbstractClassProperty" || n.abstract) {
+    parts.push("abstract ");
+  }
+  if (n.readonly) {
+    parts.push("readonly ");
+  }
+  if (n.variance) {
+    parts.push(path.call(print, "variance"));
+  }
+  parts.push(
+    printPropertyKey(path, options, print),
+    printOptionalToken(path),
+    printTypeAnnotation(path, options, print)
+  );
+  if (n.value) {
+    parts.push(
+      " =",
+      printAssignmentRight(n.key, n.value, path.call(print, "value"), options)
+    );
+  }
+
+  parts.push(semi);
+
+  return group(concat(parts));
+}
+
+function printDecorators(path, options, print) {
+  const node = path.getValue();
+  return group(
+    concat([
+      join(line, path.map(print, "decorators")),
+      hasNewlineBetweenOrAfterDecorators(node, options) ? hardline : line,
+    ])
+  );
+}
+
+module.exports = {
+  printClass,
+  printClassMethod,
+  printClassBody,
+  printClassProperty,
+};
diff --git a/src/language-js/print/flow.js b/src/language-js/print/flow.js
new file mode 100644
index 000000000..e776eaa1c
--- /dev/null
+++ b/src/language-js/print/flow.js
@@ -0,0 +1,14 @@
+"use strict";
+
+const { printFlowDeclaration } = require("./misc");
+const { printClass } = require("./class");
+
+function printFlow(path, options, print) {
+  const n = path.getValue();
+  switch (n.type) {
+    case "DeclareClass":
+      return printFlowDeclaration(path, printClass(path, options, print));
+  }
+}
+
+module.exports = { printFlow };
diff --git a/src/language-js/print/misc.js b/src/language-js/print/misc.js
index 4d30c8889..4cda52514 100644
--- a/src/language-js/print/misc.js
+++ b/src/language-js/print/misc.js
@@ -3,12 +3,9 @@
 /** @type {import("assert")} */
 const assert = require("assert");
 const {
-  builders: { concat, group, indent, join, line, hardline },
+  builders: { concat, indent, join, line },
 } = require("../../document");
-const {
-  hasNewlineBetweenOrAfterDecorators,
-  getParentExportDeclaration,
-} = require("../utils");
+const { getParentExportDeclaration } = require("../utils");
 
 function printOptionalToken(path) {
   const node = path.getValue();
@@ -52,16 +49,6 @@ function printTypeScriptModifiers(path, options, print) {
   return concat([join(" ", path.map(print, "modifiers")), " "]);
 }
 
-function printDecorators(path, options, print) {
-  const node = path.getValue();
-  return group(
-    concat([
-      join(line, path.map(print, "decorators")),
-      hasNewlineBetweenOrAfterDecorators(node, options) ? hardline : line,
-    ])
-  );
-}
-
 function printFlowDeclaration(path, printed) {
   const parentExportDecl = getParentExportDeclaration(path);
 
@@ -93,7 +80,6 @@ module.exports = {
   printFunctionTypeParameters,
   printBindExpressionCallee,
   printTypeScriptModifiers,
-  printDecorators,
   printFlowDeclaration,
   adjustClause,
 };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index b512dba0c..be0768624 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -67,11 +67,11 @@ const {
 } = require("./print/html-binding");
 const { printAngular } = require("./print/angular");
 const { printJsx } = require("./print/jsx");
+const { printFlow } = require("./print/flow");
 const {
   printOptionalToken,
   printBindExpressionCallee,
   printTypeScriptModifiers,
-  printDecorators,
   printFlowDeclaration,
   adjustClause,
 } = require("./print/misc");
@@ -90,7 +90,12 @@ const {
   printTypeAnnotation,
   shouldHugType,
 } = require("./print/type-annotation");
-const { printClass, printClassMethod } = require("./print/class");
+const {
+  printClass,
+  printClassMethod,
+  printClassBody,
+  printClassProperty,
+} = require("./print/class");
 const {
   printTypeParameter,
   printTypeParameters,
@@ -236,19 +241,11 @@ function printPathNoParens(path, options, print, args) {
     return n;
   }
 
-  const htmlBinding = printHtmlBinding(path, options, print);
-  if (htmlBinding) {
-    return htmlBinding;
-  }
-
-  const printedAngular = printAngular(path, options, print);
-  if (typeof printedAngular !== "undefined") {
-    return printedAngular;
-  }
-
-  const printedJsx = printJsx(path, options, print);
-  if (typeof printedJsx !== "undefined") {
-    return printedJsx;
+  for (const printer of [printHtmlBinding, printAngular, printJsx, printFlow]) {
+    const printed = printer(path, options, print);
+    if (typeof printed !== "undefined") {
+      return printed;
+    }
   }
 
   /** @type{Doc[]} */
@@ -568,12 +565,6 @@ function printPathNoParens(path, options, print, args) {
       }
 
       return concat(parts); // Babel 6
-    case "ClassMethod":
-    case "ClassPrivateMethod":
-    case "MethodDefinition":
-    case "TSAbstractMethodDefinition":
-    case "TSDeclareMethod":
-      return printClassMethod(path, options, print);
     case "ObjectMethod":
       return printMethod(path, options, print);
     case "Decorator":
@@ -1053,79 +1044,23 @@ function printPathNoParens(path, options, print, args) {
       return concat(["debugger", semi]);
     case "TSQualifiedName":
       return join(".", [path.call(print, "left"), path.call(print, "right")]);
-    case "ClassBody":
-      if (!n.comments && n.body.length === 0) {
-        return "{}";
-      }
 
-      return concat([
-        "{",
-        n.body.length > 0
-          ? indent(
-              concat([
-                hardline,
-                path.call((bodyPath) => {
-                  return printStatementSequence(bodyPath, options, print);
-                }, "body"),
-              ])
-            )
-          : comments.printDanglingComments(path, options),
-        hardline,
-        "}",
-      ]);
+    case "ClassDeclaration":
+    case "ClassExpression":
+      return printClass(path, options, print);
+    case "ClassBody":
+      return printClassBody(path, options, print);
+    case "ClassMethod":
+    case "ClassPrivateMethod":
+    case "MethodDefinition":
+    case "TSAbstractMethodDefinition":
+    case "TSDeclareMethod":
+      return printClassMethod(path, options, print);
     case "ClassProperty":
     case "FieldDefinition":
     case "TSAbstractClassProperty":
-    case "ClassPrivateProperty": {
-      if (n.decorators && n.decorators.length !== 0) {
-        parts.push(printDecorators(path, options, print));
-      }
-      if (n.accessibility) {
-        parts.push(n.accessibility + " ");
-      }
-      if (n.declare) {
-        parts.push("declare ");
-      }
-      if (n.static) {
-        parts.push("static ");
-      }
-      if (n.type === "TSAbstractClassProperty" || n.abstract) {
-        parts.push("abstract ");
-      }
-      if (n.readonly) {
-        parts.push("readonly ");
-      }
-      if (n.variance) {
-        parts.push(path.call(print, "variance"));
-      }
-      parts.push(
-        printPropertyKey(path, options, print),
-        printOptionalToken(path),
-        printTypeAnnotation(path, options, print)
-      );
-      if (n.value) {
-        parts.push(
-          " =",
-          printAssignmentRight(
-            n.key,
-            n.value,
-            path.call(print, "value"),
-            options
-          )
-        );
-      }
-
-      parts.push(semi);
-
-      return group(concat(parts));
-    }
-    case "ClassDeclaration":
-    case "ClassExpression":
-      if (n.declare) {
-        parts.push("declare ");
-      }
-      parts.push(printClass(path, options, print));
-      return concat(parts);
+    case "ClassPrivateProperty":
+      return printClassProperty(path, options, print);
     case "TSInterfaceHeritage":
     case "TSExpressionWithTypeArguments": // Babel AST
       parts.push(path.call(print, "expression"));
@@ -1215,8 +1150,6 @@ function printPathNoParens(path, options, print, args) {
       return concat([path.call(print, "elementType"), "[]"]);
     case "BooleanLiteralTypeAnnotation":
       return "" + n.value;
-    case "DeclareClass":
-      return printFlowDeclaration(path, printClass(path, options, print));
     case "TSDeclareFunction":
       // For TypeScript the TSDeclareFunction node shares the AST
       // structure with FunctionDeclaration

From 248ab375a6102c9f0a5b8e07283a848cb326cb8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Nov 2020 08:50:22 +0000
Subject: [PATCH 091/299] Build(deps-dev): Bump @babel/core from 7.12.3 to
 7.12.7 (#9746)

---
 package.json |  2 +-
 yarn.lock    | 75 ++++++++++++++++++++++++++++------------------------
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index ca068effd..45712ccb4 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "yaml-unist-parser": "1.3.1"
   },
   "devDependencies": {
-    "@babel/core": "7.12.3",
+    "@babel/core": "7.12.7",
     "@babel/preset-env": "7.12.7",
     "@babel/types": "7.12.6",
     "@glimmer/reference": "0.66.0",
diff --git a/yarn.lock b/yarn.lock
index 8fbc2aad2..2e8f5bf8b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,19 +28,19 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
   integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
-"@babel/core@7.12.3", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
-  integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
+"@babel/core@7.12.7", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.7.tgz#bf55363c08c8352a37691f7216ec30090bf7e3bf"
+  integrity sha512-tRKx9B53kJe8NCGGIxEQb2Bkr0riUIEuN7Sc1fxhs5H8lKlCWUvQCSNMVIB0Meva7hcbCRJ76de15KoLltdoqw==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.1"
+    "@babel/generator" "^7.12.5"
     "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helpers" "^7.12.1"
-    "@babel/parser" "^7.12.3"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/helpers" "^7.12.5"
+    "@babel/parser" "^7.12.7"
+    "@babel/template" "^7.12.7"
+    "@babel/traverse" "^7.12.7"
+    "@babel/types" "^7.12.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -50,12 +50,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468"
-  integrity sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==
+"@babel/generator@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
+  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.12.5"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
@@ -259,14 +259,14 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helpers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.1.tgz#8a8261c1d438ec18cb890434df4ec768734c1e79"
-  integrity sha512-9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==
+"@babel/helpers@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
+  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
   dependencies:
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
 
 "@babel/highlight@^7.0.0", "@babel/highlight@^7.10.4":
   version "7.10.4"
@@ -277,11 +277,16 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.12.5", "@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.12.1", "@babel/parser@^7.12.3", "@babel/parser@^7.7.0":
+"@babel/parser@7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
   integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
 
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
+  integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
+
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
@@ -826,26 +831,26 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.10.4", "@babel/template@^7.3.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
-  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
+"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
+  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/parser" "^7.12.7"
+    "@babel/types" "^7.12.7"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.7.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.1.tgz#941395e0c5cc86d5d3e75caa095d3924526f0c1e"
-  integrity sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.7", "@babel/traverse@^7.7.0":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.7.tgz#572a722408681cef17d6b0bef69ef2e728ca69f1"
+  integrity sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.1"
+    "@babel/generator" "^7.12.5"
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/parser" "^7.12.7"
+    "@babel/types" "^7.12.7"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.19"

From 501020e3c6be9ef3708922bdb9fdd2978c465ee1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Nov 2020 09:45:04 +0000
Subject: [PATCH 092/299] Build(deps-dev): Bump @babel/types from 7.12.6 to
 7.12.7 (#9750)

---
 package.json |  2 +-
 yarn.lock    | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 45712ccb4..bad4f33bd 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
   "devDependencies": {
     "@babel/core": "7.12.7",
     "@babel/preset-env": "7.12.7",
-    "@babel/types": "7.12.6",
+    "@babel/types": "7.12.7",
     "@glimmer/reference": "0.66.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.1",
diff --git a/yarn.lock b/yarn.lock
index 2e8f5bf8b..b21f57211 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -855,16 +855,7 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@7.12.6":
-  version "7.12.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
-  integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@7.12.7", "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
   integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==

From 5b4a4eda32e2ebab7926054dcfa1f7faa72a81aa Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 23 Nov 2020 18:02:04 +0800
Subject: [PATCH 093/299] Extract `printProperty` (#9756)

---
 src/language-js/print/property.js | 19 ++++++++++++++++++-
 src/language-js/printer-estree.js | 21 ++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/language-js/print/property.js b/src/language-js/print/property.js
index 722880b2e..af3d23058 100644
--- a/src/language-js/print/property.js
+++ b/src/language-js/print/property.js
@@ -12,6 +12,7 @@ const {
   isStringPropSafeToUnquote,
   rawText,
 } = require("../utils");
+const { printAssignment } = require("./assignment");
 
 const needsQuoteProps = new WeakMap();
 
@@ -97,4 +98,20 @@ function printPropertyKey(path, options, print) {
   return path.call(print, "key");
 }
 
-module.exports = { printPropertyKey };
+function printProperty(path, options, print) {
+  const n = path.getValue();
+  if (n.shorthand) {
+    return path.call(print, "value");
+  }
+
+  return printAssignment(
+    n.key,
+    printPropertyKey(path, options, print),
+    ":",
+    n.value,
+    path.call(print, "value"),
+    options
+  );
+}
+
+module.exports = { printProperty, printPropertyKey };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index be0768624..ef5faf13c 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -100,7 +100,7 @@ const {
   printTypeParameter,
   printTypeParameters,
 } = require("./print/type-parameters");
-const { printPropertyKey } = require("./print/property");
+const { printPropertyKey, printProperty } = require("./print/property");
 const {
   printFunctionDeclaration,
   printArrowFunctionExpression,
@@ -112,7 +112,6 @@ const { printInterface } = require("./print/interface");
 const {
   printVariableDeclarator,
   printAssignmentExpression,
-  printAssignment,
   printAssignmentRight,
 } = require("./print/assignment");
 const { printBinaryishExpression } = require("./print/binaryish");
@@ -548,23 +547,7 @@ function printPathNoParens(path, options, print, args) {
       if (n.method || n.kind === "get" || n.kind === "set") {
         return printMethod(path, options, print);
       }
-
-      if (n.shorthand) {
-        parts.push(path.call(print, "value"));
-      } else {
-        parts.push(
-          printAssignment(
-            n.key,
-            printPropertyKey(path, options, print),
-            ":",
-            n.value,
-            path.call(print, "value"),
-            options
-          )
-        );
-      }
-
-      return concat(parts); // Babel 6
+      return printProperty(path, options, print);
     case "ObjectMethod":
       return printMethod(path, options, print);
     case "Decorator":

From 895a177b0d19360012b98533f709c0204d38ebfa Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 23 Nov 2020 18:13:56 +0800
Subject: [PATCH 094/299] Refactor function related functions (#9755)

---
 src/language-js/print/function.js | 10 ++++++++++
 src/language-js/printer-estree.js | 29 ++++++++---------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/language-js/print/function.js b/src/language-js/print/function.js
index 94f247e3d..5924f0704 100644
--- a/src/language-js/print/function.js
+++ b/src/language-js/print/function.js
@@ -31,6 +31,12 @@ function printFunctionDeclaration(path, print, options, expandArg) {
   const n = path.getValue();
   const parts = [];
 
+  // For TypeScript the TSDeclareFunction node shares the AST
+  // structure with FunctionDeclaration
+  if (n.type === "TSDeclareFunction" && n.declare) {
+    parts.push("declare ");
+  }
+
   if (n.async) {
     parts.push("async ");
   }
@@ -57,6 +63,10 @@ function printFunctionDeclaration(path, print, options, expandArg) {
     path.call(print, "body")
   );
 
+  if (options.semi && (n.declare || !n.body)) {
+    parts.push(";");
+  }
+
   return concat(parts);
 }
 
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index ef5faf13c..c7ce91726 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -437,22 +437,17 @@ function printPathNoParens(path, options, print, args) {
         path.call(print, "argument"),
         printTypeAnnotation(path, options, print),
       ]);
+    case "TSDeclareFunction":
     case "FunctionDeclaration":
     case "FunctionExpression":
-      parts.push(
-        printFunctionDeclaration(
-          path,
-          print,
-          options,
-          args &&
-            args.expandLastArg &&
-            getCallArguments(path.getParentNode()).length > 1
-        )
+      return printFunctionDeclaration(
+        path,
+        print,
+        options,
+        args &&
+          args.expandLastArg &&
+          getCallArguments(path.getParentNode()).length > 1
       );
-      if (!n.body) {
-        parts.push(semi);
-      }
-      return concat(parts);
     case "ArrowFunctionExpression":
       return printArrowFunctionExpression(path, options, print, args);
     case "YieldExpression":
@@ -1133,14 +1128,6 @@ function printPathNoParens(path, options, print, args) {
       return concat([path.call(print, "elementType"), "[]"]);
     case "BooleanLiteralTypeAnnotation":
       return "" + n.value;
-    case "TSDeclareFunction":
-      // For TypeScript the TSDeclareFunction node shares the AST
-      // structure with FunctionDeclaration
-      return concat([
-        n.declare ? "declare " : "",
-        printFunctionDeclaration(path, print, options),
-        semi,
-      ]);
     case "DeclareFunction":
       return printFlowDeclaration(
         path,

From 3337fc1509b7ebc5a9e61e867dec7463cb69c6a0 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 23 Nov 2020 18:59:31 +0800
Subject: [PATCH 095/299] Refactor `ConditionalExpression` and
 `TSConditionalType` print (#9753)

---
 src/language-js/print/ternary.js  | 138 ++++++++++++++++--------------
 src/language-js/printer-estree.js |  30 +------
 2 files changed, 77 insertions(+), 91 deletions(-)

diff --git a/src/language-js/print/ternary.js b/src/language-js/print/ternary.js
index 604ea79de..580074850 100644
--- a/src/language-js/print/ternary.js
+++ b/src/language-js/print/ternary.js
@@ -23,15 +23,6 @@ const {
  * @typedef {import("../../common/fast-path")} FastPath
  *
  * @typedef {any} Options - Prettier options (TBD ...)
- *
- * @typedef {Object} OperatorOptions
- * @property {() => Array<string | Doc>} beforeParts - Parts to print before the `?`.
- * @property {(breakClosingParen: boolean) => Array<string | Doc>} afterParts - Parts to print after the conditional expression.
- * @property {boolean} shouldCheckJsx - Whether to check for and print in JSX mode.
- * @property {string} conditionalNodeType - The type of the conditional expression node, ie "ConditionalExpression" or "TSConditionalType".
- * @property {string} consequentNodePropertyName - The property at which the consequent node can be found on the main node, eg "consequent".
- * @property {string} alternateNodePropertyName - The property at which the alternate node can be found on the main node, eg "alternate".
- * @property {string[]} testNodePropertyNames - The properties at which the test nodes can be found on the main node, eg "test".
  */
 
 // If we have nested conditional expressions, we want to print them in JSX mode
@@ -129,6 +120,40 @@ function conditionalExpressionChainContainsJSX(node) {
   return getConditionalChainContents(node).some(isJSXNode);
 }
 
+function printTernaryTest(path, options, print) {
+  const node = path.getValue();
+  const isConditionalExpression = node.type === "ConditionalExpression";
+  const alternateNodePropertyName = isConditionalExpression
+    ? "alternate"
+    : "falseType";
+
+  const parent = path.getParentNode();
+
+  const printed = isConditionalExpression
+    ? path.call(print, "test")
+    : concat([
+        path.call(print, "checkType"),
+        " ",
+        "extends",
+        " ",
+        path.call(print, "extendsType"),
+      ]);
+  /**
+   *     a
+   *       ? b
+   *       : multiline
+   *         test
+   *         node
+   *       ^^ align(2)
+   *       ? d
+   *       : e
+   */
+  if (parent.type === node.type && parent[alternateNodePropertyName] === node) {
+    return align(2, printed);
+  }
+  return printed;
+}
+
 /**
  * The following is the shared logic for
  * ternary operators, namely ConditionalExpression
@@ -136,13 +161,22 @@ function conditionalExpressionChainContainsJSX(node) {
  * @param {FastPath} path - The path to the ConditionalExpression/TSConditionalType node.
  * @param {Options} options - Prettier options
  * @param {Function} print - Print function to call recursively
- * @param {OperatorOptions} operatorOptions
  * @returns {Doc}
  */
-function printTernaryOperator(path, options, print, operatorOptions) {
+function printTernary(path, options, print) {
   const node = path.getValue();
-  const consequentNode = node[operatorOptions.consequentNodePropertyName];
-  const alternateNode = node[operatorOptions.alternateNodePropertyName];
+  const isConditionalExpression = node.type === "ConditionalExpression";
+  const consequentNodePropertyName = isConditionalExpression
+    ? "consequent"
+    : "trueType";
+  const alternateNodePropertyName = isConditionalExpression
+    ? "alternate"
+    : "falseType";
+  const testNodePropertyNames = isConditionalExpression
+    ? ["test"]
+    : ["checkType", "extendsType"];
+  const consequentNode = node[consequentNodePropertyName];
+  const alternateNode = node[alternateNodePropertyName];
   const parts = [];
 
   // We print a ConditionalExpression in either "JSX mode" or "normal mode".
@@ -150,10 +184,9 @@ function printTernaryOperator(path, options, print, operatorOptions) {
   let jsxMode = false;
   const parent = path.getParentNode();
   const isParentTest =
-    parent.type === operatorOptions.conditionalNodeType &&
-    operatorOptions.testNodePropertyNames.some((prop) => parent[prop] === node);
-  let forceNoIndent =
-    parent.type === operatorOptions.conditionalNodeType && !isParentTest;
+    parent.type === node.type &&
+    testNodePropertyNames.some((prop) => parent[prop] === node);
+  let forceNoIndent = parent.type === node.type && !isParentTest;
 
   // Find the outermost non-ConditionalExpression parent, and the outermost
   // ConditionalExpression parent. We'll use these to determine if we should
@@ -167,8 +200,8 @@ function printTernaryOperator(path, options, print, operatorOptions) {
     i++;
   } while (
     currentParent &&
-    currentParent.type === operatorOptions.conditionalNodeType &&
-    operatorOptions.testNodePropertyNames.every(
+    currentParent.type === node.type &&
+    testNodePropertyNames.every(
       (prop) => currentParent[prop] !== previousParent
     )
   );
@@ -176,8 +209,8 @@ function printTernaryOperator(path, options, print, operatorOptions) {
   const lastConditionalParent = previousParent;
 
   if (
-    operatorOptions.shouldCheckJsx &&
-    (isJSXNode(node[operatorOptions.testNodePropertyNames[0]]) ||
+    isConditionalExpression &&
+    (isJSXNode(node[testNodePropertyNames[0]]) ||
       isJSXNode(consequentNode) ||
       isJSXNode(alternateNode) ||
       conditionalExpressionChainContainsJSX(lastConditionalParent))
@@ -208,35 +241,30 @@ function printTernaryOperator(path, options, print, operatorOptions) {
     parts.push(
       " ? ",
       isNil(consequentNode)
-        ? path.call(print, operatorOptions.consequentNodePropertyName)
-        : wrap(path.call(print, operatorOptions.consequentNodePropertyName)),
+        ? path.call(print, consequentNodePropertyName)
+        : wrap(path.call(print, consequentNodePropertyName)),
       " : ",
-      alternateNode.type === operatorOptions.conditionalNodeType ||
-        isNil(alternateNode)
-        ? path.call(print, operatorOptions.alternateNodePropertyName)
-        : wrap(path.call(print, operatorOptions.alternateNodePropertyName))
+      alternateNode.type === node.type || isNil(alternateNode)
+        ? path.call(print, alternateNodePropertyName)
+        : wrap(path.call(print, alternateNodePropertyName))
     );
   } else {
     // normal mode
     const part = concat([
       line,
       "? ",
-      consequentNode.type === operatorOptions.conditionalNodeType
-        ? ifBreak("", "(")
-        : "",
-      align(2, path.call(print, operatorOptions.consequentNodePropertyName)),
-      consequentNode.type === operatorOptions.conditionalNodeType
-        ? ifBreak("", ")")
-        : "",
+      consequentNode.type === node.type ? ifBreak("", "(") : "",
+      align(2, path.call(print, consequentNodePropertyName)),
+      consequentNode.type === node.type ? ifBreak("", ")") : "",
       line,
       ": ",
-      alternateNode.type === operatorOptions.conditionalNodeType
-        ? path.call(print, operatorOptions.alternateNodePropertyName)
-        : align(2, path.call(print, operatorOptions.alternateNodePropertyName)),
+      alternateNode.type === node.type
+        ? path.call(print, alternateNodePropertyName)
+        : align(2, path.call(print, alternateNodePropertyName)),
     ]);
     parts.push(
-      parent.type !== operatorOptions.conditionalNodeType ||
-        parent[operatorOptions.alternateNodePropertyName] === node ||
+      parent.type !== node.type ||
+        parent[alternateNodePropertyName] === node ||
         isParentTest
         ? part
         : options.useTabs
@@ -249,9 +277,7 @@ function printTernaryOperator(path, options, print, operatorOptions) {
   // break if any of them break. That means we should only group around the
   // outer-most ConditionalExpression.
   const comments = flat([
-    ...operatorOptions.testNodePropertyNames.map(
-      (propertyName) => node[propertyName].comments
-    ),
+    ...testNodePropertyNames.map((propertyName) => node[propertyName].comments),
     consequentNode.comments,
     alternateNode.comments,
   ]).filter(Boolean);
@@ -284,27 +310,11 @@ function printTernaryOperator(path, options, print, operatorOptions) {
     !parent.computed;
 
   const result = maybeGroup(
-    concat(
-      [].concat(
-        ((testDoc) =>
-          /**
-           *     a
-           *       ? b
-           *       : multiline
-           *         test
-           *         node
-           *       ^^ align(2)
-           *       ? d
-           *       : e
-           */
-          parent.type === operatorOptions.conditionalNodeType &&
-          parent[operatorOptions.alternateNodePropertyName] === node
-            ? align(2, testDoc)
-            : testDoc)(concat(operatorOptions.beforeParts())),
-        forceNoIndent ? concat(parts) : indent(concat(parts)),
-        operatorOptions.afterParts(breakClosingParen)
-      )
-    )
+    concat([
+      printTernaryTest(path, options, print),
+      forceNoIndent ? concat(parts) : indent(concat(parts)),
+      isConditionalExpression && breakClosingParen ? softline : "",
+    ])
   );
 
   return isParentTest
@@ -312,4 +322,4 @@ function printTernaryOperator(path, options, print, operatorOptions) {
     : result;
 }
 
-module.exports = printTernaryOperator;
+module.exports = { printTernary };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index c7ce91726..078df4222 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -81,7 +81,7 @@ const {
   printExportAllDeclaration,
   printModuleSpecifier,
 } = require("./print/module");
-const printTernaryOperator = require("./print/ternary");
+const { printTernary } = require("./print/ternary");
 const { printFunctionParameters } = require("./print/function-parameters");
 const { printTemplateLiteral } = require("./print/template-literal");
 const { printArray, printArrayItems } = require("./print/array");
@@ -646,15 +646,8 @@ function printPathNoParens(path, options, print, args) {
 
       return concat(parts);
     case "ConditionalExpression":
-      return printTernaryOperator(path, options, print, {
-        beforeParts: () => [path.call(print, "test")],
-        afterParts: (breakClosingParen) => [breakClosingParen ? softline : ""],
-        shouldCheckJsx: true,
-        conditionalNodeType: "ConditionalExpression",
-        consequentNodePropertyName: "consequent",
-        alternateNodePropertyName: "alternate",
-        testNodePropertyNames: ["test"],
-      });
+    case "TSConditionalType":
+      return printTernary(path, options, print);
     case "VariableDeclaration": {
       const printed = path.map((childPath) => {
         return print(childPath);
@@ -2038,23 +2031,6 @@ function printPathNoParens(path, options, print, args) {
     case "TSPrivateIdentifier":
       return n.escapedText;
 
-    case "TSConditionalType":
-      return printTernaryOperator(path, options, print, {
-        beforeParts: () => [
-          path.call(print, "checkType"),
-          " ",
-          "extends",
-          " ",
-          path.call(print, "extendsType"),
-        ],
-        afterParts: () => [],
-        shouldCheckJsx: false,
-        conditionalNodeType: "TSConditionalType",
-        consequentNodePropertyName: "trueType",
-        alternateNodePropertyName: "falseType",
-        testNodePropertyNames: ["checkType", "extendsType"],
-      });
-
     case "TSInferType":
       return concat(["infer", " ", path.call(print, "typeParameter")]);
 

From 0517db95c90d70b1fccd1728d3e137414ddbe251 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Nov 2020 11:04:54 +0000
Subject: [PATCH 096/299] Build(deps-dev): Bump @glimmer/reference from 0.66.0
 to 0.66.1 (#9752)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index bad4f33bd..77524a626 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.7",
     "@babel/preset-env": "7.12.7",
     "@babel/types": "7.12.7",
-    "@glimmer/reference": "0.66.0",
+    "@glimmer/reference": "0.66.1",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.1",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index b21f57211..6d42431d4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -898,10 +898,10 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.66.0.tgz#4efc0d90ffc33a07e2f86b1462e71541f4e36cdd"
-  integrity sha512-3kaSDZptEF3dmCO/rcQptJ0qZQub8ax1C19+IkuBnTbeYOEgdW61rPFdApqAzY/EydMjBmxZRLhS/IMRx4wJcQ==
+"@glimmer/global-context@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.66.1.tgz#3be91232e225bc0cac4920159f6f73c8761bc98d"
+  integrity sha512-dWdr6XUsVoZ8XXLYqaYFrz9O6amogb2q9QMDnrxjqurfhcc2Va7qaUM9e3qRyICwph6MsUgrDtX3SRA6dyRwJw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
@@ -912,16 +912,23 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.66.0.tgz#3d1acb1755fe6c1660275aec7482cbc9935a656c"
-  integrity sha512-HNY2bxx+2/i5jEDQO5tVX3TZGVzCfpvVE5whkNxS+vDTV+E3KACWvxNz4e3cKbA98tYoZJjGw/jWOhgak3Bbvg==
+"@glimmer/interfaces@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.66.1.tgz#5b50b0dd6bcae19e7848d70b42f9466a184979be"
+  integrity sha512-opcDbSID3YqkUgOR15+IePfkoiJKRJh5pfxPXNw3xcwkptmbiSXNkfZGnPk4FZr4g+Jpem1CIGUDejtyaTTk3Q==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/reference@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.66.1.tgz#b61d44d78d44eb3b4bbf62cdb0dc0e4ea9600302"
+  integrity sha512-ifd2g614YzrDfHcZWTiglHVFv/x9lym79hB92GSYCiK73sl5oGUBodsbur084MfAMc1cNJEp06bXxTAoiguwLg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.66.0"
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/util" "0.66.0"
-    "@glimmer/validator" "0.66.0"
+    "@glimmer/global-context" "0.66.1"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/util" "0.66.1"
+    "@glimmer/validator" "0.66.1"
 
 "@glimmer/syntax@0.66.0":
   version "0.66.0"
@@ -942,13 +949,22 @@
     "@glimmer/interfaces" "0.66.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.66.0.tgz#a127e6f9e36a41665f6bbb8d6635412db8160824"
-  integrity sha512-9xZK3Z8kIbTa3UoDU3lxel5AeQvr9bI6hQSbx21E2sO7R7dnozWM0GQjvnjCeyU5JLGJH/YKpeItZFhHhbDvtQ==
+"@glimmer/util@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.66.1.tgz#53c5e12f121011f44c018dba6bcaa936133ffd24"
+  integrity sha512-pB7VEpCmC5hmehQdED7HJJEKFdGPsO6LHGl4LtRHHQptlyKTxotTxevDbzGuIxbsDpGPT+4e3g1rlEAfnC51/Q==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.66.1"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/validator@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.66.1.tgz#46bf25b2a8b819570d9fca0a248185ca07b8ec2a"
+  integrity sha512-9mhSCfe9R8TgTnHtOZuVTzsO9/Ej0gwRun1SQtQu5WK7Lamg0XPhluWVV46GcFv6w6NkopStCfoHIrounXTnpA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.66.0"
+    "@glimmer/global-context" "0.66.1"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From df60040e1d915ad38c88c6580b793178848deaad Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 23 Nov 2020 19:05:37 +0800
Subject: [PATCH 097/299] Move `Declare*` node to `print/flow.js` (#9757)

---
 src/language-js/print/flow.js            | 87 +++++++++++++++++++++-
 src/language-js/print/interface.js       |  2 +-
 src/language-js/print/misc.js            | 18 -----
 src/language-js/print/module.js          | 11 +--
 src/language-js/print/type-annotation.js | 60 ++++++++++++++-
 src/language-js/printer-estree.js        | 95 ++----------------------
 6 files changed, 153 insertions(+), 120 deletions(-)

diff --git a/src/language-js/print/flow.js b/src/language-js/print/flow.js
index e776eaa1c..5a069918a 100644
--- a/src/language-js/print/flow.js
+++ b/src/language-js/print/flow.js
@@ -1,14 +1,99 @@
 "use strict";
 
-const { printFlowDeclaration } = require("./misc");
+const assert = require("assert");
+const {
+  builders: { concat },
+} = require("../../document");
+const { getParentExportDeclaration } = require("../utils");
 const { printClass } = require("./class");
+const { printOpaqueType, printTypeAlias } = require("./type-annotation");
+const { printInterface } = require("./interface");
+const {
+  printExportDeclaration,
+  printExportAllDeclaration,
+} = require("./module");
 
 function printFlow(path, options, print) {
   const n = path.getValue();
+  const semi = options.semi ? ";" : "";
   switch (n.type) {
     case "DeclareClass":
       return printFlowDeclaration(path, printClass(path, options, print));
+    case "DeclareFunction":
+      return printFlowDeclaration(
+        path,
+        concat([
+          "function ",
+          path.call(print, "id"),
+          n.predicate ? " " : "",
+          path.call(print, "predicate"),
+          semi,
+        ])
+      );
+    case "DeclareModule":
+      return printFlowDeclaration(
+        path,
+        concat([
+          "module ",
+          path.call(print, "id"),
+          " ",
+          path.call(print, "body"),
+        ])
+      );
+    case "DeclareModuleExports":
+      return printFlowDeclaration(
+        path,
+        concat([
+          "module.exports",
+          ": ",
+          path.call(print, "typeAnnotation"),
+          semi,
+        ])
+      );
+    case "DeclareVariable":
+      return printFlowDeclaration(
+        path,
+        concat(["var ", path.call(print, "id"), semi])
+      );
+    case "DeclareOpaqueType":
+      return printFlowDeclaration(path, printOpaqueType(path, options, print));
+    case "DeclareInterface":
+      return printFlowDeclaration(path, printInterface(path, options, print));
+    case "DeclareTypeAlias":
+      return printFlowDeclaration(path, printTypeAlias(path, options, print));
+    case "DeclareExportDeclaration":
+      return printFlowDeclaration(
+        path,
+        printExportDeclaration(path, options, print)
+      );
+    case "DeclareExportAllDeclaration":
+      return printFlowDeclaration(
+        path,
+        printExportAllDeclaration(
+          path,
+          {
+            ...options,
+            // TODO[@fisker]: confirm `semi` can be added
+            semi: false,
+          },
+          print
+        )
+      );
   }
 }
 
+function printFlowDeclaration(path, printed) {
+  const parentExportDecl = getParentExportDeclaration(path);
+
+  if (parentExportDecl) {
+    assert.strictEqual(parentExportDecl.type, "DeclareExportDeclaration");
+    return printed;
+  }
+
+  // If the parent node has type DeclareExportDeclaration, then it
+  // will be responsible for printing the "declare" token. Otherwise
+  // it needs to be printed with this non-exported declaration node.
+  return concat(["declare ", printed]);
+}
+
 module.exports = { printFlow };
diff --git a/src/language-js/print/interface.js b/src/language-js/print/interface.js
index 17b6164b1..49b9cf7c2 100644
--- a/src/language-js/print/interface.js
+++ b/src/language-js/print/interface.js
@@ -14,7 +14,7 @@ const { printTypeScriptModifiers } = require("./misc");
 function printInterface(path, options, print) {
   const n = path.getValue();
   const parts = [];
-  if (n.type === "DeclareInterface" || n.declare) {
+  if (n.declare) {
     parts.push("declare ");
   }
 
diff --git a/src/language-js/print/misc.js b/src/language-js/print/misc.js
index 4cda52514..a31607a41 100644
--- a/src/language-js/print/misc.js
+++ b/src/language-js/print/misc.js
@@ -1,11 +1,8 @@
 "use strict";
 
-/** @type {import("assert")} */
-const assert = require("assert");
 const {
   builders: { concat, indent, join, line },
 } = require("../../document");
-const { getParentExportDeclaration } = require("../utils");
 
 function printOptionalToken(path) {
   const node = path.getValue();
@@ -49,20 +46,6 @@ function printTypeScriptModifiers(path, options, print) {
   return concat([join(" ", path.map(print, "modifiers")), " "]);
 }
 
-function printFlowDeclaration(path, printed) {
-  const parentExportDecl = getParentExportDeclaration(path);
-
-  if (parentExportDecl) {
-    assert.strictEqual(parentExportDecl.type, "DeclareExportDeclaration");
-    return printed;
-  }
-
-  // If the parent node has type DeclareExportDeclaration, then it
-  // will be responsible for printing the "declare" token. Otherwise
-  // it needs to be printed with this non-exported declaration node.
-  return concat(["declare ", printed]);
-}
-
 function adjustClause(node, clause, forceSpace) {
   if (node.type === "EmptyStatement") {
     return ";";
@@ -80,6 +63,5 @@ module.exports = {
   printFunctionTypeParameters,
   printBindExpressionCallee,
   printTypeScriptModifiers,
-  printFlowDeclaration,
   adjustClause,
 };
diff --git a/src/language-js/print/module.js b/src/language-js/print/module.js
index b1b23a6b0..d8d5a7021 100644
--- a/src/language-js/print/module.js
+++ b/src/language-js/print/module.js
@@ -47,9 +47,6 @@ function printExportDeclaration(path, options, print) {
   const parts = [];
 
   const { type, exportKind, declaration } = node;
-  if (type === "DeclareExportDeclaration") {
-    parts.push("declare ");
-  }
 
   parts.push("export");
 
@@ -89,15 +86,11 @@ function printExportDeclaration(path, options, print) {
 
 function printExportAllDeclaration(path, options, print) {
   const node = path.getValue();
-  let semi = options.semi ? ";" : "";
+  const semi = options.semi ? ";" : "";
   /** @type{Doc[]} */
   const parts = [];
 
-  const { type, exportKind, exported } = node;
-  if (type === "DeclareExportAllDeclaration") {
-    parts.push("declare ");
-    semi = "";
-  }
+  const { exportKind, exported } = node;
 
   parts.push("export");
 
diff --git a/src/language-js/print/type-annotation.js b/src/language-js/print/type-annotation.js
index 483a447bb..e6e8e07d6 100644
--- a/src/language-js/print/type-annotation.js
+++ b/src/language-js/print/type-annotation.js
@@ -1,12 +1,13 @@
 "use strict";
 const {
-  builders: { concat },
+  builders: { concat, group },
 } = require("../../document");
 const {
   isFlowAnnotationComment,
   isSimpleType,
   isObjectType,
 } = require("../utils");
+const { printAssignmentRight } = require("./assignment");
 
 function printTypeAnnotation(path, options, print) {
   const node = path.getValue();
@@ -65,4 +66,59 @@ function shouldHugType(node) {
   return false;
 }
 
-module.exports = { printTypeAnnotation, shouldHugType };
+function printOpaqueType(path, options, print) {
+  const semi = options.semi ? ";" : "";
+  const n = path.getValue();
+  const parts = [];
+  parts.push(
+    "opaque type ",
+    path.call(print, "id"),
+    path.call(print, "typeParameters")
+  );
+
+  if (n.supertype) {
+    parts.push(": ", path.call(print, "supertype"));
+  }
+
+  if (n.impltype) {
+    parts.push(" = ", path.call(print, "impltype"));
+  }
+
+  parts.push(semi);
+
+  return concat(parts);
+}
+
+function printTypeAlias(path, options, print) {
+  const semi = options.semi ? ";" : "";
+  const n = path.getValue();
+  const parts = [];
+  if (n.declare) {
+    parts.push("declare ");
+  }
+
+  const printed = printAssignmentRight(
+    n.id,
+    n.right,
+    path.call(print, "right"),
+    options
+  );
+
+  parts.push(
+    "type ",
+    path.call(print, "id"),
+    path.call(print, "typeParameters"),
+    " =",
+    printed,
+    semi
+  );
+
+  return group(concat(parts));
+}
+
+module.exports = {
+  printOpaqueType,
+  printTypeAlias,
+  printTypeAnnotation,
+  shouldHugType,
+};
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 078df4222..254bee8b9 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -72,7 +72,6 @@ const {
   printOptionalToken,
   printBindExpressionCallee,
   printTypeScriptModifiers,
-  printFlowDeclaration,
   adjustClause,
 } = require("./print/misc");
 const {
@@ -89,6 +88,8 @@ const { printObject } = require("./print/object");
 const {
   printTypeAnnotation,
   shouldHugType,
+  printOpaqueType,
+  printTypeAlias,
 } = require("./print/type-annotation");
 const {
   printClass,
@@ -485,10 +486,8 @@ function printPathNoParens(path, options, print, args) {
       return concat(["export = ", path.call(print, "expression"), semi]);
     case "ExportDefaultDeclaration":
     case "ExportNamedDeclaration":
-    case "DeclareExportDeclaration":
       return printExportDeclaration(path, options, print);
     case "ExportAllDeclaration":
-    case "DeclareExportAllDeclaration":
       return printExportAllDeclaration(path, options, print);
     case "ImportDeclaration":
       return printImportDeclaration(path, options, print);
@@ -1121,66 +1120,8 @@ function printPathNoParens(path, options, print, args) {
       return concat([path.call(print, "elementType"), "[]"]);
     case "BooleanLiteralTypeAnnotation":
       return "" + n.value;
-    case "DeclareFunction":
-      return printFlowDeclaration(
-        path,
-        concat([
-          "function ",
-          path.call(print, "id"),
-          n.predicate ? " " : "",
-          path.call(print, "predicate"),
-          semi,
-        ])
-      );
-    case "DeclareModule":
-      return printFlowDeclaration(
-        path,
-        concat([
-          "module ",
-          path.call(print, "id"),
-          " ",
-          path.call(print, "body"),
-        ])
-      );
-    case "DeclareModuleExports":
-      return printFlowDeclaration(
-        path,
-        concat([
-          "module.exports",
-          ": ",
-          path.call(print, "typeAnnotation"),
-          semi,
-        ])
-      );
-    case "DeclareVariable":
-      return printFlowDeclaration(
-        path,
-        concat(["var ", path.call(print, "id"), semi])
-      );
-    case "DeclareOpaqueType":
-    case "OpaqueType": {
-      parts.push(
-        "opaque type ",
-        path.call(print, "id"),
-        path.call(print, "typeParameters")
-      );
-
-      if (n.supertype) {
-        parts.push(": ", path.call(print, "supertype"));
-      }
-
-      if (n.impltype) {
-        parts.push(" = ", path.call(print, "impltype"));
-      }
-
-      parts.push(semi);
-
-      if (n.type === "DeclareOpaqueType") {
-        return printFlowDeclaration(path, concat(parts));
-      }
-
-      return concat(parts);
-    }
+    case "OpaqueType":
+      return printOpaqueType(path, options, print);
 
     case "EnumDeclaration":
       return concat([
@@ -1353,7 +1294,6 @@ function printPathNoParens(path, options, print, args) {
       ]);
     }
 
-    case "DeclareInterface":
     case "InterfaceDeclaration":
     case "InterfaceTypeAnnotation":
     case "TSInterfaceDeclaration":
@@ -1538,31 +1478,8 @@ function printPathNoParens(path, options, print, args) {
         return printNumber(n.extra.raw);
       }
       return printNumber(n.raw);
-
-    case "DeclareTypeAlias":
-    case "TypeAlias": {
-      if (n.type === "DeclareTypeAlias" || n.declare) {
-        parts.push("declare ");
-      }
-
-      const printed = printAssignmentRight(
-        n.id,
-        n.right,
-        path.call(print, "right"),
-        options
-      );
-
-      parts.push(
-        "type ",
-        path.call(print, "id"),
-        path.call(print, "typeParameters"),
-        " =",
-        printed,
-        semi
-      );
-
-      return group(concat(parts));
-    }
+    case "TypeAlias":
+      return printTypeAlias(path, options, print);
     case "TypeCastExpression": {
       return concat([
         "(",

From 7cb7c4920d8bd411b04c276a2d511f9a757d3640 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 23 Nov 2020 19:46:14 +0800
Subject: [PATCH 098/299] Move some "TS*" node to `print/typescript.js` (#9758)

---
 src/language-js/print/typescript.js | 548 ++++++++++++++++++++++++++++
 src/language-js/printer-estree.js   | 522 +-------------------------
 2 files changed, 558 insertions(+), 512 deletions(-)
 create mode 100644 src/language-js/print/typescript.js

diff --git a/src/language-js/print/typescript.js b/src/language-js/print/typescript.js
new file mode 100644
index 000000000..db6b76eac
--- /dev/null
+++ b/src/language-js/print/typescript.js
@@ -0,0 +1,548 @@
+"use strict";
+
+const { printDanglingComments } = require("../../main/comments");
+const { hasNewlineInRange } = require("../../common/util");
+const {
+  builders: {
+    concat,
+    join,
+    line,
+    hardline,
+    softline,
+    group,
+    indent,
+    conditionalGroup,
+    ifBreak,
+  },
+} = require("../../document");
+const {
+  isLiteral,
+  getTypeScriptMappedTypeModifier,
+  shouldPrintComma,
+} = require("../utils");
+const { locStart, locEnd } = require("../loc");
+
+const { printOptionalToken, printTypeScriptModifiers } = require("./misc");
+const { printTernary } = require("./ternary");
+const { printFunctionParameters } = require("./function-parameters");
+const { printTemplateLiteral } = require("./template-literal");
+const { printArrayItems } = require("./array");
+const { printObject } = require("./object");
+const { printClassProperty, printClassMethod } = require("./class");
+const {
+  printTypeParameter,
+  printTypeParameters,
+} = require("./type-parameters");
+const { printPropertyKey } = require("./property");
+const { printFunctionDeclaration } = require("./function");
+const { printInterface } = require("./interface");
+const { printAssignmentRight } = require("./assignment");
+const { printBlock } = require("./block");
+
+function printTypescript(path, options, print) {
+  const n = path.getValue();
+  const semi = options.semi ? ";" : "";
+  const parts = [];
+  switch (n.type) {
+    case "TSTypeAssertion": {
+      const shouldBreakAfterCast = !(
+        n.expression.type === "ArrayExpression" ||
+        n.expression.type === "ObjectExpression"
+      );
+
+      const castGroup = group(
+        concat([
+          "<",
+          indent(concat([softline, path.call(print, "typeAnnotation")])),
+          softline,
+          ">",
+        ])
+      );
+
+      const exprContents = concat([
+        ifBreak("("),
+        indent(concat([softline, path.call(print, "expression")])),
+        softline,
+        ifBreak(")"),
+      ]);
+
+      if (shouldBreakAfterCast) {
+        return conditionalGroup([
+          concat([castGroup, path.call(print, "expression")]),
+          concat([castGroup, group(exprContents, { shouldBreak: true })]),
+          concat([castGroup, path.call(print, "expression")]),
+        ]);
+      }
+      return group(concat([castGroup, path.call(print, "expression")]));
+    }
+    case "TSDeclareFunction":
+      return printFunctionDeclaration(path, print, options);
+    case "TSExportAssignment":
+      return concat(["export = ", path.call(print, "expression"), semi]);
+    case "TSModuleBlock":
+      return printBlock(path, options, print);
+    case "TSInterfaceBody":
+    case "TSTypeLiteral":
+      return printObject(path, options, print);
+    case "TSTypeAliasDeclaration": {
+      if (n.declare) {
+        parts.push("declare ");
+      }
+
+      const printed = printAssignmentRight(
+        n.id,
+        n.typeAnnotation,
+        n.typeAnnotation && path.call(print, "typeAnnotation"),
+        options
+      );
+
+      parts.push(
+        "type ",
+        path.call(print, "id"),
+        path.call(print, "typeParameters"),
+        " =",
+        printed,
+        semi
+      );
+
+      return group(concat(parts));
+    }
+    case "TSQualifiedName":
+      return join(".", [path.call(print, "left"), path.call(print, "right")]);
+    case "TSAbstractMethodDefinition":
+    case "TSDeclareMethod":
+      return printClassMethod(path, options, print);
+    case "TSAbstractClassProperty":
+      return printClassProperty(path, options, print);
+    case "TSInterfaceHeritage":
+    case "TSExpressionWithTypeArguments": // Babel AST
+      parts.push(path.call(print, "expression"));
+
+      if (n.typeParameters) {
+        parts.push(path.call(print, "typeParameters"));
+      }
+
+      return concat(parts);
+    case "TSTemplateLiteralType":
+      return printTemplateLiteral(path, print, options);
+    case "TSNamedTupleMember":
+      return concat([
+        path.call(print, "label"),
+        n.optional ? "?" : "",
+        ": ",
+        path.call(print, "elementType"),
+      ]);
+    case "TSRestType":
+      return concat(["...", path.call(print, "typeAnnotation")]);
+    case "TSOptionalType":
+      return concat([path.call(print, "typeAnnotation"), "?"]);
+    case "TSInterfaceDeclaration":
+      return printInterface(path, options, print);
+    case "TSClassImplements":
+      return concat([
+        path.call(print, "expression"),
+        path.call(print, "typeParameters"),
+      ]);
+    case "TSTypeParameterDeclaration":
+    case "TSTypeParameterInstantiation":
+      return printTypeParameters(path, options, print, "params");
+
+    case "TSTypeParameter":
+    case "TypeParameter":
+      return printTypeParameter(path, options, print);
+    case "TypeofTypeAnnotation":
+      return concat(["typeof ", path.call(print, "argument")]);
+    case "TSAbstractKeyword":
+      return "abstract";
+    case "TSAsyncKeyword":
+      return "async";
+    case "TSDeclareKeyword":
+      return "declare";
+    case "TSExportKeyword":
+      return "export";
+    case "TSNeverKeyword":
+      return "never";
+    case "TSObjectKeyword":
+      return "object";
+    case "TSProtectedKeyword":
+      return "protected";
+    case "TSPrivateKeyword":
+      return "private";
+    case "TSPublicKeyword":
+      return "public";
+    case "TSReadonlyKeyword":
+      return "readonly";
+    case "TSStaticKeyword":
+      return "static";
+    case "TSUndefinedKeyword":
+      return "undefined";
+    case "TSUnknownKeyword":
+      return "unknown";
+    case "TSAsExpression":
+      return concat([
+        path.call(print, "expression"),
+        " as ",
+        path.call(print, "typeAnnotation"),
+      ]);
+    case "TSArrayType":
+      return concat([path.call(print, "elementType"), "[]"]);
+    case "TSPropertySignature": {
+      if (n.export) {
+        parts.push("export ");
+      }
+      if (n.accessibility) {
+        parts.push(n.accessibility + " ");
+      }
+      if (n.static) {
+        parts.push("static ");
+      }
+      if (n.readonly) {
+        parts.push("readonly ");
+      }
+
+      parts.push(
+        printPropertyKey(path, options, print),
+        printOptionalToken(path)
+      );
+
+      if (n.typeAnnotation) {
+        parts.push(": ");
+        parts.push(path.call(print, "typeAnnotation"));
+      }
+
+      // This isn't valid semantically, but it's in the AST so we can print it.
+      if (n.initializer) {
+        parts.push(" = ", path.call(print, "initializer"));
+      }
+
+      return concat(parts);
+    }
+    case "TSParameterProperty":
+      if (n.accessibility) {
+        parts.push(n.accessibility + " ");
+      }
+      if (n.export) {
+        parts.push("export ");
+      }
+      if (n.static) {
+        parts.push("static ");
+      }
+      if (n.readonly) {
+        parts.push("readonly ");
+      }
+
+      parts.push(path.call(print, "parameter"));
+
+      return concat(parts);
+    case "TSTypeQuery":
+      return concat(["typeof ", path.call(print, "exprName")]);
+    case "TSIndexSignature": {
+      const parent = path.getParentNode();
+
+      // The typescript parser accepts multiple parameters here. If you're
+      // using them, it makes sense to have a trailing comma. But if you
+      // aren't, this is more like a computed property name than an array.
+      // So we leave off the trailing comma when there's just one parameter.
+      const trailingComma =
+        n.parameters.length > 1
+          ? ifBreak(shouldPrintComma(options) ? "," : "")
+          : "";
+
+      const parametersGroup = group(
+        concat([
+          indent(
+            concat([
+              softline,
+              join(concat([", ", softline]), path.map(print, "parameters")),
+            ])
+          ),
+          trailingComma,
+          softline,
+        ])
+      );
+
+      return concat([
+        n.export ? "export " : "",
+        n.accessibility ? concat([n.accessibility, " "]) : "",
+        n.static ? "static " : "",
+        n.readonly ? "readonly " : "",
+        n.declare ? "declare " : "",
+        "[",
+        n.parameters ? parametersGroup : "",
+        n.typeAnnotation ? "]: " : "]",
+        n.typeAnnotation ? path.call(print, "typeAnnotation") : "",
+        parent.type === "ClassBody" ? semi : "",
+      ]);
+    }
+    case "TSTypePredicate":
+      return concat([
+        n.asserts ? "asserts " : "",
+        path.call(print, "parameterName"),
+        n.typeAnnotation
+          ? concat([" is ", path.call(print, "typeAnnotation")])
+          : "",
+      ]);
+    case "TSNonNullExpression":
+      return concat([path.call(print, "expression"), "!"]);
+    case "TSImportType":
+      return concat([
+        !n.isTypeOf ? "" : "typeof ",
+        "import(",
+        path.call(print, n.parameter ? "parameter" : "argument"),
+        ")",
+        !n.qualifier ? "" : concat([".", path.call(print, "qualifier")]),
+        printTypeParameters(path, options, print, "typeParameters"),
+      ]);
+    case "TSLiteralType":
+      return path.call(print, "literal");
+    case "TSIndexedAccessType":
+      return concat([
+        path.call(print, "objectType"),
+        "[",
+        path.call(print, "indexType"),
+        "]",
+      ]);
+    case "TSConstructSignatureDeclaration":
+    case "TSCallSignatureDeclaration":
+    case "TSConstructorType": {
+      if (n.type !== "TSCallSignatureDeclaration") {
+        parts.push("new ");
+      }
+
+      parts.push(
+        group(
+          printFunctionParameters(
+            path,
+            print,
+            options,
+            /* expandArg */ false,
+            /* printTypeParams */ true
+          )
+        )
+      );
+
+      if (n.returnType || n.typeAnnotation) {
+        const isType = n.type === "TSConstructorType";
+        parts.push(
+          isType ? " => " : ": ",
+          path.call(print, "returnType"),
+          path.call(print, "typeAnnotation")
+        );
+      }
+      return concat(parts);
+    }
+    case "TSTypeOperator":
+      return concat([n.operator, " ", path.call(print, "typeAnnotation")]);
+    case "TSMappedType": {
+      const shouldBreak = hasNewlineInRange(
+        options.originalText,
+        locStart(n),
+        locEnd(n)
+      );
+      return group(
+        concat([
+          "{",
+          indent(
+            concat([
+              options.bracketSpacing ? line : softline,
+              n.readonly
+                ? concat([
+                    getTypeScriptMappedTypeModifier(n.readonly, "readonly"),
+                    " ",
+                  ])
+                : "",
+              printTypeScriptModifiers(path, options, print),
+              path.call(print, "typeParameter"),
+              n.optional
+                ? getTypeScriptMappedTypeModifier(n.optional, "?")
+                : "",
+              n.typeAnnotation ? ": " : "",
+              path.call(print, "typeAnnotation"),
+              ifBreak(semi, ""),
+            ])
+          ),
+          printDanglingComments(path, options, /* sameIndent */ true),
+          options.bracketSpacing ? line : softline,
+          "}",
+        ]),
+        { shouldBreak }
+      );
+    }
+    case "TSMethodSignature":
+      parts.push(
+        n.accessibility ? concat([n.accessibility, " "]) : "",
+        n.export ? "export " : "",
+        n.static ? "static " : "",
+        n.readonly ? "readonly " : "",
+        n.computed ? "[" : "",
+        path.call(print, "key"),
+        n.computed ? "]" : "",
+        printOptionalToken(path),
+        printFunctionParameters(
+          path,
+          print,
+          options,
+          /* expandArg */ false,
+          /* printTypeParams */ true
+        )
+      );
+
+      if (n.returnType || n.typeAnnotation) {
+        parts.push(
+          ": ",
+          path.call(print, "returnType"),
+          path.call(print, "typeAnnotation")
+        );
+      }
+      return group(concat(parts));
+    case "TSNamespaceExportDeclaration":
+      parts.push("export as namespace ", path.call(print, "id"));
+
+      if (options.semi) {
+        parts.push(";");
+      }
+
+      return group(concat(parts));
+    case "TSEnumDeclaration":
+      if (n.declare) {
+        parts.push("declare ");
+      }
+
+      if (n.modifiers) {
+        parts.push(printTypeScriptModifiers(path, options, print));
+      }
+      if (n.const) {
+        parts.push("const ");
+      }
+
+      parts.push("enum ", path.call(print, "id"), " ");
+
+      if (n.members.length === 0) {
+        parts.push(
+          group(
+            concat(["{", printDanglingComments(path, options), softline, "}"])
+          )
+        );
+      } else {
+        parts.push(
+          group(
+            concat([
+              "{",
+              indent(
+                concat([
+                  hardline,
+                  printArrayItems(path, options, "members", print),
+                  shouldPrintComma(options, "es5") ? "," : "",
+                ])
+              ),
+              printDanglingComments(path, options, /* sameIndent */ true),
+              hardline,
+              "}",
+            ])
+          )
+        );
+      }
+
+      return concat(parts);
+    case "TSEnumMember":
+      parts.push(path.call(print, "id"));
+      if (n.initializer) {
+        parts.push(" = ", path.call(print, "initializer"));
+      }
+      return concat(parts);
+    case "TSImportEqualsDeclaration":
+      if (n.isExport) {
+        parts.push("export ");
+      }
+      parts.push(
+        "import ",
+        path.call(print, "id"),
+        " = ",
+        path.call(print, "moduleReference")
+      );
+
+      if (options.semi) {
+        parts.push(";");
+      }
+
+      return group(concat(parts));
+    case "TSExternalModuleReference":
+      return concat(["require(", path.call(print, "expression"), ")"]);
+    case "TSModuleDeclaration": {
+      const parent = path.getParentNode();
+      const isExternalModule = isLiteral(n.id);
+      const parentIsDeclaration = parent.type === "TSModuleDeclaration";
+      const bodyIsDeclaration = n.body && n.body.type === "TSModuleDeclaration";
+
+      if (parentIsDeclaration) {
+        parts.push(".");
+      } else {
+        if (n.declare) {
+          parts.push("declare ");
+        }
+        parts.push(printTypeScriptModifiers(path, options, print));
+
+        const textBetweenNodeAndItsId = options.originalText.slice(
+          locStart(n),
+          locStart(n.id)
+        );
+
+        // Global declaration looks like this:
+        // (declare)? global { ... }
+        const isGlobalDeclaration =
+          n.id.type === "Identifier" &&
+          n.id.name === "global" &&
+          !/namespace|module/.test(textBetweenNodeAndItsId);
+
+        if (!isGlobalDeclaration) {
+          parts.push(
+            isExternalModule ||
+              /(^|\s)module(\s|$)/.test(textBetweenNodeAndItsId)
+              ? "module "
+              : "namespace "
+          );
+        }
+      }
+
+      parts.push(path.call(print, "id"));
+
+      if (bodyIsDeclaration) {
+        parts.push(path.call(print, "body"));
+      } else if (n.body) {
+        parts.push(" ", group(path.call(print, "body")));
+      } else {
+        parts.push(semi);
+      }
+
+      return concat(parts);
+    }
+    // TODO: Temporary auto-generated node type. To remove when typescript-estree has proper support for private fields.
+    case "TSPrivateIdentifier":
+      return n.escapedText;
+
+    case "TSConditionalType":
+      return printTernary(path, options, print);
+
+    case "TSInferType":
+      return concat(["infer", " ", path.call(print, "typeParameter")]);
+
+    // These are not valid TypeScript. Printing them just for the sake of error recovery.
+    case "TSJSDocAllType":
+      return "*";
+    case "TSJSDocUnknownType":
+      return "?";
+    case "TSJSDocNullableType":
+      return concat(["?", path.call(print, "typeAnnotation")]);
+    case "TSJSDocNonNullableType":
+      return concat(["!", path.call(print, "typeAnnotation")]);
+    case "TSJSDocFunctionType":
+      return concat([
+        "function(",
+        // The parameters could be here, but typescript-estree doesn't convert them anyway (throws an error).
+        "): ",
+        path.call(print, "typeAnnotation"),
+      ]);
+  }
+}
+
+module.exports = { printTypescript };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 254bee8b9..b7244e16a 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -9,7 +9,6 @@ const assert = require("assert");
 const comments = require("../main/comments");
 const {
   hasNewline,
-  hasNewlineInRange,
   getLast,
   printString,
   printNumber,
@@ -26,7 +25,6 @@ const {
     group,
     indent,
     align,
-    conditionalGroup,
     ifBreak,
   },
   utils: { isEmpty },
@@ -40,7 +38,6 @@ const preprocess = require("./print-preprocess");
 const {
   getCallArguments,
   getParentExportDeclaration,
-  getTypeScriptMappedTypeModifier,
   hasDanglingComments,
   hasFlowShorthandAnnotationComment,
   hasLeadingOwnLineComment,
@@ -50,7 +47,6 @@ const {
   isExportDeclaration,
   isFunctionNotation,
   isGetterOrSetter,
-  isLiteral,
   isObjectType,
   isObjectTypePropertyAFunction,
   isTheOnlyJSXElementInMarkdown,
@@ -68,10 +64,10 @@ const {
 const { printAngular } = require("./print/angular");
 const { printJsx } = require("./print/jsx");
 const { printFlow } = require("./print/flow");
+const { printTypescript } = require("./print/typescript");
 const {
   printOptionalToken,
   printBindExpressionCallee,
-  printTypeScriptModifiers,
   adjustClause,
 } = require("./print/misc");
 const {
@@ -97,10 +93,7 @@ const {
   printClassBody,
   printClassProperty,
 } = require("./print/class");
-const {
-  printTypeParameter,
-  printTypeParameters,
-} = require("./print/type-parameters");
+const { printTypeParameters } = require("./print/type-parameters");
 const { printPropertyKey, printProperty } = require("./print/property");
 const {
   printFunctionDeclaration,
@@ -113,7 +106,6 @@ const { printInterface } = require("./print/interface");
 const {
   printVariableDeclarator,
   printAssignmentExpression,
-  printAssignmentRight,
 } = require("./print/assignment");
 const { printBinaryishExpression } = require("./print/binaryish");
 const { printStatementSequence } = require("./print/statement");
@@ -241,7 +233,13 @@ function printPathNoParens(path, options, print, args) {
     return n;
   }
 
-  for (const printer of [printHtmlBinding, printAngular, printJsx, printFlow]) {
+  for (const printer of [
+    printHtmlBinding,
+    printAngular,
+    printJsx,
+    printFlow,
+    printTypescript,
+  ]) {
     const printed = printer(path, options, print);
     if (typeof printed !== "undefined") {
       return printed;
@@ -363,37 +361,6 @@ function printPathNoParens(path, options, print, args) {
         " = ",
         path.call(print, "right"),
       ]);
-    case "TSTypeAssertion": {
-      const shouldBreakAfterCast = !(
-        n.expression.type === "ArrayExpression" ||
-        n.expression.type === "ObjectExpression"
-      );
-
-      const castGroup = group(
-        concat([
-          "<",
-          indent(concat([softline, path.call(print, "typeAnnotation")])),
-          softline,
-          ">",
-        ])
-      );
-
-      const exprContents = concat([
-        ifBreak("("),
-        indent(concat([softline, path.call(print, "expression")])),
-        softline,
-        ifBreak(")"),
-      ]);
-
-      if (shouldBreakAfterCast) {
-        return conditionalGroup([
-          concat([castGroup, path.call(print, "expression")]),
-          concat([castGroup, group(exprContents, { shouldBreak: true })]),
-          concat([castGroup, path.call(print, "expression")]),
-        ]);
-      }
-      return group(concat([castGroup, path.call(print, "expression")]));
-    }
     case "OptionalMemberExpression":
     case "MemberExpression": {
       return printMemberExpression(path, options, print);
@@ -438,7 +405,6 @@ function printPathNoParens(path, options, print, args) {
         path.call(print, "argument"),
         printTypeAnnotation(path, options, print),
       ]);
-    case "TSDeclareFunction":
     case "FunctionDeclaration":
     case "FunctionExpression":
       return printFunctionDeclaration(
@@ -482,8 +448,6 @@ function printPathNoParens(path, options, print, args) {
       }
       return concat(parts);
     }
-    case "TSExportAssignment":
-      return concat(["export = ", path.call(print, "expression"), semi]);
     case "ExportDefaultDeclaration":
     case "ExportNamedDeclaration":
       return printExportDeclaration(path, options, print);
@@ -502,7 +466,6 @@ function printPathNoParens(path, options, print, args) {
       return concat([path.call(print, "key"), ": ", path.call(print, "value")]);
     case "Import":
       return "import";
-    case "TSModuleBlock":
     case "BlockStatement":
     case "StaticBlock":
       return printBlock(path, options, print);
@@ -531,8 +494,6 @@ function printPathNoParens(path, options, print, args) {
     case "ObjectExpression":
     case "ObjectPattern":
     case "ObjectTypeAnnotation":
-    case "TSInterfaceBody":
-    case "TSTypeLiteral":
     case "RecordExpression":
       return printObject(path, options, print);
     // Babel 6
@@ -645,7 +606,6 @@ function printPathNoParens(path, options, print, args) {
 
       return concat(parts);
     case "ConditionalExpression":
-    case "TSConditionalType":
       return printTernary(path, options, print);
     case "VariableDeclaration": {
       const printed = path.map((childPath) => {
@@ -692,29 +652,6 @@ function printPathNoParens(path, options, print, args) {
 
       return group(concat(parts));
     }
-    case "TSTypeAliasDeclaration": {
-      if (n.declare) {
-        parts.push("declare ");
-      }
-
-      const printed = printAssignmentRight(
-        n.id,
-        n.typeAnnotation,
-        n.typeAnnotation && path.call(print, "typeAnnotation"),
-        options
-      );
-
-      parts.push(
-        "type ",
-        path.call(print, "id"),
-        path.call(print, "typeParameters"),
-        " =",
-        printed,
-        semi
-      );
-
-      return group(concat(parts));
-    }
     case "WithStatement":
       return group(
         concat([
@@ -1012,8 +949,6 @@ function printPathNoParens(path, options, print, args) {
     // JSX extensions below.
     case "DebuggerStatement":
       return concat(["debugger", semi]);
-    case "TSQualifiedName":
-      return join(".", [path.call(print, "left"), path.call(print, "right")]);
 
     case "ClassDeclaration":
     case "ClassExpression":
@@ -1023,29 +958,15 @@ function printPathNoParens(path, options, print, args) {
     case "ClassMethod":
     case "ClassPrivateMethod":
     case "MethodDefinition":
-    case "TSAbstractMethodDefinition":
-    case "TSDeclareMethod":
       return printClassMethod(path, options, print);
     case "ClassProperty":
     case "FieldDefinition":
-    case "TSAbstractClassProperty":
     case "ClassPrivateProperty":
       return printClassProperty(path, options, print);
-    case "TSInterfaceHeritage":
-    case "TSExpressionWithTypeArguments": // Babel AST
-      parts.push(path.call(print, "expression"));
-
-      if (n.typeParameters) {
-        parts.push(path.call(print, "typeParameters"));
-      }
-
-      return concat(parts);
     case "TemplateElement":
       return join(literalline, n.value.raw.split(/\r?\n/g));
-    case "TSTemplateLiteralType":
-    case "TemplateLiteral": {
+    case "TemplateLiteral":
       return printTemplateLiteral(path, print, options);
-    }
     case "TaggedTemplateExpression":
       return concat([
         path.call(print, "tag"),
@@ -1080,13 +1001,6 @@ function printPathNoParens(path, options, print, args) {
 
       /* istanbul ignore next */
       return "";
-    case "TSNamedTupleMember":
-      return concat([
-        path.call(print, "label"),
-        n.optional ? "?" : "",
-        ": ",
-        path.call(print, "elementType"),
-      ]);
     case "TSTupleType":
     case "TupleTypeAnnotation": {
       const typesField = n.type === "TSTupleType" ? "elementTypes" : "types";
@@ -1276,10 +1190,6 @@ function printPathNoParens(path, options, print, args) {
 
       return group(concat(parts));
     }
-    case "TSRestType":
-      return concat(["...", path.call(print, "typeAnnotation")]);
-    case "TSOptionalType":
-      return concat([path.call(print, "typeAnnotation"), "?"]);
     case "FunctionTypeParam": {
       const name = n.name
         ? path.call(print, "name")
@@ -1296,7 +1206,6 @@ function printPathNoParens(path, options, print, args) {
 
     case "InterfaceDeclaration":
     case "InterfaceTypeAnnotation":
-    case "TSInterfaceDeclaration":
       return printInterface(path, options, print);
     case "ClassImplements":
     case "InterfaceExtends":
@@ -1304,11 +1213,6 @@ function printPathNoParens(path, options, print, args) {
         path.call(print, "id"),
         path.call(print, "typeParameters"),
       ]);
-    case "TSClassImplements":
-      return concat([
-        path.call(print, "expression"),
-        path.call(print, "typeParameters"),
-      ]);
     case "TSIntersectionType":
     case "IntersectionTypeAnnotation": {
       const types = path.map(print, "types");
@@ -1515,15 +1419,6 @@ function printPathNoParens(path, options, print, args) {
       return printed;
     }
 
-    case "TSTypeParameterDeclaration":
-    case "TSTypeParameterInstantiation":
-      return printTypeParameters(path, options, print, "params");
-
-    case "TSTypeParameter":
-    case "TypeParameter":
-      return printTypeParameter(path, options, print);
-    case "TypeofTypeAnnotation":
-      return concat(["typeof ", path.call(print, "argument")]);
     case "InferredPredicate":
       return "%checks";
     // Unhandled types below. If encountered, nodes of these types should
@@ -1531,13 +1426,9 @@ function printPathNoParens(path, options, print, args) {
     // supported by the pretty-printer.
     case "DeclaredPredicate":
       return concat(["%checks(", path.call(print, "value"), ")"]);
-    case "TSAbstractKeyword":
-      return "abstract";
     case "AnyTypeAnnotation":
     case "TSAnyKeyword":
       return "any";
-    case "TSAsyncKeyword":
-      return "async";
     case "BooleanTypeAnnotation":
     case "TSBooleanKeyword":
       return "boolean";
@@ -1546,411 +1437,35 @@ function printPathNoParens(path, options, print, args) {
       return "bigint";
     case "TSConstKeyword":
       return "const";
-    case "TSDeclareKeyword":
-      return "declare";
-    case "TSExportKeyword":
-      return "export";
     case "NullLiteralTypeAnnotation":
     case "TSNullKeyword":
       return "null";
-    case "TSNeverKeyword":
-      return "never";
     case "NumberTypeAnnotation":
     case "TSNumberKeyword":
       return "number";
-    case "TSObjectKeyword":
-      return "object";
-    case "TSProtectedKeyword":
-      return "protected";
-    case "TSPrivateKeyword":
-      return "private";
-    case "TSPublicKeyword":
-      return "public";
-    case "TSReadonlyKeyword":
-      return "readonly";
     case "SymbolTypeAnnotation":
     case "TSSymbolKeyword":
       return "symbol";
-    case "TSStaticKeyword":
-      return "static";
     case "StringTypeAnnotation":
     case "TSStringKeyword":
       return "string";
-    case "TSUndefinedKeyword":
-      return "undefined";
-    case "TSUnknownKeyword":
-      return "unknown";
     case "VoidTypeAnnotation":
     case "TSVoidKeyword":
       return "void";
-    case "TSAsExpression":
-      return concat([
-        path.call(print, "expression"),
-        " as ",
-        path.call(print, "typeAnnotation"),
-      ]);
-    case "TSArrayType":
-      return concat([path.call(print, "elementType"), "[]"]);
-    case "TSPropertySignature": {
-      if (n.export) {
-        parts.push("export ");
-      }
-      if (n.accessibility) {
-        parts.push(n.accessibility + " ");
-      }
-      if (n.static) {
-        parts.push("static ");
-      }
-      if (n.readonly) {
-        parts.push("readonly ");
-      }
-
-      parts.push(
-        printPropertyKey(path, options, print),
-        printOptionalToken(path)
-      );
-
-      if (n.typeAnnotation) {
-        parts.push(": ");
-        parts.push(path.call(print, "typeAnnotation"));
-      }
-
-      // This isn't valid semantically, but it's in the AST so we can print it.
-      if (n.initializer) {
-        parts.push(" = ", path.call(print, "initializer"));
-      }
-
-      return concat(parts);
-    }
-    case "TSParameterProperty":
-      if (n.accessibility) {
-        parts.push(n.accessibility + " ");
-      }
-      if (n.export) {
-        parts.push("export ");
-      }
-      if (n.static) {
-        parts.push("static ");
-      }
-      if (n.readonly) {
-        parts.push("readonly ");
-      }
-
-      parts.push(path.call(print, "parameter"));
-
-      return concat(parts);
     case "GenericTypeAnnotation":
     case "TSTypeReference":
       return concat([
         path.call(print, n.type === "TSTypeReference" ? "typeName" : "id"),
         printTypeParameters(path, options, print, "typeParameters"),
       ]);
-    case "TSTypeQuery":
-      return concat(["typeof ", path.call(print, "exprName")]);
-    case "TSIndexSignature": {
-      const parent = path.getParentNode();
-
-      // The typescript parser accepts multiple parameters here. If you're
-      // using them, it makes sense to have a trailing comma. But if you
-      // aren't, this is more like a computed property name than an array.
-      // So we leave off the trailing comma when there's just one parameter.
-      const trailingComma =
-        n.parameters.length > 1
-          ? ifBreak(shouldPrintComma(options) ? "," : "")
-          : "";
-
-      const parametersGroup = group(
-        concat([
-          indent(
-            concat([
-              softline,
-              join(concat([", ", softline]), path.map(print, "parameters")),
-            ])
-          ),
-          trailingComma,
-          softline,
-        ])
-      );
-
-      return concat([
-        n.export ? "export " : "",
-        n.accessibility ? concat([n.accessibility, " "]) : "",
-        n.static ? "static " : "",
-        n.readonly ? "readonly " : "",
-        n.declare ? "declare " : "",
-        "[",
-        n.parameters ? parametersGroup : "",
-        n.typeAnnotation ? "]: " : "]",
-        n.typeAnnotation ? path.call(print, "typeAnnotation") : "",
-        parent.type === "ClassBody" ? semi : "",
-      ]);
-    }
-    case "TSTypePredicate":
-      return concat([
-        n.asserts ? "asserts " : "",
-        path.call(print, "parameterName"),
-        n.typeAnnotation
-          ? concat([" is ", path.call(print, "typeAnnotation")])
-          : "",
-      ]);
-    case "TSNonNullExpression":
-      return concat([path.call(print, "expression"), "!"]);
     case "ThisTypeAnnotation":
     case "TSThisType":
       return "this";
-    case "TSImportType":
-      return concat([
-        !n.isTypeOf ? "" : "typeof ",
-        "import(",
-        path.call(print, n.parameter ? "parameter" : "argument"),
-        ")",
-        !n.qualifier ? "" : concat([".", path.call(print, "qualifier")]),
-        printTypeParameters(path, options, print, "typeParameters"),
-      ]);
-    case "TSLiteralType":
-      return path.call(print, "literal");
-    case "TSIndexedAccessType":
-      return concat([
-        path.call(print, "objectType"),
-        "[",
-        path.call(print, "indexType"),
-        "]",
-      ]);
-    case "TSConstructSignatureDeclaration":
-    case "TSCallSignatureDeclaration":
-    case "TSConstructorType": {
-      if (n.type !== "TSCallSignatureDeclaration") {
-        parts.push("new ");
-      }
-
-      parts.push(
-        group(
-          printFunctionParameters(
-            path,
-            print,
-            options,
-            /* expandArg */ false,
-            /* printTypeParams */ true
-          )
-        )
-      );
-
-      if (n.returnType || n.typeAnnotation) {
-        const isType = n.type === "TSConstructorType";
-        parts.push(
-          isType ? " => " : ": ",
-          path.call(print, "returnType"),
-          path.call(print, "typeAnnotation")
-        );
-      }
-      return concat(parts);
-    }
-    case "TSTypeOperator":
-      return concat([n.operator, " ", path.call(print, "typeAnnotation")]);
-    case "TSMappedType": {
-      const shouldBreak = hasNewlineInRange(
-        options.originalText,
-        locStart(n),
-        locEnd(n)
-      );
-      return group(
-        concat([
-          "{",
-          indent(
-            concat([
-              options.bracketSpacing ? line : softline,
-              n.readonly
-                ? concat([
-                    getTypeScriptMappedTypeModifier(n.readonly, "readonly"),
-                    " ",
-                  ])
-                : "",
-              printTypeScriptModifiers(path, options, print),
-              path.call(print, "typeParameter"),
-              n.optional
-                ? getTypeScriptMappedTypeModifier(n.optional, "?")
-                : "",
-              n.typeAnnotation ? ": " : "",
-              path.call(print, "typeAnnotation"),
-              ifBreak(semi, ""),
-            ])
-          ),
-          comments.printDanglingComments(path, options, /* sameIndent */ true),
-          options.bracketSpacing ? line : softline,
-          "}",
-        ]),
-        { shouldBreak }
-      );
-    }
-    case "TSMethodSignature":
-      parts.push(
-        n.accessibility ? concat([n.accessibility, " "]) : "",
-        n.export ? "export " : "",
-        n.static ? "static " : "",
-        n.readonly ? "readonly " : "",
-        n.computed ? "[" : "",
-        path.call(print, "key"),
-        n.computed ? "]" : "",
-        printOptionalToken(path),
-        printFunctionParameters(
-          path,
-          print,
-          options,
-          /* expandArg */ false,
-          /* printTypeParams */ true
-        )
-      );
-
-      if (n.returnType || n.typeAnnotation) {
-        parts.push(
-          ": ",
-          path.call(print, "returnType"),
-          path.call(print, "typeAnnotation")
-        );
-      }
-      return group(concat(parts));
-    case "TSNamespaceExportDeclaration":
-      parts.push("export as namespace ", path.call(print, "id"));
-
-      if (options.semi) {
-        parts.push(";");
-      }
-
-      return group(concat(parts));
-    case "TSEnumDeclaration":
-      if (n.declare) {
-        parts.push("declare ");
-      }
-
-      if (n.modifiers) {
-        parts.push(printTypeScriptModifiers(path, options, print));
-      }
-      if (n.const) {
-        parts.push("const ");
-      }
-
-      parts.push("enum ", path.call(print, "id"), " ");
-
-      if (n.members.length === 0) {
-        parts.push(
-          group(
-            concat([
-              "{",
-              comments.printDanglingComments(path, options),
-              softline,
-              "}",
-            ])
-          )
-        );
-      } else {
-        parts.push(
-          group(
-            concat([
-              "{",
-              indent(
-                concat([
-                  hardline,
-                  printArrayItems(path, options, "members", print),
-                  shouldPrintComma(options, "es5") ? "," : "",
-                ])
-              ),
-              comments.printDanglingComments(
-                path,
-                options,
-                /* sameIndent */ true
-              ),
-              hardline,
-              "}",
-            ])
-          )
-        );
-      }
-
-      return concat(parts);
-    case "TSEnumMember":
-      parts.push(path.call(print, "id"));
-      if (n.initializer) {
-        parts.push(" = ", path.call(print, "initializer"));
-      }
-      return concat(parts);
-    case "TSImportEqualsDeclaration":
-      if (n.isExport) {
-        parts.push("export ");
-      }
-      parts.push(
-        "import ",
-        path.call(print, "id"),
-        " = ",
-        path.call(print, "moduleReference")
-      );
-
-      if (options.semi) {
-        parts.push(";");
-      }
-
-      return group(concat(parts));
-    case "TSExternalModuleReference":
-      return concat(["require(", path.call(print, "expression"), ")"]);
-    case "TSModuleDeclaration": {
-      const parent = path.getParentNode();
-      const isExternalModule = isLiteral(n.id);
-      const parentIsDeclaration = parent.type === "TSModuleDeclaration";
-      const bodyIsDeclaration = n.body && n.body.type === "TSModuleDeclaration";
-
-      if (parentIsDeclaration) {
-        parts.push(".");
-      } else {
-        if (n.declare) {
-          parts.push("declare ");
-        }
-        parts.push(printTypeScriptModifiers(path, options, print));
-
-        const textBetweenNodeAndItsId = options.originalText.slice(
-          locStart(n),
-          locStart(n.id)
-        );
-
-        // Global declaration looks like this:
-        // (declare)? global { ... }
-        const isGlobalDeclaration =
-          n.id.type === "Identifier" &&
-          n.id.name === "global" &&
-          !/namespace|module/.test(textBetweenNodeAndItsId);
-
-        if (!isGlobalDeclaration) {
-          parts.push(
-            isExternalModule ||
-              /(^|\s)module(\s|$)/.test(textBetweenNodeAndItsId)
-              ? "module "
-              : "namespace "
-          );
-        }
-      }
-
-      parts.push(path.call(print, "id"));
-
-      if (bodyIsDeclaration) {
-        parts.push(path.call(print, "body"));
-      } else if (n.body) {
-        parts.push(" ", group(path.call(print, "body")));
-      } else {
-        parts.push(semi);
-      }
-
-      return concat(parts);
-    }
 
     case "PrivateName":
       // babel use `id`, meriyah use `name`
       return concat(["#", path.call(print, n.id ? "id" : "name")]);
 
-    // TODO: Temporary auto-generated node type. To remove when typescript-estree has proper support for private fields.
-    case "TSPrivateIdentifier":
-      return n.escapedText;
-
-    case "TSInferType":
-      return concat(["infer", " ", path.call(print, "typeParameter")]);
-
     case "InterpreterDirective":
       parts.push("#!", n.value, hardline);
 
@@ -1972,23 +1487,6 @@ function printPathNoParens(path, options, print, args) {
     case "ArgumentPlaceholder":
       return "?";
 
-    // These are not valid TypeScript. Printing them just for the sake of error recovery.
-    case "TSJSDocAllType":
-      return "*";
-    case "TSJSDocUnknownType":
-      return "?";
-    case "TSJSDocNullableType":
-      return concat(["?", path.call(print, "typeAnnotation")]);
-    case "TSJSDocNonNullableType":
-      return concat(["!", path.call(print, "typeAnnotation")]);
-    case "TSJSDocFunctionType":
-      return concat([
-        "function(",
-        // The parameters could be here, but typescript-estree doesn't convert them anyway (throws an error).
-        "): ",
-        path.call(print, "typeAnnotation"),
-      ]);
-
     default:
       /* istanbul ignore next */
       throw new Error("unknown type: " + JSON.stringify(n.type));

From fc0c506042142e376092f690b7af60323adca484 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 00:06:11 +0800
Subject: [PATCH 099/299] Build(deps): Bump @glimmer/syntax from 0.66.0 to
 0.66.1 (#9747)

Bumps [@glimmer/syntax](https://github.com/glimmerjs/glimmer-vm) from 0.66.0 to 0.66.1.
- [Release notes](https://github.com/glimmerjs/glimmer-vm/releases)
- [Changelog](https://github.com/glimmerjs/glimmer-vm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/glimmerjs/glimmer-vm/compare/v0.66.0...v0.66.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 28 ++++++----------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 77524a626..689f1e5ff 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "10.2.3",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.5",
-    "@glimmer/syntax": "0.66.0",
+    "@glimmer/syntax": "0.66.1",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.8.1",
     "angular-estree-parser": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index 6d42431d4..0228a44f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -905,13 +905,6 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.66.0.tgz#f281e1985d6b7f63648d960cc2745c68562fdb92"
-  integrity sha512-fw1pO6oyczSKeTPR6anrSI4OarLlaAR0SSDAhsYrINXfW7Xd/U/es7i6VE1JjLSZqfnsAxjNOFDe0lA5lmV/dw==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.66.1":
   version "0.66.1"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.66.1.tgz#5b50b0dd6bcae19e7848d70b42f9466a184979be"
@@ -930,25 +923,16 @@
     "@glimmer/util" "0.66.1"
     "@glimmer/validator" "0.66.1"
 
-"@glimmer/syntax@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.66.0.tgz#d38561be48f6c4deeb94c24a1344a3426bb7e925"
-  integrity sha512-sgGQvoLprHjGV/TW2WY5wTmJaUjkHHgXhRJp+nLL5+JVC1zoR/mbGJk2Wfbj/R5D3pKzPln08HsSdXKj9Dl36g==
+"@glimmer/syntax@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.66.1.tgz#901b9d0253ad5ac1f7f8199de0ef43c98c209a63"
+  integrity sha512-hzYhlfWzu5c8K7ZtTh3bSdpT5a6efxN1NsKUvGE5p1TC9XGOZuKogq/fRtlK2UGBUazEh5fvTu7qmQ8dTU1dWA==
   dependencies:
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/util" "0.66.0"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/util" "0.66.1"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.66.0.tgz#c457951951f4ea1d5a1d63fa11c9ffeae8efa4f6"
-  integrity sha512-4J3sihRKZ7N4igk2BZGryC/E6qIy+20d3Dl9+jYhsM8SdviPm+PtFy7tdJsb3E+u/yITqHnvzt7+Cr+VtlT7KA==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.66.0"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.66.1":
   version "0.66.1"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.66.1.tgz#53c5e12f121011f44c018dba6bcaa936133ffd24"

From 82603f2609c7814606cbf35dfcf4f6a6d3328cfe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 14:24:30 +0800
Subject: [PATCH 100/299] Build(deps): Bump @babel/parser from 7.12.5 to 7.12.7
 (#9748)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: fisker <lionkay@gmail.com>
---
 package.json                                  |  2 +-
 .../objects/__snapshots__/jsfmt.spec.js.snap  | 82 +++++++++++++++--
 tests/js/objects/getter-setter.js             |  4 +
 tests/js/objects/jsfmt.spec.js                |  5 +-
 .../keywords/__snapshots__/jsfmt.spec.js.snap | 87 +++++++++++++++++++
 tests/typescript/keywords/jsfmt.spec.js       |  4 +-
 tests/typescript/keywords/keywords-2.ts       | 38 ++++++++
 .../__snapshots__/jsfmt.spec.js.snap          | 23 +++++
 .../typescript/predicate-types/jsfmt.spec.js  |  1 +
 .../predicate-types/predicate-types.ts        |  6 ++
 yarn.lock                                     |  7 +-
 11 files changed, 242 insertions(+), 17 deletions(-)
 create mode 100644 tests/js/objects/getter-setter.js
 create mode 100644 tests/typescript/keywords/keywords-2.ts
 create mode 100644 tests/typescript/predicate-types/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/typescript/predicate-types/jsfmt.spec.js
 create mode 100644 tests/typescript/predicate-types/predicate-types.ts

diff --git a/package.json b/package.json
index 689f1e5ff..0ddc0cebd 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@angular/compiler": "10.2.3",
     "@babel/code-frame": "7.10.4",
-    "@babel/parser": "7.12.5",
+    "@babel/parser": "7.12.7",
     "@glimmer/syntax": "0.66.1",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.8.1",
diff --git a/tests/js/objects/__snapshots__/jsfmt.spec.js.snap b/tests/js/objects/__snapshots__/jsfmt.spec.js.snap
index 4b85057b7..83bc1d99c 100644
--- a/tests/js/objects/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/objects/__snapshots__/jsfmt.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`escape-sequence-key.js format 1`] = `
 ====================================options=====================================
-parsers: ["babel"]
+parsers: ["babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -30,7 +30,7 @@ const b = {
 
 exports[`expand.js format 1`] = `
 ====================================options=====================================
-parsers: ["babel"]
+parsers: ["babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -74,9 +74,20 @@ exports[`expression.js [meriyah] format 1`] = `
   8 | ({} = 0);"
 `;
 
+exports[`expression.js [typescript] format 1`] = `
+"')' expected. (5:4)
+  3 | a = () => ({}).x;
+  4 | ({} && a, b);
+> 5 | ({}::b, 0);
+    |    ^
+  6 | ({}::b()\`\`[''].c++ && 0 ? 0 : 0, 0);
+  7 | ({}(), 0);
+  8 | ({} = 0);"
+`;
+
 exports[`expression.js format 1`] = `
 ====================================options=====================================
-parsers: ["babel"]
+parsers: ["babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -135,6 +146,50 @@ const a3 = {
 ================================================================================
 `;
 
+exports[`getter-setter.js [espree] format 1`] = `
+"setter should have exactly one param (3:9)
+  1 | ({ set x(foo) {} });
+  2 | ({ get x() { return 1 } });
+> 3 | ({ set x() {} });
+    |         ^
+  4 | ({ get x(x) {} });
+  5 | "
+`;
+
+exports[`getter-setter.js [meriyah] format 1`] = `
+"[3:10]: Setter functions must have exactly one argument (3:10)
+  1 | ({ set x(foo) {} });
+  2 | ({ get x() { return 1 } });
+> 3 | ({ set x() {} });
+    |          ^
+  4 | ({ get x(x) {} });
+  5 | "
+`;
+
+exports[`getter-setter.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+({ set x(foo) {} });
+({ get x() { return 1 } });
+({ set x() {} });
+({ get x(x) {} });
+
+=====================================output=====================================
+({ set x(foo) {} });
+({
+  get x() {
+    return 1;
+  },
+});
+({ set x() {} });
+({ get x(x) {} });
+
+================================================================================
+`;
+
 exports[`invalid-accessor-generator.js [espree] format 1`] = `
 "Unexpected token * (5:9)
   3 | 
@@ -157,9 +212,20 @@ exports[`invalid-accessor-generator.js [meriyah] format 1`] = `
   8 |     set iterator2(iter) { },"
 `;
 
+exports[`invalid-accessor-generator.js [typescript] format 1`] = `
+"Identifier expected. (5:9)
+  3 | 
+  4 | ({
+> 5 |     get *iterator() { },
+    |         ^
+  6 |     set *iterator(iter) { },
+  7 |     get iterator2() { },
+  8 |     set iterator2(iter) { },"
+`;
+
 exports[`invalid-accessor-generator.js format 1`] = `
 ====================================options=====================================
-parsers: ["babel"]
+parsers: ["babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -203,7 +269,7 @@ exports[`invalid-setter.js [meriyah] format 1`] = `
 
 exports[`invalid-setter.js format 1`] = `
 ====================================options=====================================
-parsers: ["babel"]
+parsers: ["babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -217,7 +283,7 @@ printWidth: 80
 
 exports[`method.js format 1`] = `
 ====================================options=====================================
-parsers: ["babel"]
+parsers: ["babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -231,7 +297,7 @@ a = { f() {} };
 
 exports[`range.js format 1`] = `
 ====================================options=====================================
-parsers: ["babel"]
+parsers: ["babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
@@ -269,7 +335,7 @@ group(
 
 exports[`right-break.js format 1`] = `
 ====================================options=====================================
-parsers: ["babel"]
+parsers: ["babel", "typescript"]
 printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
diff --git a/tests/js/objects/getter-setter.js b/tests/js/objects/getter-setter.js
new file mode 100644
index 000000000..3a8931bb5
--- /dev/null
+++ b/tests/js/objects/getter-setter.js
@@ -0,0 +1,4 @@
+({ set x(foo) {} });
+({ get x() { return 1 } });
+({ set x() {} });
+({ get x(x) {} });
diff --git a/tests/js/objects/jsfmt.spec.js b/tests/js/objects/jsfmt.spec.js
index 432d0d511..315aaf07e 100644
--- a/tests/js/objects/jsfmt.spec.js
+++ b/tests/js/objects/jsfmt.spec.js
@@ -1,14 +1,17 @@
-run_spec(__dirname, ["babel"], {
+run_spec(__dirname, ["babel", "typescript"], {
   errors: {
     espree: [
       "expression.js",
       "invalid-accessor-generator.js",
       "invalid-setter.js",
+      "getter-setter.js",
     ],
+    typescript: ["expression.js", "invalid-accessor-generator.js"],
     meriyah: [
       "expression.js",
       "invalid-accessor-generator.js",
       "invalid-setter.js",
+      "getter-setter.js",
     ],
   },
 });
diff --git a/tests/typescript/keywords/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/keywords/__snapshots__/jsfmt.spec.js.snap
index ebdf7fa1a..caf12a3c3 100644
--- a/tests/typescript/keywords/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/keywords/__snapshots__/jsfmt.spec.js.snap
@@ -113,3 +113,90 @@ module YYY4 {
 
 ================================================================================
 `;
+
+exports[`keywords-2.ts format 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// https://github.com/babel/babel/pull/12356
+
+class C {
+  private *a() {}
+  public *b() {}
+  static *c() {}
+  abstract *d() {}
+  readonly *e() {}
+  declare *f() {}
+  protected *g() {}
+}
+
+class D {
+  declare<T>() {}
+  readonly<T>() {}
+  abstract<T>() {}
+  static<T>() {}
+  private<T>() {}
+  public<T>() {}
+  protected<T>() {}
+}
+
+class E {
+  public
+  private() {}
+}
+
+class Foo {
+  constructor(private, public, static) {
+  }
+}
+
+class F {
+    constructor(public []) {}
+}
+class G {
+    constructor(public {}) {}
+}
+
+=====================================output=====================================
+// https://github.com/babel/babel/pull/12356
+
+class C {
+  private *a() {}
+  public *b() {}
+  static *c() {}
+  abstract *d() {}
+  *e() {}
+  *f() {}
+  protected *g() {}
+}
+
+class D {
+  declare<T>() {}
+  readonly<T>() {}
+  abstract<T>() {}
+  static<T>() {}
+  private<T>() {}
+  public<T>() {}
+  protected<T>() {}
+}
+
+class E {
+  public;
+  private() {}
+}
+
+class Foo {
+  constructor(private, public, static) {}
+}
+
+class F {
+  constructor(public []) {}
+}
+class G {
+  constructor(public {}) {}
+}
+
+================================================================================
+`;
diff --git a/tests/typescript/keywords/jsfmt.spec.js b/tests/typescript/keywords/jsfmt.spec.js
index 4c48f7a81..69e435854 100644
--- a/tests/typescript/keywords/jsfmt.spec.js
+++ b/tests/typescript/keywords/jsfmt.spec.js
@@ -1 +1,3 @@
-run_spec(__dirname, ["typescript"], { errors: { "babel-ts": true } });
+run_spec(__dirname, ["typescript"], {
+  errors: { "babel-ts": ["keywords.ts"] },
+});
diff --git a/tests/typescript/keywords/keywords-2.ts b/tests/typescript/keywords/keywords-2.ts
new file mode 100644
index 000000000..cc54a65ec
--- /dev/null
+++ b/tests/typescript/keywords/keywords-2.ts
@@ -0,0 +1,38 @@
+// https://github.com/babel/babel/pull/12356
+
+class C {
+  private *a() {}
+  public *b() {}
+  static *c() {}
+  abstract *d() {}
+  readonly *e() {}
+  declare *f() {}
+  protected *g() {}
+}
+
+class D {
+  declare<T>() {}
+  readonly<T>() {}
+  abstract<T>() {}
+  static<T>() {}
+  private<T>() {}
+  public<T>() {}
+  protected<T>() {}
+}
+
+class E {
+  public
+  private() {}
+}
+
+class Foo {
+  constructor(private, public, static) {
+  }
+}
+
+class F {
+    constructor(public []) {}
+}
+class G {
+    constructor(public {}) {}
+}
diff --git a/tests/typescript/predicate-types/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/predicate-types/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..7adc82a8e
--- /dev/null
+++ b/tests/typescript/predicate-types/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`predicate-types.ts format 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+class Foo {
+  isBar(): this is string {
+  }
+  isBaz = (): this is string => {
+  }
+}
+
+=====================================output=====================================
+class Foo {
+  isBar(): this is string {}
+  isBaz = (): this is string => {};
+}
+
+================================================================================
+`;
diff --git a/tests/typescript/predicate-types/jsfmt.spec.js b/tests/typescript/predicate-types/jsfmt.spec.js
new file mode 100644
index 000000000..2ea3bb6eb
--- /dev/null
+++ b/tests/typescript/predicate-types/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["typescript"]);
diff --git a/tests/typescript/predicate-types/predicate-types.ts b/tests/typescript/predicate-types/predicate-types.ts
new file mode 100644
index 000000000..5a4be8de8
--- /dev/null
+++ b/tests/typescript/predicate-types/predicate-types.ts
@@ -0,0 +1,6 @@
+class Foo {
+  isBar(): this is string {
+  }
+  isBaz = (): this is string => {
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 0228a44f6..e09b1ccaf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -277,12 +277,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
-  integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
+"@babel/parser@7.12.7", "@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
   integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==

From 90abbb792452cf04a2611ccd810fa21c695f5732 Mon Sep 17 00:00:00 2001
From: Juriy Zaytsev <kangax@gmail.com>
Date: Tue, 24 Nov 2020 01:45:03 -0500
Subject: [PATCH 101/299] [Glimmer] Preserve tilde comments (#9082)

Co-authored-by: fisker <lionkay@gmail.com>
---
 changelog_unreleased/handlebars/9082.md       | 19 ++++++++++++++
 src/language-handlebars/printer-glimmer.js    | 20 +++++++++++++-
 .../comment/__snapshots__/jsfmt.spec.js.snap  | 26 +++++++++++++++++++
 tests/handlebars/comment/comments.hbs         | 13 ++++++++++
 .../__snapshots__/jsfmt.spec.js.snap          | 20 ++++++++++++++
 .../errors/handlebars/tilde-comments-1.hbs    |  1 +
 .../errors/handlebars/tilde-comments-2.hbs    |  1 +
 7 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/handlebars/9082.md
 create mode 100644 tests/misc/errors/handlebars/tilde-comments-1.hbs
 create mode 100644 tests/misc/errors/handlebars/tilde-comments-2.hbs

diff --git a/changelog_unreleased/handlebars/9082.md b/changelog_unreleased/handlebars/9082.md
new file mode 100644
index 000000000..5c9d6070f
--- /dev/null
+++ b/changelog_unreleased/handlebars/9082.md
@@ -0,0 +1,19 @@
+#### Preserve tilde comments (#9082 by @kangax, @fisker)
+
+<!-- prettier-ignore -->
+```hbs
+{{!-- Input --}}
+{{~! Comment }}
+{{! Comment ~}}
+{{~! Comment ~}}
+
+{{!-- Prettier stable --}}
+{{! Comment }}
+{{! Comment }}
+{{! Comment }}
+
+{{!-- Prettier master --}}
+{{~! Comment }}
+{{! Comment ~}}
+{{~! Comment ~}}
+```
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index ff63ca325..0981f2dd3 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -268,8 +268,26 @@ function print(path, options, print) {
       ]);
     }
     case "MustacheCommentStatement": {
+      const start = locStart(n);
+      const end = locEnd(n);
+      // Starts with `{{~`
+      const isLeftWhiteSpaceSensitive =
+        options.originalText.charAt(start + 2) === "~";
+      // Ends with `{{~`
+      const isRightWhitespaceSensitive =
+        options.originalText.charAt(end - 3) === "~";
+
       const dashes = n.value.includes("}}") ? "--" : "";
-      return concat(["{{!", dashes, n.value, dashes, "}}"]);
+      return concat([
+        "{{",
+        isLeftWhiteSpaceSensitive ? "~" : "",
+        "!",
+        dashes,
+        n.value,
+        dashes,
+        isRightWhitespaceSensitive ? "~" : "",
+        "}}",
+      ]);
     }
     case "PathExpression": {
       return n.original;
diff --git a/tests/handlebars/comment/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/comment/__snapshots__/jsfmt.spec.js.snap
index 98dedda6a..83d437eee 100644
--- a/tests/handlebars/comment/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/handlebars/comment/__snapshots__/jsfmt.spec.js.snap
@@ -21,9 +21,22 @@ printWidth: 80
 <div class="entry">
   {{! This comment will not be in the output }}
   {{!-- This comment as }} and will not be in the output --}}
+  {{~! This comment will not be in the output }}
+  {{! This comment will not be in the output ~}}
+  {{~! This comment will not be in the output ~}}
+  {{~!
+comment
+ ~}}
+  {{~! 1 ~}}{{~! 2 ~}}
   <!-- This comment will be in the output -->
 </div>
 
+<div>
+  {{~!~}}
+  <span></span>
+  {{~!~}}
+</div>
+
 =====================================output=====================================
 <div>
   {{! Foo }}
@@ -40,7 +53,20 @@ printWidth: 80
 <div class="entry">
   {{! This comment will not be in the output }}
   {{!-- This comment as }} and will not be in the output --}}
+  {{~! This comment will not be in the output }}
+  {{! This comment will not be in the output ~}}
+  {{~! This comment will not be in the output ~}}
+  {{~!
+comment
+ ~}}
+  {{~! 1 ~}}{{~! 2 ~}}
   <!-- This comment will be in the output -->
 </div>
+
+<div>
+  {{~!~}}
+  <span></span>
+  {{~!~}}
+</div>
 ================================================================================
 `;
diff --git a/tests/handlebars/comment/comments.hbs b/tests/handlebars/comment/comments.hbs
index 5df2a8a45..adf0c46b7 100644
--- a/tests/handlebars/comment/comments.hbs
+++ b/tests/handlebars/comment/comments.hbs
@@ -13,5 +13,18 @@
 <div class="entry">
   {{! This comment will not be in the output }}
   {{!-- This comment as }} and will not be in the output --}}
+  {{~! This comment will not be in the output }}
+  {{! This comment will not be in the output ~}}
+  {{~! This comment will not be in the output ~}}
+  {{~!
+comment
+ ~}}
+  {{~! 1 ~}}{{~! 2 ~}}
   <!-- This comment will be in the output -->
 </div>
+
+<div>
+  {{~!~}}
+  <span></span>
+  {{~!~}}
+</div>
diff --git a/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
index ab5091dd0..c06026421 100644
--- a/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
@@ -37,3 +37,23 @@ Expecting 'ID', 'STRING', 'NUMBER', 'BOOLEAN', 'UNDEFINED', 'NULL', 'DATA', got
     |   ^
   4 | "
 `;
+
+exports[`tilde-comments-1.hbs [glimmer] format 1`] = `
+"Parse error on line 1:
+{{~}}
+---^
+Expecting 'ID', 'STRING', 'NUMBER', 'BOOLEAN', 'UNDEFINED', 'NULL', 'DATA', got 'CLOSE' (1:4)
+> 1 | {{~}}
+    |    ^
+  2 | "
+`;
+
+exports[`tilde-comments-2.hbs [glimmer] format 1`] = `
+"Parse error on line 1:
+{{~~}}
+---^
+Expecting 'ID', 'STRING', 'NUMBER', 'BOOLEAN', 'UNDEFINED', 'NULL', 'DATA', got 'CLOSE' (1:4)
+> 1 | {{~~}}
+    |    ^
+  2 | "
+`;
diff --git a/tests/misc/errors/handlebars/tilde-comments-1.hbs b/tests/misc/errors/handlebars/tilde-comments-1.hbs
new file mode 100644
index 000000000..562fbb6b0
--- /dev/null
+++ b/tests/misc/errors/handlebars/tilde-comments-1.hbs
@@ -0,0 +1 @@
+{{~}}
diff --git a/tests/misc/errors/handlebars/tilde-comments-2.hbs b/tests/misc/errors/handlebars/tilde-comments-2.hbs
new file mode 100644
index 000000000..d3966458d
--- /dev/null
+++ b/tests/misc/errors/handlebars/tilde-comments-2.hbs
@@ -0,0 +1 @@
+{{~~}}

From bdb01f2471c97cf3cc3aab3ecf7cc2f11d4e1aba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 06:48:13 +0000
Subject: [PATCH 102/299] Build(deps-dev): Bump @babel/core from 7.12.7 to
 7.12.8 (#9765)

---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 0ddc0cebd..6718dfa4c 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "yaml-unist-parser": "1.3.1"
   },
   "devDependencies": {
-    "@babel/core": "7.12.7",
+    "@babel/core": "7.12.8",
     "@babel/preset-env": "7.12.7",
     "@babel/types": "7.12.7",
     "@glimmer/reference": "0.66.1",
diff --git a/yarn.lock b/yarn.lock
index e09b1ccaf..769d0a9cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,10 +28,10 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
   integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
-"@babel/core@7.12.7", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.7.tgz#bf55363c08c8352a37691f7216ec30090bf7e3bf"
-  integrity sha512-tRKx9B53kJe8NCGGIxEQb2Bkr0riUIEuN7Sc1fxhs5H8lKlCWUvQCSNMVIB0Meva7hcbCRJ76de15KoLltdoqw==
+"@babel/core@7.12.8", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
+  version "7.12.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.8.tgz#8ad76c1a7d2a6a3beecc4395fa4f7b4cb88390e6"
+  integrity sha512-ra28JXL+5z73r1IC/t+FT1ApXU5LsulFDnTDntNfLQaScJUJmcHL5Qxm/IWanCToQk3bPWQo5bflbplU5r15pg==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/generator" "^7.12.5"
@@ -39,7 +39,7 @@
     "@babel/helpers" "^7.12.5"
     "@babel/parser" "^7.12.7"
     "@babel/template" "^7.12.7"
-    "@babel/traverse" "^7.12.7"
+    "@babel/traverse" "^7.12.8"
     "@babel/types" "^7.12.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
@@ -835,10 +835,10 @@
     "@babel/parser" "^7.12.7"
     "@babel/types" "^7.12.7"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.7", "@babel/traverse@^7.7.0":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.7.tgz#572a722408681cef17d6b0bef69ef2e728ca69f1"
-  integrity sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.8", "@babel/traverse@^7.7.0":
+  version "7.12.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.8.tgz#c1c2983bf9ba0f4f0eaa11dff7e77fa63307b2a4"
+  integrity sha512-EIRQXPTwFEGRZyu6gXbjfpNORN1oZvwuzJbxcXjAgWV0iqXYDszN1Hx3FVm6YgZfu1ZQbCVAk3l+nIw95Xll9Q==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/generator" "^7.12.5"

From c0334559502d2425d02fd1f1ebcaae52b6d880c1 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 24 Nov 2020 14:58:26 +0800
Subject: [PATCH 103/299] Extract some type annotation to `flow.js` and
 `typescript.js` (#9761)

---
 src/language-js/print/array.js           |   3 +-
 src/language-js/print/class.js           |   3 +-
 src/language-js/print/flow.js            |  31 ++-
 src/language-js/print/function.js        |  11 +-
 src/language-js/print/misc.js            |  28 +++
 src/language-js/print/object.js          |   4 +-
 src/language-js/print/type-annotation.js | 245 ++++++++++++++++++++---
 src/language-js/print/typescript.js      |  21 ++
 src/language-js/printer-estree.js        | 245 +----------------------
 9 files changed, 314 insertions(+), 277 deletions(-)

diff --git a/src/language-js/print/array.js b/src/language-js/print/array.js
index 0ce6db81b..845dd1dba 100644
--- a/src/language-js/print/array.js
+++ b/src/language-js/print/array.js
@@ -8,8 +8,7 @@ const { getLast, isNextLineEmpty } = require("../../common/util");
 const { hasDanglingComments, shouldPrintComma } = require("../utils");
 const { locEnd } = require("../loc");
 
-const { printOptionalToken } = require("./misc");
-const { printTypeAnnotation } = require("./type-annotation");
+const { printOptionalToken, printTypeAnnotation } = require("./misc");
 
 /** @typedef {import("../../document").Doc} Doc */
 
diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
index 3fc72ced8..384ff81cd 100644
--- a/src/language-js/print/class.js
+++ b/src/language-js/print/class.js
@@ -11,10 +11,9 @@ const {
 } = require("../utils");
 const { getTypeParametersGroupId } = require("./type-parameters");
 const { printMethod } = require("./function");
-const { printOptionalToken } = require("./misc");
+const { printOptionalToken, printTypeAnnotation } = require("./misc");
 const { printStatementSequence } = require("./statement");
 const { printPropertyKey } = require("./property");
-const { printTypeAnnotation } = require("./type-annotation");
 const { printAssignmentRight } = require("./assignment");
 
 function printClass(path, options, print) {
diff --git a/src/language-js/print/flow.js b/src/language-js/print/flow.js
index 5a069918a..186a01137 100644
--- a/src/language-js/print/flow.js
+++ b/src/language-js/print/flow.js
@@ -6,8 +6,16 @@ const {
 } = require("../../document");
 const { getParentExportDeclaration } = require("../utils");
 const { printClass } = require("./class");
-const { printOpaqueType, printTypeAlias } = require("./type-annotation");
+const {
+  printOpaqueType,
+  printTypeAlias,
+  printIntersectionType,
+  printUnionType,
+  printFunctionType,
+  printTupleType,
+} = require("./type-annotation");
 const { printInterface } = require("./interface");
+const { printTypeParameters } = require("./type-parameters");
 const {
   printExportDeclaration,
   printExportAllDeclaration,
@@ -79,6 +87,27 @@ function printFlow(path, options, print) {
           print
         )
       );
+    case "OpaqueType":
+      return printOpaqueType(path, options, print);
+    case "TypeAlias":
+      return printTypeAlias(path, options, print);
+    case "IntersectionTypeAnnotation":
+      return printIntersectionType(path, options, print);
+    case "UnionTypeAnnotation":
+      return printUnionType(path, options, print);
+    case "FunctionTypeAnnotation":
+      return printFunctionType(path, options, print);
+    case "TupleTypeAnnotation":
+      return printTupleType(path, options, print);
+    case "GenericTypeAnnotation":
+      return concat([
+        path.call(print, "id"),
+        printTypeParameters(path, options, print, "typeParameters"),
+      ]);
+    // Type Annotations for Facebook Flow, typically stripped out or
+    // transformed away before printing.
+    case "TypeAnnotation":
+      return path.call(print, "typeAnnotation");
   }
 }
 
diff --git a/src/language-js/print/function.js b/src/language-js/print/function.js
index 5924f0704..8f5aa69c1 100644
--- a/src/language-js/print/function.js
+++ b/src/language-js/print/function.js
@@ -355,10 +355,19 @@ function printReturnAndThrowArgument(path, options, print) {
   return concat(parts);
 }
 
+function printReturnStatement(path, options, print) {
+  return concat(["return", printReturnAndThrowArgument(path, options, print)]);
+}
+
+function printThrowStatement(path, options, print) {
+  return concat(["throw", printReturnAndThrowArgument(path, options, print)]);
+}
+
 module.exports = {
   printFunctionDeclaration,
   printArrowFunctionExpression,
   printMethod,
-  printReturnAndThrowArgument,
+  printReturnStatement,
+  printThrowStatement,
   shouldPrintParamsWithoutParens,
 };
diff --git a/src/language-js/print/misc.js b/src/language-js/print/misc.js
index a31607a41..8623edb6a 100644
--- a/src/language-js/print/misc.js
+++ b/src/language-js/print/misc.js
@@ -3,6 +3,7 @@
 const {
   builders: { concat, indent, join, line },
 } = require("../../document");
+const { isFlowAnnotationComment } = require("../utils");
 
 function printOptionalToken(path) {
   const node = path.getValue();
@@ -34,6 +35,32 @@ function printFunctionTypeParameters(path, options, print) {
   return "";
 }
 
+function printTypeAnnotation(path, options, print) {
+  const node = path.getValue();
+  if (!node.typeAnnotation) {
+    return "";
+  }
+
+  const parentNode = path.getParentNode();
+  const isDefinite =
+    node.definite ||
+    (parentNode &&
+      parentNode.type === "VariableDeclarator" &&
+      parentNode.definite);
+
+  const isFunctionDeclarationIdentifier =
+    parentNode.type === "DeclareFunction" && parentNode.id === node;
+
+  if (isFlowAnnotationComment(options.originalText, node.typeAnnotation)) {
+    return concat([" /*: ", path.call(print, "typeAnnotation"), " */"]);
+  }
+
+  return concat([
+    isFunctionDeclarationIdentifier ? "" : isDefinite ? "!: " : ": ",
+    path.call(print, "typeAnnotation"),
+  ]);
+}
+
 function printBindExpressionCallee(path, options, print) {
   return concat(["::", path.call(print, "callee")]);
 }
@@ -63,5 +90,6 @@ module.exports = {
   printFunctionTypeParameters,
   printBindExpressionCallee,
   printTypeScriptModifiers,
+  printTypeAnnotation,
   adjustClause,
 };
diff --git a/src/language-js/print/object.js b/src/language-js/print/object.js
index e6f949e6c..bff624c68 100644
--- a/src/language-js/print/object.js
+++ b/src/language-js/print/object.js
@@ -18,9 +18,9 @@ const {
 } = require("../utils");
 const { locStart, locEnd } = require("../loc");
 
-const { printOptionalToken } = require("./misc");
+const { printOptionalToken, printTypeAnnotation } = require("./misc");
 const { shouldHugFunctionParameters } = require("./function-parameters");
-const { printTypeAnnotation, shouldHugType } = require("./type-annotation");
+const { shouldHugType } = require("./type-annotation");
 
 /** @typedef {import("../../document").Doc} Doc */
 
diff --git a/src/language-js/print/type-annotation.js b/src/language-js/print/type-annotation.js
index e6e8e07d6..bc1895a41 100644
--- a/src/language-js/print/type-annotation.js
+++ b/src/language-js/print/type-annotation.js
@@ -1,39 +1,22 @@
 "use strict";
+
+const { printComments, printDanglingComments } = require("../../main/comments");
+const { getLast } = require("../../common/util");
 const {
-  builders: { concat, group },
+  builders: { concat, group, join, line, softline, indent, align, ifBreak },
 } = require("../../document");
+const pathNeedsParens = require("../needs-parens");
+const { locStart } = require("../loc");
 const {
-  isFlowAnnotationComment,
   isSimpleType,
   isObjectType,
+  hasLeadingOwnLineComment,
+  isObjectTypePropertyAFunction,
+  shouldPrintComma,
 } = require("../utils");
 const { printAssignmentRight } = require("./assignment");
-
-function printTypeAnnotation(path, options, print) {
-  const node = path.getValue();
-  if (!node.typeAnnotation) {
-    return "";
-  }
-
-  const parentNode = path.getParentNode();
-  const isDefinite =
-    node.definite ||
-    (parentNode &&
-      parentNode.type === "VariableDeclarator" &&
-      parentNode.definite);
-
-  const isFunctionDeclarationIdentifier =
-    parentNode.type === "DeclareFunction" && parentNode.id === node;
-
-  if (isFlowAnnotationComment(options.originalText, node.typeAnnotation)) {
-    return concat([" /*: ", path.call(print, "typeAnnotation"), " */"]);
-  }
-
-  return concat([
-    isFunctionDeclarationIdentifier ? "" : isDefinite ? "!: " : ": ",
-    path.call(print, "typeAnnotation"),
-  ]);
-}
+const { printFunctionParameters } = require("./function-parameters");
+const { printArrayItems } = require("./array");
 
 function shouldHugType(node) {
   if (isSimpleType(node) || isObjectType(node)) {
@@ -116,9 +99,213 @@ function printTypeAlias(path, options, print) {
   return group(concat(parts));
 }
 
+// `TSIntersectionType` and `IntersectionTypeAnnotation`
+function printIntersectionType(path, options, print) {
+  const n = path.getValue();
+  const types = path.map(print, "types");
+  const result = [];
+  let wasIndented = false;
+  for (let i = 0; i < types.length; ++i) {
+    if (i === 0) {
+      result.push(types[i]);
+    } else if (isObjectType(n.types[i - 1]) && isObjectType(n.types[i])) {
+      // If both are objects, don't indent
+      result.push(concat([" & ", wasIndented ? indent(types[i]) : types[i]]));
+    } else if (!isObjectType(n.types[i - 1]) && !isObjectType(n.types[i])) {
+      // If no object is involved, go to the next line if it breaks
+      result.push(indent(concat([" &", line, types[i]])));
+    } else {
+      // If you go from object to non-object or vis-versa, then inline it
+      if (i > 1) {
+        wasIndented = true;
+      }
+      result.push(" & ", i > 1 ? indent(types[i]) : types[i]);
+    }
+  }
+  return group(concat(result));
+}
+
+// `TSUnionType` and `UnionTypeAnnotation`
+function printUnionType(path, options, print) {
+  const n = path.getValue();
+  // single-line variation
+  // A | B | C
+
+  // multi-line variation
+  // | A
+  // | B
+  // | C
+
+  const parent = path.getParentNode();
+
+  // If there's a leading comment, the parent is doing the indentation
+  const shouldIndent =
+    parent.type !== "TypeParameterInstantiation" &&
+    parent.type !== "TSTypeParameterInstantiation" &&
+    parent.type !== "GenericTypeAnnotation" &&
+    parent.type !== "TSTypeReference" &&
+    parent.type !== "TSTypeAssertion" &&
+    parent.type !== "TupleTypeAnnotation" &&
+    parent.type !== "TSTupleType" &&
+    !(
+      parent.type === "FunctionTypeParam" &&
+      !parent.name &&
+      path.getParentNode(1).this !== parent
+    ) &&
+    !(
+      (parent.type === "TypeAlias" ||
+        parent.type === "VariableDeclarator" ||
+        parent.type === "TSTypeAliasDeclaration") &&
+      hasLeadingOwnLineComment(options.originalText, n)
+    );
+
+  // {
+  //   a: string
+  // } | null | void
+  // should be inlined and not be printed in the multi-line variant
+  const shouldHug = shouldHugType(n);
+
+  // We want to align the children but without its comment, so it looks like
+  // | child1
+  // // comment
+  // | child2
+  const printed = path.map((typePath) => {
+    let printedType = typePath.call(print);
+    if (!shouldHug) {
+      printedType = align(2, printedType);
+    }
+    return printComments(typePath, () => printedType, options);
+  }, "types");
+
+  if (shouldHug) {
+    return join(" | ", printed);
+  }
+
+  const shouldAddStartLine =
+    shouldIndent && !hasLeadingOwnLineComment(options.originalText, n);
+
+  const code = concat([
+    ifBreak(concat([shouldAddStartLine ? line : "", "| "])),
+    join(concat([line, "| "]), printed),
+  ]);
+
+  if (pathNeedsParens(path, options)) {
+    return group(concat([indent(code), softline]));
+  }
+
+  if (
+    (parent.type === "TupleTypeAnnotation" && parent.types.length > 1) ||
+    (parent.type === "TSTupleType" && parent.elementTypes.length > 1)
+  ) {
+    return group(
+      concat([
+        indent(concat([ifBreak(concat(["(", softline])), code])),
+        softline,
+        ifBreak(")"),
+      ])
+    );
+  }
+
+  return group(shouldIndent ? indent(code) : code);
+}
+
+// `TSFunctionType` and `FunctionTypeAnnotation`
+function printFunctionType(path, options, print) {
+  const n = path.getValue();
+  const parts = [];
+  // FunctionTypeAnnotation is ambiguous:
+  // declare function foo(a: B): void; OR
+  // var A: (a: B) => void;
+  const parent = path.getParentNode(0);
+  const parentParent = path.getParentNode(1);
+  const parentParentParent = path.getParentNode(2);
+  let isArrowFunctionTypeAnnotation =
+    n.type === "TSFunctionType" ||
+    !(
+      ((parent.type === "ObjectTypeProperty" ||
+        parent.type === "ObjectTypeInternalSlot") &&
+        !parent.variance &&
+        !parent.optional &&
+        locStart(parent) === locStart(n)) ||
+      parent.type === "ObjectTypeCallProperty" ||
+      (parentParentParent && parentParentParent.type === "DeclareFunction")
+    );
+
+  let needsColon =
+    isArrowFunctionTypeAnnotation &&
+    (parent.type === "TypeAnnotation" || parent.type === "TSTypeAnnotation");
+
+  // Sadly we can't put it inside of FastPath::needsColon because we are
+  // printing ":" as part of the expression and it would put parenthesis
+  // around :(
+  const needsParens =
+    needsColon &&
+    isArrowFunctionTypeAnnotation &&
+    (parent.type === "TypeAnnotation" || parent.type === "TSTypeAnnotation") &&
+    parentParent.type === "ArrowFunctionExpression";
+
+  if (isObjectTypePropertyAFunction(parent)) {
+    isArrowFunctionTypeAnnotation = true;
+    needsColon = true;
+  }
+
+  if (needsParens) {
+    parts.push("(");
+  }
+
+  parts.push(
+    printFunctionParameters(
+      path,
+      print,
+      options,
+      /* expandArg */ false,
+      /* printTypeParams */ true
+    )
+  );
+
+  // The returnType is not wrapped in a TypeAnnotation, so the colon
+  // needs to be added separately.
+  if (n.returnType || n.predicate || n.typeAnnotation) {
+    parts.push(
+      isArrowFunctionTypeAnnotation ? " => " : ": ",
+      path.call(print, "returnType"),
+      path.call(print, "predicate"),
+      path.call(print, "typeAnnotation")
+    );
+  }
+  if (needsParens) {
+    parts.push(")");
+  }
+
+  return group(concat(parts));
+}
+
+// `TSTupleType` and `TupleTypeAnnotation`
+function printTupleType(path, options, print) {
+  const n = path.getValue();
+  const typesField = n.type === "TSTupleType" ? "elementTypes" : "types";
+  const hasRest =
+    n[typesField].length > 0 && getLast(n[typesField]).type === "TSRestType";
+  return group(
+    concat([
+      "[",
+      indent(
+        concat([softline, printArrayItems(path, options, typesField, print)])
+      ),
+      ifBreak(shouldPrintComma(options, "all") && !hasRest ? "," : ""),
+      printDanglingComments(path, options, /* sameIndent */ true),
+      softline,
+      "]",
+    ])
+  );
+}
+
 module.exports = {
   printOpaqueType,
   printTypeAlias,
-  printTypeAnnotation,
+  printIntersectionType,
+  printUnionType,
+  printFunctionType,
+  printTupleType,
   shouldHugType,
 };
diff --git a/src/language-js/print/typescript.js b/src/language-js/print/typescript.js
index db6b76eac..10724d858 100644
--- a/src/language-js/print/typescript.js
+++ b/src/language-js/print/typescript.js
@@ -38,6 +38,12 @@ const { printFunctionDeclaration } = require("./function");
 const { printInterface } = require("./interface");
 const { printAssignmentRight } = require("./assignment");
 const { printBlock } = require("./block");
+const {
+  printIntersectionType,
+  printUnionType,
+  printFunctionType,
+  printTupleType,
+} = require("./type-annotation");
 
 function printTypescript(path, options, print) {
   const n = path.getValue();
@@ -525,6 +531,21 @@ function printTypescript(path, options, print) {
 
     case "TSInferType":
       return concat(["infer", " ", path.call(print, "typeParameter")]);
+    case "TSIntersectionType":
+      return printIntersectionType(path, options, print);
+    case "TSUnionType":
+      return printUnionType(path, options, print);
+    case "TSFunctionType":
+      return printFunctionType(path, options, print);
+    case "TSTupleType":
+      return printTupleType(path, options, print);
+    case "TSTypeReference":
+      return concat([
+        path.call(print, "typeName"),
+        printTypeParameters(path, options, print, "typeParameters"),
+      ]);
+    case "TSTypeAnnotation":
+      return path.call(print, "typeAnnotation");
 
     // These are not valid TypeScript. Printing them just for the sake of error recovery.
     case "TSJSDocAllType":
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index b7244e16a..42d31381d 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -9,7 +9,6 @@ const assert = require("assert");
 const comments = require("../main/comments");
 const {
   hasNewline,
-  getLast,
   printString,
   printNumber,
   isNextLineEmpty,
@@ -24,8 +23,6 @@ const {
     literalline,
     group,
     indent,
-    align,
-    ifBreak,
   },
   utils: { isEmpty },
 } = require("../document");
@@ -40,15 +37,12 @@ const {
   getParentExportDeclaration,
   hasDanglingComments,
   hasFlowShorthandAnnotationComment,
-  hasLeadingOwnLineComment,
   hasNewlineBetweenOrAfterDecorators,
   hasPrettierIgnore,
   hasTrailingComment,
   isExportDeclaration,
   isFunctionNotation,
   isGetterOrSetter,
-  isObjectType,
-  isObjectTypePropertyAFunction,
   isTheOnlyJSXElementInMarkdown,
   isBlockComment,
   needsHardlineAfterDanglingComment,
@@ -68,6 +62,7 @@ const { printTypescript } = require("./print/typescript");
 const {
   printOptionalToken,
   printBindExpressionCallee,
+  printTypeAnnotation,
   adjustClause,
 } = require("./print/misc");
 const {
@@ -77,16 +72,9 @@ const {
   printModuleSpecifier,
 } = require("./print/module");
 const { printTernary } = require("./print/ternary");
-const { printFunctionParameters } = require("./print/function-parameters");
 const { printTemplateLiteral } = require("./print/template-literal");
 const { printArray, printArrayItems } = require("./print/array");
 const { printObject } = require("./print/object");
-const {
-  printTypeAnnotation,
-  shouldHugType,
-  printOpaqueType,
-  printTypeAlias,
-} = require("./print/type-annotation");
 const {
   printClass,
   printClassMethod,
@@ -99,7 +87,8 @@ const {
   printFunctionDeclaration,
   printArrowFunctionExpression,
   printMethod,
-  printReturnAndThrowArgument,
+  printReturnStatement,
+  printThrowStatement,
 } = require("./print/function");
 const { printCallExpression } = require("./print/call-expression");
 const { printInterface } = require("./print/interface");
@@ -470,11 +459,9 @@ function printPathNoParens(path, options, print, args) {
     case "StaticBlock":
       return printBlock(path, options, print);
     case "ThrowStatement":
+      return printThrowStatement(path, options, print);
     case "ReturnStatement":
-      return concat([
-        n.type === "ReturnStatement" ? "return" : "throw",
-        printReturnAndThrowArgument(path, options, print),
-      ]);
+      return printReturnStatement(path, options, print);
     case "NewExpression":
     case "ImportExpression":
     case "OptionalCallExpression":
@@ -991,39 +978,6 @@ function printPathNoParens(path, options, print, args) {
     case "Type":
       /* istanbul ignore next */
       throw new Error("unprintable type: " + JSON.stringify(n.type));
-    // Type Annotations for Facebook Flow, typically stripped out or
-    // transformed away before printing.
-    case "TypeAnnotation":
-    case "TSTypeAnnotation":
-      if (n.typeAnnotation) {
-        return path.call(print, "typeAnnotation");
-      }
-
-      /* istanbul ignore next */
-      return "";
-    case "TSTupleType":
-    case "TupleTypeAnnotation": {
-      const typesField = n.type === "TSTupleType" ? "elementTypes" : "types";
-      const hasRest =
-        n[typesField].length > 0 &&
-        getLast(n[typesField]).type === "TSRestType";
-      return group(
-        concat([
-          "[",
-          indent(
-            concat([
-              softline,
-              printArrayItems(path, options, typesField, print),
-            ])
-          ),
-          ifBreak(shouldPrintComma(options, "all") && !hasRest ? "," : ""),
-          comments.printDanglingComments(path, options, /* sameIndent */ true),
-          softline,
-          "]",
-        ])
-      );
-    }
-
     case "ExistsTypeAnnotation":
       return "*";
     case "EmptyTypeAnnotation":
@@ -1034,8 +988,6 @@ function printPathNoParens(path, options, print, args) {
       return concat([path.call(print, "elementType"), "[]"]);
     case "BooleanLiteralTypeAnnotation":
       return "" + n.value;
-    case "OpaqueType":
-      return printOpaqueType(path, options, print);
 
     case "EnumDeclaration":
       return concat([
@@ -1119,77 +1071,6 @@ function printPathNoParens(path, options, print, args) {
       ]);
     case "EnumDefaultedMember":
       return path.call(print, "id");
-
-    case "FunctionTypeAnnotation":
-    case "TSFunctionType": {
-      // FunctionTypeAnnotation is ambiguous:
-      // declare function foo(a: B): void; OR
-      // var A: (a: B) => void;
-      const parent = path.getParentNode(0);
-      const parentParent = path.getParentNode(1);
-      const parentParentParent = path.getParentNode(2);
-      let isArrowFunctionTypeAnnotation =
-        n.type === "TSFunctionType" ||
-        !(
-          ((parent.type === "ObjectTypeProperty" ||
-            parent.type === "ObjectTypeInternalSlot") &&
-            !parent.variance &&
-            !parent.optional &&
-            locStart(parent) === locStart(n)) ||
-          parent.type === "ObjectTypeCallProperty" ||
-          (parentParentParent && parentParentParent.type === "DeclareFunction")
-        );
-
-      let needsColon =
-        isArrowFunctionTypeAnnotation &&
-        (parent.type === "TypeAnnotation" ||
-          parent.type === "TSTypeAnnotation");
-
-      // Sadly we can't put it inside of FastPath::needsColon because we are
-      // printing ":" as part of the expression and it would put parenthesis
-      // around :(
-      const needsParens =
-        needsColon &&
-        isArrowFunctionTypeAnnotation &&
-        (parent.type === "TypeAnnotation" ||
-          parent.type === "TSTypeAnnotation") &&
-        parentParent.type === "ArrowFunctionExpression";
-
-      if (isObjectTypePropertyAFunction(parent)) {
-        isArrowFunctionTypeAnnotation = true;
-        needsColon = true;
-      }
-
-      if (needsParens) {
-        parts.push("(");
-      }
-
-      parts.push(
-        printFunctionParameters(
-          path,
-          print,
-          options,
-          /* expandArg */ false,
-          /* printTypeParams */ true
-        )
-      );
-
-      // The returnType is not wrapped in a TypeAnnotation, so the colon
-      // needs to be added separately.
-      if (n.returnType || n.predicate || n.typeAnnotation) {
-        parts.push(
-          isArrowFunctionTypeAnnotation ? " => " : ": ",
-          path.call(print, "returnType"),
-          path.call(print, "predicate"),
-          path.call(print, "typeAnnotation")
-        );
-      }
-      if (needsParens) {
-        parts.push(")");
-      }
-
-      return group(concat(parts));
-    }
     case "FunctionTypeParam": {
       const name = n.name
         ? path.call(print, "name")
@@ -1213,114 +1094,6 @@ function printPathNoParens(path, options, print, args) {
         path.call(print, "id"),
         path.call(print, "typeParameters"),
       ]);
-    case "TSIntersectionType":
-    case "IntersectionTypeAnnotation": {
-      const types = path.map(print, "types");
-      const result = [];
-      let wasIndented = false;
-      for (let i = 0; i < types.length; ++i) {
-        if (i === 0) {
-          result.push(types[i]);
-        } else if (isObjectType(n.types[i - 1]) && isObjectType(n.types[i])) {
-          // If both are objects, don't indent
-          result.push(
-            concat([" & ", wasIndented ? indent(types[i]) : types[i]])
-          );
-        } else if (!isObjectType(n.types[i - 1]) && !isObjectType(n.types[i])) {
-          // If no object is involved, go to the next line if it breaks
-          result.push(indent(concat([" &", line, types[i]])));
-        } else {
-          // If you go from object to non-object or vis-versa, then inline it
-          if (i > 1) {
-            wasIndented = true;
-          }
-          result.push(" & ", i > 1 ? indent(types[i]) : types[i]);
-        }
-      }
-      return group(concat(result));
-    }
-    case "TSUnionType":
-    case "UnionTypeAnnotation": {
-      // single-line variation
-      // A | B | C
-
-      // multi-line variation
-      // | A
-      // | B
-      // | C
-
-      const parent = path.getParentNode();
-
-      // If there's a leading comment, the parent is doing the indentation
-      const shouldIndent =
-        parent.type !== "TypeParameterInstantiation" &&
-        parent.type !== "TSTypeParameterInstantiation" &&
-        parent.type !== "GenericTypeAnnotation" &&
-        parent.type !== "TSTypeReference" &&
-        parent.type !== "TSTypeAssertion" &&
-        parent.type !== "TupleTypeAnnotation" &&
-        parent.type !== "TSTupleType" &&
-        !(
-          parent.type === "FunctionTypeParam" &&
-          !parent.name &&
-          path.getParentNode(1).this !== parent
-        ) &&
-        !(
-          (parent.type === "TypeAlias" ||
-            parent.type === "VariableDeclarator" ||
-            parent.type === "TSTypeAliasDeclaration") &&
-          hasLeadingOwnLineComment(options.originalText, n)
-        );
-
-      // {
-      //   a: string
-      // } | null | void
-      // should be inlined and not be printed in the multi-line variant
-      const shouldHug = shouldHugType(n);
-
-      // We want to align the children but without its comment, so it looks like
-      // | child1
-      // // comment
-      // | child2
-      const printed = path.map((typePath) => {
-        let printedType = typePath.call(print);
-        if (!shouldHug) {
-          printedType = align(2, printedType);
-        }
-        return comments.printComments(typePath, () => printedType, options);
-      }, "types");
-
-      if (shouldHug) {
-        return join(" | ", printed);
-      }
-
-      const shouldAddStartLine =
-        shouldIndent && !hasLeadingOwnLineComment(options.originalText, n);
-
-      const code = concat([
-        ifBreak(concat([shouldAddStartLine ? line : "", "| "])),
-        join(concat([line, "| "]), printed),
-      ]);
-
-      if (pathNeedsParens(path, options)) {
-        return group(concat([indent(code), softline]));
-      }
-
-      if (
-        (parent.type === "TupleTypeAnnotation" && parent.types.length > 1) ||
-        (parent.type === "TSTupleType" && parent.elementTypes.length > 1)
-      ) {
-        return group(
-          concat([
-            indent(concat([ifBreak(concat(["(", softline])), code])),
-            softline,
-            ifBreak(")"),
-          ])
-        );
-      }
-
-      return group(shouldIndent ? indent(code) : code);
-    }
     case "NullableTypeAnnotation":
       return concat(["?", path.call(print, "typeAnnotation")]);
     case "Variance": {
@@ -1382,8 +1155,6 @@ function printPathNoParens(path, options, print, args) {
         return printNumber(n.extra.raw);
       }
       return printNumber(n.raw);
-    case "TypeAlias":
-      return printTypeAlias(path, options, print);
     case "TypeCastExpression": {
       return concat([
         "(",
@@ -1452,12 +1223,6 @@ function printPathNoParens(path, options, print, args) {
     case "VoidTypeAnnotation":
     case "TSVoidKeyword":
       return "void";
-    case "GenericTypeAnnotation":
-    case "TSTypeReference":
-      return concat([
-        path.call(print, n.type === "TSTypeReference" ? "typeName" : "id"),
-        printTypeParameters(path, options, print, "typeParameters"),
-      ]);
     case "ThisTypeAnnotation":
     case "TSThisType":
       return "this";

From 3cd70e3a9a8541c45fd1aad749f5293ee2f600da Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 24 Nov 2020 16:13:23 +0800
Subject: [PATCH 104/299] Test: Fix AST_COMPARE test (#9768)

---
 src/language-js/clean.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/language-js/clean.js b/src/language-js/clean.js
index 45d300feb..5fbfcc0b6 100644
--- a/src/language-js/clean.js
+++ b/src/language-js/clean.js
@@ -212,6 +212,12 @@ function clean(ast, newObj, parent) {
   if (ast.type === "InterpreterDirective") {
     newObj.value = newObj.value.trimEnd();
   }
+
+  // TODO: Remove this when fixing #9760
+  if (ast.type === "ClassMethod") {
+    delete newObj.declare;
+    delete newObj.readonly;
+  }
 }
 
 clean.ignoredProperties = ignoredProperties;

From 2359d0affd4c9e8022f4ab8203a5d088b762eb50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 09:12:18 +0000
Subject: [PATCH 105/299] Build(deps-dev): Bump @typescript-eslint/types from
 4.8.1 to 4.8.2 (#9766)

---
 package.json | 2 +-
 yarn.lock    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6718dfa4c..104b56e9e 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@rollup/plugin-replace": "2.3.4",
     "@types/estree": "0.0.45",
     "@types/node": "14.14.0",
-    "@typescript-eslint/types": "4.8.1",
+    "@typescript-eslint/types": "4.8.2",
     "babel-jest": "26.6.3",
     "babel-loader": "8.2.1",
     "benchmark": "2.1.4",
diff --git a/yarn.lock b/yarn.lock
index 769d0a9cd..35d8ff239 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1464,6 +1464,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.8.1.tgz#23829c73c5fc6f4fcd5346a7780b274f72fee222"
   integrity sha512-ave2a18x2Y25q5K05K/U3JQIe2Av4+TNi/2YuzyaXLAsDx6UZkz1boZ7nR/N6Wwae2PpudTZmHFXqu7faXfHmA==
 
+"@typescript-eslint/types@4.8.2":
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.8.2.tgz#c862dd0e569d9478eb82d6aee662ea53f5661a36"
+  integrity sha512-z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw==
+
 "@typescript-eslint/typescript-estree@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.1.tgz#29a43c7060641ec51c902d9f50ac7c5866ec479f"

From 3513f26d398a8962d8481dd18c0b3f9e12f2f4b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 09:12:28 +0000
Subject: [PATCH 106/299] Build(deps): Bump
 @typescript-eslint/typescript-estree (#9763)

---
 package.json |  2 +-
 yarn.lock    | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 104b56e9e..a69bc0d52 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@babel/parser": "7.12.7",
     "@glimmer/syntax": "0.66.1",
     "@iarna/toml": "2.2.5",
-    "@typescript-eslint/typescript-estree": "4.8.1",
+    "@typescript-eslint/typescript-estree": "4.8.2",
     "angular-estree-parser": "2.2.1",
     "angular-html-parser": "1.7.1",
     "camelcase": "6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 35d8ff239..0ddf99d79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1483,13 +1483,13 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.1.tgz#7307e3f2c9e95df7daa8dc0a34b8c43b7ec0dd32"
-  integrity sha512-bJ6Fn/6tW2g7WIkCWh3QRlaSU7CdUUK52shx36/J7T5oTQzANvi6raoTsbwGM11+7eBbeem8hCCKbyvAc0X3sQ==
+"@typescript-eslint/typescript-estree@4.8.2":
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.2.tgz#eeec34707d8577600fb21661b5287226cc8b3bed"
+  integrity sha512-HToGNwI6fekH0dOw3XEVESUm71Onfam0AKin6f26S2FtUmO7o3cLlWgrIaT1q3vjB3wCTdww3Dx2iGq5wtUOCg==
   dependencies:
-    "@typescript-eslint/types" "4.8.1"
-    "@typescript-eslint/visitor-keys" "4.8.1"
+    "@typescript-eslint/types" "4.8.2"
+    "@typescript-eslint/visitor-keys" "4.8.2"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
@@ -1505,12 +1505,12 @@
     "@typescript-eslint/types" "4.0.1"
     eslint-visitor-keys "^2.0.0"
 
-"@typescript-eslint/visitor-keys@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.1.tgz#794f68ee292d1b2e3aa9690ebedfcb3a8c90e3c3"
-  integrity sha512-3nrwXFdEYALQh/zW8rFwP4QltqsanCDz4CwWMPiIZmwlk9GlvBeueEIbq05SEq4ganqM0g9nh02xXgv5XI3PeQ==
+"@typescript-eslint/visitor-keys@4.8.2":
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.2.tgz#62cd3fbbbf65f8eccfbe6f159eb1b84a243a3f77"
+  integrity sha512-Vg+/SJTMZJEKKGHW7YC21QxgKJrSbxoYYd3MEUGtW7zuytHuEcksewq0DUmo4eh/CTNrVJGSdIY9AtRb6riWFw==
   dependencies:
-    "@typescript-eslint/types" "4.8.1"
+    "@typescript-eslint/types" "4.8.2"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.9.0":

From d02a367e6422cbc476ecc024f9caac46855e16ee Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 24 Nov 2020 17:37:29 +0800
Subject: [PATCH 107/299] Remove `JSXText` spacial case in comment attaching
 (#9759)

---
 src/common/util.js                            |  8 ---
 .../comments/__snapshots__/jsfmt.spec.js.snap | 55 +++++++++++++++++++
 .../comments/jsx-tag-comment-after-prop.js    | 12 ++++
 .../comments/like-a-comment-in-jsx-text.js    |  6 ++
 4 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 tests/jsx/comments/jsx-tag-comment-after-prop.js
 create mode 100644 tests/jsx/comments/like-a-comment-in-jsx-text.js

diff --git a/src/common/util.js b/src/common/util.js
index 4b9f3e513..38a143e65 100644
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -565,14 +565,6 @@ function addCommentHelper(node, comment) {
   const comments = node.comments || (node.comments = []);
   comments.push(comment);
   comment.printed = false;
-
-  // For some reason, TypeScript parses `// x` inside of JSXText as a comment
-  // We already "print" it via the raw text, we don't need to re-print it as a
-  // comment
-  /* istanbul ignore next */
-  if (node.type === "JSXText") {
-    comment.printed = true;
-  }
 }
 
 function addLeadingComment(node, comment) {
diff --git a/tests/jsx/comments/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/comments/__snapshots__/jsfmt.spec.js.snap
index cd3f81c5d..a703688af 100644
--- a/tests/jsx/comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx/comments/__snapshots__/jsfmt.spec.js.snap
@@ -222,3 +222,58 @@ printWidth: 80
 
 ================================================================================
 `;
+
+exports[`jsx-tag-comment-after-prop.js - {"jsxBracketSameLine":true} format 1`] = `
+====================================options=====================================
+jsxBracketSameLine: true
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// https://github.com/typescript-eslint/typescript-eslint/pull/703
+
+const pure = () => {
+  return (
+      <Foo
+        // one
+        foo={123}
+        // two
+        bar="woof"
+      />
+  );
+}
+=====================================output=====================================
+// https://github.com/typescript-eslint/typescript-eslint/pull/703
+
+const pure = () => {
+  return (
+    <Foo
+      // one
+      foo={123}
+      // two
+      bar="woof"
+    />
+  );
+};
+
+================================================================================
+`;
+
+exports[`like-a-comment-in-jsx-text.js - {"jsxBracketSameLine":true} format 1`] = `
+====================================options=====================================
+jsxBracketSameLine: true
+parsers: ["flow", "babel", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<Foo
+>
+  text
+  // comment
+  text
+</Foo>
+=====================================output=====================================
+<Foo>text // comment text</Foo>;
+
+================================================================================
+`;
diff --git a/tests/jsx/comments/jsx-tag-comment-after-prop.js b/tests/jsx/comments/jsx-tag-comment-after-prop.js
new file mode 100644
index 000000000..feb701527
--- /dev/null
+++ b/tests/jsx/comments/jsx-tag-comment-after-prop.js
@@ -0,0 +1,12 @@
+// https://github.com/typescript-eslint/typescript-eslint/pull/703
+
+const pure = () => {
+  return (
+      <Foo
+        // one
+        foo={123}
+        // two
+        bar="woof"
+      />
+  );
+}
\ No newline at end of file
diff --git a/tests/jsx/comments/like-a-comment-in-jsx-text.js b/tests/jsx/comments/like-a-comment-in-jsx-text.js
new file mode 100644
index 000000000..7aae724ab
--- /dev/null
+++ b/tests/jsx/comments/like-a-comment-in-jsx-text.js
@@ -0,0 +1,6 @@
+<Foo
+>
+  text
+  // comment
+  text
+</Foo>
\ No newline at end of file

From 559b46845c5db7488652451d1b347b042d8d827b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 09:42:46 +0000
Subject: [PATCH 108/299] Build(deps-dev): Bump @glimmer/reference from 0.66.1
 to 0.67.0 (#9764)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index a69bc0d52..882f5c65b 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.8",
     "@babel/preset-env": "7.12.7",
     "@babel/types": "7.12.7",
-    "@glimmer/reference": "0.66.1",
+    "@glimmer/reference": "0.67.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.1",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index 0ddf99d79..ecec5261b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -893,10 +893,10 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.66.1.tgz#3be91232e225bc0cac4920159f6f73c8761bc98d"
-  integrity sha512-dWdr6XUsVoZ8XXLYqaYFrz9O6amogb2q9QMDnrxjqurfhcc2Va7qaUM9e3qRyICwph6MsUgrDtX3SRA6dyRwJw==
+"@glimmer/global-context@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.67.0.tgz#041103738b6ec503d929684e342942023351b123"
+  integrity sha512-eeMwi+lQK8GbK2m/+HJSQaGKJogGEqJEZn8hGxHbG7zvHXA7TBQ5+c4vR2QXNWTMrOI7qDzCX9XnF3tlaxQPjQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
@@ -907,16 +907,23 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.66.1.tgz#b61d44d78d44eb3b4bbf62cdb0dc0e4ea9600302"
-  integrity sha512-ifd2g614YzrDfHcZWTiglHVFv/x9lym79hB92GSYCiK73sl5oGUBodsbur084MfAMc1cNJEp06bXxTAoiguwLg==
+"@glimmer/interfaces@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.67.0.tgz#fc68db956028f0ab9c655a53bb882d54fd34c24b"
+  integrity sha512-1yNs8kt8k4tzA6r9lO3ScX4zR6Jg9ymRqIFvDtam1twNoRQBFHNwfpTqPU4X5mq/4tOcgtWA8FNv5/jBIOaOew==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/reference@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.67.0.tgz#2983167fcb90e5f7a24e00a5eb13c50bf266cf3d"
+  integrity sha512-Qopa+sNhIvAZ4lb4hlAUPrPx7h19yOLlfqho3zgwTJoEQAyhUqalqeH5lr+xIC4r2uV6yCcLd3C27BLYxN342Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.66.1"
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/util" "0.66.1"
-    "@glimmer/validator" "0.66.1"
+    "@glimmer/global-context" "0.67.0"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/util" "0.67.0"
+    "@glimmer/validator" "0.67.0"
 
 "@glimmer/syntax@0.66.1":
   version "0.66.1"
@@ -937,13 +944,22 @@
     "@glimmer/interfaces" "0.66.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.66.1.tgz#46bf25b2a8b819570d9fca0a248185ca07b8ec2a"
-  integrity sha512-9mhSCfe9R8TgTnHtOZuVTzsO9/Ej0gwRun1SQtQu5WK7Lamg0XPhluWVV46GcFv6w6NkopStCfoHIrounXTnpA==
+"@glimmer/util@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.67.0.tgz#7f19320826e926a2fe80abb44512f9898f6df6d8"
+  integrity sha512-iDio1mKJgdtvo9GT/d4QL/pvUzAxQOM7m/3fAY3pX2CAa25jwEwpUh7fNN+F3iEFkJWiDJusSPY/K3RPMfAoXg==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.67.0"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/validator@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.67.0.tgz#9d50db47152786c4e7d4304a73c498c53afc7886"
+  integrity sha512-PQsTPU1N0erGtWVoHwkQ9N/jMb3iMoclyaBe3rVbxs6RSjYeafaxAqwN8rJ+Gd+OWQscD4tjPPguTW/iGQVlYQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.66.1"
+    "@glimmer/global-context" "0.67.0"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From ce9c3a47a596b02034d37cd1c99b841bcb98d30b Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Tue, 24 Nov 2020 18:24:45 +0800
Subject: [PATCH 109/299] Fix yarn.lock

---
 yarn.lock | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index ecec5261b..a10a54efb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1475,11 +1475,6 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2"
   integrity sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg==
 
-"@typescript-eslint/types@4.8.1":
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.8.1.tgz#23829c73c5fc6f4fcd5346a7780b274f72fee222"
-  integrity sha512-ave2a18x2Y25q5K05K/U3JQIe2Av4+TNi/2YuzyaXLAsDx6UZkz1boZ7nR/N6Wwae2PpudTZmHFXqu7faXfHmA==
-
 "@typescript-eslint/types@4.8.2":
   version "4.8.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.8.2.tgz#c862dd0e569d9478eb82d6aee662ea53f5661a36"

From 21dd12d3702f657a85fd21158eff7b7b40827895 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 19:26:14 +0800
Subject: [PATCH 110/299] Build(deps): Bump @glimmer/syntax from 0.66.1 to
 0.67.0 (#9762)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: fisker <lionkay@gmail.com>
---
 package.json                                  |  2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |  2 +-
 yarn.lock                                     | 28 ++++---------------
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index 882f5c65b..706f5d42a 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "10.2.3",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.7",
-    "@glimmer/syntax": "0.66.1",
+    "@glimmer/syntax": "0.67.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.8.2",
     "angular-estree-parser": "2.2.1",
diff --git a/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
index c06026421..d9f77bf34 100644
--- a/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
@@ -12,7 +12,7 @@ Expecting 'CLOSE_RAW_BLOCK', 'CLOSE', 'CLOSE_UNESCAPED', 'OPEN_SEXPR', 'CLOSE_SE
 `;
 
 exports[`invalid-2.hbs [glimmer] format 1`] = `
-"Syntax Error: Unclosed element \`@name\`: 
+"Unclosed element \`@name\`: 
 
 |
 |  <{@name>
diff --git a/yarn.lock b/yarn.lock
index a10a54efb..61e48b201 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -900,13 +900,6 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.66.1.tgz#5b50b0dd6bcae19e7848d70b42f9466a184979be"
-  integrity sha512-opcDbSID3YqkUgOR15+IePfkoiJKRJh5pfxPXNw3xcwkptmbiSXNkfZGnPk4FZr4g+Jpem1CIGUDejtyaTTk3Q==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.67.0":
   version "0.67.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.67.0.tgz#fc68db956028f0ab9c655a53bb882d54fd34c24b"
@@ -925,25 +918,16 @@
     "@glimmer/util" "0.67.0"
     "@glimmer/validator" "0.67.0"
 
-"@glimmer/syntax@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.66.1.tgz#901b9d0253ad5ac1f7f8199de0ef43c98c209a63"
-  integrity sha512-hzYhlfWzu5c8K7ZtTh3bSdpT5a6efxN1NsKUvGE5p1TC9XGOZuKogq/fRtlK2UGBUazEh5fvTu7qmQ8dTU1dWA==
+"@glimmer/syntax@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.67.0.tgz#2aaa5ba451671ee869285463b9711dbec1c843e2"
+  integrity sha512-9eRjAF3oD0RyWzptincQT/ucWxxgMhYrhumizxCJDGWTpk8GCpAMoKjEK2D1eryVEaF3KknGS9ba3/oakGkpzg==
   dependencies:
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/util" "0.66.1"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/util" "0.67.0"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.66.1.tgz#53c5e12f121011f44c018dba6bcaa936133ffd24"
-  integrity sha512-pB7VEpCmC5hmehQdED7HJJEKFdGPsO6LHGl4LtRHHQptlyKTxotTxevDbzGuIxbsDpGPT+4e3g1rlEAfnC51/Q==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.66.1"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.67.0":
   version "0.67.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.67.0.tgz#7f19320826e926a2fe80abb44512f9898f6df6d8"

From d230dccd9a6bdd34bdfd8742f958ce127e83a382 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 25 Nov 2020 08:59:26 +0800
Subject: [PATCH 111/299] Rename a variable (#9769)

---
 src/main/comments.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/comments.js b/src/main/comments.js
index 6094568e2..c5c0931e5 100644
--- a/src/main/comments.js
+++ b/src/main/comments.js
@@ -333,10 +333,10 @@ function breakTies(tiesToBreak, text, options) {
   ) {
     const {
       comment,
-      precedingNode: currentCommentEnclosingNode,
+      precedingNode: currentCommentPrecedingNode,
       followingNode: currentCommentFollowingNode,
     } = tiesToBreak[indexOfFirstLeadingComment - 1];
-    assert.strictEqual(currentCommentEnclosingNode, precedingNode);
+    assert.strictEqual(currentCommentPrecedingNode, precedingNode);
     assert.strictEqual(currentCommentFollowingNode, followingNode);
 
     const gap = text.slice(options.locEnd(comment), gapEndPos);

From 5f01f34453674c2027c8e5d2bd533f483b472cdb Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 25 Nov 2020 19:26:20 +0800
Subject: [PATCH 112/299] Add `semi` to `DeclareExportAllDeclaration` (#9767)

---
 changelog_unreleased/flow/9767.md                 | 15 +++++++++++++++
 src/language-js/print/flow.js                     | 10 +---------
 .../__snapshots__/jsfmt.spec.js.snap              |  8 ++++----
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 changelog_unreleased/flow/9767.md

diff --git a/changelog_unreleased/flow/9767.md b/changelog_unreleased/flow/9767.md
new file mode 100644
index 000000000..bcc28c110
--- /dev/null
+++ b/changelog_unreleased/flow/9767.md
@@ -0,0 +1,15 @@
+#### Fix missing semi in `declare export * from …` (#9767 by @fisker)
+
+<!-- Optional description if it makes sense. -->
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+declare export * from "ES6_ExportAllFrom_Source2";
+
+// Prettier stable
+declare export * from "ES6_ExportAllFrom_Source2"
+
+// Prettier master
+declare export * from "ES6_ExportAllFrom_Source2";
+```
diff --git a/src/language-js/print/flow.js b/src/language-js/print/flow.js
index 186a01137..454594f10 100644
--- a/src/language-js/print/flow.js
+++ b/src/language-js/print/flow.js
@@ -77,15 +77,7 @@ function printFlow(path, options, print) {
     case "DeclareExportAllDeclaration":
       return printFlowDeclaration(
         path,
-        printExportAllDeclaration(
-          path,
-          {
-            ...options,
-            // TODO[@fisker]: confirm `semi` can be added
-            semi: false,
-          },
-          print
-        )
+        printExportAllDeclaration(path, options, print)
       );
     case "OpaqueType":
       return printOpaqueType(path, options, print);
diff --git a/tests/flow-repo/declare_export/__snapshots__/jsfmt.spec.js.snap b/tests/flow-repo/declare_export/__snapshots__/jsfmt.spec.js.snap
index 49b7ccf7e..aa8ae112a 100644
--- a/tests/flow-repo/declare_export/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow-repo/declare_export/__snapshots__/jsfmt.spec.js.snap
@@ -363,7 +363,7 @@ declare export * from "ES6_ExportAllFrom_Source1";
  * @flow
  */
 
-declare export * from "ES6_ExportAllFrom_Source1"
+declare export * from "ES6_ExportAllFrom_Source1";
 
 ================================================================================
 `;
@@ -387,7 +387,7 @@ declare export * from "ES6_ExportAllFrom_Source2";
  * @flow
  */
 
-declare export * from "ES6_ExportAllFrom_Source2"
+declare export * from "ES6_ExportAllFrom_Source2";
 
 ================================================================================
 `;
@@ -454,8 +454,8 @@ declare export * from "./ES6_ExportAllFrom_Source2";
 =====================================output=====================================
 // @flow
 
-declare export * from "./ES6_ExportAllFrom_Source1"
-declare export * from "./ES6_ExportAllFrom_Source2"
+declare export * from "./ES6_ExportAllFrom_Source1";
+declare export * from "./ES6_ExportAllFrom_Source2";
 
 ================================================================================
 `;

From 125492818c5bba9f2c3fd7018fd78c32590a515a Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 25 Nov 2020 22:03:34 +0800
Subject: [PATCH 113/299] `printDocToString`: Don't check existance before
 replacing newLine (#9775)

---
 src/document/doc-printer.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/document/doc-printer.js b/src/document/doc-printer.js
index 541063c49..34f1521b9 100644
--- a/src/document/doc-printer.js
+++ b/src/document/doc-printer.js
@@ -261,10 +261,7 @@ function printDocToString(doc, options) {
     const [ind, mode, doc] = cmds.pop();
 
     if (typeof doc === "string") {
-      const formatted =
-        newLine !== "\n" && doc.includes("\n")
-          ? doc.replace(/\n/g, newLine)
-          : doc;
+      const formatted = newLine !== "\n" ? doc.replace(/\n/g, newLine) : doc;
       out.push(formatted);
       pos += getStringWidth(formatted);
     } else {

From d8e40cd978ffe5dae04b63d4901f6e425b6ad29a Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 25 Nov 2020 22:14:27 +0800
Subject: [PATCH 114/299] JS: Add `hasComment` and `getComments` (#9742)

---
 .eslintrc.yml                                 |  13 ++
 package.json                                  |   2 +-
 .../index.js                                  |   1 +
 .../no-node-comments.js                       |  85 +++++++++
 src/language-js/comments.js                   |   7 +-
 src/language-js/print/angular.js              |   6 +-
 src/language-js/print/array.js                |   4 +-
 src/language-js/print/binaryish.js            |  10 +-
 src/language-js/print/block.js                |   4 +-
 src/language-js/print/call-arguments.js       |  16 +-
 src/language-js/print/class.js                |  17 +-
 src/language-js/print/function-parameters.js  |   5 +-
 src/language-js/print/function.js             |  16 +-
 src/language-js/print/interface.js            |  14 +-
 src/language-js/print/jsx.js                  |  42 ++---
 src/language-js/print/member-chain.js         |  30 ++--
 src/language-js/print/module.js               |   7 +-
 src/language-js/print/object.js               |  23 +--
 src/language-js/print/statement.js            |   4 +-
 src/language-js/print/template-literal.js     |   5 +-
 src/language-js/print/ternary.js              |  12 +-
 src/language-js/print/type-parameters.js      |  10 +-
 src/language-js/printer-estree.js             |  48 +++---
 src/language-js/utils.js                      | 161 ++++++++++--------
 yarn.lock                                     |   5 +-
 25 files changed, 335 insertions(+), 212 deletions(-)
 create mode 100644 scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 26bc7af25..4b4ebfc6e 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -109,3 +109,16 @@ overrides:
       - src/language-*/**/*.js
     rules:
       prettier-internal-rules/directly-loc-start-end: error
+  - files:
+      - src/language-js/**/*.js
+    rules:
+      prettier-internal-rules/no-node-comments:
+        - error
+        - file: "src/language-js/utils.js"
+          functions:
+            - hasComment
+            - getComments
+        - "src/language-js/parse-postprocess.js"
+        - "src/language-js/parser-babel.js"
+        - "src/language-js/parser-meriyah.js"
+        - "src/language-js/pragma.js"
diff --git a/package.json b/package.json
index 706f5d42a..7479d4de3 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jest": "24.1.3",
-    "eslint-plugin-prettier-internal-rules": "file:scripts/tools/eslint-plugin-prettier-internal-rules",
+    "eslint-plugin-prettier-internal-rules": "link:scripts/tools/eslint-plugin-prettier-internal-rules",
     "eslint-plugin-react": "7.21.5",
     "eslint-plugin-unicorn": "23.0.0",
     "execa": "4.1.0",
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
index 9436ff11b..412f6a982 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
@@ -4,6 +4,7 @@ module.exports = {
   rules: {
     "better-parent-property-check-in-needs-parens": require("./better-parent-property-check-in-needs-parens"),
     "directly-loc-start-end": require("./directly-loc-start-end"),
+    "no-node-comments": require("./no-node-comments"),
     "prefer-fast-path-each": require("./prefer-fast-path-each"),
     "require-json-extensions": require("./require-json-extensions"),
   },
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js b/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js
new file mode 100644
index 000000000..761911b0e
--- /dev/null
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js
@@ -0,0 +1,85 @@
+"use strict";
+const path = require("path");
+
+// `node.comments`
+const memberExpressionSelector = [
+  "MemberExpression[computed=false]",
+  "",
+  ">",
+  "Identifier.property",
+  '[name="comments"]',
+].join("");
+
+// `const {comments} = node`
+// `const {comments: nodeComments} = node`
+const objectPatternSelector = [
+  "ObjectPattern",
+  ">",
+  "Property.properties",
+  ">",
+  "Identifier.key",
+  '[name="comments"]',
+].join("");
+
+const selector = `:matches(${memberExpressionSelector}, ${objectPatternSelector})`;
+
+const messageId = "no-node-comments";
+
+module.exports = {
+  meta: {
+    type: "suggestion",
+    docs: {
+      url:
+        "https://github.com/prettier/prettier/blob/master/scripts/eslint-plugin-prettier-internal-rules/no-node-comments.js",
+    },
+    messages: {
+      [messageId]: "Do not access node.comments.",
+    },
+  },
+  create(context) {
+    const fileName = context.getFilename();
+    const ignored = new Map(
+      context.options.map((option) => {
+        if (typeof option === "string") {
+          option = { file: option };
+        }
+        const { file, functions } = option;
+        return [
+          path.join(__dirname, "../../..", file),
+          functions ? new Set(functions) : true,
+        ];
+      })
+    );
+    return {
+      [selector](node) {
+        if (ignored.has(fileName)) {
+          const functionNames = ignored.get(fileName);
+          if (functionNames === true) {
+            return;
+          }
+          let isIgnored;
+          let currentNode = node.parent;
+          while (currentNode) {
+            if (
+              currentNode.type === "FunctionDeclaration" &&
+              currentNode.id &&
+              currentNode.id.type === "Identifier" &&
+              functionNames.has(currentNode.id.name)
+            ) {
+              isIgnored = true;
+              break;
+            }
+            currentNode = currentNode.parent;
+          }
+          if (isIgnored) {
+            return;
+          }
+        }
+        context.report({
+          node,
+          messageId,
+        });
+      },
+    };
+  },
+};
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index 0433fe3c6..af0866175 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -19,6 +19,8 @@ const {
   hasFlowShorthandAnnotationComment,
   hasFlowAnnotationComment,
   hasIgnoreComment,
+  hasComment,
+  CommentCheckFlags,
 } = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
@@ -873,10 +875,7 @@ function hasLeadingComment(node, fn = () => true) {
   if (node.leadingComments) {
     return node.leadingComments.some(fn);
   }
-  if (node.comments) {
-    return node.comments.some((comment) => comment.leading && fn(comment));
-  }
-  return false;
+  return hasComment(node, CommentCheckFlags.Leading, fn);
 }
 
 /**
diff --git a/src/language-js/print/angular.js b/src/language-js/print/angular.js
index b370d1f8c..f025aeeae 100644
--- a/src/language-js/print/angular.js
+++ b/src/language-js/print/angular.js
@@ -3,7 +3,7 @@
 const {
   builders: { concat, join, line, group },
 } = require("../../document");
-const { hasNode } = require("../utils");
+const { hasNode, hasComment, getComments } = require("../utils");
 const { printBinaryishExpression } = require("./binaryish");
 
 /** @typedef {import("../../common/fast-path")} FastPath */
@@ -15,9 +15,9 @@ function printAngular(path, options, print) {
       return concat(
         [].concat(
           path.call(print, "node"),
-          !n.node.comments || n.node.comments.length === 0
+          !hasComment(n.node)
             ? []
-            : concat([" //", n.node.comments[0].value.trimEnd()])
+            : concat([" //", getComments(n.node)[0].value.trimEnd()])
         )
       );
     case "NGPipeExpression":
diff --git a/src/language-js/print/array.js b/src/language-js/print/array.js
index 845dd1dba..ce7925b6b 100644
--- a/src/language-js/print/array.js
+++ b/src/language-js/print/array.js
@@ -5,7 +5,7 @@ const {
   builders: { concat, line, softline, group, indent, ifBreak },
 } = require("../../document");
 const { getLast, isNextLineEmpty } = require("../../common/util");
-const { hasDanglingComments, shouldPrintComma } = require("../utils");
+const { shouldPrintComma, hasComment, CommentCheckFlags } = require("../utils");
 const { locEnd } = require("../loc");
 
 const { printOptionalToken, printTypeAnnotation } = require("./misc");
@@ -20,7 +20,7 @@ function printArray(path, options, print) {
   const openBracket = n.type === "TupleExpression" ? "#[" : "[";
   const closeBracket = "]";
   if (n.elements.length === 0) {
-    if (!hasDanglingComments(n)) {
+    if (!hasComment(n, CommentCheckFlags.Dangling)) {
       parts.push(openBracket, closeBracket);
     } else {
       parts.push(
diff --git a/src/language-js/print/binaryish.js b/src/language-js/print/binaryish.js
index f6edc26a5..a1c736d88 100644
--- a/src/language-js/print/binaryish.js
+++ b/src/language-js/print/binaryish.js
@@ -8,10 +8,11 @@ const {
 } = require("../../document");
 const {
   hasLeadingOwnLineComment,
-  hasTrailingLineComment,
   isBinaryish,
   isJSXNode,
   shouldFlatten,
+  hasComment,
+  CommentCheckFlags,
 } = require("../utils");
 
 /** @typedef {import("../../document").Doc} Doc */
@@ -250,7 +251,10 @@ function printBinaryishExpressions(
     // If there's only a single binary expression, we want to create a group
     // in order to avoid having a small right part like -1 be on its own line.
     const parent = path.getParentNode();
-    const shouldBreak = hasTrailingLineComment(node.left);
+    const shouldBreak = hasComment(
+      node.left,
+      CommentCheckFlags.Trailing | CommentCheckFlags.Line
+    );
     const shouldGroup =
       shouldBreak ||
       (!(isInsideParenthesis && node.type === "LogicalExpression") &&
@@ -266,7 +270,7 @@ function printBinaryishExpressions(
     // The root comments are already printed, but we need to manually print
     // the other ones since we don't call the normal print on BinaryExpression,
     // only for the left and right parts
-    if (isNested && node.comments) {
+    if (isNested && hasComment(node)) {
       parts = normalizeParts(
         printComments(path, () => concat(parts), options).parts
       );
diff --git a/src/language-js/print/block.js b/src/language-js/print/block.js
index b4a7f5051..aacffab1e 100644
--- a/src/language-js/print/block.js
+++ b/src/language-js/print/block.js
@@ -5,7 +5,7 @@ const { isNextLineEmpty } = require("../../common/util");
 const {
   builders: { concat, hardline, indent },
 } = require("../../document");
-const { hasDanglingComments } = require("../utils");
+const { hasComment, CommentCheckFlags } = require("../utils");
 const { locEnd } = require("../loc");
 
 const { printStatementSequence } = require("./statement");
@@ -32,7 +32,7 @@ function printBlock(path, options, print) {
   if (
     !hasContent &&
     !hasDirectives &&
-    !hasDanglingComments(n) &&
+    !hasComment(n, CommentCheckFlags.Dangling) &&
     (parent.type === "ArrowFunctionExpression" ||
       parent.type === "FunctionExpression" ||
       parent.type === "FunctionDeclaration" ||
diff --git a/src/language-js/print/call-arguments.js b/src/language-js/print/call-arguments.js
index 0561f1b8b..d5c943eb0 100644
--- a/src/language-js/print/call-arguments.js
+++ b/src/language-js/print/call-arguments.js
@@ -9,8 +9,8 @@ const {
 const {
   getFunctionParameters,
   iterateFunctionParametersPath,
-  hasLeadingComment,
-  hasTrailingComment,
+  hasComment,
+  CommentCheckFlags,
   isFunctionCompositionArgs,
   isJSXNode,
   isLongCurriedCallExpression,
@@ -55,7 +55,7 @@ function printCallArguments(path, options, print) {
     getFunctionParameters(args[0]).length === 0 &&
     args[0].body.type === "BlockStatement" &&
     args[1].type === "ArrayExpression" &&
-    !args.some((arg) => arg.comments)
+    !args.some((arg) => hasComment(arg))
   ) {
     return concat([
       "(",
@@ -235,9 +235,9 @@ function printCallArguments(path, options, print) {
 function couldGroupArg(arg) {
   return (
     (arg.type === "ObjectExpression" &&
-      (arg.properties.length > 0 || arg.comments)) ||
+      (arg.properties.length > 0 || hasComment(arg))) ||
     (arg.type === "ArrayExpression" &&
-      (arg.elements.length > 0 || arg.comments)) ||
+      (arg.elements.length > 0 || hasComment(arg))) ||
     (arg.type === "TSTypeAssertion" && couldGroupArg(arg.expression)) ||
     (arg.type === "TSAsExpression" && couldGroupArg(arg.expression)) ||
     arg.type === "FunctionExpression" ||
@@ -271,8 +271,8 @@ function shouldGroupLastArg(args) {
   const lastArg = getLast(args);
   const penultimateArg = getPenultimate(args);
   return (
-    !hasLeadingComment(lastArg) &&
-    !hasTrailingComment(lastArg) &&
+    !hasComment(lastArg, CommentCheckFlags.Leading) &&
+    !hasComment(lastArg, CommentCheckFlags.Trailing) &&
     couldGroupArg(lastArg) &&
     // If the last two arguments are of the same type,
     // disable last element expansion.
@@ -287,7 +287,7 @@ function shouldGroupFirstArg(args) {
 
   const [firstArg, secondArg] = args;
   return (
-    (!firstArg.comments || !firstArg.comments.length) &&
+    !hasComment(firstArg) &&
     (firstArg.type === "FunctionExpression" ||
       (firstArg.type === "ArrowFunctionExpression" &&
         firstArg.body.type === "BlockStatement")) &&
diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
index 384ff81cd..add6caafa 100644
--- a/src/language-js/print/class.js
+++ b/src/language-js/print/class.js
@@ -5,8 +5,8 @@ const {
   builders: { concat, join, line, hardline, softline, group, indent, ifBreak },
 } = require("../../document");
 const {
-  hasTrailingComment,
-  hasTrailingLineComment,
+  hasComment,
+  CommentCheckFlags,
   hasNewlineBetweenOrAfterDecorators,
 } = require("../utils");
 const { getTypeParametersGroupId } = require("./type-parameters");
@@ -33,10 +33,8 @@ function printClass(path, options, print) {
   // Keep old behaviour of extends in same line
   // If there is only on extends and there are not comments
   const groupMode =
-    (n.id && hasTrailingComment(n.id)) ||
-    (n.superClass &&
-      n.superClass.comments &&
-      n.superClass.comments.length !== 0) ||
+    (n.id && hasComment(n.id, CommentCheckFlags.Trailing)) ||
+    (n.superClass && hasComment(n.superClass)) ||
     (n.extends && n.extends.length !== 0) || // DeclareClass
     (n.mixins && n.mixins.length !== 0) ||
     (n.implements && n.implements.length !== 0);
@@ -105,7 +103,10 @@ function hasMultipleHeritage(node) {
 function shouldIndentOnlyHeritageClauses(node) {
   return (
     node.typeParameters &&
-    !hasTrailingLineComment(node.typeParameters) &&
+    !hasComment(
+      node.typeParameters,
+      CommentCheckFlags.Trailing | CommentCheckFlags.Line
+    ) &&
     !hasMultipleHeritage(node)
   );
 }
@@ -177,7 +178,7 @@ function printClassMethod(path, options, print) {
 
 function printClassBody(path, options, print) {
   const n = path.getValue();
-  if (!n.comments && n.body.length === 0) {
+  if (!hasComment(n) && n.body.length === 0) {
     return "{}";
   }
 
diff --git a/src/language-js/print/function-parameters.js b/src/language-js/print/function-parameters.js
index 7a8d696ca..bcdb6c903 100644
--- a/src/language-js/print/function-parameters.js
+++ b/src/language-js/print/function-parameters.js
@@ -19,6 +19,7 @@ const {
   isObjectTypePropertyAFunction,
   hasRestParameter,
   shouldPrintComma,
+  hasComment,
 } = require("../utils");
 const { locEnd } = require("../loc");
 const { printFunctionTypeParameters } = require("./misc");
@@ -59,7 +60,7 @@ function printFunctionParameters(
   const isParametersInTestCall = isTestCall(parent);
   const shouldHugParameters = shouldHugFunctionParameters(functionNode);
   const shouldExpandParameters =
-    expandArg && !parameters.some((node) => node.comments);
+    expandArg && !parameters.some((node) => hasComment(node));
   const printed = [];
   iterateFunctionParametersPath(path, (parameterPath, index) => {
     const isLastParameter = index === parameters.length - 1;
@@ -173,7 +174,7 @@ function shouldHugFunctionParameters(node) {
   }
   const [parameter] = parameters;
   return (
-    !parameter.comments &&
+    !hasComment(parameter) &&
     (parameter.type === "ObjectPattern" ||
       parameter.type === "ArrayPattern" ||
       (parameter.type === "Identifier" &&
diff --git a/src/language-js/print/function.js b/src/language-js/print/function.js
index 8f5aa69c1..df4ee059b 100644
--- a/src/language-js/print/function.js
+++ b/src/language-js/print/function.js
@@ -11,7 +11,6 @@ const {
 } = require("../../document");
 const {
   getFunctionParameters,
-  hasDanglingComments,
   hasLeadingOwnLineComment,
   isFlowAnnotationComment,
   isJSXNode,
@@ -21,6 +20,9 @@ const {
   returnArgumentHasLeadingComment,
   isBinaryish,
   isLineComment,
+  hasComment,
+  getComments,
+  CommentCheckFlags,
 } = require("../utils");
 const { locEnd } = require("../loc");
 const { printFunctionParameters } = require("./function-parameters");
@@ -207,7 +209,7 @@ function printArrowFunctionExpression(path, options, print, args) {
   const shouldAddSoftLine =
     ((args && args.expandLastArg) ||
       path.getParentNode().type === "JSXExpressionContainer") &&
-    !(n.comments && n.comments.length);
+    !hasComment(n);
 
   const printTrailingComma =
     args && args.expandLastArg && shouldPrintComma(options, "all");
@@ -246,10 +248,10 @@ function canPrintParamsWithoutParens(node) {
   return (
     parameters.length === 1 &&
     !node.typeParameters &&
-    !hasDanglingComments(node) &&
+    !hasComment(node, CommentCheckFlags.Dangling) &&
     parameters[0].type === "Identifier" &&
     !parameters[0].typeAnnotation &&
-    !parameters[0].comments &&
+    !hasComment(parameters[0]) &&
     !parameters[0].optional &&
     !node.predicate &&
     !node.returnType
@@ -333,15 +335,15 @@ function printReturnAndThrowArgument(path, options, print) {
     }
   }
 
-  const lastComment =
-    Array.isArray(node.comments) && node.comments[node.comments.length - 1];
+  const comments = getComments(node);
+  const lastComment = comments[comments.length - 1];
   const isLastCommentLine = lastComment && isLineComment(lastComment);
 
   if (isLastCommentLine) {
     parts.push(semi);
   }
 
-  if (hasDanglingComments(node)) {
+  if (hasComment(node, CommentCheckFlags.Dangling)) {
     parts.push(
       " ",
       printDanglingComments(path, options, /* sameIndent */ true)
diff --git a/src/language-js/print/interface.js b/src/language-js/print/interface.js
index 49b9cf7c2..84f42657e 100644
--- a/src/language-js/print/interface.js
+++ b/src/language-js/print/interface.js
@@ -3,11 +3,7 @@
 const {
   builders: { concat, join, line, group, indent, ifBreak },
 } = require("../../document");
-const {
-  hasTrailingComment,
-  hasTrailingLineComment,
-  identity,
-} = require("../utils");
+const { hasComment, identity, CommentCheckFlags } = require("../utils");
 const { getTypeParametersGroupId } = require("./type-parameters");
 const { printTypeScriptModifiers } = require("./misc");
 
@@ -39,7 +35,11 @@ function printInterface(path, options, print) {
   }
 
   const shouldIndentOnlyHeritageClauses =
-    n.typeParameters && !hasTrailingLineComment(n.typeParameters);
+    n.typeParameters &&
+    !hasComment(
+      n.typeParameters,
+      CommentCheckFlags.Trailing | CommentCheckFlags.Line
+    );
 
   if (n.extends && n.extends.length !== 0) {
     extendsParts.push(
@@ -56,7 +56,7 @@ function printInterface(path, options, print) {
   }
 
   if (
-    (n.id && hasTrailingComment(n.id)) ||
+    (n.id && hasComment(n.id, CommentCheckFlags.Trailing)) ||
     (n.extends && n.extends.length !== 0)
   ) {
     const printedExtends = concat(extendsParts);
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index b25913e9c..c2a621527 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -20,7 +20,6 @@ const {
 
 const { getLast, getPreferredQuote } = require("../../common/util");
 const {
-  hasTrailingComment,
   isEmptyJSXElement,
   isJSXWhitespaceExpression,
   isJSXNode,
@@ -31,8 +30,8 @@ const {
   isCallOrOptionalCallExpression,
   isStringLiteral,
   isBinaryish,
-  isBlockComment,
-  isLineComment,
+  hasComment,
+  CommentCheckFlags,
 } = require("../utils");
 const pathNeedsParens = require("../needs-parens");
 const { willPrintOwnComments } = require("../comments");
@@ -508,11 +507,9 @@ function printJsxExpressionContainer(path, options, print) {
   const n = path.getValue();
   const parent = path.getParentNode(0);
 
-  const hasComments = n.expression.comments && n.expression.comments.length > 0;
-
   const shouldInline =
     n.expression.type === "JSXEmptyExpression" ||
-    (!hasComments &&
+    (!hasComment(n.expression) &&
       (n.expression.type === "ArrayExpression" ||
         n.expression.type === "ObjectExpression" ||
         n.expression.type === "ArrowFunctionExpression" ||
@@ -547,10 +544,8 @@ function printJsxOpeningElement(path, options, print) {
   const n = path.getValue();
 
   const nameHasComments =
-    (n.name && n.name.comments && n.name.comments.length > 0) ||
-    (n.typeParameters &&
-      n.typeParameters.comments &&
-      n.typeParameters.comments.length > 0);
+    (n.name && hasComment(n.name)) ||
+    (n.typeParameters && hasComment(n.typeParameters));
 
   // Don't break self-closing elements with no attributes and no comments
   if (n.selfClosing && !n.attributes.length && !nameHasComments) {
@@ -579,7 +574,7 @@ function printJsxOpeningElement(path, options, print) {
     //   // comment
     // >
     !nameHasComments &&
-    (!n.attributes[0].comments || !n.attributes[0].comments.length)
+    !hasComment(n.attributes[0])
   ) {
     return group(
       concat([
@@ -594,7 +589,8 @@ function printJsxOpeningElement(path, options, print) {
   }
 
   const lastAttrHasTrailingComments =
-    n.attributes.length && hasTrailingComment(getLast(n.attributes));
+    n.attributes.length &&
+    hasComment(getLast(n.attributes), CommentCheckFlags.Trailing);
 
   const bracketSameLine =
     // Simple tags (no attributes and no comment in tag name) should be
@@ -646,16 +642,10 @@ function printJsxClosingElement(path, options, print) {
   parts.push("</");
 
   const printed = path.call(print, "name");
-  if (
-    Array.isArray(n.name.comments) &&
-    n.name.comments.some((comment) => comment.leading && isLineComment(comment))
-  ) {
+  if (hasComment(n.name, CommentCheckFlags.Leading | CommentCheckFlags.Line)) {
     parts.push(indent(concat([hardline, printed])), hardline);
   } else if (
-    Array.isArray(n.name.comments) &&
-    n.name.comments.some(
-      (comment) => comment.leading && isBlockComment(comment)
-    )
+    hasComment(n.name, CommentCheckFlags.Leading | CommentCheckFlags.Block)
   ) {
     parts.push(" ", printed);
   } else {
@@ -669,9 +659,8 @@ function printJsxClosingElement(path, options, print) {
 
 function printJsxOpeningClosingFragment(path, options /*, print*/) {
   const n = path.getValue();
-  const hasComment = n.comments && n.comments.length;
-  const hasOwnLineComment =
-    hasComment && !n.comments.every((comment) => isBlockComment(comment));
+  const nodeHasComment = hasComment(n);
+  const hasOwnLineComment = hasComment(n, CommentCheckFlags.Line);
   const isOpeningFragment = n.type === "JSXOpeningFragment";
   return concat([
     isOpeningFragment ? "<" : "</",
@@ -679,7 +668,7 @@ function printJsxOpeningClosingFragment(path, options /*, print*/) {
       concat([
         hasOwnLineComment
           ? hardline
-          : hasComment && !isOpeningFragment
+          : nodeHasComment && !isOpeningFragment
           ? " "
           : "",
         printDanglingComments(path, options, true),
@@ -701,8 +690,7 @@ function printJsxElement(path, options, print) {
 
 function printJsxEmptyExpression(path, options /*, print*/) {
   const n = path.getValue();
-  const requiresHardline =
-    n.comments && !n.comments.every((comment) => isBlockComment(comment));
+  const requiresHardline = hasComment(n, CommentCheckFlags.Line);
 
   return concat([
     printDanglingComments(path, options, /* sameIndent */ !requiresHardline),
@@ -719,7 +707,7 @@ function printJsxSpreadAttribute(path, options, print) {
       (p) => {
         const printed = concat(["...", print(p)]);
         const n = p.getValue();
-        if (!n.comments || !n.comments.length || !willPrintOwnComments(p)) {
+        if (!hasComment(n) || !willPrintOwnComments(p)) {
           return printed;
         }
         return concat([
diff --git a/src/language-js/print/member-chain.js b/src/language-js/print/member-chain.js
index 16247fdb3..508595982 100644
--- a/src/language-js/print/member-chain.js
+++ b/src/language-js/print/member-chain.js
@@ -11,14 +11,14 @@ const {
 } = require("../../common/util");
 const pathNeedsParens = require("../needs-parens");
 const {
-  hasLeadingComment,
-  hasTrailingComment,
   isCallOrOptionalCallExpression,
   isFunctionOrArrowExpression,
   isLongCurriedCallExpression,
   isMemberish,
   isNumericLiteral,
   isSimpleCallArgument,
+  hasComment,
+  CommentCheckFlags,
 } = require("../utils");
 const { locEnd } = require("../loc");
 
@@ -244,10 +244,7 @@ function printMemberChain(path, options, print) {
     }
     currentGroup.push(printedNodes[i]);
 
-    if (
-      printedNodes[i].node.comments &&
-      printedNodes[i].node.comments.some((comment) => comment.trailing)
-    ) {
+    if (hasComment(printedNodes[i].node, CommentCheckFlags.Trailing)) {
       groups.push(currentGroup);
       currentGroup = [];
       hasSeenCallExpression = false;
@@ -308,7 +305,9 @@ function printMemberChain(path, options, print) {
   }
 
   const shouldMerge =
-    groups.length >= 2 && !groups[1][0].node.comments && shouldNotWrap(groups);
+    groups.length >= 2 &&
+    !hasComment(groups[1][0].node) &&
+    shouldNotWrap(groups);
 
   function printGroup(printedGroup) {
     const printed = printedGroup.map((tuple) => tuple.printed);
@@ -339,14 +338,19 @@ function printMemberChain(path, options, print) {
   const cutoff = shouldMerge ? 3 : 2;
   const flatGroups = flat(groups);
 
-  const hasComment =
-    flatGroups.slice(1, -1).some((node) => hasLeadingComment(node.node)) ||
-    flatGroups.slice(0, -1).some((node) => hasTrailingComment(node.node)) ||
-    (groups[cutoff] && hasLeadingComment(groups[cutoff][0].node));
+  const nodeHasComment =
+    flatGroups
+      .slice(1, -1)
+      .some((node) => hasComment(node.node, CommentCheckFlags.Leading)) ||
+    flatGroups
+      .slice(0, -1)
+      .some((node) => hasComment(node.node, CommentCheckFlags.Trailing)) ||
+    (groups[cutoff] &&
+      hasComment(groups[cutoff][0].node, CommentCheckFlags.Leading));
 
   // If we only have a single `.`, we shouldn't do anything fancy and just
   // render everything concatenated together.
-  if (groups.length <= cutoff && !hasComment) {
+  if (groups.length <= cutoff && !nodeHasComment) {
     if (isLongCurriedCallExpression(path)) {
       return oneLine;
     }
@@ -390,7 +394,7 @@ function printMemberChain(path, options, print) {
   //  * any group but the last one has a hard line,
   //  * the last call's arguments have a hard line and other calls have non-trivial arguments.
   if (
-    hasComment ||
+    nodeHasComment ||
     (callExpressions.length > 2 &&
       callExpressions.some(
         (expr) => !expr.arguments.every((arg) => isSimpleCallArgument(arg, 0))
diff --git a/src/language-js/print/module.js b/src/language-js/print/module.js
index d8d5a7021..af0de27b9 100644
--- a/src/language-js/print/module.js
+++ b/src/language-js/print/module.js
@@ -6,7 +6,8 @@ const {
 const { printDanglingComments } = require("../../main/comments");
 
 const {
-  hasDanglingComments,
+  hasComment,
+  CommentCheckFlags,
   shouldPrintComma,
   needsHardlineAfterDanglingComment,
 } = require("../utils");
@@ -55,7 +56,7 @@ function printExportDeclaration(path, options, print) {
     parts.push(" default");
   }
 
-  if (hasDanglingComments(node)) {
+  if (hasComment(node, CommentCheckFlags.Dangling)) {
     parts.push(
       " ",
       printDanglingComments(path, options, /* sameIndent */ true)
@@ -203,7 +204,7 @@ function printModuleSpecifiers(path, options, print) {
       const canBreak =
         groupedSpecifiers.length > 1 ||
         standaloneSpecifiers.length > 0 ||
-        node.specifiers.some((node) => node.comments);
+        node.specifiers.some((node) => hasComment(node));
 
       if (canBreak) {
         parts.push(
diff --git a/src/language-js/print/object.js b/src/language-js/print/object.js
index bff624c68..a5546b1a9 100644
--- a/src/language-js/print/object.js
+++ b/src/language-js/print/object.js
@@ -11,10 +11,10 @@ const {
   hasNewline,
 } = require("../../common/util");
 const {
-  hasDanglingComments,
   shouldPrintComma,
-  hasNodeIgnoreComment,
-  isBlockComment,
+  hasComment,
+  getComments,
+  CommentCheckFlags,
 } = require("../utils");
 const { locStart, locEnd } = require("../loc");
 
@@ -116,7 +116,7 @@ function printObject(path, options, print) {
         (prop.node.type === "TSPropertySignature" ||
           prop.node.type === "TSMethodSignature" ||
           prop.node.type === "TSConstructSignatureDeclaration") &&
-        hasNodeIgnoreComment(prop.node)
+        hasComment(prop.node, CommentCheckFlags.PrettierIgnore)
       ) {
         separatorParts.shift();
       }
@@ -128,10 +128,8 @@ function printObject(path, options, print) {
 
   if (n.inexact) {
     let printed;
-    if (hasDanglingComments(n)) {
-      const hasLineComments = !n.comments.every((comment) =>
-        isBlockComment(comment)
-      );
+    if (hasComment(n, CommentCheckFlags.Dangling)) {
+      const hasLineComments = hasComment(n, CommentCheckFlags.Line);
       const printedDanglingComments = printDanglingComments(
         path,
         options,
@@ -140,10 +138,7 @@ function printObject(path, options, print) {
       printed = concat([
         printedDanglingComments,
         hasLineComments ||
-        hasNewline(
-          options.originalText,
-          locEnd(n.comments[n.comments.length - 1])
-        )
+        hasNewline(options.originalText, locEnd(getLast(getComments(n))))
           ? hardline
           : line,
         "...",
@@ -164,12 +159,12 @@ function printObject(path, options, print) {
         lastElem.type === "TSCallSignatureDeclaration" ||
         lastElem.type === "TSMethodSignature" ||
         lastElem.type === "TSConstructSignatureDeclaration") &&
-      hasNodeIgnoreComment(lastElem))
+      hasComment(lastElem, CommentCheckFlags.PrettierIgnore))
   );
 
   let content;
   if (props.length === 0) {
-    if (!hasDanglingComments(n)) {
+    if (!hasComment(n, CommentCheckFlags.Dangling)) {
       return concat([
         leftBrace,
         rightBrace,
diff --git a/src/language-js/print/statement.js b/src/language-js/print/statement.js
index a4a95c909..427a65295 100644
--- a/src/language-js/print/statement.js
+++ b/src/language-js/print/statement.js
@@ -13,6 +13,8 @@ const {
   isJSXNode,
   isLastStatement,
   isTheOnlyJSXElementInMarkdown,
+  hasComment,
+  CommentCheckFlags,
 } = require("../utils");
 const { locEnd } = require("../loc");
 const { shouldPrintParamsWithoutParens } = require("./function");
@@ -47,7 +49,7 @@ function printStatement({ path, index, bodyNode, isClass }, options, print) {
     !isTheOnlyJSXElementInMarkdown(options, path) &&
     statementNeedsASIProtection(path, options)
   ) {
-    if (node.comments && node.comments.some((comment) => comment.leading)) {
+    if (hasComment(node, CommentCheckFlags.Leading)) {
       parts.push(print(path, { needsSemi: true }));
     } else {
       parts.push(";", printed);
diff --git a/src/language-js/print/template-literal.js b/src/language-js/print/template-literal.js
index 157ddc018..81f68121e 100644
--- a/src/language-js/print/template-literal.js
+++ b/src/language-js/print/template-literal.js
@@ -20,6 +20,7 @@ const {
   isBinaryish,
   isJestEachTemplateLiteral,
   isSimpleTemplateLiteral,
+  hasComment,
 } = require("../utils");
 
 function printTemplateLiteral(path, print, options) {
@@ -81,7 +82,7 @@ function printTemplateLiteral(path, print, options) {
         // Breaks at the template element boundaries (${ and }) are preferred to breaking
         // in the middle of a MemberExpression
         if (
-          (expression.comments && expression.comments.length) ||
+          hasComment(expression) ||
           expression.type === "MemberExpression" ||
           expression.type === "OptionalMemberExpression" ||
           expression.type === "ConditionalExpression" ||
@@ -201,7 +202,7 @@ function printJestEachTemplateLiteral(path, options, print) {
 function printTemplateExpression(path, print) {
   const node = path.getValue();
   let printed = print(path);
-  if (node.comments && node.comments.length) {
+  if (hasComment(node)) {
     printed = group(concat([indent(concat([softline, printed])), softline]));
   }
   return concat(["${", printed, lineSuffixBoundary, "}"]);
diff --git a/src/language-js/print/ternary.js b/src/language-js/print/ternary.js
index 580074850..43da1f587 100644
--- a/src/language-js/print/ternary.js
+++ b/src/language-js/print/ternary.js
@@ -2,7 +2,7 @@
 
 const flat = require("lodash/flatten");
 const { hasNewlineInRange } = require("../../common/util");
-const { isJSXNode, isBlockComment } = require("../utils");
+const { isJSXNode, isBlockComment, getComments } = require("../utils");
 const { locStart, locEnd } = require("../loc");
 const {
   builders: {
@@ -277,10 +277,12 @@ function printTernary(path, options, print) {
   // break if any of them break. That means we should only group around the
   // outer-most ConditionalExpression.
   const comments = flat([
-    ...testNodePropertyNames.map((propertyName) => node[propertyName].comments),
-    consequentNode.comments,
-    alternateNode.comments,
-  ]).filter(Boolean);
+    ...testNodePropertyNames.map((propertyName) =>
+      getComments(node[propertyName])
+    ),
+    getComments(consequentNode),
+    getComments(alternateNode),
+  ]);
   const shouldBreak = comments.some(
     (comment) =>
       isBlockComment(comment) &&
diff --git a/src/language-js/print/type-parameters.js b/src/language-js/print/type-parameters.js
index 2fe3029c6..eb1e9fc79 100644
--- a/src/language-js/print/type-parameters.js
+++ b/src/language-js/print/type-parameters.js
@@ -5,9 +5,9 @@ const {
   builders: { concat, join, line, hardline, softline, group, indent, ifBreak },
 } = require("../../document");
 const {
-  hasDanglingComments,
   isTestCall,
-  isBlockComment,
+  hasComment,
+  CommentCheckFlags,
   isTSXFile,
   shouldPrintComma,
   getFunctionParameters,
@@ -82,12 +82,10 @@ function printTypeParameters(path, options, print, paramsKey) {
 
 function printDanglingCommentsForInline(path, options) {
   const n = path.getValue();
-  if (!hasDanglingComments(n)) {
+  if (!hasComment(n, CommentCheckFlags.Dangling)) {
     return "";
   }
-  const hasOnlyBlockComments = n.comments.every((comment) =>
-    isBlockComment(comment)
-  );
+  const hasOnlyBlockComments = !hasComment(n, CommentCheckFlags.Line);
   const printed = printDanglingComments(
     path,
     options,
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 42d31381d..e02dd375e 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -35,11 +35,11 @@ const preprocess = require("./print-preprocess");
 const {
   getCallArguments,
   getParentExportDeclaration,
-  hasDanglingComments,
   hasFlowShorthandAnnotationComment,
   hasNewlineBetweenOrAfterDecorators,
   hasPrettierIgnore,
-  hasTrailingComment,
+  hasComment,
+  CommentCheckFlags,
   isExportDeclaration,
   isFunctionNotation,
   isGetterOrSetter,
@@ -261,7 +261,7 @@ function printPathNoParens(path, options, print, args) {
 
     case "Program": {
       const hasContents =
-        !n.body.every(({ type }) => type === "EmptyStatement") || n.comments;
+        !n.body.every(({ type }) => type === "EmptyStatement") || hasComment(n);
 
       // Babel 6
       if (n.directives) {
@@ -324,7 +324,7 @@ function printPathNoParens(path, options, print, args) {
       ]);
     // Babel non-standard node. Used for Closure-style type casts. See postprocess.js.
     case "ParenthesizedExpression": {
-      const shouldHug = !n.expression.comments;
+      const shouldHug = !hasComment(n.expression);
       if (shouldHug) {
         return concat(["(", path.call(print, "expression"), ")"]);
       }
@@ -568,7 +568,7 @@ function printPathNoParens(path, options, print, args) {
         parts.push(" ");
       }
 
-      if (n.argument.comments && n.argument.comments.length > 0) {
+      if (hasComment(n.argument)) {
         parts.push(
           group(
             concat([
@@ -611,7 +611,7 @@ function printPathNoParens(path, options, print, args) {
       const hasValue = n.declarations.some((decl) => decl.init);
 
       let firstVariable;
-      if (printed.length === 1 && !n.declarations[0].comments) {
+      if (printed.length === 1 && !hasComment(n.declarations[0])) {
         firstVariable = printed[0];
       } else if (printed.length > 0) {
         // Indent first var to comply with eslint one-var rule
@@ -668,16 +668,15 @@ function printPathNoParens(path, options, print, args) {
 
       if (n.alternate) {
         const commentOnOwnLine =
-          (hasTrailingComment(n.consequent) &&
-            n.consequent.comments.some(
-              (comment) => comment.trailing && !isBlockComment(comment)
-            )) ||
-          needsHardlineAfterDanglingComment(n);
+          hasComment(
+            n.consequent,
+            CommentCheckFlags.Trailing | CommentCheckFlags.Line
+          ) || needsHardlineAfterDanglingComment(n);
         const elseOnSameLine =
           n.consequent.type === "BlockStatement" && !commentOnOwnLine;
         parts.push(elseOnSameLine ? " " : hardline);
 
-        if (hasDanglingComments(n)) {
+        if (hasComment(n, CommentCheckFlags.Dangling)) {
           parts.push(
             comments.printDanglingComments(path, options, true),
             commentOnOwnLine ? hardline : " "
@@ -849,23 +848,22 @@ function printPathNoParens(path, options, print, args) {
       ]);
     case "CatchClause":
       if (n.param) {
-        const hasComments =
-          n.param.comments &&
-          n.param.comments.some(
-            (comment) =>
-              !isBlockComment(comment) ||
-              (comment.leading &&
-                hasNewline(options.originalText, locEnd(comment))) ||
-              (comment.trailing &&
-                hasNewline(options.originalText, locStart(comment), {
-                  backwards: true,
-                }))
-          );
+        const parameterHasComments = hasComment(
+          n.param,
+          (comment) =>
+            !isBlockComment(comment) ||
+            (comment.leading &&
+              hasNewline(options.originalText, locEnd(comment))) ||
+            (comment.trailing &&
+              hasNewline(options.originalText, locStart(comment), {
+                backwards: true,
+              }))
+        );
         const param = path.call(print, "param");
 
         return concat([
           "catch ",
-          hasComments
+          parameterHasComments
             ? concat(["(", indent(concat([softline, param])), softline, ") "])
             : concat(["(", param, ") "]),
           path.call(print, "body"),
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index 16184d372..a9302d2cb 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -344,7 +344,7 @@ function isJSXWhitespaceExpression(node) {
     node.type === "JSXExpressionContainer" &&
     isLiteral(node.expression) &&
     node.expression.value === " " &&
-    !node.expression.comments
+    !hasComment(node.expression)
   );
 }
 
@@ -564,35 +564,6 @@ function isTestCall(n, parent) {
   return false;
 }
 
-/**
- * @param {Node} node
- * @returns {boolean}
- */
-function hasLeadingComment(node) {
-  return node.comments && node.comments.some((comment) => comment.leading);
-}
-
-/**
- * @param {Node} node
- * @returns {boolean}
- */
-function hasTrailingComment(node) {
-  return node.comments && node.comments.some((comment) => comment.trailing);
-}
-
-/**
- * @param {Node} node
- * @returns {boolean}
- */
-function hasTrailingLineComment(node) {
-  return (
-    node.comments &&
-    node.comments.some(
-      (comment) => comment.trailing && !isBlockComment(comment)
-    )
-  );
-}
-
 /**
  * @param {CallExpression | OptionalCallExpression} node
  * @returns {boolean}
@@ -603,17 +574,6 @@ function isCallOrOptionalCallExpression(node) {
   );
 }
 
-/**
- * @param {Node} node
- * @returns {boolean}
- */
-function hasDanglingComments(node) {
-  return (
-    node.comments &&
-    node.comments.some((comment) => !comment.leading && !comment.trailing)
-  );
-}
-
 /**
  *
  * @param {any} node
@@ -632,7 +592,7 @@ function isSimpleTemplateLiteral(node) {
 
   return expressions.every((expr) => {
     // Disallow comments since printDocToString can't print them here
-    if (expr.comments) {
+    if (hasComment(expr)) {
       return false;
     }
 
@@ -660,7 +620,7 @@ function isSimpleTemplateLiteral(node) {
           return false;
         }
         head = head.object;
-        if (head.comments) {
+        if (hasComment(head)) {
           return false;
         }
       }
@@ -819,10 +779,7 @@ function hasJsxIgnoreComment(path) {
     prevSibling &&
     prevSibling.type === "JSXExpressionContainer" &&
     prevSibling.expression.type === "JSXEmptyExpression" &&
-    prevSibling.expression.comments &&
-    prevSibling.expression.comments.some((comment) =>
-      isPrettierIgnoreComment(comment)
-    )
+    hasNodeIgnoreComment(prevSibling.expression)
   );
 }
 
@@ -893,12 +850,9 @@ function hasLeadingOwnLineComment(text, node) {
     return hasNodeIgnoreComment(node);
   }
 
-  const res =
-    node.comments &&
-    node.comments.some(
-      (comment) => comment.leading && hasNewline(text, locEnd(comment))
-    );
-  return res;
+  return hasComment(node, CommentCheckFlags.Leading, (comment) =>
+    hasNewline(text, locEnd(comment))
+  );
 }
 
 // This recurses the return argument, looking for the first token
@@ -1036,11 +990,11 @@ function isTemplateOnItsOwnLine(n, text) {
  * @returns {boolean}
  */
 function needsHardlineAfterDanglingComment(node) {
-  if (!node.comments) {
+  if (!hasComment(node)) {
     return false;
   }
   const lastDanglingComment = getLast(
-    node.comments.filter((comment) => !comment.leading && !comment.trailing)
+    getComments(node, CommentCheckFlags.Dangling)
   );
   return lastDanglingComment && !isBlockComment(lastDanglingComment);
 }
@@ -1453,18 +1407,13 @@ function iterateCallArgumentsPath(path, iteratee) {
 }
 
 function isPrettierIgnoreComment(comment) {
-  return comment.value.trim() === "prettier-ignore";
+  return comment.value.trim() === "prettier-ignore" && !comment.unignore;
 }
 
 function hasNodeIgnoreComment(node) {
   return (
     node &&
-    ((node.comments &&
-      node.comments.length > 0 &&
-      node.comments.some(
-        (comment) => isPrettierIgnoreComment(comment) && !comment.unignore
-      )) ||
-      node.prettierIgnore)
+    (node.prettierIgnore || hasComment(node, CommentCheckFlags.PrettierIgnore))
   );
 }
 
@@ -1473,6 +1422,86 @@ function hasIgnoreComment(path) {
   return hasNodeIgnoreComment(node);
 }
 
+const CommentCheckFlags = {
+  /** @type {number} Check comment is a leading comment */
+  Leading: 1 << 1,
+  /** @type {number} Check comment is a trailing comment */
+  Trailing: 1 << 2,
+  /** @type {number} Check comment is a dangling comment */
+  Dangling: 1 << 3,
+  /** @type {number} Check comment is a block comment */
+  Block: 1 << 4,
+  /** @type {number} Check comment is a line comment */
+  Line: 1 << 5,
+  /** @type {number} Check comment is a `prettier-ignore` comment */
+  PrettierIgnore: 1 << 6,
+  /** @type {number} Check comment is the first attched comment */
+  First: 1 << 7,
+  /** @type {number} Check comment is the last attched comment */
+  Last: 1 << 8,
+};
+
+/**
+ * @returns {function}
+ */
+const getCommentTestFunction = (flags, fn) => {
+  if (typeof flags === "function") {
+    fn = flags;
+    flags = 0;
+  }
+  if (flags || fn) {
+    return (comment, index, comments) =>
+      !(
+        (flags & CommentCheckFlags.Leading && !comment.leading) ||
+        (flags & CommentCheckFlags.Trailing && !comment.trailing) ||
+        (flags & CommentCheckFlags.Dangling &&
+          (comment.leading || comment.trailing)) ||
+        (flags & CommentCheckFlags.Block && !isBlockComment(comment)) ||
+        (flags & CommentCheckFlags.Line && !isLineComment(comment)) ||
+        (flags & CommentCheckFlags.First && index !== 0) ||
+        (flags & CommentCheckFlags.Last && index !== comments.length - 1) ||
+        (flags & CommentCheckFlags.PrettierIgnore &&
+          !isPrettierIgnoreComment(comment)) ||
+        (fn && !fn(comment))
+      );
+  }
+};
+/**
+ * @param {Node} node
+ * @param {number | function} [flags]
+ * @param {function} [fn]
+ * @returns {boolean}
+ */
+function hasComment(node, flags, fn) {
+  if (!node || !Array.isArray(node.comments) || node.comments.length === 0) {
+    return false;
+  }
+  const test = getCommentTestFunction(flags, fn);
+  return test
+    ? node.comments.some((comment, index, comments) =>
+        test(comment, index, comments)
+      )
+    : true;
+}
+
+/**
+ * @param {Node} node
+ * @param {number | function} [flags]
+ * @param {function} [fn]
+ * @returns {Comment[]}
+ */
+function getComments(node, flags, fn) {
+  if (!node || !Array.isArray(node.comments)) {
+    return [];
+  }
+  const test = getCommentTestFunction(flags, fn);
+  return test
+    ? node.comments.filter((comment, index, comments) =>
+        test(comment, index, comments)
+      )
+    : node.comments;
+}
+
 module.exports = {
   classChildNeedsASIProtection,
   classPropMayCauseASIProblems,
@@ -1484,19 +1513,14 @@ module.exports = {
   getLeftSidePathName,
   getParentExportDeclaration,
   getTypeScriptMappedTypeModifier,
-  hasDanglingComments,
   hasFlowAnnotationComment,
   hasFlowShorthandAnnotationComment,
-  hasLeadingComment,
   hasLeadingOwnLineComment,
   hasNakedLeftSide,
   hasNewlineBetweenOrAfterDecorators,
   hasNode,
   hasPrettierIgnore,
-  hasTrailingComment,
-  hasTrailingLineComment,
   hasIgnoreComment,
-  hasNodeIgnoreComment,
   identity,
   isBinaryish,
   isBlockComment,
@@ -1542,4 +1566,7 @@ module.exports = {
   shouldFlatten,
   startsWithNoLookaheadToken,
   getPrecedence,
+  hasComment,
+  getComments,
+  CommentCheckFlags,
 };
diff --git a/yarn.lock b/yarn.lock
index 61e48b201..ffff03a19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3186,8 +3186,9 @@ eslint-plugin-jest@24.1.3:
   dependencies:
     "@typescript-eslint/experimental-utils" "^4.0.1"
 
-"eslint-plugin-prettier-internal-rules@file:scripts/tools/eslint-plugin-prettier-internal-rules":
-  version "1.0.3"
+"eslint-plugin-prettier-internal-rules@link:scripts/tools/eslint-plugin-prettier-internal-rules":
+  version "0.0.0"
+  uid ""
 
 eslint-plugin-react@7.21.5:
   version "7.21.5"

From b46710f2d9cd53a83ac615d68b6b2f20ae600493 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Sun, 22 Nov 2020 09:24:22 +0900
Subject: [PATCH 115/299] Fix formatting for AssignmentExpression with
 ClassExpression (#9741)

* Fix formatting for asignment with superClass

* Add tests

* Changelog

* For only AssignmentExpression

* Remove unnecesary ifBreak
---
 changelog_unreleased/javascript/9741.md       | 27 +++++++++++++++++++
 src/language-js/print/class.js                | 14 +++++-----
 .../classes/__snapshots__/jsfmt.spec.js.snap  | 16 ++++++++---
 tests/js/classes/assignment.js                |  6 +++++
 4 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 changelog_unreleased/javascript/9741.md

diff --git a/changelog_unreleased/javascript/9741.md b/changelog_unreleased/javascript/9741.md
new file mode 100644
index 000000000..94caafe8c
--- /dev/null
+++ b/changelog_unreleased/javascript/9741.md
@@ -0,0 +1,27 @@
+#### Fix formatting for AssignmentExpression with ClassExpression (#9741 by @sosukesuzuki)
+
+<!-- prettier-ignore -->
+```js
+// Input
+module.exports = class A extends B {
+  method() {
+    console.log("foo");
+  }
+};
+
+// Prettier stable
+module.exports = class A extends (
+  B
+) {
+  method() {
+    console.log("foo");
+  }
+};
+
+// Prettier master
+module.exports = class A extends B {
+  method() {
+    console.log("foo");
+  }
+};
+```
diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
index 2e48dfeb1..ecefce26c 100644
--- a/src/language-js/print/class.js
+++ b/src/language-js/print/class.js
@@ -131,13 +131,13 @@ function printList(path, options, print, listName) {
 function printSuperClass(path, options, print) {
   const printed = path.call(print, "superClass");
   const parent = path.getParentNode();
-  if (parent && parent.type === "AssignmentExpression") {
-    return concat([
-      ifBreak("("),
-      indent(concat([softline, printed])),
-      softline,
-      ifBreak(")"),
-    ]);
+  if (parent.type === "AssignmentExpression") {
+    return group(
+      ifBreak(
+        concat(["(", indent(concat([softline, printed])), softline, ")"]),
+        printed
+      )
+    );
   }
   return printed;
 }
diff --git a/tests/js/classes/__snapshots__/jsfmt.spec.js.snap b/tests/js/classes/__snapshots__/jsfmt.spec.js.snap
index 2025489e6..44873cab8 100644
--- a/tests/js/classes/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/classes/__snapshots__/jsfmt.spec.js.snap
@@ -32,6 +32,12 @@ foo = class extends aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggg
   }
 };
 
+module.exports = class A extends B {
+  method () {
+    console.log("foo");
+  }
+};
+
 =====================================output=====================================
 aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends (
   aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg1
@@ -41,9 +47,7 @@ aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggggg2 = class extends
   }
 };
 
-foo = class extends (
-  bar
-) {
+foo = class extends bar {
   method() {
     console.log("foo");
   }
@@ -65,6 +69,12 @@ foo = class extends (
   }
 };
 
+module.exports = class A extends B {
+  method() {
+    console.log("foo");
+  }
+};
+
 ================================================================================
 `;
 
diff --git a/tests/js/classes/assignment.js b/tests/js/classes/assignment.js
index dc0f6c4b6..56f7348cc 100644
--- a/tests/js/classes/assignment.js
+++ b/tests/js/classes/assignment.js
@@ -23,3 +23,9 @@ foo = class extends aaaaaaaa.bbbbbbbb.cccccccc.dddddddd.eeeeeeee.ffffffff.gggggg
     console.log("foo");
   }
 };
+
+module.exports = class A extends B {
+  method () {
+    console.log("foo");
+  }
+};

From 81bfd3ffc72d3c971e3b6962157a90c8bf12be50 Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Thu, 26 Nov 2020 02:42:41 +0900
Subject: [PATCH 116/299] Fix changelog to old format

---
 changelog_unreleased/javascript/{9741.md => pr-9741.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog_unreleased/javascript/{9741.md => pr-9741.md} (100%)

diff --git a/changelog_unreleased/javascript/9741.md b/changelog_unreleased/javascript/pr-9741.md
similarity index 100%
rename from changelog_unreleased/javascript/9741.md
rename to changelog_unreleased/javascript/pr-9741.md

From 25d53fa9b3129db81c81eb4c97ba2b79a68e736e Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 26 Nov 2020 19:28:00 +0800
Subject: [PATCH 117/299] SCSS/LESS: Fix comment inside parens (#9710)

---
 changelog_unreleased/scss/pr-9710.md          | 23 +++++++++++
 src/language-css/printer-postcss.js           |  7 ++++
 .../comments/__snapshots__/jsfmt.spec.js.snap | 40 +++++++++++++++++++
 tests/less/comments/in-value.less             | 14 +++++++
 .../comments/__snapshots__/jsfmt.spec.js.snap | 40 +++++++++++++++++++
 tests/scss/comments/in-value.scss             | 14 +++++++
 6 files changed, 138 insertions(+)
 create mode 100644 changelog_unreleased/scss/pr-9710.md
 create mode 100644 tests/less/comments/in-value.less
 create mode 100644 tests/scss/comments/in-value.scss

diff --git a/changelog_unreleased/scss/pr-9710.md b/changelog_unreleased/scss/pr-9710.md
new file mode 100644
index 000000000..ca92c1a21
--- /dev/null
+++ b/changelog_unreleased/scss/pr-9710.md
@@ -0,0 +1,23 @@
+#### Fix broken comment inside parens (#9710 by @fisker)
+
+<!-- prettier-ignore -->
+```scss
+// Input
+.simplification {
+  foo: (
+    calc() // not a comment anymore
+  );
+}
+
+// Prettier stable
+.simplification {
+  foo: (calc() // not a comment anymore);
+}
+
+// Prettier master
+.simplification {
+  foo: (
+    calc() // not a comment anymore
+  );
+}
+```
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index 74b5ec151..bbbf0c3e6 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -534,6 +534,9 @@ function genericPrint(path, options, print) {
       const atRuleAncestorNode = getAncestorNode(path, "css-atrule");
       const isControlDirective =
         atRuleAncestorNode && isSCSSControlDirectiveNode(atRuleAncestorNode);
+      const hasInlineComment = node.groups.some((node) =>
+        isInlineValueCommentNode(node)
+      );
 
       const printed = path.map(print, "groups");
       const parts = [];
@@ -800,6 +803,10 @@ function genericPrint(path, options, print) {
         parts.push(line);
       }
 
+      if (hasInlineComment) {
+        parts.push(breakParent);
+      }
+
       if (didBreak) {
         parts.unshift(hardline);
       }
diff --git a/tests/less/comments/__snapshots__/jsfmt.spec.js.snap b/tests/less/comments/__snapshots__/jsfmt.spec.js.snap
index ba0123c2a..d34539e2b 100644
--- a/tests/less/comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/less/comments/__snapshots__/jsfmt.spec.js.snap
@@ -198,6 +198,46 @@ printWidth: 80
 ================================================================================
 `;
 
+exports[`in-value.less format 1`] = `
+====================================options=====================================
+parsers: ["less"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+.real-world-example {
+  background: radial-gradient(
+      circle at left 0% bottom $position,
+      transparent,
+      transparent $diameter,
+      #fbfbfb calc(#{$diameter} + 1px) // Add 1px for edge-smoothing.
+    );
+}
+
+.simplification { 
+  foo: (
+    calc() // not a comment anymore
+  );
+}
+
+=====================================output=====================================
+.real-world-example {
+  background: radial-gradient(
+    circle at left 0% bottom $position,
+    transparent,
+    transparent $diameter,
+    #fbfbfb calc(#{$diameter} + 1px) // Add 1px for edge-smoothing.
+  );
+}
+
+.simplification {
+  foo: (
+    calc() // not a comment anymore
+  );
+}
+
+================================================================================
+`;
+
 exports[`issue-8130.less format 1`] = `
 ====================================options=====================================
 parsers: ["less"]
diff --git a/tests/less/comments/in-value.less b/tests/less/comments/in-value.less
new file mode 100644
index 000000000..4729f124e
--- /dev/null
+++ b/tests/less/comments/in-value.less
@@ -0,0 +1,14 @@
+.real-world-example {
+  background: radial-gradient(
+      circle at left 0% bottom $position,
+      transparent,
+      transparent $diameter,
+      #fbfbfb calc(#{$diameter} + 1px) // Add 1px for edge-smoothing.
+    );
+}
+
+.simplification { 
+  foo: (
+    calc() // not a comment anymore
+  );
+}
diff --git a/tests/scss/comments/__snapshots__/jsfmt.spec.js.snap b/tests/scss/comments/__snapshots__/jsfmt.spec.js.snap
index d6d360762..45cf082b4 100644
--- a/tests/scss/comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/scss/comments/__snapshots__/jsfmt.spec.js.snap
@@ -338,6 +338,46 @@ printWidth: 80
 ================================================================================
 `;
 
+exports[`in-value.scss format 1`] = `
+====================================options=====================================
+parsers: ["scss"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+.real-world-example {
+  background: radial-gradient(
+      circle at left 0% bottom $position,
+      transparent,
+      transparent $diameter,
+      #fbfbfb calc(#{$diameter} + 1px) // Add 1px for edge-smoothing.
+    );
+}
+
+.simplification { 
+  foo: (
+    calc() // not a comment anymore
+  );
+}
+
+=====================================output=====================================
+.real-world-example {
+  background: radial-gradient(
+    circle at left 0% bottom $position,
+    transparent,
+    transparent $diameter,
+    #fbfbfb calc(#{$diameter} + 1px) // Add 1px for edge-smoothing.
+  );
+}
+
+.simplification {
+  foo: (
+    calc() // not a comment anymore
+  );
+}
+
+================================================================================
+`;
+
 exports[`lists.scss format 1`] = `
 ====================================options=====================================
 parsers: ["scss"]
diff --git a/tests/scss/comments/in-value.scss b/tests/scss/comments/in-value.scss
new file mode 100644
index 000000000..4729f124e
--- /dev/null
+++ b/tests/scss/comments/in-value.scss
@@ -0,0 +1,14 @@
+.real-world-example {
+  background: radial-gradient(
+      circle at left 0% bottom $position,
+      transparent,
+      transparent $diameter,
+      #fbfbfb calc(#{$diameter} + 1px) // Add 1px for edge-smoothing.
+    );
+}
+
+.simplification { 
+  foo: (
+    calc() // not a comment anymore
+  );
+}

From 664d0d33b519b093f2be3a35357debeecdf941e2 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 26 Nov 2020 19:30:57 +0800
Subject: [PATCH 118/299] Fix inconsistent language comment detection (#9743)

---
 changelog_unreleased/javascript/9743.md       | 19 +++++++++++++++++++
 src/language-js/comments.js                   | 15 ---------------
 src/language-js/embed.js                      |  9 ++++-----
 .../__snapshots__/jsfmt.spec.js.snap          | 19 +++++++++++++++++++
 .../language-comment/jsfmt.spec.js            |  1 +
 .../language-comment/not-language-comment.js  |  3 +++
 6 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100644 changelog_unreleased/javascript/9743.md
 create mode 100644 tests/js/multiparser-html/language-comment/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/js/multiparser-html/language-comment/jsfmt.spec.js
 create mode 100644 tests/js/multiparser-html/language-comment/not-language-comment.js

diff --git a/changelog_unreleased/javascript/9743.md b/changelog_unreleased/javascript/9743.md
new file mode 100644
index 000000000..376d20e92
--- /dev/null
+++ b/changelog_unreleased/javascript/9743.md
@@ -0,0 +1,19 @@
+#### Fix inconsistent language comment detection (#9743 by @fisker)
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+foo /* HTML */ = `<DIV>
+</DIV>`;
+
+// Prettier stable (--parser=babel)
+foo /* HTML */ = `<div></div>`;
+
+// Prettier stable (--parser=meriyah)
+foo /* HTML */ = `<DIV>
+</DIV>`;
+
+// Prettier master (All JavaScript parsers)
+foo /* HTML */ = `<DIV>
+</DIV>`;
+```
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index af0866175..91cd34ffa 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -19,8 +19,6 @@ const {
   hasFlowShorthandAnnotationComment,
   hasFlowAnnotationComment,
   hasIgnoreComment,
-  hasComment,
-  CommentCheckFlags,
 } = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
@@ -866,18 +864,6 @@ function handleTSMappedTypeComments({
   return false;
 }
 
-/**
- * @param {Node} node
- * @param {(comment: Comment) => boolean} fn
- * @returns boolean
- */
-function hasLeadingComment(node, fn = () => true) {
-  if (node.leadingComments) {
-    return node.leadingComments.some(fn);
-  }
-  return hasComment(node, CommentCheckFlags.Leading, fn);
-}
-
 /**
  * @param {Node} node
  * @returns {boolean}
@@ -994,7 +980,6 @@ module.exports = {
   handleOwnLineComment,
   handleEndOfLineComment,
   handleRemainingComment,
-  hasLeadingComment,
   isTypeCastComment,
   getGapRegex,
   getCommentChildNodes,
diff --git a/src/language-js/embed.js b/src/language-js/embed.js
index 7c7ee3eb9..3058e7868 100644
--- a/src/language-js/embed.js
+++ b/src/language-js/embed.js
@@ -1,7 +1,6 @@
 "use strict";
 
-const { isBlockComment } = require("./utils");
-const { hasLeadingComment } = require("./comments");
+const { hasComment, CommentCheckFlags } = require("./utils");
 const formatMarkdown = require("./embed/markdown");
 const formatCss = require("./embed/css");
 const formatGraphql = require("./embed/graphql");
@@ -267,10 +266,10 @@ function hasLanguageComment(node, languageName) {
   // we will not trim the comment value and we will expect exactly one space on
   // either side of the GraphQL string
   // Also see ./clean.js
-  return hasLeadingComment(
+  return hasComment(
     node,
-    (comment) =>
-      isBlockComment(comment) && comment.value === ` ${languageName} `
+    CommentCheckFlags.Block | CommentCheckFlags.Leading,
+    ({ value }) => value === ` ${languageName} `
   );
 }
 
diff --git a/tests/js/multiparser-html/language-comment/__snapshots__/jsfmt.spec.js.snap b/tests/js/multiparser-html/language-comment/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..025e71c48
--- /dev/null
+++ b/tests/js/multiparser-html/language-comment/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`not-language-comment.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+const html /* HTML */ = \`<DIV>
+
+</DIV>\`;
+
+=====================================output=====================================
+const html /* HTML */ = \`<DIV>
+
+</DIV>\`;
+
+================================================================================
+`;
diff --git a/tests/js/multiparser-html/language-comment/jsfmt.spec.js b/tests/js/multiparser-html/language-comment/jsfmt.spec.js
new file mode 100644
index 000000000..eb85eda6b
--- /dev/null
+++ b/tests/js/multiparser-html/language-comment/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["babel", "flow", "typescript"]);
diff --git a/tests/js/multiparser-html/language-comment/not-language-comment.js b/tests/js/multiparser-html/language-comment/not-language-comment.js
new file mode 100644
index 000000000..ee5517b7b
--- /dev/null
+++ b/tests/js/multiparser-html/language-comment/not-language-comment.js
@@ -0,0 +1,3 @@
+const html /* HTML */ = `<DIV>
+
+</DIV>`;

From 9f422f6a37705ace948f5f3589ba53e6e2feac33 Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Thu, 26 Nov 2020 20:20:39 +0800
Subject: [PATCH 119/299] Fix `lint:changelog`

---
 changelog_unreleased/scss/{pr-9710.md => 9710.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog_unreleased/scss/{pr-9710.md => 9710.md} (100%)

diff --git a/changelog_unreleased/scss/pr-9710.md b/changelog_unreleased/scss/9710.md
similarity index 100%
rename from changelog_unreleased/scss/pr-9710.md
rename to changelog_unreleased/scss/9710.md

From 3a6d659ecc16d81dcc2c5248c6d22186b82e3d9d Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Thu, 26 Nov 2020 19:19:40 +0200
Subject: [PATCH 120/299] =?UTF-8?q?Update=20option=20philosophy:=20option?=
 =?UTF-8?q?=20requests=20aren=E2=80=99t=20accepted=20anymore=20(#8540)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update option philosophy: option requests aren’t accepted anymore

* Update docs/option-philosophy.md

Co-authored-by: Lucas Azzola <lucas.azzola@iress.com>

* Update option-philosophy.md

Co-authored-by: Lucas Azzola <lucas.azzola@iress.com>
---
 docs/option-philosophy.md | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/docs/option-philosophy.md b/docs/option-philosophy.md
index f56fdda7a..a1966fd53 100644
--- a/docs/option-philosophy.md
+++ b/docs/option-philosophy.md
@@ -3,17 +3,17 @@ id: option-philosophy
 title: Option Philosophy
 ---
 
-> Prettier has a few options because of history. **But we don’t want more of them.**
+> Prettier has a few options because of history. **But we won’t add more of them.**
 >
 > Read on to learn more.
 
 Prettier is not a kitchen-sink code formatter that attempts to print your code in any way you wish. It is _opinionated._ Quoting the [Why Prettier?](why-prettier.md) page:
 
-> By far the biggest reason for adopting Prettier is to stop all the on-going debates over styles.
+> By far the biggest reason for adopting Prettier is to stop all the ongoing debates over styles.
 
-The more options Prettier has, the further from the above goal it gets. **The debates over styles just turn into debates over which Prettier options to use.**
+Yet the more options Prettier has, the further from the above goal it gets. **The debates over styles just turn into debates over which Prettier options to use.** Formatting wars break out with renewed vigour: “Which option values are better? Why? Did we make the right choices?”
 
-The issue about [resisting adding configuration](https://github.com/prettier/prettier/issues/40) has more 👍s than any option request issue.
+And it’s not the only cost options have. To learn more about their downsides, see the [issue about resisting adding configuration](https://github.com/prettier/prettier/issues/40), which has more 👍s than any option request issue.
 
 So why are there any options at all?
 
@@ -21,27 +21,18 @@ So why are there any options at all?
 - A couple were added after “great demand.” 🤔
 - Some were added for compatibility reasons. 👍
 
-What we’ve learned during the years is that it’s really hard to measure demand. Prettier has grown _a lot_ in usage. What was “great demand” back in the day is not as much today. How many is many? What about all silent users?
-
-It’s so easy to add “just one more“ option. But where do we stop? When is one too many? There will always be a “top issue” in the issue tracker. Even if we add just that one final option.
-
-The downside of options is that they open up for debate within teams. Which options should we use? Why? Did we make the right choices?
-
-Every option also makes it much harder to say no to new ones. If _those_ options exist, why can’t this one?
-
-We’ve had several users open up option requests only to close them themselves a couple of months later. They had realized that they don’t care at all about that little syntax choice they used to feel so strongly about. Examples: [#3101](https://github.com/prettier/prettier/issues/3101#issuecomment-500927917) and [#5501](https://github.com/prettier/prettier/issues/5501#issuecomment-487025417).
-
-All of this makes the topic of options in Prettier very difficult. And mentally tiring for maintainers. What do people want? What do people _really_ want in 6 months? Are we spending time and energy on the right things?
-
-Some options are easier to motivate:
+Options that are easier to motivate include:
 
 - `--trailing-comma es5` lets you use trailing commas in most environments without having to transpile (trailing function commas were added in ES2017).
-- `--prose-wrap` is important to support all quirky markdown renderers in the wild.
+- `--prose-wrap` is important to support all quirky Markdown renderers in the wild.
 - `--html-whitespace-sensitivity` is needed due to the unfortunate whitespace rules of HTML.
 - `--end-of-line` makes it easier for teams to keep CRLFs out of their git repositories.
 - `--quote-props` is important for advanced usage of the Google Closure Compiler.
 
-But others are harder to motivate in hindsight, and usually end up with bike shedding. `--arrow-parens`,
-`--jsx-single-quote`, `--jsx-bracket-same-line` and `--no-bracket-spacing` are not the type of options we want more of. They exist (and are difficult to remove now), but should not motivate adding more options like them.
+But other options are harder to motivate in hindsight: `--arrow-parens`, `--jsx-single-quote`, `--jsx-bracket-same-line` and `--no-bracket-spacing` are not the type of options we’re happy to have. They cause a lot of [bike-shedding](https://en.wikipedia.org/wiki/Law_of_triviality) in teams, and we’re sorry for that. Difficult to remove now, these options exist as a historical artifact and should not motivate adding more options (“If _those_ options exist, why can’t this one?”).
 
-Feel free to open issues! Prettier isn’t perfect. Many times things can be improved without adding options. But if the issue _does_ seem to need a new option, we’ll generally keep it open, to let people 👍 it and add comments.
+For a long time, we left option requests open in order to let discussions play out and collect feedback. What we’ve learned during those years is that it’s really hard to measure demand. Prettier has grown a lot in usage. What was “great demand” back in the day is not as much today. GitHub reactions and Twitter polls became unrepresentative. What about all silent users? It looked easy to add “just one more” option. But where should we have stopped? When is one too many? Even after adding “that one final option”, there would always be a “top issue” in the issue tracker.
+
+However, the time to stop has come. Now that Prettier is mature enough and we see it adopted by so many organizations and projects, the research phase is over. We have enough confidence to conclude that Prettier reached a point where the set of options should be “frozen”. **Option requests aren’t accepted anymore.** We’re thankful to everyone who participated in this difficult journey.
+
+Please note that as option requests are out of scope for Prettier, they will be closed without discussion. The same applies to requests to preserve elements of input formatting (e.g. line breaks) since that’s nothing else but an option in disguise with all the downsides of “real” options. There may be situations where adding an option can’t be avoided because of technical necessity (e.g. compatibility), but for formatting-related options, this is final.

From c0e117939125d72485fbc56ae37dbb7d995457b0 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Thu, 26 Nov 2020 19:29:25 +0200
Subject: [PATCH 121/299] copy option philosophy to stable docs

---
 .../version-stable/option-philosophy.md       | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/website/versioned_docs/version-stable/option-philosophy.md b/website/versioned_docs/version-stable/option-philosophy.md
index 7d3d55f5c..ed53cd2a3 100644
--- a/website/versioned_docs/version-stable/option-philosophy.md
+++ b/website/versioned_docs/version-stable/option-philosophy.md
@@ -4,17 +4,17 @@ title: Option Philosophy
 original_id: option-philosophy
 ---
 
-> Prettier has a few options because of history. **But we don’t want more of them.**
+> Prettier has a few options because of history. **But we won’t add more of them.**
 >
 > Read on to learn more.
 
 Prettier is not a kitchen-sink code formatter that attempts to print your code in any way you wish. It is _opinionated._ Quoting the [Why Prettier?](why-prettier.md) page:
 
-> By far the biggest reason for adopting Prettier is to stop all the on-going debates over styles.
+> By far the biggest reason for adopting Prettier is to stop all the ongoing debates over styles.
 
-The more options Prettier has, the further from the above goal it gets. **The debates over styles just turn into debates over which Prettier options to use.**
+Yet the more options Prettier has, the further from the above goal it gets. **The debates over styles just turn into debates over which Prettier options to use.** Formatting wars break out with renewed vigour: “Which option values are better? Why? Did we make the right choices?”
 
-The issue about [resisting adding configuration](https://github.com/prettier/prettier/issues/40) has more 👍s than any option request issue.
+And it’s not the only cost options have. To learn more about their downsides, see the [issue about resisting adding configuration](https://github.com/prettier/prettier/issues/40), which has more 👍s than any option request issue.
 
 So why are there any options at all?
 
@@ -22,27 +22,18 @@ So why are there any options at all?
 - A couple were added after “great demand.” 🤔
 - Some were added for compatibility reasons. 👍
 
-What we’ve learned during the years is that it’s really hard to measure demand. Prettier has grown _a lot_ in usage. What was “great demand” back in the day is not as much today. How many is many? What about all silent users?
-
-It’s so easy to add “just one more“ option. But where do we stop? When is one too many? There will always be a “top issue” in the issue tracker. Even if we add just that one final option.
-
-The downside of options is that they open up for debate within teams. Which options should we use? Why? Did we make the right choices?
-
-Every option also makes it much harder to say no to new ones. If _those_ options exist, why can’t this one?
-
-We’ve had several users open up option requests only to close them themselves a couple of months later. They had realized that they don’t care at all about that little syntax choice they used to feel so strongly about. Examples: [#3101](https://github.com/prettier/prettier/issues/3101#issuecomment-500927917) and [#5501](https://github.com/prettier/prettier/issues/5501#issuecomment-487025417).
-
-All of this makes the topic of options in Prettier very difficult. And mentally tiring for maintainers. What do people want? What do people _really_ want in 6 months? Are we spending time and energy on the right things?
-
-Some options are easier to motivate:
+Options that are easier to motivate include:
 
 - `--trailing-comma es5` lets you use trailing commas in most environments without having to transpile (trailing function commas were added in ES2017).
-- `--prose-wrap` is important to support all quirky markdown renderers in the wild.
+- `--prose-wrap` is important to support all quirky Markdown renderers in the wild.
 - `--html-whitespace-sensitivity` is needed due to the unfortunate whitespace rules of HTML.
 - `--end-of-line` makes it easier for teams to keep CRLFs out of their git repositories.
 - `--quote-props` is important for advanced usage of the Google Closure Compiler.
 
-But others are harder to motivate in hindsight, and usually end up with bike shedding. `--arrow-parens`,
-`--jsx-single-quote`, `--jsx-bracket-same-line` and `--no-bracket-spacing` are not the type of options we want more of. They exist (and are difficult to remove now), but should not motivate adding more options like them.
+But other options are harder to motivate in hindsight: `--arrow-parens`, `--jsx-single-quote`, `--jsx-bracket-same-line` and `--no-bracket-spacing` are not the type of options we’re happy to have. They cause a lot of [bike-shedding](https://en.wikipedia.org/wiki/Law_of_triviality) in teams, and we’re sorry for that. Difficult to remove now, these options exist as a historical artifact and should not motivate adding more options (“If _those_ options exist, why can’t this one?”).
 
-Feel free to open issues! Prettier isn’t perfect. Many times things can be improved without adding options. But if the issue _does_ seem to need a new option, we’ll generally keep it open, to let people 👍 it and add comments.
+For a long time, we left option requests open in order to let discussions play out and collect feedback. What we’ve learned during those years is that it’s really hard to measure demand. Prettier has grown a lot in usage. What was “great demand” back in the day is not as much today. GitHub reactions and Twitter polls became unrepresentative. What about all silent users? It looked easy to add “just one more” option. But where should we have stopped? When is one too many? Even after adding “that one final option”, there would always be a “top issue” in the issue tracker.
+
+However, the time to stop has come. Now that Prettier is mature enough and we see it adopted by so many organizations and projects, the research phase is over. We have enough confidence to conclude that Prettier reached a point where the set of options should be “frozen”. **Option requests aren’t accepted anymore.** We’re thankful to everyone who participated in this difficult journey.
+
+Please note that as option requests are out of scope for Prettier, they will be closed without discussion. The same applies to requests to preserve elements of input formatting (e.g. line breaks) since that’s nothing else but an option in disguise with all the downsides of “real” options. There may be situations where adding an option can’t be avoided because of technical necessity (e.g. compatibility), but for formatting-related options, this is final.

From e6af1534cdf5534dadf85d6d04442975d1617ab8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Nov 2020 05:47:08 +0000
Subject: [PATCH 122/299] Build(deps-dev): Bump babel-loader from 8.2.1 to
 8.2.2 in /website (#9778)

---
 website/package.json |  2 +-
 website/yarn.lock    | 38 +++++++++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/website/package.json b/website/package.json
index bdfc9adb8..191102641 100644
--- a/website/package.json
+++ b/website/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@babel/preset-react": "7.12.7",
     "@sandhose/prettier-animated-logo": "1.0.3",
-    "babel-loader": "8.2.1",
+    "babel-loader": "8.2.2",
     "concurrently": "5.3.0",
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.0",
diff --git a/website/yarn.lock b/website/yarn.lock
index 0ccd81db8..21df270e2 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1525,15 +1525,14 @@ babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-loader@8.2.1:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.1.tgz#e53313254677e86f27536f5071d807e01d24ec00"
-  integrity sha512-dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==
+babel-loader@8.2.2:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
   dependencies:
-    find-cache-dir "^2.1.0"
+    find-cache-dir "^3.3.1"
     loader-utils "^1.4.0"
-    make-dir "^2.1.0"
-    pify "^4.0.1"
+    make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
 babel-plugin-dynamic-import-node@^2.3.3:
@@ -3235,7 +3234,7 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
+find-cache-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -3244,6 +3243,15 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
+find-cache-dir@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
+  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.2"
+    pkg-dir "^4.1.0"
+
 find-up@3.0.0, find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -4695,6 +4703,13 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
+make-dir@^3.0.2, make-dir@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -5447,7 +5462,7 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-pkg-dir@^4.2.0:
+pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -6391,6 +6406,11 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
+semver@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"

From ce724ef422f2cf631107c9d6aa3234341b977bad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Nov 2020 05:55:33 +0000
Subject: [PATCH 123/299] Build(deps-dev): Bump webpack from 5.6.0 to 5.8.0 in
 /website (#9779)

---
 website/package.json |  2 +-
 website/yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/website/package.json b/website/package.json
index 191102641..62f6b3dd6 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.0",
     "svgo": "1.3.2",
-    "webpack": "5.6.0",
+    "webpack": "5.8.0",
     "webpack-cli": "4.2.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 21df270e2..dca841d63 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -6935,10 +6935,10 @@ tapable@^1.0.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tapable@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.0.0.tgz#a49c3d6a8a2bb606e7db372b82904c970d537a08"
-  integrity sha512-bjzn0C0RWoffnNdTzNi7rNDhs1Zlwk2tRXgk8EiHKAOX1Mag3d6T0Y5zNa7l9CJ+EoUne/0UHdwS8tMbkh9zDg==
+tapable@^2.0.0, tapable@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.1.1.tgz#b01cc1902d42a7bb30514e320ce21c456f72fd3f"
+  integrity sha512-Wib1S8m2wdpLbmQz0RBEVosIyvb/ykfKXf3ZIDqvWoMg/zTNm6G/tDSuUM61J1kNCDXWJrLHGSFeMhAG+gAGpQ==
 
 tar-stream@^1.5.2:
   version "1.6.2"
@@ -7393,10 +7393,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.6.0.tgz#282d10434c403b070ed91d459b385e873b51a07d"
-  integrity sha512-SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA==
+webpack@5.8.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.8.0.tgz#65f00a181708279ff982c2d7338e1dd5505364c4"
+  integrity sha512-X2yosPiHip3L0TE+ylruzrOqSgEgsdGyBOGFWKYChcwlKChaw9VodZIUovG1oo7s0ss6e3ZxBMn9tXR+nkPThA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"
@@ -7418,7 +7418,7 @@ webpack@5.6.0:
     neo-async "^2.6.2"
     pkg-dir "^4.2.0"
     schema-utils "^3.0.0"
-    tapable "^2.0.0"
+    tapable "^2.1.1"
     terser-webpack-plugin "^5.0.3"
     watchpack "^2.0.0"
     webpack-sources "^2.1.1"

From 4e0396b87bcf3b7ec4968a68ff4d1e3ed6d80bcc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Nov 2020 08:04:44 +0000
Subject: [PATCH 124/299] Build(deps-dev): Bump babel-loader from 8.2.1 to
 8.2.2 (#9781)

---
 package.json |  2 +-
 yarn.lock    | 74 +++++++++++-----------------------------------------
 2 files changed, 16 insertions(+), 60 deletions(-)

diff --git a/package.json b/package.json
index 7479d4de3..1a4c8448a 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "@types/node": "14.14.0",
     "@typescript-eslint/types": "4.8.2",
     "babel-jest": "26.6.3",
-    "babel-loader": "8.2.1",
+    "babel-loader": "8.2.2",
     "benchmark": "2.1.4",
     "builtin-modules": "3.1.0",
     "cross-env": "7.0.2",
diff --git a/yarn.lock b/yarn.lock
index ffff03a19..4d2a11058 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1933,15 +1933,14 @@ babel-jest@26.6.3, babel-jest@^26.6.3:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
-babel-loader@8.2.1:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.1.tgz#e53313254677e86f27536f5071d807e01d24ec00"
-  integrity sha512-dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==
+babel-loader@8.2.2:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
   dependencies:
-    find-cache-dir "^2.1.0"
+    find-cache-dir "^3.3.1"
     loader-utils "^1.4.0"
-    make-dir "^2.1.0"
-    pify "^4.0.1"
+    make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
 babel-plugin-dynamic-import-node@^2.3.3:
@@ -3188,7 +3187,6 @@ eslint-plugin-jest@24.1.3:
 
 "eslint-plugin-prettier-internal-rules@link:scripts/tools/eslint-plugin-prettier-internal-rules":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-react@7.21.5:
   version "7.21.5"
@@ -3561,14 +3559,14 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-find-cache-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
-  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+find-cache-dir@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
+  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
   dependencies:
     commondir "^1.0.1"
-    make-dir "^2.0.0"
-    pkg-dir "^3.0.0"
+    make-dir "^3.0.2"
+    pkg-dir "^4.1.0"
 
 find-parent-dir@0.3.0:
   version "0.3.0"
@@ -3582,13 +3580,6 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -5172,14 +5163,6 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -5236,15 +5219,7 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
-make-dir@^2.0.0, make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
-
-make-dir@^3.0.0:
+make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -5683,7 +5658,7 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -5704,13 +5679,6 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -5872,11 +5840,6 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
 pirates@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
@@ -5891,14 +5854,7 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
-pkg-dir@^4.2.0:
+pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==

From 5bbc45971dc16fd1a6446082d9bb658db03d7332 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Nov 2020 08:24:17 +0000
Subject: [PATCH 125/299] Build(deps-dev): Bump webpack from 5.6.0 to 5.8.0
 (#9780)

---
 package.json |  2 +-
 yarn.lock    | 47 +++++++++++------------------------------------
 2 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/package.json b/package.json
index 1a4c8448a..4613ef369 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "synchronous-promise": "2.0.15",
     "tempy": "1.0.0",
     "terser-webpack-plugin": "5.0.3",
-    "webpack": "5.6.0"
+    "webpack": "5.8.0"
   },
   "scripts": {
     "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
diff --git a/yarn.lock b/yarn.lock
index 4d2a11058..b9f859ba2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2076,17 +2076,7 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.14.5:
-  version "4.14.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
-  integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
-  dependencies:
-    caniuse-lite "^1.0.30001135"
-    electron-to-chromium "^1.3.571"
-    escalade "^3.1.0"
-    node-releases "^1.1.61"
-
-browserslist@^4.14.6:
+browserslist@^4.14.5, browserslist@^4.14.6:
   version "4.14.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
   integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
@@ -2149,11 +2139,6 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001135:
-  version "1.0.30001148"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz#dc97c7ed918ab33bf8706ddd5e387287e015d637"
-  integrity sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==
-
 caniuse-lite@^1.0.30001157:
   version "1.0.30001159"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz#bebde28f893fa9594dadcaa7d6b8e2aa0299df20"
@@ -2982,11 +2967,6 @@ editorconfig@0.15.3:
     semver "^5.6.0"
     sigmund "^1.0.1"
 
-electron-to-chromium@^1.3.571:
-  version "1.3.578"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz#e6671936f4571a874eb26e2e833aa0b2c0b776e0"
-  integrity sha512-z4gU6dA1CbBJsAErW5swTGAaU2TBzc2mPAonJb00zqW1rOraDo2zfBMDRvaz9cVic+0JEZiYbHWPw/fTaZlG2Q==
-
 electron-to-chromium@^1.3.591:
   version "1.3.603"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz#1b71bec27fb940eccd79245f6824c63d5f7e8abf"
@@ -3085,7 +3065,7 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-escalade@^3.1.0, escalade@^3.1.1:
+escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
@@ -5435,11 +5415,6 @@ node-notifier@^8.0.0:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.61:
-  version "1.1.61"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
-  integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
-
 node-releases@^1.1.66:
   version "1.1.67"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
@@ -6909,10 +6884,10 @@ table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
-tapable@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.0.0.tgz#a49c3d6a8a2bb606e7db372b82904c970d537a08"
-  integrity sha512-bjzn0C0RWoffnNdTzNi7rNDhs1Zlwk2tRXgk8EiHKAOX1Mag3d6T0Y5zNa7l9CJ+EoUne/0UHdwS8tMbkh9zDg==
+tapable@^2.0.0, tapable@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.1.1.tgz#b01cc1902d42a7bb30514e320ce21c456f72fd3f"
+  integrity sha512-Wib1S8m2wdpLbmQz0RBEVosIyvb/ykfKXf3ZIDqvWoMg/zTNm6G/tDSuUM61J1kNCDXWJrLHGSFeMhAG+gAGpQ==
 
 temp-dir@^2.0.0:
   version "2.0.0"
@@ -7434,10 +7409,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.6.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.6.0.tgz#282d10434c403b070ed91d459b385e873b51a07d"
-  integrity sha512-SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA==
+webpack@5.8.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.8.0.tgz#65f00a181708279ff982c2d7338e1dd5505364c4"
+  integrity sha512-X2yosPiHip3L0TE+ylruzrOqSgEgsdGyBOGFWKYChcwlKChaw9VodZIUovG1oo7s0ss6e3ZxBMn9tXR+nkPThA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"
@@ -7459,7 +7434,7 @@ webpack@5.6.0:
     neo-async "^2.6.2"
     pkg-dir "^4.2.0"
     schema-utils "^3.0.0"
-    tapable "^2.0.0"
+    tapable "^2.1.1"
     terser-webpack-plugin "^5.0.3"
     watchpack "^2.0.0"
     webpack-sources "^2.1.1"

From 00a4798b9042bffcf89d341e60aa6cddc3a14102 Mon Sep 17 00:00:00 2001
From: oebrab <72924639+oebrab@users.noreply.github.com>
Date: Fri, 27 Nov 2020 22:31:37 +0800
Subject: [PATCH 126/299] Add a link to the "Example" part (#9782)

---
 commands.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands.md b/commands.md
index adcbc3f26..3ca932f2d 100644
--- a/commands.md
+++ b/commands.md
@@ -42,7 +42,7 @@ However, if any of the items inside the array have a hard break, the array will
 ];
 ```
 
-Functions always break after the opening curly brace no matter what, so the array breaks as well for consistent formatting. See the implementation of `ArrayExpression` for an example.
+Functions always break after the opening curly brace no matter what, so the array breaks as well for consistent formatting. See [the implementation of `ArrayExpression`](#example) for an example.
 
 ### conditionalGroup
 

From 326543f9082d6d77dec634914c8d4daa8525c7eb Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Sat, 28 Nov 2020 09:21:04 +0900
Subject: [PATCH 127/299] Release 2.2.1

---
 .github/ISSUE_TEMPLATE/formatting.md          |  2 +-
 .github/ISSUE_TEMPLATE/integration.md         |  2 +-
 CHANGELOG.md                                  | 32 +++++++++++++++++++
 docs/browser.md                               | 12 +++----
 package.json                                  |  2 +-
 .../versioned_docs/version-stable/browser.md  | 12 +++----
 6 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/formatting.md b/.github/ISSUE_TEMPLATE/formatting.md
index af8efd889..76c445afc 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.2.0**
+**Prettier 2.2.1**
 [Playground link](https://prettier.io/playground/#.....)
 
 ```sh
diff --git a/.github/ISSUE_TEMPLATE/integration.md b/.github/ISSUE_TEMPLATE/integration.md
index eea91394d..d443f6cbf 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.2.0
+- Prettier Version: 2.2.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 b1d3f6130..49b08b329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+# 2.2.1
+
+[diff](https://github.com/prettier/prettier/compare/2.2.0...2.2.1)
+
+#### Fix formatting for AssignmentExpression with ClassExpression ([#9741](https://github.com/prettier/prettier/pull/9741) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+<!-- prettier-ignore -->
+```js
+// Input
+module.exports = class A extends B {
+  method() {
+    console.log("foo");
+  }
+};
+
+// Prettier 2.2.0
+module.exports = class A extends (
+  B
+) {
+  method() {
+    console.log("foo");
+  }
+};
+
+// Prettier 2.2.1
+module.exports = class A extends B {
+  method() {
+    console.log("foo");
+  }
+};
+```
+
 # 2.2.0
 
 [diff](https://github.com/prettier/prettier/compare/2.1.2...2.2.0)
diff --git a/docs/browser.md b/docs/browser.md
index 92f7a67a7..40e1b67a3 100644
--- a/docs/browser.md
+++ b/docs/browser.md
@@ -23,8 +23,8 @@ See [Usage](#usage) below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@2.2.0/standalone.js"></script>
-<script src="https://unpkg.com/prettier@2.2.0/parser-graphql.js"></script>
+<script src="https://unpkg.com/prettier@2.2.1/standalone.js"></script>
+<script src="https://unpkg.com/prettier@2.2.1/parser-graphql.js"></script>
 <script>
   prettier.format("query { }", {
     parser: "graphql",
@@ -51,8 +51,8 @@ prettier.format("query { }", {
 
 ```js
 define([
-  "https://unpkg.com/prettier@2.2.0/standalone.js",
-  "https://unpkg.com/prettier@2.2.0/parser-graphql.js",
+  "https://unpkg.com/prettier@2.2.1/standalone.js",
+  "https://unpkg.com/prettier@2.2.1/parser-graphql.js",
 ], (prettier, ...plugins) => {
   prettier.format("query { }", { parser: "graphql", plugins });
 });
@@ -71,7 +71,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.2.0/standalone.js");
-importScripts("https://unpkg.com/prettier@2.2.0/parser-graphql.js");
+importScripts("https://unpkg.com/prettier@2.2.1/standalone.js");
+importScripts("https://unpkg.com/prettier@2.2.1/parser-graphql.js");
 prettier.format("query { }", { parser: "graphql", plugins: prettierPlugins });
 ```
diff --git a/package.json b/package.json
index fd7478a6e..57756ce72 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.3.0-dev",
+  "version": "2.2.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 9d4f8ad45..f4283f763 100644
--- a/website/versioned_docs/version-stable/browser.md
+++ b/website/versioned_docs/version-stable/browser.md
@@ -24,8 +24,8 @@ See [Usage](#usage) below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@2.2.0/standalone.js"></script>
-<script src="https://unpkg.com/prettier@2.2.0/parser-graphql.js"></script>
+<script src="https://unpkg.com/prettier@2.2.1/standalone.js"></script>
+<script src="https://unpkg.com/prettier@2.2.1/parser-graphql.js"></script>
 <script>
   prettier.format("query { }", {
     parser: "graphql",
@@ -52,8 +52,8 @@ prettier.format("query { }", {
 
 ```js
 define([
-  "https://unpkg.com/prettier@2.2.0/standalone.js",
-  "https://unpkg.com/prettier@2.2.0/parser-graphql.js",
+  "https://unpkg.com/prettier@2.2.1/standalone.js",
+  "https://unpkg.com/prettier@2.2.1/parser-graphql.js",
 ], (prettier, ...plugins) => {
   prettier.format("query { }", { parser: "graphql", plugins });
 });
@@ -72,7 +72,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.2.0/standalone.js");
-importScripts("https://unpkg.com/prettier@2.2.0/parser-graphql.js");
+importScripts("https://unpkg.com/prettier@2.2.1/standalone.js");
+importScripts("https://unpkg.com/prettier@2.2.1/parser-graphql.js");
 prettier.format("query { }", { parser: "graphql", plugins: prettierPlugins });
 ```

From 80961835a68e3de1b14819a7b77583a54d2b63d7 Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Sat, 28 Nov 2020 09:26:36 +0900
Subject: [PATCH 128/299] Bump Prettier dependency to 2.2.1

---
 package.json | 4 ++--
 yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 57756ce72..f3599af64 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.2.1",
+  "version": "2.3.0-dev",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin/prettier.js",
   "repository": "prettier/prettier",
@@ -119,7 +119,7 @@
     "jest-watch-typeahead": "0.6.1",
     "npm-run-all": "4.1.5",
     "path-browserify": "1.0.1",
-    "prettier": "2.2.0",
+    "prettier": "2.2.1",
     "rimraf": "3.0.2",
     "rollup": "2.33.3",
     "rollup-plugin-node-globals": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 0baa4dc83..70b14a422 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5952,10 +5952,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.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b"
-  integrity sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==
+prettier@2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
+  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
 pretty-format@^26.1.0:
   version "26.1.0"

From 2df72775013fcb3f09c040f897faeafface23238 Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Sat, 28 Nov 2020 09:26:36 +0900
Subject: [PATCH 129/299] Git blame ignore 2.2.1

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index f513724fa..85040b22c 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -5,6 +5,8 @@
 # See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
 
 # Prettier bump after release
+# 2.2.1
+80961835a68e3de1b14819a7b77583a54d2b63d7
 # 2.2.0
 cf354c205de9841a2d306387473dac369359ca2b
 # 2.1.2

From de00bf1018e36e3651b9356b435759bdca6d9054 Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Sat, 28 Nov 2020 09:26:43 +0900
Subject: [PATCH 130/299] Update dependents count

---
 website/pages/en/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index c2b451f45..2737d81a6 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -297,7 +297,7 @@ const UsersSection = ({ language }) => {
             <div style={{ marginLeft: ".7em", width: "260px" }}>
               <p>
                 More than{" "}
-                <strong data-placeholder="dependent-github">2.2 million</strong>{" "}
+                <strong data-placeholder="dependent-github">2.3 million</strong>{" "}
                 dependent repositories on GitHub
               </p>
               <Button href="https://github.com/prettier/prettier/network/dependents">

From eb7972a86de3980fdcc23f123410ddc5f676fc7c Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Sat, 28 Nov 2020 09:39:51 +0900
Subject: [PATCH 131/299] Clean changelog_unreleased for patch-release

---
 changelog_unreleased/javascript/9741.md | 27 -------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 changelog_unreleased/javascript/9741.md

diff --git a/changelog_unreleased/javascript/9741.md b/changelog_unreleased/javascript/9741.md
deleted file mode 100644
index 94caafe8c..000000000
--- a/changelog_unreleased/javascript/9741.md
+++ /dev/null
@@ -1,27 +0,0 @@
-#### Fix formatting for AssignmentExpression with ClassExpression (#9741 by @sosukesuzuki)
-
-<!-- prettier-ignore -->
-```js
-// Input
-module.exports = class A extends B {
-  method() {
-    console.log("foo");
-  }
-};
-
-// Prettier stable
-module.exports = class A extends (
-  B
-) {
-  method() {
-    console.log("foo");
-  }
-};
-
-// Prettier master
-module.exports = class A extends B {
-  method() {
-    console.log("foo");
-  }
-};
-```

From 9ee97183a0090118e573133b2889ea0edb44e1e6 Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Sat, 28 Nov 2020 09:46:33 +0900
Subject: [PATCH 132/299] Clean changelog_unreleased for patch-release

---
 changelog_unreleased/javascript/pr-9741.md | 27 ----------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 changelog_unreleased/javascript/pr-9741.md

diff --git a/changelog_unreleased/javascript/pr-9741.md b/changelog_unreleased/javascript/pr-9741.md
deleted file mode 100644
index 94caafe8c..000000000
--- a/changelog_unreleased/javascript/pr-9741.md
+++ /dev/null
@@ -1,27 +0,0 @@
-#### Fix formatting for AssignmentExpression with ClassExpression (#9741 by @sosukesuzuki)
-
-<!-- prettier-ignore -->
-```js
-// Input
-module.exports = class A extends B {
-  method() {
-    console.log("foo");
-  }
-};
-
-// Prettier stable
-module.exports = class A extends (
-  B
-) {
-  method() {
-    console.log("foo");
-  }
-};
-
-// Prettier master
-module.exports = class A extends B {
-  method() {
-    console.log("foo");
-  }
-};
-```

From 8d01b3c11bc15e330b8ecb4c762c62e777aa3875 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 28 Nov 2020 12:41:44 +0800
Subject: [PATCH 133/299] Build(deps-dev): Bump @babel/core from 7.12.8 to
 7.12.9 (#9774)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.12.8 to 7.12.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.9/packages/babel-core)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 4e10f6e44..6f6120dd0 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "yaml-unist-parser": "1.3.1"
   },
   "devDependencies": {
-    "@babel/core": "7.12.8",
+    "@babel/core": "7.12.9",
     "@babel/preset-env": "7.12.7",
     "@babel/types": "7.12.7",
     "@glimmer/reference": "0.67.0",
diff --git a/yarn.lock b/yarn.lock
index b047b3dc1..0f6fa3fa6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,10 +28,10 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
   integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
-"@babel/core@7.12.8", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.12.8"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.8.tgz#8ad76c1a7d2a6a3beecc4395fa4f7b4cb88390e6"
-  integrity sha512-ra28JXL+5z73r1IC/t+FT1ApXU5LsulFDnTDntNfLQaScJUJmcHL5Qxm/IWanCToQk3bPWQo5bflbplU5r15pg==
+"@babel/core@7.12.9", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
+  version "7.12.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
+  integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/generator" "^7.12.5"
@@ -39,7 +39,7 @@
     "@babel/helpers" "^7.12.5"
     "@babel/parser" "^7.12.7"
     "@babel/template" "^7.12.7"
-    "@babel/traverse" "^7.12.8"
+    "@babel/traverse" "^7.12.9"
     "@babel/types" "^7.12.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
@@ -835,10 +835,10 @@
     "@babel/parser" "^7.12.7"
     "@babel/types" "^7.12.7"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.8", "@babel/traverse@^7.7.0":
-  version "7.12.8"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.8.tgz#c1c2983bf9ba0f4f0eaa11dff7e77fa63307b2a4"
-  integrity sha512-EIRQXPTwFEGRZyu6gXbjfpNORN1oZvwuzJbxcXjAgWV0iqXYDszN1Hx3FVm6YgZfu1ZQbCVAk3l+nIw95Xll9Q==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.7.0":
+  version "7.12.9"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f"
+  integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/generator" "^7.12.5"

From 902d524d2f1776efe0b110c1a24813d4d7fcb9d0 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 30 Nov 2020 12:23:20 +0800
Subject: [PATCH 134/299] Treat `.prettierrc` as yaml (#8105)

---
 changelog_unreleased/api/8105.md              |  3 +
 src/language-js/index.js                      |  1 -
 src/language-yaml/embed.js                    | 16 +++
 src/language-yaml/index.js                    |  5 +-
 src/language-yaml/printer-yaml.js             |  2 +
 .../__snapshots__/jsfmt.spec.js.snap          | 99 +++++++++++++++++++
 tests/misc/parser-inference/jsfmt.spec.js     | 55 ++++++++++-
 .../__snapshots__/support-info.js.snap        | 11 ++-
 8 files changed, 186 insertions(+), 6 deletions(-)
 create mode 100644 changelog_unreleased/api/8105.md
 create mode 100644 src/language-yaml/embed.js

diff --git a/changelog_unreleased/api/8105.md b/changelog_unreleased/api/8105.md
new file mode 100644
index 000000000..715e6a7e6
--- /dev/null
+++ b/changelog_unreleased/api/8105.md
@@ -0,0 +1,3 @@
+#### Treat `.prettierrc` as `yaml` (#8105 by @fisker)
+
+`.prettierrc` file can written in both JSON and YAML, previously we infer the parser to be `json`, if it's write in YAML, there will be a `SyntaxError` thrown when formatting it, now it's treat as a YAML file, but if it's write in JSON, it won't format as a normal YAML file, it will be formatted as JSON.
diff --git a/src/language-js/index.js b/src/language-js/index.js
index f6e9c3c00..dd35ccd6c 100644
--- a/src/language-js/index.js
+++ b/src/language-js/index.js
@@ -72,7 +72,6 @@ const languages = [
     since: "1.5.0",
     parsers: ["json"],
     vscodeLanguageIds: ["json"],
-    filenames: [...data.filenames, ".prettierrc"],
     extensions: data.extensions.filter((extension) => extension !== ".jsonl"),
   })),
   createLanguage(
diff --git a/src/language-yaml/embed.js b/src/language-yaml/embed.js
new file mode 100644
index 000000000..cf246b8e0
--- /dev/null
+++ b/src/language-yaml/embed.js
@@ -0,0 +1,16 @@
+"use strict";
+
+function embed(path, print, textToDoc, options) {
+  const node = path.getValue();
+
+  // Try to format `.prettierrc` as `json` first
+  if (
+    node.type === "root" &&
+    options.filepath &&
+    /(?:[/\\]|^)\.prettierrc$/.test(options.filepath)
+  ) {
+    return textToDoc(options.originalText, { ...options, parser: "json" });
+  }
+}
+
+module.exports = embed;
diff --git a/src/language-yaml/index.js b/src/language-yaml/index.js
index 158de2d73..7205e75d8 100644
--- a/src/language-yaml/index.js
+++ b/src/language-yaml/index.js
@@ -10,7 +10,10 @@ const languages = [
     parsers: ["yaml"],
     vscodeLanguageIds: ["yaml", "ansible", "home-assistant"],
     // yarn.lock is not YAML: https://github.com/yarnpkg/yarn/issues/5629
-    filenames: data.filenames.filter((filename) => filename !== "yarn.lock"),
+    filenames: [
+      ...data.filenames.filter((filename) => filename !== "yarn.lock"),
+      ".prettierrc",
+    ],
   })),
 ];
 
diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js
index 4177c3b3e..f1dbd538c 100644
--- a/src/language-yaml/printer-yaml.js
+++ b/src/language-yaml/printer-yaml.js
@@ -21,6 +21,7 @@ const {
 const { replaceEndOfLineWith, isPreviousLineEmpty } = require("../common/util");
 const { insertPragma, isPragma } = require("./pragma");
 const { locStart } = require("./loc");
+const embed = require("./embed");
 const {
   getAncestorCount,
   getBlockValueLineContents,
@@ -777,6 +778,7 @@ function clean(node, newNode /*, parent */) {
 
 module.exports = {
   preprocess,
+  embed,
   print: genericPrint,
   massageAstNode: clean,
   insertPragma,
diff --git a/tests/misc/parser-inference/__snapshots__/jsfmt.spec.js.snap b/tests/misc/parser-inference/__snapshots__/jsfmt.spec.js.snap
index 6eee49e58..bf65bfdd2 100644
--- a/tests/misc/parser-inference/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/parser-inference/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,104 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`snippet: .prettierrc in json format 1`] = `
+====================================options=====================================
+parsers: []
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+{"printWidth": 100,
+"overrides": [
+  {"files": ".prettierrc",
+    "options": {"parser": "json"
+  }},
+  {"files": "*.js",
+    "options": {"parser": "babel",
+  "singleQuote": true,"printWidth": 80,"semi":
+false,
+"quoteProps": "as-needed"
+  }}
+]}
+=====================================output=====================================
+{
+  "printWidth": 100,
+  "overrides": [
+    { "files": ".prettierrc", "options": { "parser": "json" } },
+    {
+      "files": "*.js",
+      "options": {
+        "parser": "babel",
+        "singleQuote": true,
+        "printWidth": 80,
+        "semi": false,
+        "quoteProps": "as-needed"
+      }
+    }
+  ]
+}
+
+================================================================================
+`;
+
+exports[`snippet: .prettierrc in json(empty) format 1`] = `
+====================================options=====================================
+parsers: []
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+{}
+=====================================output=====================================
+{}
+
+================================================================================
+`;
+
+exports[`snippet: .prettierrc in yaml (with flowMapping) format 1`] = `
+====================================options=====================================
+parsers: []
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+# comment
+printWidth: 100
+overrides: {
+  "files": [".prettierrc", "prettierrc.json"],
+  "options": { "parser": "json"}
+}
+=====================================output=====================================
+# comment
+printWidth: 100
+overrides:
+  {
+    "files": [".prettierrc", "prettierrc.json"],
+    "options": { "parser": "json" },
+  }
+
+================================================================================
+`;
+
+exports[`snippet: .prettierrc in yaml format 1`] = `
+====================================options=====================================
+parsers: []
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+# comment
+printWidth: 100
+overrides:
+  - files: '.prettierrc'
+    options:
+      parser: "json"
+=====================================output=====================================
+# comment
+printWidth: 100
+overrides:
+  - files: ".prettierrc"
+    options:
+      parser: "json"
+
+================================================================================
+`;
+
 exports[`test.html format 1`] = `
 ====================================options=====================================
 parsers: []
diff --git a/tests/misc/parser-inference/jsfmt.spec.js b/tests/misc/parser-inference/jsfmt.spec.js
index 989047bcc..19c432041 100644
--- a/tests/misc/parser-inference/jsfmt.spec.js
+++ b/tests/misc/parser-inference/jsfmt.spec.js
@@ -1 +1,54 @@
-run_spec(__dirname);
+const { outdent } = require("outdent");
+
+run_spec({
+  dirname: __dirname,
+  snippets: [
+    {
+      name: ".prettierrc in json(empty)",
+      filename: ".prettierrc",
+      code: "{}",
+    },
+    {
+      name: ".prettierrc in json",
+      filename: "path/to/.prettierrc",
+      code: outdent`
+        {"printWidth": 100,
+        "overrides": [
+          {"files": ".prettierrc",
+            "options": {"parser": "json"
+          }},
+          {"files": "*.js",
+            "options": {"parser": "babel",
+          "singleQuote": true,"printWidth": 80,"semi":
+        false,
+        "quoteProps": "as-needed"
+          }}
+        ]}
+      `,
+    },
+    {
+      name: ".prettierrc in yaml",
+      filename: ".prettierrc",
+      code: outdent`
+        # comment
+        printWidth: 100
+        overrides:
+          - files: '.prettierrc'
+            options:
+              parser: "json"
+      `,
+    },
+    {
+      name: ".prettierrc in yaml (with flowMapping)",
+      filename: ".prettierrc",
+      code: outdent`
+        # comment
+        printWidth: 100
+        overrides: {
+          "files": [".prettierrc", "prettierrc.json"],
+          "options": { "parser": "json"}
+        }
+      `,
+    },
+  ],
+});
diff --git a/tests_integration/__tests__/__snapshots__/support-info.js.snap b/tests_integration/__tests__/__snapshots__/support-info.js.snap
index b368e7d1e..c15621810 100644
--- a/tests_integration/__tests__/__snapshots__/support-info.js.snap
+++ b/tests_integration/__tests__/__snapshots__/support-info.js.snap
@@ -456,8 +456,7 @@ exports[`CLI --support-info (stdout) 1`] = `
         \\".tern-project\\",
         \\".watchmanconfig\\",
         \\"composer.lock\\",
-        \\"mcmod.info\\",
-        \\".prettierrc\\"
+        \\"mcmod.info\\"
       ],
       \\"linguistLanguageId\\": 174,
       \\"name\\": \\"JSON\\",
@@ -720,7 +719,13 @@ exports[`CLI --support-info (stdout) 1`] = `
         \\".yaml.sed\\",
         \\".yml.mysql\\"
       ],
-      \\"filenames\\": [\\".clang-format\\", \\".clang-tidy\\", \\".gemrc\\", \\"glide.lock\\"],
+      \\"filenames\\": [
+        \\".clang-format\\",
+        \\".clang-tidy\\",
+        \\".gemrc\\",
+        \\"glide.lock\\",
+        \\".prettierrc\\"
+      ],
       \\"linguistLanguageId\\": 407,
       \\"name\\": \\"YAML\\",
       \\"parsers\\": [\\"yaml\\"],

From 05d20a63a4c91d93cc016f205dc40fb2b86140af Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 30 Nov 2020 12:29:48 +0800
Subject: [PATCH 135/299] Exclude node at `rangeStart` (#9704)

---
 changelog_unreleased/javascript/9704.md       |  19 +++
 src/main/core.js                              |   7 +
 src/main/range-util.js                        |  76 +++++++----
 .../js/range/__snapshots__/jsfmt.spec.js.snap | 120 ++++++++++++++++++
 tests/js/range/boundary-2.js                  |  10 ++
 tests/js/range/boundary-3.js                  |   6 +
 tests/js/range/boundary.js                    |   4 +
 tests/js/range/reversed-range.js              |   2 +
 tests/js/range/start-equals-end.js            |   2 +
 tests_config/run_spec.js                      |  21 ++-
 tests_config/utils/visualize-range.js         |   7 +-
 11 files changed, 245 insertions(+), 29 deletions(-)
 create mode 100644 changelog_unreleased/javascript/9704.md
 create mode 100644 tests/js/range/boundary-2.js
 create mode 100644 tests/js/range/boundary-3.js
 create mode 100644 tests/js/range/boundary.js
 create mode 100644 tests/js/range/reversed-range.js
 create mode 100644 tests/js/range/start-equals-end.js

diff --git a/changelog_unreleased/javascript/9704.md b/changelog_unreleased/javascript/9704.md
new file mode 100644
index 000000000..014c7204b
--- /dev/null
+++ b/changelog_unreleased/javascript/9704.md
@@ -0,0 +1,19 @@
+#### Fix node ends at `rangeStart` was formatted (#9704 by @fisker)
+
+Previously a node ends at `rangeStart` in considered in range, now it's excluded.
+
+<!-- prettier-ignore -->
+```js
+// Prettier stable
+foo = 1.0000;bar = 1.0000;baz=1.0000;
+             ^^^^^^^^^^^^^ Range
+
+// Prettier stable
+foo = 1.0;
+bar = 1.0;baz=1.0000;
+
+// Prettier master
+foo = 1.0000;bar = 1.0;baz=1.0000;
+```
+
+_This effect other languages support range format too._
diff --git a/src/main/core.js b/src/main/core.js
index 8ad34c4ec..e4e8cf99f 100644
--- a/src/main/core.js
+++ b/src/main/core.js
@@ -278,6 +278,13 @@ function format(originalText, originalOptions) {
     normalizeOptions(originalOptions)
   );
 
+  if (options.rangeStart >= options.rangeEnd && text !== "") {
+    return {
+      formatted: originalText,
+      cursorOffset: originalOptions.cursorOffset,
+    };
+  }
+
   const selectedParser = parser.resolveParser(options);
   const hasPragma = !selectedParser.hasPragma || selectedParser.hasPragma(text);
   if (options.requirePragma && !hasPragma) {
diff --git a/src/main/range-util.js b/src/main/range-util.js
index 344926dd0..20860a0a1 100644
--- a/src/main/range-util.js
+++ b/src/main/range-util.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const assert = require("assert");
 const comments = require("./comments");
 
 function findSiblingAncestors(startNodeAndParents, endNodeAndParents, opts) {
@@ -43,8 +44,24 @@ function findSiblingAncestors(startNodeAndParents, endNodeAndParents, opts) {
   };
 }
 
-function findNodeAtOffset(node, offset, options, predicate, parentNodes = []) {
-  if (offset < options.locStart(node) || offset > options.locEnd(node)) {
+function findNodeAtOffset(
+  node,
+  offset,
+  options,
+  predicate,
+  parentNodes = [],
+  type
+) {
+  const { locStart, locEnd } = options;
+  const start = locStart(node);
+  const end = locEnd(node);
+
+  if (
+    offset > end ||
+    offset < start ||
+    (type === "rangeEnd" && offset === start) ||
+    (type === "rangeStart" && offset === end)
+  ) {
     return;
   }
 
@@ -54,7 +71,8 @@ function findNodeAtOffset(node, offset, options, predicate, parentNodes = []) {
       offset,
       options,
       predicate,
-      [node, ...parentNodes]
+      [node, ...parentNodes],
+      type
     );
     if (childResult) {
       return childResult;
@@ -133,37 +151,41 @@ function isSourceElement(opts, node) {
 }
 
 function calculateRange(text, opts, ast) {
+  let { rangeStart: start, rangeEnd: end, locStart, locEnd } = opts;
+  assert.ok(end > start);
   // Contract the range so that it has non-whitespace characters at its endpoints.
   // This ensures we can format a range that doesn't end on a node.
-  const rangeStringOrig = text.slice(opts.rangeStart, opts.rangeEnd);
-  const startNonWhitespace = Math.max(
-    opts.rangeStart + rangeStringOrig.search(/\S/),
-    opts.rangeStart
-  );
-  let endNonWhitespace;
-  for (
-    endNonWhitespace = opts.rangeEnd;
-    endNonWhitespace > opts.rangeStart;
-    --endNonWhitespace
-  ) {
-    if (/\S/.test(text[endNonWhitespace - 1])) {
-      break;
+  const firstNonWhitespaceCharacterIndex = text.slice(start, end).search(/\S/);
+  const isAllWhitespace = firstNonWhitespaceCharacterIndex === -1;
+  if (!isAllWhitespace) {
+    start += firstNonWhitespaceCharacterIndex;
+    for (; end > start; --end) {
+      if (/\S/.test(text[end - 1])) {
+        break;
+      }
     }
   }
 
   const startNodeAndParents = findNodeAtOffset(
     ast,
-    startNonWhitespace,
+    start,
     opts,
-    (node) => isSourceElement(opts, node)
+    (node) => isSourceElement(opts, node),
+    [],
+    "rangeStart"
   );
-  const endNodeAndParents = findNodeAtOffset(
-    ast,
-    endNonWhitespace,
-    opts,
-    (node) => isSourceElement(opts, node)
-  );
-
+  const endNodeAndParents =
+    // No need find Node at `end`, it will be the same as `startNodeAndParents`
+    isAllWhitespace
+      ? startNodeAndParents
+      : findNodeAtOffset(
+          ast,
+          end,
+          opts,
+          (node) => isSourceElement(opts, node),
+          [],
+          "rangeEnd"
+        );
   if (!startNodeAndParents || !endNodeAndParents) {
     return {
       rangeStart: 0,
@@ -178,8 +200,8 @@ function calculateRange(text, opts, ast) {
   );
 
   return {
-    rangeStart: Math.min(opts.locStart(startNode), opts.locStart(endNode)),
-    rangeEnd: Math.max(opts.locEnd(startNode), opts.locEnd(endNode)),
+    rangeStart: Math.min(locStart(startNode), locStart(endNode)),
+    rangeEnd: Math.max(locEnd(startNode), locEnd(endNode)),
   };
 }
 
diff --git a/tests/js/range/__snapshots__/jsfmt.spec.js.snap b/tests/js/range/__snapshots__/jsfmt.spec.js.snap
index 339cca526..4378d8da2 100644
--- a/tests/js/range/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/range/__snapshots__/jsfmt.spec.js.snap
@@ -26,6 +26,88 @@ a = [, , , , , , , a];
 ================================================================================
 `;
 
+exports[`boundary.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+rangeEnd: 26
+rangeStart: 13
+     |                                                                                | printWidth
+=====================================input======================================
+> 1 | foo = 1.0000;bar = 1.0000;baz=1.0000;
+    |              ^^^^^^^^^^^^^
+  2 | // The range will be 13~26
+  3 | // \`foo\` ends at 13, should not format
+  4 | // \`bar\` ends at 26, should format
+  5 | 
+=====================================output=====================================
+foo = 1.0000;bar = 1.0;baz=1.0000;
+// The range will be 13~26
+// \`foo\` ends at 13, should not format
+// \`bar\` ends at 26, should format
+
+================================================================================
+`;
+
+exports[`boundary-2.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+rangeEnd: 45
+rangeStart: 28
+      |                                                                                | printWidth
+=====================================input======================================
+   1 | function a(
+   2 | ){
+   3 | a (
+   4 | );
+   5 | b (
+>  6 | );                 c (
+     |   ^^^^^^^^^^^^^^^^^
+   7 | ); d(
+   8 | );
+   9 | 
+  10 | }
+  11 | 
+=====================================output=====================================
+function a(
+){
+  a();
+  b();
+  c();
+  d();
+}
+
+================================================================================
+`;
+
+exports[`boundary-3.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+rangeEnd: 30
+rangeStart: 13
+     |                                                                                | printWidth
+=====================================input======================================
+  1 | a (
+  2 | );
+  3 | b (
+> 4 | );                 c (
+    |   ^^^^^^^^^^^^^^^^^
+  5 | ); d(
+  6 | );
+  7 | 
+=====================================output=====================================
+a (
+);
+b (
+);                 c (
+); d(
+);
+
+================================================================================
+`;
+
 exports[`class-declaration.js format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]
@@ -851,6 +933,44 @@ call(
 ================================================================================
 `;
 
+exports[`reversed-range.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+rangeEnd: 13
+rangeStart: 26
+     |                                                                                | printWidth
+=====================================input======================================
+> 1 | foo = 1.0000;bar = 1.0000;baz=1.0000;
+    |              ^^^^^^^^^^^^^ [Reversed range]
+  2 | // The range will be 26~13, should not format anything
+  3 | 
+=====================================output=====================================
+foo = 1.0000;bar = 1.0000;baz=1.0000;
+// The range will be 26~13, should not format anything
+
+================================================================================
+`;
+
+exports[`start-equals-end.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+rangeEnd: 13
+rangeStart: 13
+     |                                                                                | printWidth
+=====================================input======================================
+> 1 | foo = 1.0000;bar = 1.0000;baz=1.0000;
+    |              ^
+  2 | // The range will be 13~13, should not format anything
+  3 | 
+=====================================output=====================================
+foo = 1.0000;bar = 1.0000;baz=1.0000;
+// The range will be 13~13, should not format anything
+
+================================================================================
+`;
+
 exports[`try-catch.js format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]
diff --git a/tests/js/range/boundary-2.js b/tests/js/range/boundary-2.js
new file mode 100644
index 000000000..6b94539a8
--- /dev/null
+++ b/tests/js/range/boundary-2.js
@@ -0,0 +1,10 @@
+function a(
+){
+a (
+);
+b (
+);<<<PRETTIER_RANGE_START>>>                 <<<PRETTIER_RANGE_END>>>c (
+); d(
+);
+
+}
diff --git a/tests/js/range/boundary-3.js b/tests/js/range/boundary-3.js
new file mode 100644
index 000000000..32c8512f8
--- /dev/null
+++ b/tests/js/range/boundary-3.js
@@ -0,0 +1,6 @@
+a (
+);
+b (
+);<<<PRETTIER_RANGE_START>>>                 <<<PRETTIER_RANGE_END>>>c (
+); d(
+);
diff --git a/tests/js/range/boundary.js b/tests/js/range/boundary.js
new file mode 100644
index 000000000..ce9ff23f6
--- /dev/null
+++ b/tests/js/range/boundary.js
@@ -0,0 +1,4 @@
+foo = 1.0000;<<<PRETTIER_RANGE_START>>>bar = 1.0000;<<<PRETTIER_RANGE_END>>>baz=1.0000;
+// The range will be 13~26
+// `foo` ends at 13, should not format
+// `bar` ends at 26, should format
diff --git a/tests/js/range/reversed-range.js b/tests/js/range/reversed-range.js
new file mode 100644
index 000000000..0fe95737a
--- /dev/null
+++ b/tests/js/range/reversed-range.js
@@ -0,0 +1,2 @@
+foo = 1.0000;<<<PRETTIER_RANGE_END>>>bar = 1.0000;<<<PRETTIER_RANGE_START>>>baz=1.0000;
+// The range will be 26~13, should not format anything
diff --git a/tests/js/range/start-equals-end.js b/tests/js/range/start-equals-end.js
new file mode 100644
index 000000000..65d3ca905
--- /dev/null
+++ b/tests/js/range/start-equals-end.js
@@ -0,0 +1,2 @@
+foo = 1.0000;<<<PRETTIER_RANGE_START>>><<<PRETTIER_RANGE_END>>>bar = 1.0000;baz=1.0000;
+// The range will be 13~13, should not format anything
diff --git a/tests_config/run_spec.js b/tests_config/run_spec.js
index d2e2a1f04..6887e6162 100644
--- a/tests_config/run_spec.js
+++ b/tests_config/run_spec.js
@@ -334,7 +334,7 @@ function runTest({
     });
   }
 
-  if (!code.includes("\r") && !formatOptions.requirePragma) {
+  if (!shouldSkipEolTest(code, formatResult.options)) {
     for (const eol of ["\r\n", "\r"]) {
       test(`[${parser}] EOL ${JSON.stringify(eol)}`, () => {
         const output = format(code.replace(/\n/g, eol), formatOptions)
@@ -361,6 +361,25 @@ function runTest({
   }
 }
 
+function shouldSkipEolTest(code, options) {
+  if (code.includes("\r")) {
+    return true;
+  }
+  const { requirePragma, rangeStart, rangeEnd } = options;
+  if (requirePragma) {
+    return true;
+  }
+
+  if (
+    typeof rangeStart === "number" &&
+    typeof rangeEnd === "number" &&
+    rangeStart >= rangeEnd
+  ) {
+    return true;
+  }
+  return false;
+}
+
 function parse(source, options) {
   return prettier.__debug.parse(source, options, /* massage */ true).ast;
 }
diff --git a/tests_config/utils/visualize-range.js b/tests_config/utils/visualize-range.js
index d0e362814..d8125a06a 100644
--- a/tests_config/utils/visualize-range.js
+++ b/tests_config/utils/visualize-range.js
@@ -5,6 +5,9 @@ const { codeFrameColumns } = require("@babel/code-frame");
 const codeFrameColumnsOptions = { linesAbove: Infinity, linesBelow: Infinity };
 
 const locationForRange = (text, rangeStart, rangeEnd) => {
+  if (rangeStart > rangeEnd) {
+    [rangeStart, rangeEnd] = [rangeEnd, rangeStart];
+  }
   const lines = new LinesAndColumns(text);
   const start = lines.locationForIndex(rangeStart);
   const end = lines.locationForIndex(rangeEnd);
@@ -26,7 +29,9 @@ const visualizeRange = (text, { rangeStart = 0, rangeEnd = text.length }) =>
   codeFrameColumns(
     text,
     locationForRange(text, rangeStart, rangeEnd),
-    codeFrameColumnsOptions
+    rangeStart > rangeEnd
+      ? { ...codeFrameColumnsOptions, message: "[Reversed range]" }
+      : codeFrameColumnsOptions
   );
 
 module.exports = visualizeRange;

From f59eacd7f63e8bc12546e71f91822afc953beae5 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 30 Nov 2020 13:51:49 +0800
Subject: [PATCH 136/299] JS: Fix multiple-comments-on-same-line format (#9672)

Co-authored-by: Georgii Dolzhykov <thorn.mailbox@gmail.com>
---
 changelog_unreleased/javascript/9672.md       |  27 +
 src/main/comments.js                          |  95 ++-
 .../comments/__snapshots__/jsfmt.spec.js.snap | 694 ++++++++++++++++++
 tests/js/comments/issue-3532.js               |  41 ++
 tests/js/comments/issue-7724.js               |  18 +
 .../comments/multi-comments-on-same-line-2.js |   2 +
 .../comments/multi-comments-on-same-line.js   |  89 +++
 7 files changed, 949 insertions(+), 17 deletions(-)
 create mode 100644 changelog_unreleased/javascript/9672.md
 create mode 100644 tests/js/comments/issue-3532.js
 create mode 100644 tests/js/comments/issue-7724.js
 create mode 100644 tests/js/comments/multi-comments-on-same-line-2.js
 create mode 100644 tests/js/comments/multi-comments-on-same-line.js

diff --git a/changelog_unreleased/javascript/9672.md b/changelog_unreleased/javascript/9672.md
new file mode 100644
index 000000000..58fc5c2b7
--- /dev/null
+++ b/changelog_unreleased/javascript/9672.md
@@ -0,0 +1,27 @@
+#### Improve comment format (#9672 by @fisker)
+
+When multiple comments on same line, the result became unstable.
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+a;
+/*1*//*2*/
+/*3*/
+b;
+
+// Prettier stable
+a; /*2*/
+/*1*/ /*3*/
+b;
+
+// Prettier stable (second format)
+a; /*2*/ /*3*/
+/*1*/ b;
+
+// Prettier master
+a;
+/*1*/ /*2*/
+/*3*/
+b;
+```
diff --git a/src/main/comments.js b/src/main/comments.js
index c5c0931e5..57db1e932 100644
--- a/src/main/comments.js
+++ b/src/main/comments.js
@@ -187,7 +187,27 @@ function attach(comments, ast, text, options) {
     remaining: handleRemainingComment = returnFalse,
   } = handleComments;
 
-  comments.forEach((comment, i) => {
+  const decoratedComments = comments.map((comment, index) => ({
+    ...decorateComment(ast, comment, options),
+    comment,
+    text,
+    options,
+    ast,
+    isLastComment: comments.length - 1 === index,
+  }));
+
+  decoratedComments.forEach((context, index) => {
+    const {
+      comment,
+      precedingNode,
+      enclosingNode,
+      followingNode,
+      text,
+      options,
+      ast,
+      isLastComment,
+    } = context;
+
     if (
       options.parser === "json" ||
       options.parser === "json5" ||
@@ -204,20 +224,6 @@ function attach(comments, ast, text, options) {
       }
     }
 
-    const isLastComment = comments.length - 1 === i;
-    const decorated = decorateComment(ast, comment, options);
-    const { precedingNode, enclosingNode, followingNode } = decorated;
-    const context = {
-      comment,
-      precedingNode,
-      enclosingNode,
-      followingNode,
-      text,
-      options,
-      ast,
-      isLastComment,
-    };
-
     let args;
     if (avoidAstMutation) {
       args = [context];
@@ -228,7 +234,7 @@ function attach(comments, ast, text, options) {
       args = [comment, text, options, ast, isLastComment];
     }
 
-    if (hasNewline(text, locStart(comment), { backwards: true })) {
+    if (isOwnLineComment(text, options, decoratedComments, index)) {
       // If a comment exists on its own line, prefer a leading comment.
       // We also need to check if it's the first line of the file.
       if (handleOwnLineComment(...args)) {
@@ -245,7 +251,7 @@ function attach(comments, ast, text, options) {
         /* istanbul ignore next */
         addDanglingComment(ast, comment);
       }
-    } else if (hasNewline(text, locEnd(comment))) {
+    } else if (isEndOfLineComment(text, options, decoratedComments, index)) {
       if (handleEndOfLineComment(...args)) {
         // We're good
       } else if (precedingNode) {
@@ -306,6 +312,61 @@ function attach(comments, ast, text, options) {
   }
 }
 
+const isAllEmptyAndNoLineBreak = (text) => !/[\S\n\u2028\u2029]/.test(text);
+function isOwnLineComment(text, options, decoratedComments, commentIndex) {
+  const { comment, precedingNode } = decoratedComments[commentIndex];
+  const { locStart, locEnd } = options;
+  let start = locStart(comment);
+
+  if (precedingNode) {
+    // Find first comment on the same line
+    for (let index = commentIndex - 1; index >= 0; index--) {
+      const {
+        comment,
+        precedingNode: currentCommentPrecedingNode,
+      } = decoratedComments[index];
+      if (
+        currentCommentPrecedingNode !== precedingNode ||
+        !isAllEmptyAndNoLineBreak(text.slice(locEnd(comment), start))
+      ) {
+        break;
+      }
+      start = locStart(comment);
+    }
+  }
+
+  return hasNewline(text, start, { backwards: true });
+}
+
+function isEndOfLineComment(text, options, decoratedComments, commentIndex) {
+  const { comment, followingNode } = decoratedComments[commentIndex];
+  const { locStart, locEnd } = options;
+  let end = locEnd(comment);
+
+  if (followingNode) {
+    // Find last comment on the same line
+    for (
+      let index = commentIndex + 1;
+      index < decoratedComments.length;
+      index++
+    ) {
+      const {
+        comment,
+        followingNode: currentCommentFollowingNode,
+      } = decoratedComments[index];
+      if (
+        currentCommentFollowingNode !== followingNode ||
+        !isAllEmptyAndNoLineBreak(text.slice(end, locStart(comment)))
+      ) {
+        break;
+      }
+      end = locEnd(comment);
+    }
+  }
+
+  return hasNewline(text, end);
+}
+
 function breakTies(tiesToBreak, text, options) {
   const tieCount = tiesToBreak.length;
   if (tieCount === 0) {
diff --git a/tests/js/comments/__snapshots__/jsfmt.spec.js.snap b/tests/js/comments/__snapshots__/jsfmt.spec.js.snap
index aec6bbbce..3aebe8723 100644
--- a/tests/js/comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/comments/__snapshots__/jsfmt.spec.js.snap
@@ -2152,6 +2152,282 @@ if (14) {
 ================================================================================
 `;
 
+exports[`issue-3532.js - {"semi":false} format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+import React from 'react';
+
+/*
+import styled from 'react-emotion';
+
+const AspectRatioBox = styled.div\`
+  &::before {
+    content: '';
+    width: 1px;
+    margin-left: -1px;
+    float: left;
+    height: 0;
+    padding-top: \${props => 100 / props.aspectRatio}%;
+  }
+
+  &::after {
+    /* To clear float *//*
+    content: '';
+    display: table;
+    clear: both;
+  }
+\`;
+*/
+
+const AspectRatioBox = ({
+  aspectRatio,
+  children,
+  ...props
+}) => (
+  <div
+    className={\`height: 0;
+  overflow: hidden;
+  padding-top: \${props => 100 / props.aspectRatio}%;
+  background: white;
+  position: relative;\`}
+  >
+    <div>{children}</div>
+  </div>
+);
+
+export default AspectRatioBox;
+
+=====================================output=====================================
+import React from "react"
+
+/*
+import styled from 'react-emotion';
+
+const AspectRatioBox = styled.div\`
+  &::before {
+    content: '';
+    width: 1px;
+    margin-left: -1px;
+    float: left;
+    height: 0;
+    padding-top: \${props => 100 / props.aspectRatio}%;
+  }
+
+  &::after {
+    /* To clear float */ /*
+    content: '';
+    display: table;
+    clear: both;
+  }
+\`;
+*/
+
+const AspectRatioBox = ({ aspectRatio, children, ...props }) => (
+  <div
+    className={\`height: 0;
+  overflow: hidden;
+  padding-top: \${(props) => 100 / props.aspectRatio}%;
+  background: white;
+  position: relative;\`}
+  >
+    <div>{children}</div>
+  </div>
+)
+
+export default AspectRatioBox
+
+================================================================================
+`;
+
+exports[`issue-3532.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+import React from 'react';
+
+/*
+import styled from 'react-emotion';
+
+const AspectRatioBox = styled.div\`
+  &::before {
+    content: '';
+    width: 1px;
+    margin-left: -1px;
+    float: left;
+    height: 0;
+    padding-top: \${props => 100 / props.aspectRatio}%;
+  }
+
+  &::after {
+    /* To clear float *//*
+    content: '';
+    display: table;
+    clear: both;
+  }
+\`;
+*/
+
+const AspectRatioBox = ({
+  aspectRatio,
+  children,
+  ...props
+}) => (
+  <div
+    className={\`height: 0;
+  overflow: hidden;
+  padding-top: \${props => 100 / props.aspectRatio}%;
+  background: white;
+  position: relative;\`}
+  >
+    <div>{children}</div>
+  </div>
+);
+
+export default AspectRatioBox;
+
+=====================================output=====================================
+import React from "react";
+
+/*
+import styled from 'react-emotion';
+
+const AspectRatioBox = styled.div\`
+  &::before {
+    content: '';
+    width: 1px;
+    margin-left: -1px;
+    float: left;
+    height: 0;
+    padding-top: \${props => 100 / props.aspectRatio}%;
+  }
+
+  &::after {
+    /* To clear float */ /*
+    content: '';
+    display: table;
+    clear: both;
+  }
+\`;
+*/
+
+const AspectRatioBox = ({ aspectRatio, children, ...props }) => (
+  <div
+    className={\`height: 0;
+  overflow: hidden;
+  padding-top: \${(props) => 100 / props.aspectRatio}%;
+  background: white;
+  position: relative;\`}
+  >
+    <div>{children}</div>
+  </div>
+);
+
+export default AspectRatioBox;
+
+================================================================================
+`;
+
+exports[`issue-7724.js - {"semi":false} format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+const foo = "Bar";
+
+/**
+ * @template T
+ * @param {Type} type
+ * @param {T} value
+ * @return {Value}
+ *//**
+ * @param {Type} type
+ * @return {Value}
+ */
+function value(type, value) {
+  if (arguments.length === 2) {
+    return new ConcreteValue(type, value);
+  } else {
+    return new Value(type);
+  }
+}
+=====================================output=====================================
+const foo = "Bar"
+
+/**
+ * @template T
+ * @param {Type} type
+ * @param {T} value
+ * @return {Value}
+ */ /**
+ * @param {Type} type
+ * @return {Value}
+ */
+function value(type, value) {
+  if (arguments.length === 2) {
+    return new ConcreteValue(type, value)
+  } else {
+    return new Value(type)
+  }
+}
+
+================================================================================
+`;
+
+exports[`issue-7724.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+const foo = "Bar";
+
+/**
+ * @template T
+ * @param {Type} type
+ * @param {T} value
+ * @return {Value}
+ *//**
+ * @param {Type} type
+ * @return {Value}
+ */
+function value(type, value) {
+  if (arguments.length === 2) {
+    return new ConcreteValue(type, value);
+  } else {
+    return new Value(type);
+  }
+}
+=====================================output=====================================
+const foo = "Bar";
+
+/**
+ * @template T
+ * @param {Type} type
+ * @param {T} value
+ * @return {Value}
+ */ /**
+ * @param {Type} type
+ * @return {Value}
+ */
+function value(type, value) {
+  if (arguments.length === 2) {
+    return new ConcreteValue(type, value);
+  } else {
+    return new Value(type);
+  }
+}
+
+================================================================================
+`;
+
 exports[`issues.js - {"semi":false} format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]
@@ -3341,6 +3617,424 @@ y;
 ================================================================================
 `;
 
+exports[`multi-comments-on-same-line.js - {"semi":false} format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+/*========= All on same line =========*/
+a;
+/*1*//*2*//*3*/
+b;
+
+a;/*1*//*2*//*3*/
+b;
+
+a;
+/*1*//*2*//*3*/b;
+
+a;
+/*
+1*//*2*//*3
+*/
+b;
+
+a;/*
+1*//*2*//*3
+*/
+b;
+
+a;/*
+1*//*2*//*3
+*/b;
+
+/*========= First two on same line =========*/
+a;
+/*1*//*2*/
+/*3*/
+b;
+
+a;/*1*//*2*/
+/*3*/
+b;
+
+a;
+/*1*//*2*/
+/*3*/b;
+
+a;
+/*
+1*//*2*/
+/*3
+*/
+b;
+
+a;/*
+1*//*2*/
+/*3
+*/
+b;
+
+a;/*
+1*//*2*/
+/*3
+*/b;
+
+/*========= Last two on same line =========*/
+a;
+/*1*/
+/*2*//*3*/
+b;
+
+a;/*1*/
+/*2*//*3*/
+b;
+
+a;
+/*1*/
+/*2*//*3*/b;
+
+a;
+/*
+1*/
+/*2*//*3
+*/
+b;
+
+a;/*
+1*/
+/*2*//*3
+*/
+b;
+
+a;/*
+1*/
+/*2*//*3
+*/b;
+
+=====================================output=====================================
+/*========= All on same line =========*/
+a
+/*1*/ /*2*/ /*3*/
+b
+
+a /*1*/ /*2*/ /*3*/
+b
+
+a
+/*1*/ /*2*/ /*3*/ b
+
+a
+/*
+1*/ /*2*/ /*3
+ */
+b
+
+a /*
+1*/ /*2*/
+/*3
+ */
+b
+
+a
+/*
+1*/ /*2*/ /*3
+ */ b
+
+/*========= First two on same line =========*/
+a
+/*1*/ /*2*/
+/*3*/
+b
+
+a /*1*/ /*2*/
+/*3*/
+b
+
+a
+/*1*/ /*2*/
+/*3*/ b
+
+a
+/*
+1*/ /*2*/
+/*3
+ */
+b
+
+a /*
+1*/ /*2*/
+/*3
+ */
+b
+
+a /*
+1*/ /*2*/
+/*3
+ */ b
+
+/*========= Last two on same line =========*/
+a
+/*1*/
+/*2*/ /*3*/
+b
+
+a /*1*/
+/*2*/ /*3*/
+b
+
+a
+/*1*/
+/*2*/ /*3*/ b
+
+a
+/*
+1*/
+/*2*/ /*3
+ */
+b
+
+a /*
+1*/
+/*2*/ /*3
+ */
+b
+
+a /*
+1*/
+/*2*/ /*3
+ */ b
+
+================================================================================
+`;
+
+exports[`multi-comments-on-same-line.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+/*========= All on same line =========*/
+a;
+/*1*//*2*//*3*/
+b;
+
+a;/*1*//*2*//*3*/
+b;
+
+a;
+/*1*//*2*//*3*/b;
+
+a;
+/*
+1*//*2*//*3
+*/
+b;
+
+a;/*
+1*//*2*//*3
+*/
+b;
+
+a;/*
+1*//*2*//*3
+*/b;
+
+/*========= First two on same line =========*/
+a;
+/*1*//*2*/
+/*3*/
+b;
+
+a;/*1*//*2*/
+/*3*/
+b;
+
+a;
+/*1*//*2*/
+/*3*/b;
+
+a;
+/*
+1*//*2*/
+/*3
+*/
+b;
+
+a;/*
+1*//*2*/
+/*3
+*/
+b;
+
+a;/*
+1*//*2*/
+/*3
+*/b;
+
+/*========= Last two on same line =========*/
+a;
+/*1*/
+/*2*//*3*/
+b;
+
+a;/*1*/
+/*2*//*3*/
+b;
+
+a;
+/*1*/
+/*2*//*3*/b;
+
+a;
+/*
+1*/
+/*2*//*3
+*/
+b;
+
+a;/*
+1*/
+/*2*//*3
+*/
+b;
+
+a;/*
+1*/
+/*2*//*3
+*/b;
+
+=====================================output=====================================
+/*========= All on same line =========*/
+a;
+/*1*/ /*2*/ /*3*/
+b;
+
+a; /*1*/ /*2*/ /*3*/
+b;
+
+a;
+/*1*/ /*2*/ /*3*/ b;
+
+a;
+/*
+1*/ /*2*/ /*3
+ */
+b;
+
+a; /*
+1*/ /*2*/
+/*3
+ */
+b;
+
+a;
+/*
+1*/ /*2*/ /*3
+ */ b;
+
+/*========= First two on same line =========*/
+a;
+/*1*/ /*2*/
+/*3*/
+b;
+
+a; /*1*/ /*2*/
+/*3*/
+b;
+
+a;
+/*1*/ /*2*/
+/*3*/ b;
+
+a;
+/*
+1*/ /*2*/
+/*3
+ */
+b;
+
+a; /*
+1*/ /*2*/
+/*3
+ */
+b;
+
+a; /*
+1*/ /*2*/
+/*3
+ */ b;
+
+/*========= Last two on same line =========*/
+a;
+/*1*/
+/*2*/ /*3*/
+b;
+
+a; /*1*/
+/*2*/ /*3*/
+b;
+
+a;
+/*1*/
+/*2*/ /*3*/ b;
+
+a;
+/*
+1*/
+/*2*/ /*3
+ */
+b;
+
+a; /*
+1*/
+/*2*/ /*3
+ */
+b;
+
+a; /*
+1*/
+/*2*/ /*3
+ */ b;
+
+================================================================================
+`;
+
+exports[`multi-comments-on-same-line-2.js - {"semi":false} format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+/* 1 */ /* 2 */ /* 3 */ a;
+a; /* 4 */ /* 5 */ /* 6 */
+
+=====================================output=====================================
+/* 1 */ /* 2 */ /* 3 */ a
+a /* 4 */ /* 5 */ /* 6 */
+
+================================================================================
+`;
+
+exports[`multi-comments-on-same-line-2.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+/* 1 */ /* 2 */ /* 3 */ a;
+a; /* 4 */ /* 5 */ /* 6 */
+
+=====================================output=====================================
+/* 1 */ /* 2 */ /* 3 */ a;
+a; /* 4 */ /* 5 */ /* 6 */
+
+================================================================================
+`;
+
 exports[`preserve-new-line-last.js - {"semi":false} format 1`] = `
 ====================================options=====================================
 parsers: ["babel", "flow", "typescript"]
diff --git a/tests/js/comments/issue-3532.js b/tests/js/comments/issue-3532.js
new file mode 100644
index 000000000..87c660e44
--- /dev/null
+++ b/tests/js/comments/issue-3532.js
@@ -0,0 +1,41 @@
+import React from 'react';
+
+/*
+import styled from 'react-emotion';
+
+const AspectRatioBox = styled.div`
+  &::before {
+    content: '';
+    width: 1px;
+    margin-left: -1px;
+    float: left;
+    height: 0;
+    padding-top: ${props => 100 / props.aspectRatio}%;
+  }
+
+  &::after {
+    /* To clear float *//*
+    content: '';
+    display: table;
+    clear: both;
+  }
+`;
+*/
+
+const AspectRatioBox = ({
+  aspectRatio,
+  children,
+  ...props
+}) => (
+  <div
+    className={`height: 0;
+  overflow: hidden;
+  padding-top: ${props => 100 / props.aspectRatio}%;
+  background: white;
+  position: relative;`}
+  >
+    <div>{children}</div>
+  </div>
+);
+
+export default AspectRatioBox;
diff --git a/tests/js/comments/issue-7724.js b/tests/js/comments/issue-7724.js
new file mode 100644
index 000000000..50b7c53c9
--- /dev/null
+++ b/tests/js/comments/issue-7724.js
@@ -0,0 +1,18 @@
+const foo = "Bar";
+
+/**
+ * @template T
+ * @param {Type} type
+ * @param {T} value
+ * @return {Value}
+ *//**
+ * @param {Type} type
+ * @return {Value}
+ */
+function value(type, value) {
+  if (arguments.length === 2) {
+    return new ConcreteValue(type, value);
+  } else {
+    return new Value(type);
+  }
+}
\ No newline at end of file
diff --git a/tests/js/comments/multi-comments-on-same-line-2.js b/tests/js/comments/multi-comments-on-same-line-2.js
new file mode 100644
index 000000000..129f6c026
--- /dev/null
+++ b/tests/js/comments/multi-comments-on-same-line-2.js
@@ -0,0 +1,2 @@
+/* 1 */ /* 2 */ /* 3 */ a;
+a; /* 4 */ /* 5 */ /* 6 */
diff --git a/tests/js/comments/multi-comments-on-same-line.js b/tests/js/comments/multi-comments-on-same-line.js
new file mode 100644
index 000000000..98b583664
--- /dev/null
+++ b/tests/js/comments/multi-comments-on-same-line.js
@@ -0,0 +1,89 @@
+/*========= All on same line =========*/
+a;
+/*1*//*2*//*3*/
+b;
+
+a;/*1*//*2*//*3*/
+b;
+
+a;
+/*1*//*2*//*3*/b;
+
+a;
+/*
+1*//*2*//*3
+*/
+b;
+
+a;/*
+1*//*2*//*3
+*/
+b;
+
+a;/*
+1*//*2*//*3
+*/b;
+
+/*========= First two on same line =========*/
+a;
+/*1*//*2*/
+/*3*/
+b;
+
+a;/*1*//*2*/
+/*3*/
+b;
+
+a;
+/*1*//*2*/
+/*3*/b;
+
+a;
+/*
+1*//*2*/
+/*3
+*/
+b;
+
+a;/*
+1*//*2*/
+/*3
+*/
+b;
+
+a;/*
+1*//*2*/
+/*3
+*/b;
+
+/*========= Last two on same line =========*/
+a;
+/*1*/
+/*2*//*3*/
+b;
+
+a;/*1*/
+/*2*//*3*/
+b;
+
+a;
+/*1*/
+/*2*//*3*/b;
+
+a;
+/*
+1*/
+/*2*//*3
+*/
+b;
+
+a;/*
+1*/
+/*2*//*3
+*/
+b;
+
+a;/*
+1*/
+/*2*//*3
+*/b;

From 7eb08f73066229d17793f57132a5da8c3cde5c87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Nov 2020 13:53:44 +0800
Subject: [PATCH 137/299] Build(deps): Bump codemirror-graphql from 0.12.3 to
 0.12.4 in /website (#9792)

Bumps [codemirror-graphql](https://github.com/graphql/graphiql) from 0.12.3 to 0.12.4.
- [Release notes](https://github.com/graphql/graphiql/releases)
- [Changelog](https://github.com/graphql/graphiql/blob/main/CHANGELOG.md)
- [Commits](https://github.com/graphql/graphiql/compare/codemirror-graphql@0.12.3...codemirror-graphql@0.12.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 36 +++++++++++++++---------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/website/package.json b/website/package.json
index 62f6b3dd6..ce2c3a19e 100644
--- a/website/package.json
+++ b/website/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "clipboard": "2.0.6",
-    "codemirror-graphql": "0.12.3",
+    "codemirror-graphql": "0.12.4",
     "lz-string": "1.4.4",
     "prop-types": "15.7.2",
     "react": "17.0.1",
diff --git a/website/yarn.lock b/website/yarn.lock
index dca841d63..751c3eb05 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -2011,13 +2011,13 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-codemirror-graphql@0.12.3:
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.12.3.tgz#8b76f59ea02ead356ca39c9574827396e4b4b454"
-  integrity sha512-u0TooVA2MWGNV+Bio89RCTRW9P5FqegB1V9rnz9I0QKoGXX/c9z9/Fc+nj18p8jxkWK8ii8d7hkz7vsNsHxdkw==
+codemirror-graphql@0.12.4:
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.12.4.tgz#607e113035856a179ee019e8451210cd1a8ca340"
+  integrity sha512-gWxmLk2OzPVzvwAXO0K52MtU1n6ylMNbKp0LtZHioK0NEUwLnSL5iPKVXn8MgvYqS8Yos/CG5WrP9Y7RWTO4mg==
   dependencies:
-    graphql-language-service-interface "^2.4.2"
-    graphql-language-service-parser "^1.6.4"
+    graphql-language-service-interface "^2.4.3"
+    graphql-language-service-parser "^1.6.5"
 
 coffee-script@^1.12.4:
   version "1.12.7"
@@ -3600,23 +3600,22 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graphql-language-service-interface@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.4.2.tgz#77b868c0dad8f18908ff5c6a7a1706d43370bd40"
-  integrity sha512-iFLMz51cA2L5Tu7/mP19++bRGUuIe2J9ekQZrcJ6sMYStsF60x5eNu3JqheduYTLhQaSdKN55jX7RlLeIDUhQA==
+graphql-language-service-interface@^2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.4.3.tgz#bba756d9282b7a2ee818a3cba5702ec9e5da1f7e"
+  integrity sha512-WVWdviRYzb+/z+GS/6ds87OW5qqP0J6l6pGGOE0694x4It57x97//mkRHY5vfNa3knHw5OYwkUYymVzqYu4xTw==
   dependencies:
-    graphql-language-service-parser "^1.6.4"
+    graphql-language-service-parser "^1.6.5"
     graphql-language-service-types "^1.6.3"
     graphql-language-service-utils "^2.4.3"
     vscode-languageserver-types "^3.15.1"
 
-graphql-language-service-parser@^1.6.4:
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-1.6.4.tgz#d5b92db1e50a91cdcf7f54f79253e13455e20257"
-  integrity sha512-Y365zUFfJ1GJ9NeRHb5Z/HBo6EnbuTi187Gkuldwd1YIDc0QcD7kqz6U5g043zd7BI/UZQth13Zd7pElvbb2zw==
+graphql-language-service-parser@^1.6.5:
+  version "1.6.5"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-1.6.5.tgz#5c9d4c48cbf4b66171f9ec5f182041627669e4f4"
+  integrity sha512-Xti3aQfnp7rTYg5dzhUnt3eqs9zbdr0tIC7S02RRcO1J5tWAwqXzv3PpYpWXGar11kD7VzP8amkh81CD4Q/m0Q==
   dependencies:
     graphql-language-service-types "^1.6.3"
-    typescript "^3.9.5"
 
 graphql-language-service-types@^1.6.3:
   version "1.6.3"
@@ -7167,11 +7166,6 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@^3.9.5:
-  version "3.9.7"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
-  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
-
 typical@^5.0.0, typical@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066"

From c7ebffbedf8a9d654ced36c34f5ec36e71462442 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Nov 2020 06:12:22 +0000
Subject: [PATCH 138/299] Build(deps-dev): Bump webpack from 5.8.0 to 5.9.0 in
 /website (#9793)

---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index ce2c3a19e..eb57b8c7a 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.0",
     "svgo": "1.3.2",
-    "webpack": "5.8.0",
+    "webpack": "5.9.0",
     "webpack-cli": "4.2.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 751c3eb05..beed19567 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -7387,10 +7387,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.8.0.tgz#65f00a181708279ff982c2d7338e1dd5505364c4"
-  integrity sha512-X2yosPiHip3L0TE+ylruzrOqSgEgsdGyBOGFWKYChcwlKChaw9VodZIUovG1oo7s0ss6e3ZxBMn9tXR+nkPThA==
+webpack@5.9.0:
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.9.0.tgz#af2e9cf9d6c7867cdcf214ea3bb5eb77aece6895"
+  integrity sha512-YnnqIV/uAS5ZrNpctSv378qV7HmbJ74DL+XfvMxzbX1bV9e7eeT6eEWU4wuUw33CNr/HspBh7R/xQlVjTEyAeA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From c9fbc1b906f3d8ac948f3a82021889924aed805d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Nov 2020 14:55:55 +0800
Subject: [PATCH 139/299] Build(deps-dev): Bump cspell from 4.2.2 to 4.2.3
 (#9796)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 532 ++++++++++++++++++++++++++-------------------------
 2 files changed, 277 insertions(+), 257 deletions(-)

diff --git a/package.json b/package.json
index 6f6120dd0..33fef5ee9 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "benchmark": "2.1.4",
     "builtin-modules": "3.1.0",
     "cross-env": "7.0.2",
-    "cspell": "4.2.2",
+    "cspell": "4.2.3",
     "eslint": "7.14.0",
     "eslint-config-prettier": "6.15.0",
     "eslint-formatter-friendly": "7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 0f6fa3fa6..9b698586e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2433,234 +2433,234 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-cspell-dict-aws@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/cspell-dict-aws/-/cspell-dict-aws-1.0.9.tgz#e9600dfc6973aaccb1f54546308be4763f4e0fac"
-  integrity sha512-DrSXcDEcPK0flggRzP7PgmMcqOKO3TsEv5pClK8MsCHN1GcJB3+FyT683BZu0gcO4RQkj4CjEi2Q5m++fZ30Cg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-bash@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/cspell-dict-bash/-/cspell-dict-bash-1.0.7.tgz#ff9154dbeaeb45f2ff37209aad42d7fe6e678e9e"
-  integrity sha512-u1TFhmCUNZq86lfGFXCpnKHie8Zm3aarGHBu9/cBZC/NVjXp/6S32EUdiNjJm9t+Rlfb244u2ITTKvLPp/IE/A==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-companies@^1.0.31:
-  version "1.0.31"
-  resolved "https://registry.yarnpkg.com/cspell-dict-companies/-/cspell-dict-companies-1.0.31.tgz#7f8c3c3fb2c70eeb0c9050fea208b75092243f59"
-  integrity sha512-DHn7umIg/Zz79f58PHyTmvEO01UFZmG0226Dgi6bA/haGUV/zR0P72cPLMEsoTUUSzsfkmcQ/8k2lHNEwriLaQ==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-cpp@^1.1.33:
-  version "1.1.33"
-  resolved "https://registry.yarnpkg.com/cspell-dict-cpp/-/cspell-dict-cpp-1.1.33.tgz#f0267f62a08c4a435b75c711379661fb2733d004"
-  integrity sha512-wCvVCSQl6k3884oEcpGv77l/B1k2dRl2Koo3xrB7tAADg9n4euuk7BBwN681vtHJjJPQXBqW59qeSCwD14y8sw==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-cryptocurrencies@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cspell-dict-cryptocurrencies/-/cspell-dict-cryptocurrencies-1.0.6.tgz#4e51b16ac7a5f29f8cddd9f256605e6850a243ae"
-  integrity sha512-JAjP6CkVsMH8j2K0s6DozAgk7tBfJ2ixLGy5uOhn7/gx+sIf327p9GZOtlRLzAjN3xc2/nzjJ0Li7zGCFlh5cA==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-csharp@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cspell-dict-csharp/-/cspell-dict-csharp-1.0.6.tgz#6e3dfc77498ab1313469f390000d1bb90c9e396a"
-  integrity sha512-j/no5CTqhmLh9D23SgtYSS4Nr/k82yOn/+NjIqr6mE2Z57w4vgDxLmfiE7MocDvZGczBkAiHtOgrXLDkOzIkSA==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-css@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cspell-dict-css/-/cspell-dict-css-1.0.6.tgz#3a46feedd3bc386f663621d05d1fbb25f01d1eab"
-  integrity sha512-Io1X4PMdOpY7NVL0fu9uw1NQu9VF4I9ONI1L7t/5Hu19WcljmSTJL7rxKlwqUc4qQ91ICnZwPJ5lztNfcWYe+w==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-django@^1.0.21:
-  version "1.0.21"
-  resolved "https://registry.yarnpkg.com/cspell-dict-django/-/cspell-dict-django-1.0.21.tgz#da3a9539e1af7b962a97a1430b6eb90263879c4f"
-  integrity sha512-wUlSbFC5CDYw+2+oGkgn/hI356LK2Q/K6h6GOBHTKGCNm0K6Pqrb0/LUKSC2CmZ/FvnAbuz3A6298ZVzQ5INAg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-dotnet@^1.0.20:
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/cspell-dict-dotnet/-/cspell-dict-dotnet-1.0.20.tgz#f033a535d6663a018b1c65dbf4ca3eb19e17d5fa"
-  integrity sha512-+h73Kvr6/w+jRp/6yHDqkV0lIr4HaVfDwVGqbVeefO+VkAass94CYAuu78HvmgvwovsyEpym0JJDMnftZA4o5A==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-elixir@^1.0.19:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/cspell-dict-elixir/-/cspell-dict-elixir-1.0.19.tgz#45faa865792f7021071a06c7f3fd50e29af69f65"
-  integrity sha512-1NtCgvykvAvzXKunQvaZ8UPTkgPFnYyu5thfayWgJXv1PkHtM2TlrwLqypkskj1z8uWDTtQqHH2DES8OOb2Qeg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-en-gb@^1.1.24:
-  version "1.1.24"
-  resolved "https://registry.yarnpkg.com/cspell-dict-en-gb/-/cspell-dict-en-gb-1.1.24.tgz#b8322f036aa280037e85033eb59639cc50c4e7d0"
-  integrity sha512-fF+doyWNV039760WY08aYcTFfLyPo6BSwXN8gWsPWAc17f0uKI2EGEhF8IrR/kTIqdwyt9tRiZdYNZM7suTPKg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-en_us@^1.2.34:
-  version "1.2.34"
-  resolved "https://registry.yarnpkg.com/cspell-dict-en_us/-/cspell-dict-en_us-1.2.34.tgz#27b89a0e120a894ee24f7a7282345bec1765e9be"
-  integrity sha512-BCiAotkU19/a/FJrhfs3C8c16k6QPGb+KIpQ/sJZQFVTI69nxgGvZ3yidBWS+fo1Q4UDx3atiNEE/cmcY6uZAw==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-filetypes@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cspell-dict-filetypes/-/cspell-dict-filetypes-1.1.1.tgz#be05b6a28e1ec90d421e73e26f30a905a491e6c3"
-  integrity sha512-X313greGPD/2orACD+x86W6rS+C99voSkm4wwbg6ZxmTGPlNV+hTLmY1jgHsjrE3nzL2Uz1//+N+BE6kzQKguQ==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-fonts@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/cspell-dict-fonts/-/cspell-dict-fonts-1.0.9.tgz#49bf0f796f881f11ffcac07d748b5ba7e8235412"
-  integrity sha512-tm1VxbWEl08p6TcTZqkB3RbIDJjEHgR4Hs0OmGnX8rASgOw1ogcWWMmTCjE+mxcxmY5zcf0F9Vn8BmEvIwdqog==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-fullstack@^1.0.32:
-  version "1.0.32"
-  resolved "https://registry.yarnpkg.com/cspell-dict-fullstack/-/cspell-dict-fullstack-1.0.32.tgz#8f547d1b78aff0c7ca4c6386db3032bdeb2b94c4"
-  integrity sha512-rC0ae/iDI7cYsxNbYjSgrP8s4wye5NxLHsJSR4GBFO5tlDejHPCVzQO04bRcrrz+vkYk74rVQ0nJ2s67dgXv1g==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-golang@^1.1.20:
-  version "1.1.20"
-  resolved "https://registry.yarnpkg.com/cspell-dict-golang/-/cspell-dict-golang-1.1.20.tgz#0544c6932094335a4a37288cfeb830dbc0372800"
-  integrity sha512-9pdJgWTH5TZpZoxcMksJ2dS3EyD0Ur5sHCEMVnDEfA3EU7dZSiNB+uQQET5aGJGupmSJzLrs0Kc9upS1BZzq1w==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-haskell@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/cspell-dict-haskell/-/cspell-dict-haskell-1.0.8.tgz#82b1fcc50ce5d35eb7c74c174a3a52f7a8c8a49d"
-  integrity sha512-JnTbTX4kZGtV7w2wFNWeR+2JlbE/PW7IDeYjJFG+sX9RXcV32MUM4WkV8L4Ucx7GQpSiJOXp1gVyqWrZOvr3Hg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-html-symbol-entities@^1.0.19:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/cspell-dict-html-symbol-entities/-/cspell-dict-html-symbol-entities-1.0.19.tgz#dc65ecdfffb847fb0cd6f3c61bd822f117cc7fc7"
-  integrity sha512-+L2whNDxODc8F3Pjomm6cr+T2rWtC24Aiemkt9ZWe1Jh8BnTQeYMF1oWgMTmiuEPF5rEGlhXADbNfyrSNJI11Q==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-html@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cspell-dict-html/-/cspell-dict-html-1.1.1.tgz#c83f13ada9c484e33153e985637d10ddad8a2831"
-  integrity sha512-v2Lu7M3K7QcW/2A6PCI04IOW/w6MeuuoukYuFxaBKtHW/PWjhjO0PJaGf/XAtccGed+U+2ppSGLL57YREwPMnw==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-java@^1.0.18:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/cspell-dict-java/-/cspell-dict-java-1.0.18.tgz#2330499e601f117694f850f7b788691900faf25b"
-  integrity sha512-wy8BXuV0g4/OHdrOyIpzQL3DfjLRHKwA7S6CCHTAe3EWqLzE3HCOIgfyat/6gxJu8K8GXJ2A3IqFnIXy+wLB1Q==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-latex@^1.0.19:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/cspell-dict-latex/-/cspell-dict-latex-1.0.19.tgz#c7a441b312fc90b82ebb0e0c50eb35a14505de03"
-  integrity sha512-wjFkbEMCrNANN1XZiBn45yngrqCOkwD7Mha4Un7J1FbYI6fVGX1/+TCcwhMeTvJ+mhOo8VIZUazSm8+pPuOJqQ==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-lorem-ipsum@^1.0.18:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/cspell-dict-lorem-ipsum/-/cspell-dict-lorem-ipsum-1.0.18.tgz#7f16bf50f93b343c12b9ecbeeeaca3b73da8214b"
-  integrity sha512-fTTEhFktvYG1l6x/pss/i/2DX3XdYk/cLUGUpIjvOe6KpfX7Wk6rnYNyazK3fR2CteRrktsvCPbOqroHYHmfYQ==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-lua@^1.0.12:
+cspell-dict-aws@^1.0.12:
   version "1.0.12"
-  resolved "https://registry.yarnpkg.com/cspell-dict-lua/-/cspell-dict-lua-1.0.12.tgz#6c3f5d6492ebd27debbe00eb5ece9baa10f3b6a0"
-  integrity sha512-UmXMehOeWXNB7rzZopx0MO1bf8OXsT9ttSfAKklJWZHJrb6/qbGbJ5RDYNuyv7xZvpoMKNZcRJvxup1p3u0aeg==
+  resolved "https://registry.yarnpkg.com/cspell-dict-aws/-/cspell-dict-aws-1.0.12.tgz#f036e191bb58da8e8ea285be61c7c7e5c86f039d"
+  integrity sha512-kAe+VnSucsrpcFKVV0oTU8P25NtefpGy8fYEFvjnqk8A2CVFlD5pK4mNkD6ztTrArxWz3orvDUlWw+ndw4itFw==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-node@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/cspell-dict-node/-/cspell-dict-node-1.0.5.tgz#8922bcb4bec86f67a1d8b84ed16823deba059c3d"
-  integrity sha512-oNUO0QHm7N/sqWvgh1RIJf/rOlCFfyBGRmK2ecr9lBtt8DhZ+/BU9RM/ZzVuLY69YdZH0Ghjt4+9LGYpd+x3/w==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-npm@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cspell-dict-npm/-/cspell-dict-npm-1.0.6.tgz#03be3260fd883c7d47bb13404e768f222b01be27"
-  integrity sha512-nyRUfFQIOgMcmkKZeZuNTVUaJj8mozZXYtd+O3f+SRzEj3zhzSeubenoBfQsEg5naNi3bqEsqKjej83bopRdaQ==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-php@^1.0.19:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/cspell-dict-php/-/cspell-dict-php-1.0.19.tgz#6bfae10f2c413106450a4d12da429cd37a9343eb"
-  integrity sha512-3LSHgtOFVO0lnUIMnOVWeX/rPoK/trOo6TVEIyottKCdB58SCf1/E/Vw+EhLDolvgvVg5qqjTBf4sx8OXI/hCg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-powershell@^1.0.10:
+cspell-dict-bash@^1.0.10:
   version "1.0.10"
-  resolved "https://registry.yarnpkg.com/cspell-dict-powershell/-/cspell-dict-powershell-1.0.10.tgz#9d38a519960cb49d14afc0297fa7e6ffa4e5e1cd"
-  integrity sha512-BwY5UiqwIaHz5WjoXnIp53y6xKCbbihewWTYRZjRsYl0MvfiKnZ1wUQWa8DW/W5gKs+OifYSulgmLWy6N4pYug==
+  resolved "https://registry.yarnpkg.com/cspell-dict-bash/-/cspell-dict-bash-1.0.10.tgz#3a6b278d12efdab5254d46964a229322ba417354"
+  integrity sha512-uPjdXyb+YBMwg3r+l0ZuB3R83OSu5WJ2MbuoK+ImxngNiXxUicDPG96S1H1eEN9IY62c1OiX6nbzRzxAoS4amQ==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-python@^1.0.27:
-  version "1.0.27"
-  resolved "https://registry.yarnpkg.com/cspell-dict-python/-/cspell-dict-python-1.0.27.tgz#8539f7241ca01cf702d15b273b1811efd4100a06"
-  integrity sha512-VHGa7O9RhJd3Ke2eDmMbzzoU6mDsoXPN24YrfXzcJ3OVEPC2giR42KQIn3Iq2JzEMRBQuOMloSlf4w+0KtPOOg==
+cspell-dict-companies@^1.0.34:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/cspell-dict-companies/-/cspell-dict-companies-1.0.34.tgz#7b258ab4d0c48a31939e7dfe0de5c660e304a9bd"
+  integrity sha512-SxFE+a4TJheuO1QdCf2oqIlL+KWzbQqs7ibHdtLlZ+TR/0lO29ghlrlXpknj/wGzz39AqKvGkdOLSiz3kF4uDg==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-ruby@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/cspell-dict-ruby/-/cspell-dict-ruby-1.0.8.tgz#a55676f8cb88c0b6265ee8b17fc9d86474d3e11d"
-  integrity sha512-Z/OJce6A5XbwOM2LL8HUkJP8wPNCKRNf2SzyfHqPTUYHfPpyE7MWFLTKxiZWZ6h9J/tfUyjFnyoAD3GxpjFQ3Q==
+cspell-dict-cpp@^1.1.36:
+  version "1.1.36"
+  resolved "https://registry.yarnpkg.com/cspell-dict-cpp/-/cspell-dict-cpp-1.1.36.tgz#f1690325cfbb3a74fb7745cfb05de197632069ea"
+  integrity sha512-FrQk2XScnY/KTmY5Q7ivsjhm/DZDetMp1zVWPPAzAk6WARWGDWMj3XU/cTT7ByoLnJBL7eb2q6hm0i5IOo24Ag==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-rust@^1.0.18:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/cspell-dict-rust/-/cspell-dict-rust-1.0.18.tgz#ec79f64ee4beed88f397e4b3c6c81748a449ab04"
-  integrity sha512-Jolr/EDhRYHWedTJ6lZmAozi2uojzv3dCyBvkOB0j6RftlVH0Y6NlPCy593KRLgDES3kmtQCXIJCNj1orIj0PA==
+cspell-dict-cryptocurrencies@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/cspell-dict-cryptocurrencies/-/cspell-dict-cryptocurrencies-1.0.9.tgz#73efff93f6c04a79966b73e072197ecd2171e5f7"
+  integrity sha512-UTuBMu4M8NHCmagF+aHFNnoogCJ8yC4ZlniAlCGZ/n1mua3vCoAXmnaBrs2uZiEZOErSvWTjb5PVmIBifYx7mQ==
+  dependencies:
+    configstore "^5.0.0"
+
+cspell-dict-csharp@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/cspell-dict-csharp/-/cspell-dict-csharp-1.0.9.tgz#2ef15678b06923ccc711c8d4759ebe5ff75ab7f1"
+  integrity sha512-EZZyzvPpAcNsEYGVpKHECAgksCDOG5lTVrA36hXYACRhL/8MsvoAF+Es2bxbwd0GCWgVNuNbdutkC41BEN0s5Q==
+  dependencies:
+    configstore "^5.0.0"
+
+cspell-dict-css@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/cspell-dict-css/-/cspell-dict-css-1.0.9.tgz#48eb90e4a31cf618b7eb0fde4ffa95713bfb2ddb"
+  integrity sha512-RQPgZ97Sr2B8NIQ8Tf/sqMeAzfTsAMXFwLcqr0/J0/tpm0D1eelKR+8hiW+R/Xl86R7w2DgqTQXoEMi8cpLGJg==
+  dependencies:
+    configstore "^5.0.0"
+
+cspell-dict-django@^1.0.24:
+  version "1.0.24"
+  resolved "https://registry.yarnpkg.com/cspell-dict-django/-/cspell-dict-django-1.0.24.tgz#8717d7b9ebc602b896111431f362c6ff28085217"
+  integrity sha512-6WkK2maLFBGB1YTv7Q8GAuAHA/gulOu5xbc/pr5o4XQaJ62AbY6GFIuCuVK3VREPHboRT9P9DUGQAbsYXZg1bg==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-scala@^1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/cspell-dict-scala/-/cspell-dict-scala-1.0.17.tgz#d35350edd9909f7520c7b2b6f77543246b9a756d"
-  integrity sha512-ULwdZtIRxxJ8SXxfCbteMstKqs+9HIZC25u2oWwLZmK6fdOGcVE4Z/19tz3vEXeGHOg6rqQVcjAcM5BdaNSHsA==
+cspell-dict-dotnet@^1.0.23:
+  version "1.0.23"
+  resolved "https://registry.yarnpkg.com/cspell-dict-dotnet/-/cspell-dict-dotnet-1.0.23.tgz#551fa95c785d548b131827667064beae63aee8a9"
+  integrity sha512-+p6xxzCEdIpYc8ifWsoJYqy445pr+tsW7YOhxtXzMWXswXMtR3dKN5TOEG6P7FRs0y8JeA38/iCq1B4INYvv/Q==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-software-terms@^1.0.19:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/cspell-dict-software-terms/-/cspell-dict-software-terms-1.0.19.tgz#6d8f4b7b07896432c3952c5ed94c02bfeaa099d7"
-  integrity sha512-Q1QSDZ63kkStP1rUgGw9fjfXZ6gyinRoJKNX3nu7o7W/D6u2+ZOz7UMo/Vahu7+zqVKZ/7mxtNjJcbVhhPBMgA==
+cspell-dict-elixir@^1.0.22:
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/cspell-dict-elixir/-/cspell-dict-elixir-1.0.22.tgz#3ef9f86bcf225be45fb6aab726ff7956400fa440"
+  integrity sha512-iZiyO+h5+S4+hzi7UiegDABhUWNlmASaPplqf250kInAXxK/Ji/RZ5Ru/KNd8RdkTLoUEZoTFsfBuxAw1P5Ugw==
   dependencies:
     configstore "^5.0.1"
 
-cspell-dict-typescript@^1.0.12:
+cspell-dict-en-gb@^1.1.27:
+  version "1.1.27"
+  resolved "https://registry.yarnpkg.com/cspell-dict-en-gb/-/cspell-dict-en-gb-1.1.27.tgz#5b8671e77c7a99bf11bf746950a76bda2bb52b26"
+  integrity sha512-AftBECTbkxAkqhFmKz9nxf/WUZpYbcWWAx3ULAMydp6Zl/YFP0hMl++J54WVmONfADi3+QVjvp1PwfRsXnml9A==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-en_us@^1.2.37:
+  version "1.2.37"
+  resolved "https://registry.yarnpkg.com/cspell-dict-en_us/-/cspell-dict-en_us-1.2.37.tgz#9f0d52b3c4189f5835e33363df1b92275c6e3386"
+  integrity sha512-sTSayWhfTKhNwaqN7I01UtswrWb2BPTJ1FjHDqTSqfuJqJ+Y8RrvNnUFot2bkh2Rttipt+qFUFcYzO1Q8XjN2w==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-filetypes@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/cspell-dict-filetypes/-/cspell-dict-filetypes-1.1.4.tgz#a6c8fa9c1110ddbb2c9e54a4c2bdfa1a24a329b9"
+  integrity sha512-bx+COWITPEYYFSoMz69Epe495Or/K5coJwYf7iQPWK7YIiPHxnJKnXAQLjmKLXPw3axXPaKsiGiEQ4P26kjDYQ==
+  dependencies:
+    configstore "^5.0.0"
+
+cspell-dict-fonts@^1.0.12:
   version "1.0.12"
-  resolved "https://registry.yarnpkg.com/cspell-dict-typescript/-/cspell-dict-typescript-1.0.12.tgz#4b102c9c6237217aeddb8099964c6ac12d82a1e0"
-  integrity sha512-EvqdZEbsmEdCR3svx5/HqGHZdYipg31BZeXKJ63mQ3+/cf3RCOMAbKDuvyGcJFpMS87LUr5vBA5sj0Aiaz3MLQ==
+  resolved "https://registry.yarnpkg.com/cspell-dict-fonts/-/cspell-dict-fonts-1.0.12.tgz#29a4d3d46e0c95a3e59942cd0085bac97e1b141e"
+  integrity sha512-3af5iT5LgSmMNLStfiWTjKO1p5LQgaZIqXlG8Mjq6z7pcPWOiUbXfeJXiYrbAzC8e94wwFufRiYsNwXEx7yi3g==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-fullstack@^1.0.35:
+  version "1.0.35"
+  resolved "https://registry.yarnpkg.com/cspell-dict-fullstack/-/cspell-dict-fullstack-1.0.35.tgz#7b01153bfbf0d885b2774156de26982853a78872"
+  integrity sha512-b8j2fXfDYs5VHuHjM3vulA/yduQMUjGWL7SK6lmdzndJavAfi5d4+Zn8nS/eeiHD61zI0xUyliYnyC0c5/2d1w==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-golang@^1.1.23:
+  version "1.1.23"
+  resolved "https://registry.yarnpkg.com/cspell-dict-golang/-/cspell-dict-golang-1.1.23.tgz#3a3e61bf2b13bce5a74fab2b918c1b6ac96bdb56"
+  integrity sha512-4tT55V7duKYEpSlIo6U4ExCgR2pXnYh5RVfsyzWkzvfF4Ka10DOd+5tR+HL6fr6WehdDa2p4wvybg4wS0nOzUQ==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-haskell@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/cspell-dict-haskell/-/cspell-dict-haskell-1.0.11.tgz#2cdc3946d60a1d3a7516e1c84079e3f0466714c3"
+  integrity sha512-aV0zSgcv4BfZ5P2NTnduX8PRlLe55LzSMfqfNxm5gatFZAp06j+OW2Le/ngpPRRC0LkMngxTZDPWsRNQNYKj1w==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-html-symbol-entities@^1.0.22:
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/cspell-dict-html-symbol-entities/-/cspell-dict-html-symbol-entities-1.0.22.tgz#21f2a2f567f13bb15e24ce4fb7c81bf4c9253335"
+  integrity sha512-YSq3fOTaF4+54PqvBIvCbeuY43VrVWYu70PzSyvqcJqcIrK0eZywzkPjU4PYbyq6HrzSzNnH2MZmlFd64tnJnw==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-html@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/cspell-dict-html/-/cspell-dict-html-1.1.4.tgz#b8ec977f746a81b91604c3cb9523291a29be306b"
+  integrity sha512-0G6uv35pU4rBZM4nB3wG6mzTMJYpulTr6DibGIAjO4rv/wW+hR3WWS4IuZo0SJBhH16BUALWKh4HCi6TQlUEdQ==
+  dependencies:
+    configstore "^5.0.0"
+
+cspell-dict-java@^1.0.21:
+  version "1.0.21"
+  resolved "https://registry.yarnpkg.com/cspell-dict-java/-/cspell-dict-java-1.0.21.tgz#d861e39b3681f839fe9940ad42f660cffbf241da"
+  integrity sha512-YrzUrvY9nHGQdoJ5BGToUydtyXSJYGSacPmI3N1KZsYFoaP5tKHmeCSUaONucZQCd7CkgsEjNXQz0g0MlYI91w==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-latex@^1.0.22:
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/cspell-dict-latex/-/cspell-dict-latex-1.0.22.tgz#18b41eed69c10559a9f0f02d353bbf8f26ef68fd"
+  integrity sha512-dyPotbmlBN8roXQKZaoKJInDeATlVB8eSxwdDZsX0tMgccD2DZJCWh//P/nS01NzpSpDYDi96bTjHhyVTInN5w==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-lorem-ipsum@^1.0.21:
+  version "1.0.21"
+  resolved "https://registry.yarnpkg.com/cspell-dict-lorem-ipsum/-/cspell-dict-lorem-ipsum-1.0.21.tgz#cc98645c53e0428df2a7a93e5032510fcbf7e65a"
+  integrity sha512-zu7grVZraIv7S3cQhEwfCg4fnzGQ8nT1BaVVu/x1nIl+/PYOnojWBFb/8R5cx5DnUvi3Z4e1b/UzA6vO0yVaXQ==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-lua@^1.0.15:
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/cspell-dict-lua/-/cspell-dict-lua-1.0.15.tgz#474d2184cffdbee513df450f0906bbbb07046ef2"
+  integrity sha512-jP91ieNofTMHw/ZbLXC0MgdOLf7HV28rs+A8drgXtgZ7V7IZ+LB9xcXuGs43I/Gm8VjToDJYV3ak+vv7KpSBwQ==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-node@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/cspell-dict-node/-/cspell-dict-node-1.0.8.tgz#35d5c96becb4dd9db9d75210ee23752fabb6ee82"
+  integrity sha512-7bLoIRrAMYpkHu3Ea//2eAPN6hg2/CoyCbxsV0o7lSCADKoQU2ywo4sWv3/zl3720jyoE/yvAiOZueaJ5cV0bA==
+  dependencies:
+    configstore "^5.0.0"
+
+cspell-dict-npm@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/cspell-dict-npm/-/cspell-dict-npm-1.0.9.tgz#91fa4704a43a6017c89e9c76d5aebe054836f69e"
+  integrity sha512-0KqNjm6MRx1JmGe51OTDA826nhafcGvUdB3Kxr6fD3EpshD+i++HWB521ulzCZgu9ZPlcYYYjQn+YUf8RRdEWQ==
+  dependencies:
+    configstore "^5.0.0"
+
+cspell-dict-php@^1.0.22:
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/cspell-dict-php/-/cspell-dict-php-1.0.22.tgz#f9925132f126767098dd82de3854b5a738e79bb4"
+  integrity sha512-QCEsYS8+Jl6zL8HCM3IlgNnTAZJ9DIXzwsl1LP8dYNgYsMbUh3ip6Y5/12yqf6YOO+MbA5TSvCbCkg2tWpd6Tg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-powershell@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/cspell-dict-powershell/-/cspell-dict-powershell-1.0.13.tgz#d2f41a79802fd4b3e6047f00bac8ccc420887410"
+  integrity sha512-7q1Y0nhzieYmR8Ts+NJgkL5+0hDwlagm618IFDwz31eqzfr3sFJSuancxV2nvIEof0DFoYwCBynw/dmc/b9szg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-python@^1.0.30:
+  version "1.0.30"
+  resolved "https://registry.yarnpkg.com/cspell-dict-python/-/cspell-dict-python-1.0.30.tgz#0f2d9163eae5600982414dacbec89c5e06bc83bc"
+  integrity sha512-1fKsbDmd5xVplcPFk8lV2J2H72ikyhq4lSIytl25ZmApn1ZbX0Xuio8W2eVKOJC9F4RXPsObWDK/+Svgsm9SCg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-ruby@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/cspell-dict-ruby/-/cspell-dict-ruby-1.0.11.tgz#e78198a47717de48e2f5bd82e6e1d8c13f442cd0"
+  integrity sha512-g8btqTC17NjFuPiYUoEMZ/FuQhk1G1z/RZbqAUYpzc7GgwQOMKA6k28uxLm4A1zm8+h/qdk8KREODgWOlKxSRg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-rust@^1.0.21:
+  version "1.0.21"
+  resolved "https://registry.yarnpkg.com/cspell-dict-rust/-/cspell-dict-rust-1.0.21.tgz#57f826c1a6a456da057cd1621304a167f470ead4"
+  integrity sha512-tAwnTYoqEgmhwaJpriyjm84/YvBBp/pdOCZVNDmntT5fbOtR7wEmXRv9VFnEs/Lui5nycbkJpk8pbimhbawzPg==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-scala@^1.0.20:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/cspell-dict-scala/-/cspell-dict-scala-1.0.20.tgz#683c66afa59e8e0d04d78c89871be312632b2e28"
+  integrity sha512-j0/IpCIyjUpBcZRGiiU2+2i8emv/v0Q1fv+KGT0Ig8rNQAeZfBtJ7NrrSpy1ooDQk61I5maNJSr9w4/Yl4nssA==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-software-terms@^1.0.22:
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/cspell-dict-software-terms/-/cspell-dict-software-terms-1.0.22.tgz#faecfa7dfa365af604cce7954fe2212dfcc57d5b"
+  integrity sha512-dEaq4k8aSJwjTze/dYquOmlrBpFyIiaFpFYDBIn3i4syTGCFDB4z6LLvfUB4IGbk1j1dkkuL6+glPDqHLGo03A==
+  dependencies:
+    configstore "^5.0.1"
+
+cspell-dict-typescript@^1.0.15:
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/cspell-dict-typescript/-/cspell-dict-typescript-1.0.15.tgz#a50ddb89cb123bc510d271850a9fdb2693999ca4"
+  integrity sha512-26GRbsSZNmvmSzBISEg8s6d7WFOH79rhZMpCzKmbzZ5IML6/213eXY1PSweiQ4/AAwexs+L0H4zRoUtO6ZuGyQ==
   dependencies:
     configstore "^5.0.1"
 
@@ -2671,61 +2671,62 @@ cspell-glob@^0.1.25:
   dependencies:
     micromatch "^4.0.2"
 
-cspell-io@^4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-4.1.6.tgz#d3300a08fc4ebcd87748b620f4cfdcbc6f238aa5"
-  integrity sha512-S8Fk1uBrZGt9vcztKQkMIi2qpGT1R0eqTZ+5v5++nZDkryKkix8iTkNldH7cxIvqTQU9Tr7afFI/0RXSEEn8Eg==
+cspell-io@^4.1.7:
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-4.1.7.tgz#ff2c0d44560fe26fa8c5714d2b973a940a66bffe"
+  integrity sha512-V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ==
   dependencies:
     iconv-lite "^0.6.2"
     iterable-to-stream "^1.0.1"
 
-cspell-lib@^4.3.6:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-4.3.6.tgz#fd06b8a85204ea2d35d837ac1385c231c1baa889"
-  integrity sha512-Bm7AEdbjy5rNqGdOulTZVV/P6eUweDivYIZss29T3j3dUFu99spG73zGmKVxTddB7RNdb4MsfLwtnZvWXr98IA==
+cspell-lib@^4.3.7:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-4.3.7.tgz#f8b4410fa44b09117e4fc8d148ca3b2ef18cef28"
+  integrity sha512-J9DP1z3Zc5HPNHkJ+eDvbQ3DoCRs2Kr8s1mfG7yXfUqxybPfF21wA/DZZ/Z6S49LjavoSxgEeHZ/hGEzq4ALSg==
   dependencies:
     comment-json "^4.1.0"
     configstore "^5.0.1"
-    cspell-dict-aws "^1.0.9"
-    cspell-dict-bash "^1.0.7"
-    cspell-dict-companies "^1.0.31"
-    cspell-dict-cpp "^1.1.33"
-    cspell-dict-cryptocurrencies "^1.0.6"
-    cspell-dict-csharp "^1.0.6"
-    cspell-dict-css "^1.0.6"
-    cspell-dict-django "^1.0.21"
-    cspell-dict-dotnet "^1.0.20"
-    cspell-dict-elixir "^1.0.19"
-    cspell-dict-en-gb "^1.1.24"
-    cspell-dict-en_us "^1.2.34"
-    cspell-dict-filetypes "^1.1.1"
-    cspell-dict-fonts "^1.0.9"
-    cspell-dict-fullstack "^1.0.32"
-    cspell-dict-golang "^1.1.20"
-    cspell-dict-haskell "^1.0.8"
-    cspell-dict-html "^1.1.1"
-    cspell-dict-html-symbol-entities "^1.0.19"
-    cspell-dict-java "^1.0.18"
-    cspell-dict-latex "^1.0.19"
-    cspell-dict-lorem-ipsum "^1.0.18"
-    cspell-dict-lua "^1.0.12"
-    cspell-dict-node "^1.0.5"
-    cspell-dict-npm "^1.0.6"
-    cspell-dict-php "^1.0.19"
-    cspell-dict-powershell "^1.0.10"
-    cspell-dict-python "^1.0.27"
-    cspell-dict-ruby "^1.0.8"
-    cspell-dict-rust "^1.0.18"
-    cspell-dict-scala "^1.0.17"
-    cspell-dict-software-terms "^1.0.19"
-    cspell-dict-typescript "^1.0.12"
-    cspell-io "^4.1.6"
+    cspell-dict-aws "^1.0.12"
+    cspell-dict-bash "^1.0.10"
+    cspell-dict-companies "^1.0.34"
+    cspell-dict-cpp "^1.1.36"
+    cspell-dict-cryptocurrencies "^1.0.9"
+    cspell-dict-csharp "^1.0.9"
+    cspell-dict-css "^1.0.9"
+    cspell-dict-django "^1.0.24"
+    cspell-dict-dotnet "^1.0.23"
+    cspell-dict-elixir "^1.0.22"
+    cspell-dict-en-gb "^1.1.27"
+    cspell-dict-en_us "^1.2.37"
+    cspell-dict-filetypes "^1.1.4"
+    cspell-dict-fonts "^1.0.12"
+    cspell-dict-fullstack "^1.0.35"
+    cspell-dict-golang "^1.1.23"
+    cspell-dict-haskell "^1.0.11"
+    cspell-dict-html "^1.1.4"
+    cspell-dict-html-symbol-entities "^1.0.22"
+    cspell-dict-java "^1.0.21"
+    cspell-dict-latex "^1.0.22"
+    cspell-dict-lorem-ipsum "^1.0.21"
+    cspell-dict-lua "^1.0.15"
+    cspell-dict-node "^1.0.8"
+    cspell-dict-npm "^1.0.9"
+    cspell-dict-php "^1.0.22"
+    cspell-dict-powershell "^1.0.13"
+    cspell-dict-python "^1.0.30"
+    cspell-dict-ruby "^1.0.11"
+    cspell-dict-rust "^1.0.21"
+    cspell-dict-scala "^1.0.20"
+    cspell-dict-software-terms "^1.0.22"
+    cspell-dict-typescript "^1.0.15"
+    cspell-io "^4.1.7"
     cspell-trie-lib "^4.2.6"
-    cspell-util-bundle "^4.1.8"
+    cspell-util-bundle "^4.1.9"
     fs-extra "^9.0.1"
     gensequence "^3.1.1"
     minimatch "^3.0.4"
     resolve-from "^5.0.0"
+    resolve-global "^1.0.0"
     vscode-uri "^2.1.2"
 
 cspell-trie-lib@^4.2.6:
@@ -2735,21 +2736,21 @@ cspell-trie-lib@^4.2.6:
   dependencies:
     gensequence "^3.1.1"
 
-cspell-util-bundle@^4.1.8:
-  version "4.1.8"
-  resolved "https://registry.yarnpkg.com/cspell-util-bundle/-/cspell-util-bundle-4.1.8.tgz#c57ffb8fc87f57852a2302553e54a5da94a28ca4"
-  integrity sha512-Cm9fG7dsdveKEtWAN8TgljhW8OU7OQX4vX3ZFg6o9FQfo6rNoX8nwyxXRq60YjbKNBf1d6/ZSozsqS4vq2uLzQ==
+cspell-util-bundle@^4.1.9:
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/cspell-util-bundle/-/cspell-util-bundle-4.1.9.tgz#7a92fcf427ec67601f96e4bb4e473557dae5d906"
+  integrity sha512-ytYWn+EmSuthkh+GOKqLpBXsa5mnSBvOgl58IF04zB8LvjQpzRdo1FJkiQiy+HYPMl1xUmcLDqcAhvANzNGDMg==
 
-cspell@4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/cspell/-/cspell-4.2.2.tgz#cecc6b82c733fb859444a04f9d8df0dd652f692e"
-  integrity sha512-NqObIP0ljFs/f//pA4D8rwqC9XHW2TY3CMNunp0nPQzVk/GanIqTEtMDZEZrVG1wnxHEndUIHlw05+rEYejkQg==
+cspell@4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/cspell/-/cspell-4.2.3.tgz#34a49daf8ec8010ed7a2a3d09ba8b186d6d2ff86"
+  integrity sha512-ox83ITQ4+HZFDANS+rMuyBkv6TxZdwq6FiLQkg+Xv6zJWnMkBPkGrTm03xeuAIfGWHlO+fOSS6p9c7rT9rBL7g==
   dependencies:
     chalk "^4.1.0"
     commander "^6.1.0"
     comment-json "^4.0.6"
     cspell-glob "^0.1.25"
-    cspell-lib "^4.3.6"
+    cspell-lib "^4.3.7"
     fs-extra "^9.0.1"
     gensequence "^3.1.1"
     get-stdin "^8.0.0"
@@ -3728,6 +3729,13 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+global-dirs@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
+  dependencies:
+    ini "^1.3.4"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -3969,6 +3977,11 @@ inherits@2, inherits@^2.0.0:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+ini@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
 internal-slot@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
@@ -6270,6 +6283,13 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
+resolve-global@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255"
+  integrity sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==
+  dependencies:
+    global-dirs "^0.1.1"
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"

From a29c149e073130795542bc1420a1abed79153746 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Nov 2020 15:03:03 +0800
Subject: [PATCH 140/299] Build(deps-dev): Bump rollup from 2.33.3 to 2.34.0
 (#9795)

Bumps [rollup](https://github.com/rollup/rollup) from 2.33.3 to 2.34.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v2.33.3...v2.34.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 33fef5ee9..e36aad736 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "path-browserify": "1.0.1",
     "prettier": "2.2.1",
     "rimraf": "3.0.2",
-    "rollup": "2.33.3",
+    "rollup": "2.34.0",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-terser": "7.0.2",
     "shelljs": "0.8.4",
diff --git a/yarn.lock b/yarn.lock
index 9b698586e..6ef48485c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6356,10 +6356,10 @@ rollup-pluginutils@^2.3.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@2.33.3:
-  version "2.33.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.3.tgz#ae72ce31f992b09a580072951bfea76e9df17342"
-  integrity sha512-RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w==
+rollup@2.34.0:
+  version "2.34.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.34.0.tgz#ecc7f1d4ce2cb88bb51bec2f56b984f3c35b8271"
+  integrity sha512-dW5iLvttZzdVehjEuNJ1bWvuMEJjOWGmnuFS82WeKHTGXDkRHQeq/ExdifkSyJv9dLcR86ysKRmrIDyR6O0X8g==
   optionalDependencies:
     fsevents "~2.1.2"
 

From 67eb19a16e2a2253318745b6f2b84381dfd7b91f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Nov 2020 15:03:22 +0800
Subject: [PATCH 141/299] Build(deps-dev): Bump webpack from 5.8.0 to 5.9.0
 (#9794)

Bumps [webpack](https://github.com/webpack/webpack) from 5.8.0 to 5.9.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.8.0...v5.9.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e36aad736..a194ad75f 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "synchronous-promise": "2.0.15",
     "tempy": "1.0.0",
     "terser-webpack-plugin": "5.0.3",
-    "webpack": "5.8.0"
+    "webpack": "5.9.0"
   },
   "scripts": {
     "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
diff --git a/yarn.lock b/yarn.lock
index 6ef48485c..658588c51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7429,10 +7429,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.8.0.tgz#65f00a181708279ff982c2d7338e1dd5505364c4"
-  integrity sha512-X2yosPiHip3L0TE+ylruzrOqSgEgsdGyBOGFWKYChcwlKChaw9VodZIUovG1oo7s0ss6e3ZxBMn9tXR+nkPThA==
+webpack@5.9.0:
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.9.0.tgz#af2e9cf9d6c7867cdcf214ea3bb5eb77aece6895"
+  integrity sha512-YnnqIV/uAS5ZrNpctSv378qV7HmbJ74DL+XfvMxzbX1bV9e7eeT6eEWU4wuUw33CNr/HspBh7R/xQlVjTEyAeA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From c0fbd752887861ce018e50abea9b69d07a4c77f1 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 30 Nov 2020 18:10:09 +0800
Subject: [PATCH 142/299] Fix empty front matter formatting (#9791)

---
 changelog_unreleased/markdown/9791.md         | 44 +++++++++++++++
 src/utils/front-matter.js                     |  4 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 23 ++++++++
 tests/css/front-matter/empty.css              |  5 ++
 .../__snapshots__/jsfmt.spec.js.snap          | 43 +++++++++++++++
 tests/html/front-matter/empty.html            |  5 ++
 tests/html/front-matter/empty2.html           |  6 +++
 .../__snapshots__/jsfmt.spec.js.snap          | 54 +++++++++++++++++++
 tests/markdown/front-matter/empty-2.md        | 10 ++++
 tests/markdown/front-matter/empty.md          |  5 ++
 10 files changed, 197 insertions(+), 2 deletions(-)
 create mode 100644 changelog_unreleased/markdown/9791.md
 create mode 100644 tests/css/front-matter/empty.css
 create mode 100644 tests/html/front-matter/empty.html
 create mode 100644 tests/html/front-matter/empty2.html
 create mode 100644 tests/markdown/front-matter/empty-2.md
 create mode 100644 tests/markdown/front-matter/empty.md

diff --git a/changelog_unreleased/markdown/9791.md b/changelog_unreleased/markdown/9791.md
new file mode 100644
index 000000000..983136a64
--- /dev/null
+++ b/changelog_unreleased/markdown/9791.md
@@ -0,0 +1,44 @@
+#### Fix empty front matter formatting (#9791 by @fisker)
+
+<!-- prettier-ignore -->
+```markdown
+<!-- Input -->
+---
+---
+
+# Title
+
+a|b|c|
+|:--|:-:|--:|
+|d|e|f|
+
+---
+
+text
+
+<!-- Prettier stable -->
+---
+---
+# Title
+
+a|b|c|
+|:--|:-:|--:|
+|d|e|f|
+---
+
+text
+
+<!-- Prettier master -->
+---
+---
+
+# Title
+
+| a   |  b  |   c |
+| :-- | :-: | --: |
+| d   |  e  |   f |
+
+---
+
+text
+```
diff --git a/src/utils/front-matter.js b/src/utils/front-matter.js
index bd1b83f5e..d4d9c4119 100644
--- a/src/utils/front-matter.js
+++ b/src/utils/front-matter.js
@@ -16,7 +16,7 @@ function parse(text) {
   const match = text.match(
     // trailing spaces after delimiters are allowed
     new RegExp(
-      `^(${delimiterRegex})([^\\n]*)\\n(?:([\\s\\S]*?)\\n)?\\1[^\\n\\S]*(\\n|$)`
+      `^(${delimiterRegex})([^\\n]*)\\n(?:|([\\s\\S]*?)\\n)\\1[^\\n\\S]*(\\n|$)`
     )
   );
 
@@ -24,7 +24,7 @@ function parse(text) {
     return { frontMatter: null, content: text };
   }
 
-  const [raw, delimiter, language, value] = match;
+  const [raw, delimiter, language, value = ""] = match;
   let lang = DELIMITER_MAP[delimiter];
   if (lang !== "toml" && language && language.trim()) {
     lang = language.trim();
diff --git a/tests/css/front-matter/__snapshots__/jsfmt.spec.js.snap b/tests/css/front-matter/__snapshots__/jsfmt.spec.js.snap
index 2b4909fe2..02ef26b9e 100644
--- a/tests/css/front-matter/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/css/front-matter/__snapshots__/jsfmt.spec.js.snap
@@ -26,3 +26,26 @@ description: Description
 
 ================================================================================
 `;
+
+exports[`empty.css format 1`] = `
+====================================options=====================================
+parsers: ["css", "scss", "less"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+---
+---
+/* comment */
+.something
+{}
+
+=====================================output=====================================
+---
+---
+
+/* comment */
+.something {
+}
+
+================================================================================
+`;
diff --git a/tests/css/front-matter/empty.css b/tests/css/front-matter/empty.css
new file mode 100644
index 000000000..997920993
--- /dev/null
+++ b/tests/css/front-matter/empty.css
@@ -0,0 +1,5 @@
+---
+---
+/* comment */
+.something
+{}
diff --git a/tests/html/front-matter/__snapshots__/jsfmt.spec.js.snap b/tests/html/front-matter/__snapshots__/jsfmt.spec.js.snap
index 8a8f13075..b4f37fa75 100644
--- a/tests/html/front-matter/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html/front-matter/__snapshots__/jsfmt.spec.js.snap
@@ -29,6 +29,49 @@ slug: home
 ================================================================================
 `;
 
+exports[`empty.html format 1`] = `
+====================================options=====================================
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+---
+---
+
+<h1>
+  Hello world!</h1>
+
+=====================================output=====================================
+---
+---
+
+<h1>Hello world!</h1>
+
+================================================================================
+`;
+
+exports[`empty2.html format 1`] = `
+====================================options=====================================
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+---
+---
+
+<div>
+---
+</div>
+
+=====================================output=====================================
+---
+---
+
+<div>---</div>
+
+================================================================================
+`;
+
 exports[`issue-9042.html format 1`] = `
 ====================================options=====================================
 parsers: ["html"]
diff --git a/tests/html/front-matter/empty.html b/tests/html/front-matter/empty.html
new file mode 100644
index 000000000..eca1bfac3
--- /dev/null
+++ b/tests/html/front-matter/empty.html
@@ -0,0 +1,5 @@
+---
+---
+
+<h1>
+  Hello world!</h1>
diff --git a/tests/html/front-matter/empty2.html b/tests/html/front-matter/empty2.html
new file mode 100644
index 000000000..41c2577f5
--- /dev/null
+++ b/tests/html/front-matter/empty2.html
@@ -0,0 +1,6 @@
+---
+---
+
+<div>
+---
+</div>
diff --git a/tests/markdown/front-matter/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/front-matter/__snapshots__/jsfmt.spec.js.snap
index 7a77b0bf4..0e51653ca 100644
--- a/tests/markdown/front-matter/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/markdown/front-matter/__snapshots__/jsfmt.spec.js.snap
@@ -25,3 +25,57 @@ __123__
 
 ================================================================================
 `;
+
+exports[`empty.md format 1`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+---
+---
+
+__123__
+**456**
+
+=====================================output=====================================
+---
+---
+
+**123**
+**456**
+
+================================================================================
+`;
+
+exports[`empty-2.md format 1`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+---
+---
+
+# Title 1
+
+Hello, world
+
+---
+
+text
+
+=====================================output=====================================
+---
+---
+
+# Title 1
+
+Hello, world
+
+---
+
+text
+
+================================================================================
+`;
diff --git a/tests/markdown/front-matter/empty-2.md b/tests/markdown/front-matter/empty-2.md
new file mode 100644
index 000000000..56e619df7
--- /dev/null
+++ b/tests/markdown/front-matter/empty-2.md
@@ -0,0 +1,10 @@
+---
+---
+
+# Title 1
+
+Hello, world
+
+---
+
+text
diff --git a/tests/markdown/front-matter/empty.md b/tests/markdown/front-matter/empty.md
new file mode 100644
index 000000000..cb9315eb3
--- /dev/null
+++ b/tests/markdown/front-matter/empty.md
@@ -0,0 +1,5 @@
+---
+---
+
+__123__
+**456**

From fdaaf2298a7a9305f46619d3eecbd8d7aa717bfb Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 30 Nov 2020 18:10:30 +0800
Subject: [PATCH 143/299] Refactor: Stop mutating AST during
 `getSortedChildNodes` (#9797)

---
 src/main/comments.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/comments.js b/src/main/comments.js
index 57db1e932..448e83028 100644
--- a/src/main/comments.js
+++ b/src/main/comments.js
@@ -26,8 +26,7 @@ const {
   addTrailingComment,
 } = require("../common/util");
 
-const childNodesCacheKey = Symbol("child-nodes");
-
+const childNodesCache = new WeakMap();
 function getSortedChildNodes(node, options, resultArray) {
   if (!node) {
     return;
@@ -51,8 +50,8 @@ function getSortedChildNodes(node, options, resultArray) {
       resultArray.splice(i + 1, 0, node);
       return;
     }
-  } else if (node[childNodesCacheKey]) {
-    return node[childNodesCacheKey];
+  } else if (childNodesCache.has(node)) {
+    return childNodesCache.get(node);
   }
 
   const childNodes =
@@ -75,10 +74,8 @@ function getSortedChildNodes(node, options, resultArray) {
   }
 
   if (!resultArray) {
-    Object.defineProperty(node, childNodesCacheKey, {
-      value: (resultArray = []),
-      enumerable: false,
-    });
+    resultArray = [];
+    childNodesCache.set(node, resultArray);
   }
 
   childNodes.forEach((childNode) => {

From 8f5691a088a39acdc5bbad12dda508e492445c50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Dec 2020 14:13:53 +0800
Subject: [PATCH 144/299] Build(deps-dev): Bump cspell from 4.2.3 to 4.2.5
 (#9803)

Bumps [cspell](https://github.com/streetsidesoftware/cspell) from 4.2.3 to 4.2.5.
- [Release notes](https://github.com/streetsidesoftware/cspell/releases)
- [Changelog](https://github.com/streetsidesoftware/cspell/blob/master/CHANGELOG.md)
- [Commits](https://github.com/streetsidesoftware/cspell/compare/cspell@4.2.3...cspell@4.2.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 492 ++++++++++++++++++++++-----------------------------
 2 files changed, 214 insertions(+), 280 deletions(-)

diff --git a/package.json b/package.json
index a194ad75f..e150c35c8 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "benchmark": "2.1.4",
     "builtin-modules": "3.1.0",
     "cross-env": "7.0.2",
-    "cspell": "4.2.3",
+    "cspell": "4.2.5",
     "eslint": "7.14.0",
     "eslint-config-prettier": "6.15.0",
     "eslint-formatter-friendly": "7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 658588c51..9eeab61e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -872,6 +872,171 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@cspell/dict-aws@^1.0.12":
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-aws/-/dict-aws-1.0.12.tgz#34fab54e0cc8ce0384c9e298fe584a3290d4eea2"
+  integrity sha512-2jI3VCdizeFssndayOco36HiTnWVG6SYc49sMazSdu/hJwKdvoT/5CX5qXOG6I0hU+L0Q964pGjhk05NTFeG2g==
+
+"@cspell/dict-bash@^1.0.10":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-bash/-/dict-bash-1.0.10.tgz#223e0f676dbbf8f928bbf502ccf2166498edbb96"
+  integrity sha512-xYEOfGeqJUvGr5EPggMA9b/LQt3bw7k29pXeLHbpOymbAmb1rYVg69oSItZDMXenqG/KjNdx885qKtJA3OlRkQ==
+
+"@cspell/dict-companies@^1.0.34":
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-companies/-/dict-companies-1.0.34.tgz#2ce261c9c8de1637a721828c18593268a6c24f1c"
+  integrity sha512-zwCa+8Z/du3WOwH2pzEQynckIKMHi2ZoK+VYDRz2/+jatpueOYoPJRjMKpTAigQuOEXM7k5y5XR9piyrrteYWA==
+
+"@cspell/dict-cpp@^1.1.36":
+  version "1.1.36"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-cpp/-/dict-cpp-1.1.36.tgz#138e845074a5bb42a1d97da3eb3e531175005a1c"
+  integrity sha512-c2jWVVPWTzEV+puML05NeZRk+loUve6uonLRrL1L6WhZDKNEE6HJCqTPw7E91xck75fl3UPhriYrVNOE5UAInQ==
+
+"@cspell/dict-cryptocurrencies@^1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-1.0.9.tgz#babe24a0e11a04027829f08442547f3b68231cc5"
+  integrity sha512-n7P4uIO3cykPFxST5DJFEpdgCg6HzmMuO+RBpIj9oW+urRHrg97LrIVrMa8Xqk2eJ1hnFWnWyUm8JA8g8ego0w==
+
+"@cspell/dict-csharp@^1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-csharp/-/dict-csharp-1.0.9.tgz#937a07ad265cd9deca2576f498def742bc1fff9f"
+  integrity sha512-GHEOX40Bk4OeDL/RgW1MIrMH7S3oEnrjIpsh+cOTWBxsqj25LcOCF0pA7c9zsjbJy9xTMS2ZRL3iBVU8AaS6rg==
+
+"@cspell/dict-css@^1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-css/-/dict-css-1.0.9.tgz#44a2e817768f0bf0ea1606a8a5d42b0dd6316c11"
+  integrity sha512-S2mJEZRZ0oF+RqfbGNkmWIf/5uDUN6mIveUXRrOPatX42gTUiZZ0iIpdjadeW9Eg/M8f2u7LjKlqT6bZ39azjA==
+
+"@cspell/dict-django@^1.0.24":
+  version "1.0.24"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-django/-/dict-django-1.0.24.tgz#7b9a9b23cfc7472677eca9bda6ad3515d7b218f6"
+  integrity sha512-Fwx1XMVMhd2CL7aW0W8S8hDyMnsl6ipah3H1YIb/m+IemdISZYy1zk+EplXmQxuReausk7IRtQMXWvvtiEhWRQ==
+
+"@cspell/dict-dotnet@^1.0.23":
+  version "1.0.23"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-dotnet/-/dict-dotnet-1.0.23.tgz#0482a052e35d50430d8824d47812d1c07cbe3dfe"
+  integrity sha512-st7Kbzf88L4ZWh4+5y2S66ub7D/VU+gS1m15avYu6qFGOMq/xxZViudHfv4rqPSoEo8aOwOYb7k7pFCH8D5yqA==
+
+"@cspell/dict-elixir@^1.0.22":
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-elixir/-/dict-elixir-1.0.22.tgz#2fbf1bb5c3ac84793e3e403462592435519982a3"
+  integrity sha512-Ik4UDk9o0LH3wVPyEFpT4syiZMWrkdPzKxQDKuQXhveHtayIQvTSQ3AeoNOSSu9w0EGYWyYY4ZNX6Cwbk2vxqg==
+
+"@cspell/dict-en-gb@^1.1.27":
+  version "1.1.27"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-en-gb/-/dict-en-gb-1.1.27.tgz#5c567fcc0f737e9ac8dc8fa76eb39928a6a2b35b"
+  integrity sha512-0tY939q0vzmsUotKQe/i8mDGqiiw4V3Kv/nkTvxFfVQAd6JRfpWBKlMbVV5Oy37nQkQiwkDLY4v90AbyqOvG8Q==
+
+"@cspell/dict-en_us@^1.2.37":
+  version "1.2.37"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-en_us/-/dict-en_us-1.2.37.tgz#3e45e4c43bd3cbacdddadec449e565eb0b51749c"
+  integrity sha512-03QYjVBsjCYzDOkK0GKAF0YmshPwXp56efgN1uYd1BS5t5lMOFix/5hH8UYuBK2o2db0o/Kuw5GWMgKtBkO/5Q==
+
+"@cspell/dict-filetypes@^1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-filetypes/-/dict-filetypes-1.1.4.tgz#ccfda35c3c52ce3a6493b31a7a9817de119ebb78"
+  integrity sha512-X3+noNfQQr3u/oL/RkD3Vg+R+3H1lV+m8Kdn2nfCkkLaDen3/QQ8Z9NM7vbm1zwyTlIKGcM3u1IqKIwhAXQOqA==
+
+"@cspell/dict-fonts@^1.0.12":
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-fonts/-/dict-fonts-1.0.12.tgz#1a081bf5ec7bc1dbffa2f93fc01d60142097285e"
+  integrity sha512-BVvU9YoXf7EhTk4m+oLWxkSAVDWS994q10YhsR5QNQ5SejuMsmBIyqph0hoBidXvhIE5B736zPLoMkqon7NNig==
+
+"@cspell/dict-fullstack@^1.0.35":
+  version "1.0.35"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-fullstack/-/dict-fullstack-1.0.35.tgz#a6580fe86cf3bdcef9f650429a0e98e3c643979a"
+  integrity sha512-gTnxIeZ9A3dW/qBCvl2ZuQqE+IeL5uOHmrTFw7tA+mLEgknNUwSdmoGu82pmH/sTbH223U07nSglNqhY0hH/Wg==
+
+"@cspell/dict-golang@^1.1.23":
+  version "1.1.23"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-golang/-/dict-golang-1.1.23.tgz#724acc8cc8f2c212a77992c2f96849885fae98a4"
+  integrity sha512-FE1IenW5vFLaRk4AFhVYRlWKQhqjFApQ76+2dDxJdDxLIWOC+EOJmIBP4asAD57NT/Dz7sKw4grtkLu4vB+s9Q==
+
+"@cspell/dict-haskell@^1.0.11":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-haskell/-/dict-haskell-1.0.11.tgz#b81553e4f34ae4276106028730cfc0e879cf3ec7"
+  integrity sha512-sE0+Hnl+/iUc9rbHQHSZF9r0AP2SxnXRL7IbLDhy/zCrBMgvsYNOgRjC9tI0uxr5vRTEgBKumrUIduXiI0GICA==
+
+"@cspell/dict-html-symbol-entities@^1.0.22":
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-1.0.22.tgz#6eef114162d8d5a97b8aa04b08315ccab73c6a5f"
+  integrity sha512-Ai4nho7DRRwsXeez0Lc8PPOoN5A060aAv0ICQmB4YjpA2YVvVTmz6/mI6JbTJFF3V+WKd7YK448PuccNlUgDcQ==
+
+"@cspell/dict-html@^1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-html/-/dict-html-1.1.4.tgz#0b61f731807bd268b2f116e5755b93bf8ee4774f"
+  integrity sha512-torS96vNxwdwliAj77FGswqZlPZmTgZrtLu+5S1JRhGrNN2wVDRJvKG2KiiiFq4qP+xiRlWlpTybRGa6ldZkFQ==
+
+"@cspell/dict-java@^1.0.21":
+  version "1.0.21"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-java/-/dict-java-1.0.21.tgz#6ef37ebf743e8070f3537b49b000e20c361bb714"
+  integrity sha512-jgrJmwyOXixGbXjvIny/fptFrNzFvBnMkYKDWQYHsHK7zrv0+RFFmWIQLLBvtnnX98hT2dhGmoR/tiZnsa6Xvg==
+
+"@cspell/dict-latex@^1.0.22":
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-latex/-/dict-latex-1.0.22.tgz#6989acbf1c043c6de247c42dde66a272f61acf50"
+  integrity sha512-DlPbT1XE3gAla1ogIlG4BeYIT+ql2o5iYBqlj2iqhE8wyH54UGLKObmBx8K+tQqIKsQm5NfoNZ7uBcGXBwcQww==
+
+"@cspell/dict-lorem-ipsum@^1.0.21":
+  version "1.0.21"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-1.0.21.tgz#3ad60e3c82dfcfd7fc940568d46d560cd2faaed9"
+  integrity sha512-1eXhTePkDpCYYmiwRFEECEjgOnvSMfEiGGd9Ku+P4p+mj2LmFdejfzWhyr9agrcbj9YD0OWwEBluiRg4QAs9kQ==
+
+"@cspell/dict-lua@^1.0.15":
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-lua/-/dict-lua-1.0.15.tgz#d4830cb04510e2715cf1c8e3d811d40b428cec20"
+  integrity sha512-/3L5oHxErLd4SPwgJ10SCBcidGP+obJ9V1QAhBF10ktAPD9b3larrXam01G2zn1H6lMJjuOm9Q4iJOV5rL3TsQ==
+
+"@cspell/dict-node@^1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-node/-/dict-node-1.0.8.tgz#ff66cc2428906b4468133120edf043fa37a6097d"
+  integrity sha512-3Pc2Np66BjaeNtcScrGjRTzyHe8UuFFrZGStzo1zx89MnKx6gT3XagIwmLjm6kGzUbtoAnKY2U2FugIOSQ7dLA==
+
+"@cspell/dict-npm@^1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-npm/-/dict-npm-1.0.9.tgz#d5b0b7b0f2a904ca49d1a48be91dfae148064b99"
+  integrity sha512-LyV/uUV8TPq7JKXRvN4Bm/be9qgXbCL2oLdZ/D01dljsRBmlgg5hmDaa8SY+msitnTyJ1MKtEsQiwlH2CbGgow==
+
+"@cspell/dict-php@^1.0.22":
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-php/-/dict-php-1.0.22.tgz#577eb43d2f3965b239ddee3d3b337e7cee0dc73c"
+  integrity sha512-SWkz/3EB00irqRyF7UG7bgO2oh1K1JAhKB4BHfW7HKDec6Zb6IapNvvXaS5ham/oXqjy6IigDVoY7sgVRJ2sZg==
+
+"@cspell/dict-powershell@^1.0.13":
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-powershell/-/dict-powershell-1.0.13.tgz#1815a54e1634722e6f7ce4a70e6d44db0455bf79"
+  integrity sha512-6dOPZiKac4ycoFUtcw/zsLrlL2uoTorgKkX0wtRlBu3rnD6FiN/2UD9rfnl/tbd6dM0SvS2Adxb3HkV2teVGbQ==
+
+"@cspell/dict-python@^1.0.30":
+  version "1.0.30"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-python/-/dict-python-1.0.30.tgz#31ba036ee3e9ca8686a282e9ff0662376f3c4a81"
+  integrity sha512-9ej3jHJxcTpGl3fQMeInZ7m1zD8tEAJU81C7C9FfxsyO0t1eMNB+q/lU72p8lfuNHFSz2Kb8Q+swMw7j1guIUg==
+
+"@cspell/dict-ruby@^1.0.11":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-ruby/-/dict-ruby-1.0.11.tgz#c064a522cdc52b0bc78ee7d77951f32f259f8219"
+  integrity sha512-n/KZqm68wOemeV1vp6340yIJDclXO/p8dFvDnjR8hUJP1l7p4p/QzY1K4HFDv/744V4sqTSF0dXJia8uXiuwBA==
+
+"@cspell/dict-rust@^1.0.21":
+  version "1.0.21"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-rust/-/dict-rust-1.0.21.tgz#21e416270d10425255d87bc03237f1dd6fe11d2d"
+  integrity sha512-13O1Gvfc9aSK+r5kRT+Bqe2+/QYQbM0yWsD4KV8pTG1xNxDQOzS02dzjbd4MpmCjzYFO1H+Zz//iZpX4vxnawA==
+
+"@cspell/dict-scala@^1.0.20":
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-scala/-/dict-scala-1.0.20.tgz#3b81522df6d402b0d54b0a125a6570486fce0df5"
+  integrity sha512-JkVCjsn3lUmh5EdeoKttedN2pCXvQJzz5jtbr5Hfer7oLC6flre58yPpaC1kyfOP1lCpg31FQSUnhlB6AyJNDQ==
+
+"@cspell/dict-software-terms@^1.0.22":
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-1.0.22.tgz#6caf5850a0451fb518b592f63f487305860f15b6"
+  integrity sha512-mZgKYgL6EXXeEdzc+XlRNDdTmLAvl1L+muijAiwyRxfJnP5yznoxvyN0v51dTraRYA9xxoqKzNlT5gPQkLc7hQ==
+
+"@cspell/dict-typescript@^1.0.15":
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-typescript/-/dict-typescript-1.0.15.tgz#97cd4357f5715b91178a93b6c1dcab5f6d0591ec"
+  integrity sha512-Guh+nN57OqbcRNH6cfbBQKfeDp0i+GBlniYvhWvaRxkSdFQJi4YgFKvQJsvtwLkwmNqYkQIXQr+8zXhuvTHLhA==
+
 "@eslint/eslintrc@^0.2.1":
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
@@ -2348,7 +2513,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-configstore@^5.0.0, configstore@^5.0.1:
+configstore@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
   integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
@@ -2433,237 +2598,6 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-cspell-dict-aws@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/cspell-dict-aws/-/cspell-dict-aws-1.0.12.tgz#f036e191bb58da8e8ea285be61c7c7e5c86f039d"
-  integrity sha512-kAe+VnSucsrpcFKVV0oTU8P25NtefpGy8fYEFvjnqk8A2CVFlD5pK4mNkD6ztTrArxWz3orvDUlWw+ndw4itFw==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-bash@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/cspell-dict-bash/-/cspell-dict-bash-1.0.10.tgz#3a6b278d12efdab5254d46964a229322ba417354"
-  integrity sha512-uPjdXyb+YBMwg3r+l0ZuB3R83OSu5WJ2MbuoK+ImxngNiXxUicDPG96S1H1eEN9IY62c1OiX6nbzRzxAoS4amQ==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-companies@^1.0.34:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/cspell-dict-companies/-/cspell-dict-companies-1.0.34.tgz#7b258ab4d0c48a31939e7dfe0de5c660e304a9bd"
-  integrity sha512-SxFE+a4TJheuO1QdCf2oqIlL+KWzbQqs7ibHdtLlZ+TR/0lO29ghlrlXpknj/wGzz39AqKvGkdOLSiz3kF4uDg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-cpp@^1.1.36:
-  version "1.1.36"
-  resolved "https://registry.yarnpkg.com/cspell-dict-cpp/-/cspell-dict-cpp-1.1.36.tgz#f1690325cfbb3a74fb7745cfb05de197632069ea"
-  integrity sha512-FrQk2XScnY/KTmY5Q7ivsjhm/DZDetMp1zVWPPAzAk6WARWGDWMj3XU/cTT7ByoLnJBL7eb2q6hm0i5IOo24Ag==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-cryptocurrencies@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/cspell-dict-cryptocurrencies/-/cspell-dict-cryptocurrencies-1.0.9.tgz#73efff93f6c04a79966b73e072197ecd2171e5f7"
-  integrity sha512-UTuBMu4M8NHCmagF+aHFNnoogCJ8yC4ZlniAlCGZ/n1mua3vCoAXmnaBrs2uZiEZOErSvWTjb5PVmIBifYx7mQ==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-csharp@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/cspell-dict-csharp/-/cspell-dict-csharp-1.0.9.tgz#2ef15678b06923ccc711c8d4759ebe5ff75ab7f1"
-  integrity sha512-EZZyzvPpAcNsEYGVpKHECAgksCDOG5lTVrA36hXYACRhL/8MsvoAF+Es2bxbwd0GCWgVNuNbdutkC41BEN0s5Q==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-css@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/cspell-dict-css/-/cspell-dict-css-1.0.9.tgz#48eb90e4a31cf618b7eb0fde4ffa95713bfb2ddb"
-  integrity sha512-RQPgZ97Sr2B8NIQ8Tf/sqMeAzfTsAMXFwLcqr0/J0/tpm0D1eelKR+8hiW+R/Xl86R7w2DgqTQXoEMi8cpLGJg==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-django@^1.0.24:
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/cspell-dict-django/-/cspell-dict-django-1.0.24.tgz#8717d7b9ebc602b896111431f362c6ff28085217"
-  integrity sha512-6WkK2maLFBGB1YTv7Q8GAuAHA/gulOu5xbc/pr5o4XQaJ62AbY6GFIuCuVK3VREPHboRT9P9DUGQAbsYXZg1bg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-dotnet@^1.0.23:
-  version "1.0.23"
-  resolved "https://registry.yarnpkg.com/cspell-dict-dotnet/-/cspell-dict-dotnet-1.0.23.tgz#551fa95c785d548b131827667064beae63aee8a9"
-  integrity sha512-+p6xxzCEdIpYc8ifWsoJYqy445pr+tsW7YOhxtXzMWXswXMtR3dKN5TOEG6P7FRs0y8JeA38/iCq1B4INYvv/Q==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-elixir@^1.0.22:
-  version "1.0.22"
-  resolved "https://registry.yarnpkg.com/cspell-dict-elixir/-/cspell-dict-elixir-1.0.22.tgz#3ef9f86bcf225be45fb6aab726ff7956400fa440"
-  integrity sha512-iZiyO+h5+S4+hzi7UiegDABhUWNlmASaPplqf250kInAXxK/Ji/RZ5Ru/KNd8RdkTLoUEZoTFsfBuxAw1P5Ugw==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-en-gb@^1.1.27:
-  version "1.1.27"
-  resolved "https://registry.yarnpkg.com/cspell-dict-en-gb/-/cspell-dict-en-gb-1.1.27.tgz#5b8671e77c7a99bf11bf746950a76bda2bb52b26"
-  integrity sha512-AftBECTbkxAkqhFmKz9nxf/WUZpYbcWWAx3ULAMydp6Zl/YFP0hMl++J54WVmONfADi3+QVjvp1PwfRsXnml9A==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-en_us@^1.2.37:
-  version "1.2.37"
-  resolved "https://registry.yarnpkg.com/cspell-dict-en_us/-/cspell-dict-en_us-1.2.37.tgz#9f0d52b3c4189f5835e33363df1b92275c6e3386"
-  integrity sha512-sTSayWhfTKhNwaqN7I01UtswrWb2BPTJ1FjHDqTSqfuJqJ+Y8RrvNnUFot2bkh2Rttipt+qFUFcYzO1Q8XjN2w==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-filetypes@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/cspell-dict-filetypes/-/cspell-dict-filetypes-1.1.4.tgz#a6c8fa9c1110ddbb2c9e54a4c2bdfa1a24a329b9"
-  integrity sha512-bx+COWITPEYYFSoMz69Epe495Or/K5coJwYf7iQPWK7YIiPHxnJKnXAQLjmKLXPw3axXPaKsiGiEQ4P26kjDYQ==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-fonts@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/cspell-dict-fonts/-/cspell-dict-fonts-1.0.12.tgz#29a4d3d46e0c95a3e59942cd0085bac97e1b141e"
-  integrity sha512-3af5iT5LgSmMNLStfiWTjKO1p5LQgaZIqXlG8Mjq6z7pcPWOiUbXfeJXiYrbAzC8e94wwFufRiYsNwXEx7yi3g==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-fullstack@^1.0.35:
-  version "1.0.35"
-  resolved "https://registry.yarnpkg.com/cspell-dict-fullstack/-/cspell-dict-fullstack-1.0.35.tgz#7b01153bfbf0d885b2774156de26982853a78872"
-  integrity sha512-b8j2fXfDYs5VHuHjM3vulA/yduQMUjGWL7SK6lmdzndJavAfi5d4+Zn8nS/eeiHD61zI0xUyliYnyC0c5/2d1w==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-golang@^1.1.23:
-  version "1.1.23"
-  resolved "https://registry.yarnpkg.com/cspell-dict-golang/-/cspell-dict-golang-1.1.23.tgz#3a3e61bf2b13bce5a74fab2b918c1b6ac96bdb56"
-  integrity sha512-4tT55V7duKYEpSlIo6U4ExCgR2pXnYh5RVfsyzWkzvfF4Ka10DOd+5tR+HL6fr6WehdDa2p4wvybg4wS0nOzUQ==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-haskell@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/cspell-dict-haskell/-/cspell-dict-haskell-1.0.11.tgz#2cdc3946d60a1d3a7516e1c84079e3f0466714c3"
-  integrity sha512-aV0zSgcv4BfZ5P2NTnduX8PRlLe55LzSMfqfNxm5gatFZAp06j+OW2Le/ngpPRRC0LkMngxTZDPWsRNQNYKj1w==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-html-symbol-entities@^1.0.22:
-  version "1.0.22"
-  resolved "https://registry.yarnpkg.com/cspell-dict-html-symbol-entities/-/cspell-dict-html-symbol-entities-1.0.22.tgz#21f2a2f567f13bb15e24ce4fb7c81bf4c9253335"
-  integrity sha512-YSq3fOTaF4+54PqvBIvCbeuY43VrVWYu70PzSyvqcJqcIrK0eZywzkPjU4PYbyq6HrzSzNnH2MZmlFd64tnJnw==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-html@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/cspell-dict-html/-/cspell-dict-html-1.1.4.tgz#b8ec977f746a81b91604c3cb9523291a29be306b"
-  integrity sha512-0G6uv35pU4rBZM4nB3wG6mzTMJYpulTr6DibGIAjO4rv/wW+hR3WWS4IuZo0SJBhH16BUALWKh4HCi6TQlUEdQ==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-java@^1.0.21:
-  version "1.0.21"
-  resolved "https://registry.yarnpkg.com/cspell-dict-java/-/cspell-dict-java-1.0.21.tgz#d861e39b3681f839fe9940ad42f660cffbf241da"
-  integrity sha512-YrzUrvY9nHGQdoJ5BGToUydtyXSJYGSacPmI3N1KZsYFoaP5tKHmeCSUaONucZQCd7CkgsEjNXQz0g0MlYI91w==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-latex@^1.0.22:
-  version "1.0.22"
-  resolved "https://registry.yarnpkg.com/cspell-dict-latex/-/cspell-dict-latex-1.0.22.tgz#18b41eed69c10559a9f0f02d353bbf8f26ef68fd"
-  integrity sha512-dyPotbmlBN8roXQKZaoKJInDeATlVB8eSxwdDZsX0tMgccD2DZJCWh//P/nS01NzpSpDYDi96bTjHhyVTInN5w==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-lorem-ipsum@^1.0.21:
-  version "1.0.21"
-  resolved "https://registry.yarnpkg.com/cspell-dict-lorem-ipsum/-/cspell-dict-lorem-ipsum-1.0.21.tgz#cc98645c53e0428df2a7a93e5032510fcbf7e65a"
-  integrity sha512-zu7grVZraIv7S3cQhEwfCg4fnzGQ8nT1BaVVu/x1nIl+/PYOnojWBFb/8R5cx5DnUvi3Z4e1b/UzA6vO0yVaXQ==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-lua@^1.0.15:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/cspell-dict-lua/-/cspell-dict-lua-1.0.15.tgz#474d2184cffdbee513df450f0906bbbb07046ef2"
-  integrity sha512-jP91ieNofTMHw/ZbLXC0MgdOLf7HV28rs+A8drgXtgZ7V7IZ+LB9xcXuGs43I/Gm8VjToDJYV3ak+vv7KpSBwQ==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-node@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/cspell-dict-node/-/cspell-dict-node-1.0.8.tgz#35d5c96becb4dd9db9d75210ee23752fabb6ee82"
-  integrity sha512-7bLoIRrAMYpkHu3Ea//2eAPN6hg2/CoyCbxsV0o7lSCADKoQU2ywo4sWv3/zl3720jyoE/yvAiOZueaJ5cV0bA==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-npm@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/cspell-dict-npm/-/cspell-dict-npm-1.0.9.tgz#91fa4704a43a6017c89e9c76d5aebe054836f69e"
-  integrity sha512-0KqNjm6MRx1JmGe51OTDA826nhafcGvUdB3Kxr6fD3EpshD+i++HWB521ulzCZgu9ZPlcYYYjQn+YUf8RRdEWQ==
-  dependencies:
-    configstore "^5.0.0"
-
-cspell-dict-php@^1.0.22:
-  version "1.0.22"
-  resolved "https://registry.yarnpkg.com/cspell-dict-php/-/cspell-dict-php-1.0.22.tgz#f9925132f126767098dd82de3854b5a738e79bb4"
-  integrity sha512-QCEsYS8+Jl6zL8HCM3IlgNnTAZJ9DIXzwsl1LP8dYNgYsMbUh3ip6Y5/12yqf6YOO+MbA5TSvCbCkg2tWpd6Tg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-powershell@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/cspell-dict-powershell/-/cspell-dict-powershell-1.0.13.tgz#d2f41a79802fd4b3e6047f00bac8ccc420887410"
-  integrity sha512-7q1Y0nhzieYmR8Ts+NJgkL5+0hDwlagm618IFDwz31eqzfr3sFJSuancxV2nvIEof0DFoYwCBynw/dmc/b9szg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-python@^1.0.30:
-  version "1.0.30"
-  resolved "https://registry.yarnpkg.com/cspell-dict-python/-/cspell-dict-python-1.0.30.tgz#0f2d9163eae5600982414dacbec89c5e06bc83bc"
-  integrity sha512-1fKsbDmd5xVplcPFk8lV2J2H72ikyhq4lSIytl25ZmApn1ZbX0Xuio8W2eVKOJC9F4RXPsObWDK/+Svgsm9SCg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-ruby@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/cspell-dict-ruby/-/cspell-dict-ruby-1.0.11.tgz#e78198a47717de48e2f5bd82e6e1d8c13f442cd0"
-  integrity sha512-g8btqTC17NjFuPiYUoEMZ/FuQhk1G1z/RZbqAUYpzc7GgwQOMKA6k28uxLm4A1zm8+h/qdk8KREODgWOlKxSRg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-rust@^1.0.21:
-  version "1.0.21"
-  resolved "https://registry.yarnpkg.com/cspell-dict-rust/-/cspell-dict-rust-1.0.21.tgz#57f826c1a6a456da057cd1621304a167f470ead4"
-  integrity sha512-tAwnTYoqEgmhwaJpriyjm84/YvBBp/pdOCZVNDmntT5fbOtR7wEmXRv9VFnEs/Lui5nycbkJpk8pbimhbawzPg==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-scala@^1.0.20:
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/cspell-dict-scala/-/cspell-dict-scala-1.0.20.tgz#683c66afa59e8e0d04d78c89871be312632b2e28"
-  integrity sha512-j0/IpCIyjUpBcZRGiiU2+2i8emv/v0Q1fv+KGT0Ig8rNQAeZfBtJ7NrrSpy1ooDQk61I5maNJSr9w4/Yl4nssA==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-software-terms@^1.0.22:
-  version "1.0.22"
-  resolved "https://registry.yarnpkg.com/cspell-dict-software-terms/-/cspell-dict-software-terms-1.0.22.tgz#faecfa7dfa365af604cce7954fe2212dfcc57d5b"
-  integrity sha512-dEaq4k8aSJwjTze/dYquOmlrBpFyIiaFpFYDBIn3i4syTGCFDB4z6LLvfUB4IGbk1j1dkkuL6+glPDqHLGo03A==
-  dependencies:
-    configstore "^5.0.1"
-
-cspell-dict-typescript@^1.0.15:
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/cspell-dict-typescript/-/cspell-dict-typescript-1.0.15.tgz#a50ddb89cb123bc510d271850a9fdb2693999ca4"
-  integrity sha512-26GRbsSZNmvmSzBISEg8s6d7WFOH79rhZMpCzKmbzZ5IML6/213eXY1PSweiQ4/AAwexs+L0H4zRoUtO6ZuGyQ==
-  dependencies:
-    configstore "^5.0.1"
-
 cspell-glob@^0.1.25:
   version "0.1.25"
   resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-0.1.25.tgz#5d55b03ac5e7a379d435ebd5685178806b0c372f"
@@ -2679,48 +2613,48 @@ cspell-io@^4.1.7:
     iconv-lite "^0.6.2"
     iterable-to-stream "^1.0.1"
 
-cspell-lib@^4.3.7:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-4.3.7.tgz#f8b4410fa44b09117e4fc8d148ca3b2ef18cef28"
-  integrity sha512-J9DP1z3Zc5HPNHkJ+eDvbQ3DoCRs2Kr8s1mfG7yXfUqxybPfF21wA/DZZ/Z6S49LjavoSxgEeHZ/hGEzq4ALSg==
+cspell-lib@^4.3.9:
+  version "4.3.9"
+  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-4.3.9.tgz#8b0731e9340ed213164cc725ea2203837cf34783"
+  integrity sha512-vyyYq2sa91iDwyNt2qvxfLgG39RGJOcpDQbL6IKPoAsliCBSzVPq4U1e1I8kQRmEcbl7oM2+GeYth5E6YY1IVg==
   dependencies:
+    "@cspell/dict-aws" "^1.0.12"
+    "@cspell/dict-bash" "^1.0.10"
+    "@cspell/dict-companies" "^1.0.34"
+    "@cspell/dict-cpp" "^1.1.36"
+    "@cspell/dict-cryptocurrencies" "^1.0.9"
+    "@cspell/dict-csharp" "^1.0.9"
+    "@cspell/dict-css" "^1.0.9"
+    "@cspell/dict-django" "^1.0.24"
+    "@cspell/dict-dotnet" "^1.0.23"
+    "@cspell/dict-elixir" "^1.0.22"
+    "@cspell/dict-en-gb" "^1.1.27"
+    "@cspell/dict-en_us" "^1.2.37"
+    "@cspell/dict-filetypes" "^1.1.4"
+    "@cspell/dict-fonts" "^1.0.12"
+    "@cspell/dict-fullstack" "^1.0.35"
+    "@cspell/dict-golang" "^1.1.23"
+    "@cspell/dict-haskell" "^1.0.11"
+    "@cspell/dict-html" "^1.1.4"
+    "@cspell/dict-html-symbol-entities" "^1.0.22"
+    "@cspell/dict-java" "^1.0.21"
+    "@cspell/dict-latex" "^1.0.22"
+    "@cspell/dict-lorem-ipsum" "^1.0.21"
+    "@cspell/dict-lua" "^1.0.15"
+    "@cspell/dict-node" "^1.0.8"
+    "@cspell/dict-npm" "^1.0.9"
+    "@cspell/dict-php" "^1.0.22"
+    "@cspell/dict-powershell" "^1.0.13"
+    "@cspell/dict-python" "^1.0.30"
+    "@cspell/dict-ruby" "^1.0.11"
+    "@cspell/dict-rust" "^1.0.21"
+    "@cspell/dict-scala" "^1.0.20"
+    "@cspell/dict-software-terms" "^1.0.22"
+    "@cspell/dict-typescript" "^1.0.15"
     comment-json "^4.1.0"
     configstore "^5.0.1"
-    cspell-dict-aws "^1.0.12"
-    cspell-dict-bash "^1.0.10"
-    cspell-dict-companies "^1.0.34"
-    cspell-dict-cpp "^1.1.36"
-    cspell-dict-cryptocurrencies "^1.0.9"
-    cspell-dict-csharp "^1.0.9"
-    cspell-dict-css "^1.0.9"
-    cspell-dict-django "^1.0.24"
-    cspell-dict-dotnet "^1.0.23"
-    cspell-dict-elixir "^1.0.22"
-    cspell-dict-en-gb "^1.1.27"
-    cspell-dict-en_us "^1.2.37"
-    cspell-dict-filetypes "^1.1.4"
-    cspell-dict-fonts "^1.0.12"
-    cspell-dict-fullstack "^1.0.35"
-    cspell-dict-golang "^1.1.23"
-    cspell-dict-haskell "^1.0.11"
-    cspell-dict-html "^1.1.4"
-    cspell-dict-html-symbol-entities "^1.0.22"
-    cspell-dict-java "^1.0.21"
-    cspell-dict-latex "^1.0.22"
-    cspell-dict-lorem-ipsum "^1.0.21"
-    cspell-dict-lua "^1.0.15"
-    cspell-dict-node "^1.0.8"
-    cspell-dict-npm "^1.0.9"
-    cspell-dict-php "^1.0.22"
-    cspell-dict-powershell "^1.0.13"
-    cspell-dict-python "^1.0.30"
-    cspell-dict-ruby "^1.0.11"
-    cspell-dict-rust "^1.0.21"
-    cspell-dict-scala "^1.0.20"
-    cspell-dict-software-terms "^1.0.22"
-    cspell-dict-typescript "^1.0.15"
     cspell-io "^4.1.7"
-    cspell-trie-lib "^4.2.6"
+    cspell-trie-lib "^4.2.7"
     cspell-util-bundle "^4.1.9"
     fs-extra "^9.0.1"
     gensequence "^3.1.1"
@@ -2729,10 +2663,10 @@ cspell-lib@^4.3.7:
     resolve-global "^1.0.0"
     vscode-uri "^2.1.2"
 
-cspell-trie-lib@^4.2.6:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-4.2.6.tgz#48e0abee2702400ab15998a55a79d4484e5ecaaa"
-  integrity sha512-glf6Yk1PxRxTFpQIkBk5G4ljpGUBzJORJe1yFHuiZ29mY5gHL0D7+i5rULa2dFU/5WJ24SFojHUXd1fLCBjUOQ==
+cspell-trie-lib@^4.2.7:
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-4.2.7.tgz#25d5e5931979dcfdc4cfd53785bc72a5a8084558"
+  integrity sha512-Iwspbgqw4lv6L0kPMTl5423Kq9/zyfPLCc0gpl4vBNJ9skc7beuMmZoyvAF1IeGWl4li35AuaTfEy0uR+h88cQ==
   dependencies:
     gensequence "^3.1.1"
 
@@ -2741,16 +2675,16 @@ cspell-util-bundle@^4.1.9:
   resolved "https://registry.yarnpkg.com/cspell-util-bundle/-/cspell-util-bundle-4.1.9.tgz#7a92fcf427ec67601f96e4bb4e473557dae5d906"
   integrity sha512-ytYWn+EmSuthkh+GOKqLpBXsa5mnSBvOgl58IF04zB8LvjQpzRdo1FJkiQiy+HYPMl1xUmcLDqcAhvANzNGDMg==
 
-cspell@4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/cspell/-/cspell-4.2.3.tgz#34a49daf8ec8010ed7a2a3d09ba8b186d6d2ff86"
-  integrity sha512-ox83ITQ4+HZFDANS+rMuyBkv6TxZdwq6FiLQkg+Xv6zJWnMkBPkGrTm03xeuAIfGWHlO+fOSS6p9c7rT9rBL7g==
+cspell@4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/cspell/-/cspell-4.2.5.tgz#6678d480b3f63501f0c9e75447011f5236e063ce"
+  integrity sha512-JAlgs1I4hrqkfLdzkfCA9ynNr4EByauH57oGstIw1onsi25Htv7rzAz0E9rjXlARr3cD4lzoTSylrPI4dfmLmA==
   dependencies:
     chalk "^4.1.0"
     commander "^6.1.0"
     comment-json "^4.0.6"
     cspell-glob "^0.1.25"
-    cspell-lib "^4.3.7"
+    cspell-lib "^4.3.9"
     fs-extra "^9.0.1"
     gensequence "^3.1.1"
     get-stdin "^8.0.0"

From 114ca3b6f24431739a0ed7295d410ec1d8dc8912 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Dec 2020 14:15:50 +0800
Subject: [PATCH 145/299] Build(deps-dev): Bump @typescript-eslint/types from
 4.8.2 to 4.9.0 (#9802)

Bumps [@typescript-eslint/types](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/visitor-keys) from 4.8.2 to 4.9.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/visitor-keys/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.9.0/packages/visitor-keys)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e150c35c8..62cc9049e 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@rollup/plugin-replace": "2.3.4",
     "@types/estree": "0.0.45",
     "@types/node": "14.14.0",
-    "@typescript-eslint/types": "4.8.2",
+    "@typescript-eslint/types": "4.9.0",
     "babel-jest": "26.6.3",
     "babel-loader": "8.2.2",
     "benchmark": "2.1.4",
diff --git a/yarn.lock b/yarn.lock
index 9eeab61e1..e57f1b252 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1629,6 +1629,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.8.2.tgz#c862dd0e569d9478eb82d6aee662ea53f5661a36"
   integrity sha512-z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw==
 
+"@typescript-eslint/types@4.9.0":
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.0.tgz#3fe8c3632abd07095c7458f7451bd14c85d0033c"
+  integrity sha512-luzLKmowfiM/IoJL/rus1K9iZpSJK6GlOS/1ezKplb7MkORt2dDcfi8g9B0bsF6JoRGhqn0D3Va55b+vredFHA==
+
 "@typescript-eslint/typescript-estree@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.1.tgz#29a43c7060641ec51c902d9f50ac7c5866ec479f"

From e15e6112b617ecadaae76fc624378231146fb0e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Dec 2020 15:05:34 +0800
Subject: [PATCH 146/299] Build(deps-dev): Bump @rollup/plugin-babel from 5.2.1
 to 5.2.2 (#9805)

Bumps [@rollup/plugin-babel](https://github.com/rollup/plugins) from 5.2.1 to 5.2.2.
- [Release notes](https://github.com/rollup/plugins/releases)
- [Commits](https://github.com/rollup/plugins/compare/babel-v5.2.1...babel-v5.2.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 62cc9049e..721b11b75 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "@babel/types": "7.12.7",
     "@glimmer/reference": "0.67.0",
     "@rollup/plugin-alias": "3.1.1",
-    "@rollup/plugin-babel": "5.2.1",
+    "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "10.0.0",
diff --git a/yarn.lock b/yarn.lock
index e57f1b252..52c8281b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1357,10 +1357,10 @@
   dependencies:
     slash "^3.0.0"
 
-"@rollup/plugin-babel@5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz#20fc8f8864dc0eaa1c5578408459606808f72924"
-  integrity sha512-Jd7oqFR2dzZJ3NWANDyBjwTtX/lYbZpVcmkHrfQcpvawHs9E4c0nYk5U2mfZ6I/DZcIvy506KZJi54XK/jxH7A==
+"@rollup/plugin-babel@5.2.2":
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.2.2.tgz#e5623a01dd8e37e004ba87f2de218c611727d9b2"
+  integrity sha512-MjmH7GvFT4TW8xFdIeFS3wqIX646y5tACdxkTO+khbHvS3ZcVJL6vkAHLw2wqPmkhwCfWHoNsp15VYNwW6JEJA==
   dependencies:
     "@babel/helper-module-imports" "^7.10.4"
     "@rollup/pluginutils" "^3.1.0"

From 11ac80f64eb1466f5a4a11d2cfa0facc8a30d53c Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 2 Dec 2020 11:10:53 +0800
Subject: [PATCH 147/299] Build: Fix rollup warning (#9808)

---
 scripts/build/bundler.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/build/bundler.js b/scripts/build/bundler.js
index 43f73049b..9936f339e 100644
--- a/scripts/build/bundler.js
+++ b/scripts/build/bundler.js
@@ -54,6 +54,11 @@ const entries = [
       `${PROJECT_ROOT}/node_modules/@angular/compiler/esm2015/src`
     ),
   },
+  // Avoid rollup `SOURCEMAP_ERROR` and `THIS_IS_UNDEFINED` error
+  {
+    find: "@glimmer/syntax",
+    replacement: require.resolve("@glimmer/syntax"),
+  },
 ];
 
 function webpackNativeShims(config, modules) {

From 083b50166314c68b9126a42e1fdc48d192ad16e7 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Wed, 2 Dec 2020 15:03:32 +0900
Subject: [PATCH 148/299] Refactor: Make Cache modern in build scripts (#9809)

* Make cache class

* equal -> strictEqual

* Use strict mode assert module
---
 scripts/build/cache.js | 158 +++++++++++++++++++++--------------------
 1 file changed, 80 insertions(+), 78 deletions(-)

diff --git a/scripts/build/cache.js b/scripts/build/cache.js
index 1bcb061a9..ae599f0a1 100644
--- a/scripts/build/cache.js
+++ b/scripts/build/cache.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const util = require("util");
-const assert = require("assert");
+const assert = require("assert").strict;
 const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
@@ -12,97 +12,99 @@ const writeFile = util.promisify(fs.writeFile);
 
 const ROOT = path.join(__dirname, "..", "..");
 
-function Cache(cacheDir, version) {
-  this.cacheDir = path.resolve(cacheDir || required("cacheDir"));
-  this.manifest = path.join(this.cacheDir, "manifest.json");
-  this.version = version || required("version");
-  this.checksums = {};
-  this.files = {};
-  this.updated = {
-    version: this.version,
-    checksums: {},
-    files: {},
-  };
-}
-
-// Loads the manifest.json file with the information from the last build
-Cache.prototype.load = async function () {
-  // This should never throw, if it does, let it fail the build
-  const lockfile = await readFile("yarn.lock", "utf-8");
-  const lockfileHash = hashString(lockfile);
-  this.updated.checksums["yarn.lock"] = lockfileHash;
-
-  try {
-    const manifest = await readFile(this.manifest, "utf-8");
-    const { version, checksums, files } = JSON.parse(manifest);
-
-    // Ignore the cache if the version changed
-    assert.equal(this.version, version);
-
-    assert.ok(typeof checksums === "object");
-    // If yarn.lock changed, rebuild everything
-    assert.equal(lockfileHash, checksums["yarn.lock"]);
-    this.checksums = checksums;
-
-    assert.ok(typeof files === "object");
-    this.files = files;
-
-    for (const files of Object.values(this.files)) {
-      assert.ok(Array.isArray(files));
-    }
-  } catch (err) {
+class Cache {
+  constructor(cacheDir, version) {
+    this.cacheDir = path.resolve(cacheDir || required("cacheDir"));
+    this.manifest = path.join(this.cacheDir, "manifest.json");
+    this.version = version || required("version");
     this.checksums = {};
     this.files = {};
+    this.updated = {
+      version: this.version,
+      checksums: {},
+      files: {},
+    };
   }
-};
 
-// Run rollup to get the list of files included in the bundle and check if
-// any (or the list itself) have changed.
-// This takes the same rollup config used for bundling to include files that are
-// resolved by specific plugins.
-Cache.prototype.checkBundle = async function (id, inputOptions, outputOptions) {
-  const files = new Set(this.files[id]);
-  const newFiles = (this.updated.files[id] = []);
+  // Loads the manifest.json file with the information from the last build
+  async load() {
+    // This should never throw, if it does, let it fail the build
+    const lockfile = await readFile("yarn.lock", "utf-8");
+    const lockfileHash = hashString(lockfile);
+    this.updated.checksums["yarn.lock"] = lockfileHash;
 
-  let dirty = false;
+    try {
+      const manifest = await readFile(this.manifest, "utf-8");
+      const { version, checksums, files } = JSON.parse(manifest);
 
-  const bundle = await rollup(getRollupConfig(inputOptions));
-  const { output } = await bundle.generate(outputOptions);
+      // Ignore the cache if the version changed
+      assert.strictEqual(this.version, version);
 
-  const modules = output
-    .filter((mod) => !/\0/.test(mod.facadeModuleId))
-    .map((mod) => [path.relative(ROOT, mod.facadeModuleId), mod.code]);
+      assert.ok(typeof checksums === "object");
+      // If yarn.lock changed, rebuild everything
+      assert.strictEqual(lockfileHash, checksums["yarn.lock"]);
+      this.checksums = checksums;
 
-  for (const [id, code] of modules) {
-    newFiles.push(id);
-    // If we already checked this file for another bundle, reuse the hash
-    if (!this.updated.checksums[id]) {
-      this.updated.checksums[id] = hashString(code);
-    }
-    const hash = this.updated.checksums[id];
+      assert.ok(typeof files === "object");
+      this.files = files;
 
-    // Check if this file changed
-    if (!this.checksums[id] || this.checksums[id] !== hash) {
-      dirty = true;
-    }
-
-    // Check if this file is new
-    if (!files.delete(id)) {
-      dirty = true;
+      for (const files of Object.values(this.files)) {
+        assert.ok(Array.isArray(files));
+      }
+    } catch (err) {
+      this.checksums = {};
+      this.files = {};
     }
   }
 
-  // Final check: if any file was removed, `files` is not empty
-  return !dirty && files.size === 0;
-};
+  // Run rollup to get the list of files included in the bundle and check if
+  // any (or the list itself) have changed.
+  // This takes the same rollup config used for bundling to include files that are
+  // resolved by specific plugins.
+  async checkBundle(id, inputOptions, outputOptions) {
+    const files = new Set(this.files[id]);
+    const newFiles = (this.updated.files[id] = []);
 
-Cache.prototype.save = async function () {
-  try {
-    await writeFile(this.manifest, JSON.stringify(this.updated, null, 2));
-  } catch (err) {
-    // Don't fail the build
+    let dirty = false;
+
+    const bundle = await rollup(getRollupConfig(inputOptions));
+    const { output } = await bundle.generate(outputOptions);
+
+    const modules = output
+      .filter((mod) => !/\0/.test(mod.facadeModuleId))
+      .map((mod) => [path.relative(ROOT, mod.facadeModuleId), mod.code]);
+
+    for (const [id, code] of modules) {
+      newFiles.push(id);
+      // If we already checked this file for another bundle, reuse the hash
+      if (!this.updated.checksums[id]) {
+        this.updated.checksums[id] = hashString(code);
+      }
+      const hash = this.updated.checksums[id];
+
+      // Check if this file changed
+      if (!this.checksums[id] || this.checksums[id] !== hash) {
+        dirty = true;
+      }
+
+      // Check if this file is new
+      if (!files.delete(id)) {
+        dirty = true;
+      }
+    }
+
+    // Final check: if any file was removed, `files` is not empty
+    return !dirty && files.size === 0;
   }
-};
+
+  async save() {
+    try {
+      await writeFile(this.manifest, JSON.stringify(this.updated, null, 2));
+    } catch (err) {
+      // Don't fail the build
+    }
+  }
+}
 
 function required(name) {
   throw new Error(name + " is required");

From b9aa130b079d9e9ce336341ac6ad22385779a447 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Dec 2020 15:16:17 +0800
Subject: [PATCH 149/299] Build(deps-dev): Bump cross-env from 7.0.2 to 7.0.3
 (#9814)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 721b11b75..600f5a604 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "babel-loader": "8.2.2",
     "benchmark": "2.1.4",
     "builtin-modules": "3.1.0",
-    "cross-env": "7.0.2",
+    "cross-env": "7.0.3",
     "cspell": "4.2.5",
     "eslint": "7.14.0",
     "eslint-config-prettier": "6.15.0",
diff --git a/yarn.lock b/yarn.lock
index 52c8281b7..de0fea83d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2571,10 +2571,10 @@ cosmiconfig@7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cross-env@7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
-  integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==
+cross-env@7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
     cross-spawn "^7.0.1"
 

From bce3500b5e490ecab7c291b01b2e881a6a966995 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Dec 2020 16:57:15 +0800
Subject: [PATCH 150/299] Build(deps-dev): Bump @rollup/plugin-node-resolve
 from 10.0.0 to 11.0.0 (#9804)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: fisker <lionkay@gmail.com>
---
 package.json             |  2 +-
 scripts/build/bundler.js |  9 +++++++++
 yarn.lock                | 12 ++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 600f5a604..8c00bbcca 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
     "@rollup/plugin-json": "4.1.0",
-    "@rollup/plugin-node-resolve": "10.0.0",
+    "@rollup/plugin-node-resolve": "11.0.0",
     "@rollup/plugin-replace": "2.3.4",
     "@types/estree": "0.0.45",
     "@types/node": "14.14.0",
diff --git a/scripts/build/bundler.js b/scripts/build/bundler.js
index 9936f339e..06494ff4e 100644
--- a/scripts/build/bundler.js
+++ b/scripts/build/bundler.js
@@ -59,6 +59,15 @@ const entries = [
     find: "@glimmer/syntax",
     replacement: require.resolve("@glimmer/syntax"),
   },
+  // https://github.com/rollup/plugins/issues/670
+  {
+    find: "is-core-module",
+    replacement: require.resolve("is-core-module"),
+  },
+  {
+    find: "yaml/util",
+    replacement: require.resolve("yaml/util"),
+  },
 ];
 
 function webpackNativeShims(config, modules) {
diff --git a/yarn.lock b/yarn.lock
index de0fea83d..f987b323b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1385,17 +1385,17 @@
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
 
-"@rollup/plugin-node-resolve@10.0.0":
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-10.0.0.tgz#44064a2b98df7530e66acf8941ff262fc9b4ead8"
-  integrity sha512-sNijGta8fqzwA1VwUEtTvWCx2E7qC70NMsDh4ZG13byAXYigBNZMxALhKUSycBks5gupJdq0lFrKumFrRZ8H3A==
+"@rollup/plugin-node-resolve@11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.0.tgz#770458fb26691a686c5f29f37dded94832ffce59"
+  integrity sha512-8Hrmwjn1pLYjUxcv7U7IPP0qfnzEJWHyHE6CaZ8jbLM+8axaarJRB1jB6JgKTDp5gNga+TpsgX6F8iuvgOerKQ==
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     "@types/resolve" "1.17.1"
     builtin-modules "^3.1.0"
     deepmerge "^4.2.2"
     is-module "^1.0.0"
-    resolve "^1.17.0"
+    resolve "^1.19.0"
 
 "@rollup/plugin-replace@2.3.4":
   version "2.3.4"
@@ -6234,7 +6234,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.19.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2:
+resolve@1.19.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.3.2:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
   integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==

From 1344d9a18adb0f0efcfe7aafa99bb69efaa4f501 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Wed, 2 Dec 2020 18:58:08 +0200
Subject: [PATCH 151/299] Fix an oversight from #9709

---
 src/main/comments.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/comments.js b/src/main/comments.js
index 448e83028..a7ee5ba70 100644
--- a/src/main/comments.js
+++ b/src/main/comments.js
@@ -111,7 +111,7 @@ function decorateComment(node, comment, options, enclosingNode) {
       return decorateComment(child, comment, options, child);
     }
 
-    if (start <= commentStart) {
+    if (end <= commentStart) {
       // This child node falls completely before the comment.
       // Because we will never consider this node or any nodes
       // before it again, this node must be the closest preceding

From ff5330d8494e426cc891af3188441ea11616de13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Dec 2020 16:01:55 +0800
Subject: [PATCH 152/299] Build(deps): Bump semver from 7.3.2 to 7.3.4 (#9813)

Bumps [semver](https://github.com/npm/node-semver) from 7.3.2 to 7.3.4.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/master/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.3.2...v7.3.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8c00bbcca..b1eb5d2e4 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "remark-math": "3.0.1",
     "remark-parse": "8.0.3",
     "resolve": "1.19.0",
-    "semver": "7.3.2",
+    "semver": "7.3.4",
     "string-width": "4.2.0",
     "typescript": "4.1.2",
     "unicode-regex": "3.0.0",
diff --git a/yarn.lock b/yarn.lock
index f987b323b..8861d97f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5137,6 +5137,13 @@ lru-cache@^4.1.5:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 magic-string@^0.22.5:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
@@ -6396,10 +6403,12 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.2, semver@^7.2.1, semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+semver@7.3.4, semver@^7.2.1, semver@^7.3.2:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
 
 semver@^6.0.0, semver@^6.3.0:
   version "6.3.0"
@@ -7509,6 +7518,11 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yaml-unist-parser@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/yaml-unist-parser/-/yaml-unist-parser-1.3.1.tgz#4305a54d8f8750dfff782bb998ff93d0da538d1a"

From 8b7dd4371940f881d6083f5b78cf393f7a8767e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Dec 2020 16:02:30 +0800
Subject: [PATCH 153/299] Build(deps): Bump
 @typescript-eslint/typescript-estree from 4.8.2 to 4.9.0 (#9806)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 27 +++++++++++----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index b1eb5d2e4..fd56eeaa7 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@babel/parser": "7.12.7",
     "@glimmer/syntax": "0.67.0",
     "@iarna/toml": "2.2.5",
-    "@typescript-eslint/typescript-estree": "4.8.2",
+    "@typescript-eslint/typescript-estree": "4.9.0",
     "angular-estree-parser": "2.2.1",
     "angular-html-parser": "1.7.1",
     "camelcase": "6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 8861d97f8..70d5fe652 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1624,11 +1624,6 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2"
   integrity sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg==
 
-"@typescript-eslint/types@4.8.2":
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.8.2.tgz#c862dd0e569d9478eb82d6aee662ea53f5661a36"
-  integrity sha512-z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw==
-
 "@typescript-eslint/types@4.9.0":
   version "4.9.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.0.tgz#3fe8c3632abd07095c7458f7451bd14c85d0033c"
@@ -1648,13 +1643,13 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@4.8.2":
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.2.tgz#eeec34707d8577600fb21661b5287226cc8b3bed"
-  integrity sha512-HToGNwI6fekH0dOw3XEVESUm71Onfam0AKin6f26S2FtUmO7o3cLlWgrIaT1q3vjB3wCTdww3Dx2iGq5wtUOCg==
+"@typescript-eslint/typescript-estree@4.9.0":
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.9.0.tgz#38a98df6ee281cfd6164d6f9d91795b37d9e508c"
+  integrity sha512-rmDR++PGrIyQzAtt3pPcmKWLr7MA+u/Cmq9b/rON3//t5WofNR4m/Ybft2vOLj0WtUzjn018ekHjTsnIyBsQug==
   dependencies:
-    "@typescript-eslint/types" "4.8.2"
-    "@typescript-eslint/visitor-keys" "4.8.2"
+    "@typescript-eslint/types" "4.9.0"
+    "@typescript-eslint/visitor-keys" "4.9.0"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
@@ -1670,12 +1665,12 @@
     "@typescript-eslint/types" "4.0.1"
     eslint-visitor-keys "^2.0.0"
 
-"@typescript-eslint/visitor-keys@4.8.2":
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.2.tgz#62cd3fbbbf65f8eccfbe6f159eb1b84a243a3f77"
-  integrity sha512-Vg+/SJTMZJEKKGHW7YC21QxgKJrSbxoYYd3MEUGtW7zuytHuEcksewq0DUmo4eh/CTNrVJGSdIY9AtRb6riWFw==
+"@typescript-eslint/visitor-keys@4.9.0":
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.9.0.tgz#f284e9fac43f2d6d35094ce137473ee321f266c8"
+  integrity sha512-sV45zfdRqQo1A97pOSx3fsjR+3blmwtdCt8LDrXgCX36v4Vmz4KHrhpV6Fo2cRdXmyumxx11AHw0pNJqCNpDyg==
   dependencies:
-    "@typescript-eslint/types" "4.8.2"
+    "@typescript-eslint/types" "4.9.0"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.9.0":

From 5ec2c076a81adc47179712b52e69ce3fe1a9771a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Dec 2020 14:02:49 +0800
Subject: [PATCH 154/299] Build(deps-dev): Bump @glimmer/reference from 0.67.0
 to 0.68.0 (#9821)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index fd56eeaa7..c1d0bfd5f 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.9",
     "@babel/preset-env": "7.12.7",
     "@babel/types": "7.12.7",
-    "@glimmer/reference": "0.67.0",
+    "@glimmer/reference": "0.68.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index 70d5fe652..2c2ceb1f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1058,10 +1058,10 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.67.0.tgz#041103738b6ec503d929684e342942023351b123"
-  integrity sha512-eeMwi+lQK8GbK2m/+HJSQaGKJogGEqJEZn8hGxHbG7zvHXA7TBQ5+c4vR2QXNWTMrOI7qDzCX9XnF3tlaxQPjQ==
+"@glimmer/global-context@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.68.0.tgz#92fe8a2b641b02bec682b670eb3d2a24d683e490"
+  integrity sha512-qaYUOP2PF9JmOXiAULzR/5J0py0YNsBVx0wFbPhbhAfrY5LTmVx5Aunbhbc6tHNY8IjgoW4v1k0GpG86YZ+4Mw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
@@ -1072,16 +1072,23 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.67.0.tgz#2983167fcb90e5f7a24e00a5eb13c50bf266cf3d"
-  integrity sha512-Qopa+sNhIvAZ4lb4hlAUPrPx7h19yOLlfqho3zgwTJoEQAyhUqalqeH5lr+xIC4r2uV6yCcLd3C27BLYxN342Q==
+"@glimmer/interfaces@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.68.0.tgz#451e12d9b74cfd0778fbf6ae0374323b726d7a79"
+  integrity sha512-GvR8ke9XZK0qupJmHcUHVzy6Y5gLsBIzi0h769xoA6l6VrtRCQJC1GF95KNj1z3jlhVCUw3OLnqVFantCEONaQ==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/reference@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.68.0.tgz#91e85cd881b0d9ee7e108879cd56e1ec374f9b59"
+  integrity sha512-b66jSLLitKvt0d7yi/+5M6XE+vWrorwsjYk3eCTE+cdMEG/T8n0d2j3P2TRL7opSnn8Pjj4o5ZZc4tOPyw7Sug==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.67.0"
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/util" "0.67.0"
-    "@glimmer/validator" "0.67.0"
+    "@glimmer/global-context" "0.68.0"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/util" "0.68.0"
+    "@glimmer/validator" "0.68.0"
 
 "@glimmer/syntax@0.67.0":
   version "0.67.0"
@@ -1102,13 +1109,22 @@
     "@glimmer/interfaces" "0.67.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.67.0.tgz#9d50db47152786c4e7d4304a73c498c53afc7886"
-  integrity sha512-PQsTPU1N0erGtWVoHwkQ9N/jMb3iMoclyaBe3rVbxs6RSjYeafaxAqwN8rJ+Gd+OWQscD4tjPPguTW/iGQVlYQ==
+"@glimmer/util@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.68.0.tgz#16fec2fb54a9cda6ceef8c3cbc2c47346704cefc"
+  integrity sha512-YUIcItWFkHilVwllZnkJggoBm7xDvN+VyMgcPk4jsmUlMrt3zy0C9XGgmDmnPqJ1Bl0gMCf5JUf59RByw8TNHQ==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.68.0"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/validator@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.68.0.tgz#a9cab4a3eb6fdc432002e97d51fc07ec9fb144f4"
+  integrity sha512-KtDOCN1LxJW4/GRfhXZsHNsg3V0xHFklVhcXBdNjM/3mQDs5MIyaWJ+HduyLrFPC9I25/vjyH1zryBrD4+taiQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.67.0"
+    "@glimmer/global-context" "0.68.0"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From 36ff235678210f5d270e2d894c64f856e26aeb49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Dec 2020 08:37:17 +0000
Subject: [PATCH 155/299] Build(deps-dev): Bump rollup from 2.34.0 to 2.34.1
 (#9823)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c1d0bfd5f..60ce7b2f2 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "path-browserify": "1.0.1",
     "prettier": "2.2.1",
     "rimraf": "3.0.2",
-    "rollup": "2.34.0",
+    "rollup": "2.34.1",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-terser": "7.0.2",
     "shelljs": "0.8.4",
diff --git a/yarn.lock b/yarn.lock
index 2c2ceb1f1..719dbb45d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6313,10 +6313,10 @@ rollup-pluginutils@^2.3.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@2.34.0:
-  version "2.34.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.34.0.tgz#ecc7f1d4ce2cb88bb51bec2f56b984f3c35b8271"
-  integrity sha512-dW5iLvttZzdVehjEuNJ1bWvuMEJjOWGmnuFS82WeKHTGXDkRHQeq/ExdifkSyJv9dLcR86ysKRmrIDyR6O0X8g==
+rollup@2.34.1:
+  version "2.34.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.34.1.tgz#a387230df02c58b242794a213dfb68b42de2c8fb"
+  integrity sha512-tGveB6NU5x4MS/iXaIsjfUkEv4hxzJJ4o0FRy5LO62Ndx3R2cmE1qsLYlSfRkvHUUPqWiFoxEm8pRftzh1a5HA==
   optionalDependencies:
     fsevents "~2.1.2"
 

From 8dc57c4046caf8d8c9b0977daf5aa51926b8d956 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Dec 2020 08:49:38 +0000
Subject: [PATCH 156/299] Build(deps-dev): Bump execa from 4.1.0 to 5.0.0
 (#9820)

---
 package.json |  2 +-
 yarn.lock    | 59 +++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 60ce7b2f2..76dfd6e68 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "eslint-plugin-prettier-internal-rules": "link:scripts/tools/eslint-plugin-prettier-internal-rules",
     "eslint-plugin-react": "7.21.5",
     "eslint-plugin-unicorn": "23.0.0",
-    "execa": "4.1.0",
+    "execa": "5.0.0",
     "jest": "26.6.3",
     "jest-snapshot-serializer-ansi": "1.0.0",
     "jest-snapshot-serializer-raw": "1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 719dbb45d..9ca11f321 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2600,7 +2600,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -3311,19 +3311,19 @@ exec-sh@^0.3.2:
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
   integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
 
-execa@4.1.0, execa@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
-  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+execa@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376"
+  integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==
   dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
     is-stream "^2.0.0"
     merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
 execa@^1.0.0:
@@ -3339,6 +3339,21 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -3643,6 +3658,11 @@ get-stream@^5.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718"
+  integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -3854,6 +3874,11 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -5434,7 +5459,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-run-path@^4.0.0:
+npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
@@ -5545,10 +5570,10 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+onetime@^5.1.0, onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
@@ -6511,7 +6536,7 @@ sigmund@^1.0.1:
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
   integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==

From 4b08aa5e03b67c3a9d0576d7bda7bf6d79561d53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Dec 2020 17:21:09 +0800
Subject: [PATCH 157/299] Build(deps): Bump @glimmer/syntax from 0.67.0 to
 0.68.0 (#9822)

Bumps [@glimmer/syntax](https://github.com/glimmerjs/glimmer-vm) from 0.67.0 to 0.68.0.
- [Release notes](https://github.com/glimmerjs/glimmer-vm/releases)
- [Changelog](https://github.com/glimmerjs/glimmer-vm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/glimmerjs/glimmer-vm/compare/v0.67.0...v0.68.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 28 ++++++----------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 76dfd6e68..59266eeaa 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "10.2.3",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.7",
-    "@glimmer/syntax": "0.67.0",
+    "@glimmer/syntax": "0.68.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.9.0",
     "angular-estree-parser": "2.2.1",
diff --git a/yarn.lock b/yarn.lock
index 9ca11f321..26894545e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1065,13 +1065,6 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.67.0.tgz#fc68db956028f0ab9c655a53bb882d54fd34c24b"
-  integrity sha512-1yNs8kt8k4tzA6r9lO3ScX4zR6Jg9ymRqIFvDtam1twNoRQBFHNwfpTqPU4X5mq/4tOcgtWA8FNv5/jBIOaOew==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.68.0":
   version "0.68.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.68.0.tgz#451e12d9b74cfd0778fbf6ae0374323b726d7a79"
@@ -1090,25 +1083,16 @@
     "@glimmer/util" "0.68.0"
     "@glimmer/validator" "0.68.0"
 
-"@glimmer/syntax@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.67.0.tgz#2aaa5ba451671ee869285463b9711dbec1c843e2"
-  integrity sha512-9eRjAF3oD0RyWzptincQT/ucWxxgMhYrhumizxCJDGWTpk8GCpAMoKjEK2D1eryVEaF3KknGS9ba3/oakGkpzg==
+"@glimmer/syntax@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.68.0.tgz#8dc25dbe8332ecc288ed5e02c721b19fc1e856e4"
+  integrity sha512-nidrNS1xf/cTQsoRyCj1VeCHGj4/dgRBBd3fbIig5KumOx7W5UQF4/cXJi24hA0/vvd0MEUMqo2DPpCMsPV7PQ==
   dependencies:
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/util" "0.67.0"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/util" "0.68.0"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.67.0.tgz#7f19320826e926a2fe80abb44512f9898f6df6d8"
-  integrity sha512-iDio1mKJgdtvo9GT/d4QL/pvUzAxQOM7m/3fAY3pX2CAa25jwEwpUh7fNN+F3iEFkJWiDJusSPY/K3RPMfAoXg==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.67.0"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.68.0":
   version "0.68.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.68.0.tgz#16fec2fb54a9cda6ceef8c3cbc2c47346704cefc"

From 400e30e47e4454937ac82f3536d6d2ba53182199 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 7 Dec 2020 09:57:27 +0800
Subject: [PATCH 158/299] Remove dead code (#9824)

---
 src/common/util.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/common/util.js b/src/common/util.js
index 38a143e65..50d33bfb1 100644
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -557,10 +557,6 @@ function getStringWidth(text) {
   return stringWidth(text);
 }
 
-function isNodeIgnoreComment(comment) {
-  return comment.value.trim() === "prettier-ignore";
-}
-
 function addCommentHelper(node, comment) {
   const comments = node.comments || (node.comments = []);
   comments.push(comment);
@@ -658,7 +654,6 @@ module.exports = {
   getPreferredQuote,
   printString,
   printNumber,
-  isNodeIgnoreComment,
   makeString,
   addLeadingComment,
   addDanglingComment,

From 52f08946118552a5b220cc0ada0ac8ecf9a27a19 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 7 Dec 2020 10:07:34 +0800
Subject: [PATCH 159/299] Fix `stripTrailingHardline` function (#9736)

Co-authored-by: Georgii Dolzhykov <thorn.mailbox@gmail.com>
---
 changelog_unreleased/markdown/9736.md         |  26 ++++
 src/document/doc-utils.js                     | 142 ++++++++++++++----
 src/language-js/embed/css.js                  |  50 ++----
 src/main/multiparser.js                       |   2 +-
 tests/markdown/multiparser-js/9734.md         |  49 ++++++
 .../__snapshots__/jsfmt.spec.js.snap          | 112 ++++++++++++++
 .../__tests__/doc-utils-clean-doc.js          |  71 +++++++++
 7 files changed, 385 insertions(+), 67 deletions(-)
 create mode 100644 changelog_unreleased/markdown/9736.md
 create mode 100644 tests/markdown/multiparser-js/9734.md
 create mode 100644 tests_integration/__tests__/doc-utils-clean-doc.js

diff --git a/changelog_unreleased/markdown/9736.md b/changelog_unreleased/markdown/9736.md
new file mode 100644
index 000000000..d60d80679
--- /dev/null
+++ b/changelog_unreleased/markdown/9736.md
@@ -0,0 +1,26 @@
+#### Fix extra newline at the end of JavaScript fenced code block with string literal (#9736 by @fisker)
+
+<!-- prettier-ignore -->
+````markdown
+<!-- Input -->
+Markdown
+
+```js
+"· "
+```
+
+<!-- Prettier stable -->
+Markdown
+
+```js
+"· ";
+
+```
+
+<!-- Prettier master -->
+Markdown
+
+```js
+"· ";
+```
+````
diff --git a/src/document/doc-utils.js b/src/document/doc-utils.js
index d9fe00900..453db6107 100644
--- a/src/document/doc-utils.js
+++ b/src/document/doc-utils.js
@@ -180,43 +180,130 @@ function removeLines(doc) {
   return mapDoc(doc, removeLinesFn);
 }
 
-function getInnerParts(doc) {
-  let { parts } = doc;
-  let lastPart;
-  // Avoid a falsy element like ""
-  for (let i = doc.parts.length; i > 0 && !lastPart; i--) {
-    lastPart = parts[i - 1];
+const isHardline = (doc, nextDoc) =>
+  doc &&
+  doc.type === "line" &&
+  doc.hard &&
+  nextDoc &&
+  nextDoc.type === "break-parent";
+function stripDocTrailingHardlineFromDoc(doc) {
+  if (!doc) {
+    return doc;
   }
-  if (lastPart.type === "group") {
-    parts = lastPart.contents.parts;
-  }
-  return parts;
-}
 
-function stripTrailingHardline(doc, withInnerParts = false) {
-  // HACK remove ending hardline, original PR: #1984
-  if (doc.type === "concat" && doc.parts.length !== 0) {
-    const parts = withInnerParts ? getInnerParts(doc) : doc.parts;
-    const lastPart = parts[parts.length - 1];
-    if (lastPart.type === "concat") {
-      if (
-        lastPart.parts.length === 2 &&
-        lastPart.parts[0].hard &&
-        lastPart.parts[1].type === "break-parent"
-      ) {
-        return { type: "concat", parts: parts.slice(0, -1) };
+  switch (doc.type) {
+    case "concat":
+    case "fill": {
+      const parts = [...doc.parts];
+
+      while (parts.length > 1 && isHardline(...parts.slice(-2))) {
+        parts.length -= 2;
       }
 
-      return {
-        type: "concat",
-        parts: doc.parts.slice(0, -1).concat(stripTrailingHardline(lastPart)),
-      };
+      if (parts.length > 0) {
+        const lastPart = stripDocTrailingHardlineFromDoc(
+          parts[parts.length - 1]
+        );
+        parts[parts.length - 1] = lastPart;
+      }
+      return { ...doc, parts };
+    }
+    case "align":
+    case "indent":
+    case "group":
+    case "line-suffix": {
+      const contents = stripDocTrailingHardlineFromDoc(doc.contents);
+      return { ...doc, contents };
+    }
+    case "if-break": {
+      const breakContents = stripDocTrailingHardlineFromDoc(doc.breakContents);
+      const flatContents = stripDocTrailingHardlineFromDoc(doc.flatContents);
+      return { ...doc, breakContents, flatContents };
     }
   }
 
   return doc;
 }
 
+function stripTrailingHardline(doc) {
+  // HACK remove ending hardline, original PR: #1984
+  return stripDocTrailingHardlineFromDoc(cleanDoc(doc));
+}
+
+const isConcat = (doc) => doc && doc.type === "concat";
+function cleanDocFn(doc) {
+  switch (doc.type) {
+    case "fill":
+      if (doc.parts.length === 0 || doc.parts.every((part) => part === "")) {
+        return "";
+      }
+      break;
+    case "group":
+      if (!doc.contents && !doc.id && !doc.break && !doc.expandedStates) {
+        return "";
+      }
+      // Remove nested only group
+      if (
+        doc.contents.type === "group" &&
+        doc.contents.id === doc.id &&
+        doc.contents.break === doc.break &&
+        doc.contents.expandedStates === doc.expandedStates
+      ) {
+        return doc.contents;
+      }
+      break;
+    case "align":
+    case "indent":
+    case "line-suffix":
+      if (!doc.contents) {
+        return "";
+      }
+      break;
+    case "if-break":
+      if (!doc.flatContents && !doc.breakContents) {
+        return "";
+      }
+      break;
+  }
+
+  if (!isConcat(doc)) {
+    return doc;
+  }
+
+  const parts = [];
+  for (const part of doc.parts) {
+    if (!part) {
+      continue;
+    }
+    const [currentPart, ...restParts] = isConcat(part) ? part.parts : [part];
+    if (
+      typeof currentPart === "string" &&
+      typeof parts[parts.length - 1] === "string"
+    ) {
+      parts[parts.length - 1] += currentPart;
+    } else {
+      parts.push(currentPart);
+    }
+    parts.push(...restParts);
+  }
+
+  if (parts.length === 0) {
+    return "";
+  }
+
+  if (parts.length === 1) {
+    return parts[0];
+  }
+  return { ...doc, parts };
+}
+// A safer version of `normalizeDoc`
+// - `normalizeDoc` concat strings and flat "concat" in `fill`, while `cleanDoc` don't
+// - On `concat` object, `normalizeDoc` always return object with `parts`, `cleanDoc` may return strings
+// - `cleanDoc` also remove nested `group`s and empty `fill`/`align`/`indent`/`line-suffix`/`if-break` if possible
+function cleanDoc(doc) {
+  return mapDoc(doc, (currentDoc) => cleanDocFn(currentDoc));
+}
+
 function normalizeParts(parts) {
   const newParts = [];
 
@@ -284,5 +371,6 @@ module.exports = {
   stripTrailingHardline,
   normalizeParts,
   normalizeDoc,
+  cleanDoc,
   replaceNewlinesWithLiterallines,
 };
diff --git a/src/language-js/embed/css.js b/src/language-js/embed/css.js
index 3ee4e1fa3..9eb9608dd 100644
--- a/src/language-js/embed/css.js
+++ b/src/language-js/embed/css.js
@@ -2,7 +2,7 @@
 
 const {
   builders: { indent, hardline, softline, concat },
-  utils: { mapDoc, replaceNewlinesWithLiterallines },
+  utils: { mapDoc, replaceNewlinesWithLiterallines, cleanDoc },
 } = require("../../document");
 const { printTemplateExpressions } = require("../print/template-literal");
 
@@ -49,53 +49,25 @@ function replacePlaceholders(quasisDoc, expressionDocs) {
   if (!expressionDocs || !expressionDocs.length) {
     return quasisDoc;
   }
-
   let replaceCounter = 0;
-  const newDoc = mapDoc(quasisDoc, (doc) => {
-    if (!doc || !doc.parts || !doc.parts.length) {
+  const newDoc = mapDoc(cleanDoc(quasisDoc), (doc) => {
+    if (typeof doc !== "string" || !doc.includes("@prettier-placeholder")) {
       return doc;
     }
-
-    let { parts } = doc;
-    const atIndex = parts.indexOf("@");
-    const placeholderIndex = atIndex + 1;
-    if (
-      atIndex > -1 &&
-      typeof parts[placeholderIndex] === "string" &&
-      parts[placeholderIndex].startsWith("prettier-placeholder")
-    ) {
-      // If placeholder is split, join it
-      const at = parts[atIndex];
-      const placeholder = parts[placeholderIndex];
-      const rest = parts.slice(placeholderIndex + 1);
-      parts = parts
-        .slice(0, atIndex)
-        .concat([at + placeholder])
-        .concat(rest);
-    }
-
-    const replacedParts = [];
-    parts.forEach((part) => {
-      if (typeof part !== "string" || !part.includes("@prettier-placeholder")) {
-        replacedParts.push(part);
-        return;
-      }
-
-      // When we have multiple placeholders in one line, like:
-      // ${Child}${Child2}:not(:first-child)
-      part.split(/@prettier-placeholder-(\d+)-id/).forEach((component, idx) => {
+    // When we have multiple placeholders in one line, like:
+    // ${Child}${Child2}:not(:first-child)
+    return concat(
+      doc.split(/@prettier-placeholder-(\d+)-id/).map((component, idx) => {
         // The placeholder is always at odd indices
         if (idx % 2 === 0) {
-          replacedParts.push(replaceNewlinesWithLiterallines(component));
-          return;
+          return replaceNewlinesWithLiterallines(component);
         }
 
         // The component will always be a number at odd index
-        replacedParts.push(expressionDocs[component]);
         replaceCounter++;
-      });
-    });
-    return { ...doc, parts: replacedParts };
+        return expressionDocs[component];
+      })
+    );
   });
   return expressionDocs.length === replaceCounter ? newDoc : null;
 }
diff --git a/src/main/multiparser.js b/src/main/multiparser.js
index 26cc5c3ce..5a5153f8b 100644
--- a/src/main/multiparser.js
+++ b/src/main/multiparser.js
@@ -68,7 +68,7 @@ function textToDoc(
       return doc.replace(/(?:\r?\n)*$/, "");
     }
 
-    return stripTrailingHardline(doc, true);
+    return stripTrailingHardline(doc);
   }
 
   /* istanbul ignore next */
diff --git a/tests/markdown/multiparser-js/9734.md b/tests/markdown/multiparser-js/9734.md
new file mode 100644
index 000000000..d57da526c
--- /dev/null
+++ b/tests/markdown/multiparser-js/9734.md
@@ -0,0 +1,49 @@
+Markdown
+
+```js
+"test"
+```
+
+```js
+'test'
+```
+
+```js
+`test`
+```
+
+```js
+false
+```
+
+```js
+true
+```
+
+```js
+null
+```
+
+```js
+[]
+```
+
+```js
+{}
+```
+
+```js
+5
+```
+
+```js
+Infinity
+```
+
+```js
+NaN
+```
+
+```js
+undefined
+```
diff --git a/tests/markdown/multiparser-js/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/multiparser-js/__snapshots__/jsfmt.spec.js.snap
index 2c74ae100..8bc7fd4c6 100644
--- a/tests/markdown/multiparser-js/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/markdown/multiparser-js/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,117 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`9734.md - {"trailingComma":"all"} format 1`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+trailingComma: "all"
+                                                                                | printWidth
+=====================================input======================================
+Markdown
+
+\`\`\`js
+"test"
+\`\`\`
+
+\`\`\`js
+'test'
+\`\`\`
+
+\`\`\`js
+\`test\`
+\`\`\`
+
+\`\`\`js
+false
+\`\`\`
+
+\`\`\`js
+true
+\`\`\`
+
+\`\`\`js
+null
+\`\`\`
+
+\`\`\`js
+[]
+\`\`\`
+
+\`\`\`js
+{}
+\`\`\`
+
+\`\`\`js
+5
+\`\`\`
+
+\`\`\`js
+Infinity
+\`\`\`
+
+\`\`\`js
+NaN
+\`\`\`
+
+\`\`\`js
+undefined
+\`\`\`
+
+=====================================output=====================================
+Markdown
+
+\`\`\`js
+"test";
+\`\`\`
+
+\`\`\`js
+"test";
+\`\`\`
+
+\`\`\`js
+\`test\`;
+\`\`\`
+
+\`\`\`js
+false;
+\`\`\`
+
+\`\`\`js
+true;
+\`\`\`
+
+\`\`\`js
+null;
+\`\`\`
+
+\`\`\`js
+[];
+\`\`\`
+
+\`\`\`js
+{
+}
+\`\`\`
+
+\`\`\`js
+5;
+\`\`\`
+
+\`\`\`js
+Infinity;
+\`\`\`
+
+\`\`\`js
+NaN;
+\`\`\`
+
+\`\`\`js
+undefined;
+\`\`\`
+
+================================================================================
+`;
+
 exports[`jsx-comment.md - {"trailingComma":"all"} format 1`] = `
 ====================================options=====================================
 parsers: ["markdown"]
diff --git a/tests_integration/__tests__/doc-utils-clean-doc.js b/tests_integration/__tests__/doc-utils-clean-doc.js
new file mode 100644
index 000000000..69f8e9b0a
--- /dev/null
+++ b/tests_integration/__tests__/doc-utils-clean-doc.js
@@ -0,0 +1,71 @@
+"use strict";
+
+const prettier = require("prettier-local");
+const docBuilders = prettier.doc.builders;
+const docUtils = prettier.doc.utils;
+
+const { cleanDoc } = docUtils;
+const { group, concat, align, indent, lineSuffix, ifBreak, fill } = docBuilders;
+
+describe("cleanDoc", () => {
+  test.each([
+    [
+      "fill",
+      concat([fill(["", ""]), fill([]), fill(["1"]), fill(["2", "3"])]),
+      concat([fill(["1"]), fill(["2", "3"])]),
+    ],
+    ["nested group", group(group("_")), group("_")],
+    [
+      "empty group",
+      concat([
+        group(""),
+        group(concat([""])),
+        group("_", { id: "id" }),
+        group("_", { shouldBreak: true }),
+        group("_", { expandedStates: ["_"] }),
+      ]),
+      concat([
+        group("_", { id: "id" }),
+        group("_", { shouldBreak: true }),
+        group("_", { expandedStates: ["_"] }),
+      ]),
+    ],
+    [
+      "removes empty align/indent/line-suffix",
+      concat([
+        group(
+          concat([
+            align("  ", concat([""])),
+            indent(concat([""])),
+            concat([""]),
+            "",
+            lineSuffix(concat([""])),
+            ifBreak("", concat([""])),
+          ])
+        ),
+        "_",
+      ]),
+      "_",
+    ],
+    [
+      "removes empty string/concat",
+      concat(["", concat(["", concat([concat(["", "_", ""]), ""])]), ""]),
+      "_",
+    ],
+    [
+      "concat string & flat concat",
+      group(
+        concat([
+          group("1"),
+          concat(["2", "3", group("4"), "5", "6"]),
+          concat(["7", "8", group("9"), "10", "11"]),
+        ])
+      ),
+      group(concat([group("1"), "23", group("4"), "5678", group("9"), "1011"])),
+    ],
+  ])("%s", (_, doc, expected) => {
+    const result = cleanDoc(doc);
+
+    expect(result).toEqual(expected);
+  });
+});

From 2ca1fb705a9a21930d1ddc990263d6b61dec798f Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 7 Dec 2020 11:32:18 +0800
Subject: [PATCH 160/299] Update `@angular/compiler` and
 `angular-estree-parser` (#9816)

---
 package.json |  4 ++--
 yarn.lock    | 27 ++++++++++++++-------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 59266eeaa..d6b6c4d51 100644
--- a/package.json
+++ b/package.json
@@ -20,13 +20,13 @@
     "bin"
   ],
   "dependencies": {
-    "@angular/compiler": "10.2.3",
+    "@angular/compiler": "11.0.3",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.7",
     "@glimmer/syntax": "0.68.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.9.0",
-    "angular-estree-parser": "2.2.1",
+    "angular-estree-parser": "2.3.0",
     "angular-html-parser": "1.7.1",
     "camelcase": "6.2.0",
     "chalk": "4.1.0",
diff --git a/yarn.lock b/yarn.lock
index 26894545e..24ab99810 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/compiler@10.2.3":
-  version "10.2.3"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-10.2.3.tgz#4f2a42d1b479d323118fe33e1e62594d029ed5f9"
-  integrity sha512-Bg+QbyvJVlfGQpJCagEMkkqoRi2LMQc8iuu+cVYVqQOETLO0LxmkPpMQ/7pRLTNWl36PoYEB7IjUkp+qng8xKg==
+"@angular/compiler@11.0.3":
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.3.tgz#1bf9d1d58acb12f02c16d97155de9063246a3c23"
+  integrity sha512-OjfG4TzCzqNyHO4NmQNM7kdaWlbGrfXyB2i2Kd30PS9Z8s9cuhBBZS23P8NEEYNy1PjhI26cmiozrdMZl0hTUw==
   dependencies:
     tslib "^2.0.0"
 
@@ -1889,13 +1889,13 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-angular-estree-parser@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/angular-estree-parser/-/angular-estree-parser-2.2.1.tgz#997f981e48efe756f8672814d708d376eb6ccca3"
-  integrity sha512-bo6Gw/GOgxozOVXqsEwjc2iNgi7RJsmIKr8+aDzgq699QgZYMcIppui8fstzFT0mHt2r3SvcN9Aaf25sAUllyw==
+angular-estree-parser@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/angular-estree-parser/-/angular-estree-parser-2.3.0.tgz#1504d5a1b67db2a49084f952a79849a7e8dc9d5b"
+  integrity sha512-+jW3uOXSHAbDRJTpVodLhH4DhpI7Qe1NyFtemyv+MowcZXBLBF5QRwCzi1/+LWNbxjNNm8mWo7tjT9z4MUIBqg==
   dependencies:
     lines-and-columns "^1.1.6"
-    tslib "^1.9.3"
+    tslib "^2.0.3"
 
 angular-html-parser@1.7.1:
   version "1.7.1"
@@ -3102,6 +3102,7 @@ eslint-plugin-jest@24.1.3:
 
 "eslint-plugin-prettier-internal-rules@link:scripts/tools/eslint-plugin-prettier-internal-rules":
   version "0.0.0"
+  uid ""
 
 eslint-plugin-react@7.21.5:
   version "7.21.5"
@@ -7046,10 +7047,10 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
 
-tslib@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
-  integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
+tslib@^2.0.0, tslib@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
+  integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
 
 tsutils@^3.17.1:
   version "3.17.1"

From 78332781b409d41ca71ff9032f7844a8cd0d57c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Dec 2020 05:52:18 +0000
Subject: [PATCH 161/299] Build(deps-dev): Bump eslint from 7.14.0 to 7.15.0
 (#9836)

---
 package.json |  2 +-
 yarn.lock    | 88 ++++++++++++++++++++++------------------------------
 2 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/package.json b/package.json
index d6b6c4d51..f98ca7ee1 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "builtin-modules": "3.1.0",
     "cross-env": "7.0.3",
     "cspell": "4.2.5",
-    "eslint": "7.14.0",
+    "eslint": "7.15.0",
     "eslint-config-prettier": "6.15.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.22.1",
diff --git a/yarn.lock b/yarn.lock
index 24ab99810..181beea06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1037,10 +1037,10 @@
   resolved "https://registry.yarnpkg.com/@cspell/dict-typescript/-/dict-typescript-1.0.15.tgz#97cd4357f5715b91178a93b6c1dcab5f6d0591ec"
   integrity sha512-Guh+nN57OqbcRNH6cfbBQKfeDp0i+GBlniYvhWvaRxkSdFQJi4YgFKvQJsvtwLkwmNqYkQIXQr+8zXhuvTHLhA==
 
-"@eslint/eslintrc@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
-  integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==
+"@eslint/eslintrc@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
+  integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"
@@ -1841,7 +1841,7 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^5.2.0:
+acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
@@ -3102,7 +3102,6 @@ eslint-plugin-jest@24.1.3:
 
 "eslint-plugin-prettier-internal-rules@link:scripts/tools/eslint-plugin-prettier-internal-rules":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-react@7.21.5:
   version "7.21.5"
@@ -3175,13 +3174,13 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@7.14.0:
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz#2d2cac1d28174c510a97b377f122a5507958e344"
-  integrity sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==
+eslint@7.15.0:
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7"
+  integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@eslint/eslintrc" "^0.2.1"
+    "@eslint/eslintrc" "^0.2.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -3191,10 +3190,10 @@ eslint@7.14.0:
     eslint-scope "^5.1.1"
     eslint-utils "^2.1.0"
     eslint-visitor-keys "^2.0.0"
-    espree "^7.3.0"
+    espree "^7.3.1"
     esquery "^1.2.0"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
+    file-entry-cache "^6.0.0"
     functional-red-black-tree "^1.0.1"
     glob-parent "^5.0.0"
     globals "^12.1.0"
@@ -3218,7 +3217,7 @@ eslint@7.14.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@7.3.0, espree@^7.3.0:
+espree@7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
   integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
@@ -3227,6 +3226,15 @@ espree@7.3.0, espree@^7.3.0:
     acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.3.0"
 
+espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+  dependencies:
+    acorn "^7.4.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^1.3.0"
+
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -3466,12 +3474,12 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+file-entry-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a"
+  integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==
   dependencies:
-    flat-cache "^2.0.1"
+    flat-cache "^3.0.4"
 
 fill-range@^4.0.0:
   version "4.0.0"
@@ -3519,19 +3527,18 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
   dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
 
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+flatted@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"
+  integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==
 
 flatten@^1.0.2:
   version "1.0.3"
@@ -5314,13 +5321,6 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -6280,13 +6280,6 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -7497,13 +7490,6 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@^7.2.3:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"

From c878c59b83dfb22ecb98bd04ebb6320ddc8ea5e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Dec 2020 05:57:11 +0000
Subject: [PATCH 162/299] Build(deps-dev): Bump @glimmer/reference from 0.68.0
 to 0.68.1 (#9833)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index f98ca7ee1..0d29d09d3 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.9",
     "@babel/preset-env": "7.12.7",
     "@babel/types": "7.12.7",
-    "@glimmer/reference": "0.68.0",
+    "@glimmer/reference": "0.68.1",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index 181beea06..091152622 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1058,10 +1058,10 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.68.0.tgz#92fe8a2b641b02bec682b670eb3d2a24d683e490"
-  integrity sha512-qaYUOP2PF9JmOXiAULzR/5J0py0YNsBVx0wFbPhbhAfrY5LTmVx5Aunbhbc6tHNY8IjgoW4v1k0GpG86YZ+4Mw==
+"@glimmer/global-context@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.68.1.tgz#b5e84883a2449075a0618e33641d94e7442a0b31"
+  integrity sha512-nwZeoaBJWxEqT3tubPFI1lyUIO8UhkcdGAo+8rranrASJ0oQddldYhaDGO863Gnre+5I2MWUps4jVAg7MFBkSg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
@@ -1072,16 +1072,23 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.68.0.tgz#91e85cd881b0d9ee7e108879cd56e1ec374f9b59"
-  integrity sha512-b66jSLLitKvt0d7yi/+5M6XE+vWrorwsjYk3eCTE+cdMEG/T8n0d2j3P2TRL7opSnn8Pjj4o5ZZc4tOPyw7Sug==
+"@glimmer/interfaces@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.68.1.tgz#a4d4b0380f0094c7f5901c26b54ccf40ddef521e"
+  integrity sha512-QNsWfMe5Aob++aM+OBJOUAn6DXwNK84p7ISkzxKZYdNNgLavjI5Coo2N577I95x42h1k9fdUoIxBKKC7aCSx4g==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/reference@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.68.1.tgz#0adb39a452e1c82c28c27f082135b5698e529a18"
+  integrity sha512-qXF0SAyA34oeATkLT95St8gUdImRG52VjcDax9TbkW4fIjf5geQnyfsMP00VKFxWa7TUBFvPSapdhvWCfOu0LQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.68.0"
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/util" "0.68.0"
-    "@glimmer/validator" "0.68.0"
+    "@glimmer/global-context" "0.68.1"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/util" "0.68.1"
+    "@glimmer/validator" "0.68.1"
 
 "@glimmer/syntax@0.68.0":
   version "0.68.0"
@@ -1102,13 +1109,22 @@
     "@glimmer/interfaces" "0.68.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.68.0.tgz#a9cab4a3eb6fdc432002e97d51fc07ec9fb144f4"
-  integrity sha512-KtDOCN1LxJW4/GRfhXZsHNsg3V0xHFklVhcXBdNjM/3mQDs5MIyaWJ+HduyLrFPC9I25/vjyH1zryBrD4+taiQ==
+"@glimmer/util@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.68.1.tgz#d522ff4b91f0a59a23327f336bb90ddc55685ca1"
+  integrity sha512-eg1etiyeaxXL63ZONvl4+AVPN64dl84hFYXJCngb4qRXCXuAzSH+lepkJtKwhzJUEMlASwqk75Au9CyoGM4SOg==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.68.1"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/validator@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.68.1.tgz#7052fde18b5fcb4e1c726edf7b215c99fd68c36b"
+  integrity sha512-J5NmaltZl7Dpja3HvfDD3rITKIHaXlsRQoMHM6d4jqHTRkRCGpqm+x+BHMUiOXkm3vDwb0+t6bRTgQ8/hDGgSw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.68.0"
+    "@glimmer/global-context" "0.68.1"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From c4aa779393f25054d24cdc60c21ff52b4b595e6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Dec 2020 05:57:44 +0000
Subject: [PATCH 163/299] Build(deps-dev): Bump webpack from 5.9.0 to 5.10.0 in
 /website (#9832)

---
 website/package.json |  2 +-
 website/yarn.lock    | 39 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/website/package.json b/website/package.json
index eb57b8c7a..4753fcbe2 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.0",
     "svgo": "1.3.2",
-    "webpack": "5.9.0",
+    "webpack": "5.10.0",
     "webpack-cli": "4.2.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index beed19567..35dba5967 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -3280,6 +3280,14 @@ find-up@^4.0.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 find-versions@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.1.0.tgz#10161f29cf3eb4350dec10a29bdde75bff0df32d"
@@ -4526,6 +4534,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -5297,6 +5312,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-map-series@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
@@ -5468,6 +5490,13 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
+pkg-dir@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
+  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
+  dependencies:
+    find-up "^5.0.0"
+
 pkg-up@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
@@ -7387,10 +7416,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.9.0:
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.9.0.tgz#af2e9cf9d6c7867cdcf214ea3bb5eb77aece6895"
-  integrity sha512-YnnqIV/uAS5ZrNpctSv378qV7HmbJ74DL+XfvMxzbX1bV9e7eeT6eEWU4wuUw33CNr/HspBh7R/xQlVjTEyAeA==
+webpack@5.10.0:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.0.tgz#6f77c31522a2c525152d9c344f9765d168b3df08"
+  integrity sha512-P0bHAXmIz0zsNcHNLqFmLY1ZtrT+jtBr7FqpuDtA2o7GiHC+zBsfhgK7SmJ1HG7BAEb3G9JoMdSVi7mEDvG3Zg==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"
@@ -7410,7 +7439,7 @@ webpack@5.9.0:
     loader-runner "^4.1.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    pkg-dir "^4.2.0"
+    pkg-dir "^5.0.0"
     schema-utils "^3.0.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.0.3"

From f9827cbe99fe0700c28fd0844a7d6719d010f261 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Dec 2020 09:04:05 +0000
Subject: [PATCH 164/299] Build(deps): Bump @glimmer/syntax from 0.68.0 to
 0.68.1 (#9835)

---
 package.json |  2 +-
 yarn.lock    | 28 ++++++----------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 0d29d09d3..14f0571c2 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "11.0.3",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.7",
-    "@glimmer/syntax": "0.68.0",
+    "@glimmer/syntax": "0.68.1",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.9.0",
     "angular-estree-parser": "2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 091152622..c70b237a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1065,13 +1065,6 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.68.0.tgz#451e12d9b74cfd0778fbf6ae0374323b726d7a79"
-  integrity sha512-GvR8ke9XZK0qupJmHcUHVzy6Y5gLsBIzi0h769xoA6l6VrtRCQJC1GF95KNj1z3jlhVCUw3OLnqVFantCEONaQ==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.68.1":
   version "0.68.1"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.68.1.tgz#a4d4b0380f0094c7f5901c26b54ccf40ddef521e"
@@ -1090,25 +1083,16 @@
     "@glimmer/util" "0.68.1"
     "@glimmer/validator" "0.68.1"
 
-"@glimmer/syntax@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.68.0.tgz#8dc25dbe8332ecc288ed5e02c721b19fc1e856e4"
-  integrity sha512-nidrNS1xf/cTQsoRyCj1VeCHGj4/dgRBBd3fbIig5KumOx7W5UQF4/cXJi24hA0/vvd0MEUMqo2DPpCMsPV7PQ==
+"@glimmer/syntax@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.68.1.tgz#e7bebdc26b2b4586ca27ae2d577a712b5bf9a6c3"
+  integrity sha512-c1XXV6Oy2ogYQSef3CYvlv/YRz1O5nZ71UadpUYtkchfQdgbwEQgCtIXKIvet5eMuvoYudnXHidSi91QEWaLOA==
   dependencies:
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/util" "0.68.0"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/util" "0.68.1"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.68.0.tgz#16fec2fb54a9cda6ceef8c3cbc2c47346704cefc"
-  integrity sha512-YUIcItWFkHilVwllZnkJggoBm7xDvN+VyMgcPk4jsmUlMrt3zy0C9XGgmDmnPqJ1Bl0gMCf5JUf59RByw8TNHQ==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.0"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.68.1":
   version "0.68.1"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.68.1.tgz#d522ff4b91f0a59a23327f336bb90ddc55685ca1"

From 471771bc42fddaa61a52e0daaf45e94e19542db5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Dec 2020 09:13:10 +0000
Subject: [PATCH 165/299] Build(deps-dev): Bump webpack from 5.9.0 to 5.10.0
 (#9834)

---
 package.json |  2 +-
 yarn.lock    | 39 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 14f0571c2..a4d91a5d3 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "synchronous-promise": "2.0.15",
     "tempy": "1.0.0",
     "terser-webpack-plugin": "5.0.3",
-    "webpack": "5.9.0"
+    "webpack": "5.10.0"
   },
   "scripts": {
     "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
diff --git a/yarn.lock b/yarn.lock
index c70b237a1..05e99535c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3527,6 +3527,14 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -5130,6 +5138,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -5641,6 +5656,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -5816,6 +5838,13 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
+pkg-dir@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
+  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
+  dependencies:
+    find-up "^5.0.0"
+
 platform@^1.3.3:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444"
@@ -7391,10 +7420,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.9.0:
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.9.0.tgz#af2e9cf9d6c7867cdcf214ea3bb5eb77aece6895"
-  integrity sha512-YnnqIV/uAS5ZrNpctSv378qV7HmbJ74DL+XfvMxzbX1bV9e7eeT6eEWU4wuUw33CNr/HspBh7R/xQlVjTEyAeA==
+webpack@5.10.0:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.0.tgz#6f77c31522a2c525152d9c344f9765d168b3df08"
+  integrity sha512-P0bHAXmIz0zsNcHNLqFmLY1ZtrT+jtBr7FqpuDtA2o7GiHC+zBsfhgK7SmJ1HG7BAEb3G9JoMdSVi7mEDvG3Zg==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"
@@ -7414,7 +7443,7 @@ webpack@5.9.0:
     loader-runner "^4.1.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    pkg-dir "^4.2.0"
+    pkg-dir "^5.0.0"
     schema-utils "^3.0.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.0.3"

From d6999dcc386b42a5e0e1b6c6ebc02bf6d3f3aaf5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Dec 2020 09:21:21 +0000
Subject: [PATCH 166/299] Build(deps-dev): Bump eslint-config-prettier from
 6.15.0 to 7.0.0 (#9838)

---
 package.json |  2 +-
 yarn.lock    | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index a4d91a5d3..07dfd84b3 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "cross-env": "7.0.3",
     "cspell": "4.2.5",
     "eslint": "7.15.0",
-    "eslint-config-prettier": "6.15.0",
+    "eslint-config-prettier": "7.0.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jest": "24.1.3",
diff --git a/yarn.lock b/yarn.lock
index 05e99535c..e09b9a688 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3040,12 +3040,10 @@ eslint-ast-utils@^1.1.0:
     lodash.get "^4.4.2"
     lodash.zip "^4.2.0"
 
-eslint-config-prettier@6.15.0:
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"
-  integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==
-  dependencies:
-    get-stdin "^6.0.0"
+eslint-config-prettier@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz#c1ae4106f74e6c0357f44adb076771d032ac0e97"
+  integrity sha512-8Y8lGLVPPZdaNA7JXqnvETVC7IiVRgAP6afQu9gOQRn90YY3otMNh+x7Vr2vMePQntF+5erdSUBqSzCmU/AxaQ==
 
 eslint-formatter-friendly@7.0.0:
   version "7.0.0"
@@ -3639,11 +3637,6 @@ get-stdin@8.0.0, get-stdin@^8.0.0:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
   integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
-
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"

From 6401a1b4d32b7cf086ae14fa08c9a7edd5565e52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Dec 2020 17:22:54 +0800
Subject: [PATCH 167/299] Build(deps): Bump espree from 7.3.0 to 7.3.1 (#9837)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 07dfd84b3..931d12340 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "editorconfig": "0.15.3",
     "editorconfig-to-prettier": "0.2.0",
     "escape-string-regexp": "4.0.0",
-    "espree": "7.3.0",
+    "espree": "7.3.1",
     "esutils": "2.0.3",
     "fast-glob": "3.2.4",
     "fast-json-stable-stringify": "2.1.0",
diff --git a/yarn.lock b/yarn.lock
index e09b9a688..5a7f7cf5e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1841,7 +1841,7 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
@@ -3215,16 +3215,7 @@ eslint@7.15.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
-  integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
-  dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.3.0"
-
-espree@^7.3.0, espree@^7.3.1:
+espree@7.3.1, espree@^7.3.0, espree@^7.3.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
   integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==

From 08f2e7339d14e9e6cf6a5ad7745890b1b6fe0492 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Dec 2020 09:52:51 +0000
Subject: [PATCH 168/299] Build(deps-dev): Bump rollup from 2.34.1 to 2.34.2
 (#9831)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 931d12340..d6ef17ab5 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "path-browserify": "1.0.1",
     "prettier": "2.2.1",
     "rimraf": "3.0.2",
-    "rollup": "2.34.1",
+    "rollup": "2.34.2",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-terser": "7.0.2",
     "shelljs": "0.8.4",
diff --git a/yarn.lock b/yarn.lock
index 5a7f7cf5e..9dd26c8be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6329,10 +6329,10 @@ rollup-pluginutils@^2.3.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@2.34.1:
-  version "2.34.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.34.1.tgz#a387230df02c58b242794a213dfb68b42de2c8fb"
-  integrity sha512-tGveB6NU5x4MS/iXaIsjfUkEv4hxzJJ4o0FRy5LO62Ndx3R2cmE1qsLYlSfRkvHUUPqWiFoxEm8pRftzh1a5HA==
+rollup@2.34.2:
+  version "2.34.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.34.2.tgz#fa73e05c64df587e9ed4dc80d7d4e7d4a43f8908"
+  integrity sha512-mvtQLqu3cNeoctS+kZ09iOPxrc1P1/Bt1z15enuQ5feyKOdM3MJAVFjjsygurDpSWn530xB4AlA83TWIzRstXA==
   optionalDependencies:
     fsevents "~2.1.2"
 

From aaa9363e6faf1c1d886241b6dad8bd7c05c91a84 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Tue, 8 Dec 2020 13:52:30 +0900
Subject: [PATCH 169/299] Print null argument list item (#9787)

* Print null argument list item

* Add changelog

* Add tests for comments
---
 changelog_unreleased/javascript/9787.md       | 13 +++++
 src/language-js/utils.js                      | 18 ++++---
 .../__snapshots__/jsfmt.spec.js.snap          | 50 +++++++++++++++++++
 .../js/call/null-arguments-item/jsfmt.spec.js |  6 +++
 .../null-arguments-item.js                    |  6 +++
 5 files changed, 85 insertions(+), 8 deletions(-)
 create mode 100644 changelog_unreleased/javascript/9787.md
 create mode 100644 tests/js/call/null-arguments-item/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/js/call/null-arguments-item/jsfmt.spec.js
 create mode 100644 tests/js/call/null-arguments-item/null-arguments-item.js

diff --git a/changelog_unreleased/javascript/9787.md b/changelog_unreleased/javascript/9787.md
new file mode 100644
index 000000000..8a8c45ee4
--- /dev/null
+++ b/changelog_unreleased/javascript/9787.md
@@ -0,0 +1,13 @@
+#### Print null items in arguments (#9787 by @sosukesuzuki)
+
+<!-- prettier-ignore -->
+```js
+// Input
+foo("a", , "b");
+
+// Prettier stable
+TypeError: Cannot read property 'type' of null
+
+// Prettier master
+foo("a", , "b");
+```
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index a9302d2cb..fb3a2acc9 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -1008,16 +1008,18 @@ function isFunctionCompositionArgs(args) {
   }
   let count = 0;
   for (const arg of args) {
-    if (isFunctionOrArrowExpression(arg)) {
-      count += 1;
-      if (count > 1) {
-        return true;
-      }
-    } else if (isCallOrOptionalCallExpression(arg)) {
-      for (const childArg of arg.arguments) {
-        if (isFunctionOrArrowExpression(childArg)) {
+    if (arg) {
+      if (isFunctionOrArrowExpression(arg)) {
+        count += 1;
+        if (count > 1) {
           return true;
         }
+      } else if (isCallOrOptionalCallExpression(arg)) {
+        for (const childArg of arg.arguments) {
+          if (isFunctionOrArrowExpression(childArg)) {
+            return true;
+          }
+        }
       }
     }
   }
diff --git a/tests/js/call/null-arguments-item/__snapshots__/jsfmt.spec.js.snap b/tests/js/call/null-arguments-item/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..a09473f69
--- /dev/null
+++ b/tests/js/call/null-arguments-item/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,50 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`null-arguments-item.js [espree] format 1`] = `
+"Unexpected token , (1:11)
+> 1 | foor('a', , 'b');
+    |           ^
+  2 | foo('looooooooooooooooooooooooooooooooooooooooooooooong', , 'looooooooooooooooooooooooooooooooooooooooooooooong');
+  3 | foo(\\"a\\",
+  4 |     //1"
+`;
+
+exports[`null-arguments-item.js [meriyah] format 1`] = `
+"[1:11]: Unexpected token: ',' (1:11)
+> 1 | foor('a', , 'b');
+    |           ^
+  2 | foo('looooooooooooooooooooooooooooooooooooooooooooooong', , 'looooooooooooooooooooooooooooooooooooooooooooooong');
+  3 | foo(\\"a\\",
+  4 |     //1"
+`;
+
+exports[`null-arguments-item.js format 1`] = `
+====================================options=====================================
+parsers: ["babel"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+foor('a', , 'b');
+foo('looooooooooooooooooooooooooooooooooooooooooooooong', , 'looooooooooooooooooooooooooooooooooooooooooooooong');
+foo("a",
+    //1
+    , "b");
+foo("a", /* comment */, "b");
+
+=====================================output=====================================
+foor("a", , "b");
+foo(
+  "looooooooooooooooooooooooooooooooooooooooooooooong",
+  ,
+  "looooooooooooooooooooooooooooooooooooooooooooooong"
+);
+foo(
+  "a",
+  ,
+  //1
+  "b"
+);
+foo("a" /* comment */, , "b");
+
+================================================================================
+`;
diff --git a/tests/js/call/null-arguments-item/jsfmt.spec.js b/tests/js/call/null-arguments-item/jsfmt.spec.js
new file mode 100644
index 000000000..c57dff579
--- /dev/null
+++ b/tests/js/call/null-arguments-item/jsfmt.spec.js
@@ -0,0 +1,6 @@
+run_spec(__dirname, ["babel"], {
+  errors: {
+    espree: true,
+    meriyah: true,
+  },
+});
diff --git a/tests/js/call/null-arguments-item/null-arguments-item.js b/tests/js/call/null-arguments-item/null-arguments-item.js
new file mode 100644
index 000000000..52b91101f
--- /dev/null
+++ b/tests/js/call/null-arguments-item/null-arguments-item.js
@@ -0,0 +1,6 @@
+foor('a', , 'b');
+foo('looooooooooooooooooooooooooooooooooooooooooooooong', , 'looooooooooooooooooooooooooooooooooooooooooooooong');
+foo("a",
+    //1
+    , "b");
+foo("a", /* comment */, "b");

From 8d0c8b2bf47bdd2b0ab456971b8ac320e8a3e4d8 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Tue, 8 Dec 2020 14:36:46 +0900
Subject: [PATCH 170/299] Extract files and rename util -> core (#9826)

WIP

Extract create-minimist-options

Remove warning

Fix

Extract format.js

Fix

Remove

fix

Fix

Extract files for cli and rename util -> core

Update tsconfig
---
 src/cli/context.js                          |  149 +++
 src/cli/core.js                             |   58 ++
 src/cli/create-minimist-options.js          |   37 +
 src/cli/expand-patterns.js                  |    2 +-
 src/cli/format.js                           |  422 ++++++++
 src/cli/index.js                            |   20 +-
 src/cli/logger.js                           |   51 +
 src/cli/option-map.js                       |   65 ++
 src/cli/option.js                           |  145 +++
 src/cli/usage.js                            |  192 ++++
 src/cli/util.js                             | 1041 -------------------
 tests_integration/__tests__/help-options.js |    6 +-
 tsconfig.json                               |    7 +-
 13 files changed, 1139 insertions(+), 1056 deletions(-)
 create mode 100644 src/cli/context.js
 create mode 100644 src/cli/core.js
 create mode 100644 src/cli/create-minimist-options.js
 create mode 100644 src/cli/format.js
 create mode 100644 src/cli/logger.js
 create mode 100644 src/cli/option-map.js
 create mode 100644 src/cli/option.js
 create mode 100644 src/cli/usage.js
 delete mode 100644 src/cli/util.js

diff --git a/src/cli/context.js b/src/cli/context.js
new file mode 100644
index 000000000..95da0f822
--- /dev/null
+++ b/src/cli/context.js
@@ -0,0 +1,149 @@
+"use strict";
+const fromPairs = require("lodash/fromPairs");
+const pick = require("lodash/pick");
+
+// eslint-disable-next-line no-restricted-modules
+const prettier = require("../index");
+const { createLogger } = require("./logger");
+const {
+  optionsModule,
+  optionsNormalizer,
+  utils: { arrayify },
+} = require("./prettier-internal");
+const minimist = require("./minimist");
+const constant = require("./constant");
+const {
+  createDetailedOptionMap,
+  normalizeDetailedOptionMap,
+} = require("./option-map");
+const createMinimistOptions = require("./create-minimist-options");
+
+/**
+ * @typedef {Object} Context
+ * @property logger
+ * @property {string[]} args
+ * @property argv
+ * @property {string[]} filePatterns
+ * @property {any[]} supportOptions
+ * @property detailedOptions
+ * @property detailedOptionMap
+ * @property apiDefaultOptions
+ * @property languages
+ * @property {Partial<Context>[]} stack
+ */
+
+/** @returns {Context} */
+function createContext(args) {
+  /** @type {Context} */
+  const context = { args, stack: [] };
+
+  updateContextArgv(context);
+  normalizeContextArgv(context, ["loglevel", "plugin", "plugin-search-dir"]);
+
+  context.logger = createLogger(context.argv.loglevel);
+
+  updateContextArgv(
+    context,
+    context.argv.plugin,
+    context.argv["plugin-search-dir"]
+  );
+
+  return context;
+}
+
+function initContext(context) {
+  // split into 2 step so that we could wrap this in a `try..catch` in cli/index.js
+  normalizeContextArgv(context);
+}
+
+/**
+ * @param {Context} context
+ * @param {string[]} plugins
+ * @param {string[]=} pluginSearchDirs
+ */
+function updateContextOptions(context, plugins, pluginSearchDirs) {
+  const { options: supportOptions, languages } = prettier.getSupportInfo({
+    showDeprecated: true,
+    showUnreleased: true,
+    showInternal: true,
+    plugins,
+    pluginSearchDirs,
+  });
+
+  const detailedOptionMap = normalizeDetailedOptionMap({
+    ...createDetailedOptionMap(supportOptions),
+    ...constant.options,
+  });
+
+  const detailedOptions = arrayify(detailedOptionMap, "name");
+
+  const apiDefaultOptions = {
+    ...optionsModule.hiddenDefaults,
+    ...fromPairs(
+      supportOptions
+        .filter(({ deprecated }) => !deprecated)
+        .map((option) => [option.name, option.default])
+    ),
+  };
+
+  Object.assign(context, {
+    supportOptions,
+    detailedOptions,
+    detailedOptionMap,
+    apiDefaultOptions,
+    languages,
+  });
+}
+
+/**
+ * @param {Context} context
+ * @param {string[]} plugins
+ * @param {string[]=} pluginSearchDirs
+ */
+function pushContextPlugins(context, plugins, pluginSearchDirs) {
+  context.stack.push(
+    pick(context, [
+      "supportOptions",
+      "detailedOptions",
+      "detailedOptionMap",
+      "apiDefaultOptions",
+      "languages",
+    ])
+  );
+  updateContextOptions(context, plugins, pluginSearchDirs);
+}
+
+/**
+ * @param {Context} context
+ */
+function popContextPlugins(context) {
+  Object.assign(context, context.stack.pop());
+}
+
+function updateContextArgv(context, plugins, pluginSearchDirs) {
+  pushContextPlugins(context, plugins, pluginSearchDirs);
+
+  const minimistOptions = createMinimistOptions(context.detailedOptions);
+  const argv = minimist(context.args, minimistOptions);
+
+  context.argv = argv;
+  context.filePatterns = argv._.map((file) => String(file));
+}
+
+function normalizeContextArgv(context, keys) {
+  const detailedOptions = !keys
+    ? context.detailedOptions
+    : context.detailedOptions.filter((option) => keys.includes(option.name));
+  const argv = !keys ? context.argv : pick(context.argv, keys);
+
+  context.argv = optionsNormalizer.normalizeCliOptions(argv, detailedOptions, {
+    logger: context.logger,
+  });
+}
+
+module.exports = {
+  createContext,
+  initContext,
+  popContextPlugins,
+  pushContextPlugins,
+};
diff --git a/src/cli/core.js b/src/cli/core.js
new file mode 100644
index 000000000..fe6c7b002
--- /dev/null
+++ b/src/cli/core.js
@@ -0,0 +1,58 @@
+"use strict";
+
+const path = require("path");
+
+const stringify = require("fast-json-stable-stringify");
+
+// eslint-disable-next-line no-restricted-modules
+const prettier = require("../index");
+
+const { format, formatStdin, formatFiles } = require("./format");
+const { createContext, initContext } = require("./context");
+const {
+  normalizeDetailedOptionMap,
+  createDetailedOptionMap,
+} = require("./option-map");
+const { createDetailedUsage, createUsage } = require("./usage");
+
+function logResolvedConfigPathOrDie(context) {
+  const configFile = prettier.resolveConfigFile.sync(
+    context.argv["find-config-path"]
+  );
+  if (configFile) {
+    context.logger.log(path.relative(process.cwd(), configFile));
+  } else {
+    process.exit(1);
+  }
+}
+
+function logFileInfoOrDie(context) {
+  const options = {
+    ignorePath: context.argv["ignore-path"],
+    withNodeModules: context.argv["with-node-modules"],
+    plugins: context.argv.plugin,
+    pluginSearchDirs: context.argv["plugin-search-dir"],
+    resolveConfig: context.argv.config !== false,
+  };
+
+  context.logger.log(
+    prettier.format(
+      stringify(prettier.getFileInfo.sync(context.argv["file-info"], options)),
+      { parser: "json" }
+    )
+  );
+}
+
+module.exports = {
+  createContext,
+  createDetailedOptionMap,
+  createDetailedUsage,
+  createUsage,
+  format,
+  formatFiles,
+  formatStdin,
+  initContext,
+  logResolvedConfigPathOrDie,
+  logFileInfoOrDie,
+  normalizeDetailedOptionMap,
+};
diff --git a/src/cli/create-minimist-options.js b/src/cli/create-minimist-options.js
new file mode 100644
index 000000000..91b8d1c3e
--- /dev/null
+++ b/src/cli/create-minimist-options.js
@@ -0,0 +1,37 @@
+"use strict";
+
+const partition = require("lodash/partition");
+const flat = require("lodash/flatten");
+const fromPairs = require("lodash/fromPairs");
+
+module.exports = function createMinimistOptions(detailedOptions) {
+  const [boolean, string] = partition(
+    detailedOptions,
+    ({ type }) => type === "boolean"
+  ).map((detailedOptions) =>
+    flat(
+      detailedOptions.map(({ name, alias }) => (alias ? [name, alias] : [name]))
+    )
+  );
+
+  const defaults = fromPairs(
+    detailedOptions
+      .filter(
+        (option) =>
+          !option.deprecated &&
+          (!option.forwardToApi ||
+            option.name === "plugin" ||
+            option.name === "plugin-search-dir") &&
+          option.default !== undefined
+      )
+      .map((option) => [option.name, option.default])
+  );
+
+  return {
+    // we use vnopts' AliasSchema to handle aliases for better error messages
+    alias: {},
+    boolean,
+    string,
+    default: defaults,
+  };
+};
diff --git a/src/cli/expand-patterns.js b/src/cli/expand-patterns.js
index 346301ad0..7dba07ddb 100644
--- a/src/cli/expand-patterns.js
+++ b/src/cli/expand-patterns.js
@@ -5,7 +5,7 @@ const fs = require("fs");
 const fastGlob = require("fast-glob");
 const flat = require("lodash/flatten");
 
-/** @typedef {import('./util').Context} Context */
+/** @typedef {import('./context').Context} Context */
 
 /**
  * @param {Context} context
diff --git a/src/cli/format.js b/src/cli/format.js
new file mode 100644
index 000000000..99e6f59d6
--- /dev/null
+++ b/src/cli/format.js
@@ -0,0 +1,422 @@
+"use strict";
+
+const fs = require("fs");
+const readline = require("readline");
+const path = require("path");
+
+const chalk = require("chalk");
+
+// eslint-disable-next-line no-restricted-modules
+const prettier = require("../index");
+// eslint-disable-next-line no-restricted-modules
+const { getStdin } = require("../common/third-party");
+
+const { createIgnorer, errors } = require("./prettier-internal");
+const { expandPatterns, fixWindowsSlashes } = require("./expand-patterns");
+const { getOptionsForFile } = require("./option");
+const isTTY = require("./is-tty");
+
+function diff(a, b) {
+  return require("diff").createTwoFilesPatch("", "", a, b, "", "", {
+    context: 2,
+  });
+}
+
+function handleError(context, filename, error) {
+  if (error instanceof errors.UndefinedParserError) {
+    // Can't test on CI, `isTTY()` is always false, see ./is-tty.js
+    /* istanbul ignore next */
+    if ((context.argv.write || context.argv["ignore-unknown"]) && isTTY()) {
+      readline.clearLine(process.stdout, 0);
+      readline.cursorTo(process.stdout, 0, null);
+    }
+    if (context.argv["ignore-unknown"]) {
+      return;
+    }
+    if (!context.argv.check && !context.argv["list-different"]) {
+      process.exitCode = 2;
+    }
+    context.logger.error(error.message);
+    return;
+  }
+
+  if (context.argv.write) {
+    // Add newline to split errors from filename line.
+    process.stdout.write("\n");
+  }
+
+  const isParseError = Boolean(error && error.loc);
+  const isValidationError = /^Invalid \S+ value\./.test(error && error.message);
+
+  if (isParseError) {
+    // `invalid.js: SyntaxError: Unexpected token (1:1)`.
+    context.logger.error(`${filename}: ${String(error)}`);
+  } else if (isValidationError || error instanceof errors.ConfigError) {
+    // `Invalid printWidth value. Expected an integer, but received 0.5.`
+    context.logger.error(error.message);
+    // If validation fails for one file, it will fail for all of them.
+    process.exit(1);
+  } else if (error instanceof errors.DebugError) {
+    // `invalid.js: Some debug error message`
+    context.logger.error(`${filename}: ${error.message}`);
+  } else {
+    // `invalid.js: Error: Some unexpected error\n[stack trace]`
+    /* istanbul ignore next */
+    context.logger.error(filename + ": " + (error.stack || error));
+  }
+
+  // Don't exit the process if one file failed
+  process.exitCode = 2;
+}
+
+function writeOutput(context, result, options) {
+  // Don't use `console.log` here since it adds an extra newline at the end.
+  process.stdout.write(
+    context.argv["debug-check"] ? result.filepath : result.formatted
+  );
+
+  if (options && options.cursorOffset >= 0) {
+    process.stderr.write(result.cursorOffset + "\n");
+  }
+}
+
+function listDifferent(context, input, options, filename) {
+  if (!context.argv.check && !context.argv["list-different"]) {
+    return;
+  }
+
+  try {
+    if (!options.filepath && !options.parser) {
+      throw new errors.UndefinedParserError(
+        "No parser and no file path given, couldn't infer a parser."
+      );
+    }
+    if (!prettier.check(input, options)) {
+      if (!context.argv.write) {
+        context.logger.log(filename);
+        process.exitCode = 1;
+      }
+    }
+  } catch (error) {
+    context.logger.error(error.message);
+  }
+
+  return true;
+}
+
+function format(context, input, opt) {
+  if (!opt.parser && !opt.filepath) {
+    throw new errors.UndefinedParserError(
+      "No parser and no file path given, couldn't infer a parser."
+    );
+  }
+
+  if (context.argv["debug-print-doc"]) {
+    const doc = prettier.__debug.printToDoc(input, opt);
+    return { formatted: prettier.__debug.formatDoc(doc) };
+  }
+
+  if (context.argv["debug-check"]) {
+    const pp = prettier.format(input, opt);
+    const pppp = prettier.format(pp, opt);
+    if (pp !== pppp) {
+      throw new errors.DebugError(
+        "prettier(input) !== prettier(prettier(input))\n" + diff(pp, pppp)
+      );
+    } else {
+      const stringify = (obj) => JSON.stringify(obj, null, 2);
+      const ast = stringify(
+        prettier.__debug.parse(input, opt, /* massage */ true).ast
+      );
+      const past = stringify(
+        prettier.__debug.parse(pp, opt, /* massage */ true).ast
+      );
+
+      /* istanbul ignore next */
+      if (ast !== past) {
+        const MAX_AST_SIZE = 2097152; // 2MB
+        const astDiff =
+          ast.length > MAX_AST_SIZE || past.length > MAX_AST_SIZE
+            ? "AST diff too large to render"
+            : diff(ast, past);
+        throw new errors.DebugError(
+          "ast(input) !== ast(prettier(input))\n" +
+            astDiff +
+            "\n" +
+            diff(input, pp)
+        );
+      }
+    }
+    return { formatted: pp, filepath: opt.filepath || "(stdin)\n" };
+  }
+
+  /* istanbul ignore next */
+  if (context.argv["debug-benchmark"]) {
+    let benchmark;
+    try {
+      benchmark = eval("require")("benchmark");
+    } catch (err) {
+      context.logger.debug(
+        "'--debug-benchmark' requires the 'benchmark' package to be installed."
+      );
+      process.exit(2);
+    }
+    context.logger.debug(
+      "'--debug-benchmark' option found, measuring formatWithCursor with 'benchmark' module."
+    );
+    const suite = new benchmark.Suite();
+    suite
+      .add("format", () => {
+        prettier.formatWithCursor(input, opt);
+      })
+      .on("cycle", (event) => {
+        const results = {
+          benchmark: String(event.target),
+          hz: event.target.hz,
+          ms: event.target.times.cycle * 1000,
+        };
+        context.logger.debug(
+          "'--debug-benchmark' measurements for formatWithCursor: " +
+            JSON.stringify(results, null, 2)
+        );
+      })
+      .run({ async: false });
+  } else if (context.argv["debug-repeat"] > 0) {
+    const repeat = context.argv["debug-repeat"];
+    context.logger.debug(
+      "'--debug-repeat' option found, running formatWithCursor " +
+        repeat +
+        " times."
+    );
+    // should be using `performance.now()`, but only `Date` is cross-platform enough
+    const now = Date.now ? () => Date.now() : () => +new Date();
+    let totalMs = 0;
+    for (let i = 0; i < repeat; ++i) {
+      const startMs = now();
+      prettier.formatWithCursor(input, opt);
+      totalMs += now() - startMs;
+    }
+    const averageMs = totalMs / repeat;
+    const results = {
+      repeat,
+      hz: 1000 / averageMs,
+      ms: averageMs,
+    };
+    context.logger.debug(
+      "'--debug-repeat' measurements for formatWithCursor: " +
+        JSON.stringify(results, null, 2)
+    );
+  }
+
+  return prettier.formatWithCursor(input, opt);
+}
+
+function createIgnorerFromContextOrDie(context) {
+  try {
+    return createIgnorer.sync(
+      context.argv["ignore-path"],
+      context.argv["with-node-modules"]
+    );
+  } catch (e) {
+    context.logger.error(e.message);
+    process.exit(2);
+  }
+}
+
+function formatStdin(context) {
+  const filepath = context.argv["stdin-filepath"]
+    ? path.resolve(process.cwd(), context.argv["stdin-filepath"])
+    : process.cwd();
+
+  const ignorer = createIgnorerFromContextOrDie(context);
+  // If there's an ignore-path set, the filename must be relative to the
+  // ignore path, not the current working directory.
+  const relativeFilepath = context.argv["ignore-path"]
+    ? path.relative(path.dirname(context.argv["ignore-path"]), filepath)
+    : path.relative(process.cwd(), filepath);
+
+  getStdin()
+    .then((input) => {
+      if (
+        relativeFilepath &&
+        ignorer.ignores(fixWindowsSlashes(relativeFilepath))
+      ) {
+        writeOutput(context, { formatted: input });
+        return;
+      }
+
+      const options = getOptionsForFile(context, filepath);
+
+      if (listDifferent(context, input, options, "(stdin)")) {
+        return;
+      }
+
+      writeOutput(context, format(context, input, options), options);
+    })
+    .catch((error) => {
+      handleError(context, relativeFilepath || "stdin", error);
+    });
+}
+
+function formatFiles(context) {
+  // The ignorer will be used to filter file paths after the glob is checked,
+  // before any files are actually written
+  const ignorer = createIgnorerFromContextOrDie(context);
+
+  let numberOfUnformattedFilesFound = 0;
+
+  if (context.argv.check) {
+    context.logger.log("Checking formatting...");
+  }
+
+  for (const pathOrError of expandPatterns(context)) {
+    if (typeof pathOrError === "object") {
+      context.logger.error(pathOrError.error);
+      // Don't exit, but set the exit code to 2
+      process.exitCode = 2;
+      continue;
+    }
+
+    const filename = pathOrError;
+    // If there's an ignore-path set, the filename must be relative to the
+    // ignore path, not the current working directory.
+    const ignoreFilename = context.argv["ignore-path"]
+      ? path.relative(path.dirname(context.argv["ignore-path"]), filename)
+      : filename;
+
+    const fileIgnored = ignorer.ignores(fixWindowsSlashes(ignoreFilename));
+    if (
+      fileIgnored &&
+      (context.argv["debug-check"] ||
+        context.argv.write ||
+        context.argv.check ||
+        context.argv["list-different"])
+    ) {
+      continue;
+    }
+
+    const options = {
+      ...getOptionsForFile(context, filename),
+      filepath: filename,
+    };
+
+    if (isTTY()) {
+      context.logger.log(filename, { newline: false });
+    }
+
+    let input;
+    try {
+      input = fs.readFileSync(filename, "utf8");
+    } catch (error) {
+      // Add newline to split errors from filename line.
+      /* istanbul ignore next */
+      context.logger.log("");
+
+      /* istanbul ignore next */
+      context.logger.error(
+        `Unable to read file: ${filename}\n${error.message}`
+      );
+
+      // Don't exit the process if one file failed
+      /* istanbul ignore next */
+      process.exitCode = 2;
+
+      /* istanbul ignore next */
+      continue;
+    }
+
+    if (fileIgnored) {
+      writeOutput(context, { formatted: input }, options);
+      continue;
+    }
+
+    const start = Date.now();
+
+    let result;
+    let output;
+
+    try {
+      result = format(context, input, options);
+      output = result.formatted;
+    } catch (error) {
+      handleError(context, filename, error);
+      continue;
+    }
+
+    const isDifferent = output !== input;
+
+    if (isTTY()) {
+      // Remove previously printed filename to log it with duration.
+      readline.clearLine(process.stdout, 0);
+      readline.cursorTo(process.stdout, 0, null);
+    }
+
+    if (context.argv.write) {
+      // Don't write the file if it won't change in order not to invalidate
+      // mtime based caches.
+      if (isDifferent) {
+        if (!context.argv.check && !context.argv["list-different"]) {
+          context.logger.log(`${filename} ${Date.now() - start}ms`);
+        }
+
+        try {
+          fs.writeFileSync(filename, output, "utf8");
+        } catch (error) {
+          /* istanbul ignore next */
+          context.logger.error(
+            `Unable to write file: ${filename}\n${error.message}`
+          );
+
+          // Don't exit the process if one file failed
+          /* istanbul ignore next */
+          process.exitCode = 2;
+        }
+      } else if (!context.argv.check && !context.argv["list-different"]) {
+        context.logger.log(`${chalk.grey(filename)} ${Date.now() - start}ms`);
+      }
+    } else if (context.argv["debug-check"]) {
+      /* istanbul ignore else */
+      if (result.filepath) {
+        context.logger.log(result.filepath);
+      } else {
+        process.exitCode = 2;
+      }
+    } else if (!context.argv.check && !context.argv["list-different"]) {
+      writeOutput(context, result, options);
+    }
+
+    if (isDifferent) {
+      if (context.argv.check) {
+        context.logger.warn(filename);
+      } else if (context.argv["list-different"]) {
+        context.logger.log(filename);
+      }
+      numberOfUnformattedFilesFound += 1;
+    }
+  }
+
+  // Print check summary based on expected exit code
+  if (context.argv.check) {
+    if (numberOfUnformattedFilesFound === 0) {
+      context.logger.log("All matched files use Prettier code style!");
+    } else {
+      context.logger.warn(
+        context.argv.write
+          ? "Code style issues fixed in the above file(s)."
+          : "Code style issues found in the above file(s). Forgot to run Prettier?"
+      );
+    }
+  }
+
+  // Ensure non-zero exitCode when using --check/list-different is not combined with --write
+  if (
+    (context.argv.check || context.argv["list-different"]) &&
+    numberOfUnformattedFilesFound > 0 &&
+    !process.exitCode &&
+    !context.argv.write
+  ) {
+    process.exitCode = 1;
+  }
+}
+
+module.exports = { format, formatStdin, formatFiles };
diff --git a/src/cli/index.js b/src/cli/index.js
index 1d5c15edc..27b059b4f 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -6,13 +6,13 @@ require("please-upgrade-node")(require("../../package.json"));
 const stringify = require("fast-json-stable-stringify");
 // eslint-disable-next-line no-restricted-modules
 const prettier = require("../index");
-const util = require("./util");
+const core = require("./core");
 
 function run(args) {
-  const context = util.createContext(args);
+  const context = core.createContext(args);
 
   try {
-    util.initContext(context);
+    core.initContext(context);
 
     context.logger.debug(`normalized argv: ${JSON.stringify(context.argv)}`);
 
@@ -44,8 +44,8 @@ function run(args) {
     if (context.argv.help !== undefined) {
       context.logger.log(
         typeof context.argv.help === "string" && context.argv.help !== ""
-          ? util.createDetailedUsage(context, context.argv.help)
-          : util.createUsage(context)
+          ? core.createDetailedUsage(context, context.argv.help)
+          : core.createUsage(context)
       );
       process.exit(0);
     }
@@ -65,15 +65,15 @@ function run(args) {
       (!process.stdin.isTTY || context.args["stdin-filepath"]);
 
     if (context.argv["find-config-path"]) {
-      util.logResolvedConfigPathOrDie(context);
+      core.logResolvedConfigPathOrDie(context);
     } else if (context.argv["file-info"]) {
-      util.logFileInfoOrDie(context);
+      core.logFileInfoOrDie(context);
     } else if (useStdin) {
-      util.formatStdin(context);
+      core.formatStdin(context);
     } else if (hasFilePatterns) {
-      util.formatFiles(context);
+      core.formatFiles(context);
     } else {
-      context.logger.log(util.createUsage(context));
+      context.logger.log(core.createUsage(context));
       process.exit(1);
     }
   } catch (error) {
diff --git a/src/cli/logger.js b/src/cli/logger.js
new file mode 100644
index 000000000..c899381d5
--- /dev/null
+++ b/src/cli/logger.js
@@ -0,0 +1,51 @@
+"use strict";
+
+const chalk = require("chalk");
+
+function createLogger(logLevel) {
+  return {
+    warn: createLogFunc("warn", "yellow"),
+    error: createLogFunc("error", "red"),
+    debug: createLogFunc("debug", "blue"),
+    log: createLogFunc("log"),
+  };
+
+  function createLogFunc(loggerName, color) {
+    if (!shouldLog(loggerName)) {
+      return () => {};
+    }
+
+    const prefix = color ? `[${chalk[color](loggerName)}] ` : "";
+    return function (message, opts) {
+      opts = { newline: true, ...opts };
+      const stream = process[loggerName === "log" ? "stdout" : "stderr"];
+      stream.write(message.replace(/^/gm, prefix) + (opts.newline ? "\n" : ""));
+    };
+  }
+
+  function shouldLog(loggerName) {
+    switch (logLevel) {
+      case "silent":
+        return false;
+      case "debug":
+        if (loggerName === "debug") {
+          return true;
+        }
+      // fall through
+      case "log":
+        if (loggerName === "log") {
+          return true;
+        }
+      // fall through
+      case "warn":
+        if (loggerName === "warn") {
+          return true;
+        }
+      // fall through
+      case "error":
+        return loggerName === "error";
+    }
+  }
+}
+
+module.exports = { createLogger };
diff --git a/src/cli/option-map.js b/src/cli/option-map.js
new file mode 100644
index 000000000..baf25598a
--- /dev/null
+++ b/src/cli/option-map.js
@@ -0,0 +1,65 @@
+"use strict";
+
+const dashify = require("dashify");
+
+const fromPairs = require("lodash/fromPairs");
+
+const { coreOptions } = require("./prettier-internal");
+
+function normalizeDetailedOption(name, option) {
+  return {
+    category: coreOptions.CATEGORY_OTHER,
+    ...option,
+    choices:
+      option.choices &&
+      option.choices.map((choice) => {
+        const newChoice = {
+          description: "",
+          deprecated: false,
+          ...(typeof choice === "object" ? choice : { value: choice }),
+        };
+        /* istanbul ignore next */
+        if (newChoice.value === true) {
+          newChoice.value = ""; // backward compatibility for original boolean option
+        }
+        return newChoice;
+      }),
+  };
+}
+
+function normalizeDetailedOptionMap(detailedOptionMap) {
+  return fromPairs(
+    Object.entries(detailedOptionMap)
+      .sort(([leftName], [rightName]) => leftName.localeCompare(rightName))
+      .map(([name, option]) => [name, normalizeDetailedOption(name, option)])
+  );
+}
+
+function createDetailedOptionMap(supportOptions) {
+  return fromPairs(
+    supportOptions.map((option) => {
+      const newOption = {
+        ...option,
+        name: option.cliName || dashify(option.name),
+        description: option.cliDescription || option.description,
+        category: option.cliCategory || coreOptions.CATEGORY_FORMAT,
+        forwardToApi: option.name,
+      };
+
+      /* istanbul ignore next */
+      if (option.deprecated) {
+        delete newOption.forwardToApi;
+        delete newOption.description;
+        delete newOption.oppositeDescription;
+        newOption.deprecated = true;
+      }
+
+      return [newOption.name, newOption];
+    })
+  );
+}
+
+module.exports = {
+  normalizeDetailedOptionMap,
+  createDetailedOptionMap,
+};
diff --git a/src/cli/option.js b/src/cli/option.js
new file mode 100644
index 000000000..211fc4f8c
--- /dev/null
+++ b/src/cli/option.js
@@ -0,0 +1,145 @@
+"use strict";
+
+const dashify = require("dashify");
+
+const fromPairs = require("lodash/fromPairs");
+
+// eslint-disable-next-line no-restricted-modules
+const prettier = require("../index");
+
+const minimist = require("./minimist");
+const { popContextPlugins, pushContextPlugins } = require("./context");
+const { optionsNormalizer } = require("./prettier-internal");
+const createMinimistOptions = require("./create-minimist-options");
+
+function getOptions(argv, detailedOptions) {
+  return fromPairs(
+    detailedOptions
+      .filter(({ forwardToApi }) => forwardToApi)
+      .map(({ forwardToApi, name }) => [forwardToApi, argv[name]])
+  );
+}
+
+function cliifyOptions(object, apiDetailedOptionMap) {
+  return Object.keys(object || {}).reduce((output, key) => {
+    const apiOption = apiDetailedOptionMap[key];
+    const cliKey = apiOption ? apiOption.name : key;
+
+    output[dashify(cliKey)] = object[key];
+    return output;
+  }, {});
+}
+
+function createApiDetailedOptionMap(detailedOptions) {
+  return fromPairs(
+    detailedOptions
+      .filter(
+        (option) => option.forwardToApi && option.forwardToApi !== option.name
+      )
+      .map((option) => [option.forwardToApi, option])
+  );
+}
+
+function parseArgsToOptions(context, overrideDefaults) {
+  const minimistOptions = createMinimistOptions(context.detailedOptions);
+  const apiDetailedOptionMap = createApiDetailedOptionMap(
+    context.detailedOptions
+  );
+  return getOptions(
+    optionsNormalizer.normalizeCliOptions(
+      minimist(context.args, {
+        string: minimistOptions.string,
+        boolean: minimistOptions.boolean,
+        default: cliifyOptions(overrideDefaults, apiDetailedOptionMap),
+      }),
+      context.detailedOptions,
+      { logger: false }
+    ),
+    context.detailedOptions
+  );
+}
+
+function getOptionsOrDie(context, filePath) {
+  try {
+    if (context.argv.config === false) {
+      context.logger.debug(
+        "'--no-config' option found, skip loading config file."
+      );
+      return null;
+    }
+
+    context.logger.debug(
+      context.argv.config
+        ? `load config file from '${context.argv.config}'`
+        : `resolve config from '${filePath}'`
+    );
+
+    const options = prettier.resolveConfig.sync(filePath, {
+      editorconfig: context.argv.editorconfig,
+      config: context.argv.config,
+    });
+
+    context.logger.debug("loaded options `" + JSON.stringify(options) + "`");
+    return options;
+  } catch (error) {
+    context.logger.error(
+      `Invalid configuration file \`${filePath}\`: ` + error.message
+    );
+    process.exit(2);
+  }
+}
+
+function applyConfigPrecedence(context, options) {
+  try {
+    switch (context.argv["config-precedence"]) {
+      case "cli-override":
+        return parseArgsToOptions(context, options);
+      case "file-override":
+        return { ...parseArgsToOptions(context), ...options };
+      case "prefer-file":
+        return options || parseArgsToOptions(context);
+    }
+  } catch (error) {
+    /* istanbul ignore next */
+    context.logger.error(error.toString());
+
+    /* istanbul ignore next */
+    process.exit(2);
+  }
+}
+
+function getOptionsForFile(context, filepath) {
+  const options = getOptionsOrDie(context, filepath);
+
+  const hasPlugins = options && options.plugins;
+  if (hasPlugins) {
+    pushContextPlugins(context, options.plugins);
+  }
+
+  const appliedOptions = {
+    filepath,
+    ...applyConfigPrecedence(
+      context,
+      options &&
+        optionsNormalizer.normalizeApiOptions(options, context.supportOptions, {
+          logger: context.logger,
+        })
+    ),
+  };
+
+  context.logger.debug(
+    `applied config-precedence (${context.argv["config-precedence"]}): ` +
+      `${JSON.stringify(appliedOptions)}`
+  );
+
+  if (hasPlugins) {
+    popContextPlugins(context);
+  }
+
+  return appliedOptions;
+}
+
+module.exports = {
+  getOptionsForFile,
+  createMinimistOptions,
+};
diff --git a/src/cli/usage.js b/src/cli/usage.js
new file mode 100644
index 000000000..222df21fc
--- /dev/null
+++ b/src/cli/usage.js
@@ -0,0 +1,192 @@
+"use strict";
+
+const groupBy = require("lodash/groupBy");
+const flat = require("lodash/flatten");
+const camelCase = require("camelcase");
+const constant = require("./constant");
+
+const OPTION_USAGE_THRESHOLD = 25;
+const CHOICE_USAGE_MARGIN = 3;
+const CHOICE_USAGE_INDENTATION = 2;
+
+function indent(str, spaces) {
+  return str.replace(/^/gm, " ".repeat(spaces));
+}
+
+function createDefaultValueDisplay(value) {
+  return Array.isArray(value)
+    ? `[${value.map(createDefaultValueDisplay).join(", ")}]`
+    : value;
+}
+
+function getOptionDefaultValue(context, optionName) {
+  // --no-option
+  if (!(optionName in context.detailedOptionMap)) {
+    return;
+  }
+
+  const option = context.detailedOptionMap[optionName];
+
+  if (option.default !== undefined) {
+    return option.default;
+  }
+
+  const optionCamelName = camelCase(optionName);
+  if (optionCamelName in context.apiDefaultOptions) {
+    return context.apiDefaultOptions[optionCamelName];
+  }
+}
+
+function createOptionUsageHeader(option) {
+  const name = `--${option.name}`;
+  const alias = option.alias ? `-${option.alias},` : null;
+  const type = createOptionUsageType(option);
+  return [alias, name, type].filter(Boolean).join(" ");
+}
+
+function createOptionUsageRow(header, content, threshold) {
+  const separator =
+    header.length >= threshold
+      ? `\n${" ".repeat(threshold)}`
+      : " ".repeat(threshold - header.length);
+
+  const description = content.replace(/\n/g, `\n${" ".repeat(threshold)}`);
+
+  return `${header}${separator}${description}`;
+}
+
+function createOptionUsageType(option) {
+  switch (option.type) {
+    case "boolean":
+      return null;
+    case "choice":
+      return `<${option.choices
+        .filter((choice) => !choice.deprecated && choice.since !== null)
+        .map((choice) => choice.value)
+        .join("|")}>`;
+    default:
+      return `<${option.type}>`;
+  }
+}
+
+function createChoiceUsages(choices, margin, indentation) {
+  const activeChoices = choices.filter(
+    (choice) => !choice.deprecated && choice.since !== null
+  );
+  const threshold =
+    activeChoices
+      .map((choice) => choice.value.length)
+      .reduce((current, length) => Math.max(current, length), 0) + margin;
+  return activeChoices.map((choice) =>
+    indent(
+      createOptionUsageRow(choice.value, choice.description, threshold),
+      indentation
+    )
+  );
+}
+
+function createOptionUsage(context, option, threshold) {
+  const header = createOptionUsageHeader(option);
+  const optionDefaultValue = getOptionDefaultValue(context, option.name);
+  return createOptionUsageRow(
+    header,
+    `${option.description}${
+      optionDefaultValue === undefined
+        ? ""
+        : `\nDefaults to ${createDefaultValueDisplay(optionDefaultValue)}.`
+    }`,
+    threshold
+  );
+}
+
+function getOptionsWithOpposites(options) {
+  // Add --no-foo after --foo.
+  const optionsWithOpposites = options.map((option) => [
+    option.description ? option : null,
+    option.oppositeDescription
+      ? {
+          ...option,
+          name: `no-${option.name}`,
+          type: "boolean",
+          description: option.oppositeDescription,
+        }
+      : null,
+  ]);
+  return flat(optionsWithOpposites).filter(Boolean);
+}
+
+function createUsage(context) {
+  const options = getOptionsWithOpposites(context.detailedOptions).filter(
+    // remove unnecessary option (e.g. `semi`, `color`, etc.), which is only used for --help <flag>
+    (option) =>
+      !(
+        option.type === "boolean" &&
+        option.oppositeDescription &&
+        !option.name.startsWith("no-")
+      )
+  );
+
+  const groupedOptions = groupBy(options, (option) => option.category);
+
+  const firstCategories = constant.categoryOrder.slice(0, -1);
+  const lastCategories = constant.categoryOrder.slice(-1);
+  const restCategories = Object.keys(groupedOptions).filter(
+    (category) => !constant.categoryOrder.includes(category)
+  );
+  const allCategories = [
+    ...firstCategories,
+    ...restCategories,
+    ...lastCategories,
+  ];
+
+  const optionsUsage = allCategories.map((category) => {
+    const categoryOptions = groupedOptions[category]
+      .map((option) =>
+        createOptionUsage(context, option, OPTION_USAGE_THRESHOLD)
+      )
+      .join("\n");
+    return `${category} options:\n\n${indent(categoryOptions, 2)}`;
+  });
+
+  return [constant.usageSummary].concat(optionsUsage, [""]).join("\n\n");
+}
+
+function createDetailedUsage(context, flag) {
+  const option = getOptionsWithOpposites(context.detailedOptions).find(
+    (option) => option.name === flag || option.alias === flag
+  );
+
+  const header = createOptionUsageHeader(option);
+  const description = `\n\n${indent(option.description, 2)}`;
+
+  const choices =
+    option.type !== "choice"
+      ? ""
+      : `\n\nValid options:\n\n${createChoiceUsages(
+          option.choices,
+          CHOICE_USAGE_MARGIN,
+          CHOICE_USAGE_INDENTATION
+        ).join("\n")}`;
+
+  const optionDefaultValue = getOptionDefaultValue(context, option.name);
+  const defaults =
+    optionDefaultValue !== undefined
+      ? `\n\nDefault: ${createDefaultValueDisplay(optionDefaultValue)}`
+      : "";
+
+  const pluginDefaults =
+    option.pluginDefaults && Object.keys(option.pluginDefaults).length
+      ? `\nPlugin defaults:${Object.keys(option.pluginDefaults).map(
+          (key) =>
+            `\n* ${key}: ${createDefaultValueDisplay(
+              option.pluginDefaults[key]
+            )}`
+        )}`
+      : "";
+  return `${header}${description}${choices}${defaults}${pluginDefaults}`;
+}
+
+module.exports = {
+  createUsage,
+  createDetailedUsage,
+};
diff --git a/src/cli/util.js b/src/cli/util.js
deleted file mode 100644
index a95a4b580..000000000
--- a/src/cli/util.js
+++ /dev/null
@@ -1,1041 +0,0 @@
-"use strict";
-
-const path = require("path");
-const fs = require("fs");
-const readline = require("readline");
-const camelCase = require("camelcase");
-const dashify = require("dashify");
-
-const chalk = require("chalk");
-const stringify = require("fast-json-stable-stringify");
-const fromPairs = require("lodash/fromPairs");
-const pick = require("lodash/pick");
-const groupBy = require("lodash/groupBy");
-const flat = require("lodash/flatten");
-const partition = require("lodash/partition");
-// eslint-disable-next-line no-restricted-modules
-const prettier = require("../index");
-// eslint-disable-next-line no-restricted-modules
-const { getStdin } = require("../common/third-party");
-const {
-  createIgnorer,
-  errors,
-  coreOptions,
-  optionsModule,
-  optionsNormalizer,
-  utils: { arrayify },
-} = require("./prettier-internal");
-
-const minimist = require("./minimist");
-const { expandPatterns, fixWindowsSlashes } = require("./expand-patterns");
-const constant = require("./constant");
-const isTTY = require("./is-tty");
-
-const OPTION_USAGE_THRESHOLD = 25;
-const CHOICE_USAGE_MARGIN = 3;
-const CHOICE_USAGE_INDENTATION = 2;
-
-function getOptions(argv, detailedOptions) {
-  return fromPairs(
-    detailedOptions
-      .filter(({ forwardToApi }) => forwardToApi)
-      .map(({ forwardToApi, name }) => [forwardToApi, argv[name]])
-  );
-}
-
-function cliifyOptions(object, apiDetailedOptionMap) {
-  return Object.keys(object || {}).reduce((output, key) => {
-    const apiOption = apiDetailedOptionMap[key];
-    const cliKey = apiOption ? apiOption.name : key;
-
-    output[dashify(cliKey)] = object[key];
-    return output;
-  }, {});
-}
-
-function diff(a, b) {
-  return require("diff").createTwoFilesPatch("", "", a, b, "", "", {
-    context: 2,
-  });
-}
-
-function handleError(context, filename, error) {
-  if (error instanceof errors.UndefinedParserError) {
-    // Can't test on CI, `isTTY()` is always false, see ./is-tty.js
-    /* istanbul ignore next */
-    if ((context.argv.write || context.argv["ignore-unknown"]) && isTTY()) {
-      readline.clearLine(process.stdout, 0);
-      readline.cursorTo(process.stdout, 0, null);
-    }
-    if (context.argv["ignore-unknown"]) {
-      return;
-    }
-    if (!context.argv.check && !context.argv["list-different"]) {
-      process.exitCode = 2;
-    }
-    context.logger.error(error.message);
-    return;
-  }
-
-  if (context.argv.write) {
-    // Add newline to split errors from filename line.
-    process.stdout.write("\n");
-  }
-
-  const isParseError = Boolean(error && error.loc);
-  const isValidationError = /^Invalid \S+ value\./.test(error && error.message);
-
-  if (isParseError) {
-    // `invalid.js: SyntaxError: Unexpected token (1:1)`.
-    context.logger.error(`${filename}: ${String(error)}`);
-  } else if (isValidationError || error instanceof errors.ConfigError) {
-    // `Invalid printWidth value. Expected an integer, but received 0.5.`
-    context.logger.error(error.message);
-    // If validation fails for one file, it will fail for all of them.
-    process.exit(1);
-  } else if (error instanceof errors.DebugError) {
-    // `invalid.js: Some debug error message`
-    context.logger.error(`${filename}: ${error.message}`);
-  } else {
-    // `invalid.js: Error: Some unexpected error\n[stack trace]`
-    /* istanbul ignore next */
-    context.logger.error(filename + ": " + (error.stack || error));
-  }
-
-  // Don't exit the process if one file failed
-  process.exitCode = 2;
-}
-
-function logResolvedConfigPathOrDie(context) {
-  const configFile = prettier.resolveConfigFile.sync(
-    context.argv["find-config-path"]
-  );
-  if (configFile) {
-    context.logger.log(path.relative(process.cwd(), configFile));
-  } else {
-    process.exit(1);
-  }
-}
-
-function logFileInfoOrDie(context) {
-  const options = {
-    ignorePath: context.argv["ignore-path"],
-    withNodeModules: context.argv["with-node-modules"],
-    plugins: context.argv.plugin,
-    pluginSearchDirs: context.argv["plugin-search-dir"],
-    resolveConfig: context.argv.config !== false,
-  };
-
-  context.logger.log(
-    prettier.format(
-      stringify(prettier.getFileInfo.sync(context.argv["file-info"], options)),
-      { parser: "json" }
-    )
-  );
-}
-
-function writeOutput(context, result, options) {
-  // Don't use `console.log` here since it adds an extra newline at the end.
-  process.stdout.write(
-    context.argv["debug-check"] ? result.filepath : result.formatted
-  );
-
-  if (options && options.cursorOffset >= 0) {
-    process.stderr.write(result.cursorOffset + "\n");
-  }
-}
-
-function listDifferent(context, input, options, filename) {
-  if (!context.argv.check && !context.argv["list-different"]) {
-    return;
-  }
-
-  try {
-    if (!options.filepath && !options.parser) {
-      throw new errors.UndefinedParserError(
-        "No parser and no file path given, couldn't infer a parser."
-      );
-    }
-    if (!prettier.check(input, options)) {
-      if (!context.argv.write) {
-        context.logger.log(filename);
-        process.exitCode = 1;
-      }
-    }
-  } catch (error) {
-    context.logger.error(error.message);
-  }
-
-  return true;
-}
-
-function format(context, input, opt) {
-  if (!opt.parser && !opt.filepath) {
-    throw new errors.UndefinedParserError(
-      "No parser and no file path given, couldn't infer a parser."
-    );
-  }
-
-  if (context.argv["debug-print-doc"]) {
-    const doc = prettier.__debug.printToDoc(input, opt);
-    return { formatted: prettier.__debug.formatDoc(doc) };
-  }
-
-  if (context.argv["debug-check"]) {
-    const pp = prettier.format(input, opt);
-    const pppp = prettier.format(pp, opt);
-    if (pp !== pppp) {
-      throw new errors.DebugError(
-        "prettier(input) !== prettier(prettier(input))\n" + diff(pp, pppp)
-      );
-    } else {
-      const stringify = (obj) => JSON.stringify(obj, null, 2);
-      const ast = stringify(
-        prettier.__debug.parse(input, opt, /* massage */ true).ast
-      );
-      const past = stringify(
-        prettier.__debug.parse(pp, opt, /* massage */ true).ast
-      );
-
-      /* istanbul ignore next */
-      if (ast !== past) {
-        const MAX_AST_SIZE = 2097152; // 2MB
-        const astDiff =
-          ast.length > MAX_AST_SIZE || past.length > MAX_AST_SIZE
-            ? "AST diff too large to render"
-            : diff(ast, past);
-        throw new errors.DebugError(
-          "ast(input) !== ast(prettier(input))\n" +
-            astDiff +
-            "\n" +
-            diff(input, pp)
-        );
-      }
-    }
-    return { formatted: pp, filepath: opt.filepath || "(stdin)\n" };
-  }
-
-  /* istanbul ignore next */
-  if (context.argv["debug-benchmark"]) {
-    let benchmark;
-    try {
-      benchmark = eval("require")("benchmark");
-    } catch (err) {
-      context.logger.debug(
-        "'--debug-benchmark' requires the 'benchmark' package to be installed."
-      );
-      process.exit(2);
-    }
-    context.logger.debug(
-      "'--debug-benchmark' option found, measuring formatWithCursor with 'benchmark' module."
-    );
-    const suite = new benchmark.Suite();
-    suite
-      .add("format", () => {
-        prettier.formatWithCursor(input, opt);
-      })
-      .on("cycle", (event) => {
-        const results = {
-          benchmark: String(event.target),
-          hz: event.target.hz,
-          ms: event.target.times.cycle * 1000,
-        };
-        context.logger.debug(
-          "'--debug-benchmark' measurements for formatWithCursor: " +
-            JSON.stringify(results, null, 2)
-        );
-      })
-      .run({ async: false });
-  } else if (context.argv["debug-repeat"] > 0) {
-    const repeat = context.argv["debug-repeat"];
-    context.logger.debug(
-      "'--debug-repeat' option found, running formatWithCursor " +
-        repeat +
-        " times."
-    );
-    // should be using `performance.now()`, but only `Date` is cross-platform enough
-    const now = Date.now ? () => Date.now() : () => +new Date();
-    let totalMs = 0;
-    for (let i = 0; i < repeat; ++i) {
-      const startMs = now();
-      prettier.formatWithCursor(input, opt);
-      totalMs += now() - startMs;
-    }
-    const averageMs = totalMs / repeat;
-    const results = {
-      repeat,
-      hz: 1000 / averageMs,
-      ms: averageMs,
-    };
-    context.logger.debug(
-      "'--debug-repeat' measurements for formatWithCursor: " +
-        JSON.stringify(results, null, 2)
-    );
-  }
-
-  return prettier.formatWithCursor(input, opt);
-}
-
-function getOptionsOrDie(context, filePath) {
-  try {
-    if (context.argv.config === false) {
-      context.logger.debug(
-        "'--no-config' option found, skip loading config file."
-      );
-      return null;
-    }
-
-    context.logger.debug(
-      context.argv.config
-        ? `load config file from '${context.argv.config}'`
-        : `resolve config from '${filePath}'`
-    );
-
-    const options = prettier.resolveConfig.sync(filePath, {
-      editorconfig: context.argv.editorconfig,
-      config: context.argv.config,
-    });
-
-    context.logger.debug("loaded options `" + JSON.stringify(options) + "`");
-    return options;
-  } catch (error) {
-    context.logger.error(
-      `Invalid configuration file \`${filePath}\`: ` + error.message
-    );
-    process.exit(2);
-  }
-}
-
-function getOptionsForFile(context, filepath) {
-  const options = getOptionsOrDie(context, filepath);
-
-  const hasPlugins = options && options.plugins;
-  if (hasPlugins) {
-    pushContextPlugins(context, options.plugins);
-  }
-
-  const appliedOptions = {
-    filepath,
-    ...applyConfigPrecedence(
-      context,
-      options &&
-        optionsNormalizer.normalizeApiOptions(options, context.supportOptions, {
-          logger: context.logger,
-        })
-    ),
-  };
-
-  context.logger.debug(
-    `applied config-precedence (${context.argv["config-precedence"]}): ` +
-      `${JSON.stringify(appliedOptions)}`
-  );
-
-  if (hasPlugins) {
-    popContextPlugins(context);
-  }
-
-  return appliedOptions;
-}
-
-function parseArgsToOptions(context, overrideDefaults) {
-  const minimistOptions = createMinimistOptions(context.detailedOptions);
-  const apiDetailedOptionMap = createApiDetailedOptionMap(
-    context.detailedOptions
-  );
-  return getOptions(
-    optionsNormalizer.normalizeCliOptions(
-      minimist(context.args, {
-        string: minimistOptions.string,
-        boolean: minimistOptions.boolean,
-        default: cliifyOptions(overrideDefaults, apiDetailedOptionMap),
-      }),
-      context.detailedOptions,
-      { logger: false }
-    ),
-    context.detailedOptions
-  );
-}
-
-function applyConfigPrecedence(context, options) {
-  try {
-    switch (context.argv["config-precedence"]) {
-      case "cli-override":
-        return parseArgsToOptions(context, options);
-      case "file-override":
-        return { ...parseArgsToOptions(context), ...options };
-      case "prefer-file":
-        return options || parseArgsToOptions(context);
-    }
-  } catch (error) {
-    /* istanbul ignore next */
-    context.logger.error(error.toString());
-
-    /* istanbul ignore next */
-    process.exit(2);
-  }
-}
-
-function formatStdin(context) {
-  const filepath = context.argv["stdin-filepath"]
-    ? path.resolve(process.cwd(), context.argv["stdin-filepath"])
-    : process.cwd();
-
-  const ignorer = createIgnorerFromContextOrDie(context);
-  // If there's an ignore-path set, the filename must be relative to the
-  // ignore path, not the current working directory.
-  const relativeFilepath = context.argv["ignore-path"]
-    ? path.relative(path.dirname(context.argv["ignore-path"]), filepath)
-    : path.relative(process.cwd(), filepath);
-
-  getStdin()
-    .then((input) => {
-      if (
-        relativeFilepath &&
-        ignorer.ignores(fixWindowsSlashes(relativeFilepath))
-      ) {
-        writeOutput(context, { formatted: input });
-        return;
-      }
-
-      const options = getOptionsForFile(context, filepath);
-
-      if (listDifferent(context, input, options, "(stdin)")) {
-        return;
-      }
-
-      writeOutput(context, format(context, input, options), options);
-    })
-    .catch((error) => {
-      handleError(context, relativeFilepath || "stdin", error);
-    });
-}
-
-function createIgnorerFromContextOrDie(context) {
-  try {
-    return createIgnorer.sync(
-      context.argv["ignore-path"],
-      context.argv["with-node-modules"]
-    );
-  } catch (e) {
-    context.logger.error(e.message);
-    process.exit(2);
-  }
-}
-
-function formatFiles(context) {
-  // The ignorer will be used to filter file paths after the glob is checked,
-  // before any files are actually written
-  const ignorer = createIgnorerFromContextOrDie(context);
-
-  let numberOfUnformattedFilesFound = 0;
-
-  if (context.argv.check) {
-    context.logger.log("Checking formatting...");
-  }
-
-  for (const pathOrError of expandPatterns(context)) {
-    if (typeof pathOrError === "object") {
-      context.logger.error(pathOrError.error);
-      // Don't exit, but set the exit code to 2
-      process.exitCode = 2;
-      continue;
-    }
-
-    const filename = pathOrError;
-    // If there's an ignore-path set, the filename must be relative to the
-    // ignore path, not the current working directory.
-    const ignoreFilename = context.argv["ignore-path"]
-      ? path.relative(path.dirname(context.argv["ignore-path"]), filename)
-      : filename;
-
-    const fileIgnored = ignorer.ignores(fixWindowsSlashes(ignoreFilename));
-    if (
-      fileIgnored &&
-      (context.argv["debug-check"] ||
-        context.argv.write ||
-        context.argv.check ||
-        context.argv["list-different"])
-    ) {
-      continue;
-    }
-
-    const options = {
-      ...getOptionsForFile(context, filename),
-      filepath: filename,
-    };
-
-    if (isTTY()) {
-      context.logger.log(filename, { newline: false });
-    }
-
-    let input;
-    try {
-      input = fs.readFileSync(filename, "utf8");
-    } catch (error) {
-      // Add newline to split errors from filename line.
-      /* istanbul ignore next */
-      context.logger.log("");
-
-      /* istanbul ignore next */
-      context.logger.error(
-        `Unable to read file: ${filename}\n${error.message}`
-      );
-
-      // Don't exit the process if one file failed
-      /* istanbul ignore next */
-      process.exitCode = 2;
-
-      /* istanbul ignore next */
-      continue;
-    }
-
-    if (fileIgnored) {
-      writeOutput(context, { formatted: input }, options);
-      continue;
-    }
-
-    const start = Date.now();
-
-    let result;
-    let output;
-
-    try {
-      result = format(context, input, options);
-      output = result.formatted;
-    } catch (error) {
-      handleError(context, filename, error);
-      continue;
-    }
-
-    const isDifferent = output !== input;
-
-    if (isTTY()) {
-      // Remove previously printed filename to log it with duration.
-      readline.clearLine(process.stdout, 0);
-      readline.cursorTo(process.stdout, 0, null);
-    }
-
-    if (context.argv.write) {
-      // Don't write the file if it won't change in order not to invalidate
-      // mtime based caches.
-      if (isDifferent) {
-        if (!context.argv.check && !context.argv["list-different"]) {
-          context.logger.log(`${filename} ${Date.now() - start}ms`);
-        }
-
-        try {
-          fs.writeFileSync(filename, output, "utf8");
-        } catch (error) {
-          /* istanbul ignore next */
-          context.logger.error(
-            `Unable to write file: ${filename}\n${error.message}`
-          );
-
-          // Don't exit the process if one file failed
-          /* istanbul ignore next */
-          process.exitCode = 2;
-        }
-      } else if (!context.argv.check && !context.argv["list-different"]) {
-        context.logger.log(`${chalk.grey(filename)} ${Date.now() - start}ms`);
-      }
-    } else if (context.argv["debug-check"]) {
-      /* istanbul ignore else */
-      if (result.filepath) {
-        context.logger.log(result.filepath);
-      } else {
-        process.exitCode = 2;
-      }
-    } else if (!context.argv.check && !context.argv["list-different"]) {
-      writeOutput(context, result, options);
-    }
-
-    if (isDifferent) {
-      if (context.argv.check) {
-        context.logger.warn(filename);
-      } else if (context.argv["list-different"]) {
-        context.logger.log(filename);
-      }
-      numberOfUnformattedFilesFound += 1;
-    }
-  }
-
-  // Print check summary based on expected exit code
-  if (context.argv.check) {
-    if (numberOfUnformattedFilesFound === 0) {
-      context.logger.log("All matched files use Prettier code style!");
-    } else {
-      context.logger.warn(
-        context.argv.write
-          ? "Code style issues fixed in the above file(s)."
-          : "Code style issues found in the above file(s). Forgot to run Prettier?"
-      );
-    }
-  }
-
-  // Ensure non-zero exitCode when using --check/list-different is not combined with --write
-  if (
-    (context.argv.check || context.argv["list-different"]) &&
-    numberOfUnformattedFilesFound > 0 &&
-    !process.exitCode &&
-    !context.argv.write
-  ) {
-    process.exitCode = 1;
-  }
-}
-
-function getOptionsWithOpposites(options) {
-  // Add --no-foo after --foo.
-  const optionsWithOpposites = options.map((option) => [
-    option.description ? option : null,
-    option.oppositeDescription
-      ? {
-          ...option,
-          name: `no-${option.name}`,
-          type: "boolean",
-          description: option.oppositeDescription,
-        }
-      : null,
-  ]);
-  return flat(optionsWithOpposites).filter(Boolean);
-}
-
-function createUsage(context) {
-  const options = getOptionsWithOpposites(context.detailedOptions).filter(
-    // remove unnecessary option (e.g. `semi`, `color`, etc.), which is only used for --help <flag>
-    (option) =>
-      !(
-        option.type === "boolean" &&
-        option.oppositeDescription &&
-        !option.name.startsWith("no-")
-      )
-  );
-
-  const groupedOptions = groupBy(options, (option) => option.category);
-
-  const firstCategories = constant.categoryOrder.slice(0, -1);
-  const lastCategories = constant.categoryOrder.slice(-1);
-  const restCategories = Object.keys(groupedOptions).filter(
-    (category) => !constant.categoryOrder.includes(category)
-  );
-  const allCategories = [
-    ...firstCategories,
-    ...restCategories,
-    ...lastCategories,
-  ];
-
-  const optionsUsage = allCategories.map((category) => {
-    const categoryOptions = groupedOptions[category]
-      .map((option) =>
-        createOptionUsage(context, option, OPTION_USAGE_THRESHOLD)
-      )
-      .join("\n");
-    return `${category} options:\n\n${indent(categoryOptions, 2)}`;
-  });
-
-  return [constant.usageSummary].concat(optionsUsage, [""]).join("\n\n");
-}
-
-function createOptionUsage(context, option, threshold) {
-  const header = createOptionUsageHeader(option);
-  const optionDefaultValue = getOptionDefaultValue(context, option.name);
-  return createOptionUsageRow(
-    header,
-    `${option.description}${
-      optionDefaultValue === undefined
-        ? ""
-        : `\nDefaults to ${createDefaultValueDisplay(optionDefaultValue)}.`
-    }`,
-    threshold
-  );
-}
-
-function createDefaultValueDisplay(value) {
-  return Array.isArray(value)
-    ? `[${value.map(createDefaultValueDisplay).join(", ")}]`
-    : value;
-}
-
-function createOptionUsageHeader(option) {
-  const name = `--${option.name}`;
-  const alias = option.alias ? `-${option.alias},` : null;
-  const type = createOptionUsageType(option);
-  return [alias, name, type].filter(Boolean).join(" ");
-}
-
-function createOptionUsageRow(header, content, threshold) {
-  const separator =
-    header.length >= threshold
-      ? `\n${" ".repeat(threshold)}`
-      : " ".repeat(threshold - header.length);
-
-  const description = content.replace(/\n/g, `\n${" ".repeat(threshold)}`);
-
-  return `${header}${separator}${description}`;
-}
-
-function createOptionUsageType(option) {
-  switch (option.type) {
-    case "boolean":
-      return null;
-    case "choice":
-      return `<${option.choices
-        .filter((choice) => !choice.deprecated && choice.since !== null)
-        .map((choice) => choice.value)
-        .join("|")}>`;
-    default:
-      return `<${option.type}>`;
-  }
-}
-
-function createChoiceUsages(choices, margin, indentation) {
-  const activeChoices = choices.filter(
-    (choice) => !choice.deprecated && choice.since !== null
-  );
-  const threshold =
-    activeChoices
-      .map((choice) => choice.value.length)
-      .reduce((current, length) => Math.max(current, length), 0) + margin;
-  return activeChoices.map((choice) =>
-    indent(
-      createOptionUsageRow(choice.value, choice.description, threshold),
-      indentation
-    )
-  );
-}
-
-function createDetailedUsage(context, flag) {
-  const option = getOptionsWithOpposites(context.detailedOptions).find(
-    (option) => option.name === flag || option.alias === flag
-  );
-
-  const header = createOptionUsageHeader(option);
-  const description = `\n\n${indent(option.description, 2)}`;
-
-  const choices =
-    option.type !== "choice"
-      ? ""
-      : `\n\nValid options:\n\n${createChoiceUsages(
-          option.choices,
-          CHOICE_USAGE_MARGIN,
-          CHOICE_USAGE_INDENTATION
-        ).join("\n")}`;
-
-  const optionDefaultValue = getOptionDefaultValue(context, option.name);
-  const defaults =
-    optionDefaultValue !== undefined
-      ? `\n\nDefault: ${createDefaultValueDisplay(optionDefaultValue)}`
-      : "";
-
-  const pluginDefaults =
-    option.pluginDefaults && Object.keys(option.pluginDefaults).length
-      ? `\nPlugin defaults:${Object.keys(option.pluginDefaults).map(
-          (key) =>
-            `\n* ${key}: ${createDefaultValueDisplay(
-              option.pluginDefaults[key]
-            )}`
-        )}`
-      : "";
-  return `${header}${description}${choices}${defaults}${pluginDefaults}`;
-}
-
-function getOptionDefaultValue(context, optionName) {
-  // --no-option
-  if (!(optionName in context.detailedOptionMap)) {
-    return;
-  }
-
-  const option = context.detailedOptionMap[optionName];
-
-  if (option.default !== undefined) {
-    return option.default;
-  }
-
-  const optionCamelName = camelCase(optionName);
-  if (optionCamelName in context.apiDefaultOptions) {
-    return context.apiDefaultOptions[optionCamelName];
-  }
-}
-
-function indent(str, spaces) {
-  return str.replace(/^/gm, " ".repeat(spaces));
-}
-
-function createLogger(logLevel) {
-  return {
-    warn: createLogFunc("warn", "yellow"),
-    error: createLogFunc("error", "red"),
-    debug: createLogFunc("debug", "blue"),
-    log: createLogFunc("log"),
-  };
-
-  function createLogFunc(loggerName, color) {
-    if (!shouldLog(loggerName)) {
-      return () => {};
-    }
-
-    const prefix = color ? `[${chalk[color](loggerName)}] ` : "";
-    return function (message, opts) {
-      opts = { newline: true, ...opts };
-      const stream = process[loggerName === "log" ? "stdout" : "stderr"];
-      stream.write(message.replace(/^/gm, prefix) + (opts.newline ? "\n" : ""));
-    };
-  }
-
-  function shouldLog(loggerName) {
-    switch (logLevel) {
-      case "silent":
-        return false;
-      case "debug":
-        if (loggerName === "debug") {
-          return true;
-        }
-      // fall through
-      case "log":
-        if (loggerName === "log") {
-          return true;
-        }
-      // fall through
-      case "warn":
-        if (loggerName === "warn") {
-          return true;
-        }
-      // fall through
-      case "error":
-        return loggerName === "error";
-    }
-  }
-}
-
-function normalizeDetailedOption(name, option) {
-  return {
-    category: coreOptions.CATEGORY_OTHER,
-    ...option,
-    choices:
-      option.choices &&
-      option.choices.map((choice) => {
-        const newChoice = {
-          description: "",
-          deprecated: false,
-          ...(typeof choice === "object" ? choice : { value: choice }),
-        };
-        /* istanbul ignore next */
-        if (newChoice.value === true) {
-          newChoice.value = ""; // backward compatibility for original boolean option
-        }
-        return newChoice;
-      }),
-  };
-}
-
-function normalizeDetailedOptionMap(detailedOptionMap) {
-  return fromPairs(
-    Object.entries(detailedOptionMap)
-      .sort(([leftName], [rightName]) => leftName.localeCompare(rightName))
-      .map(([name, option]) => [name, normalizeDetailedOption(name, option)])
-  );
-}
-
-function createMinimistOptions(detailedOptions) {
-  const [boolean, string] = partition(
-    detailedOptions,
-    ({ type }) => type === "boolean"
-  ).map((detailedOptions) =>
-    flat(
-      detailedOptions.map(({ name, alias }) => (alias ? [name, alias] : [name]))
-    )
-  );
-
-  const defaults = fromPairs(
-    detailedOptions
-      .filter(
-        (option) =>
-          !option.deprecated &&
-          (!option.forwardToApi ||
-            option.name === "plugin" ||
-            option.name === "plugin-search-dir") &&
-          option.default !== undefined
-      )
-      .map((option) => [option.name, option.default])
-  );
-
-  return {
-    // we use vnopts' AliasSchema to handle aliases for better error messages
-    alias: {},
-    boolean,
-    string,
-    default: defaults,
-  };
-}
-
-function createApiDetailedOptionMap(detailedOptions) {
-  return fromPairs(
-    detailedOptions
-      .filter(
-        (option) => option.forwardToApi && option.forwardToApi !== option.name
-      )
-      .map((option) => [option.forwardToApi, option])
-  );
-}
-
-function createDetailedOptionMap(supportOptions) {
-  return fromPairs(
-    supportOptions.map((option) => {
-      const newOption = {
-        ...option,
-        name: option.cliName || dashify(option.name),
-        description: option.cliDescription || option.description,
-        category: option.cliCategory || coreOptions.CATEGORY_FORMAT,
-        forwardToApi: option.name,
-      };
-
-      /* istanbul ignore next */
-      if (option.deprecated) {
-        delete newOption.forwardToApi;
-        delete newOption.description;
-        delete newOption.oppositeDescription;
-        newOption.deprecated = true;
-      }
-
-      return [newOption.name, newOption];
-    })
-  );
-}
-
-//-----------------------------context-util-start-------------------------------
-/**
- * @typedef {Object} Context
- * @property logger
- * @property {string[]} args
- * @property argv
- * @property {string[]} filePatterns
- * @property {any[]} supportOptions
- * @property detailedOptions
- * @property detailedOptionMap
- * @property apiDefaultOptions
- * @property languages
- * @property {Partial<Context>[]} stack
- */
-
-/** @returns {Context} */
-function createContext(args) {
-  /** @type {Context} */
-  const context = { args, stack: [] };
-
-  updateContextArgv(context);
-  normalizeContextArgv(context, ["loglevel", "plugin", "plugin-search-dir"]);
-
-  context.logger = createLogger(context.argv.loglevel);
-
-  updateContextArgv(
-    context,
-    context.argv.plugin,
-    context.argv["plugin-search-dir"]
-  );
-
-  return context;
-}
-
-function initContext(context) {
-  // split into 2 step so that we could wrap this in a `try..catch` in cli/index.js
-  normalizeContextArgv(context);
-}
-
-/**
- * @param {Context} context
- * @param {string[]} plugins
- * @param {string[]=} pluginSearchDirs
- */
-function updateContextOptions(context, plugins, pluginSearchDirs) {
-  const { options: supportOptions, languages } = prettier.getSupportInfo({
-    showDeprecated: true,
-    showUnreleased: true,
-    showInternal: true,
-    plugins,
-    pluginSearchDirs,
-  });
-
-  const detailedOptionMap = normalizeDetailedOptionMap({
-    ...createDetailedOptionMap(supportOptions),
-    ...constant.options,
-  });
-
-  const detailedOptions = arrayify(detailedOptionMap, "name");
-
-  const apiDefaultOptions = {
-    ...optionsModule.hiddenDefaults,
-    ...fromPairs(
-      supportOptions
-        .filter(({ deprecated }) => !deprecated)
-        .map((option) => [option.name, option.default])
-    ),
-  };
-
-  Object.assign(context, {
-    supportOptions,
-    detailedOptions,
-    detailedOptionMap,
-    apiDefaultOptions,
-    languages,
-  });
-}
-
-/**
- * @param {Context} context
- * @param {string[]} plugins
- * @param {string[]=} pluginSearchDirs
- */
-function pushContextPlugins(context, plugins, pluginSearchDirs) {
-  context.stack.push(
-    pick(context, [
-      "supportOptions",
-      "detailedOptions",
-      "detailedOptionMap",
-      "apiDefaultOptions",
-      "languages",
-    ])
-  );
-  updateContextOptions(context, plugins, pluginSearchDirs);
-}
-
-/**
- * @param {Context} context
- */
-function popContextPlugins(context) {
-  Object.assign(context, context.stack.pop());
-}
-
-function updateContextArgv(context, plugins, pluginSearchDirs) {
-  pushContextPlugins(context, plugins, pluginSearchDirs);
-
-  const minimistOptions = createMinimistOptions(context.detailedOptions);
-  const argv = minimist(context.args, minimistOptions);
-
-  context.argv = argv;
-  context.filePatterns = argv._.map((file) => String(file));
-}
-
-function normalizeContextArgv(context, keys) {
-  const detailedOptions = !keys
-    ? context.detailedOptions
-    : context.detailedOptions.filter((option) => keys.includes(option.name));
-  const argv = !keys ? context.argv : pick(context.argv, keys);
-
-  context.argv = optionsNormalizer.normalizeCliOptions(argv, detailedOptions, {
-    logger: context.logger,
-  });
-}
-//------------------------------context-util-end--------------------------------
-
-module.exports = {
-  createContext,
-  createDetailedOptionMap,
-  createDetailedUsage,
-  createUsage,
-  format,
-  formatFiles,
-  formatStdin,
-  initContext,
-  logResolvedConfigPathOrDie,
-  logFileInfoOrDie,
-  normalizeDetailedOptionMap,
-};
diff --git a/tests_integration/__tests__/help-options.js b/tests_integration/__tests__/help-options.js
index 2d2c06c56..a1dc6ae44 100644
--- a/tests_integration/__tests__/help-options.js
+++ b/tests_integration/__tests__/help-options.js
@@ -3,19 +3,19 @@
 const prettier = require("prettier-local");
 const runPrettier = require("../runPrettier");
 const constant = require("../../src/cli/constant");
-const util = require("../../src/cli/util");
+const core = require("../../src/cli/core");
 const arrayify = require("../../src/utils/arrayify");
 
 arrayify(
   {
-    ...util.createDetailedOptionMap(
+    ...core.createDetailedOptionMap(
       prettier.getSupportInfo({
         showDeprecated: true,
         showUnreleased: true,
         showInternal: true,
       }).options
     ),
-    ...util.normalizeDetailedOptionMap(constant.options),
+    ...core.normalizeDetailedOptionMap(constant.options),
   },
   "name"
 ).forEach((option) => {
diff --git a/tsconfig.json b/tsconfig.json
index 92b75bbcc..b437d2f19 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,7 +27,12 @@
     "src/common/load-plugins.js",
     "src/cli/index.js",
     "src/cli/expand-patterns.js",
-    "src/cli/util.js",
+    "src/cli/core.js",
+    "src/cli/context.js",
+    "src/cli/format.js",
+    "src/cli/option-map.js",
+    "src/cli/option.js",
+    "src/cli/usage.js",
     "src/cli/constant.js",
     "src/cli/prettier-internal.js",
     "src/languages.js",

From 1c08737d7d416320c091fc9e759fb54b584ae544 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Dec 2020 13:51:32 +0800
Subject: [PATCH 171/299] Build(deps-dev): Bump js-yaml from 3.14.0 to 3.14.1
 in /website (#9843)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index 4753fcbe2..66b1ed6ac 100644
--- a/website/package.json
+++ b/website/package.json
@@ -21,7 +21,7 @@
     "babel-loader": "8.2.2",
     "concurrently": "5.3.0",
     "docusaurus": "1.14.6",
-    "js-yaml": "3.14.0",
+    "js-yaml": "3.14.1",
     "svgo": "1.3.2",
     "webpack": "5.10.0",
     "webpack-cli": "4.2.0"
diff --git a/website/yarn.lock b/website/yarn.lock
index 35dba5967..aa62b3347 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -4345,10 +4345,10 @@ js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@3.14.0, js-yaml@^3.13.1, js-yaml@^3.8.1:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
-  integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
+js-yaml@3.14.1, js-yaml@^3.13.1, js-yaml@^3.8.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"

From ec85c8a1feed84a76fb70aacb0d7ce55c7d91acd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Dec 2020 14:33:44 +0800
Subject: [PATCH 172/299] Build(deps): Bump
 @typescript-eslint/typescript-estree from 4.9.0 to 4.9.1 (#9842)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 27 ++++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index d6ef17ab5..a734668f0 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@babel/parser": "7.12.7",
     "@glimmer/syntax": "0.68.1",
     "@iarna/toml": "2.2.5",
-    "@typescript-eslint/typescript-estree": "4.9.0",
+    "@typescript-eslint/typescript-estree": "4.9.1",
     "angular-estree-parser": "2.3.0",
     "angular-html-parser": "1.7.1",
     "camelcase": "6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 9dd26c8be..0af2f6b85 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1629,6 +1629,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.0.tgz#3fe8c3632abd07095c7458f7451bd14c85d0033c"
   integrity sha512-luzLKmowfiM/IoJL/rus1K9iZpSJK6GlOS/1ezKplb7MkORt2dDcfi8g9B0bsF6JoRGhqn0D3Va55b+vredFHA==
 
+"@typescript-eslint/types@4.9.1":
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.1.tgz#a1a7dd80e4e5ac2c593bc458d75dd1edaf77faa2"
+  integrity sha512-fjkT+tXR13ks6Le7JiEdagnwEFc49IkOyys7ueWQ4O8k4quKPwPJudrwlVOJCUQhXo45PrfIvIarcrEjFTNwUA==
+
 "@typescript-eslint/typescript-estree@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.1.tgz#29a43c7060641ec51c902d9f50ac7c5866ec479f"
@@ -1643,13 +1648,13 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@4.9.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.9.0.tgz#38a98df6ee281cfd6164d6f9d91795b37d9e508c"
-  integrity sha512-rmDR++PGrIyQzAtt3pPcmKWLr7MA+u/Cmq9b/rON3//t5WofNR4m/Ybft2vOLj0WtUzjn018ekHjTsnIyBsQug==
+"@typescript-eslint/typescript-estree@4.9.1":
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.9.1.tgz#6e5b86ff5a5f66809e1f347469fadeec69ac50bf"
+  integrity sha512-bzP8vqwX6Vgmvs81bPtCkLtM/Skh36NE6unu6tsDeU/ZFoYthlTXbBmpIrvosgiDKlWTfb2ZpPELHH89aQjeQw==
   dependencies:
-    "@typescript-eslint/types" "4.9.0"
-    "@typescript-eslint/visitor-keys" "4.9.0"
+    "@typescript-eslint/types" "4.9.1"
+    "@typescript-eslint/visitor-keys" "4.9.1"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
@@ -1665,12 +1670,12 @@
     "@typescript-eslint/types" "4.0.1"
     eslint-visitor-keys "^2.0.0"
 
-"@typescript-eslint/visitor-keys@4.9.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.9.0.tgz#f284e9fac43f2d6d35094ce137473ee321f266c8"
-  integrity sha512-sV45zfdRqQo1A97pOSx3fsjR+3blmwtdCt8LDrXgCX36v4Vmz4KHrhpV6Fo2cRdXmyumxx11AHw0pNJqCNpDyg==
+"@typescript-eslint/visitor-keys@4.9.1":
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.9.1.tgz#d76374a58c4ead9e92b454d186fea63487b25ae1"
+  integrity sha512-9gspzc6UqLQHd7lXQS7oWs+hrYggspv/rk6zzEMhCbYwPE/sF7oxo7GAjkS35Tdlt7wguIG+ViWCPtVZHz/ybQ==
   dependencies:
-    "@typescript-eslint/types" "4.9.0"
+    "@typescript-eslint/types" "4.9.1"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.9.0":

From 19a8df2f572f1bc4504cebe0614f45f868b786fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Dec 2020 18:11:05 +0800
Subject: [PATCH 173/299] Build(deps-dev): Bump @typescript-eslint/types from
 4.9.0 to 4.9.1 (#9840)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package.json b/package.json
index a734668f0..661727e3a 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@rollup/plugin-replace": "2.3.4",
     "@types/estree": "0.0.45",
     "@types/node": "14.14.0",
-    "@typescript-eslint/types": "4.9.0",
+    "@typescript-eslint/types": "4.9.1",
     "babel-jest": "26.6.3",
     "babel-loader": "8.2.2",
     "benchmark": "2.1.4",
diff --git a/yarn.lock b/yarn.lock
index 0af2f6b85..295bb4aba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1624,11 +1624,6 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2"
   integrity sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg==
 
-"@typescript-eslint/types@4.9.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.0.tgz#3fe8c3632abd07095c7458f7451bd14c85d0033c"
-  integrity sha512-luzLKmowfiM/IoJL/rus1K9iZpSJK6GlOS/1ezKplb7MkORt2dDcfi8g9B0bsF6JoRGhqn0D3Va55b+vredFHA==
-
 "@typescript-eslint/types@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.1.tgz#a1a7dd80e4e5ac2c593bc458d75dd1edaf77faa2"

From dde604b117326dd91b7058c07965ce376ca4a39c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Dec 2020 13:48:49 +0800
Subject: [PATCH 174/299] Build(deps): Bump codemirror-graphql from 0.12.4 to
 0.13.0 in /website (#9851)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/website/package.json b/website/package.json
index 66b1ed6ac..4b8900d31 100644
--- a/website/package.json
+++ b/website/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "clipboard": "2.0.6",
-    "codemirror-graphql": "0.12.4",
+    "codemirror-graphql": "0.13.0",
     "lz-string": "1.4.4",
     "prop-types": "15.7.2",
     "react": "17.0.1",
diff --git a/website/yarn.lock b/website/yarn.lock
index aa62b3347..ba043719a 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -2011,12 +2011,12 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-codemirror-graphql@0.12.4:
-  version "0.12.4"
-  resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.12.4.tgz#607e113035856a179ee019e8451210cd1a8ca340"
-  integrity sha512-gWxmLk2OzPVzvwAXO0K52MtU1n6ylMNbKp0LtZHioK0NEUwLnSL5iPKVXn8MgvYqS8Yos/CG5WrP9Y7RWTO4mg==
+codemirror-graphql@0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.13.0.tgz#bb01039fb4737f462adcdc4fd911d7aa82b72bfd"
+  integrity sha512-f2w/goKJNXL8+f8a14rD7SnfLPrEoAlvT0qmm2yobXqw7O62QbqFxIkSBcePpUyt3Ki+yyzuCiF4GVHUnGj0+Q==
   dependencies:
-    graphql-language-service-interface "^2.4.3"
+    graphql-language-service-interface "^2.5.0"
     graphql-language-service-parser "^1.6.5"
 
 coffee-script@^1.12.4:
@@ -3608,10 +3608,10 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graphql-language-service-interface@^2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.4.3.tgz#bba756d9282b7a2ee818a3cba5702ec9e5da1f7e"
-  integrity sha512-WVWdviRYzb+/z+GS/6ds87OW5qqP0J6l6pGGOE0694x4It57x97//mkRHY5vfNa3knHw5OYwkUYymVzqYu4xTw==
+graphql-language-service-interface@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.5.0.tgz#5af71b24e85dbb950e837910d5b218995a2327d3"
+  integrity sha512-JOT5X+BqsREMofnnacmyu3oy0CI+15JXp5NQWG+KDp4bQATjTDpiCOFeBNtw6t9z2ozaY8m7PTaknp0YjgDkvA==
   dependencies:
     graphql-language-service-parser "^1.6.5"
     graphql-language-service-types "^1.6.3"

From 929499f34fdc6e35530fbe3140984c27422aee23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Dec 2020 03:45:57 +0900
Subject: [PATCH 175/299] Build(deps): Bump flow-parser from 0.138.0 to 0.139.0
 (#9841)

Bumps [flow-parser](https://github.com/facebook/flow) from 0.138.0 to 0.139.0.
- [Release notes](https://github.com/facebook/flow/releases)
- [Changelog](https://github.com/facebook/flow/blob/master/Changelog.md)
- [Commits](https://github.com/facebook/flow/compare/v0.138.0...v0.139.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 661727e3a..92b58ebbc 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "fast-glob": "3.2.4",
     "fast-json-stable-stringify": "2.1.0",
     "find-parent-dir": "0.3.0",
-    "flow-parser": "0.138.0",
+    "flow-parser": "0.139.0",
     "get-stdin": "8.0.0",
     "globby": "11.0.1",
     "graphql": "15.4.0",
diff --git a/yarn.lock b/yarn.lock
index 295bb4aba..346da65bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3542,10 +3542,10 @@ flatten@^1.0.2:
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
   integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
-flow-parser@0.138.0:
-  version "0.138.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.138.0.tgz#2d9818f6b804d66f90949dfa8b4892f3a0af546d"
-  integrity sha512-LFnTyjrv39UvCWl8NOcpByr/amj8a5k5z7isO2wv4T43nNrUnHQwX3rarTz9zcpHXkDAQv6X4MfQ4ZzJUptpbw==
+flow-parser@0.139.0:
+  version "0.139.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.139.0.tgz#c046779114487175f2b1e8aa639bf977d4c7dd9f"
+  integrity sha512-yEh5wJIi/BG7JZvWAWxTdfZ1uoh/W3oefJOuvUDosKFIE5H7ad8Eu6k9ba1yr83Lxn5vY6kZMG1IaiiiA/5scg==
 
 for-in@^1.0.2:
   version "1.0.2"

From c83e72a7fdbe3ea10868235688d9f12e2ff04067 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Dec 2020 05:57:29 +0000
Subject: [PATCH 176/299] Build(deps-dev): Bump @babel/core from 7.12.9 to
 7.12.10 (#9859)

---
 package.json |  2 +-
 yarn.lock    | 61 +++++++++++++++++++++++++++++++---------------------
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 92b58ebbc..df3f64aaa 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "yaml-unist-parser": "1.3.1"
   },
   "devDependencies": {
-    "@babel/core": "7.12.9",
+    "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.7",
     "@babel/types": "7.12.7",
     "@glimmer/reference": "0.68.1",
diff --git a/yarn.lock b/yarn.lock
index 346da65bb..b33f08627 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,34 +28,33 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
   integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
 
-"@babel/core@7.12.9", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.12.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
-  integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
+"@babel/core@7.12.10", "@babel/core@^7.1.0", "@babel/core@^7.7.5":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
+  integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
+    "@babel/generator" "^7.12.10"
     "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helpers" "^7.12.5"
-    "@babel/parser" "^7.12.7"
+    "@babel/parser" "^7.12.10"
     "@babel/template" "^7.12.7"
-    "@babel/traverse" "^7.12.9"
-    "@babel/types" "^7.12.7"
+    "@babel/traverse" "^7.12.10"
+    "@babel/types" "^7.12.10"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
     json5 "^2.1.2"
     lodash "^4.17.19"
-    resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
-  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
+"@babel/generator@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz#2b188fc329fb8e4f762181703beffc0fe6df3460"
+  integrity sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==
   dependencies:
-    "@babel/types" "^7.12.5"
+    "@babel/types" "^7.12.10"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
@@ -277,11 +276,16 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.12.7", "@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
+"@babel/parser@7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
   integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
 
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81"
+  integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==
+
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
@@ -835,22 +839,22 @@
     "@babel/parser" "^7.12.7"
     "@babel/types" "^7.12.7"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.7.0":
-  version "7.12.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f"
-  integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.7.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a"
+  integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
+    "@babel/generator" "^7.12.10"
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
+    "@babel/parser" "^7.12.10"
+    "@babel/types" "^7.12.10"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@7.12.7", "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
   integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
@@ -859,6 +863,15 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
+  integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -6275,7 +6288,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.19.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.3.2:
+resolve@1.19.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
   integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==

From 15fdfd5be50f65bf45fe71b793a7d4d6dceac831 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Dec 2020 06:03:52 +0000
Subject: [PATCH 177/299] Build(deps): Bump @angular/compiler from 11.0.3 to
 11.0.4 (#9864)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index df3f64aaa..e59ff7b71 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "bin"
   ],
   "dependencies": {
-    "@angular/compiler": "11.0.3",
+    "@angular/compiler": "11.0.4",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.7",
     "@glimmer/syntax": "0.68.1",
diff --git a/yarn.lock b/yarn.lock
index b33f08627..4026de440 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/compiler@11.0.3":
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.3.tgz#1bf9d1d58acb12f02c16d97155de9063246a3c23"
-  integrity sha512-OjfG4TzCzqNyHO4NmQNM7kdaWlbGrfXyB2i2Kd30PS9Z8s9cuhBBZS23P8NEEYNy1PjhI26cmiozrdMZl0hTUw==
+"@angular/compiler@11.0.4":
+  version "11.0.4"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.4.tgz#8cc4e92ac9734d707828c02c487eff2cd1a69d02"
+  integrity sha512-Smf8FKSjkqd522ZCdXjSnVv1lYA0b21AN3WC5L1mwtRwyl/VacqCA/YEklLneDGgI2FdSIC9+bzSQIV+CCVftA==
   dependencies:
     tslib "^2.0.0"
 

From bf526bb1e1d47ec94bf9ac04d56fe50f3a601a5d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Dec 2020 08:01:59 +0000
Subject: [PATCH 178/299] Build(deps-dev): Bump @babel/types from 7.12.7 to
 7.12.10 (#9858)

---
 package.json |  2 +-
 yarn.lock    | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index e59ff7b71..7a2518cc2 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
   "devDependencies": {
     "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.7",
-    "@babel/types": "7.12.7",
+    "@babel/types": "7.12.10",
     "@glimmer/reference": "0.68.1",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
diff --git a/yarn.lock b/yarn.lock
index 4026de440..bd36994ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -854,16 +854,7 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
-  integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@7.12.10", "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.12.10"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
   integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==

From 5629322c5c3075e7c1f9d97d8009cbb2405da581 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Dec 2020 08:47:07 +0000
Subject: [PATCH 179/299] Build(deps-dev): Bump @babel/preset-env from 7.12.7
 to 7.12.10 (#9863)

---
 package.json |  2 +-
 yarn.lock    | 57 +++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 7a2518cc2..bb1bf41a4 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.12.10",
-    "@babel/preset-env": "7.12.7",
+    "@babel/preset-env": "7.12.10",
     "@babel/types": "7.12.10",
     "@glimmer/reference": "0.68.1",
     "@rollup/plugin-alias": "3.1.1",
diff --git a/yarn.lock b/yarn.lock
index bd36994ae..04ea55538 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -718,10 +718,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a"
-  integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==
+"@babel/plugin-transform-typeof-symbol@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b"
+  integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
@@ -740,10 +740,10 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/preset-env@7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
-  integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
+"@babel/preset-env@7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.10.tgz#ca981b95f641f2610531bd71948656306905e6ab"
+  integrity sha512-Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA==
   dependencies:
     "@babel/compat-data" "^7.12.7"
     "@babel/helper-compilation-targets" "^7.12.5"
@@ -804,12 +804,12 @@
     "@babel/plugin-transform-spread" "^7.12.1"
     "@babel/plugin-transform-sticky-regex" "^7.12.7"
     "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.12.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.10"
     "@babel/plugin-transform-unicode-escapes" "^7.12.1"
     "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.12.7"
-    core-js-compat "^3.7.0"
+    "@babel/types" "^7.12.10"
+    core-js-compat "^3.8.0"
     semver "^5.5.0"
 
 "@babel/preset-modules@^0.1.3":
@@ -2245,7 +2245,7 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.14.5, browserslist@^4.14.6:
+browserslist@^4.14.5:
   version "4.14.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
   integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
@@ -2256,6 +2256,17 @@ browserslist@^4.14.5, browserslist@^4.14.6:
     escalade "^3.1.1"
     node-releases "^1.1.66"
 
+browserslist@^4.15.0:
+  version "4.15.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.15.0.tgz#3d48bbca6a3f378e86102ffd017d9a03f122bdb0"
+  integrity sha512-IJ1iysdMkGmjjYeRlDU8PQejVwxvVO5QOfXH7ylW31GO6LwNRSmm/SgRXtNsEXqMLl2e+2H5eEJ7sfynF8TCaQ==
+  dependencies:
+    caniuse-lite "^1.0.30001164"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.612"
+    escalade "^3.1.1"
+    node-releases "^1.1.67"
+
 bser@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
@@ -2313,6 +2324,11 @@ caniuse-lite@^1.0.30001157:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz#bebde28f893fa9594dadcaa7d6b8e2aa0299df20"
   integrity sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA==
 
+caniuse-lite@^1.0.30001164:
+  version "1.0.30001165"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz#32955490d2f60290bb186bb754f2981917fa744f"
+  integrity sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -2546,12 +2562,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz#8479c5d3d672d83f1f5ab94cf353e57113e065ed"
-  integrity sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==
+core-js-compat@^3.8.0:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.1.tgz#8d1ddd341d660ba6194cbe0ce60f4c794c87a36e"
+  integrity sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==
   dependencies:
-    browserslist "^4.14.6"
+    browserslist "^4.15.0"
     semver "7.0.0"
 
 core-util-is@1.0.2, core-util-is@^1.0.2:
@@ -2911,6 +2927,11 @@ electron-to-chromium@^1.3.591:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz#1b71bec27fb940eccd79245f6824c63d5f7e8abf"
   integrity sha512-J8OHxOeJkoSLgBXfV9BHgKccgfLMHh+CoeRo6wJsi6m0k3otaxS/5vrHpMNSEYY4MISwewqanPOuhAtuE8riQQ==
 
+electron-to-chromium@^1.3.612:
+  version "1.3.621"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.621.tgz#0bbe2100ef0b28f88d0b1101fbdf433312f69be0"
+  integrity sha512-FeIuBzArONbAmKmZIsZIFGu/Gc9AVGlVeVbhCq+G2YIl6QkT0TDn2HKN/FMf1btXEB9kEmIuQf3/lBTVAbmFOg==
+
 emittery@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451"
@@ -5398,7 +5419,7 @@ node-notifier@^8.0.0:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.66:
+node-releases@^1.1.66, node-releases@^1.1.67:
   version "1.1.67"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
   integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==

From d64aee0b73f289631b82a2520729d95d0cbdcfa5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Dec 2020 09:33:59 +0000
Subject: [PATCH 180/299] Build(deps-dev): Bump @glimmer/reference from 0.68.1
 to 0.69.0 (#9860)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index bb1bf41a4..4c6171f72 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.10",
     "@babel/types": "7.12.10",
-    "@glimmer/reference": "0.68.1",
+    "@glimmer/reference": "0.69.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index 04ea55538..b5472d772 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1062,10 +1062,10 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.68.1.tgz#b5e84883a2449075a0618e33641d94e7442a0b31"
-  integrity sha512-nwZeoaBJWxEqT3tubPFI1lyUIO8UhkcdGAo+8rranrASJ0oQddldYhaDGO863Gnre+5I2MWUps4jVAg7MFBkSg==
+"@glimmer/global-context@0.69.0":
+  version "0.69.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.69.0.tgz#5a35a780bd2dc614984caf7f6a3ada37f6f8aa47"
+  integrity sha512-y3E0Id6a2ab5Qf53qRJWTh6yHM+xDYDBvS4Su/WDN3PPDyY8Oeme0L+7vceg4e56DsYDNtwPy1b4/470y35L0g==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
@@ -1076,16 +1076,23 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.68.1.tgz#0adb39a452e1c82c28c27f082135b5698e529a18"
-  integrity sha512-qXF0SAyA34oeATkLT95St8gUdImRG52VjcDax9TbkW4fIjf5geQnyfsMP00VKFxWa7TUBFvPSapdhvWCfOu0LQ==
+"@glimmer/interfaces@0.69.0":
+  version "0.69.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.69.0.tgz#85ba8b9f44ca630950d40481d5af119e479b99ec"
+  integrity sha512-vgnhDj9+Td4XkgPWFE2BE0w9XaV4fqwVbmY9J6DIKFIzlwPfDaKfsUiHFVzGP13Cp78cRXA7JtbAxqjCLRcAeA==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/reference@0.69.0":
+  version "0.69.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.69.0.tgz#3b0af80edbae50eebd6626458bdd3911ae6c9f37"
+  integrity sha512-MbdczRZ3GM0ErFG25DHETy6kJml6SziPu83LXdCp8kd4zmoWjLHu7O1CW9S/RnoRicvsblHKIjUhCud7XflpbA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.68.1"
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/util" "0.68.1"
-    "@glimmer/validator" "0.68.1"
+    "@glimmer/global-context" "0.69.0"
+    "@glimmer/interfaces" "0.69.0"
+    "@glimmer/util" "0.69.0"
+    "@glimmer/validator" "0.69.0"
 
 "@glimmer/syntax@0.68.1":
   version "0.68.1"
@@ -1106,13 +1113,22 @@
     "@glimmer/interfaces" "0.68.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.68.1.tgz#7052fde18b5fcb4e1c726edf7b215c99fd68c36b"
-  integrity sha512-J5NmaltZl7Dpja3HvfDD3rITKIHaXlsRQoMHM6d4jqHTRkRCGpqm+x+BHMUiOXkm3vDwb0+t6bRTgQ8/hDGgSw==
+"@glimmer/util@0.69.0":
+  version "0.69.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.69.0.tgz#7dd032202522f144b5c061d6a37c93565cd69134"
+  integrity sha512-nZfiygIp541ZIHzgdButCXyUl1p3syUFxF/K208ogPEqe/eadwYvurtkibNoKlm+is0doIhi9GWe3ll7e17GJQ==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.69.0"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/validator@0.69.0":
+  version "0.69.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.69.0.tgz#65b7e50e823f9672064e215078604c647b718d73"
+  integrity sha512-vnpCicG/foHQvR0A/eKrLC9sfaNNl64q1Ya+WOdzj00RBXTuzKvhj6tpeP7p8yBZgTrAVG9LUtaLWHKmfQCe7Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.68.1"
+    "@glimmer/global-context" "0.69.0"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From 892a70e0d3011349155d2f82d56a99532f23fd19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Dec 2020 10:53:49 +0000
Subject: [PATCH 181/299] Build(deps): Bump @glimmer/syntax from 0.68.1 to
 0.69.0 (#9862)

---
 package.json                                  |  2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |  6 +--
 yarn.lock                                     | 38 ++++++-------------
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index 4c6171f72..739e8a0f1 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "11.0.4",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.7",
-    "@glimmer/syntax": "0.68.1",
+    "@glimmer/syntax": "0.69.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.9.1",
     "angular-estree-parser": "2.3.0",
diff --git a/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
index d9f77bf34..5327f3acb 100644
--- a/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/handlebars/__snapshots__/jsfmt.spec.js.snap
@@ -30,7 +30,7 @@ exports[`invalid-3.hbs [glimmer] format 1`] = `
 "Parse error on line 3:
 <a>{{}}
 -----^
-Expecting 'ID', 'STRING', 'NUMBER', 'BOOLEAN', 'UNDEFINED', 'NULL', 'DATA', got 'CLOSE' (3:3)
+Expecting 'OPEN_SEXPR', 'ID', 'STRING', 'NUMBER', 'BOOLEAN', 'UNDEFINED', 'NULL', 'DATA', got 'CLOSE' (3:3)
   1 | <a>
   2 | 
 > 3 | {{}}
@@ -42,7 +42,7 @@ exports[`tilde-comments-1.hbs [glimmer] format 1`] = `
 "Parse error on line 1:
 {{~}}
 ---^
-Expecting 'ID', 'STRING', 'NUMBER', 'BOOLEAN', 'UNDEFINED', 'NULL', 'DATA', got 'CLOSE' (1:4)
+Expecting 'OPEN_SEXPR', 'ID', 'STRING', 'NUMBER', 'BOOLEAN', 'UNDEFINED', 'NULL', 'DATA', got 'CLOSE' (1:4)
 > 1 | {{~}}
     |    ^
   2 | "
@@ -52,7 +52,7 @@ exports[`tilde-comments-2.hbs [glimmer] format 1`] = `
 "Parse error on line 1:
 {{~~}}
 ---^
-Expecting 'ID', 'STRING', 'NUMBER', 'BOOLEAN', 'UNDEFINED', 'NULL', 'DATA', got 'CLOSE' (1:4)
+Expecting 'OPEN_SEXPR', 'ID', 'STRING', 'NUMBER', 'BOOLEAN', 'UNDEFINED', 'NULL', 'DATA', got 'CLOSE' (1:4)
 > 1 | {{~~}}
     |    ^
   2 | "
diff --git a/yarn.lock b/yarn.lock
index b5472d772..bb82a23a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1069,13 +1069,6 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.68.1.tgz#a4d4b0380f0094c7f5901c26b54ccf40ddef521e"
-  integrity sha512-QNsWfMe5Aob++aM+OBJOUAn6DXwNK84p7ISkzxKZYdNNgLavjI5Coo2N577I95x42h1k9fdUoIxBKKC7aCSx4g==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.69.0":
   version "0.69.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.69.0.tgz#85ba8b9f44ca630950d40481d5af119e479b99ec"
@@ -1094,25 +1087,16 @@
     "@glimmer/util" "0.69.0"
     "@glimmer/validator" "0.69.0"
 
-"@glimmer/syntax@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.68.1.tgz#e7bebdc26b2b4586ca27ae2d577a712b5bf9a6c3"
-  integrity sha512-c1XXV6Oy2ogYQSef3CYvlv/YRz1O5nZ71UadpUYtkchfQdgbwEQgCtIXKIvet5eMuvoYudnXHidSi91QEWaLOA==
+"@glimmer/syntax@0.69.0":
+  version "0.69.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.69.0.tgz#41b0d240ff46e3c793de989ff2c28248f29dbc72"
+  integrity sha512-P5GrG7qf0RGotO2ADmoNJL60NU+kscYMkHXKM1a4O53VxKKNoBHzS97CoZ9rbmwCkHn0/mDt8IJPp/CD3QL+bQ==
   dependencies:
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/util" "0.68.1"
-    "@handlebars/parser" "^1.1.0"
+    "@glimmer/interfaces" "0.69.0"
+    "@glimmer/util" "0.69.0"
+    "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.68.1.tgz#d522ff4b91f0a59a23327f336bb90ddc55685ca1"
-  integrity sha512-eg1etiyeaxXL63ZONvl4+AVPN64dl84hFYXJCngb4qRXCXuAzSH+lepkJtKwhzJUEMlASwqk75Au9CyoGM4SOg==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.1"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.69.0":
   version "0.69.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.69.0.tgz#7dd032202522f144b5c061d6a37c93565cd69134"
@@ -1130,10 +1114,10 @@
     "@glimmer/env" "^0.1.7"
     "@glimmer/global-context" "0.69.0"
 
-"@handlebars/parser@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf"
-  integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A==
+"@handlebars/parser@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
+  integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
 
 "@iarna/toml@2.2.5":
   version "2.2.5"

From 401d4255faefec971e9692a34f4cc803cbc01187 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Dec 2020 07:42:54 +0800
Subject: [PATCH 182/299] Build(deps-dev): Bump @babel/preset-react in /website
 (#9861)

Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.12.7 to 7.12.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.10/packages/babel-preset-react)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 68 +++++++++++++++++++++++++++-----------------
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/website/package.json b/website/package.json
index 4b8900d31..5b3ff6da3 100644
--- a/website/package.json
+++ b/website/package.json
@@ -16,7 +16,7 @@
     "react-dom": "17.0.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.12.7",
+    "@babel/preset-react": "7.12.10",
     "@sandhose/prettier-animated-logo": "1.0.3",
     "babel-loader": "8.2.2",
     "concurrently": "5.3.0",
diff --git a/website/yarn.lock b/website/yarn.lock
index ba043719a..5cc5e063a 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -70,6 +70,13 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
+"@babel/helper-annotate-as-pure@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d"
+  integrity sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==
+  dependencies:
+    "@babel/types" "^7.12.10"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
@@ -78,6 +85,15 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
+"@babel/helper-builder-react-jsx-experimental@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.10.tgz#a58cb96a793dc0fcd5c9ed3bb36d62fdc60534c2"
+  integrity sha512-3Kcr2LGpL7CTRDTTYm1bzeor9qZbxbvU2AxsLA6mUG9gYarSfIKMK0UlU+azLWI+s0+BH768bwyaziWB2NOJlQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.10"
+    "@babel/helper-module-imports" "^7.12.5"
+    "@babel/types" "^7.12.10"
+
 "@babel/helper-builder-react-jsx-experimental@^7.12.4":
   version "7.12.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
@@ -197,6 +213,13 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
+"@babel/helper-module-imports@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
+  dependencies:
+    "@babel/types" "^7.12.5"
+
 "@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
@@ -745,27 +768,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.12.1"
 
-"@babel/plugin-transform-react-jsx-self@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28"
-  integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-react-jsx-source@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b"
-  integrity sha512-keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-react-jsx@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz#8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f"
-  integrity sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==
+"@babel/plugin-transform-react-jsx@^7.12.10":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.10.tgz#a7af3097c73479123594c8c8fe39545abebd44e3"
+  integrity sha512-MM7/BC8QdHXM7Qc1wdnuk73R4gbuOpfrSUgfV/nODGc86sPY1tgmY2M9E9uAnf2e4DOIp8aKGWqgZfQxnTNGuw==
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.10.4"
-    "@babel/helper-builder-react-jsx-experimental" "^7.12.4"
+    "@babel/helper-builder-react-jsx-experimental" "^7.12.10"
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-jsx" "^7.12.1"
 
@@ -937,17 +946,15 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@7.12.7", "@babel/preset-react@^7.9.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz#36d61d83223b07b6ac4ec55cf016abb0f70be83b"
-  integrity sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ==
+"@babel/preset-react@7.12.10", "@babel/preset-react@^7.9.4":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.10.tgz#4fed65f296cbb0f5fb09de6be8cddc85cc909be9"
+  integrity sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-react-display-name" "^7.12.1"
-    "@babel/plugin-transform-react-jsx" "^7.12.7"
+    "@babel/plugin-transform-react-jsx" "^7.12.10"
     "@babel/plugin-transform-react-jsx-development" "^7.12.7"
-    "@babel/plugin-transform-react-jsx-self" "^7.12.1"
-    "@babel/plugin-transform-react-jsx-source" "^7.12.1"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
 "@babel/register@^7.9.0":
@@ -1010,6 +1017,15 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.12.10", "@babel/types@^7.12.5":
+  version "7.12.10"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
+  integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"

From ee1d1a95128ed1d7e7f9f30dd015a0ddf9639769 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 11 Dec 2020 07:44:03 +0800
Subject: [PATCH 183/299] HTML: Remove use of `normalizeParts` in "text" print
 (#9846)

---
 src/language-html/printer-html.js             | 18 +++++++--------
 .../text/__snapshots__/jsfmt.spec.js.snap     | 22 +++++++++++++++++++
 tests/html/text/jsfmt.spec.js                 |  1 +
 tests/html/text/tag-should-in-fill.html       |  4 ++++
 4 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 tests/html/text/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/html/text/jsfmt.spec.js
 create mode 100644 tests/html/text/tag-should-in-fill.html

diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index 4ae1b9dcf..6cfc662ba 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -3,7 +3,7 @@
 const assert = require("assert");
 const {
   builders,
-  utils: { mapDoc, normalizeParts },
+  utils: { mapDoc, normalizeParts, cleanDoc },
 } = require("../document");
 const { replaceEndOfLineWith } = require("../common/util");
 const { print: printFrontMatter } = require("../utils/front-matter");
@@ -384,15 +384,15 @@ function genericPrint(path, options, print) {
           hasTrailingNewline ? hardline : "",
         ]);
       }
-      return fill(
-        normalizeParts(
-          [].concat(
-            printOpeningTagPrefix(node, options),
-            getTextValueParts(node),
-            printClosingTagSuffix(node, options)
-          )
-        )
+
+      const printed = cleanDoc(
+        concat([
+          printOpeningTagPrefix(node, options),
+          ...getTextValueParts(node),
+          printClosingTagSuffix(node, options),
+        ])
       );
+      return typeof printed === "string" ? printed : fill(printed.parts);
     }
     case "docType":
       return concat([
diff --git a/tests/html/text/__snapshots__/jsfmt.spec.js.snap b/tests/html/text/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..fd9e1a456
--- /dev/null
+++ b/tests/html/text/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`tag-should-in-fill.html format 1`] = `
+====================================options=====================================
+parsers: ["html"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+<a-long-long-long-element>foo bar foo bar
+  foo bar foo bar foo bar foo bar foo bar
+  foo bar foo bar</a-long-long-long-element>
+<!-- The end tag should stay in 80 print width -->
+
+=====================================output=====================================
+<a-long-long-long-element
+  >foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo
+  bar</a-long-long-long-element
+>
+<!-- The end tag should stay in 80 print width -->
+
+================================================================================
+`;
diff --git a/tests/html/text/jsfmt.spec.js b/tests/html/text/jsfmt.spec.js
new file mode 100644
index 000000000..53763df9b
--- /dev/null
+++ b/tests/html/text/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["html"]);
diff --git a/tests/html/text/tag-should-in-fill.html b/tests/html/text/tag-should-in-fill.html
new file mode 100644
index 000000000..77085766b
--- /dev/null
+++ b/tests/html/text/tag-should-in-fill.html
@@ -0,0 +1,4 @@
+<a-long-long-long-element>foo bar foo bar
+  foo bar foo bar foo bar foo bar foo bar
+  foo bar foo bar</a-long-long-long-element>
+<!-- The end tag should stay in 80 print width -->

From d3af05e33a969f21f1c2efa412026378072f139b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Dec 2020 06:02:05 +0000
Subject: [PATCH 184/299] Build(deps): Bump actions/setup-node from v2.1.2 to
 v2.1.3 (#9870)

---
 .github/workflows/dev-package-test.yml | 2 +-
 .github/workflows/dev-test.yml         | 2 +-
 .github/workflows/lint.yml             | 2 +-
 .github/workflows/prod-test.yml        | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dev-package-test.yml b/.github/workflows/dev-package-test.yml
index 12576bc08..2cc7c1718 100644
--- a/.github/workflows/dev-package-test.yml
+++ b/.github/workflows/dev-package-test.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v2.1.3
         with:
           node-version: ${{ matrix.node }}
 
diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml
index 343651405..6b2bce95d 100644
--- a/.github/workflows/dev-test.yml
+++ b/.github/workflows/dev-test.yml
@@ -46,7 +46,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v2.1.3
         with:
           node-version: ${{ matrix.node }}
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a377c3759..1fc17a46d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v2.1.3
 
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
diff --git a/.github/workflows/prod-test.yml b/.github/workflows/prod-test.yml
index 13bdb965a..440e9b680 100644
--- a/.github/workflows/prod-test.yml
+++ b/.github/workflows/prod-test.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v2.1.3
 
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
@@ -60,7 +60,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v2.1.3
 
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
@@ -108,7 +108,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.2
+        uses: actions/setup-node@v2.1.3
         with:
           node-version: ${{ matrix.node }}
 

From 96acf88861b91b90f74452002fbfdecaa4714c10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Dec 2020 06:19:24 +0000
Subject: [PATCH 185/299] Build(deps-dev): Bump @glimmer/reference from 0.69.0
 to 0.69.3 (#9868)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 739e8a0f1..b4194aa6a 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.10",
     "@babel/types": "7.12.10",
-    "@glimmer/reference": "0.69.0",
+    "@glimmer/reference": "0.69.3",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index bb82a23a5..57f19f7db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1062,10 +1062,10 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.69.0":
-  version "0.69.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.69.0.tgz#5a35a780bd2dc614984caf7f6a3ada37f6f8aa47"
-  integrity sha512-y3E0Id6a2ab5Qf53qRJWTh6yHM+xDYDBvS4Su/WDN3PPDyY8Oeme0L+7vceg4e56DsYDNtwPy1b4/470y35L0g==
+"@glimmer/global-context@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.69.3.tgz#d38bae41e6dcc248f264fecbce99f997f57a88d7"
+  integrity sha512-QFkVRGVaduy9yQwaN/oB54M5wpLXLuIOhcrcfT9cBDwAOuMO5EWT+jffQ958RH6XNg8dpnL5ut233v7SxM9SJg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
@@ -1076,16 +1076,23 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.69.0":
-  version "0.69.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.69.0.tgz#3b0af80edbae50eebd6626458bdd3911ae6c9f37"
-  integrity sha512-MbdczRZ3GM0ErFG25DHETy6kJml6SziPu83LXdCp8kd4zmoWjLHu7O1CW9S/RnoRicvsblHKIjUhCud7XflpbA==
+"@glimmer/interfaces@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.69.3.tgz#7d99db1a328ab6cd95b7235360780ed28d27b0e5"
+  integrity sha512-0h19o+PNdw5wO5aLbX/96jhT3wZA9zKYap7B1pAjcZiHYwtvhuGLSqR+zvr4Dq4oSXrNU/kbk1WWmoHm7Hkehw==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/reference@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.69.3.tgz#b229bfa44a0506e89f19fa23468de82908c78695"
+  integrity sha512-JoHGFPPv8S5VO3wXSZ7dMIdCPEvkzdvRUG412nQp6M3KdXZUKy4ouAYFJy4iTpFWvPaIi4BI1Exo1HVtliuvZA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.69.0"
-    "@glimmer/interfaces" "0.69.0"
-    "@glimmer/util" "0.69.0"
-    "@glimmer/validator" "0.69.0"
+    "@glimmer/global-context" "0.69.3"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/util" "0.69.3"
+    "@glimmer/validator" "0.69.3"
 
 "@glimmer/syntax@0.69.0":
   version "0.69.0"
@@ -1106,13 +1113,22 @@
     "@glimmer/interfaces" "0.69.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.69.0":
-  version "0.69.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.69.0.tgz#65b7e50e823f9672064e215078604c647b718d73"
-  integrity sha512-vnpCicG/foHQvR0A/eKrLC9sfaNNl64q1Ya+WOdzj00RBXTuzKvhj6tpeP7p8yBZgTrAVG9LUtaLWHKmfQCe7Q==
+"@glimmer/util@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.69.3.tgz#1d822a8f971a9a1e24385c4b46c3a48ab5cdf20d"
+  integrity sha512-bu3vMBPfWqGBRjQb4Hj81XYa8DWKdA+0HRxVCVqKlov3py8TSUyuGHKcbVB/bB0kKxuZp8nxW2UZJO3WA4V08A==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.69.3"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/validator@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.69.3.tgz#488e56463337297f85e671e575d61e7c493ef144"
+  integrity sha512-nDHLaEY/CzNfKWk7rV1+eL+JAq11O3IM/FKAp/Uuson5HB2yEzxrM8rFHQCbZDkxzBgtPKuUtpTWQyxyNYgUJQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.69.0"
+    "@glimmer/global-context" "0.69.3"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 725b2e8e741c1478286d4a91ca6d657a61c7435a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Dec 2020 07:39:07 +0000
Subject: [PATCH 186/299] Build(deps): Bump @glimmer/syntax from 0.69.0 to
 0.69.3 (#9869)

---
 package.json |  2 +-
 yarn.lock    | 28 ++++++----------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index b4194aa6a..d81164d0d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "11.0.4",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.7",
-    "@glimmer/syntax": "0.69.0",
+    "@glimmer/syntax": "0.69.3",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.9.1",
     "angular-estree-parser": "2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 57f19f7db..c1aa15551 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1069,13 +1069,6 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.69.0":
-  version "0.69.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.69.0.tgz#85ba8b9f44ca630950d40481d5af119e479b99ec"
-  integrity sha512-vgnhDj9+Td4XkgPWFE2BE0w9XaV4fqwVbmY9J6DIKFIzlwPfDaKfsUiHFVzGP13Cp78cRXA7JtbAxqjCLRcAeA==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.69.3":
   version "0.69.3"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.69.3.tgz#7d99db1a328ab6cd95b7235360780ed28d27b0e5"
@@ -1094,25 +1087,16 @@
     "@glimmer/util" "0.69.3"
     "@glimmer/validator" "0.69.3"
 
-"@glimmer/syntax@0.69.0":
-  version "0.69.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.69.0.tgz#41b0d240ff46e3c793de989ff2c28248f29dbc72"
-  integrity sha512-P5GrG7qf0RGotO2ADmoNJL60NU+kscYMkHXKM1a4O53VxKKNoBHzS97CoZ9rbmwCkHn0/mDt8IJPp/CD3QL+bQ==
+"@glimmer/syntax@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.69.3.tgz#3613ef244935cd4f3aaac31f4ad8ca08a1c38a97"
+  integrity sha512-7LKqqnBdSFlWUh5+BfND4bS9LzCgezAYG3axHWIXZcPYuUadbnBe+0ugq8FFhIAsMF3TXk3rHHLseYo95OqwYA==
   dependencies:
-    "@glimmer/interfaces" "0.69.0"
-    "@glimmer/util" "0.69.0"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/util" "0.69.3"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.69.0":
-  version "0.69.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.69.0.tgz#7dd032202522f144b5c061d6a37c93565cd69134"
-  integrity sha512-nZfiygIp541ZIHzgdButCXyUl1p3syUFxF/K208ogPEqe/eadwYvurtkibNoKlm+is0doIhi9GWe3ll7e17GJQ==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.69.0"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.69.3":
   version "0.69.3"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.69.3.tgz#1d822a8f971a9a1e24385c4b46c3a48ab5cdf20d"

From cdaf179b5938a13147fc476fa1a6ad59fdb0bfd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Dec 2020 21:33:31 +0900
Subject: [PATCH 187/299] Build(deps): Bump @babel/parser from 7.12.7 to
 7.12.10 (#9865)

Bumps [@babel/parser](https://github.com/babel/babel/tree/HEAD/packages/babel-parser) from 7.12.7 to 7.12.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.10/packages/babel-parser)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index d81164d0d..b03899723 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@angular/compiler": "11.0.4",
     "@babel/code-frame": "7.10.4",
-    "@babel/parser": "7.12.7",
+    "@babel/parser": "7.12.10",
     "@glimmer/syntax": "0.69.3",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.9.1",
diff --git a/yarn.lock b/yarn.lock
index c1aa15551..915589759 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -276,12 +276,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
-  integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
+"@babel/parser@7.12.10", "@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
   version "7.12.10"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81"
   integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==

From 05661d81c8e35acf7444d993515a889f91303451 Mon Sep 17 00:00:00 2001
From: Kevin Deisz <kevin.deisz@gmail.com>
Date: Fri, 11 Dec 2020 08:49:31 -0500
Subject: [PATCH 188/299] Ruby blog post (#9854)

---
 cspell.json                                |  4 +++
 website/blog/2020-12-11-plugin-ruby-1.0.md | 42 ++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 website/blog/2020-12-11-plugin-ruby-1.0.md

diff --git a/cspell.json b/cspell.json
index 3bc57e559..e7ec93fb3 100644
--- a/cspell.json
+++ b/cspell.json
@@ -11,6 +11,7 @@
         "Apheleia",
         "apos",
         "arduner",
+        "arity",
         "arrayify",
         "Artem",
         "Ascher",
@@ -77,6 +78,7 @@
         "declarators",
         "dedent",
         "defun",
+        "Deisz",
         "Deloise",
         "deltice",
         "deopt",
@@ -189,6 +191,7 @@
         "Karimov",
         "Kassens",
         "Kasturi",
+        "kddeisz",
         "Kearney",
         "keyof",
         "Khatri",
@@ -315,6 +318,7 @@
         "rhengles",
         "ribaudo",
         "Roadmap",
+        "Rubocop",
         "ruleset",
         "rulesets",
         "sandhose",
diff --git a/website/blog/2020-12-11-plugin-ruby-1.0.md b/website/blog/2020-12-11-plugin-ruby-1.0.md
new file mode 100644
index 000000000..aad11ef00
--- /dev/null
+++ b/website/blog/2020-12-11-plugin-ruby-1.0.md
@@ -0,0 +1,42 @@
+---
+author: Kevin Deisz (@kddeisz)
+authorURL: https://twitter.com/kddeisz
+title: Prettier for Ruby goes v1.0 🎉
+---
+
+After 1500 commits and 50 releases since July 2018, we're happy to announce that we've just released v1.0 of [Prettier for Ruby](https://github.com/prettier/plugin-ruby). In this blog post, we'd like to give a short overview of how the plugin works, its philosophy, and what to expect in the future.
+
+<!--truncate-->
+
+## How does it work?
+
+Prettier for Ruby works through Prettier's [plugin API](https://prettier.io/docs/en/plugins.html). Its `parse` function works by spawning a Ruby process and using Ruby's own parser (known as `Ripper`). After tracking all of the various node types, comments, location information, and other various metadata, it returns a built abstract syntax tree (AST) to the Prettier process. Finally it converts that AST into Prettier's intermediate representation (known as `Doc`) before allowing Prettier to handle printing it back out.
+
+## Philosophy
+
+The Ruby plugin attempts to be satisfied with as many varieties of code as possible. For instance, if you decide to a call a method with or without parentheses, the plugin will allow this and honor your selection. For a couple of instances where the Ruby community has entrenched itself into some strong opinions, however, options are provided. These include:
+
+- `rubyArrayLiteral` - By default, the Ruby plugin will convert arrays of simple strings and symbols to their equivalent array literal syntax (`%w` and `%i`, respectively). If you disable this option, it will leave them alone.
+- `rubyHashLabel` - This option is for the fans of the hash rocket. By default, the Ruby plugin will print out your hash keys consistently, i.e., it will use labels if it can for every key, otherwise it will use hash rockets for every key. If you disable the default behavior, every key in hashes will always use hash rockets.
+- `rubyModifier` - For the users that really dislike the modifier form of `if`, `unless`, `while`, and `until`, this option is for you.
+- `rubySingleQuote` - The default behavior is to use single quotes where it makes sense, and otherwise to use double quotes. With this option you can reverse that behavior.
+- `rubyToProc` - This option allows Prettier to convert statements like `array.map { |elem| elem.to_s }` to `array.map(&:to_s)`. It is disabled by default because it technically changes the arity of block, which can break reflection code.
+
+The plugin additionally supports various Prettier core options, including:
+
+- `printWidth` - This defaults to 80 characters, but you can make the line longer if you prefer.
+- `tabWidth` - This defaults to 2 characters.
+- `trailingComma` - This defaults to `"none"`, but you can choose `"all"` to introduce trailing commas into array literals, hash literals, and argument lists that span multiple lines.
+
+In general the style of Prettier will match that of the [Ruby style guide](https://github.com/rubocop-hq/ruby-style-guide), i.e., the default Rubocop configuration. However, while you're using Prettier you might just find that you want to turn off the `Formatting/*` rules from Rubocop anyway as it will speed up your linter runs.
+
+## What's next
+
+Going forward, we're going to be working on a couple of things:
+
+- Support for the new syntax coming out with Ruby 3, including rightward assignment and more pattern matching.
+- Better performance, as in [these](https://github.com/kddeisz/libdoc) [experiments](https://github.com/prettier/plugin-ruby/pull/512).
+- Support for the Ruby language in Prettier's [playground](https://prettier.io/playground/).
+- Support for HTML ERB templates as another plugin, as in this [experiment](https://github.com/prettier/plugin-ruby/compare/erb).
+
+Today, you can try the plugin from the command line by following the [instructions in the README](https://github.com/prettier/plugin-ruby#getting-started). Definitely [report any bugs](https://github.com/prettier/plugin-ruby/issues) that you find, we're working diligently to make sure they're squashed as soon as they come up. Also feel free to [get started contributing](https://github.com/prettier/plugin-ruby/blob/master/CONTRIBUTING.md) to the project itself if you're interested.

From 9c87a9af2e1fe77fc0df847936925cca077c0d98 Mon Sep 17 00:00:00 2001
From: Kevin Deisz <kevin.deisz@gmail.com>
Date: Fri, 11 Dec 2020 09:22:57 -0500
Subject: [PATCH 189/299] Correct name for Ruby blog post (#9875)

---
 cspell.json                                | 1 +
 website/blog/2020-12-11-plugin-ruby-1.0.md | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cspell.json b/cspell.json
index e7ec93fb3..21333bf09 100644
--- a/cspell.json
+++ b/cspell.json
@@ -192,6 +192,7 @@
         "Kassens",
         "Kasturi",
         "kddeisz",
+        "kddnewton",
         "Kearney",
         "keyof",
         "Khatri",
diff --git a/website/blog/2020-12-11-plugin-ruby-1.0.md b/website/blog/2020-12-11-plugin-ruby-1.0.md
index aad11ef00..cd788e384 100644
--- a/website/blog/2020-12-11-plugin-ruby-1.0.md
+++ b/website/blog/2020-12-11-plugin-ruby-1.0.md
@@ -1,6 +1,6 @@
 ---
-author: Kevin Deisz (@kddeisz)
-authorURL: https://twitter.com/kddeisz
+author: Kevin Newton (@kddnewton)
+authorURL: https://twitter.com/kddnewton
 title: Prettier for Ruby goes v1.0 🎉
 ---
 

From 6df49ad078718b7a685b15e05ae3a214430a3fe3 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sun, 13 Dec 2020 05:10:01 +0800
Subject: [PATCH 190/299] Fix link to babel website (#9856)

Co-authored-by: Sosuke Suzuki <aosukeke@gmail.com>
---
 docs/options.md                                  | 2 +-
 website/versioned_docs/version-stable/options.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/options.md b/docs/options.md
index d380c51f3..389eab7b9 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -107,7 +107,7 @@ Valid options:
 
 - `"es5"` - Trailing commas where valid in ES5 (objects, arrays, etc.)
 - `"none"` - No trailing commas.
-- `"all"` - Trailing commas wherever possible (including function arguments). This requires node 8 or a [transform](https://babeljs.io/docs/plugins/syntax-trailing-function-commas/).
+- `"all"` - Trailing commas wherever possible (including [trailing commas in function parameter lists and calls](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Trailing_commas#Trailing_commas_in_functions)). This requires node 8 or a modern browser that supports ES2017 or transform with [babel](https://babeljs.io/docs/en/index).
 
 | Default | CLI Override                                           | API Override                                           |
 | ------- | ------------------------------------------------------ | ------------------------------------------------------ |
diff --git a/website/versioned_docs/version-stable/options.md b/website/versioned_docs/version-stable/options.md
index 1941ae386..7fa1fa36d 100644
--- a/website/versioned_docs/version-stable/options.md
+++ b/website/versioned_docs/version-stable/options.md
@@ -108,7 +108,7 @@ Valid options:
 
 - `"es5"` - Trailing commas where valid in ES5 (objects, arrays, etc.)
 - `"none"` - No trailing commas.
-- `"all"` - Trailing commas wherever possible (including function arguments). This requires node 8 or a [transform](https://babeljs.io/docs/plugins/syntax-trailing-function-commas/).
+- `"all"` - Trailing commas wherever possible (including [trailing commas in function parameter lists and calls](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Trailing_commas#Trailing_commas_in_functions)). This requires node 8 or a modern browser that supports ES2017 or transform with [babel](https://babeljs.io/docs/en/index).
 
 | Default | CLI Override                                           | API Override                                           |
 | ------- | ------------------------------------------------------ | ------------------------------------------------------ |

From e1654bd2f8ef144ba5f58c4511a6c6f98d961222 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Dec 2020 23:10:37 +0200
Subject: [PATCH 191/299] Build(deps): Bump flow-parser from 0.139.0 to 0.140.0
 (#9867)

Bumps [flow-parser](https://github.com/facebook/flow) from 0.139.0 to 0.140.0.
- [Release notes](https://github.com/facebook/flow/releases)
- [Changelog](https://github.com/facebook/flow/blob/master/Changelog.md)
- [Commits](https://github.com/facebook/flow/compare/v0.139.0...v0.140.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b03899723..4002f15ef 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "fast-glob": "3.2.4",
     "fast-json-stable-stringify": "2.1.0",
     "find-parent-dir": "0.3.0",
-    "flow-parser": "0.139.0",
+    "flow-parser": "0.140.0",
     "get-stdin": "8.0.0",
     "globby": "11.0.1",
     "graphql": "15.4.0",
diff --git a/yarn.lock b/yarn.lock
index 915589759..137d19ab0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3562,10 +3562,10 @@ flatten@^1.0.2:
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
   integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
-flow-parser@0.139.0:
-  version "0.139.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.139.0.tgz#c046779114487175f2b1e8aa639bf977d4c7dd9f"
-  integrity sha512-yEh5wJIi/BG7JZvWAWxTdfZ1uoh/W3oefJOuvUDosKFIE5H7ad8Eu6k9ba1yr83Lxn5vY6kZMG1IaiiiA/5scg==
+flow-parser@0.140.0:
+  version "0.140.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.140.0.tgz#f737901bf8343c843417cac695b0b428a54843c6"
+  integrity sha512-z57YJZXcO0mmlNoOf9uvdnoZXanu8ALTqSaAWAv6kQavpnA5Kpdd4R7B3wP56+/yi/yODjrtarQYV/bgv867Iw==
 
 for-in@^1.0.2:
   version "1.0.2"

From 643f8906e0a15e6d896daf29c5d8bbb29f25e72e Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sun, 13 Dec 2020 05:10:59 +0800
Subject: [PATCH 192/299] doc: improve examples in browser (#9811)

---
 docs/browser.md                               | 68 +++++++++++++++----
 .../versioned_docs/version-stable/browser.md  | 68 +++++++++++++++----
 2 files changed, 112 insertions(+), 24 deletions(-)

diff --git a/docs/browser.md b/docs/browser.md
index 40e1b67a3..352c9bdd4 100644
--- a/docs/browser.md
+++ b/docs/browser.md
@@ -14,10 +14,43 @@ The [`browser` field](https://github.com/defunctzombie/package-browser-field-spe
 
 ### `prettier.format(code, options)`
 
-Unlike the `format` function from the [main API](api.md#prettierformatsource--options), this function does not load plugins automatically, so a `plugins` property is required if you want to load plugins. Additionally, the parsers included in the Prettier package won’t be loaded automatically, so you need to load them as plugins before using them.
+Unlike the `format` function from the [main API](api.md#prettierformatsource--options), this function does not load plugins automatically, so a `plugins` property is required if you want to load [plugins](#plugins). Additionally, the parsers included in the Prettier package won’t be loaded automatically, so you need to load them as plugins before using them.
 
 See [Usage](#usage) below for examples.
 
+## Plugins
+
+All available plugins are files named `parser-*.js` in <https://unpkg.com/browse/prettier@2.2.1/> and `parser-*.mjs` in <https://unpkg.com/browse/prettier@2.2.1/esm/>.
+
+If you want format embed code, you need load related plugins too, for example
+
+```html
+<script type="module">
+  import prettier from "https://unpkg.com/prettier@2.2.1/esm/standalone.mjs";
+  import parserBabel from "https://unpkg.com/prettier@2.2.1/esm/parser-babel.mjs";
+
+  prettier.format("const html = /* HTML */ `<DIV> </DIV>`", {
+    parser: "babel",
+    plugins: [parserBabel],
+  });
+</script>
+```
+
+the HTML code inside JavaScript code won't get formatted, because it requires `html` parser too, correct usage
+
+```html
+<script type="module">
+  import prettier from "https://unpkg.com/prettier@2.2.1/esm/standalone.mjs";
+  import parserBabel from "https://unpkg.com/prettier@2.2.1/esm/parser-babel.mjs";
+  import parserHtml from "https://unpkg.com/prettier@2.2.1/esm/parser-html.mjs";
+
+  prettier.format("const html = /* HTML */ `<DIV> </DIV>`", {
+    parser: "babel",
+    plugins: [parserBabel, parserHtml],
+  });
+</script>
+```
+
 ## Usage
 
 ### Global
@@ -26,7 +59,7 @@ See [Usage](#usage) below for examples.
 <script src="https://unpkg.com/prettier@2.2.1/standalone.js"></script>
 <script src="https://unpkg.com/prettier@2.2.1/parser-graphql.js"></script>
 <script>
-  prettier.format("query { }", {
+  prettier.format("type Query { hello: String }", {
     parser: "graphql",
     plugins: prettierPlugins,
   });
@@ -37,14 +70,16 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
 
 ### ES Modules
 
-```js
-import prettier from "https://unpkg.com/prettier/esm/standalone.mjs";
-import parserGraphql from "https://unpkg.com/prettier/esm/parser-graphql.mjs";
+```html
+<script type="module">
+  import prettier from "https://unpkg.com/prettier@2.2.1/esm/standalone.mjs";
+  import parserGraphql from "https://unpkg.com/prettier@2.2.1/esm/parser-graphql.mjs";
 
-prettier.format("query { }", {
-  parser: "graphql",
-  plugins: [parserGraphql],
-});
+  prettier.format("type Query { hello: String }", {
+    parser: "graphql",
+    plugins: [parserGraphql],
+  });
+</script>
 ```
 
 ### AMD
@@ -54,7 +89,10 @@ define([
   "https://unpkg.com/prettier@2.2.1/standalone.js",
   "https://unpkg.com/prettier@2.2.1/parser-graphql.js",
 ], (prettier, ...plugins) => {
-  prettier.format("query { }", { parser: "graphql", plugins });
+  prettier.format("type Query { hello: String }", {
+    parser: "graphql",
+    plugins,
+  });
 });
 ```
 
@@ -63,7 +101,10 @@ define([
 ```js
 const prettier = require("prettier/standalone");
 const plugins = [require("prettier/parser-graphql")];
-prettier.format("query { }", { parser: "graphql", plugins });
+prettier.format("type Query { hello: String }", {
+  parser: "graphql",
+  plugins,
+});
 ```
 
 This syntax doesn’t necessarily work in the browser, but it can be used when bundling the code with browserify, Rollup, webpack, or another bundler.
@@ -73,5 +114,8 @@ This syntax doesn’t necessarily work in the browser, but it can be used when b
 ```js
 importScripts("https://unpkg.com/prettier@2.2.1/standalone.js");
 importScripts("https://unpkg.com/prettier@2.2.1/parser-graphql.js");
-prettier.format("query { }", { parser: "graphql", plugins: prettierPlugins });
+prettier.format("type Query { hello: String }", {
+  parser: "graphql",
+  plugins: prettierPlugins,
+});
 ```
diff --git a/website/versioned_docs/version-stable/browser.md b/website/versioned_docs/version-stable/browser.md
index f4283f763..446aa0698 100644
--- a/website/versioned_docs/version-stable/browser.md
+++ b/website/versioned_docs/version-stable/browser.md
@@ -15,10 +15,43 @@ The [`browser` field](https://github.com/defunctzombie/package-browser-field-spe
 
 ### `prettier.format(code, options)`
 
-Unlike the `format` function from the [main API](api.md#prettierformatsource--options), this function does not load plugins automatically, so a `plugins` property is required if you want to load plugins. Additionally, the parsers included in the Prettier package won’t be loaded automatically, so you need to load them as plugins before using them.
+Unlike the `format` function from the [main API](api.md#prettierformatsource--options), this function does not load plugins automatically, so a `plugins` property is required if you want to load [plugins](#plugins). Additionally, the parsers included in the Prettier package won’t be loaded automatically, so you need to load them as plugins before using them.
 
 See [Usage](#usage) below for examples.
 
+## Plugins
+
+All available plugins are files named `parser-*.js` in <https://unpkg.com/browse/prettier@2.2.1/> and `parser-*.mjs` in <https://unpkg.com/browse/prettier@2.2.1/esm/>.
+
+If you want format embed code, you need load related plugins too, for example
+
+```html
+<script type="module">
+  import prettier from "https://unpkg.com/prettier@2.2.1/esm/standalone.mjs";
+  import parserBabel from "https://unpkg.com/prettier@2.2.1/esm/parser-babel.mjs";
+
+  prettier.format("const html = /* HTML */ `<DIV> </DIV>`", {
+    parser: "babel",
+    plugins: [parserBabel],
+  });
+</script>
+```
+
+the HTML code inside JavaScript code won't get formatted, because it requires `html` parser too, correct usage
+
+```html
+<script type="module">
+  import prettier from "https://unpkg.com/prettier@2.2.1/esm/standalone.mjs";
+  import parserBabel from "https://unpkg.com/prettier@2.2.1/esm/parser-babel.mjs";
+  import parserHtml from "https://unpkg.com/prettier@2.2.1/esm/parser-html.mjs";
+
+  prettier.format("const html = /* HTML */ `<DIV> </DIV>`", {
+    parser: "babel",
+    plugins: [parserBabel, parserHtml],
+  });
+</script>
+```
+
 ## Usage
 
 ### Global
@@ -27,7 +60,7 @@ See [Usage](#usage) below for examples.
 <script src="https://unpkg.com/prettier@2.2.1/standalone.js"></script>
 <script src="https://unpkg.com/prettier@2.2.1/parser-graphql.js"></script>
 <script>
-  prettier.format("query { }", {
+  prettier.format("type Query { hello: String }", {
     parser: "graphql",
     plugins: prettierPlugins,
   });
@@ -38,14 +71,16 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
 
 ### ES Modules
 
-```js
-import prettier from "https://unpkg.com/prettier/esm/standalone.mjs";
-import parserGraphql from "https://unpkg.com/prettier/esm/parser-graphql.mjs";
+```html
+<script type="module">
+  import prettier from "https://unpkg.com/prettier@2.2.1/esm/standalone.mjs";
+  import parserGraphql from "https://unpkg.com/prettier@2.2.1/esm/parser-graphql.mjs";
 
-prettier.format("query { }", {
-  parser: "graphql",
-  plugins: [parserGraphql],
-});
+  prettier.format("type Query { hello: String }", {
+    parser: "graphql",
+    plugins: [parserGraphql],
+  });
+</script>
 ```
 
 ### AMD
@@ -55,7 +90,10 @@ define([
   "https://unpkg.com/prettier@2.2.1/standalone.js",
   "https://unpkg.com/prettier@2.2.1/parser-graphql.js",
 ], (prettier, ...plugins) => {
-  prettier.format("query { }", { parser: "graphql", plugins });
+  prettier.format("type Query { hello: String }", {
+    parser: "graphql",
+    plugins,
+  });
 });
 ```
 
@@ -64,7 +102,10 @@ define([
 ```js
 const prettier = require("prettier/standalone");
 const plugins = [require("prettier/parser-graphql")];
-prettier.format("query { }", { parser: "graphql", plugins });
+prettier.format("type Query { hello: String }", {
+  parser: "graphql",
+  plugins,
+});
 ```
 
 This syntax doesn’t necessarily work in the browser, but it can be used when bundling the code with browserify, Rollup, webpack, or another bundler.
@@ -74,5 +115,8 @@ This syntax doesn’t necessarily work in the browser, but it can be used when b
 ```js
 importScripts("https://unpkg.com/prettier@2.2.1/standalone.js");
 importScripts("https://unpkg.com/prettier@2.2.1/parser-graphql.js");
-prettier.format("query { }", { parser: "graphql", plugins: prettierPlugins });
+prettier.format("type Query { hello: String }", {
+  parser: "graphql",
+  plugins: prettierPlugins,
+});
 ```

From f49e72e371d1de71d2ccf66ee29bb464400562df Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 14 Dec 2020 08:47:28 +0800
Subject: [PATCH 193/299] Use `isBlockComment`/`isLineComment` in
 `canAttachComment` (#9849)

---
 src/language-js/printer-estree.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index e02dd375e..8e9020e7f 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -45,6 +45,7 @@ const {
   isGetterOrSetter,
   isTheOnlyJSXElementInMarkdown,
   isBlockComment,
+  isLineComment,
   needsHardlineAfterDanglingComment,
   rawText,
   shouldPrintComma,
@@ -1271,10 +1272,8 @@ function printRegex(node) {
 function canAttachComment(node) {
   return (
     node.type &&
-    node.type !== "CommentBlock" &&
-    node.type !== "CommentLine" &&
-    node.type !== "Line" &&
-    node.type !== "Block" &&
+    !isBlockComment(node) &&
+    !isLineComment(node) &&
     node.type !== "EmptyStatement" &&
     node.type !== "TemplateElement" &&
     node.type !== "Import"

From 36741e4d92a2f422bafe11d27e5b82c3e14be406 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Dec 2020 14:40:43 +0800
Subject: [PATCH 194/299] Build(deps-dev): Bump webpack from 5.10.0 to 5.10.1
 in /website (#9886)

Bumps [webpack](https://github.com/webpack/webpack) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.10.0...v5.10.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json |   2 +-
 website/yarn.lock    | 238 +++++++++++++++++++++----------------------
 2 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/website/package.json b/website/package.json
index 5b3ff6da3..2a79a065f 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.1",
     "svgo": "1.3.2",
-    "webpack": "5.10.0",
+    "webpack": "5.10.1",
     "webpack-cli": "4.2.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 5cc5e063a..84ac97c5e 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1096,149 +1096,149 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
-"@webassemblyjs/ast@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
-  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
+"@webassemblyjs/ast@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.1.tgz#76c6937716d68bf1484c15139f5ed30b9abc8bb4"
+  integrity sha512-uMu1nCWn2Wxyy126LlGqRVlhdTOsO/bsBRI4dNq3+6SiSuRKRQX6ejjKgh82LoGAPSq72lDUiQ4FWVaf0PecYw==
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/wast-parser" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.1"
+    "@webassemblyjs/wast-parser" "1.9.1"
 
-"@webassemblyjs/floating-point-hex-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
-  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
+"@webassemblyjs/floating-point-hex-parser@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.1.tgz#9eb0ff90a1cdeef51f36ba533ed9f06b5cdadd09"
+  integrity sha512-5VEKu024RySmLKTTBl9q1eO/2K5jk9ZS+2HXDBLA9s9p5IjkaXxWiDb/+b7wSQp6FRdLaH1IVGIfOex58Na2pg==
 
-"@webassemblyjs/helper-api-error@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
-  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
+"@webassemblyjs/helper-api-error@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.1.tgz#ad89015c4246cd7f5ed0556700237f8b9c2c752f"
+  integrity sha512-y1lGmfm38djrScwpeL37rRR9f1D6sM8RhMpvM7CYLzOlHVboouZokXK/G88BpzW0NQBSvCCOnW5BFhten4FPfA==
 
-"@webassemblyjs/helper-buffer@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
-  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
+"@webassemblyjs/helper-buffer@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.1.tgz#186e67ac25f9546ea7939759413987f157524133"
+  integrity sha512-uS6VSgieHbk/m4GSkMU5cqe/5TekdCzQso4revCIEQ3vpGZgqSSExi4jWpTWwDpAHOIAb1Jfrs0gUB9AA4n71w==
 
-"@webassemblyjs/helper-code-frame@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
-  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
+"@webassemblyjs/helper-code-frame@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.1.tgz#aab177b7cc87a318a8f8664ad68e2c3828ebc42b"
+  integrity sha512-ZQ2ZT6Evk4DPIfD+92AraGYaFIqGm4U20e7FpXwl7WUo2Pn1mZ1v8VGH8i+Y++IQpxPbQo/UyG0Khs7eInskzA==
   dependencies:
-    "@webassemblyjs/wast-printer" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.1"
 
-"@webassemblyjs/helper-fsm@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
-  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
+"@webassemblyjs/helper-fsm@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.1.tgz#527e91628e84d13d3573884b3dc4c53a81dcb911"
+  integrity sha512-J32HGpveEqqcKFS0YbgicB0zAlpfIxJa5MjxDxhu3i5ltPcVfY5EPvKQ1suRguFPehxiUs+/hfkwPEXom/l0lw==
 
-"@webassemblyjs/helper-module-context@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
-  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
+"@webassemblyjs/helper-module-context@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.1.tgz#778670b3d471f7cf093d1e7c0dde431b54310e16"
+  integrity sha512-IEH2cMmEQKt7fqelLWB5e/cMdZXf2rST1JIrzWmf4XBt3QTxGdnnLvV4DYoN8pJjOx0VYXsWg+yF16MmJtolZg==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
 
-"@webassemblyjs/helper-wasm-bytecode@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
-  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+"@webassemblyjs/helper-wasm-bytecode@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.1.tgz#563f59bcf409ccf469edde168b9426961ffbf6df"
+  integrity sha512-i2rGTBqFUcSXxyjt2K4vm/3kkHwyzG6o427iCjcIKjOqpWH8SEem+xe82jUk1iydJO250/CvE5o7hzNAMZf0dQ==
 
-"@webassemblyjs/helper-wasm-section@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
-  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
+"@webassemblyjs/helper-wasm-section@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.1.tgz#f7988f94c12b01b99a16120cb01dc099b00e4798"
+  integrity sha512-FetqzjtXZr2d57IECK+aId3D0IcGweeM0CbAnJHkYJkcRTHP+YcMb7Wmc0j21h5UWBpwYGb9dSkK/93SRCTrGg==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-buffer" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-buffer" "1.9.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.1"
+    "@webassemblyjs/wasm-gen" "1.9.1"
 
-"@webassemblyjs/ieee754@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
-  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
+"@webassemblyjs/ieee754@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.1.tgz#3b715871ca7d75784717cf9ceca9d7b81374b8af"
+  integrity sha512-EvTG9M78zP1MmkBpUjGQHZc26DzPGZSLIPxYHCjQsBMo60Qy2W34qf8z0exRDtxBbRIoiKa5dFyWer/7r1aaSQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
-  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
+"@webassemblyjs/leb128@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.1.tgz#b2ecaa39f9e8277cc9c707c1ca8b2aa7b27d0b72"
+  integrity sha512-Oc04ub0vFfLnF+2/+ki3AE+anmW4sv9uNBqb+79fgTaPv6xJsOT0dhphNfL3FrME84CbX/D1T9XT8tjFo0IIiw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
-  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
+"@webassemblyjs/utf8@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.1.tgz#d02d9daab85cda3211e43caf31dca74c260a73b0"
+  integrity sha512-llkYtppagjCodFjo0alWOUhAkfOiQPQDIc5oA6C9sFAXz7vC9QhZf/f8ijQIX+A9ToM3c9Pq85X0EX7nx9gVhg==
 
-"@webassemblyjs/wasm-edit@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
-  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
+"@webassemblyjs/wasm-edit@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.1.tgz#e27a6bdbf78e5c72fa812a2fc3cbaad7c3e37578"
+  integrity sha512-S2IaD6+x9B2Xi8BCT0eGsrXXd8UxAh2LVJpg1ZMtHXnrDcsTtIX2bDjHi40Hio6Lc62dWHmKdvksI+MClCYbbw==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-buffer" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/helper-wasm-section" "1.9.0"
-    "@webassemblyjs/wasm-gen" "1.9.0"
-    "@webassemblyjs/wasm-opt" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
-    "@webassemblyjs/wast-printer" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-buffer" "1.9.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.1"
+    "@webassemblyjs/helper-wasm-section" "1.9.1"
+    "@webassemblyjs/wasm-gen" "1.9.1"
+    "@webassemblyjs/wasm-opt" "1.9.1"
+    "@webassemblyjs/wasm-parser" "1.9.1"
+    "@webassemblyjs/wast-printer" "1.9.1"
 
-"@webassemblyjs/wasm-gen@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
-  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
+"@webassemblyjs/wasm-gen@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.1.tgz#56a0787d1fa7994fdc7bea59004e5bec7189c5fc"
+  integrity sha512-bqWI0S4lBQsEN5FTZ35vYzfKUJvtjNnBobB1agCALH30xNk1LToZ7Z8eiaR/Z5iVECTlBndoRQV3F6mbEqE/fg==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/ieee754" "1.9.0"
-    "@webassemblyjs/leb128" "1.9.0"
-    "@webassemblyjs/utf8" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.1"
+    "@webassemblyjs/ieee754" "1.9.1"
+    "@webassemblyjs/leb128" "1.9.1"
+    "@webassemblyjs/utf8" "1.9.1"
 
-"@webassemblyjs/wasm-opt@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
-  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
+"@webassemblyjs/wasm-opt@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.1.tgz#fbdf8943a825e6dcc4cd69c3e092289fa4aec96c"
+  integrity sha512-gSf7I7YWVXZ5c6XqTEqkZjVs8K1kc1k57vsB6KBQscSagDNbAdxt6MwuJoMjsE1yWY1tsuL+pga268A6u+Fdkg==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-buffer" "1.9.0"
-    "@webassemblyjs/wasm-gen" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-buffer" "1.9.1"
+    "@webassemblyjs/wasm-gen" "1.9.1"
+    "@webassemblyjs/wasm-parser" "1.9.1"
 
-"@webassemblyjs/wasm-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
-  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
+"@webassemblyjs/wasm-parser@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.1.tgz#5e8352a246d3f605312c8e414f7990de55aaedfa"
+  integrity sha512-ImM4N2T1MEIond0MyE3rXvStVxEmivQrDKf/ggfh5pP6EHu3lL/YTAoSrR7shrbKNPpeKpGesW1LIK/L4kqduw==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-api-error" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/ieee754" "1.9.0"
-    "@webassemblyjs/leb128" "1.9.0"
-    "@webassemblyjs/utf8" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-api-error" "1.9.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.1"
+    "@webassemblyjs/ieee754" "1.9.1"
+    "@webassemblyjs/leb128" "1.9.1"
+    "@webassemblyjs/utf8" "1.9.1"
 
-"@webassemblyjs/wast-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
-  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
+"@webassemblyjs/wast-parser@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.1.tgz#e25ef13585c060073c1db0d6bd94340fdeee7596"
+  integrity sha512-2xVxejXSvj3ls/o2TR/zI6p28qsGupjHhnHL6URULQRcXmryn3w7G83jQMcT7PHqUfyle65fZtWLukfdLdE7qw==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
-    "@webassemblyjs/helper-api-error" "1.9.0"
-    "@webassemblyjs/helper-code-frame" "1.9.0"
-    "@webassemblyjs/helper-fsm" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.1"
+    "@webassemblyjs/helper-api-error" "1.9.1"
+    "@webassemblyjs/helper-code-frame" "1.9.1"
+    "@webassemblyjs/helper-fsm" "1.9.1"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
-  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
+"@webassemblyjs/wast-printer@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.1.tgz#b9f38e93652037d4f3f9c91584635af4191ed7c1"
+  integrity sha512-tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/wast-parser" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/wast-parser" "1.9.1"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/info@^1.1.0":
@@ -7432,17 +7432,17 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.0.tgz#6f77c31522a2c525152d9c344f9765d168b3df08"
-  integrity sha512-P0bHAXmIz0zsNcHNLqFmLY1ZtrT+jtBr7FqpuDtA2o7GiHC+zBsfhgK7SmJ1HG7BAEb3G9JoMdSVi7mEDvG3Zg==
+webpack@5.10.1:
+  version "5.10.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.1.tgz#81d1853d34bef5d6e5bfa119b98a43764b26c100"
+  integrity sha512-mHu4iM2mW7d/8R91VPPNtUCNd1D8k51TTb4e0XjylapIR6WEmW8XUTBZq8TqmShj9XYxVXJn6AzKlWnrlty6DA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-module-context" "1.9.0"
-    "@webassemblyjs/wasm-edit" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-module-context" "1.9.1"
+    "@webassemblyjs/wasm-edit" "1.9.1"
+    "@webassemblyjs/wasm-parser" "1.9.1"
     acorn "^8.0.4"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"

From 92819184f8f07fa5b23640394dd83af1f744fb40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Dec 2020 14:41:20 +0800
Subject: [PATCH 195/299] Build(deps-dev): Bump webpack from 5.10.0 to 5.10.1
 (#9889)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 263 ++++++++++++++++++++++++---------------------------
 2 files changed, 122 insertions(+), 143 deletions(-)

diff --git a/package.json b/package.json
index 4002f15ef..a7164937c 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "synchronous-promise": "2.0.15",
     "tempy": "1.0.0",
     "terser-webpack-plugin": "5.0.3",
-    "webpack": "5.10.0"
+    "webpack": "5.10.1"
   },
   "scripts": {
     "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
diff --git a/yarn.lock b/yarn.lock
index 137d19ab0..52db1ac18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1672,149 +1672,149 @@
     "@typescript-eslint/types" "4.9.1"
     eslint-visitor-keys "^2.0.0"
 
-"@webassemblyjs/ast@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
-  integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==
+"@webassemblyjs/ast@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.1.tgz#76c6937716d68bf1484c15139f5ed30b9abc8bb4"
+  integrity sha512-uMu1nCWn2Wxyy126LlGqRVlhdTOsO/bsBRI4dNq3+6SiSuRKRQX6ejjKgh82LoGAPSq72lDUiQ4FWVaf0PecYw==
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/wast-parser" "1.9.0"
+    "@webassemblyjs/helper-module-context" "1.9.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.1"
+    "@webassemblyjs/wast-parser" "1.9.1"
 
-"@webassemblyjs/floating-point-hex-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
-  integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
+"@webassemblyjs/floating-point-hex-parser@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.1.tgz#9eb0ff90a1cdeef51f36ba533ed9f06b5cdadd09"
+  integrity sha512-5VEKu024RySmLKTTBl9q1eO/2K5jk9ZS+2HXDBLA9s9p5IjkaXxWiDb/+b7wSQp6FRdLaH1IVGIfOex58Na2pg==
 
-"@webassemblyjs/helper-api-error@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
-  integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
+"@webassemblyjs/helper-api-error@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.1.tgz#ad89015c4246cd7f5ed0556700237f8b9c2c752f"
+  integrity sha512-y1lGmfm38djrScwpeL37rRR9f1D6sM8RhMpvM7CYLzOlHVboouZokXK/G88BpzW0NQBSvCCOnW5BFhten4FPfA==
 
-"@webassemblyjs/helper-buffer@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
-  integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==
+"@webassemblyjs/helper-buffer@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.1.tgz#186e67ac25f9546ea7939759413987f157524133"
+  integrity sha512-uS6VSgieHbk/m4GSkMU5cqe/5TekdCzQso4revCIEQ3vpGZgqSSExi4jWpTWwDpAHOIAb1Jfrs0gUB9AA4n71w==
 
-"@webassemblyjs/helper-code-frame@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27"
-  integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==
+"@webassemblyjs/helper-code-frame@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.1.tgz#aab177b7cc87a318a8f8664ad68e2c3828ebc42b"
+  integrity sha512-ZQ2ZT6Evk4DPIfD+92AraGYaFIqGm4U20e7FpXwl7WUo2Pn1mZ1v8VGH8i+Y++IQpxPbQo/UyG0Khs7eInskzA==
   dependencies:
-    "@webassemblyjs/wast-printer" "1.9.0"
+    "@webassemblyjs/wast-printer" "1.9.1"
 
-"@webassemblyjs/helper-fsm@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8"
-  integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==
+"@webassemblyjs/helper-fsm@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.1.tgz#527e91628e84d13d3573884b3dc4c53a81dcb911"
+  integrity sha512-J32HGpveEqqcKFS0YbgicB0zAlpfIxJa5MjxDxhu3i5ltPcVfY5EPvKQ1suRguFPehxiUs+/hfkwPEXom/l0lw==
 
-"@webassemblyjs/helper-module-context@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07"
-  integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==
+"@webassemblyjs/helper-module-context@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.1.tgz#778670b3d471f7cf093d1e7c0dde431b54310e16"
+  integrity sha512-IEH2cMmEQKt7fqelLWB5e/cMdZXf2rST1JIrzWmf4XBt3QTxGdnnLvV4DYoN8pJjOx0VYXsWg+yF16MmJtolZg==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
 
-"@webassemblyjs/helper-wasm-bytecode@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
-  integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+"@webassemblyjs/helper-wasm-bytecode@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.1.tgz#563f59bcf409ccf469edde168b9426961ffbf6df"
+  integrity sha512-i2rGTBqFUcSXxyjt2K4vm/3kkHwyzG6o427iCjcIKjOqpWH8SEem+xe82jUk1iydJO250/CvE5o7hzNAMZf0dQ==
 
-"@webassemblyjs/helper-wasm-section@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
-  integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==
+"@webassemblyjs/helper-wasm-section@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.1.tgz#f7988f94c12b01b99a16120cb01dc099b00e4798"
+  integrity sha512-FetqzjtXZr2d57IECK+aId3D0IcGweeM0CbAnJHkYJkcRTHP+YcMb7Wmc0j21h5UWBpwYGb9dSkK/93SRCTrGg==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-buffer" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/wasm-gen" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-buffer" "1.9.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.1"
+    "@webassemblyjs/wasm-gen" "1.9.1"
 
-"@webassemblyjs/ieee754@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
-  integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==
+"@webassemblyjs/ieee754@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.1.tgz#3b715871ca7d75784717cf9ceca9d7b81374b8af"
+  integrity sha512-EvTG9M78zP1MmkBpUjGQHZc26DzPGZSLIPxYHCjQsBMo60Qy2W34qf8z0exRDtxBbRIoiKa5dFyWer/7r1aaSQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
-  integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==
+"@webassemblyjs/leb128@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.1.tgz#b2ecaa39f9e8277cc9c707c1ca8b2aa7b27d0b72"
+  integrity sha512-Oc04ub0vFfLnF+2/+ki3AE+anmW4sv9uNBqb+79fgTaPv6xJsOT0dhphNfL3FrME84CbX/D1T9XT8tjFo0IIiw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
-  integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
+"@webassemblyjs/utf8@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.1.tgz#d02d9daab85cda3211e43caf31dca74c260a73b0"
+  integrity sha512-llkYtppagjCodFjo0alWOUhAkfOiQPQDIc5oA6C9sFAXz7vC9QhZf/f8ijQIX+A9ToM3c9Pq85X0EX7nx9gVhg==
 
-"@webassemblyjs/wasm-edit@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
-  integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==
+"@webassemblyjs/wasm-edit@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.1.tgz#e27a6bdbf78e5c72fa812a2fc3cbaad7c3e37578"
+  integrity sha512-S2IaD6+x9B2Xi8BCT0eGsrXXd8UxAh2LVJpg1ZMtHXnrDcsTtIX2bDjHi40Hio6Lc62dWHmKdvksI+MClCYbbw==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-buffer" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/helper-wasm-section" "1.9.0"
-    "@webassemblyjs/wasm-gen" "1.9.0"
-    "@webassemblyjs/wasm-opt" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
-    "@webassemblyjs/wast-printer" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-buffer" "1.9.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.1"
+    "@webassemblyjs/helper-wasm-section" "1.9.1"
+    "@webassemblyjs/wasm-gen" "1.9.1"
+    "@webassemblyjs/wasm-opt" "1.9.1"
+    "@webassemblyjs/wasm-parser" "1.9.1"
+    "@webassemblyjs/wast-printer" "1.9.1"
 
-"@webassemblyjs/wasm-gen@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
-  integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==
+"@webassemblyjs/wasm-gen@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.1.tgz#56a0787d1fa7994fdc7bea59004e5bec7189c5fc"
+  integrity sha512-bqWI0S4lBQsEN5FTZ35vYzfKUJvtjNnBobB1agCALH30xNk1LToZ7Z8eiaR/Z5iVECTlBndoRQV3F6mbEqE/fg==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/ieee754" "1.9.0"
-    "@webassemblyjs/leb128" "1.9.0"
-    "@webassemblyjs/utf8" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.1"
+    "@webassemblyjs/ieee754" "1.9.1"
+    "@webassemblyjs/leb128" "1.9.1"
+    "@webassemblyjs/utf8" "1.9.1"
 
-"@webassemblyjs/wasm-opt@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
-  integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==
+"@webassemblyjs/wasm-opt@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.1.tgz#fbdf8943a825e6dcc4cd69c3e092289fa4aec96c"
+  integrity sha512-gSf7I7YWVXZ5c6XqTEqkZjVs8K1kc1k57vsB6KBQscSagDNbAdxt6MwuJoMjsE1yWY1tsuL+pga268A6u+Fdkg==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-buffer" "1.9.0"
-    "@webassemblyjs/wasm-gen" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-buffer" "1.9.1"
+    "@webassemblyjs/wasm-gen" "1.9.1"
+    "@webassemblyjs/wasm-parser" "1.9.1"
 
-"@webassemblyjs/wasm-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
-  integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==
+"@webassemblyjs/wasm-parser@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.1.tgz#5e8352a246d3f605312c8e414f7990de55aaedfa"
+  integrity sha512-ImM4N2T1MEIond0MyE3rXvStVxEmivQrDKf/ggfh5pP6EHu3lL/YTAoSrR7shrbKNPpeKpGesW1LIK/L4kqduw==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-api-error" "1.9.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.9.0"
-    "@webassemblyjs/ieee754" "1.9.0"
-    "@webassemblyjs/leb128" "1.9.0"
-    "@webassemblyjs/utf8" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-api-error" "1.9.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.9.1"
+    "@webassemblyjs/ieee754" "1.9.1"
+    "@webassemblyjs/leb128" "1.9.1"
+    "@webassemblyjs/utf8" "1.9.1"
 
-"@webassemblyjs/wast-parser@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914"
-  integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==
+"@webassemblyjs/wast-parser@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.1.tgz#e25ef13585c060073c1db0d6bd94340fdeee7596"
+  integrity sha512-2xVxejXSvj3ls/o2TR/zI6p28qsGupjHhnHL6URULQRcXmryn3w7G83jQMcT7PHqUfyle65fZtWLukfdLdE7qw==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/floating-point-hex-parser" "1.9.0"
-    "@webassemblyjs/helper-api-error" "1.9.0"
-    "@webassemblyjs/helper-code-frame" "1.9.0"
-    "@webassemblyjs/helper-fsm" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/floating-point-hex-parser" "1.9.1"
+    "@webassemblyjs/helper-api-error" "1.9.1"
+    "@webassemblyjs/helper-code-frame" "1.9.1"
+    "@webassemblyjs/helper-fsm" "1.9.1"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.9.0":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
-  integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==
+"@webassemblyjs/wast-printer@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.1.tgz#b9f38e93652037d4f3f9c91584635af4191ed7c1"
+  integrity sha512-tDV8V15wm7mmbAH6XvQRU1X+oPGmeOzYsd6h7hlRLz6QpV4Ec/KKxM8OpLtFmQPLCreGxTp+HuxtH4pRIZyL9w==
   dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/wast-parser" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/wast-parser" "1.9.1"
     "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
@@ -2240,18 +2240,7 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@^4.14.5:
-  version "4.14.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
-  integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
-  dependencies:
-    caniuse-lite "^1.0.30001157"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.591"
-    escalade "^3.1.1"
-    node-releases "^1.1.66"
-
-browserslist@^4.15.0:
+browserslist@^4.14.5, browserslist@^4.15.0:
   version "4.15.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.15.0.tgz#3d48bbca6a3f378e86102ffd017d9a03f122bdb0"
   integrity sha512-IJ1iysdMkGmjjYeRlDU8PQejVwxvVO5QOfXH7ylW31GO6LwNRSmm/SgRXtNsEXqMLl2e+2H5eEJ7sfynF8TCaQ==
@@ -2314,11 +2303,6 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001157:
-  version "1.0.30001159"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz#bebde28f893fa9594dadcaa7d6b8e2aa0299df20"
-  integrity sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA==
-
 caniuse-lite@^1.0.30001164:
   version "1.0.30001165"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz#32955490d2f60290bb186bb754f2981917fa744f"
@@ -2917,11 +2901,6 @@ editorconfig@0.15.3:
     semver "^5.6.0"
     sigmund "^1.0.1"
 
-electron-to-chromium@^1.3.591:
-  version "1.3.603"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz#1b71bec27fb940eccd79245f6824c63d5f7e8abf"
-  integrity sha512-J8OHxOeJkoSLgBXfV9BHgKccgfLMHh+CoeRo6wJsi6m0k3otaxS/5vrHpMNSEYY4MISwewqanPOuhAtuE8riQQ==
-
 electron-to-chromium@^1.3.612:
   version "1.3.621"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.621.tgz#0bbe2100ef0b28f88d0b1101fbdf433312f69be0"
@@ -5414,7 +5393,7 @@ node-notifier@^8.0.0:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.66, node-releases@^1.1.67:
+node-releases@^1.1.67:
   version "1.1.67"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
   integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
@@ -7424,17 +7403,17 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.0.tgz#6f77c31522a2c525152d9c344f9765d168b3df08"
-  integrity sha512-P0bHAXmIz0zsNcHNLqFmLY1ZtrT+jtBr7FqpuDtA2o7GiHC+zBsfhgK7SmJ1HG7BAEb3G9JoMdSVi7mEDvG3Zg==
+webpack@5.10.1:
+  version "5.10.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.1.tgz#81d1853d34bef5d6e5bfa119b98a43764b26c100"
+  integrity sha512-mHu4iM2mW7d/8R91VPPNtUCNd1D8k51TTb4e0XjylapIR6WEmW8XUTBZq8TqmShj9XYxVXJn6AzKlWnrlty6DA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-module-context" "1.9.0"
-    "@webassemblyjs/wasm-edit" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
+    "@webassemblyjs/ast" "1.9.1"
+    "@webassemblyjs/helper-module-context" "1.9.1"
+    "@webassemblyjs/wasm-edit" "1.9.1"
+    "@webassemblyjs/wasm-parser" "1.9.1"
     acorn "^8.0.4"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"

From bf73be29e32503d1b65165557b3b3b378cff15ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Dec 2020 14:42:14 +0800
Subject: [PATCH 196/299] Build(deps): Bump linguist-languages from 7.12.1 to
 7.12.2 (#9887)

Bumps [linguist-languages](https://github.com/ikatyang/linguist-languages) from 7.12.1 to 7.12.2.
- [Release notes](https://github.com/ikatyang/linguist-languages/releases)
- [Commits](https://github.com/ikatyang/linguist-languages/compare/v7.12.1...v7.12.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a7164937c..502e4c2da 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "json5": "2.1.3",
     "leven": "3.1.0",
     "lines-and-columns": "1.1.6",
-    "linguist-languages": "7.12.1",
+    "linguist-languages": "7.12.2",
     "lodash": "4.17.20",
     "mem": "8.0.0",
     "meriyah": "3.1.6",
diff --git a/yarn.lock b/yarn.lock
index 52db1ac18..344845ef8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5067,10 +5067,10 @@ lines-and-columns@1.1.6, lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
-linguist-languages@7.12.1:
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/linguist-languages/-/linguist-languages-7.12.1.tgz#bf4928f25953ce3e00369cf956ac4d016923d55f"
-  integrity sha512-+2CmUIeNOvJ7MWn6MY5h7mpDcw62MjKjXKC1wH0zLYnDQnn/0/+j3LcWO0v4+M9Vh/yqbt0codmlA7Z82bDnLA==
+linguist-languages@7.12.2:
+  version "7.12.2"
+  resolved "https://registry.yarnpkg.com/linguist-languages/-/linguist-languages-7.12.2.tgz#246e22ed088a0afc4fa3b48ef4e136eb45f6703d"
+  integrity sha512-xRtwDRdTLNff0/8Gr65rJBC/lXdQwDH1/UIKFK9UvpXBEFhsgT5J7jEJMGT+IbsA3WGKJSjxuEZxakuYoToqRg==
 
 load-json-file@^2.0.0:
   version "2.0.0"

From ce6f07efe9fdbbbe21f3c17aa48fe959e4dbbaca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Dec 2020 14:43:57 +0800
Subject: [PATCH 197/299] Build(deps): Bump typescript from 4.1.2 to 4.1.3
 (#9888)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 502e4c2da..e11dfd7f7 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "resolve": "1.19.0",
     "semver": "7.3.4",
     "string-width": "4.2.0",
-    "typescript": "4.1.2",
+    "typescript": "4.1.3",
     "unicode-regex": "3.0.0",
     "unified": "9.2.0",
     "vnopts": "1.0.2",
diff --git a/yarn.lock b/yarn.lock
index 344845ef8..d2a9c0a4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7122,10 +7122,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
-  integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
+typescript@4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
+  integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
 unherit@^1.0.4:
   version "1.1.3"

From 099ba0432780fba497e8362e13448287aafd11c4 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 15 Dec 2020 12:22:56 +0800
Subject: [PATCH 198/299] TypeScript: Fix missing comments in
 `MethodDefinition` (#9872)

---
 changelog_unreleased/typescript/9872.md       | 19 +++++++++++
 src/language-js/comments.js                   |  3 +-
 src/language-js/print/function.js             | 16 +++++++---
 src/language-js/print/typescript.js           |  4 ++-
 src/language-js/printer-estree.js             |  4 ++-
 .../class/__snapshots__/jsfmt.spec.js.snap    | 32 +++++++++++++++++++
 tests/typescript/class/empty-method-body.ts   | 10 ++++++
 7 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 changelog_unreleased/typescript/9872.md
 create mode 100644 tests/typescript/class/empty-method-body.ts

diff --git a/changelog_unreleased/typescript/9872.md b/changelog_unreleased/typescript/9872.md
new file mode 100644
index 000000000..1ee6d2c9b
--- /dev/null
+++ b/changelog_unreleased/typescript/9872.md
@@ -0,0 +1,19 @@
+#### Fix missing comments in `MethodDefinition` (#9872 by @fisker)
+
+`typescript` parser only, `babel-ts` don't have this issue.
+
+<!-- prettier-ignore -->
+```typescript
+// Input
+class Foo {
+  bar() /* bat */;
+}
+
+// Prettier stable
+Error: Comment "bat" was not printed. Please report this error!
+
+// Prettier master
+class Foo {
+  bar /* bat */();
+}
+```
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index 91cd34ffa..98b1e760a 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -531,7 +531,8 @@ function handleCommentInEmptyParens({ comment, enclosingNode, text }) {
   }
   if (
     enclosingNode &&
-    enclosingNode.type === "MethodDefinition" &&
+    (enclosingNode.type === "MethodDefinition" ||
+      enclosingNode.type === "TSAbstractMethodDefinition") &&
     getFunctionParameters(enclosingNode.value).length === 0
   ) {
     addDanglingComment(enclosingNode.value, comment);
diff --git a/src/language-js/print/function.js b/src/language-js/print/function.js
index df4ee059b..5037c16ba 100644
--- a/src/language-js/print/function.js
+++ b/src/language-js/print/function.js
@@ -95,12 +95,19 @@ function printMethod(path, options, print) {
 
   parts.push(
     printPropertyKey(path, options, print),
-    node.optional || node.key.optional ? "?" : "",
-    node === value
-      ? printMethodInternal(path, options, print)
-      : path.call((path) => printMethodInternal(path, options, print), "value")
+    node.optional || node.key.optional ? "?" : ""
   );
 
+  if (node === value) {
+    parts.push(printMethodInternal(path, options, print));
+  } else if (value.type === "FunctionExpression") {
+    parts.push(
+      path.call((path) => printMethodInternal(path, options, print), "value")
+    );
+  } else {
+    parts.push(path.call(print, "value"));
+  }
+
   return concat(parts);
 }
 
@@ -371,5 +378,6 @@ module.exports = {
   printMethod,
   printReturnStatement,
   printThrowStatement,
+  printMethodInternal,
   shouldPrintParamsWithoutParens,
 };
diff --git a/src/language-js/print/typescript.js b/src/language-js/print/typescript.js
index 10724d858..77c67791f 100644
--- a/src/language-js/print/typescript.js
+++ b/src/language-js/print/typescript.js
@@ -34,7 +34,7 @@ const {
   printTypeParameters,
 } = require("./type-parameters");
 const { printPropertyKey } = require("./property");
-const { printFunctionDeclaration } = require("./function");
+const { printFunctionDeclaration, printMethodInternal } = require("./function");
 const { printInterface } = require("./interface");
 const { printAssignmentRight } = require("./assignment");
 const { printBlock } = require("./block");
@@ -546,6 +546,8 @@ function printTypescript(path, options, print) {
       ]);
     case "TSTypeAnnotation":
       return path.call(print, "typeAnnotation");
+    case "TSEmptyBodyFunctionExpression":
+      return printMethodInternal(path, options, print);
 
     // These are not valid TypeScript. Printing them just for the sake of error recovery.
     case "TSJSDocAllType":
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 8e9020e7f..7dff1ad22 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -1276,7 +1276,9 @@ function canAttachComment(node) {
     !isLineComment(node) &&
     node.type !== "EmptyStatement" &&
     node.type !== "TemplateElement" &&
-    node.type !== "Import"
+    node.type !== "Import" &&
+    // `babel-ts` don't have similar node for `class Foo { bar() /* bat */; }`
+    node.type !== "TSEmptyBodyFunctionExpression"
   );
 }
 
diff --git a/tests/typescript/class/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/class/__snapshots__/jsfmt.spec.js.snap
index a13784235..4b4f2a713 100644
--- a/tests/typescript/class/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/class/__snapshots__/jsfmt.spec.js.snap
@@ -72,6 +72,38 @@ class F<__T> {}
 ================================================================================
 `;
 
+exports[`empty-method-body.ts format 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// #9324
+
+class foo1 {
+  bar() /* bat */;
+}
+
+// #9367
+class Test {
+  foo (/* 2 */) /* 3 */;
+}
+
+=====================================output=====================================
+// #9324
+
+class foo1 {
+  bar /* bat */();
+}
+
+// #9367
+class Test {
+  foo /* 3 */(/* 2 */);
+}
+
+================================================================================
+`;
+
 exports[`extends_implements.ts format 1`] = `
 ====================================options=====================================
 parsers: ["typescript"]
diff --git a/tests/typescript/class/empty-method-body.ts b/tests/typescript/class/empty-method-body.ts
new file mode 100644
index 000000000..426eab724
--- /dev/null
+++ b/tests/typescript/class/empty-method-body.ts
@@ -0,0 +1,10 @@
+// #9324
+
+class foo1 {
+  bar() /* bat */;
+}
+
+// #9367
+class Test {
+  foo (/* 2 */) /* 3 */;
+}

From 89402482ee6b1e966eb4e0ff41a45af9c5382843 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 15 Dec 2020 12:23:40 +0800
Subject: [PATCH 199/299] Consistent `Jsx` case in variables (#9871)

---
 .eslintrc.yml                                 |  3 +-
 .../index.js                                  |  1 +
 .../jsx-identifier-case.js                    | 46 +++++++++++++++++++
 src/language-js/comments.js                   |  4 +-
 src/language-js/print/binaryish.js            | 10 ++--
 src/language-js/print/call-arguments.js       |  4 +-
 src/language-js/print/function.js             |  4 +-
 src/language-js/print/jsx.js                  | 42 ++++++++---------
 src/language-js/print/statement.js            |  8 ++--
 src/language-js/print/ternary.js              | 14 +++---
 src/language-js/printer-estree.js             |  4 +-
 src/language-js/utils.js                      | 30 ++++++------
 12 files changed, 109 insertions(+), 61 deletions(-)
 create mode 100644 scripts/tools/eslint-plugin-prettier-internal-rules/jsx-identifier-case.js

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 4b4ebfc6e..07ed97f37 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -13,7 +13,6 @@ plugins:
 settings:
   import/internal-regex: ^linguist-languages/
 rules:
-  prettier-internal-rules/require-json-extensions: error
   curly: error
   dot-notation: error
   eqeqeq:
@@ -52,6 +51,8 @@ rules:
   prefer-object-spread: error
   prefer-rest-params: error
   prefer-spread: error
+  prettier-internal-rules/jsx-identifier-case: error
+  prettier-internal-rules/require-json-extensions: error
   quotes:
     - error
     - double
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
index 412f6a982..3dffdeef9 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
@@ -4,6 +4,7 @@ module.exports = {
   rules: {
     "better-parent-property-check-in-needs-parens": require("./better-parent-property-check-in-needs-parens"),
     "directly-loc-start-end": require("./directly-loc-start-end"),
+    "jsx-identifier-case": require("./jsx-identifier-case"),
     "no-node-comments": require("./no-node-comments"),
     "prefer-fast-path-each": require("./prefer-fast-path-each"),
     "require-json-extensions": require("./require-json-extensions"),
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/jsx-identifier-case.js b/scripts/tools/eslint-plugin-prettier-internal-rules/jsx-identifier-case.js
new file mode 100644
index 000000000..c1063a416
--- /dev/null
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/jsx-identifier-case.js
@@ -0,0 +1,46 @@
+"use strict";
+
+const MESSAGE_ID = "jsx-identifier-case";
+
+// To ignore variables, config eslint like this
+// {'prettier-internal-rules/jsx-identifier-case': ['error', 'name1', ... 'nameN']}
+
+module.exports = {
+  meta: {
+    type: "suggestion",
+    docs: {
+      url:
+        "https://github.com/prettier/prettier/blob/master/scripts/eslint-plugin-prettier-internal-rules/jsx-identifier-case.js",
+    },
+    messages: {
+      [MESSAGE_ID]: "Please rename '{{name}}' to '{{fixed}}'.",
+    },
+    fixable: "code",
+  },
+  create(context) {
+    const ignored = new Set(context.options);
+    return {
+      "Identifier[name=/JSX/]:not(ObjectExpression > Property.properties > .key)"(
+        node
+      ) {
+        const { name } = node;
+
+        if (ignored.has(name)) {
+          return;
+        }
+
+        const fixed = name.replace(/JSX/g, "Jsx");
+        context.report({
+          node,
+          messageId: MESSAGE_ID,
+          data: { name, fixed },
+          fix: (fixer) => fixer.replaceText(node, fixed),
+        });
+      },
+    };
+  },
+  schema: {
+    type: "array",
+    uniqueItems: true,
+  },
+};
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index 98b1e760a..128026d41 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -15,7 +15,7 @@ const {
   isBlockComment,
   getFunctionParameters,
   isPrettierIgnoreComment,
-  isJSXNode,
+  isJsxNode,
   hasFlowShorthandAnnotationComment,
   hasFlowAnnotationComment,
   hasIgnoreComment,
@@ -956,7 +956,7 @@ function willPrintOwnComments(path /*, options */) {
 
   return (
     ((node &&
-      (isJSXNode(node) ||
+      (isJsxNode(node) ||
         hasFlowShorthandAnnotationComment(node) ||
         (parent &&
           (parent.type === "CallExpression" ||
diff --git a/src/language-js/print/binaryish.js b/src/language-js/print/binaryish.js
index a1c736d88..4caa4725f 100644
--- a/src/language-js/print/binaryish.js
+++ b/src/language-js/print/binaryish.js
@@ -9,7 +9,7 @@ const {
 const {
   hasLeadingOwnLineComment,
   isBinaryish,
-  isJSXNode,
+  isJsxNode,
   shouldFlatten,
   hasComment,
   CommentCheckFlags,
@@ -127,7 +127,7 @@ function printBinaryishExpression(path, options, print) {
   //     </Foo>
   //   )
 
-  const hasJSX = isJSXNode(n.right);
+  const hasJsx = isJsxNode(n.right);
 
   const firstGroupIndex = parts.findIndex(
     (part) => typeof part !== "string" && part.type === "group"
@@ -139,7 +139,7 @@ function printBinaryishExpression(path, options, print) {
     firstGroupIndex === -1 ? 1 : firstGroupIndex + 1
   );
 
-  const rest = concat(parts.slice(headParts.length, hasJSX ? -1 : undefined));
+  const rest = concat(parts.slice(headParts.length, hasJsx ? -1 : undefined));
 
   const groupId = Symbol("logicalChain-" + ++uid);
 
@@ -154,7 +154,7 @@ function printBinaryishExpression(path, options, print) {
     { id: groupId }
   );
 
-  if (!hasJSX) {
+  if (!hasJsx) {
     return chain;
   }
 
@@ -302,7 +302,7 @@ function shouldInlineLogicalExpression(node) {
     return true;
   }
 
-  if (isJSXNode(node.right)) {
+  if (isJsxNode(node.right)) {
     return true;
   }
 
diff --git a/src/language-js/print/call-arguments.js b/src/language-js/print/call-arguments.js
index d5c943eb0..24c8e9221 100644
--- a/src/language-js/print/call-arguments.js
+++ b/src/language-js/print/call-arguments.js
@@ -12,7 +12,7 @@ const {
   hasComment,
   CommentCheckFlags,
   isFunctionCompositionArgs,
-  isJSXNode,
+  isJsxNode,
   isLongCurriedCallExpression,
   shouldPrintComma,
   getCallArguments,
@@ -263,7 +263,7 @@ function couldGroupArg(arg) {
         arg.body.type === "CallExpression" ||
         arg.body.type === "OptionalCallExpression" ||
         arg.body.type === "ConditionalExpression" ||
-        isJSXNode(arg.body)))
+        isJsxNode(arg.body)))
   );
 }
 
diff --git a/src/language-js/print/function.js b/src/language-js/print/function.js
index 5037c16ba..18c8e513c 100644
--- a/src/language-js/print/function.js
+++ b/src/language-js/print/function.js
@@ -13,7 +13,7 @@ const {
   getFunctionParameters,
   hasLeadingOwnLineComment,
   isFlowAnnotationComment,
-  isJSXNode,
+  isJsxNode,
   isTemplateOnItsOwnLine,
   shouldPrintComma,
   startsWithNoLookaheadToken,
@@ -190,7 +190,7 @@ function printArrowFunctionExpression(path, options, print, args) {
     (n.body.type === "ArrayExpression" ||
       n.body.type === "ObjectExpression" ||
       n.body.type === "BlockStatement" ||
-      isJSXNode(n.body) ||
+      isJsxNode(n.body) ||
       isTemplateOnItsOwnLine(n.body, options.originalText) ||
       n.body.type === "ArrowFunctionExpression" ||
       n.body.type === "DoExpression")
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index c2a621527..09d55e22b 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -20,10 +20,10 @@ const {
 
 const { getLast, getPreferredQuote } = require("../../common/util");
 const {
-  isEmptyJSXElement,
-  isJSXWhitespaceExpression,
-  isJSXNode,
-  isMeaningfulJSXText,
+  isEmptyJsxElement,
+  isJsxWhitespaceExpression,
+  isJsxNode,
+  isMeaningfulJsxText,
   matchJsxWhitespaceRegex,
   rawText,
   isLiteral,
@@ -54,7 +54,7 @@ const { willPrintOwnComments } = require("../comments");
 function printJsxElementInternal(path, options, print) {
   const n = path.getValue();
 
-  if (n.type === "JSXElement" && isEmptyJSXElement(n)) {
+  if (n.type === "JSXElement" && isEmptyJsxElement(n)) {
     return concat([
       path.call(print, "openingElement"),
       path.call(print, "closingElement"),
@@ -87,7 +87,7 @@ function printJsxElementInternal(path, options, print) {
   // This makes it easy to turn them into `jsxWhitespace` which
   // can then print as either a space or `{" "}` when breaking.
   n.children = n.children.map((child) => {
-    if (isJSXWhitespaceExpression(child)) {
+    if (isJsxWhitespaceExpression(child)) {
       return {
         type: "JSXText",
         value: " ",
@@ -97,7 +97,7 @@ function printJsxElementInternal(path, options, print) {
     return child;
   });
 
-  const containsTag = n.children.filter(isJSXNode).length > 0;
+  const containsTag = n.children.filter(isJsxNode).length > 0;
   const containsMultipleExpressions =
     n.children.filter((child) => child.type === "JSXExpressionContainer")
       .length > 1;
@@ -123,7 +123,7 @@ function printJsxElementInternal(path, options, print) {
     n.openingElement.name &&
     n.openingElement.name.name === "fbt";
 
-  const children = printJSXChildren(
+  const children = printJsxChildren(
     path,
     options,
     print,
@@ -131,7 +131,7 @@ function printJsxElementInternal(path, options, print) {
     isFacebookTranslationTag
   );
 
-  const containsText = n.children.some((child) => isMeaningfulJSXText(child));
+  const containsText = n.children.some((child) => isMeaningfulJsxText(child));
 
   // We can end up we multiple whitespace elements with empty string
   // content between them.
@@ -143,15 +143,15 @@ function printJsxElementInternal(path, options, print) {
       children[i] === hardline &&
       children[i + 1] === "" &&
       children[i + 2] === hardline;
-    const isLineFollowedByJSXWhitespace =
+    const isLineFollowedByJsxWhitespace =
       (children[i] === softline || children[i] === hardline) &&
       children[i + 1] === "" &&
       children[i + 2] === jsxWhitespace;
-    const isJSXWhitespaceFollowedByLine =
+    const isJsxWhitespaceFollowedByLine =
       children[i] === jsxWhitespace &&
       children[i + 1] === "" &&
       (children[i + 2] === softline || children[i + 2] === hardline);
-    const isDoubleJSXWhitespace =
+    const isDoubleJsxWhitespace =
       children[i] === jsxWhitespace &&
       children[i + 1] === "" &&
       children[i + 2] === jsxWhitespace;
@@ -166,12 +166,12 @@ function printJsxElementInternal(path, options, print) {
     if (
       (isPairOfHardlines && containsText) ||
       isPairOfEmptyStrings ||
-      isLineFollowedByJSXWhitespace ||
-      isDoubleJSXWhitespace ||
+      isLineFollowedByJsxWhitespace ||
+      isDoubleJsxWhitespace ||
       isPairOfHardOrSoftLines
     ) {
       children.splice(i, 2);
-    } else if (isJSXWhitespaceFollowedByLine) {
+    } else if (isJsxWhitespaceFollowedByLine) {
       children.splice(i + 1, 2);
     }
   }
@@ -270,7 +270,7 @@ function printJsxElementInternal(path, options, print) {
 // This requires that we give it an array of alternating
 // content and whitespace elements.
 // To ensure this we add dummy `""` content elements as needed.
-function printJSXChildren(
+function printJsxChildren(
   path,
   options,
   print,
@@ -286,7 +286,7 @@ function printJSXChildren(
       const text = rawText(child);
 
       // Contains a non-whitespace character
-      if (isMeaningfulJSXText(child)) {
+      if (isMeaningfulJsxText(child)) {
         const words = text.split(matchJsxWhitespaceRegex);
 
         // Starts with whitespace
@@ -371,7 +371,7 @@ function printJSXChildren(
 
       const next = n.children[i + 1];
       const directlyFollowedByMeaningfulText =
-        next && isMeaningfulJSXText(next);
+        next && isMeaningfulJsxText(next);
       if (directlyFollowedByMeaningfulText) {
         const firstWord = rawText(next)
           .trim()
@@ -433,7 +433,7 @@ function separatorWithWhitespace(
   return hardline;
 }
 
-function maybeWrapJSXElementInParens(path, elem, options) {
+function maybeWrapJsxElementInParens(path, elem, options) {
   const parent = path.getParentNode();
   /* istanbul ignore next */
   if (!parent) {
@@ -519,7 +519,7 @@ function printJsxExpressionContainer(path, options, print) {
         n.expression.type === "TemplateLiteral" ||
         n.expression.type === "TaggedTemplateExpression" ||
         n.expression.type === "DoExpression" ||
-        (isJSXNode(parent) &&
+        (isJsxNode(parent) &&
           (n.expression.type === "ConditionalExpression" ||
             isBinaryish(n.expression)))));
 
@@ -685,7 +685,7 @@ function printJsxElement(path, options, print) {
     () => printJsxElementInternal(path, options, print),
     options
   );
-  return maybeWrapJSXElementInParens(path, elem, options);
+  return maybeWrapJsxElementInParens(path, elem, options);
 }
 
 function printJsxEmptyExpression(path, options /*, print*/) {
diff --git a/src/language-js/print/statement.js b/src/language-js/print/statement.js
index 427a65295..e95592c3f 100644
--- a/src/language-js/print/statement.js
+++ b/src/language-js/print/statement.js
@@ -10,9 +10,9 @@ const {
   classPropMayCauseASIProblems,
   getLeftSidePathName,
   hasNakedLeftSide,
-  isJSXNode,
+  isJsxNode,
   isLastStatement,
-  isTheOnlyJSXElementInMarkdown,
+  isTheOnlyJsxElementInMarkdown,
   hasComment,
   CommentCheckFlags,
 } = require("../utils");
@@ -46,7 +46,7 @@ function printStatement({ path, index, bodyNode, isClass }, options, print) {
   if (
     !options.semi &&
     !isClass &&
-    !isTheOnlyJSXElementInMarkdown(options, path) &&
+    !isTheOnlyJsxElementInMarkdown(options, path) &&
     statementNeedsASIProtection(path, options)
   ) {
     if (hasComment(node, CommentCheckFlags.Leading)) {
@@ -130,7 +130,7 @@ function expressionNeedsASIProtection(path, options) {
       (node.operator === "+" || node.operator === "-")) ||
     node.type === "TemplateLiteral" ||
     node.type === "TemplateElement" ||
-    isJSXNode(node) ||
+    isJsxNode(node) ||
     (node.type === "BindExpression" && !node.object) ||
     node.type === "RegExpLiteral" ||
     (node.type === "Literal" && node.pattern) ||
diff --git a/src/language-js/print/ternary.js b/src/language-js/print/ternary.js
index 43da1f587..031a9dc18 100644
--- a/src/language-js/print/ternary.js
+++ b/src/language-js/print/ternary.js
@@ -2,7 +2,7 @@
 
 const flat = require("lodash/flatten");
 const { hasNewlineInRange } = require("../../common/util");
-const { isJSXNode, isBlockComment, getComments } = require("../utils");
+const { isJsxNode, isBlockComment, getComments } = require("../utils");
 const { locStart, locEnd } = require("../loc");
 const {
   builders: {
@@ -116,8 +116,8 @@ function getConditionalChainContents(node) {
   return nonConditionalExpressions;
 }
 
-function conditionalExpressionChainContainsJSX(node) {
-  return getConditionalChainContents(node).some(isJSXNode);
+function conditionalExpressionChainContainsJsx(node) {
+  return getConditionalChainContents(node).some(isJsxNode);
 }
 
 function printTernaryTest(path, options, print) {
@@ -210,10 +210,10 @@ function printTernary(path, options, print) {
 
   if (
     isConditionalExpression &&
-    (isJSXNode(node[testNodePropertyNames[0]]) ||
-      isJSXNode(consequentNode) ||
-      isJSXNode(alternateNode) ||
-      conditionalExpressionChainContainsJSX(lastConditionalParent))
+    (isJsxNode(node[testNodePropertyNames[0]]) ||
+      isJsxNode(consequentNode) ||
+      isJsxNode(alternateNode) ||
+      conditionalExpressionChainContainsJsx(lastConditionalParent))
   ) {
     jsxMode = true;
     forceNoIndent = true;
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 7dff1ad22..7ca7d9412 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -43,7 +43,7 @@ const {
   isExportDeclaration,
   isFunctionNotation,
   isGetterOrSetter,
-  isTheOnlyJSXElementInMarkdown,
+  isTheOnlyJsxElementInMarkdown,
   isBlockComment,
   isLineComment,
   needsHardlineAfterDanglingComment,
@@ -321,7 +321,7 @@ function printPathNoParens(path, options, print, args) {
       // Do not append semicolon after the only JSX element in a program
       return concat([
         path.call(print, "expression"),
-        isTheOnlyJSXElementInMarkdown(options, path) ? "" : semi,
+        isTheOnlyJsxElementInMarkdown(options, path) ? "" : semi,
       ]);
     // Babel non-standard node. Used for Closure-style type casts. See postprocess.js.
     case "ParenthesizedExpression": {
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index fb3a2acc9..91ca8a82c 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -318,18 +318,18 @@ function isAngularTestWrapper(node) {
  * @param {Node} node
  * @returns {boolean}
  */
-function isJSXNode(node) {
+function isJsxNode(node) {
   return node.type === "JSXElement" || node.type === "JSXFragment";
 }
 
-function isTheOnlyJSXElementInMarkdown(options, path) {
+function isTheOnlyJsxElementInMarkdown(options, path) {
   if (options.parentParser !== "markdown" && options.parentParser !== "mdx") {
     return false;
   }
 
   const node = path.getNode();
 
-  if (!node.expression || !isJSXNode(node.expression)) {
+  if (!node.expression || !isJsxNode(node.expression)) {
     return false;
   }
 
@@ -339,7 +339,7 @@ function isTheOnlyJSXElementInMarkdown(options, path) {
 }
 
 // Detect an expression node representing `{" "}`
-function isJSXWhitespaceExpression(node) {
+function isJsxWhitespaceExpression(node) {
   return (
     node.type === "JSXExpressionContainer" &&
     isLiteral(node.expression) &&
@@ -744,7 +744,7 @@ const containsNonJsxWhitespaceRegex = new RegExp(
  * @param {Node} node
  * @returns {boolean}
  */
-function isMeaningfulJSXText(node) {
+function isMeaningfulJsxText(node) {
   return (
     isLiteral(node) &&
     (containsNonJsxWhitespaceRegex.test(rawText(node)) ||
@@ -759,7 +759,7 @@ function isMeaningfulJSXText(node) {
 function hasJsxIgnoreComment(path) {
   const node = path.getValue();
   const parent = path.getParentNode();
-  if (!parent || !node || !isJSXNode(node) || !isJSXNode(parent)) {
+  if (!parent || !node || !isJsxNode(node) || !isJsxNode(parent)) {
     return false;
   }
 
@@ -768,7 +768,7 @@ function hasJsxIgnoreComment(path) {
   let prevSibling = null;
   for (let i = index; i > 0; i--) {
     const candidate = parent.children[i - 1];
-    if (candidate.type === "JSXText" && !isMeaningfulJSXText(candidate)) {
+    if (candidate.type === "JSXText" && !isMeaningfulJsxText(candidate)) {
       continue;
     }
     prevSibling = candidate;
@@ -787,7 +787,7 @@ function hasJsxIgnoreComment(path) {
  * @param {JSXElement} node
  * @returns {boolean}
  */
-function isEmptyJSXElement(node) {
+function isEmptyJsxElement(node) {
   if (node.children.length === 0) {
     return true;
   }
@@ -798,7 +798,7 @@ function isEmptyJSXElement(node) {
   // if there is one text child and does not contain any meaningful text
   // we can treat the element as empty.
   const child = node.children[0];
-  return isLiteral(child) && !isMeaningfulJSXText(child);
+  return isLiteral(child) && !isMeaningfulJsxText(child);
 }
 
 /**
@@ -846,7 +846,7 @@ function isFlowAnnotationComment(text, typeAnnotation) {
  * @returns {boolean}
  */
 function hasLeadingOwnLineComment(text, node) {
-  if (isJSXNode(node)) {
+  if (isJsxNode(node)) {
     return hasNodeIgnoreComment(node);
   }
 
@@ -1529,7 +1529,7 @@ module.exports = {
   isLineComment,
   isPrettierIgnoreComment,
   isCallOrOptionalCallExpression,
-  isEmptyJSXElement,
+  isEmptyJsxElement,
   isExportDeclaration,
   isFlowAnnotationComment,
   isFunctionCompositionArgs,
@@ -1537,13 +1537,13 @@ module.exports = {
   isFunctionOrArrowExpression,
   isGetterOrSetter,
   isJestEachTemplateLiteral,
-  isJSXNode,
-  isJSXWhitespaceExpression,
+  isJsxNode,
+  isJsxWhitespaceExpression,
   isLastStatement,
   isLiteral,
   isLongCurriedCallExpression,
   isSimpleCallArgument,
-  isMeaningfulJSXText,
+  isMeaningfulJsxText,
   isMemberExpressionChain,
   isMemberish,
   isNumericLiteral,
@@ -1556,7 +1556,7 @@ module.exports = {
   isStringPropSafeToUnquote,
   isTemplateOnItsOwnLine,
   isTestCall,
-  isTheOnlyJSXElementInMarkdown,
+  isTheOnlyJsxElementInMarkdown,
   isTSXFile,
   isTypeAnnotationAFunction,
   matchJsxWhitespaceRegex,

From cc9460950de58324010ada0305d6c46426a3e32d Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 15 Dec 2020 12:24:13 +0800
Subject: [PATCH 200/299] Fix inconsistent directive print (#9850)

---
 changelog_unreleased/javascript/9850.md       | 31 ++++++++++
 src/language-js/print/block.js                |  3 +-
 src/language-js/printer-estree.js             |  4 +-
 .../semi/__snapshots__/jsfmt.spec.js.snap     | 62 +++++++++++++++++++
 tests/js/ignore/semi/directive.js             |  9 +++
 tests/js/ignore/semi/jsfmt.spec.js            |  2 +
 6 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 changelog_unreleased/javascript/9850.md
 create mode 100644 tests/js/ignore/semi/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/js/ignore/semi/directive.js
 create mode 100644 tests/js/ignore/semi/jsfmt.spec.js

diff --git a/changelog_unreleased/javascript/9850.md b/changelog_unreleased/javascript/9850.md
new file mode 100644
index 000000000..313a6c192
--- /dev/null
+++ b/changelog_unreleased/javascript/9850.md
@@ -0,0 +1,31 @@
+#### Fix extra semicolon added to ignored directives (#9850 by @fisker)
+
+<!-- prettier-ignore -->
+```js
+// Input
+// prettier-ignore
+'use strict';
+
+function foo() {
+// prettier-ignore
+"use strict";;
+}
+
+// Prettier stable
+// prettier-ignore
+'use strict';;
+
+function foo() {
+  // prettier-ignore
+  "use strict";;
+}
+
+// Prettier master
+// prettier-ignore
+'use strict';
+
+function foo() {
+  // prettier-ignore
+  "use strict";
+}
+```
diff --git a/src/language-js/print/block.js b/src/language-js/print/block.js
index aacffab1e..8ba45a4ce 100644
--- a/src/language-js/print/block.js
+++ b/src/language-js/print/block.js
@@ -15,7 +15,6 @@ const { printStatementSequence } = require("./statement");
 function printBlock(path, options, print) {
   const n = path.getValue();
   const parts = [];
-  const semi = options.semi ? ";" : "";
   const naked = path.call((bodyPath) => {
     return printStatementSequence(bodyPath, options, print);
   }, "body");
@@ -56,7 +55,7 @@ function printBlock(path, options, print) {
   // Babel 6
   if (hasDirectives) {
     path.each((childPath) => {
-      parts.push(indent(concat([hardline, print(childPath), semi])));
+      parts.push(indent(concat([hardline, print(childPath)])));
       if (isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)) {
         parts.push(hardline);
       }
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 7ca7d9412..1f85d0954 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -268,7 +268,7 @@ function printPathNoParens(path, options, print, args) {
       if (n.directives) {
         const directivesCount = n.directives.length;
         path.each((childPath, index) => {
-          parts.push(print(childPath), semi, hardline);
+          parts.push(print(childPath), hardline);
           if (
             (index < directivesCount - 1 || hasContents) &&
             isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)
@@ -559,7 +559,7 @@ function printPathNoParens(path, options, print, args) {
       }
       return nodeStr(n, options);
     case "Directive":
-      return path.call(print, "value"); // Babel 6
+      return concat([path.call(print, "value"), semi]); // Babel 6
     case "DirectiveLiteral":
       return nodeStr(n, options);
     case "UnaryExpression":
diff --git a/tests/js/ignore/semi/__snapshots__/jsfmt.spec.js.snap b/tests/js/ignore/semi/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..e836b8979
--- /dev/null
+++ b/tests/js/ignore/semi/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,62 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`directive.js - {"semi":false} format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+// prettier-ignore
+'use strict';
+[].forEach();
+
+function foo() {
+// prettier-ignore
+'use strict';
+[].forEach();
+}
+
+=====================================output=====================================
+// prettier-ignore
+'use strict';
+;[].forEach()
+
+function foo() {
+  // prettier-ignore
+  'use strict';
+  ;[].forEach()
+}
+
+================================================================================
+`;
+
+exports[`directive.js format 1`] = `
+====================================options=====================================
+parsers: ["babel", "flow", "typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// prettier-ignore
+'use strict';
+[].forEach();
+
+function foo() {
+// prettier-ignore
+'use strict';
+[].forEach();
+}
+
+=====================================output=====================================
+// prettier-ignore
+'use strict';
+[].forEach();
+
+function foo() {
+  // prettier-ignore
+  'use strict';
+  [].forEach();
+}
+
+================================================================================
+`;
diff --git a/tests/js/ignore/semi/directive.js b/tests/js/ignore/semi/directive.js
new file mode 100644
index 000000000..03938cff3
--- /dev/null
+++ b/tests/js/ignore/semi/directive.js
@@ -0,0 +1,9 @@
+// prettier-ignore
+'use strict';
+[].forEach();
+
+function foo() {
+// prettier-ignore
+'use strict';
+[].forEach();
+}
diff --git a/tests/js/ignore/semi/jsfmt.spec.js b/tests/js/ignore/semi/jsfmt.spec.js
new file mode 100644
index 000000000..728e1ab5c
--- /dev/null
+++ b/tests/js/ignore/semi/jsfmt.spec.js
@@ -0,0 +1,2 @@
+run_spec(__dirname, ["babel", "flow", "typescript"]);
+run_spec(__dirname, ["babel", "flow", "typescript"], { semi: false });

From 2725ebee558de06f479f1488675e9d1e66b4c74a Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 15 Dec 2020 13:45:16 +0800
Subject: [PATCH 201/299] Fix unstable JSX formatting with U+3000 (#9866)

---
 changelog_unreleased/javascript/9866.md | 29 +++++++++++++++++++++++++
 src/language-js/print/jsx.js            |  7 +++---
 src/language-js/utils.js                | 12 ++++++++++
 tests/jsx/whitespace/jsfmt.spec.js      | 12 ++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 changelog_unreleased/javascript/9866.md

diff --git a/changelog_unreleased/javascript/9866.md b/changelog_unreleased/javascript/9866.md
new file mode 100644
index 000000000..72ebe84c4
--- /dev/null
+++ b/changelog_unreleased/javascript/9866.md
@@ -0,0 +1,29 @@
+#### Fix unstable JSX formatting with U+3000 (#9866 by @fisker)
+
+<!-- prettier-ignore -->
+```js
+// Input
+<p>
+  <span />　{this.props.data.title}　<span />
+  //----- ^ U+3000 --------------- ^ U+3000
+</p>
+
+// Prettier stable
+<p>
+  <span />
+  　{this.props.data.title}　<span />
+  //----- ^ U+3000 --------------- ^ U+3000
+</p>;
+
+// Prettier stable (second format)
+<p>
+  <span />　{this.props.data.title}　<span />
+  //----- ^ U+3000 --------------- ^ U+3000
+</p>;
+
+// Prettier master
+<p>
+  <span />　{this.props.data.title}　<span />
+  //----- ^ U+3000 --------------- ^ U+3000
+</p>;
+```
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index 09d55e22b..15d2bb394 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -32,6 +32,7 @@ const {
   isBinaryish,
   hasComment,
   CommentCheckFlags,
+  trimJsxWhitespace,
 } = require("../utils");
 const pathNeedsParens = require("../needs-parens");
 const { willPrintOwnComments } = require("../comments");
@@ -373,9 +374,9 @@ function printJsxChildren(
       const directlyFollowedByMeaningfulText =
         next && isMeaningfulJsxText(next);
       if (directlyFollowedByMeaningfulText) {
-        const firstWord = rawText(next)
-          .trim()
-          .split(matchJsxWhitespaceRegex)[0];
+        const firstWord = trimJsxWhitespace(rawText(next)).split(
+          matchJsxWhitespaceRegex
+        )[0];
         children.push(
           separatorNoWhitespace(
             isFacebookTranslationTag,
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index 91ca8a82c..15286cc33 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -737,6 +737,17 @@ const matchJsxWhitespaceRegex = new RegExp("([" + jsxWhitespaceChars + "]+)");
 const containsNonJsxWhitespaceRegex = new RegExp(
   "[^" + jsxWhitespaceChars + "]"
 );
+const trimJsxWhitespace = (text) =>
+  text.replace(
+    new RegExp(
+      "(?:^" +
+        matchJsxWhitespaceRegex.source +
+        "|" +
+        matchJsxWhitespaceRegex.source +
+        "$)"
+    ),
+    ""
+  );
 
 // Meaningful if it contains non-whitespace characters,
 // or it contains whitespace without a new line.
@@ -1571,4 +1582,5 @@ module.exports = {
   hasComment,
   getComments,
   CommentCheckFlags,
+  trimJsxWhitespace,
 };
diff --git a/tests/jsx/whitespace/jsfmt.spec.js b/tests/jsx/whitespace/jsfmt.spec.js
index 9d5fc32cf..e3e838ef6 100644
--- a/tests/jsx/whitespace/jsfmt.spec.js
+++ b/tests/jsx/whitespace/jsfmt.spec.js
@@ -70,6 +70,18 @@ run_spec(
           );
         `,
       },
+      {
+        code: outdent`
+          <p>
+            <span />\u3000{this.props.data.title}\u3000<span />
+          </p>
+        `,
+        output: outdent`
+          <p>
+            <span />\u3000{this.props.data.title}\u3000<span />
+          </p>;
+        `,
+      },
     ].map((test) => ({ ...test, output: test.output + "\n" })),
   },
   ["flow", "typescript"]

From e98b8eecc929e3d82b5c90c95c33ad5d91ab2fdc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 05:51:13 +0000
Subject: [PATCH 202/299] Build(deps-dev): Bump rollup from 2.34.2 to 2.35.1
 (#9891)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e11dfd7f7..78c13a37f 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "path-browserify": "1.0.1",
     "prettier": "2.2.1",
     "rimraf": "3.0.2",
-    "rollup": "2.34.2",
+    "rollup": "2.35.1",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-terser": "7.0.2",
     "shelljs": "0.8.4",
diff --git a/yarn.lock b/yarn.lock
index d2a9c0a4a..f0101999d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6328,10 +6328,10 @@ rollup-pluginutils@^2.3.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@2.34.2:
-  version "2.34.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.34.2.tgz#fa73e05c64df587e9ed4dc80d7d4e7d4a43f8908"
-  integrity sha512-mvtQLqu3cNeoctS+kZ09iOPxrc1P1/Bt1z15enuQ5feyKOdM3MJAVFjjsygurDpSWn530xB4AlA83TWIzRstXA==
+rollup@2.35.1:
+  version "2.35.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.35.1.tgz#e6bc8d10893556a638066f89e8c97f422d03968c"
+  integrity sha512-q5KxEyWpprAIcainhVy6HfRttD9kutQpHbeqDTWnqAFNJotiojetK6uqmcydNMymBEtC4I8bCYR+J3mTMqeaUA==
   optionalDependencies:
     fsevents "~2.1.2"
 

From 9a1419f9ec688c88c61271ef62f995b6a5566be8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 05:51:55 +0000
Subject: [PATCH 203/299] Build(deps): Bump @glimmer/syntax from 0.69.3 to
 0.70.0 (#9890)

---
 package.json |  2 +-
 yarn.lock    | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 78c13a37f..fb3ca01f1 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "11.0.4",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.10",
-    "@glimmer/syntax": "0.69.3",
+    "@glimmer/syntax": "0.70.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.9.1",
     "angular-estree-parser": "2.3.0",
diff --git a/yarn.lock b/yarn.lock
index f0101999d..2140d73b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1071,6 +1071,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.70.0.tgz#1a5782a12ebca787e55930db2ec310ffc23d5c9c"
+  integrity sha512-HT3Yv97f353LW2TuEJnBhyg5Ebt9Mbp0s7uedb5mOJQbUxhGG24yy0HjOHUV+HRI0yCQPZO/q7ojJgX3MAknQg==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/reference@0.69.3":
   version "0.69.3"
   resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.69.3.tgz#b229bfa44a0506e89f19fa23468de82908c78695"
@@ -1082,13 +1089,13 @@
     "@glimmer/util" "0.69.3"
     "@glimmer/validator" "0.69.3"
 
-"@glimmer/syntax@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.69.3.tgz#3613ef244935cd4f3aaac31f4ad8ca08a1c38a97"
-  integrity sha512-7LKqqnBdSFlWUh5+BfND4bS9LzCgezAYG3axHWIXZcPYuUadbnBe+0ugq8FFhIAsMF3TXk3rHHLseYo95OqwYA==
+"@glimmer/syntax@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.70.0.tgz#3b10023b84a02af7bf0ba4f3308946a5a932e603"
+  integrity sha512-1SFC2hbSfeV2IUwS2tMFljYCdZCq/CC+hw1S2boHWHG7I4yq3NdSQeYytLDB5yOuWAFE4ZGc4XRRntWjDRgGuQ==
   dependencies:
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/util" "0.69.3"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/util" "0.70.0"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
@@ -1101,6 +1108,15 @@
     "@glimmer/interfaces" "0.69.3"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.70.0.tgz#55cac3330cecb19a12fae21de918f49fe46d9f8b"
+  integrity sha512-h16boov87CGlXgu9c2O2XBx4xDMu/fEAHJh3YGUnfyPB/Tqebf4K9wUVKl5yl8AzhBeRT0+n/+vvyQhcl8vEmg==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.70.0"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.69.3":
   version "0.69.3"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.69.3.tgz#488e56463337297f85e671e575d61e7c493ef144"

From adf7718ba4ac0990d7e38f2d4e4f9e761bcdf9af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 05:56:46 +0000
Subject: [PATCH 204/299] Build(deps-dev): Bump @rollup/plugin-node-resolve
 from 11.0.0 to 11.0.1 (#9895)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fb3ca01f1..f76361918 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
     "@rollup/plugin-json": "4.1.0",
-    "@rollup/plugin-node-resolve": "11.0.0",
+    "@rollup/plugin-node-resolve": "11.0.1",
     "@rollup/plugin-replace": "2.3.4",
     "@types/estree": "0.0.45",
     "@types/node": "14.14.0",
diff --git a/yarn.lock b/yarn.lock
index 2140d73b8..b50526bb6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1400,10 +1400,10 @@
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
 
-"@rollup/plugin-node-resolve@11.0.0":
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.0.tgz#770458fb26691a686c5f29f37dded94832ffce59"
-  integrity sha512-8Hrmwjn1pLYjUxcv7U7IPP0qfnzEJWHyHE6CaZ8jbLM+8axaarJRB1jB6JgKTDp5gNga+TpsgX6F8iuvgOerKQ==
+"@rollup/plugin-node-resolve@11.0.1":
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.0.1.tgz#d3765eec4bccf960801439a999382aed2dca959b"
+  integrity sha512-ltlsj/4Bhwwhb+Nb5xCz/6vieuEj2/BAkkqVIKmZwC7pIdl8srmgmglE4S0jFlZa32K4qvdQ6NHdmpRKD/LwoQ==
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     "@types/resolve" "1.17.1"

From 2c14620ba63642a4399d30fec65247cbcb407de3 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 15 Dec 2020 14:09:44 +0800
Subject: [PATCH 205/299] Refactor: Improve JavaScript parser readability
 (#9783)

---
 cspell.json                                |   1 +
 src/language-js/parser-babel.js            | 199 ++++++++++-----------
 src/language-js/parser-espree.js           |  40 +++--
 src/language-js/parser-flow.js             |  48 ++---
 src/language-js/parser-meriyah.js          |  37 ++--
 src/language-js/parser-typescript.js       |  73 ++++----
 src/language-js/parser/try-combinations.js |  17 ++
 7 files changed, 214 insertions(+), 201 deletions(-)
 create mode 100644 src/language-js/parser/try-combinations.js

diff --git a/cspell.json b/cspell.json
index 21333bf09..84359a44a 100644
--- a/cspell.json
+++ b/cspell.json
@@ -368,6 +368,7 @@
         "TSAs",
         "tsep",
         "TSESTree",
+        "TSESTreeOptions",
         "TSJS",
         "tslib",
         "typeahead",
diff --git a/src/language-js/parser-babel.js b/src/language-js/parser-babel.js
index b26aa83b8..8a30b1bdd 100644
--- a/src/language-js/parser-babel.js
+++ b/src/language-js/parser-babel.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const flatten = require("lodash/flatten");
 const createError = require("../common/parser-create-error");
 const {
   getNextNonSpaceNonCommentCharacterIndexWithStartIndex,
@@ -8,61 +9,46 @@ const {
 const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
 const postprocess = require("./parse-postprocess");
+const tryCombinations = require("./parser/try-combinations");
 
-function babelOptions({ sourceType, extraPlugins = [] }) {
-  return {
-    sourceType,
-    allowAwaitOutsideFunction: true,
-    allowImportExportEverywhere: true,
-    allowReturnOutsideFunction: true,
-    allowSuperOutsideMethod: true,
-    allowUndeclaredExports: true,
-    errorRecovery: true,
-    createParenthesizedExpressions: true,
-    plugins: [
-      // When adding a plugin, please add a test in `tests/js/babel-plugins`,
-      // To remove plugins, remove it here and run `yarn test tests/js/babel-plugins` to verify
-
-      "doExpressions",
-      "classProperties",
-      "exportDefaultFrom",
-      "functionBind",
-      "functionSent",
-      "classPrivateProperties",
-      "throwExpressions",
-      "classPrivateMethods",
-      "v8intrinsic",
-      "partialApplication",
-      ["decorators", { decoratorsBeforeExport: false }],
-      "privateIn",
-      "importAssertions",
-      ["recordAndTuple", { syntaxType: "hash" }],
-      "decimal",
-      "moduleStringNames",
-      "classStaticBlock",
-      ...extraPlugins,
-    ],
-    tokens: true,
-    ranges: true,
-  };
-}
-
-function resolvePluginsConflict(
-  condition,
-  pluginCombinations,
-  conflictPlugins
-) {
-  if (!condition) {
-    return pluginCombinations;
-  }
-  const combinations = [];
-  for (const combination of pluginCombinations) {
-    for (const plugin of conflictPlugins) {
-      combinations.push([...combination, plugin]);
-    }
-  }
-  return combinations;
-}
+const parseOptions = {
+  sourceType: "module",
+  allowAwaitOutsideFunction: true,
+  allowImportExportEverywhere: true,
+  allowReturnOutsideFunction: true,
+  allowSuperOutsideMethod: true,
+  allowUndeclaredExports: true,
+  errorRecovery: true,
+  createParenthesizedExpressions: true,
+  plugins: [
+    // When adding a plugin, please add a test in `tests/js/babel-plugins`,
+    // To remove plugins, remove it here and run `yarn test tests/js/babel-plugins` to verify
+    "doExpressions",
+    "classProperties",
+    "exportDefaultFrom",
+    "functionBind",
+    "functionSent",
+    "classPrivateProperties",
+    "throwExpressions",
+    "classPrivateMethods",
+    "v8intrinsic",
+    "partialApplication",
+    ["decorators", { decoratorsBeforeExport: false }],
+    "privateIn",
+    "importAssertions",
+    ["recordAndTuple", { syntaxType: "hash" }],
+    "decimal",
+    "moduleStringNames",
+    "classStaticBlock",
+  ],
+  tokens: true,
+  ranges: true,
+};
+const pipelineOperatorPlugins = [
+  ["pipelineOperator", { proposal: "smart" }],
+  ["pipelineOperator", { proposal: "minimal" }],
+  ["pipelineOperator", { proposal: "fsharp" }],
+];
 
 // Similar to babel
 // https://github.com/babel/babel/pull/7934/files#diff-a739835084910b0ee3ea649df5a4d223R67
@@ -89,47 +75,67 @@ function isFlowFile(text, options) {
   return FLOW_PRAGMA_REGEX.test(text);
 }
 
+function parseWithOptions(parseMethod, text, options) {
+  // Inline the require to avoid loading all the JS if we don't use it
+  /** @type {import("@babel/parser").parse | import("@babel/parser").parseExpression} */
+  const parse = require("@babel/parser")[parseMethod];
+  const ast = parse(text, options);
+  // @ts-ignore
+  const error = ast.errors.find((error) => shouldRethrowRecoveredError(error));
+  if (error) {
+    throw error;
+  }
+  return ast;
+}
+
+function createParseError(error) {
+  // babel error prints (l:c) with cols that are zero indexed
+  // so we need our custom error
+  const { message, loc } = error;
+
+  throw createError(message.replace(/ \(.*\)/, ""), {
+    start: {
+      line: loc ? loc.line : 0,
+      column: loc ? loc.column + 1 : 0,
+    },
+  });
+}
+
 function createParse(parseMethod, ...pluginCombinations) {
+  const commonPlugins = parseOptions.plugins;
+  pluginCombinations = pluginCombinations.length
+    ? pluginCombinations.map((plugins) => [...commonPlugins, ...plugins])
+    : [commonPlugins];
+
   return (text, parsers, opts = {}) => {
     if (opts.parser === "babel" && isFlowFile(text, opts)) {
       opts.parser = "babel-flow";
       return parseFlow(text, parsers, opts);
     }
 
-    // Inline the require to avoid loading all the JS if we don't use it
-    const babel = require("@babel/parser");
+    let combinations = pluginCombinations;
+    if (text.includes("|>")) {
+      combinations = flatten(
+        pipelineOperatorPlugins.map((pipelineOperatorPlugin) =>
+          combinations.map((plugins) => [...plugins, pipelineOperatorPlugin])
+        )
+      );
+    }
 
     const sourceType =
       opts.__babelSourceType === "script" ? "script" : "module";
+    const { result: ast, error } = tryCombinations(
+      ...combinations.map((plugins) => () =>
+        parseWithOptions(parseMethod, text, {
+          ...parseOptions,
+          sourceType,
+          plugins,
+        })
+      )
+    );
 
-    let ast;
-    try {
-      const combinations = resolvePluginsConflict(
-        text.includes("|>"),
-        pluginCombinations,
-        [
-          ["pipelineOperator", { proposal: "smart" }],
-          ["pipelineOperator", { proposal: "minimal" }],
-          ["pipelineOperator", { proposal: "fsharp" }],
-        ]
-      );
-      ast = tryCombinations(
-        (options) => babel[parseMethod](text, options),
-        combinations.map((extraPlugins) =>
-          babelOptions({ sourceType, extraPlugins })
-        )
-      );
-    } catch (error) {
-      // babel error prints (l:c) with cols that are zero indexed
-      // so we need our custom error
-      const { message, loc } = error;
-
-      throw createError(message.replace(/ \(.*\)/, ""), {
-        start: {
-          line: loc ? loc.line : 0,
-          column: loc ? loc.column + 1 : 0,
-        },
-      });
+    if (!ast) {
+      throw createParseError(error);
     }
 
     return postprocess(ast, { ...opts, originalText: text });
@@ -148,20 +154,6 @@ const parseTypeScript = createParse(
 );
 const parseExpression = createParse("parseExpression", ["jsx"]);
 
-function tryCombinations(fn, combinations) {
-  let error;
-  for (let i = 0; i < combinations.length; i++) {
-    try {
-      return rethrowSomeRecoveredErrors(fn(combinations[i]));
-    } catch (_error) {
-      if (!error) {
-        error = _error;
-      }
-    }
-  }
-  throw error;
-}
-
 const messagesShouldThrow = new Set([
   // TSErrors.UnexpectedTypeAnnotation
   // https://github.com/babel/babel/blob/008fe25ae22e78288fbc637d41069bb4a1040987/packages/babel-parser/src/plugins/typescript/index.js#L95
@@ -174,21 +166,12 @@ const messagesShouldThrow = new Set([
   "Type parameters must come after the async keyword, e.g. instead of `<T> async () => {}`, use `async <T>() => {}`",
 ]);
 
-function shouldRethrow(error) {
+function shouldRethrowRecoveredError(error) {
   const [, message] = error.message.match(/(.*?)\s*\(\d+:\d+\)/);
   // Only works for literal message
   return messagesShouldThrow.has(message);
 }
 
-function rethrowSomeRecoveredErrors(ast) {
-  const error = ast.errors.find((error) => shouldRethrow(error));
-  if (error) {
-    throw error;
-  }
-
-  return ast;
-}
-
 function parseJson(text, parsers, opts) {
   const ast = parseExpression(text, parsers, opts);
 
diff --git a/src/language-js/parser-espree.js b/src/language-js/parser-espree.js
index ede9745cf..59d719f19 100644
--- a/src/language-js/parser-espree.js
+++ b/src/language-js/parser-espree.js
@@ -4,8 +4,9 @@ const createError = require("../common/parser-create-error");
 const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
 const postprocess = require("./parse-postprocess");
+const tryCombinations = require("./parser/try-combinations");
 
-const espreeOptions = {
+const parseOptions = {
   range: true,
   loc: true,
   comment: true,
@@ -18,9 +19,20 @@ const espreeOptions = {
   },
 };
 
+function createParseError(error) {
+  const { message, lineNumber, column } = error;
+
+  /* istanbul ignore next */
+  if (typeof lineNumber !== "number") {
+    throw error;
+  }
+
+  throw createError(message, { start: { line: lineNumber, column } });
+}
+
 function parse(originalText, parsers, options) {
   const { parse, latestEcmaVersion } = require("espree");
-  espreeOptions.ecmaVersion = latestEcmaVersion;
+  parseOptions.ecmaVersion = latestEcmaVersion;
 
   // Replace shebang with space
   const shebang = getShebang(originalText);
@@ -28,24 +40,14 @@ function parse(originalText, parsers, options) {
     ? " ".repeat(shebang.length) + originalText.slice(shebang.length)
     : originalText;
 
-  let ast;
+  const { result: ast, error: moduleParseError } = tryCombinations(
+    () => parse(text, { ...parseOptions, sourceType: "module" }),
+    () => parse(text, { ...parseOptions, sourceType: "script" })
+  );
 
-  try {
-    ast = parse(text, espreeOptions);
-  } catch (moduleError) {
-    try {
-      ast = parse(text, { ...espreeOptions, sourceType: "script" });
-    } catch (_) {
-      // throw the error for `module` parsing
-      const { message, lineNumber, column } = moduleError;
-
-      /* istanbul ignore next */
-      if (typeof lineNumber !== "number") {
-        throw moduleError;
-      }
-
-      throw createError(message, { start: { line: lineNumber, column } });
-    }
+  if (!ast) {
+    // throw the error for `module` parsing
+    throw createParseError(moduleParseError);
   }
 
   return postprocess(ast, { ...options, originalText });
diff --git a/src/language-js/parser-flow.js b/src/language-js/parser-flow.js
index f38494d72..e66f2e108 100644
--- a/src/language-js/parser-flow.js
+++ b/src/language-js/parser-flow.js
@@ -5,32 +5,36 @@ const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
 const postprocess = require("./parse-postprocess");
 
+const parseOptions = {
+  enums: true,
+  esproposal_decorators: true,
+  esproposal_class_instance_fields: true,
+  esproposal_class_static_fields: true,
+  esproposal_export_star_as: true,
+  esproposal_optional_chaining: true,
+  esproposal_nullish_coalescing: true,
+  tokens: true,
+};
+
+function createParseError(error) {
+  const {
+    message,
+    loc: { start, end },
+  } = error;
+
+  return createError(message, {
+    start: { line: start.line, column: start.column + 1 },
+    end: { line: end.line, column: end.column + 1 },
+  });
+}
+
 function parse(text, parsers, opts) {
   // Inline the require to avoid loading all the JS if we don't use it
-  const flowParser = require("flow-parser");
-
-  const ast = flowParser.parse(text, {
-    enums: true,
-    esproposal_decorators: true,
-    esproposal_class_instance_fields: true,
-    esproposal_class_static_fields: true,
-    esproposal_export_star_as: true,
-    esproposal_optional_chaining: true,
-    esproposal_nullish_coalescing: true,
-    tokens: true,
-  });
-
+  const { parse } = require("flow-parser");
+  const ast = parse(text, parseOptions);
   const [error] = ast.errors;
   if (error) {
-    const {
-      message,
-      loc: { start, end },
-    } = error;
-
-    throw createError(message, {
-      start: { line: start.line, column: start.column + 1 },
-      end: { line: end.line, column: end.column + 1 },
-    });
+    throw createParseError(error);
   }
 
   return postprocess(ast, { ...opts, originalText: text });
diff --git a/src/language-js/parser-meriyah.js b/src/language-js/parser-meriyah.js
index 4086ca389..960090f1e 100644
--- a/src/language-js/parser-meriyah.js
+++ b/src/language-js/parser-meriyah.js
@@ -4,6 +4,7 @@ const createError = require("../common/parser-create-error");
 const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
 const postprocess = require("./parse-postprocess");
+const tryCombinations = require("./parser/try-combinations");
 
 // https://github.com/meriyah/meriyah/blob/4676f60b6c149d7082bde2c9147f9ae2359c8075/src/parser.ts#L185
 const parseOptions = {
@@ -59,25 +60,27 @@ function parseWithOptions(text, module) {
   return ast;
 }
 
+function createParseError(error) {
+  // throw the error for `module` parsing
+  const { message, line, column } = error;
+
+  /* istanbul ignore next */
+  if (typeof line !== "number") {
+    return error;
+  }
+
+  return createError(message, { start: { line, column } });
+}
+
 function parse(text, parsers, options) {
-  let ast;
+  const { result: ast, error: moduleParseError } = tryCombinations(
+    () => parseWithOptions(text, /* module */ true),
+    () => parseWithOptions(text, /* module */ false)
+  );
 
-  try {
-    ast = parseWithOptions(text /* module */, true);
-  } catch (moduleError) {
-    try {
-      ast = parseWithOptions(text, /* module */ false);
-    } catch (_) {
-      // throw the error for `module` parsing
-      const { message, line, column } = moduleError;
-
-      /* istanbul ignore next */
-      if (typeof line !== "number") {
-        throw moduleError;
-      }
-
-      throw createError(message, { start: { line, column } });
-    }
+  if (!ast) {
+    // Throw the error for `module` parsing
+    throw createParseError(moduleParseError);
   }
 
   return postprocess(ast, { ...options, originalText: text });
diff --git a/src/language-js/parser-typescript.js b/src/language-js/parser-typescript.js
index bf60d724a..c2499f940 100644
--- a/src/language-js/parser-typescript.js
+++ b/src/language-js/parser-typescript.js
@@ -4,30 +4,49 @@ const createError = require("../common/parser-create-error");
 const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
 const postprocess = require("./parse-postprocess");
+const tryCombinations = require("./parser/try-combinations");
+
+/** @type {import("@typescript-eslint/typescript-estree").TSESTreeOptions} */
+const parseOptions = {
+  // `jest@<=26.4.2` rely on `loc`
+  // https://github.com/facebook/jest/issues/10444
+  loc: true,
+  range: true,
+  comment: true,
+  useJSXTextNode: true,
+  jsx: true,
+  tokens: true,
+  loggerFn: false,
+  project: [],
+};
+
+function createParseError(error) {
+  const { message, lineNumber, column } = error;
+
+  /* istanbul ignore next */
+  if (typeof lineNumber !== "number") {
+    return error;
+  }
+
+  return createError(message, {
+    start: { line: lineNumber, column: column + 1 },
+  });
+}
 
 function parse(text, parsers, opts) {
   const jsx = isProbablyJsx(text);
-  let result;
-  try {
+
+  const { parseWithNodeMaps } = require("@typescript-eslint/typescript-estree");
+  const { result, error: firstError } = tryCombinations(
     // Try passing with our best guess first.
-    result = tryParseTypeScript(text, jsx);
-  } catch (firstError) {
-    try {
-      // But if we get it wrong, try the opposite.
-      result = tryParseTypeScript(text, !jsx);
-    } catch (secondError) {
-      // Suppose our guess is correct, throw the first error
-      const { message, lineNumber, column } = firstError;
+    () => parseWithNodeMaps(text, { ...parseOptions, jsx }),
+    // But if we get it wrong, try the opposite.
+    () => parseWithNodeMaps(text, { ...parseOptions, jsx: !jsx })
+  );
 
-      /* istanbul ignore next */
-      if (typeof lineNumber !== "number") {
-        throw firstError;
-      }
-
-      throw createError(message, {
-        start: { line: lineNumber, column: column + 1 },
-      });
-    }
+  if (!result) {
+    // Suppose our guess is correct, throw the first error
+    throw createParseError(firstError);
   }
 
   return postprocess(result.ast, {
@@ -37,22 +56,6 @@ function parse(text, parsers, opts) {
   });
 }
 
-function tryParseTypeScript(text, jsx) {
-  const { parseWithNodeMaps } = require("@typescript-eslint/typescript-estree");
-  return parseWithNodeMaps(text, {
-    // `jest@<=26.4.2` rely on `loc`
-    // https://github.com/facebook/jest/issues/10444
-    loc: true,
-    range: true,
-    comment: true,
-    useJSXTextNode: true,
-    jsx,
-    tokens: true,
-    loggerFn: false,
-    project: [],
-  });
-}
-
 /**
  * Use a naive regular expression to detect JSX
  */
diff --git a/src/language-js/parser/try-combinations.js b/src/language-js/parser/try-combinations.js
new file mode 100644
index 000000000..f7edd9e48
--- /dev/null
+++ b/src/language-js/parser/try-combinations.js
@@ -0,0 +1,17 @@
+"use strict";
+
+function tryCombinations(...combinations) {
+  let firstError;
+  for (const [index, fn] of combinations.entries()) {
+    try {
+      return { result: fn() };
+    } catch (error) {
+      if (index === 0) {
+        firstError = error;
+      }
+    }
+  }
+  return { error: firstError };
+}
+
+module.exports = tryCombinations;

From c2d75d087f4a54b1275f8b4fadf7dba6e6115a1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 07:57:04 +0000
Subject: [PATCH 206/299] Build(deps-dev): Bump @typescript-eslint/types from
 4.9.1 to 4.10.0 (#9894)

---
 package.json | 2 +-
 yarn.lock    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f76361918..f4c0755fc 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@rollup/plugin-replace": "2.3.4",
     "@types/estree": "0.0.45",
     "@types/node": "14.14.0",
-    "@typescript-eslint/types": "4.9.1",
+    "@typescript-eslint/types": "4.10.0",
     "babel-jest": "26.6.3",
     "babel-loader": "8.2.2",
     "benchmark": "2.1.4",
diff --git a/yarn.lock b/yarn.lock
index b50526bb6..39f6bfc5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1639,6 +1639,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2"
   integrity sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg==
 
+"@typescript-eslint/types@4.10.0":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.10.0.tgz#12f983750ebad867f0c806e705c1953cd6415789"
+  integrity sha512-+dt5w1+Lqyd7wIPMa4XhJxUuE8+YF+vxQ6zxHyhLGHJjHiunPf0wSV8LtQwkpmAsRi1lEOoOIR30FG5S2HS33g==
+
 "@typescript-eslint/types@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.1.tgz#a1a7dd80e4e5ac2c593bc458d75dd1edaf77faa2"

From 92014b079cf212ce2ec5fbd043ae695c07618c7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 08:04:03 +0000
Subject: [PATCH 207/299] Build(deps): Bump
 @typescript-eslint/typescript-estree (#9892)

---
 package.json |  2 +-
 yarn.lock    | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index f4c0755fc..27082f0c7 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@babel/parser": "7.12.10",
     "@glimmer/syntax": "0.70.0",
     "@iarna/toml": "2.2.5",
-    "@typescript-eslint/typescript-estree": "4.9.1",
+    "@typescript-eslint/typescript-estree": "4.10.0",
     "angular-estree-parser": "2.3.0",
     "angular-html-parser": "1.7.1",
     "camelcase": "6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 39f6bfc5a..437c9f0c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1663,13 +1663,13 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@4.9.1":
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.9.1.tgz#6e5b86ff5a5f66809e1f347469fadeec69ac50bf"
-  integrity sha512-bzP8vqwX6Vgmvs81bPtCkLtM/Skh36NE6unu6tsDeU/ZFoYthlTXbBmpIrvosgiDKlWTfb2ZpPELHH89aQjeQw==
+"@typescript-eslint/typescript-estree@4.10.0":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.10.0.tgz#1e62e45fd57866afd42daf5e9fb6bd4e8dbcfa75"
+  integrity sha512-mGK0YRp9TOk6ZqZ98F++bW6X5kMTzCRROJkGXH62d2azhghmq+1LNLylkGe6uGUOQzD452NOAEth5VAF6PDo5g==
   dependencies:
-    "@typescript-eslint/types" "4.9.1"
-    "@typescript-eslint/visitor-keys" "4.9.1"
+    "@typescript-eslint/types" "4.10.0"
+    "@typescript-eslint/visitor-keys" "4.10.0"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
@@ -1685,12 +1685,12 @@
     "@typescript-eslint/types" "4.0.1"
     eslint-visitor-keys "^2.0.0"
 
-"@typescript-eslint/visitor-keys@4.9.1":
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.9.1.tgz#d76374a58c4ead9e92b454d186fea63487b25ae1"
-  integrity sha512-9gspzc6UqLQHd7lXQS7oWs+hrYggspv/rk6zzEMhCbYwPE/sF7oxo7GAjkS35Tdlt7wguIG+ViWCPtVZHz/ybQ==
+"@typescript-eslint/visitor-keys@4.10.0":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.10.0.tgz#9478822329a9bc8ebcc80623d7f79a01da5ee451"
+  integrity sha512-hPyz5qmDMuZWFtHZkjcCpkAKHX8vdu1G3YsCLEd25ryZgnJfj6FQuJ5/O7R+dB1ueszilJmAFMtlU4CA6se3Jg==
   dependencies:
-    "@typescript-eslint/types" "4.9.1"
+    "@typescript-eslint/types" "4.10.0"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.9.1":

From 88c0c9a1f5e2c175b5f6199db7ca160a54ef056b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 08:32:29 +0000
Subject: [PATCH 208/299] Build(deps-dev): Bump @glimmer/reference from 0.69.3
 to 0.70.0 (#9893)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++---------------------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index 27082f0c7..9124d87c6 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.10",
     "@babel/types": "7.12.10",
-    "@glimmer/reference": "0.69.3",
+    "@glimmer/reference": "0.70.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index 437c9f0c3..93b1b62e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1057,20 +1057,13 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.69.3.tgz#d38bae41e6dcc248f264fecbce99f997f57a88d7"
-  integrity sha512-QFkVRGVaduy9yQwaN/oB54M5wpLXLuIOhcrcfT9cBDwAOuMO5EWT+jffQ958RH6XNg8dpnL5ut233v7SxM9SJg==
+"@glimmer/global-context@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.70.0.tgz#1212b34a92955107458ffe03976175ed6a2f7a37"
+  integrity sha512-uszWyrUI8AntyfMJFQc41CbsbNV3byiz2sknvQh2XE9vDEI1tKmSPp8Gcvuq3xZwV1Ou0eE2ZwXAM9bGJniYsA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.69.3.tgz#7d99db1a328ab6cd95b7235360780ed28d27b0e5"
-  integrity sha512-0h19o+PNdw5wO5aLbX/96jhT3wZA9zKYap7B1pAjcZiHYwtvhuGLSqR+zvr4Dq4oSXrNU/kbk1WWmoHm7Hkehw==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.70.0":
   version "0.70.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.70.0.tgz#1a5782a12ebca787e55930db2ec310ffc23d5c9c"
@@ -1078,16 +1071,16 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.69.3.tgz#b229bfa44a0506e89f19fa23468de82908c78695"
-  integrity sha512-JoHGFPPv8S5VO3wXSZ7dMIdCPEvkzdvRUG412nQp6M3KdXZUKy4ouAYFJy4iTpFWvPaIi4BI1Exo1HVtliuvZA==
+"@glimmer/reference@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.70.0.tgz#2031e8bf0c3281e7d457fc52b151b66449822cf6"
+  integrity sha512-GcyUw/KeIChdzj2z6zf3jFhl0J6gBhHd1wNbcCClR9a3ufQl6GJ7rtV2JFoc9AGEQMWytYfeFVrggerP39POFg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.69.3"
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/util" "0.69.3"
-    "@glimmer/validator" "0.69.3"
+    "@glimmer/global-context" "0.70.0"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/util" "0.70.0"
+    "@glimmer/validator" "0.70.0"
 
 "@glimmer/syntax@0.70.0":
   version "0.70.0"
@@ -1099,15 +1092,6 @@
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.69.3.tgz#1d822a8f971a9a1e24385c4b46c3a48ab5cdf20d"
-  integrity sha512-bu3vMBPfWqGBRjQb4Hj81XYa8DWKdA+0HRxVCVqKlov3py8TSUyuGHKcbVB/bB0kKxuZp8nxW2UZJO3WA4V08A==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.69.3"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.70.0":
   version "0.70.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.70.0.tgz#55cac3330cecb19a12fae21de918f49fe46d9f8b"
@@ -1117,13 +1101,13 @@
     "@glimmer/interfaces" "0.70.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.69.3.tgz#488e56463337297f85e671e575d61e7c493ef144"
-  integrity sha512-nDHLaEY/CzNfKWk7rV1+eL+JAq11O3IM/FKAp/Uuson5HB2yEzxrM8rFHQCbZDkxzBgtPKuUtpTWQyxyNYgUJQ==
+"@glimmer/validator@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.70.0.tgz#21279efb0f07a9bd8493d2c03c168951da6af8ea"
+  integrity sha512-DcQwH3mjHMMqID9j7wKtRAeL1oVm+X1VAFE+RGQuRXzUxbLzYEPFDYE1XnXsbMG96KM+SJoF9yAuqzojprqNpw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.69.3"
+    "@glimmer/global-context" "0.70.0"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From d064a2c441d1acfc16721c8d3a94ed9ad9bd2c8d Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Tue, 15 Dec 2020 16:38:14 +0800
Subject: [PATCH 209/299] Fix `yarn.lock`

---
 yarn.lock | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 93b1b62e1..838e770dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1628,11 +1628,6 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.10.0.tgz#12f983750ebad867f0c806e705c1953cd6415789"
   integrity sha512-+dt5w1+Lqyd7wIPMa4XhJxUuE8+YF+vxQ6zxHyhLGHJjHiunPf0wSV8LtQwkpmAsRi1lEOoOIR30FG5S2HS33g==
 
-"@typescript-eslint/types@4.9.1":
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.1.tgz#a1a7dd80e4e5ac2c593bc458d75dd1edaf77faa2"
-  integrity sha512-fjkT+tXR13ks6Le7JiEdagnwEFc49IkOyys7ueWQ4O8k4quKPwPJudrwlVOJCUQhXo45PrfIvIarcrEjFTNwUA==
-
 "@typescript-eslint/typescript-estree@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.1.tgz#29a43c7060641ec51c902d9f50ac7c5866ec479f"
@@ -3104,6 +3099,7 @@ eslint-plugin-jest@24.1.3:
 
 "eslint-plugin-prettier-internal-rules@link:scripts/tools/eslint-plugin-prettier-internal-rules":
   version "0.0.0"
+  uid ""
 
 eslint-plugin-react@7.21.5:
   version "7.21.5"

From 67613d23b22c71dab26c7f88f017eb84652034cf Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 15 Dec 2020 16:39:59 +0800
Subject: [PATCH 210/299] Refactor: Extract `printBody` (#9898)

---
 src/language-js/print/block.js     |  6 ++----
 src/language-js/print/class.js     | 11 ++---------
 src/language-js/print/statement.js | 17 ++++++++++++++++-
 src/language-js/printer-estree.js  | 12 +++---------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/language-js/print/block.js b/src/language-js/print/block.js
index 8ba45a4ce..0a27172ab 100644
--- a/src/language-js/print/block.js
+++ b/src/language-js/print/block.js
@@ -8,16 +8,14 @@ const {
 const { hasComment, CommentCheckFlags } = require("../utils");
 const { locEnd } = require("../loc");
 
-const { printStatementSequence } = require("./statement");
+const { printBody } = require("./statement");
 
 /** @typedef {import("../../document").Doc} Doc */
 
 function printBlock(path, options, print) {
   const n = path.getValue();
   const parts = [];
-  const naked = path.call((bodyPath) => {
-    return printStatementSequence(bodyPath, options, print);
-  }, "body");
+  const naked = printBody(path, options, print);
 
   if (n.type === "StaticBlock") {
     parts.push("static ");
diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
index add6caafa..b0e588c54 100644
--- a/src/language-js/print/class.js
+++ b/src/language-js/print/class.js
@@ -12,7 +12,7 @@ const {
 const { getTypeParametersGroupId } = require("./type-parameters");
 const { printMethod } = require("./function");
 const { printOptionalToken, printTypeAnnotation } = require("./misc");
-const { printStatementSequence } = require("./statement");
+const { printBody } = require("./statement");
 const { printPropertyKey } = require("./property");
 const { printAssignmentRight } = require("./assignment");
 
@@ -185,14 +185,7 @@ function printClassBody(path, options, print) {
   return concat([
     "{",
     n.body.length > 0
-      ? indent(
-          concat([
-            hardline,
-            path.call((bodyPath) => {
-              return printStatementSequence(bodyPath, options, print);
-            }, "body"),
-          ])
-        )
+      ? indent(concat([hardline, printBody(path, options, print)]))
       : printDanglingComments(path, options),
     hardline,
     "}",
diff --git a/src/language-js/print/statement.js b/src/language-js/print/statement.js
index e95592c3f..8016fd5a7 100644
--- a/src/language-js/print/statement.js
+++ b/src/language-js/print/statement.js
@@ -150,4 +150,19 @@ function expressionNeedsASIProtection(path, options) {
   );
 }
 
-module.exports = { printStatementSequence };
+function printBody(path, options, print) {
+  return path.call((bodyPath) => {
+    return printStatementSequence(bodyPath, options, print);
+  }, "body");
+}
+
+function printSwitchCaseConsequent(path, options, print) {
+  return path.call((bodyPath) => {
+    return printStatementSequence(bodyPath, options, print);
+  }, "consequent");
+}
+
+module.exports = {
+  printBody,
+  printSwitchCaseConsequent,
+};
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 1f85d0954..80d81ee03 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -98,7 +98,7 @@ const {
   printAssignmentExpression,
 } = require("./print/assignment");
 const { printBinaryishExpression } = require("./print/binaryish");
-const { printStatementSequence } = require("./print/statement");
+const { printBody, printSwitchCaseConsequent } = require("./print/statement");
 const { printMemberExpression } = require("./print/member");
 const { printBlock } = require("./print/block");
 const { printComment } = require("./print/comment");
@@ -278,11 +278,7 @@ function printPathNoParens(path, options, print, args) {
         }, "directives");
       }
 
-      parts.push(
-        path.call((bodyPath) => {
-          return printStatementSequence(bodyPath, options, print);
-        }, "body")
-      );
+      parts.push(printBody(path, options, print));
 
       parts.push(
         comments.printDanglingComments(path, options, /* sameIndent */ true)
@@ -919,9 +915,7 @@ function printPathNoParens(path, options, print, args) {
       );
 
       if (consequent.length > 0) {
-        const cons = path.call((consequentPath) => {
-          return printStatementSequence(consequentPath, options, print);
-        }, "consequent");
+        const cons = printSwitchCaseConsequent(path, options, print);
 
         parts.push(
           consequent.length === 1 && consequent[0].type === "BlockStatement"

From cb6a9777333a9fcf875b6ca2123036e883fd7180 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Wed, 16 Dec 2020 08:45:29 +0900
Subject: [PATCH 211/299] Prints bundle sizes in build script log (#9900)

* Prints bundle size with flags

* Add "gzipped" to cspell.json

* Print esm bundle size

* Remove gzipped size from log
---
 package.json           |  1 +
 scripts/build/build.js | 38 ++++++++++++++++++++++++++++++++------
 yarn.lock              |  5 +++++
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 9124d87c6..cb6a2facc 100644
--- a/package.json
+++ b/package.json
@@ -120,6 +120,7 @@
     "npm-run-all": "4.1.5",
     "path-browserify": "1.0.1",
     "prettier": "2.2.1",
+    "pretty-bytes": "5.4.1",
     "rimraf": "3.0.2",
     "rollup": "2.35.1",
     "rollup-plugin-node-globals": "1.4.0",
diff --git a/scripts/build/build.js b/scripts/build/build.js
index 374bd0e82..22b5c72b1 100644
--- a/scripts/build/build.js
+++ b/scripts/build/build.js
@@ -2,6 +2,7 @@
 
 const path = require("path");
 const fs = require("fs");
+const readline = require("readline");
 const chalk = require("chalk");
 const execa = require("execa");
 const minimist = require("minimist");
@@ -40,17 +41,18 @@ for (const { color, text } of statusConfig) {
   status[text] = chalk[color].black(padStatusText(text));
 }
 
-function fitTerminal(input) {
+function fitTerminal(input, suffix = "") {
   const columns = Math.min(process.stdout.columns || 40, 80);
   const WIDTH = columns - maxLength + 1;
   if (input.length < WIDTH) {
-    input += chalk.dim(".").repeat(WIDTH - input.length - 1);
+    const repeatCount = WIDTH - input.length - 1 - suffix.length;
+    input += chalk.dim(".").repeat(repeatCount) + suffix;
   }
   return input;
 }
 
 async function createBundle(bundleConfig, cache, options) {
-  const { output, target } = bundleConfig;
+  const { output, target, format, type } = bundleConfig;
   process.stdout.write(fitTerminal(output));
   try {
     const { cached, skipped } = await bundler(bundleConfig, cache, options);
@@ -65,17 +67,41 @@ async function createBundle(bundleConfig, cache, options) {
       return;
     }
 
+    const file = path.join("dist", output);
+    const content = fs.readFileSync(file, "utf8");
+
     // Files including U+FFEE can't load in Chrome Extension
     // `prettier-chrome-extension` https://github.com/prettier/prettier-chrome-extension
     // details https://github.com/prettier/prettier/pull/8534
     if (target === "universal") {
-      const file = path.join("dist", output);
-      const content = fs.readFileSync(file, "utf8");
       if (content.includes("\ufffe")) {
         throw new Error("Bundled umd file should not have U+FFFE character.");
       }
     }
 
+    if (options["print-size"]) {
+      // Clear previous line
+      readline.clearLine(process.stdout, 0);
+      readline.cursorTo(process.stdout, 0, null);
+
+      const prettyBytes = require("pretty-bytes");
+      const getSizeText = (file) => prettyBytes(fs.statSync(file).size);
+      const sizeTexts = [getSizeText(file, content)];
+      if (
+        type !== "core" &&
+        format !== "esm" &&
+        bundleConfig.bundler !== "webpack" &&
+        target === "universal"
+      ) {
+        const esmFile = path.join("dist/esm", output.replace(".js", ".mjs"));
+        const esmContent = fs.readFileSync(esmFile, "utf8");
+        sizeTexts.push(`esm ${getSizeText(esmFile, esmContent)}`);
+      }
+      process.stdout.write(
+        fitTerminal(output, sizeTexts.join(", ").concat(" "))
+      );
+    }
+
     console.log(status.DONE);
   } catch (error) {
     console.log(status.FAIL + "\n");
@@ -153,6 +179,6 @@ async function run(params) {
 
 run(
   minimist(process.argv.slice(2), {
-    boolean: ["purge-cache", "playground"],
+    boolean: ["purge-cache", "playground", "print-size"],
   })
 );
diff --git a/yarn.lock b/yarn.lock
index 838e770dc..791201afa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5912,6 +5912,11 @@ prettier@2.2.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
   integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
+pretty-bytes@5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz#cd89f79bbcef21e3d21eb0da68ffe93f803e884b"
+  integrity sha512-s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA==
+
 pretty-format@^26.1.0:
   version "26.1.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.1.0.tgz#272b9cd1f1a924ab5d443dc224899d7a65cb96ec"

From a8e0af058591025a7618d24740bcfee93b3781a2 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 16 Dec 2020 08:45:41 +0800
Subject: [PATCH 212/299] Simplify `escapeTemplateCharacters` (#9848)

---
 src/language-js/print/template-literal.js | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/language-js/print/template-literal.js b/src/language-js/print/template-literal.js
index 81f68121e..ab1289e0d 100644
--- a/src/language-js/print/template-literal.js
+++ b/src/language-js/print/template-literal.js
@@ -217,21 +217,13 @@ function printTemplateExpressions(path, print) {
 
 function escapeTemplateCharacters(doc, raw) {
   return mapDoc(doc, (currentDoc) => {
-    if (!currentDoc.parts) {
-      return currentDoc;
+    if (typeof currentDoc === "string") {
+      return raw
+        ? currentDoc.replace(/(\\*)`/g, "$1$1\\`")
+        : uncookTemplateElementValue(currentDoc);
     }
 
-    const parts = currentDoc.parts.map((part) => {
-      if (typeof part === "string") {
-        return raw
-          ? part.replace(/(\\*)`/g, "$1$1\\`")
-          : uncookTemplateElementValue(part);
-      }
-
-      return part;
-    });
-
-    return { ...currentDoc, parts };
+    return currentDoc;
   });
 }
 

From 94256cac916950a21f1eb5341264e45618900f54 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 16 Dec 2020 08:48:04 +0800
Subject: [PATCH 213/299] Refactor: Simplify JS parsers (#9897)

---
 src/language-js/parser-babel.js         | 19 +++++++------------
 src/language-js/parser-espree.js        |  5 ++---
 src/language-js/parser-flow.js          |  5 ++---
 src/language-js/parser-meriyah.js       |  5 ++---
 src/language-js/parser-typescript.js    |  7 ++-----
 src/language-js/parser/create-parser.js | 18 ++++++++++++++++++
 6 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 src/language-js/parser/create-parser.js

diff --git a/src/language-js/parser-babel.js b/src/language-js/parser-babel.js
index 8a30b1bdd..0ca12064a 100644
--- a/src/language-js/parser-babel.js
+++ b/src/language-js/parser-babel.js
@@ -6,10 +6,9 @@ const {
   getNextNonSpaceNonCommentCharacterIndexWithStartIndex,
   getShebang,
 } = require("../common/util");
-const { hasPragma } = require("./pragma");
-const { locStart, locEnd } = require("./loc");
 const postprocess = require("./parse-postprocess");
 const tryCombinations = require("./parser/try-combinations");
+const createParser = require("./parser/create-parser");
 
 const parseOptions = {
   sourceType: "module",
@@ -235,17 +234,15 @@ function assertJsonNode(node, parent) {
   }
 }
 
-const babel = { parse, astFormat: "estree", hasPragma, locStart, locEnd };
-const babelFlow = { ...babel, parse: parseFlow };
-const babelTypeScript = { ...babel, parse: parseTypeScript };
-const babelExpression = { ...babel, parse: parseExpression };
+const babel = createParser(parse);
+const babelExpression = createParser(parseExpression);
 
 // Export as a plugin so we can reuse the same bundle for UMD loading
 module.exports = {
   parsers: {
     babel,
-    "babel-flow": babelFlow,
-    "babel-ts": babelTypeScript,
+    "babel-flow": createParser(parseFlow),
+    "babel-ts": createParser(parseTypeScript),
     json: {
       ...babelExpression,
       hasPragma() {
@@ -253,12 +250,10 @@ module.exports = {
       },
     },
     json5: babelExpression,
-    "json-stringify": {
+    "json-stringify": createParser({
       parse: parseJson,
       astFormat: "estree-json",
-      locStart,
-      locEnd,
-    },
+    }),
     /** @internal */
     __js_expression: babelExpression,
     /** for vue filter */
diff --git a/src/language-js/parser-espree.js b/src/language-js/parser-espree.js
index 59d719f19..d3a626ff2 100644
--- a/src/language-js/parser-espree.js
+++ b/src/language-js/parser-espree.js
@@ -1,10 +1,9 @@
 "use strict";
 const { getShebang } = require("../common/util");
 const createError = require("../common/parser-create-error");
-const { hasPragma } = require("./pragma");
-const { locStart, locEnd } = require("./loc");
 const postprocess = require("./parse-postprocess");
 const tryCombinations = require("./parser/try-combinations");
+const createParser = require("./parser/create-parser");
 
 const parseOptions = {
   range: true,
@@ -55,6 +54,6 @@ function parse(originalText, parsers, options) {
 
 module.exports = {
   parsers: {
-    espree: { parse, astFormat: "estree", hasPragma, locStart, locEnd },
+    espree: createParser(parse),
   },
 };
diff --git a/src/language-js/parser-flow.js b/src/language-js/parser-flow.js
index e66f2e108..901f1b52e 100644
--- a/src/language-js/parser-flow.js
+++ b/src/language-js/parser-flow.js
@@ -1,9 +1,8 @@
 "use strict";
 
 const createError = require("../common/parser-create-error");
-const { hasPragma } = require("./pragma");
-const { locStart, locEnd } = require("./loc");
 const postprocess = require("./parse-postprocess");
+const createParser = require("./parser/create-parser");
 
 const parseOptions = {
   enums: true,
@@ -43,6 +42,6 @@ function parse(text, parsers, opts) {
 // Export as a plugin so we can reuse the same bundle for UMD loading
 module.exports = {
   parsers: {
-    flow: { parse, astFormat: "estree", hasPragma, locStart, locEnd },
+    flow: createParser(parse),
   },
 };
diff --git a/src/language-js/parser-meriyah.js b/src/language-js/parser-meriyah.js
index 960090f1e..707690110 100644
--- a/src/language-js/parser-meriyah.js
+++ b/src/language-js/parser-meriyah.js
@@ -1,10 +1,9 @@
 "use strict";
 
 const createError = require("../common/parser-create-error");
-const { hasPragma } = require("./pragma");
-const { locStart, locEnd } = require("./loc");
 const postprocess = require("./parse-postprocess");
 const tryCombinations = require("./parser/try-combinations");
+const createParser = require("./parser/create-parser");
 
 // https://github.com/meriyah/meriyah/blob/4676f60b6c149d7082bde2c9147f9ae2359c8075/src/parser.ts#L185
 const parseOptions = {
@@ -88,6 +87,6 @@ function parse(text, parsers, options) {
 
 module.exports = {
   parsers: {
-    meriyah: { parse, astFormat: "estree", hasPragma, locStart, locEnd },
+    meriyah: createParser(parse),
   },
 };
diff --git a/src/language-js/parser-typescript.js b/src/language-js/parser-typescript.js
index c2499f940..259c88efe 100644
--- a/src/language-js/parser-typescript.js
+++ b/src/language-js/parser-typescript.js
@@ -1,10 +1,9 @@
 "use strict";
 
 const createError = require("../common/parser-create-error");
-const { hasPragma } = require("./pragma");
-const { locStart, locEnd } = require("./loc");
 const postprocess = require("./parse-postprocess");
 const tryCombinations = require("./parser/try-combinations");
+const createParser = require("./parser/create-parser");
 
 /** @type {import("@typescript-eslint/typescript-estree").TSESTreeOptions} */
 const parseOptions = {
@@ -70,11 +69,9 @@ function isProbablyJsx(text) {
   ).test(text);
 }
 
-const parser = { parse, astFormat: "estree", hasPragma, locStart, locEnd };
-
 // Export as a plugin so we can reuse the same bundle for UMD loading
 module.exports = {
   parsers: {
-    typescript: parser,
+    typescript: createParser(parse),
   },
 };
diff --git a/src/language-js/parser/create-parser.js b/src/language-js/parser/create-parser.js
new file mode 100644
index 000000000..c8c50c15c
--- /dev/null
+++ b/src/language-js/parser/create-parser.js
@@ -0,0 +1,18 @@
+"use strict";
+
+const { hasPragma } = require("../pragma");
+const { locStart, locEnd } = require("../loc");
+
+function createParser(options) {
+  options = typeof options === "function" ? { parse: options } : options;
+
+  return {
+    astFormat: "estree",
+    hasPragma,
+    locStart,
+    locEnd,
+    ...options,
+  };
+}
+
+module.exports = createParser;

From 1bde9d88564b89e0929c9aba3fa9e8debadf68b8 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Wed, 16 Dec 2020 08:52:59 +0800
Subject: [PATCH 214/299] Refactor: Remove `composeLoc` function (#9896)

---
 src/language-js/loc.js               | 16 ----------------
 src/language-js/parse-postprocess.js | 25 +++++++++++++++----------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/language-js/loc.js b/src/language-js/loc.js
index 139dabc3a..d6409ca92 100644
--- a/src/language-js/loc.js
+++ b/src/language-js/loc.js
@@ -25,21 +25,6 @@ function locEnd(node) {
   return node.typeAnnotation ? Math.max(end, locEnd(node.typeAnnotation)) : end;
 }
 
-/**
- * @param {Node} startNode
- * @param {Node | number} endNodeOrLength
- * @returns {number[]}
- */
-function composeLoc(startNode, endNodeOrLength = startNode) {
-  const start = locStart(startNode);
-  const end =
-    typeof endNodeOrLength === "number"
-      ? start + endNodeOrLength
-      : locEnd(endNodeOrLength);
-
-  return [start, end];
-}
-
 /**
  * @param {Node} nodeA
  * @param {Node} nodeB
@@ -70,7 +55,6 @@ function hasSameLoc(nodeA, nodeB) {
 module.exports = {
   locStart,
   locEnd,
-  composeLoc,
   hasSameLocStart,
   hasSameLoc,
 };
diff --git a/src/language-js/parse-postprocess.js b/src/language-js/parse-postprocess.js
index 0d8c34733..be9dcd9dd 100644
--- a/src/language-js/parse-postprocess.js
+++ b/src/language-js/parse-postprocess.js
@@ -6,7 +6,7 @@ const {
   getShebang,
 } = require("../common/util");
 const createError = require("../common/parser-create-error");
-const { composeLoc, locStart, locEnd } = require("./loc");
+const { locStart, locEnd } = require("./loc");
 const { isTypeCastComment } = require("./comments");
 
 function postprocess(ast, options) {
@@ -126,7 +126,7 @@ function postprocess(ast, options) {
       }
       // remove redundant TypeScript nodes
       case "TSParenthesizedType": {
-        node.typeAnnotation.range = composeLoc(node);
+        node.typeAnnotation.range = [locStart(node), locEnd(node)];
         return node.typeAnnotation;
       }
       case "TSUnionType":
@@ -134,26 +134,28 @@ function postprocess(ast, options) {
         if (node.types.length === 1) {
           const [firstType] = node.types;
           // override loc, so that comments are attached properly
-          firstType.range = composeLoc(node);
+          firstType.range = [locStart(node), locEnd(node)];
           return firstType;
         }
         break;
       case "TSTypeParameter":
         // babel-ts
         if (typeof node.name === "string") {
+          const start = locStart(node);
           node.name = {
             type: "Identifier",
             name: node.name,
-            range: composeLoc(node, node.name.length),
+            range: [start, start + node.name.length],
           };
         }
         break;
       case "SequenceExpression": {
         // Babel (unlike other parsers) includes spaces and comments in the range. Let's unify this.
         const lastExpression = getLast(node.expressions);
-        if (locEnd(node) > locEnd(lastExpression)) {
-          node.range = composeLoc(node, lastExpression);
-        }
+        node.range = [
+          locStart(node),
+          Math.min(locEnd(lastExpression), locEnd(node)),
+        ];
         break;
       }
       case "ClassProperty":
@@ -183,7 +185,10 @@ function postprocess(ast, options) {
     if (options.originalText[locEnd(toOverrideNode)] === ";") {
       return;
     }
-    toBeOverriddenNode.range = composeLoc(toBeOverriddenNode, toOverrideNode);
+    toBeOverriddenNode.range = [
+      locStart(toBeOverriddenNode),
+      locEnd(toOverrideNode),
+    ];
   }
 }
 
@@ -253,10 +258,10 @@ function rebalanceLogicalTree(node) {
       operator: node.operator,
       left: node.left,
       right: node.right.left,
-      range: composeLoc(node.left, node.right.left),
+      range: [locStart(node.left), locEnd(node.right.left)],
     }),
     right: node.right.right,
-    range: composeLoc(node),
+    range: [locStart(node), locEnd(node)],
   });
 }
 

From 2ab7b52eecc62c263e1b861bb918d4b2c15f57cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 05:56:18 +0000
Subject: [PATCH 215/299] Build(deps): Bump @glimmer/syntax from 0.70.0 to
 0.71.0 (#9908)

---
 package.json |  2 +-
 yarn.lock    | 29 ++++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index cb6a2facc..2a7876ee7 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "11.0.4",
     "@babel/code-frame": "7.10.4",
     "@babel/parser": "7.12.10",
-    "@glimmer/syntax": "0.70.0",
+    "@glimmer/syntax": "0.71.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.10.0",
     "angular-estree-parser": "2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 791201afa..1f67c3c2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1071,6 +1071,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.71.0":
+  version "0.71.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.71.0.tgz#0258beb3c09e0bfe852201e2e696d66ce4d0caa4"
+  integrity sha512-34OVZsWORRa5mn4vNwDsDDHjGt/EJ3Po5LaNiah/Fm3gaFCNaRnWKOKFF19W2e0hyPbb0nvfdeToPqnuEPmAMQ==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/reference@0.70.0":
   version "0.70.0"
   resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.70.0.tgz#2031e8bf0c3281e7d457fc52b151b66449822cf6"
@@ -1082,13 +1089,13 @@
     "@glimmer/util" "0.70.0"
     "@glimmer/validator" "0.70.0"
 
-"@glimmer/syntax@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.70.0.tgz#3b10023b84a02af7bf0ba4f3308946a5a932e603"
-  integrity sha512-1SFC2hbSfeV2IUwS2tMFljYCdZCq/CC+hw1S2boHWHG7I4yq3NdSQeYytLDB5yOuWAFE4ZGc4XRRntWjDRgGuQ==
+"@glimmer/syntax@0.71.0":
+  version "0.71.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.71.0.tgz#cd3cc1b87fa6bf696537a9232b306d541c9d88c8"
+  integrity sha512-4R/tCemL93LnyZaFVCjROnvv8uxPFNgrCx/+RH+qikJkn3kmo7uHws3mpa1xt1LT4Gpeo+NHURWx4h+9aYK7eg==
   dependencies:
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/util" "0.70.0"
+    "@glimmer/interfaces" "0.71.0"
+    "@glimmer/util" "0.71.0"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
@@ -1101,6 +1108,15 @@
     "@glimmer/interfaces" "0.70.0"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.71.0":
+  version "0.71.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.71.0.tgz#9369c92265ac84154324d5cb8cabb0e1678333d8"
+  integrity sha512-EBKmZTXSzLywsg8dVN30ygWtpeZUbiqawHB1eXtsyBsBNbYdGDlNZjlh67z9Ba1zEeT9b+uD7FyIKYSbOBSGYw==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.71.0"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.70.0":
   version "0.70.0"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.70.0.tgz#21279efb0f07a9bd8493d2c03c168951da6af8ea"
@@ -3099,7 +3115,6 @@ eslint-plugin-jest@24.1.3:
 
 "eslint-plugin-prettier-internal-rules@link:scripts/tools/eslint-plugin-prettier-internal-rules":
   version "0.0.0"
-  uid ""
 
 eslint-plugin-react@7.21.5:
   version "7.21.5"

From 1035cb5242b195fcb5ccdd8b0412519248e19ee4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 05:59:35 +0000
Subject: [PATCH 216/299] Build(deps-dev): Bump webpack from 5.10.1 to 5.10.3
 in /website (#9903)

---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index 2a79a065f..aa5ed1d78 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.1",
     "svgo": "1.3.2",
-    "webpack": "5.10.1",
+    "webpack": "5.10.3",
     "webpack-cli": "4.2.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 84ac97c5e..fbcce8ed4 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -7432,10 +7432,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.10.1:
-  version "5.10.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.1.tgz#81d1853d34bef5d6e5bfa119b98a43764b26c100"
-  integrity sha512-mHu4iM2mW7d/8R91VPPNtUCNd1D8k51TTb4e0XjylapIR6WEmW8XUTBZq8TqmShj9XYxVXJn6AzKlWnrlty6DA==
+webpack@5.10.3:
+  version "5.10.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.3.tgz#933cbd5e79d62040d988049ff0f515a6dc333006"
+  integrity sha512-KFPEbpNKfNU4t2CDsUZJ7KpuUbzDqGUCZqLmz4667KSUWMc9BuR3a8jpa72Emv7JUbdGwISD9OZjoI9S5BnHig==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From f86a2781e98e2bf0383b41daa3c321aa7fdd355a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 06:11:01 +0000
Subject: [PATCH 217/299] Build(deps-dev): Bump @babel/preset-env from 7.12.10
 to 7.12.11 (#9911)

---
 package.json |  2 +-
 yarn.lock    | 46 ++++++++++++++++++++++++++++++----------------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 2a7876ee7..657b1c9f7 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.12.10",
-    "@babel/preset-env": "7.12.10",
+    "@babel/preset-env": "7.12.11",
     "@babel/types": "7.12.10",
     "@glimmer/reference": "0.70.0",
     "@rollup/plugin-alias": "3.1.1",
diff --git a/yarn.lock b/yarn.lock
index 1f67c3c2e..f30e8bc7e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -243,10 +243,15 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
-"@babel/helper-validator-option@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
-  integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==
+"@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
+"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz#d66cb8b7a3e7fe4c6962b32020a131ecf0847f4f"
+  integrity sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==
 
 "@babel/helper-wrap-function@^7.10.4":
   version "7.10.4"
@@ -509,10 +514,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1"
-  integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==
+"@babel/plugin-transform-block-scoping@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.11.tgz#83ae92a104dbb93a7d6c6dd1844f351083c46b4f"
+  integrity sha512-atR1Rxc3hM+VPg/NvNvfYw0npQEAcHuJ+MGZnFn6h3bo+1U3BWXMdFMlvVRApBTWKQMX7SOwRJZA5FBF/JQbvA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
@@ -735,16 +740,16 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/preset-env@7.12.10":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.10.tgz#ca981b95f641f2610531bd71948656306905e6ab"
-  integrity sha512-Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA==
+"@babel/preset-env@7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.11.tgz#55d5f7981487365c93dbbc84507b1c7215e857f9"
+  integrity sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==
   dependencies:
     "@babel/compat-data" "^7.12.7"
     "@babel/helper-compilation-targets" "^7.12.5"
     "@babel/helper-module-imports" "^7.12.5"
     "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-option" "^7.12.1"
+    "@babel/helper-validator-option" "^7.12.11"
     "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
     "@babel/plugin-proposal-class-properties" "^7.12.1"
     "@babel/plugin-proposal-dynamic-import" "^7.12.1"
@@ -773,7 +778,7 @@
     "@babel/plugin-transform-arrow-functions" "^7.12.1"
     "@babel/plugin-transform-async-to-generator" "^7.12.1"
     "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.11"
     "@babel/plugin-transform-classes" "^7.12.1"
     "@babel/plugin-transform-computed-properties" "^7.12.1"
     "@babel/plugin-transform-destructuring" "^7.12.1"
@@ -803,7 +808,7 @@
     "@babel/plugin-transform-unicode-escapes" "^7.12.1"
     "@babel/plugin-transform-unicode-regex" "^7.12.1"
     "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.12.10"
+    "@babel/types" "^7.12.11"
     core-js-compat "^3.8.0"
     semver "^5.5.0"
 
@@ -849,7 +854,7 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@7.12.10", "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@7.12.10":
   version "7.12.10"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
   integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==
@@ -858,6 +863,15 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce"
+  integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"

From 306d15fbe979745d57df24ad3a87c1d2d696ec40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 08:49:06 +0000
Subject: [PATCH 218/299] Build(deps-dev): Bump webpack from 5.10.1 to 5.10.3
 (#9909)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 657b1c9f7..c9707b121 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "synchronous-promise": "2.0.15",
     "tempy": "1.0.0",
     "terser-webpack-plugin": "5.0.3",
-    "webpack": "5.10.1"
+    "webpack": "5.10.3"
   },
   "scripts": {
     "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
diff --git a/yarn.lock b/yarn.lock
index f30e8bc7e..cf77de6a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7438,10 +7438,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.10.1:
-  version "5.10.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.1.tgz#81d1853d34bef5d6e5bfa119b98a43764b26c100"
-  integrity sha512-mHu4iM2mW7d/8R91VPPNtUCNd1D8k51TTb4e0XjylapIR6WEmW8XUTBZq8TqmShj9XYxVXJn6AzKlWnrlty6DA==
+webpack@5.10.3:
+  version "5.10.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.3.tgz#933cbd5e79d62040d988049ff0f515a6dc333006"
+  integrity sha512-KFPEbpNKfNU4t2CDsUZJ7KpuUbzDqGUCZqLmz4667KSUWMc9BuR3a8jpa72Emv7JUbdGwISD9OZjoI9S5BnHig==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From de882505f0dc981e2bb85cff28518260036ee324 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Wed, 16 Dec 2020 18:46:56 +0900
Subject: [PATCH 219/299] Fix params mistaking at #9900 (#9912)

---
 scripts/build/build.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/build/build.js b/scripts/build/build.js
index 22b5c72b1..5b68c4770 100644
--- a/scripts/build/build.js
+++ b/scripts/build/build.js
@@ -68,12 +68,12 @@ async function createBundle(bundleConfig, cache, options) {
     }
 
     const file = path.join("dist", output);
-    const content = fs.readFileSync(file, "utf8");
 
     // Files including U+FFEE can't load in Chrome Extension
     // `prettier-chrome-extension` https://github.com/prettier/prettier-chrome-extension
     // details https://github.com/prettier/prettier/pull/8534
     if (target === "universal") {
+      const content = fs.readFileSync(file, "utf8");
       if (content.includes("\ufffe")) {
         throw new Error("Bundled umd file should not have U+FFFE character.");
       }
@@ -86,7 +86,7 @@ async function createBundle(bundleConfig, cache, options) {
 
       const prettyBytes = require("pretty-bytes");
       const getSizeText = (file) => prettyBytes(fs.statSync(file).size);
-      const sizeTexts = [getSizeText(file, content)];
+      const sizeTexts = [getSizeText(file)];
       if (
         type !== "core" &&
         format !== "esm" &&
@@ -94,8 +94,7 @@ async function createBundle(bundleConfig, cache, options) {
         target === "universal"
       ) {
         const esmFile = path.join("dist/esm", output.replace(".js", ".mjs"));
-        const esmContent = fs.readFileSync(esmFile, "utf8");
-        sizeTexts.push(`esm ${getSizeText(esmFile, esmContent)}`);
+        sizeTexts.push(`esm ${getSizeText(esmFile)}`);
       }
       process.stdout.write(
         fitTerminal(output, sizeTexts.join(", ").concat(" "))

From 1cb51216a0c89ede022e5c1d1f0be78b7156b5c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 10:18:29 +0000
Subject: [PATCH 220/299] Build(deps): Bump @babel/code-frame from 7.10.4 to
 7.12.11 (#9906)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c9707b121..e1dade99c 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   ],
   "dependencies": {
     "@angular/compiler": "11.0.4",
-    "@babel/code-frame": "7.10.4",
+    "@babel/code-frame": "7.12.11",
     "@babel/parser": "7.12.10",
     "@glimmer/syntax": "0.71.0",
     "@iarna/toml": "2.2.5",
diff --git a/yarn.lock b/yarn.lock
index cf77de6a2..38d65144b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,10 +16,10 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/code-frame@7.10.4", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+"@babel/code-frame@7.12.11", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
   dependencies:
     "@babel/highlight" "^7.10.4"
 

From ef7831ff643fcf8027f0b217d713b2f3715d45b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 19:10:11 +0800
Subject: [PATCH 221/299] Build(deps-dev): Bump @babel/types from 7.12.10 to
 7.12.11 (#9910)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 ++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index e1dade99c..f75ba8267 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
   "devDependencies": {
     "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.11",
-    "@babel/types": "7.12.10",
+    "@babel/types": "7.12.11",
     "@glimmer/reference": "0.70.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
diff --git a/yarn.lock b/yarn.lock
index 38d65144b..15a1762d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -238,12 +238,7 @@
   dependencies:
     "@babel/types" "^7.11.0"
 
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
-
-"@babel/helper-validator-identifier@^7.12.11":
+"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
   integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
@@ -854,16 +849,7 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@7.12.10":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
-  integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@7.12.11", "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce"
   integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==

From 243997fcd96dd77aab7c3f2abda5f943eba144b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 12:09:17 +0000
Subject: [PATCH 222/299] Build(deps-dev): Bump @glimmer/reference from 0.70.0
 to 0.71.0 (#9905)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++---------------------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index f75ba8267..ec4148347 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.11",
     "@babel/types": "7.12.11",
-    "@glimmer/reference": "0.70.0",
+    "@glimmer/reference": "0.71.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index 15a1762d1..79a5c8f50 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1057,20 +1057,13 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.70.0.tgz#1212b34a92955107458ffe03976175ed6a2f7a37"
-  integrity sha512-uszWyrUI8AntyfMJFQc41CbsbNV3byiz2sknvQh2XE9vDEI1tKmSPp8Gcvuq3xZwV1Ou0eE2ZwXAM9bGJniYsA==
+"@glimmer/global-context@0.71.0":
+  version "0.71.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.71.0.tgz#d0c1ad039b0d29e0502d7f80e7a270f9e80bf14d"
+  integrity sha512-v6ifiCTQXcQCBrtYArXpZ1YRrpnSVmhfHM9Ez5+6wLnBy15cGTpJr7sKVwFsWWqMSPqEGWg6zliI9NI/g++1cQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.70.0.tgz#1a5782a12ebca787e55930db2ec310ffc23d5c9c"
-  integrity sha512-HT3Yv97f353LW2TuEJnBhyg5Ebt9Mbp0s7uedb5mOJQbUxhGG24yy0HjOHUV+HRI0yCQPZO/q7ojJgX3MAknQg==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.71.0":
   version "0.71.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.71.0.tgz#0258beb3c09e0bfe852201e2e696d66ce4d0caa4"
@@ -1078,16 +1071,16 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.70.0.tgz#2031e8bf0c3281e7d457fc52b151b66449822cf6"
-  integrity sha512-GcyUw/KeIChdzj2z6zf3jFhl0J6gBhHd1wNbcCClR9a3ufQl6GJ7rtV2JFoc9AGEQMWytYfeFVrggerP39POFg==
+"@glimmer/reference@0.71.0":
+  version "0.71.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.71.0.tgz#c58be3170e550c1fb94b80f47e2d7229e083bf79"
+  integrity sha512-ZullfLbOuu1wgIPSPgXcWYynEwKc+tp0ccmapwloVNOthmjt6QdBTIeydRwFlT14TLHYTp5t12PQlwGBY4kNtA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.70.0"
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/util" "0.70.0"
-    "@glimmer/validator" "0.70.0"
+    "@glimmer/global-context" "0.71.0"
+    "@glimmer/interfaces" "0.71.0"
+    "@glimmer/util" "0.71.0"
+    "@glimmer/validator" "0.71.0"
 
 "@glimmer/syntax@0.71.0":
   version "0.71.0"
@@ -1099,15 +1092,6 @@
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.70.0.tgz#55cac3330cecb19a12fae21de918f49fe46d9f8b"
-  integrity sha512-h16boov87CGlXgu9c2O2XBx4xDMu/fEAHJh3YGUnfyPB/Tqebf4K9wUVKl5yl8AzhBeRT0+n/+vvyQhcl8vEmg==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.70.0"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.71.0":
   version "0.71.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.71.0.tgz#9369c92265ac84154324d5cb8cabb0e1678333d8"
@@ -1117,13 +1101,13 @@
     "@glimmer/interfaces" "0.71.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.70.0.tgz#21279efb0f07a9bd8493d2c03c168951da6af8ea"
-  integrity sha512-DcQwH3mjHMMqID9j7wKtRAeL1oVm+X1VAFE+RGQuRXzUxbLzYEPFDYE1XnXsbMG96KM+SJoF9yAuqzojprqNpw==
+"@glimmer/validator@0.71.0":
+  version "0.71.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.71.0.tgz#b049d75717e1ef210c6e7096c46b6d18b3bac1c9"
+  integrity sha512-XbC1A/+f/GVoouvUyU50WSJE/NVmvYv1HYr8FQ9MbDpzY9ASiPsfHnBThvx1iy3f+sxt/wfthu70U9Wl68jjPA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.70.0"
+    "@glimmer/global-context" "0.71.0"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 2f930ee314c4bdb80304dd6906306f6913521d71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 08:38:44 +0800
Subject: [PATCH 223/299] Build(deps): Bump @babel/parser from 7.12.10 to
 7.12.11 (#9904)

Bumps [@babel/parser](https://github.com/babel/babel/tree/HEAD/packages/babel-parser) from 7.12.10 to 7.12.11.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.11/packages/babel-parser)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ec4148347..114192875 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@angular/compiler": "11.0.4",
     "@babel/code-frame": "7.12.11",
-    "@babel/parser": "7.12.10",
+    "@babel/parser": "7.12.11",
     "@glimmer/syntax": "0.71.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.10.0",
diff --git a/yarn.lock b/yarn.lock
index 79a5c8f50..20be017af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -276,10 +276,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.12.10", "@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
-  version "7.12.10"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81"
-  integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==
+"@babel/parser@7.12.11", "@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79"
+  integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==
 
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"

From 790c8ee9dbe2850e06937d07cae7b2d9432c5a7d Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Dec 2020 08:39:23 +0800
Subject: [PATCH 224/299] Replace `normalizeParts` with safer `cleanDoc`
 (#9844)

---
 src/language-js/print/binaryish.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/language-js/print/binaryish.js b/src/language-js/print/binaryish.js
index 4caa4725f..22fb959b2 100644
--- a/src/language-js/print/binaryish.js
+++ b/src/language-js/print/binaryish.js
@@ -4,7 +4,7 @@ const { printComments } = require("../../main/comments");
 const { getLast } = require("../../common/util");
 const {
   builders: { concat, join, line, softline, group, indent, align, ifBreak },
-  utils: { normalizeParts },
+  utils: { cleanDoc },
 } = require("../../document");
 const {
   hasLeadingOwnLineComment,
@@ -271,9 +271,15 @@ function printBinaryishExpressions(
     // the other ones since we don't call the normal print on BinaryExpression,
     // only for the left and right parts
     if (isNested && hasComment(node)) {
-      parts = normalizeParts(
-        printComments(path, () => concat(parts), options).parts
+      const printed = cleanDoc(
+        printComments(path, () => concat(parts), options)
       );
+      /* istanbul ignore if */
+      if (printed.type === "string") {
+        parts = [printed];
+      } else {
+        parts = printed.parts;
+      }
     }
   } else {
     // Our stopping case. Simply print the node normally.

From d7c9dd0eaf1cc175880d67809ddf680188dd7931 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Dec 2020 08:40:45 +0800
Subject: [PATCH 225/299] Refactor(html): use `concat` directly (#9845)

---
 src/language-html/printer-html.js | 60 ++++++++++++-------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index 6cfc662ba..c00ee53f4 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -2,25 +2,25 @@
 
 const assert = require("assert");
 const {
-  builders,
-  utils: { mapDoc, normalizeParts, cleanDoc },
+  builders: {
+    breakParent,
+    dedentToRoot,
+    fill,
+    group,
+    hardline,
+    ifBreak,
+    indent,
+    join,
+    line,
+    literalline,
+    softline,
+    concat,
+  },
+  utils: { mapDoc, cleanDoc },
 } = require("../document");
 const { replaceEndOfLineWith } = require("../common/util");
 const { print: printFrontMatter } = require("../utils/front-matter");
 const clean = require("./clean");
-const {
-  breakParent,
-  dedentToRoot,
-  fill,
-  group,
-  hardline,
-  ifBreak,
-  indent,
-  join,
-  line,
-  literalline,
-  softline,
-} = builders;
 const {
   htmlTrimPreserveIndentation,
   splitByHtmlWhitespace,
@@ -56,15 +56,6 @@ const {
 } = require("./syntax-vue");
 const { printImgSrcset, printClassNames } = require("./syntax-attribute");
 
-function concat(parts) {
-  const newParts = normalizeParts(parts);
-  return newParts.length === 0
-    ? ""
-    : newParts.length === 1
-    ? newParts[0]
-    : builders.concat(newParts);
-}
-
 function embed(path, print, textToDoc, options) {
   const node = path.getValue();
 
@@ -127,15 +118,13 @@ function embed(path, print, textToDoc, options) {
             }
             textToDocOptions.__babelSourceType = sourceType;
           }
-          return builders.concat([
-            concat([
-              breakParent,
-              printOpeningTagPrefix(node, options),
-              textToDoc(value, textToDocOptions, {
-                stripTrailingHardline: true,
-              }),
-              printClosingTagSuffix(node, options),
-            ]),
+          return concat([
+            breakParent,
+            printOpeningTagPrefix(node, options),
+            textToDoc(value, textToDocOptions, {
+              stripTrailingHardline: true,
+            }),
+            printClosingTagSuffix(node, options),
           ]);
         }
       } else if (node.parent.type === "interpolation") {
@@ -238,10 +227,7 @@ function genericPrint(path, options, print) {
         options.__onHtmlRoot(node);
       }
       // use original concat to not break stripTrailingHardline
-      return builders.concat([
-        group(printChildren(path, options, print)),
-        hardline,
-      ]);
+      return concat([group(printChildren(path, options, print)), hardline]);
     case "element":
     case "ieConditionalComment": {
       if (shouldPreserveContent(node, options)) {

From cf8cba363f69615d1561ca2a65967021602764e2 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Dec 2020 09:28:58 +0800
Subject: [PATCH 226/299] DRY Block and Program print (#9899)

---
 src/language-js/print/block.js    | 119 +++++++++++++++++++-----------
 src/language-js/printer-estree.js |  37 +---------
 2 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/language-js/print/block.js b/src/language-js/print/block.js
index 0a27172ab..694501fc8 100644
--- a/src/language-js/print/block.js
+++ b/src/language-js/print/block.js
@@ -13,61 +13,90 @@ const { printBody } = require("./statement");
 /** @typedef {import("../../document").Doc} Doc */
 
 function printBlock(path, options, print) {
-  const n = path.getValue();
+  const node = path.getValue();
   const parts = [];
-  const naked = printBody(path, options, print);
 
-  if (n.type === "StaticBlock") {
+  if (node.type === "StaticBlock") {
     parts.push("static ");
   }
 
-  const hasContent = n.body.some((node) => node.type !== "EmptyStatement");
-  const hasDirectives = n.directives && n.directives.length > 0;
-
-  const parent = path.getParentNode();
-  const parentParent = path.getParentNode(1);
-  if (
-    !hasContent &&
-    !hasDirectives &&
-    !hasComment(n, CommentCheckFlags.Dangling) &&
-    (parent.type === "ArrowFunctionExpression" ||
-      parent.type === "FunctionExpression" ||
-      parent.type === "FunctionDeclaration" ||
-      parent.type === "ObjectMethod" ||
-      parent.type === "ClassMethod" ||
-      parent.type === "ClassPrivateMethod" ||
-      parent.type === "ForStatement" ||
-      parent.type === "WhileStatement" ||
-      parent.type === "DoWhileStatement" ||
-      parent.type === "DoExpression" ||
-      (parent.type === "CatchClause" && !parentParent.finalizer) ||
-      parent.type === "TSModuleDeclaration" ||
-      parent.type === "TSDeclareFunction" ||
-      n.type === "StaticBlock")
-  ) {
-    return concat([...parts, "{}"]);
-  }
-
   parts.push("{");
 
-  // Babel 6
-  if (hasDirectives) {
-    path.each((childPath) => {
-      parts.push(indent(concat([hardline, print(childPath)])));
-      if (isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)) {
-        parts.push(hardline);
-      }
-    }, "directives");
+  const printed = printBlockBody(path, options, print);
+  if (printed) {
+    parts.push(indent(concat([hardline, printed])), hardline);
+  } else {
+    const parent = path.getParentNode();
+    const parentParent = path.getParentNode(1);
+    if (
+      !(
+        parent.type === "ArrowFunctionExpression" ||
+        parent.type === "FunctionExpression" ||
+        parent.type === "FunctionDeclaration" ||
+        parent.type === "ObjectMethod" ||
+        parent.type === "ClassMethod" ||
+        parent.type === "ClassPrivateMethod" ||
+        parent.type === "ForStatement" ||
+        parent.type === "WhileStatement" ||
+        parent.type === "DoWhileStatement" ||
+        parent.type === "DoExpression" ||
+        (parent.type === "CatchClause" && !parentParent.finalizer) ||
+        parent.type === "TSModuleDeclaration" ||
+        parent.type === "TSDeclareFunction" ||
+        node.type === "StaticBlock"
+      )
+    ) {
+      parts.push(hardline);
+    }
   }
 
-  if (hasContent) {
-    parts.push(indent(concat([hardline, naked])));
-  }
-
-  parts.push(printDanglingComments(path, options));
-  parts.push(hardline, "}");
+  parts.push("}");
 
   return concat(parts);
 }
 
-module.exports = { printBlock };
+function printBlockBody(path, options, print) {
+  const node = path.getValue();
+
+  const nodeHasDirectives =
+    Array.isArray(node.directives) && node.directives.length > 0;
+  const nodeHasBody = node.body.some((node) => node.type !== "EmptyStatement");
+  const nodeHasComment = hasComment(node, CommentCheckFlags.Dangling);
+
+  if (!nodeHasDirectives && !nodeHasBody && !nodeHasComment) {
+    return "";
+  }
+
+  const parts = [];
+  // Babel 6
+  if (nodeHasDirectives) {
+    const lastDirectiveIndex = path.getValue().directives.length - 1;
+    path.each((childPath, index) => {
+      parts.push(print(childPath));
+      if (index < lastDirectiveIndex || nodeHasBody || nodeHasComment) {
+        parts.push(hardline);
+        if (
+          isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)
+        ) {
+          parts.push(hardline);
+        }
+      }
+    }, "directives");
+  }
+
+  if (nodeHasBody) {
+    parts.push(printBody(path, options, print));
+  }
+
+  if (nodeHasComment) {
+    parts.push(printDanglingComments(path, options, /* sameIndent */ true));
+  }
+
+  if (node.type === "Program") {
+    parts.push(hardline);
+  }
+
+  return concat(parts);
+}
+
+module.exports = { printBlock, printBlockBody };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 80d81ee03..52bc14b77 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -98,9 +98,9 @@ const {
   printAssignmentExpression,
 } = require("./print/assignment");
 const { printBinaryishExpression } = require("./print/binaryish");
-const { printBody, printSwitchCaseConsequent } = require("./print/statement");
+const { printSwitchCaseConsequent } = require("./print/statement");
 const { printMemberExpression } = require("./print/member");
-const { printBlock } = require("./print/block");
+const { printBlock, printBlockBody } = require("./print/block");
 const { printComment } = require("./print/comment");
 
 function genericPrint(path, options, printPath, args) {
@@ -260,37 +260,8 @@ function printPathNoParens(path, options, print, args) {
 
       return concat(parts);
 
-    case "Program": {
-      const hasContents =
-        !n.body.every(({ type }) => type === "EmptyStatement") || hasComment(n);
-
-      // Babel 6
-      if (n.directives) {
-        const directivesCount = n.directives.length;
-        path.each((childPath, index) => {
-          parts.push(print(childPath), hardline);
-          if (
-            (index < directivesCount - 1 || hasContents) &&
-            isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)
-          ) {
-            parts.push(hardline);
-          }
-        }, "directives");
-      }
-
-      parts.push(printBody(path, options, print));
-
-      parts.push(
-        comments.printDanglingComments(path, options, /* sameIndent */ true)
-      );
-
-      // Only force a trailing newline if there were any contents.
-      if (hasContents) {
-        parts.push(hardline);
-      }
-
-      return concat(parts);
-    }
+    case "Program":
+      return printBlockBody(path, options, print);
     // Babel extension.
     case "EmptyStatement":
       return "";

From 45407d82b91e4dbbeabc0f7159c5b72ea538c900 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Dec 2020 10:39:02 +0800
Subject: [PATCH 227/299] Refactor yaml (#9629)

---
 src/language-yaml/print-preprocess.js         |  30 +
 src/language-yaml/print/block.js              |  84 ++
 .../print/flow-mapping-sequence.js            |  71 ++
 src/language-yaml/print/mapping-item.js       | 185 +++++
 src/language-yaml/print/misc.js               |  55 ++
 src/language-yaml/printer-yaml.js             | 753 ++++++------------
 src/language-yaml/utils.js                    |  20 +
 7 files changed, 667 insertions(+), 531 deletions(-)
 create mode 100644 src/language-yaml/print-preprocess.js
 create mode 100644 src/language-yaml/print/block.js
 create mode 100644 src/language-yaml/print/flow-mapping-sequence.js
 create mode 100644 src/language-yaml/print/mapping-item.js
 create mode 100644 src/language-yaml/print/misc.js

diff --git a/src/language-yaml/print-preprocess.js b/src/language-yaml/print-preprocess.js
new file mode 100644
index 000000000..79912a1c0
--- /dev/null
+++ b/src/language-yaml/print-preprocess.js
@@ -0,0 +1,30 @@
+"use strict";
+const { defineShortcut, mapNode } = require("./utils");
+
+function preprocess(ast) {
+  return mapNode(ast, defineShortcuts);
+}
+
+function defineShortcuts(node) {
+  switch (node.type) {
+    case "document":
+      defineShortcut(node, "head", () => node.children[0]);
+      defineShortcut(node, "body", () => node.children[1]);
+      break;
+    case "documentBody":
+    case "sequenceItem":
+    case "flowSequenceItem":
+    case "mappingKey":
+    case "mappingValue":
+      defineShortcut(node, "content", () => node.children[0]);
+      break;
+    case "mappingItem":
+    case "flowMappingItem":
+      defineShortcut(node, "key", () => node.children[0]);
+      defineShortcut(node, "value", () => node.children[1]);
+      break;
+  }
+  return node;
+}
+
+module.exports = preprocess;
diff --git a/src/language-yaml/print/block.js b/src/language-yaml/print/block.js
new file mode 100644
index 000000000..ce98e4236
--- /dev/null
+++ b/src/language-yaml/print/block.js
@@ -0,0 +1,84 @@
+"use strict";
+
+/** @typedef {import("../../document").Doc} Doc */
+
+const {
+  builders: {
+    concat,
+    dedent,
+    dedentToRoot,
+    fill,
+    hardline,
+    join,
+    line,
+    literalline,
+    markAsRoot,
+  },
+} = require("../../document");
+const {
+  getAncestorCount,
+  getBlockValueLineContents,
+  hasIndicatorComment,
+  isLastDescendantNode,
+  isNode,
+} = require("../utils");
+const { alignWithSpaces } = require("./misc");
+
+function printBlock(path, print, options) {
+  const node = path.getValue();
+  const parentIndent = getAncestorCount(path, (ancestorNode) =>
+    isNode(ancestorNode, ["sequence", "mapping"])
+  );
+  const isLastDescendant = isLastDescendantNode(path);
+  /** @type {Doc[]} */
+  const parts = [node.type === "blockFolded" ? ">" : "|"];
+  if (node.indent !== null) {
+    parts.push(node.indent.toString());
+  }
+
+  if (node.chomping !== "clip") {
+    parts.push(node.chomping === "keep" ? "+" : "-");
+  }
+
+  if (hasIndicatorComment(node)) {
+    parts.push(" ", path.call(print, "indicatorComment"));
+  }
+
+  const lineContents = getBlockValueLineContents(node, {
+    parentIndent,
+    isLastDescendant,
+    options,
+  });
+  /** @type {Doc[]} */
+  const contentsParts = [];
+  for (const [index, lineWords] of lineContents.entries()) {
+    if (index === 0) {
+      contentsParts.push(hardline);
+    }
+    contentsParts.push(fill(join(line, lineWords).parts));
+    if (index !== lineContents.length - 1) {
+      contentsParts.push(
+        lineWords.length === 0 ? hardline : markAsRoot(literalline)
+      );
+    } else if (node.chomping === "keep" && isLastDescendant) {
+      contentsParts.push(
+        dedentToRoot(lineWords.length === 0 ? hardline : literalline)
+      );
+    }
+  }
+  if (node.indent === null) {
+    parts.push(
+      dedent(alignWithSpaces(options.tabWidth, concat(contentsParts)))
+    );
+  } else {
+    parts.push(
+      dedentToRoot(
+        alignWithSpaces(node.indent - 1 + parentIndent, concat(contentsParts))
+      )
+    );
+  }
+
+  return concat(parts);
+}
+
+module.exports = printBlock;
diff --git a/src/language-yaml/print/flow-mapping-sequence.js b/src/language-yaml/print/flow-mapping-sequence.js
new file mode 100644
index 000000000..5d96763bb
--- /dev/null
+++ b/src/language-yaml/print/flow-mapping-sequence.js
@@ -0,0 +1,71 @@
+"use strict";
+
+const {
+  builders: { concat, ifBreak, line, softline, hardline, join },
+} = require("../../document");
+const { isEmptyNode, getLast, hasEndComments } = require("../utils");
+const { printNextEmptyLine, alignWithSpaces } = require("./misc");
+
+function printFlowMapping(path, print, options) {
+  const node = path.getValue();
+  const isMapping = node.type === "flowMapping";
+  const openMarker = isMapping ? "{" : "[";
+  const closeMarker = isMapping ? "}" : "]";
+
+  /** @type {softline | line} */
+  let bracketSpacing = softline;
+  if (isMapping && node.children.length !== 0 && options.bracketSpacing) {
+    bracketSpacing = line;
+  }
+  const lastItem = getLast(node.children);
+  const isLastItemEmptyMappingItem =
+    lastItem &&
+    lastItem.type === "flowMappingItem" &&
+    isEmptyNode(lastItem.key) &&
+    isEmptyNode(lastItem.value);
+
+  return concat([
+    openMarker,
+    alignWithSpaces(
+      options.tabWidth,
+      concat([
+        bracketSpacing,
+        printChildren(path, print, options),
+        options.trailingComma === "none" ? "" : ifBreak(",", ""),
+        hasEndComments(node)
+          ? concat([hardline, join(hardline, path.map(print, "endComments"))])
+          : "",
+      ])
+    ),
+    isLastItemEmptyMappingItem ? "" : bracketSpacing,
+    closeMarker,
+  ]);
+}
+
+function printChildren(path, print, options) {
+  const node = path.getValue();
+  const parts = path.map(
+    (childPath, index) =>
+      concat([
+        print(childPath),
+        index === node.children.length - 1
+          ? ""
+          : concat([
+              ",",
+              line,
+              node.children[index].position.start.line !==
+              node.children[index + 1].position.start.line
+                ? printNextEmptyLine(childPath, options.originalText)
+                : "",
+            ]),
+      ]),
+    "children"
+  );
+  return concat(parts);
+}
+
+module.exports = {
+  printFlowMapping,
+  // Alias
+  printFlowSequence: printFlowMapping,
+};
diff --git a/src/language-yaml/print/mapping-item.js b/src/language-yaml/print/mapping-item.js
new file mode 100644
index 000000000..90aa6c6b1
--- /dev/null
+++ b/src/language-yaml/print/mapping-item.js
@@ -0,0 +1,185 @@
+"use strict";
+
+/** @typedef {import("../../document").Doc} Doc */
+
+const {
+  builders: { conditionalGroup, concat, group, hardline, ifBreak, join, line },
+} = require("../../document");
+const {
+  hasLeadingComments,
+  hasMiddleComments,
+  hasTrailingComment,
+  hasEndComments,
+  isNode,
+  isEmptyNode,
+  isInlineNode,
+} = require("../utils");
+const { alignWithSpaces } = require("./misc");
+
+function printMappingItem(node, parentNode, path, print, options) {
+  const { key, value } = node;
+
+  const isEmptyMappingKey = isEmptyNode(key);
+  const isEmptyMappingValue = isEmptyNode(value);
+
+  if (isEmptyMappingKey && isEmptyMappingValue) {
+    return concat([": "]);
+  }
+
+  const printedKey = path.call(print, "key");
+  const spaceBeforeColon = needsSpaceInFrontOfMappingValue(node) ? " " : "";
+
+  if (isEmptyMappingValue) {
+    if (node.type === "flowMappingItem" && parentNode.type === "flowMapping") {
+      return printedKey;
+    }
+
+    if (
+      node.type === "mappingItem" &&
+      isAbsolutelyPrintedAsSingleLineNode(key.content, options) &&
+      !hasTrailingComment(key.content) &&
+      (!parentNode.tag || parentNode.tag.value !== "tag:yaml.org,2002:set")
+    ) {
+      return concat([printedKey, spaceBeforeColon, ":"]);
+    }
+
+    return concat(["? ", alignWithSpaces(2, printedKey)]);
+  }
+
+  const printedValue = path.call(print, "value");
+  if (isEmptyMappingKey) {
+    return concat([": ", alignWithSpaces(2, printedValue)]);
+  }
+
+  // force explicit Key
+  if (hasLeadingComments(value) || !isInlineNode(key.content)) {
+    return concat([
+      "? ",
+      alignWithSpaces(2, printedKey),
+      hardline,
+      join(
+        "",
+        path
+          .map(print, "value", "leadingComments")
+          .map((comment) => concat([comment, hardline]))
+      ),
+      ": ",
+      alignWithSpaces(2, printedValue),
+    ]);
+  }
+
+  // force singleline
+  if (
+    isSingleLineNode(key.content) &&
+    !hasLeadingComments(key.content) &&
+    !hasMiddleComments(key.content) &&
+    !hasTrailingComment(key.content) &&
+    !hasEndComments(key) &&
+    !hasLeadingComments(value.content) &&
+    !hasMiddleComments(value.content) &&
+    !hasEndComments(value) &&
+    isAbsolutelyPrintedAsSingleLineNode(value.content, options)
+  ) {
+    return concat([printedKey, spaceBeforeColon, ": ", printedValue]);
+  }
+
+  const groupId = Symbol("mappingKey");
+  const groupedKey = group(
+    concat([
+      ifBreak("? "),
+      group(alignWithSpaces(2, printedKey), { id: groupId }),
+    ])
+  );
+  const breakValue = concat([hardline, ": ", alignWithSpaces(2, printedValue)]);
+  /** @type {Doc[]} */
+  const flatValueParts = [spaceBeforeColon, ":"];
+  if (
+    hasLeadingComments(value.content) ||
+    (hasEndComments(value) &&
+      value.content &&
+      !isNode(value.content, ["mapping", "sequence"])) ||
+    (parentNode.type === "mapping" &&
+      hasTrailingComment(key.content) &&
+      isInlineNode(value.content)) ||
+    (isNode(value.content, ["mapping", "sequence"]) &&
+      value.content.tag === null &&
+      value.content.anchor === null)
+  ) {
+    flatValueParts.push(hardline);
+  } else if (value.content) {
+    flatValueParts.push(line);
+  }
+  flatValueParts.push(printedValue);
+  const flatValue = alignWithSpaces(options.tabWidth, concat(flatValueParts));
+
+  return conditionalGroup([
+    concat([groupedKey, ifBreak(breakValue, flatValue, { groupId })]),
+  ]);
+}
+
+function isAbsolutelyPrintedAsSingleLineNode(node, options) {
+  if (!node) {
+    return true;
+  }
+
+  switch (node.type) {
+    case "plain":
+    case "quoteSingle":
+    case "quoteDouble":
+      break;
+    case "alias":
+      return true;
+    default:
+      return false;
+  }
+
+  if (options.proseWrap === "preserve") {
+    return node.position.start.line === node.position.end.line;
+  }
+
+  if (
+    // backslash-newline
+    /\\$/m.test(
+      options.originalText.slice(
+        node.position.start.offset,
+        node.position.end.offset
+      )
+    )
+  ) {
+    return false;
+  }
+
+  switch (options.proseWrap) {
+    case "never":
+      return !node.value.includes("\n");
+    case "always":
+      return !/[\n ]/.test(node.value);
+    // istanbul ignore next
+    default:
+      return false;
+  }
+}
+
+function needsSpaceInFrontOfMappingValue(node) {
+  return node.key.content && node.key.content.type === "alias";
+}
+
+function isSingleLineNode(node) {
+  /* istanbul ignore next */
+  if (!node) {
+    return true;
+  }
+
+  switch (node.type) {
+    case "plain":
+    case "quoteDouble":
+    case "quoteSingle":
+      return node.position.start.line === node.position.end.line;
+    case "alias":
+      return true;
+    default:
+      return false;
+  }
+}
+
+module.exports = printMappingItem;
diff --git a/src/language-yaml/print/misc.js b/src/language-yaml/print/misc.js
new file mode 100644
index 000000000..06783d0ed
--- /dev/null
+++ b/src/language-yaml/print/misc.js
@@ -0,0 +1,55 @@
+"use strict";
+
+const {
+  builders: { softline, align },
+} = require("../../document");
+
+const { hasEndComments, isNextLineEmpty, isNode } = require("../utils");
+
+const printedEmptyLineCache = new WeakMap();
+function printNextEmptyLine(path, originalText) {
+  const node = path.getValue();
+  const root = path.stack[0];
+
+  let isNextEmptyLinePrintedSet;
+  if (printedEmptyLineCache.has(root)) {
+    isNextEmptyLinePrintedSet = printedEmptyLineCache.get(root);
+  } else {
+    isNextEmptyLinePrintedSet = new Set();
+    printedEmptyLineCache.set(root, isNextEmptyLinePrintedSet);
+  }
+
+  if (!isNextEmptyLinePrintedSet.has(node.position.end.line)) {
+    isNextEmptyLinePrintedSet.add(node.position.end.line);
+    if (
+      isNextLineEmpty(node, originalText) &&
+      !shouldPrintEndComments(path.getParentNode())
+    ) {
+      return softline;
+    }
+  }
+
+  return "";
+}
+
+function shouldPrintEndComments(node) {
+  return (
+    hasEndComments(node) &&
+    !isNode(node, [
+      "documentHead",
+      "documentBody",
+      "flowMapping",
+      "flowSequence",
+    ])
+  );
+}
+
+function alignWithSpaces(n, doc) {
+  return align(" ".repeat(n), doc);
+}
+
+module.exports = {
+  alignWithSpaces,
+  shouldPrintEndComments,
+  printNextEmptyLine,
+};
diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js
index f1dbd538c..b7f4544aa 100644
--- a/src/language-yaml/printer-yaml.js
+++ b/src/language-yaml/printer-yaml.js
@@ -1,81 +1,75 @@
 "use strict";
 
-const docBuilders = require("../document").builders;
+/** @typedef {import("../document").Doc} Doc */
+
 const {
-  conditionalGroup,
-  breakParent,
-  concat,
-  dedent,
-  dedentToRoot,
-  fill,
-  group,
-  hardline,
-  ifBreak,
-  join,
-  line,
-  lineSuffix,
-  literalline,
-  markAsRoot,
-  softline,
-} = docBuilders;
+  builders: {
+    breakParent,
+    concat,
+    fill,
+    group,
+    hardline,
+    join,
+    line,
+    lineSuffix,
+    literalline,
+  },
+} = require("../document");
 const { replaceEndOfLineWith, isPreviousLineEmpty } = require("../common/util");
 const { insertPragma, isPragma } = require("./pragma");
 const { locStart } = require("./loc");
 const embed = require("./embed");
 const {
-  getAncestorCount,
-  getBlockValueLineContents,
   getFlowScalarLineContents,
-  getLast,
   getLastDescendantNode,
   hasLeadingComments,
   hasMiddleComments,
-  hasIndicatorComment,
   hasTrailingComment,
   hasEndComments,
   hasPrettierIgnore,
   isLastDescendantNode,
-  isNextLineEmpty,
   isNode,
-  isEmptyNode,
-  defineShortcut,
-  mapNode,
+  isInlineNode,
 } = require("./utils");
-
-function preprocess(ast) {
-  return mapNode(ast, defineShortcuts);
-}
-
-function defineShortcuts(node) {
-  switch (node.type) {
-    case "document":
-      defineShortcut(node, "head", () => node.children[0]);
-      defineShortcut(node, "body", () => node.children[1]);
-      break;
-    case "documentBody":
-    case "sequenceItem":
-    case "flowSequenceItem":
-    case "mappingKey":
-    case "mappingValue":
-      defineShortcut(node, "content", () => node.children[0]);
-      break;
-    case "mappingItem":
-    case "flowMappingItem":
-      defineShortcut(node, "key", () => node.children[0]);
-      defineShortcut(node, "value", () => node.children[1]);
-      break;
-  }
-  return node;
-}
+const preprocess = require("./print-preprocess");
+const {
+  alignWithSpaces,
+  printNextEmptyLine,
+  shouldPrintEndComments,
+} = require("./print/misc");
+const {
+  printFlowMapping,
+  printFlowSequence,
+} = require("./print/flow-mapping-sequence");
+const printMappingItem = require("./print/mapping-item");
+const printBlock = require("./print/block");
 
 function genericPrint(path, options, print) {
   const node = path.getValue();
-  const parentNode = path.getParentNode();
+  /** @type {Doc[]} */
+  const parts = [];
 
-  const tag = !node.tag ? "" : path.call(print, "tag");
-  const anchor = !node.anchor ? "" : path.call(print, "anchor");
+  if (node.type !== "mappingValue" && hasLeadingComments(node)) {
+    parts.push(
+      concat([join(hardline, path.map(print, "leadingComments")), hardline])
+    );
+  }
 
-  const nextEmptyLine =
+  const { tag, anchor } = node;
+  if (tag) {
+    parts.push(path.call(print, "tag"));
+  }
+  if (tag && anchor) {
+    parts.push(" ");
+  }
+  if (anchor) {
+    parts.push(path.call(print, "anchor"));
+  }
+
+  /** @type {Doc} */
+  let nextEmptyLine = "";
+
+  if (
     isNode(node, [
       "mapping",
       "sequence",
@@ -83,167 +77,184 @@ function genericPrint(path, options, print) {
       "directive",
       "mappingItem",
       "sequenceItem",
-    ]) && !isLastDescendantNode(path)
-      ? printNextEmptyLine(path, options.originalText)
-      : "";
+    ]) &&
+    !isLastDescendantNode(path)
+  ) {
+    nextEmptyLine = printNextEmptyLine(path, options.originalText);
+  }
 
-  return concat([
-    node.type !== "mappingValue" && hasLeadingComments(node)
-      ? concat([join(hardline, path.map(print, "leadingComments")), hardline])
-      : "",
-    tag,
-    tag && anchor ? " " : "",
-    anchor,
-    tag || anchor
-      ? isNode(node, ["sequence", "mapping"]) && !hasMiddleComments(node)
-        ? hardline
-        : " "
-      : "",
-    hasMiddleComments(node)
-      ? concat([
-          node.middleComments.length === 1 ? "" : hardline,
-          join(hardline, path.map(print, "middleComments")),
-          hardline,
+  if (tag || anchor) {
+    if (isNode(node, ["sequence", "mapping"]) && !hasMiddleComments(node)) {
+      parts.push(hardline);
+    } else {
+      parts.push(" ");
+    }
+  }
+
+  if (hasMiddleComments(node)) {
+    parts.push(
+      concat([
+        node.middleComments.length === 1 ? "" : hardline,
+        join(hardline, path.map(print, "middleComments")),
+        hardline,
+      ])
+    );
+  }
+
+  const parentNode = path.getParentNode();
+  if (hasPrettierIgnore(path)) {
+    parts.push(
+      concat(
+        replaceEndOfLineWith(
+          options.originalText
+            .slice(node.position.start.offset, node.position.end.offset)
+            .trimEnd(),
+          literalline
+        )
+      )
+    );
+  } else {
+    parts.push(group(printNode(node, parentNode, path, options, print)));
+  }
+
+  if (hasTrailingComment(node) && !isNode(node, ["document", "documentHead"])) {
+    parts.push(
+      lineSuffix(
+        concat([
+          node.type === "mappingValue" && !node.content ? "" : " ",
+          parentNode.type === "mappingKey" &&
+          path.getParentNode(2).type === "mapping" &&
+          isInlineNode(node)
+            ? ""
+            : breakParent,
+          path.call(print, "trailingComment"),
         ])
-      : "",
-    hasPrettierIgnore(path)
-      ? concat(
-          replaceEndOfLineWith(
-            options.originalText
-              .slice(node.position.start.offset, node.position.end.offset)
-              .trimEnd(),
-            literalline
-          )
-        )
-      : group(_print(node, parentNode, path, options, print)),
-    hasTrailingComment(node) && !isNode(node, ["document", "documentHead"])
-      ? lineSuffix(
-          concat([
-            node.type === "mappingValue" && !node.content ? "" : " ",
-            parentNode.type === "mappingKey" &&
-            path.getParentNode(2).type === "mapping" &&
-            isInlineNode(node)
-              ? ""
-              : breakParent,
-            path.call(print, "trailingComment"),
-          ])
-        )
-      : "",
-    shouldPrintEndComments(node)
-      ? align(
-          node.type === "sequenceItem" ? 2 : 0,
-          concat([
+      )
+    );
+  }
+
+  if (shouldPrintEndComments(node)) {
+    parts.push(
+      alignWithSpaces(
+        node.type === "sequenceItem" ? 2 : 0,
+        concat([
+          hardline,
+          join(
             hardline,
-            join(
-              hardline,
-              path.map(
-                (path) =>
-                  concat([
-                    isPreviousLineEmpty(
-                      options.originalText,
-                      path.getValue(),
-                      locStart
-                    )
-                      ? hardline
-                      : "",
-                    print(path),
-                  ]),
-                "endComments"
-              )
-            ),
-          ])
-        )
-      : "",
-    nextEmptyLine,
-  ]);
+            path.map(
+              (path) =>
+                concat([
+                  isPreviousLineEmpty(
+                    options.originalText,
+                    path.getValue(),
+                    locStart
+                  )
+                    ? hardline
+                    : "",
+                  print(path),
+                ]),
+              "endComments"
+            )
+          ),
+        ])
+      )
+    );
+  }
+  parts.push(nextEmptyLine);
+  return concat(parts);
 }
 
-function _print(node, parentNode, path, options, print) {
+function printNode(node, parentNode, path, options, print) {
   switch (node.type) {
-    case "root":
-      return concat([
-        join(
-          hardline,
-          path.map((childPath, index) => {
-            const document = node.children[index];
-            const nextDocument = node.children[index + 1];
-            return concat([
-              print(childPath),
-              shouldPrintDocumentEndMarker(document, nextDocument)
-                ? concat([
-                    hardline,
-                    "...",
-                    hasTrailingComment(document)
-                      ? concat([" ", path.call(print, "trailingComment")])
-                      : "",
-                  ])
-                : !nextDocument || hasTrailingComment(nextDocument.head)
-                ? ""
-                : concat([hardline, "---"]),
-            ]);
-          }, "children")
-        ),
-        node.children.length === 0 ||
-        ((lastDescendantNode) =>
-          isNode(lastDescendantNode, ["blockLiteral", "blockFolded"]) &&
-          lastDescendantNode.chomping === "keep")(getLastDescendantNode(node))
-          ? ""
-          : hardline,
-      ]);
+    case "root": {
+      const { children } = node;
+      const parts = [];
+      path.each((childPath, index) => {
+        const document = children[index];
+        const nextDocument = children[index + 1];
+        if (index !== 0) {
+          parts.push(hardline);
+        }
+        parts.push(print(childPath));
+        if (shouldPrintDocumentEndMarker(document, nextDocument)) {
+          parts.push(hardline, "...");
+          if (hasTrailingComment(document)) {
+            parts.push(" ", path.call(print, "trailingComment"));
+          }
+        } else if (nextDocument && !hasTrailingComment(nextDocument.head)) {
+          parts.push(hardline, "---");
+        }
+      }, "children");
+
+      const lastDescendantNode = getLastDescendantNode(node);
+      if (
+        !isNode(lastDescendantNode, ["blockLiteral", "blockFolded"]) ||
+        lastDescendantNode.chomping !== "keep"
+      ) {
+        parts.push(hardline);
+      }
+      return concat(parts);
+    }
     case "document": {
       const nextDocument = parentNode.children[path.getName() + 1];
-      return join(
-        hardline,
-        [
-          shouldPrintDocumentHeadEndMarker(
-            node,
-            nextDocument,
-            parentNode,
-            options
-          ) === "head"
-            ? join(
-                hardline,
-                [
-                  node.head.children.length === 0 &&
-                  node.head.endComments.length === 0
-                    ? ""
-                    : path.call(print, "head"),
-                  concat([
-                    "---",
-                    hasTrailingComment(node.head)
-                      ? concat([
-                          " ",
-                          path.call(print, "head", "trailingComment"),
-                        ])
-                      : "",
-                  ]),
-                ].filter(Boolean)
-              )
-            : "",
-          shouldPrintDocumentBody(node) ? path.call(print, "body") : "",
-        ].filter(Boolean)
-      );
+      const parts = [];
+      if (
+        shouldPrintDocumentHeadEndMarker(
+          node,
+          nextDocument,
+          parentNode,
+          options
+        ) === "head"
+      ) {
+        if (
+          node.head.children.length !== 0 ||
+          node.head.endComments.length !== 0
+        ) {
+          parts.push(path.call(print, "head"));
+        }
+
+        if (hasTrailingComment(node.head)) {
+          parts.push(
+            concat(["---", " ", path.call(print, "head", "trailingComment")])
+          );
+        } else {
+          parts.push("---");
+        }
+      }
+
+      if (shouldPrintDocumentBody(node)) {
+        parts.push(path.call(print, "body"));
+      }
+
+      return join(hardline, parts);
     }
     case "documentHead":
-      return join(
-        hardline,
-        [].concat(path.map(print, "children"), path.map(print, "endComments"))
-      );
+      return join(hardline, [
+        ...path.map(print, "children"),
+        ...path.map(print, "endComments"),
+      ]);
     case "documentBody": {
-      const children = join(hardline, path.map(print, "children")).parts;
-      const endComments = join(hardline, path.map(print, "endComments")).parts;
-      const separator =
-        children.length === 0 || endComments.length === 0
-          ? ""
-          : ((lastDescendantNode) =>
-              isNode(lastDescendantNode, ["blockFolded", "blockLiteral"])
-                ? lastDescendantNode.chomping === "keep"
-                  ? // there's already a newline printed at the end of blockValue (chomping=keep, lastDescendant=true)
-                    ""
-                  : // an extra newline for better readability
-                    concat([hardline, hardline])
-                : hardline)(getLastDescendantNode(node));
-      return concat([].concat(children, separator, endComments));
+      const { children, endComments } = node;
+      /** @type {Doc} */
+      let separator = "";
+      if (children.length !== 0 && endComments.length !== 0) {
+        const lastDescendantNode = getLastDescendantNode(node);
+        // there's already a newline printed at the end of blockValue (chomping=keep, lastDescendant=true)
+        if (isNode(lastDescendantNode, ["blockFolded", "blockLiteral"])) {
+          // an extra newline for better readability
+          if (lastDescendantNode.chomping !== "keep") {
+            separator = concat([hardline, hardline]);
+          }
+        } else {
+          separator = hardline;
+        }
+      }
+
+      return concat([
+        join(hardline, path.map(print, "children")),
+        separator,
+        join(hardline, path.map(print, "endComments")),
+      ]);
     }
     case "directive":
       return concat(["%", join(" ", [node.name].concat(node.parameters))]);
@@ -331,55 +342,14 @@ function _print(node, parentNode, path, options, print) {
     }
     case "blockFolded":
     case "blockLiteral": {
-      const parentIndent = getAncestorCount(path, (ancestorNode) =>
-        isNode(ancestorNode, ["sequence", "mapping"])
-      );
-      const isLastDescendant = isLastDescendantNode(path);
-      return concat([
-        node.type === "blockFolded" ? ">" : "|",
-        node.indent === null ? "" : node.indent.toString(),
-        node.chomping === "clip" ? "" : node.chomping === "keep" ? "+" : "-",
-        hasIndicatorComment(node)
-          ? concat([" ", path.call(print, "indicatorComment")])
-          : "",
-        (node.indent === null ? dedent : dedentToRoot)(
-          align(
-            node.indent === null
-              ? options.tabWidth
-              : node.indent - 1 + parentIndent,
-            concat(
-              getBlockValueLineContents(node, {
-                parentIndent,
-                isLastDescendant,
-                options,
-              }).reduce(
-                (reduced, lineWords, index, lineContents) =>
-                  reduced.concat(
-                    index === 0 ? hardline : "",
-                    fill(join(line, lineWords).parts),
-                    index !== lineContents.length - 1
-                      ? lineWords.length === 0
-                        ? hardline
-                        : markAsRoot(literalline)
-                      : node.chomping === "keep" && isLastDescendant
-                      ? lineWords.length === 0
-                        ? dedentToRoot(hardline)
-                        : dedentToRoot(literalline)
-                      : ""
-                  ),
-                []
-              )
-            )
-          )
-        ),
-      ]);
+      return printBlock(path, print, options);
     }
     case "sequence":
       return join(hardline, path.map(print, "children"));
     case "sequenceItem":
       return concat([
         "- ",
-        align(2, !node.content ? "" : path.call(print, "content")),
+        alignWithSpaces(2, !node.content ? "" : path.call(print, "content")),
       ]);
     case "mappingKey":
       return !node.content ? "" : path.call(print, "content");
@@ -389,212 +359,18 @@ function _print(node, parentNode, path, options, print) {
       return join(hardline, path.map(print, "children"));
     case "mappingItem":
     case "flowMappingItem": {
-      const isEmptyMappingKey = isEmptyNode(node.key);
-      const isEmptyMappingValue = isEmptyNode(node.value);
-
-      if (isEmptyMappingKey && isEmptyMappingValue) {
-        return concat([": "]);
-      }
-
-      const key = path.call(print, "key");
-      const value = path.call(print, "value");
-
-      if (isEmptyMappingValue) {
-        return node.type === "flowMappingItem" &&
-          parentNode.type === "flowMapping"
-          ? key
-          : node.type === "mappingItem" &&
-            isAbsolutelyPrintedAsSingleLineNode(node.key.content, options) &&
-            !hasTrailingComment(node.key.content) &&
-            (!parentNode.tag ||
-              parentNode.tag.value !== "tag:yaml.org,2002:set")
-          ? concat([key, needsSpaceInFrontOfMappingValue(node) ? " " : "", ":"])
-          : concat(["? ", align(2, key)]);
-      }
-
-      if (isEmptyMappingKey) {
-        return concat([": ", align(2, value)]);
-      }
-
-      const groupId = Symbol("mappingKey");
-
-      const forceExplicitKey =
-        hasLeadingComments(node.value) || !isInlineNode(node.key.content);
-
-      return forceExplicitKey
-        ? concat([
-            "? ",
-            align(2, key),
-            hardline,
-            join(
-              "",
-              path
-                .map(print, "value", "leadingComments")
-                .map((comment) => concat([comment, hardline]))
-            ),
-            ": ",
-            align(2, value),
-          ])
-        : // force singleline
-        isSingleLineNode(node.key.content) &&
-          !hasLeadingComments(node.key.content) &&
-          !hasMiddleComments(node.key.content) &&
-          !hasTrailingComment(node.key.content) &&
-          !hasEndComments(node.key) &&
-          !hasLeadingComments(node.value.content) &&
-          !hasMiddleComments(node.value.content) &&
-          !hasEndComments(node.value) &&
-          isAbsolutelyPrintedAsSingleLineNode(node.value.content, options)
-        ? concat([
-            key,
-            needsSpaceInFrontOfMappingValue(node) ? " " : "",
-            ": ",
-            value,
-          ])
-        : conditionalGroup([
-            concat([
-              group(
-                concat([ifBreak("? "), group(align(2, key), { id: groupId })])
-              ),
-              ifBreak(
-                concat([hardline, ": ", align(2, value)]),
-                indent(
-                  concat([
-                    needsSpaceInFrontOfMappingValue(node) ? " " : "",
-                    ":",
-                    hasLeadingComments(node.value.content) ||
-                    (hasEndComments(node.value) &&
-                      node.value.content &&
-                      !isNode(node.value.content, ["mapping", "sequence"])) ||
-                    (parentNode.type === "mapping" &&
-                      hasTrailingComment(node.key.content) &&
-                      isInlineNode(node.value.content)) ||
-                    (isNode(node.value.content, ["mapping", "sequence"]) &&
-                      node.value.content.tag === null &&
-                      node.value.content.anchor === null)
-                      ? hardline
-                      : !node.value.content
-                      ? ""
-                      : line,
-                    value,
-                  ])
-                ),
-                { groupId }
-              ),
-            ]),
-          ]);
+      return printMappingItem(node, parentNode, path, print, options);
     }
     case "flowMapping":
-    case "flowSequence": {
-      const openMarker = node.type === "flowMapping" ? "{" : "[";
-      const closeMarker = node.type === "flowMapping" ? "}" : "]";
-      const bracketSpacing =
-        node.type === "flowMapping" &&
-        node.children.length !== 0 &&
-        options.bracketSpacing
-          ? line
-          : softline;
-      const isLastItemEmptyMappingItem =
-        node.children.length !== 0 &&
-        ((lastItem) =>
-          lastItem.type === "flowMappingItem" &&
-          isEmptyNode(lastItem.key) &&
-          isEmptyNode(lastItem.value))(getLast(node.children));
-      const trailingComma =
-        options.trailingComma === "none" ? "" : ifBreak(",", "");
-      return concat([
-        openMarker,
-        indent(
-          concat([
-            bracketSpacing,
-            concat(
-              path.map(
-                (childPath, index) =>
-                  concat([
-                    print(childPath),
-                    index === node.children.length - 1
-                      ? ""
-                      : concat([
-                          ",",
-                          line,
-                          node.children[index].position.start.line !==
-                          node.children[index + 1].position.start.line
-                            ? printNextEmptyLine(
-                                childPath,
-                                options.originalText
-                              )
-                            : "",
-                        ]),
-                  ]),
-                "children"
-              )
-            ),
-            trailingComma,
-            hasEndComments(node)
-              ? concat([
-                  hardline,
-                  join(hardline, path.map(print, "endComments")),
-                ])
-              : "",
-          ])
-        ),
-        isLastItemEmptyMappingItem ? "" : bracketSpacing,
-        closeMarker,
-      ]);
-    }
+      return printFlowMapping(path, print, options);
+    case "flowSequence":
+      return printFlowSequence(path, print, options);
     case "flowSequenceItem":
       return path.call(print, "content");
     // istanbul ignore next
     default:
       throw new Error(`Unexpected node type ${node.type}`);
   }
-
-  function indent(doc) {
-    return docBuilders.align(" ".repeat(options.tabWidth), doc);
-  }
-}
-
-function align(n, doc) {
-  return typeof n === "number" && n > 0
-    ? docBuilders.align(" ".repeat(n), doc)
-    : docBuilders.align(n, doc);
-}
-
-function isInlineNode(node) {
-  /* istanbul ignore next */
-  if (!node) {
-    return true;
-  }
-
-  switch (node.type) {
-    case "plain":
-    case "quoteDouble":
-    case "quoteSingle":
-    case "alias":
-    case "flowMapping":
-    case "flowSequence":
-      return true;
-    default:
-      return false;
-  }
-}
-
-function isSingleLineNode(node) {
-  /* istanbul ignore next */
-  if (!node) {
-    return true;
-  }
-
-  switch (node.type) {
-    case "plain":
-    case "quoteDouble":
-    case "quoteSingle":
-      return node.position.start.line === node.position.end.line;
-    case "alias":
-      return true;
-    default:
-      return false;
-  }
 }
 
 function shouldPrintDocumentBody(document) {
@@ -663,91 +439,6 @@ function shouldPrintDocumentHeadEndMarker(
   return nextDocument ? "root" : false;
 }
 
-function isAbsolutelyPrintedAsSingleLineNode(node, options) {
-  if (!node) {
-    return true;
-  }
-
-  switch (node.type) {
-    case "plain":
-    case "quoteSingle":
-    case "quoteDouble":
-      break;
-    case "alias":
-      return true;
-    default:
-      return false;
-  }
-
-  if (options.proseWrap === "preserve") {
-    return node.position.start.line === node.position.end.line;
-  }
-
-  if (
-    // backslash-newline
-    /\\$/m.test(
-      options.originalText.slice(
-        node.position.start.offset,
-        node.position.end.offset
-      )
-    )
-  ) {
-    return false;
-  }
-
-  switch (options.proseWrap) {
-    case "never":
-      return !node.value.includes("\n");
-    case "always":
-      return !/[\n ]/.test(node.value);
-    // istanbul ignore next
-    default:
-      return false;
-  }
-}
-
-function needsSpaceInFrontOfMappingValue(node) {
-  return node.key.content && node.key.content.type === "alias";
-}
-
-function shouldPrintEndComments(node) {
-  return (
-    hasEndComments(node) &&
-    !isNode(node, [
-      "documentHead",
-      "documentBody",
-      "flowMapping",
-      "flowSequence",
-    ])
-  );
-}
-
-const printedEmptyLineCache = new WeakMap();
-function printNextEmptyLine(path, originalText) {
-  const node = path.getValue();
-  const root = path.stack[0];
-
-  let isNextEmptyLinePrintedSet;
-  if (printedEmptyLineCache.has(root)) {
-    isNextEmptyLinePrintedSet = printedEmptyLineCache.get(root);
-  } else {
-    isNextEmptyLinePrintedSet = new Set();
-    printedEmptyLineCache.set(root, isNextEmptyLinePrintedSet);
-  }
-
-  if (!isNextEmptyLinePrintedSet.has(node.position.end.line)) {
-    isNextEmptyLinePrintedSet.add(node.position.end.line);
-    if (
-      isNextLineEmpty(node, originalText) &&
-      !shouldPrintEndComments(path.getParentNode())
-    ) {
-      return softline;
-    }
-  }
-
-  return "";
-}
-
 function printFlowScalarContent(nodeType, content, options) {
   const lineContents = getFlowScalarLineContents(nodeType, content, options);
   return join(
diff --git a/src/language-yaml/utils.js b/src/language-yaml/utils.js
index d645938a8..615be327e 100644
--- a/src/language-yaml/utils.js
+++ b/src/language-yaml/utils.js
@@ -327,11 +327,31 @@ function getBlockValueLineContents(
   }
 }
 
+function isInlineNode(node) {
+  /* istanbul ignore next */
+  if (!node) {
+    return true;
+  }
+
+  switch (node.type) {
+    case "plain":
+    case "quoteDouble":
+    case "quoteSingle":
+    case "alias":
+    case "flowMapping":
+    case "flowSequence":
+      return true;
+    default:
+      return false;
+  }
+}
+
 module.exports = {
   getLast,
   getAncestorCount,
   isNode,
   isEmptyNode,
+  isInlineNode,
   mapNode,
   defineShortcut,
   isNextLineEmpty,

From f09ad461661ee0ad946f6227d0d519675344c53e Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Dec 2020 10:39:42 +0800
Subject: [PATCH 228/299] Use `index` instead of `.getName()` in
 `FastPath#each()` (#9914)

---
 src/language-js/printer-estree.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 52bc14b77..72ac8a3bf 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -480,11 +480,11 @@ function printPathNoParens(path, options, print, args) {
         // the few places a SequenceExpression appears unparenthesized, we want
         // to indent expressions after the first.
         const parts = [];
-        path.each((p) => {
-          if (p.getName() === 0) {
-            parts.push(print(p));
+        path.each((expressionPath, index) => {
+          if (index === 0) {
+            parts.push(print(expressionPath));
           } else {
-            parts.push(",", indent(concat([line, print(p)])));
+            parts.push(",", indent(concat([line, print(expressionPath)])));
           }
         }, "expressions");
         return group(concat(parts));

From 334609d81eeb3b8d82be4234c39fae33b772ee6f Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Dec 2020 12:09:55 +0800
Subject: [PATCH 229/299] Fix `comments.js` import style (#9917)

---
 src/language-js/print/call-arguments.js |  4 ++--
 src/language-js/print/member-chain.js   |  8 ++++----
 src/language-js/printer-estree.js       | 19 +++++--------------
 src/main/ast-to-doc.js                  |  4 ++--
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/language-js/print/call-arguments.js b/src/language-js/print/call-arguments.js
index 24c8e9221..2dabfd8e1 100644
--- a/src/language-js/print/call-arguments.js
+++ b/src/language-js/print/call-arguments.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const comments = require("../../main/comments");
+const { printDanglingComments } = require("../../main/comments");
 const {
   getLast,
   getPenultimate,
@@ -43,7 +43,7 @@ function printCallArguments(path, options, print) {
   if (args.length === 0) {
     return concat([
       "(",
-      comments.printDanglingComments(path, options, /* sameIndent */ true),
+      printDanglingComments(path, options, /* sameIndent */ true),
       ")",
     ]);
   }
diff --git a/src/language-js/print/member-chain.js b/src/language-js/print/member-chain.js
index 508595982..7669a87df 100644
--- a/src/language-js/print/member-chain.js
+++ b/src/language-js/print/member-chain.js
@@ -2,7 +2,7 @@
 
 const flat = require("lodash/flatten");
 
-const comments = require("../../main/comments");
+const { printComments } = require("../../main/comments");
 const {
   getLast,
   isNextLineEmpty,
@@ -99,7 +99,7 @@ function printMemberChain(path, options, print) {
       printedNodes.unshift({
         node,
         printed: concat([
-          comments.printComments(
+          printComments(
             path,
             () =>
               concat([
@@ -117,7 +117,7 @@ function printMemberChain(path, options, print) {
       printedNodes.unshift({
         node,
         needsParens: pathNeedsParens(path, options),
-        printed: comments.printComments(
+        printed: printComments(
           path,
           () =>
             node.type === "OptionalMemberExpression" ||
@@ -131,7 +131,7 @@ function printMemberChain(path, options, print) {
     } else if (node.type === "TSNonNullExpression") {
       printedNodes.unshift({
         node,
-        printed: comments.printComments(path, () => "!", options),
+        printed: printComments(path, () => "!", options),
       });
       path.call((expression) => rec(expression), "expression");
     } else {
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 72ac8a3bf..fc392fbcd 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -6,7 +6,7 @@
 const assert = require("assert");
 
 // TODO(azz): anything that imports from main shouldn't be in a `language-*` dir.
-const comments = require("../main/comments");
+const { printDanglingComments } = require("../main/comments");
 const {
   hasNewline,
   printString,
@@ -646,7 +646,7 @@ function printPathNoParens(path, options, print, args) {
 
         if (hasComment(n, CommentCheckFlags.Dangling)) {
           parts.push(
-            comments.printDanglingComments(path, options, true),
+            printDanglingComments(path, options, true),
             commentOnOwnLine ? hardline : " "
           );
         }
@@ -671,7 +671,7 @@ function printPathNoParens(path, options, print, args) {
       // We want to keep dangling comments above the loop to stay consistent.
       // Any comment positioned between the for statement and the parentheses
       // is going to be printed before the statement.
-      const dangling = comments.printDanglingComments(
+      const dangling = printDanglingComments(
         path,
         options,
         /* sameLine */ true
@@ -985,12 +985,7 @@ function printPathNoParens(path, options, print, args) {
       if (n.members.length === 0 && !n.hasUnknownMembers) {
         parts.push(
           group(
-            concat([
-              "{",
-              comments.printDanglingComments(path, options),
-              softline,
-              "}",
-            ])
+            concat(["{", printDanglingComments(path, options), softline, "}"])
           )
         );
       } else {
@@ -1012,11 +1007,7 @@ function printPathNoParens(path, options, print, args) {
                   ...(n.hasUnknownMembers ? [hardline, "..."] : []),
                 ])
               ),
-              comments.printDanglingComments(
-                path,
-                options,
-                /* sameIndent */ true
-              ),
+              printDanglingComments(path, options, /* sameIndent */ true),
               hardline,
               "}",
             ])
diff --git a/src/main/ast-to-doc.js b/src/main/ast-to-doc.js
index ebf9471d5..712ef02dc 100644
--- a/src/main/ast-to-doc.js
+++ b/src/main/ast-to-doc.js
@@ -3,7 +3,7 @@
 const assert = require("assert");
 const FastPath = require("../common/fast-path");
 const doc = require("../document");
-const comments = require("./comments");
+const { printComments } = require("./comments");
 const multiparser = require("./multiparser");
 
 const docBuilders = doc.builders;
@@ -59,7 +59,7 @@ function printAstToDoc(ast, options, alignmentSize = 0) {
     } else {
       // printComments will call the plugin print function and check for
       // comments to print
-      res = comments.printComments(
+      res = printComments(
         path,
         (p) => callPluginPrintFunction(p, options, printGenerically, args),
         options,

From ea17be725c89b7e81b879f36de9e0573112c2211 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Dec 2020 12:10:49 +0800
Subject: [PATCH 230/299] Move `isLastStatement` to `print/statement.js`
 (#9916)

---
 src/language-js/print/statement.js | 33 ++++++++++++++++++++++--------
 src/language-js/utils.js           | 17 ---------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/language-js/print/statement.js b/src/language-js/print/statement.js
index 8016fd5a7..03369bdb3 100644
--- a/src/language-js/print/statement.js
+++ b/src/language-js/print/statement.js
@@ -11,7 +11,6 @@ const {
   getLeftSidePathName,
   hasNakedLeftSide,
   isJsxNode,
-  isLastStatement,
   isTheOnlyJsxElementInMarkdown,
   hasComment,
   CommentCheckFlags,
@@ -19,7 +18,10 @@ const {
 const { locEnd } = require("../loc");
 const { shouldPrintParamsWithoutParens } = require("./function");
 
-/** @typedef {import("../../document").Doc} Doc */
+/**
+ * @typedef {import("../../document").Doc} Doc
+ * @typedef {import("../../common/fast-path")} FastPath
+ */
 
 function printStatement({ path, index, bodyNode, isClass }, options, print) {
   const node = path.getValue();
@@ -151,15 +153,30 @@ function expressionNeedsASIProtection(path, options) {
 }
 
 function printBody(path, options, print) {
-  return path.call((bodyPath) => {
-    return printStatementSequence(bodyPath, options, print);
-  }, "body");
+  return path.call(
+    (bodyPath) => printStatementSequence(bodyPath, options, print),
+    "body"
+  );
 }
 
 function printSwitchCaseConsequent(path, options, print) {
-  return path.call((bodyPath) => {
-    return printStatementSequence(bodyPath, options, print);
-  }, "consequent");
+  return path.call(
+    (bodyPath) => printStatementSequence(bodyPath, options, print),
+    "consequent"
+  );
+}
+
+/**
+ * @param {FastPath} path
+ * @returns {boolean}
+ */
+function isLastStatement(path) {
+  const parent = path.getParentNode();
+  const node = path.getValue();
+  const body = (parent.body || parent.consequent).filter(
+    (stmt) => stmt.type !== "EmptyStatement"
+  );
+  return body[body.length - 1] === node;
 }
 
 module.exports = {
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index 15286cc33..b3b0bb927 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -820,22 +820,6 @@ function hasPrettierIgnore(path) {
   return hasIgnoreComment(path) || hasJsxIgnoreComment(path);
 }
 
-/**
- * @param {FastPath} path
- * @returns {boolean}
- */
-function isLastStatement(path) {
-  const parent = path.getParentNode();
-  if (!parent) {
-    return true;
-  }
-  const node = path.getValue();
-  const body = (parent.body || parent.consequent).filter(
-    (stmt) => stmt.type !== "EmptyStatement"
-  );
-  return body[body.length - 1] === node;
-}
-
 /**
  * @param {string} text
  * @param {Node} typeAnnotation
@@ -1550,7 +1534,6 @@ module.exports = {
   isJestEachTemplateLiteral,
   isJsxNode,
   isJsxWhitespaceExpression,
-  isLastStatement,
   isLiteral,
   isLongCurriedCallExpression,
   isSimpleCallArgument,

From e46aaaabbaa3b273a82a9194cac30b81dfa3e77c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 14:16:25 +0800
Subject: [PATCH 231/299] Build(deps): Bump actions/setup-node from v2.1.3 to
 v2.1.4 (#9924)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/dev-package-test.yml | 2 +-
 .github/workflows/dev-test.yml         | 2 +-
 .github/workflows/lint.yml             | 2 +-
 .github/workflows/prod-test.yml        | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dev-package-test.yml b/.github/workflows/dev-package-test.yml
index 2cc7c1718..b65f53b10 100644
--- a/.github/workflows/dev-package-test.yml
+++ b/.github/workflows/dev-package-test.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.3
+        uses: actions/setup-node@v2.1.4
         with:
           node-version: ${{ matrix.node }}
 
diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml
index 6b2bce95d..1c4fcbc99 100644
--- a/.github/workflows/dev-test.yml
+++ b/.github/workflows/dev-test.yml
@@ -46,7 +46,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.3
+        uses: actions/setup-node@v2.1.4
         with:
           node-version: ${{ matrix.node }}
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1fc17a46d..0984a8e3e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.3
+        uses: actions/setup-node@v2.1.4
 
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
diff --git a/.github/workflows/prod-test.yml b/.github/workflows/prod-test.yml
index 440e9b680..45dca2c16 100644
--- a/.github/workflows/prod-test.yml
+++ b/.github/workflows/prod-test.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.3
+        uses: actions/setup-node@v2.1.4
 
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
@@ -60,7 +60,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.3
+        uses: actions/setup-node@v2.1.4
 
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
@@ -108,7 +108,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2.1.3
+        uses: actions/setup-node@v2.1.4
         with:
           node-version: ${{ matrix.node }}
 

From 67d6254bfa642f4e488eb02fe8fa7b25e40f4cb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 14:22:15 +0800
Subject: [PATCH 232/299] Build(deps): Bump outdent from 0.7.1 to 0.8.0 (#9923)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 114192875..e9dd24ded 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "minimatch": "3.0.4",
     "minimist": "1.2.5",
     "n-readlines": "1.0.1",
-    "outdent": "0.7.1",
+    "outdent": "0.8.0",
     "parse-srcset": "ikatyang/parse-srcset#54eb9c1cb21db5c62b4d0e275d7249516df6f0ee",
     "please-upgrade-node": "3.2.0",
     "postcss-less": "3.1.4",
diff --git a/yarn.lock b/yarn.lock
index 20be017af..f46c2b1e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5584,10 +5584,10 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-outdent@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/outdent/-/outdent-0.7.1.tgz#e9b400443622a97760b0bc74fa3223252ccd02a2"
-  integrity sha512-VjIzdUHunL74DdhcwMDt5FhNDQ8NYmTkuW0B+usIV2afS9aWT/1c9z1TsnFW349TP3nxmYeUl7Z++XpJRByvgg==
+outdent@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/outdent/-/outdent-0.8.0.tgz#2ebc3e77bf49912543f1008100ff8e7f44428eb0"
+  integrity sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==
 
 p-defer@^1.0.0:
   version "1.0.0"

From fa958b611f5788a86817aed191043e837b02fbca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 14:22:54 +0800
Subject: [PATCH 233/299] Build(deps): Bump @glimmer/syntax from 0.71.0 to
 0.72.0 (#9922)

Bumps [@glimmer/syntax](https://github.com/glimmerjs/glimmer-vm) from 0.71.0 to 0.72.0.
- [Release notes](https://github.com/glimmerjs/glimmer-vm/releases)
- [Changelog](https://github.com/glimmerjs/glimmer-vm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/glimmerjs/glimmer-vm/compare/v0.71.0...v0.72.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e9dd24ded..ffab1cf8d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "11.0.4",
     "@babel/code-frame": "7.12.11",
     "@babel/parser": "7.12.11",
-    "@glimmer/syntax": "0.71.0",
+    "@glimmer/syntax": "0.72.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.10.0",
     "angular-estree-parser": "2.3.0",
diff --git a/yarn.lock b/yarn.lock
index f46c2b1e6..46867e44d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1071,6 +1071,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.72.0.tgz#34817afba6736f68974cfbd14825a88032d60a63"
+  integrity sha512-o5zLnfca4FogcO4wfmerLGHpmJHz5mfUUB7uxabnLHBI53ABu+Gfmeaaye24lgQI9NyaHY/eSJlz+GtRtvMnSg==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/reference@0.71.0":
   version "0.71.0"
   resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.71.0.tgz#c58be3170e550c1fb94b80f47e2d7229e083bf79"
@@ -1082,13 +1089,13 @@
     "@glimmer/util" "0.71.0"
     "@glimmer/validator" "0.71.0"
 
-"@glimmer/syntax@0.71.0":
-  version "0.71.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.71.0.tgz#cd3cc1b87fa6bf696537a9232b306d541c9d88c8"
-  integrity sha512-4R/tCemL93LnyZaFVCjROnvv8uxPFNgrCx/+RH+qikJkn3kmo7uHws3mpa1xt1LT4Gpeo+NHURWx4h+9aYK7eg==
+"@glimmer/syntax@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.72.0.tgz#a7c22b8d1d7fb2c307d0df3ad68f826905a81794"
+  integrity sha512-HOA+dsI+tsqEvTZDZZWdnsV9wjAfCoKzmkYnzWOM+5RXOU9muRfRVp0wdu1cYF7J50QKp7gCmHLxzdLG7XcpDg==
   dependencies:
-    "@glimmer/interfaces" "0.71.0"
-    "@glimmer/util" "0.71.0"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/util" "0.72.0"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
@@ -1101,6 +1108,15 @@
     "@glimmer/interfaces" "0.71.0"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.72.0.tgz#77fdce5c14649651117d5e795b2870c48158b2c9"
+  integrity sha512-OlVmdMaV1o7UxWqhmuGXOlgpXgtynwp3zD5ypdWuf6IzNDeFf2OAsHaZY+GYqE+uDjx1u6xb+Q9xTXk7U7Bhow==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.72.0"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.71.0":
   version "0.71.0"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.71.0.tgz#b049d75717e1ef210c6e7096c46b6d18b3bac1c9"

From df8eef00130c409950468f18d57082ded0a0ce8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 14:23:37 +0800
Subject: [PATCH 234/299] Build(deps): Bump @angular/compiler from 11.0.4 to
 11.0.5 (#9921)

Bumps [@angular/compiler](https://github.com/angular/angular/tree/HEAD/packages/compiler) from 11.0.4 to 11.0.5.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/HEAD/packages/compiler)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ffab1cf8d..2eb17fa00 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "bin"
   ],
   "dependencies": {
-    "@angular/compiler": "11.0.4",
+    "@angular/compiler": "11.0.5",
     "@babel/code-frame": "7.12.11",
     "@babel/parser": "7.12.11",
     "@glimmer/syntax": "0.72.0",
diff --git a/yarn.lock b/yarn.lock
index 46867e44d..05f41f1fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/compiler@11.0.4":
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.4.tgz#8cc4e92ac9734d707828c02c487eff2cd1a69d02"
-  integrity sha512-Smf8FKSjkqd522ZCdXjSnVv1lYA0b21AN3WC5L1mwtRwyl/VacqCA/YEklLneDGgI2FdSIC9+bzSQIV+CCVftA==
+"@angular/compiler@11.0.5":
+  version "11.0.5"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.5.tgz#7622dbf81356ffc3f58ab034201f71f37c35d2fb"
+  integrity sha512-japxEn07P9z9FnW8ii+M5DIfgRAGNxl6QNQWKBkNo5ytN6iCAB7pVbJI0vn1AUT9TByV3+xDW/FNuoSuzsnX3w==
   dependencies:
     tslib "^2.0.0"
 

From 0fd2a28cff2c37469d1a12411814a0a557f2e302 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Dec 2020 14:31:51 +0800
Subject: [PATCH 235/299] Enable `arrow-body-style` rule (#9918)

---
 .eslintrc.yml                                 |  3 ++
 src/language-css/utils.js                     | 10 ++--
 src/language-html/print-preprocess.js         | 21 +++-----
 src/language-js/embed/css.js                  | 16 ++++--
 src/language-js/print/type-parameters.js      |  4 +-
 src/language-js/printer-estree.js             |  4 +-
 src/language-markdown/mdx.js                  |  5 +-
 src/language-markdown/printer-markdown.js     |  7 ++-
 src/language-markdown/utils.js                |  6 +--
 src/main/options-normalizer.js                | 10 ++--
 .../__tests__/config-resolution.js            |  7 ++-
 website/pages/en/index.js                     | 54 +++++++++----------
 website/pages/en/users/index.js               | 12 ++---
 website/playground/markdown.js                |  4 +-
 14 files changed, 74 insertions(+), 89 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 07ed97f37..d7688400b 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -13,6 +13,9 @@ plugins:
 settings:
   import/internal-regex: ^linguist-languages/
 rules:
+  arrow-body-style:
+    - error
+    - as-needed
   curly: error
   dot-notation: error
   eqeqeq:
diff --git a/src/language-css/utils.js b/src/language-css/utils.js
index c94814de3..7cd711416 100644
--- a/src/language-css/utils.js
+++ b/src/language-css/utils.js
@@ -427,16 +427,16 @@ function lastLineHasInlineComment(text) {
 function stringifyNode(node) {
   if (node.groups) {
     const open = node.open && node.open.value ? node.open.value : "";
-    const groups = node.groups.reduce((previousValue, currentValue, index) => {
-      return (
+    const groups = node.groups.reduce(
+      (previousValue, currentValue, index) =>
         previousValue +
         stringifyNode(currentValue) +
         (node.groups[0].type === "comma_group" &&
         index !== node.groups.length - 1
           ? ","
-          : "")
-      );
-    }, "");
+          : ""),
+      ""
+    );
     const close = node.close && node.close.value ? node.close.value : "";
 
     return open + groups + close;
diff --git a/src/language-html/print-preprocess.js b/src/language-html/print-preprocess.js
index dff04b832..60550e81c 100644
--- a/src/language-html/print-preprocess.js
+++ b/src/language-html/print-preprocess.js
@@ -440,19 +440,14 @@ function addIsSpaceSensitive(ast, options) {
 
     return node.clone({
       children: node.children
-        .map((child) => {
-          return {
-            ...child,
-            isLeadingSpaceSensitive: isLeadingSpaceSensitiveNode(
-              child,
-              options
-            ),
-            isTrailingSpaceSensitive: isTrailingSpaceSensitiveNode(
-              child,
-              options
-            ),
-          };
-        })
+        .map((child) => ({
+          ...child,
+          isLeadingSpaceSensitive: isLeadingSpaceSensitiveNode(child, options),
+          isTrailingSpaceSensitive: isTrailingSpaceSensitiveNode(
+            child,
+            options
+          ),
+        }))
         .map((child, index, children) => ({
           ...child,
           isLeadingSpaceSensitive:
diff --git a/src/language-js/embed/css.js b/src/language-js/embed/css.js
index 9eb9608dd..cfd25cece 100644
--- a/src/language-js/embed/css.js
+++ b/src/language-js/embed/css.js
@@ -12,11 +12,17 @@ function format(path, print, textToDoc) {
   // Get full template literal with expressions replaced by placeholders
   const rawQuasis = node.quasis.map((q) => q.value.raw);
   let placeholderID = 0;
-  const text = rawQuasis.reduce((prevVal, currVal, idx) => {
-    return idx === 0
-      ? currVal
-      : prevVal + "@prettier-placeholder-" + placeholderID++ + "-id" + currVal;
-  }, "");
+  const text = rawQuasis.reduce(
+    (prevVal, currVal, idx) =>
+      idx === 0
+        ? currVal
+        : prevVal +
+          "@prettier-placeholder-" +
+          placeholderID++ +
+          "-id" +
+          currVal,
+    ""
+  );
   const doc = textToDoc(
     text,
     { parser: "scss" },
diff --git a/src/language-js/print/type-parameters.js b/src/language-js/print/type-parameters.js
index eb1e9fc79..438510527 100644
--- a/src/language-js/print/type-parameters.js
+++ b/src/language-js/print/type-parameters.js
@@ -109,9 +109,7 @@ function printTypeParameter(path, options, print) {
     if (parent.nameType) {
       parts.push(
         " as ",
-        path.callParent((path) => {
-          return path.call(print, "nameType");
-        })
+        path.callParent((path) => path.call(print, "nameType"))
       );
     }
     parts.push("]");
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index fc392fbcd..32f0abd40 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -563,9 +563,7 @@ function printPathNoParens(path, options, print, args) {
     case "ConditionalExpression":
       return printTernary(path, options, print);
     case "VariableDeclaration": {
-      const printed = path.map((childPath) => {
-        return print(childPath);
-      }, "declarations");
+      const printed = path.map((childPath) => print(childPath), "declarations");
 
       // We generally want to terminate all variable declarations with a
       // semicolon, except when they in the () part of for loops.
diff --git a/src/language-markdown/mdx.js b/src/language-markdown/mdx.js
index 9a7ca3101..70d3087f4 100644
--- a/src/language-markdown/mdx.js
+++ b/src/language-markdown/mdx.js
@@ -46,9 +46,8 @@ const tokenizeEsSyntax = (eat, value) => {
 };
 
 /* istanbul ignore next */
-tokenizeEsSyntax.locator = (value /*, fromIndex*/) => {
-  return isExport(value) || isImport(value) ? -1 : 1;
-};
+tokenizeEsSyntax.locator = (value /*, fromIndex*/) =>
+  isExport(value) || isImport(value) ? -1 : 1;
 
 function esSyntax() {
   const { Parser } = this;
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index ec0644bc1..d55d1bb83 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -422,11 +422,10 @@ function genericPrint(path, options, print) {
                 align(
                   " ".repeat(4),
                   printChildren(path, options, print, {
-                    processor: (childPath, index) => {
-                      return index === 0
+                    processor: (childPath, index) =>
+                      index === 0
                         ? group(concat([softline, childPath.call(print)]))
-                        : childPath.call(print);
-                    },
+                        : childPath.call(print),
                   })
                 ),
                 nextNode && nextNode.type === "footnoteDefinition"
diff --git a/src/language-markdown/utils.js b/src/language-markdown/utils.js
index 4396d48f0..166fc37f4 100644
--- a/src/language-markdown/utils.js
+++ b/src/language-markdown/utils.js
@@ -213,9 +213,9 @@ function mapAst(ast, handler) {
 
     const newNode = { ...handler(node, index, parentStack) };
     if (newNode.children) {
-      newNode.children = newNode.children.map((child, index) => {
-        return preorder(child, index, [newNode].concat(parentStack));
-      });
+      newNode.children = newNode.children.map((child, index) =>
+        preorder(child, index, [newNode].concat(parentStack))
+      );
     }
 
     return newNode;
diff --git a/src/main/options-normalizer.js b/src/main/options-normalizer.js
index b93ddce28..02224dcc7 100644
--- a/src/main/options-normalizer.js
+++ b/src/main/options-normalizer.js
@@ -166,13 +166,11 @@ function optionInfoToSchema(optionInfo, { isCLI, optionInfos }) {
   }
 
   if (optionInfo.exception) {
-    parameters.validate = (value, schema, utils) => {
-      return optionInfo.exception(value) || schema.validate(value, utils);
-    };
+    parameters.validate = (value, schema, utils) =>
+      optionInfo.exception(value) || schema.validate(value, utils);
   } else {
-    parameters.validate = (value, schema, utils) => {
-      return value === undefined || schema.validate(value, utils);
-    };
+    parameters.validate = (value, schema, utils) =>
+      value === undefined || schema.validate(value, utils);
   }
 
   /* istanbul ignore next */
diff --git a/tests_integration/__tests__/config-resolution.js b/tests_integration/__tests__/config-resolution.js
index 136157651..e126fc0f7 100644
--- a/tests_integration/__tests__/config-resolution.js
+++ b/tests_integration/__tests__/config-resolution.js
@@ -79,11 +79,10 @@ describe("CLI overrides take precedence", () => {
   });
 });
 
-test("API resolveConfig with no args", () => {
-  return prettier.resolveConfig().then((result) => {
+test("API resolveConfig with no args", () =>
+  prettier.resolveConfig().then((result) => {
     expect(result).toEqual({});
-  });
-});
+  }));
 
 test("API resolveConfig.sync with no args", () => {
   expect(prettier.resolveConfig.sync()).toEqual({});
diff --git a/website/pages/en/index.js b/website/pages/en/index.js
index 2737d81a6..300ca865d 100755
--- a/website/pages/en/index.js
+++ b/website/pages/en/index.js
@@ -45,32 +45,30 @@ function Tidelift() {
   );
 }
 
-const HomeSplash = (props) => {
-  return (
-    <div className="homeContainer">
-      <Tidelift />
-      <div className="homeSplashFade">
-        <div className="wrapper homeWrapper">
-          <div className="animatedLogoWrapper">
-            <AnimatedLogo version="wide" />
-          </div>
-          <div className="inner">
-            <div className="section promoSection">
-              <div className="promoRow">
-                <div className="pluginRowBlock">
-                  <Button href="/playground/">Try It Online</Button>&nbsp;
-                  <Button href={"/docs/" + props.language + "/install.html"}>
-                    Install Prettier
-                  </Button>
-                </div>
+const HomeSplash = (props) => (
+  <div className="homeContainer">
+    <Tidelift />
+    <div className="homeSplashFade">
+      <div className="wrapper homeWrapper">
+        <div className="animatedLogoWrapper">
+          <AnimatedLogo version="wide" />
+        </div>
+        <div className="inner">
+          <div className="section promoSection">
+            <div className="promoRow">
+              <div className="pluginRowBlock">
+                <Button href="/playground/">Try It Online</Button>&nbsp;
+                <Button href={"/docs/" + props.language + "/install.html"}>
+                  Install Prettier
+                </Button>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-  );
-};
+  </div>
+);
 
 HomeSplash.propTypes = {
   language: PropTypes.string,
@@ -242,16 +240,12 @@ const EditorSupportSection = () => (
 
 const UsersSection = ({ language }) => {
   const showcase = siteConfig.users
-    .filter((user) => {
-      return user.pinned;
-    })
-    .map((user, i) => {
-      return (
-        <a key={i} className="growOnHover alignCenter" href={user.infoLink}>
-          <img className="user" src={user.greyImage} title={user.caption} />
-        </a>
-      );
-    });
+    .filter((user) => user.pinned)
+    .map((user, i) => (
+      <a key={i} className="growOnHover alignCenter" href={user.infoLink}>
+        <img className="user" src={user.greyImage} title={user.caption} />
+      </a>
+    ));
 
   return (
     <div className="usersSection productShowcaseSection">
diff --git a/website/pages/en/users/index.js b/website/pages/en/users/index.js
index 117fd8127..227e689f5 100644
--- a/website/pages/en/users/index.js
+++ b/website/pages/en/users/index.js
@@ -7,13 +7,11 @@ const siteConfig = require(process.cwd() + "/siteConfig.js");
 
 class Users extends React.Component {
   render() {
-    const showcase = siteConfig.users.map((user, i) => {
-      return (
-        <a key={i} href={user.infoLink}>
-          <img src={user.image} title={user.caption} />
-        </a>
-      );
-    });
+    const showcase = siteConfig.users.map((user, i) => (
+      <a key={i} href={user.infoLink}>
+        <img src={user.image} title={user.caption} />
+      </a>
+    ));
 
     return (
       <div>
diff --git a/website/playground/markdown.js b/website/playground/markdown.js
index b9bdfc870..79e3ade45 100644
--- a/website/playground/markdown.js
+++ b/website/playground/markdown.js
@@ -27,9 +27,7 @@ function formatMarkdown(
       isIdempotent ? [] : ["", "**Second Output:**", codeBlock(output2, syntax)]
     )
     .concat(full ? ["", "**Expected behavior:**", ""] : [])
-    .filter((part) => {
-      return part != null;
-    })
+    .filter((part) => part != null)
     .join("\n");
 }
 

From c7e354e38cfd051d3f64b56aeda35e9a0a669de6 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Dec 2020 14:46:59 +0800
Subject: [PATCH 236/299] Add `isNonEmptyArray` (#9902)

---
 .eslintrc.yml                                 |   1 +
 .../index.js                                  |   1 +
 .../prefer-is-non-empty-array.js              | 152 ++++++++++++++++++
 src/common/util.js                            |   5 +
 src/language-css/printer-postcss.js           |   3 +-
 src/language-css/utils.js                     |   5 +-
 src/language-graphql/printer-graphql.js       |   6 +-
 src/language-html/ast.js                      |   7 +-
 src/language-html/printer-html.js             |   4 +-
 src/language-js/comments.js                   |   6 +-
 src/language-js/embed/css.js                  |   3 +-
 src/language-js/loc.js                        |   4 +-
 src/language-js/print/assignment.js           |   4 +-
 src/language-js/print/block.js                |   6 +-
 src/language-js/print/class.js                |  13 +-
 src/language-js/print/interface.js            |   5 +-
 src/language-js/print/misc.js                 |   3 +-
 src/language-js/print/module.js               |   7 +-
 src/language-js/printer-estree.js             |   7 +-
 src/language-js/utils.js                      |   3 +-
 src/language-markdown/printer-markdown.js     |   3 +-
 src/language-yaml/utils.js                    |  12 +-
 src/main/comments.js                          |   3 +-
 23 files changed, 215 insertions(+), 48 deletions(-)
 create mode 100644 scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js

diff --git a/.eslintrc.yml b/.eslintrc.yml
index d7688400b..d0e2c6b1a 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -109,6 +109,7 @@ overrides:
   - files: src/**/*.js
     rules:
       prettier-internal-rules/prefer-fast-path-each: error
+      prettier-internal-rules/prefer-is-non-empty-array: error
   - files:
       - src/language-*/**/*.js
     rules:
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
index 3dffdeef9..9837c5ae5 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
@@ -7,6 +7,7 @@ module.exports = {
     "jsx-identifier-case": require("./jsx-identifier-case"),
     "no-node-comments": require("./no-node-comments"),
     "prefer-fast-path-each": require("./prefer-fast-path-each"),
+    "prefer-is-non-empty-array": require("./prefer-is-non-empty-array"),
     "require-json-extensions": require("./require-json-extensions"),
   },
 };
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js b/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js
new file mode 100644
index 000000000..81fe8932e
--- /dev/null
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js
@@ -0,0 +1,152 @@
+"use strict";
+
+const getLengthSelector = (path) =>
+  `[${path}.type="MemberExpression"][${path}.property.type="Identifier"][${path}.property.name="length"]`;
+const selector = [
+  "LogicalExpression",
+  ':not(FunctionDeclaration[id.name="isNonEmptyArray"] *)',
+  '[operator="&&"]',
+  `:matches(${[
+    // `&& foo.length`
+    getLengthSelector("right"),
+    // `&& foo.length !== 0`
+    // `&& foo.length > 0`
+    [
+      '[right.type="BinaryExpression"]',
+      ':matches([right.operator="!=="], [right.operator=">"])',
+      getLengthSelector("right.left"),
+      '[right.right.type="Literal"]',
+      '[right.right.raw="0"]',
+    ].join(""),
+  ].join(", ")})`,
+].join("");
+
+const negativeSelector = [
+  "LogicalExpression",
+  '[operator="||"]',
+  `:matches(${[
+    // `|| !foo.length`
+    [
+      '[right.type="UnaryExpression"]',
+      '[right.operator="!"]',
+      getLengthSelector("right.argument"),
+    ].join(""),
+    // `|| foo.length === 0`
+    [
+      '[right.type="BinaryExpression"]',
+      '[right.operator="==="]',
+      getLengthSelector("right.left"),
+      '[right.right.type="Literal"]',
+      '[right.right.raw="0"]',
+    ].join(""),
+  ].join(", ")})`,
+].join("");
+
+const isArrayIsArrayCall = (node) =>
+  node.type === "CallExpression" &&
+  node.callee.type === "MemberExpression" &&
+  node.callee.object.type === "Identifier" &&
+  node.callee.object.name === "Array" &&
+  node.callee.property.type === "Identifier" &&
+  node.callee.property.name === "isArray";
+
+const MESSAGE_ID = "prefer-is-non-empty-array";
+
+module.exports = {
+  meta: {
+    type: "suggestion",
+    docs: {
+      url:
+        "https://github.com/prettier/prettier/blob/master/scripts/eslint-plugin-prettier-internal-rules/prefer-is-non-empty-array.js",
+    },
+    messages: {
+      [MESSAGE_ID]: "Please use `isNonEmptyArray()`.",
+    },
+    fixable: "code",
+  },
+  create(context) {
+    const sourceCode = context.getSourceCode();
+
+    return {
+      [selector](node) {
+        let { left, right } = node;
+
+        while (left.type === "LogicalExpression" && left.operator === "&&") {
+          left = left.right;
+        }
+
+        let leftObject = left;
+        // `Array.isArray(foo)`
+        if (isArrayIsArrayCall(leftObject)) {
+          leftObject = leftObject.arguments[0];
+        }
+
+        const rightObject =
+          right.type === "BinaryExpression" ? right.left.object : right.object;
+        const objectText = sourceCode.getText(rightObject);
+        // Simple compare with code
+        if (sourceCode.getText(leftObject) !== objectText) {
+          return;
+        }
+
+        const [start] = left.range;
+        const [, end] = node.range;
+        context.report({
+          loc: {
+            start: sourceCode.getLocFromIndex(start),
+            end: sourceCode.getLocFromIndex(end),
+          },
+          messageId: MESSAGE_ID,
+          fix(fixer) {
+            return fixer.replaceTextRange(
+              [start, end],
+              `isNonEmptyArray(${objectText})`
+            );
+          },
+        });
+      },
+      [negativeSelector](node) {
+        let { left, right } = node;
+
+        while (left.type === "LogicalExpression" && left.operator === "||") {
+          left = left.right;
+        }
+
+        if (!left.type === "UnaryExpression" || left.operator !== "!") {
+          return;
+        }
+
+        const rightObject =
+          right.type === "UnaryExpression"
+            ? right.argument.object
+            : right.left.object;
+        let leftObject = left.argument;
+        if (isArrayIsArrayCall(leftObject)) {
+          leftObject = leftObject.arguments[0];
+        }
+
+        const objectText = sourceCode.getText(rightObject);
+        // Simple compare with code
+        if (sourceCode.getText(leftObject) !== objectText) {
+          return;
+        }
+
+        const [start] = left.range;
+        const [, end] = node.range;
+        context.report({
+          loc: {
+            start: sourceCode.getLocFromIndex(start),
+            end: sourceCode.getLocFromIndex(end),
+          },
+          messageId: MESSAGE_ID,
+          fix(fixer) {
+            return fixer.replaceTextRange(
+              [start, end],
+              `!isNonEmptyArray(${objectText})`
+            );
+          },
+        });
+      },
+    };
+  },
+};
diff --git a/src/common/util.js b/src/common/util.js
index 50d33bfb1..e6d6225a8 100644
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -624,6 +624,10 @@ function getShebang(text) {
   return text.slice(0, index);
 }
 
+function isNonEmptyArray(object) {
+  return Array.isArray(object) && object.length > 0;
+}
+
 module.exports = {
   inferParserByLanguage,
   replaceEndOfLineWith,
@@ -660,4 +664,5 @@ module.exports = {
   addTrailingComment,
   isFrontMatterNode,
   getShebang,
+  isNonEmptyArray,
 };
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index bbbf0c3e6..346b822ae 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -6,6 +6,7 @@ const {
   hasNewline,
   isFrontMatterNode,
   isNextLineEmpty,
+  isNonEmptyArray,
 } = require("../common/util");
 const {
   builders: {
@@ -469,7 +470,7 @@ function genericPrint(path, options, print) {
     case "selector-pseudo": {
       return concat([
         maybeToLowerCase(node.value),
-        node.nodes && node.nodes.length > 0
+        isNonEmptyArray(node.nodes)
           ? concat(["(", join(", ", path.map(print, "nodes")), ")"])
           : "",
       ]);
diff --git a/src/language-css/utils.js b/src/language-css/utils.js
index 7cd711416..20e1bff38 100644
--- a/src/language-css/utils.js
+++ b/src/language-css/utils.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const { isNonEmptyArray } = require("../common/util");
 const colorAdjusterFunctions = new Set([
   "red",
   "green",
@@ -59,7 +60,7 @@ function getPropOfDeclNode(path) {
 }
 
 function hasSCSSInterpolation(groupList) {
-  if (groupList && groupList.length) {
+  if (isNonEmptyArray(groupList)) {
     for (let i = groupList.length - 1; i > 0; i--) {
       // If we find `#{`, return true.
       if (
@@ -76,7 +77,7 @@ function hasSCSSInterpolation(groupList) {
 }
 
 function hasStringOrFunction(groupList) {
-  if (groupList && groupList.length) {
+  if (isNonEmptyArray(groupList)) {
     for (let i = 0; i < groupList.length; i++) {
       if (groupList[i].type === "string" || groupList[i].type === "func") {
         return true;
diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js
index 28cc63a8f..f12a86285 100644
--- a/src/language-graphql/printer-graphql.js
+++ b/src/language-graphql/printer-graphql.js
@@ -3,7 +3,7 @@
 const {
   builders: { concat, join, hardline, line, softline, group, indent, ifBreak },
 } = require("../document");
-const { isNextLineEmpty } = require("../common/util");
+const { isNextLineEmpty, isNonEmptyArray } = require("../common/util");
 const { insertPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
 
@@ -39,7 +39,7 @@ function genericPrint(path, options, print) {
       return concat([
         hasOperation ? n.operation : "",
         hasOperation && hasName ? concat([" ", path.call(print, "name")]) : "",
-        n.variableDefinitions && n.variableDefinitions.length
+        isNonEmptyArray(n.variableDefinitions)
           ? group(
               concat([
                 "(",
@@ -66,7 +66,7 @@ function genericPrint(path, options, print) {
       return concat([
         "fragment ",
         path.call(print, "name"),
-        n.variableDefinitions && n.variableDefinitions.length
+        isNonEmptyArray(n.variableDefinitions)
           ? group(
               concat([
                 "(",
diff --git a/src/language-html/ast.js b/src/language-html/ast.js
index 85279d5c2..f612f67be 100644
--- a/src/language-html/ast.js
+++ b/src/language-html/ast.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const { isNonEmptyArray } = require("../common/util");
 const NODES_KEYS = {
   attrs: true,
   children: true,
@@ -71,13 +72,11 @@ class Node {
   }
 
   get firstChild() {
-    return this.children && this.children.length !== 0
-      ? this.children[0]
-      : null;
+    return isNonEmptyArray(this.children) ? this.children[0] : null;
   }
 
   get lastChild() {
-    return this.children && this.children.length !== 0
+    return isNonEmptyArray(this.children)
       ? this.children[this.children.length - 1]
       : null;
   }
diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index c00ee53f4..9110cfde0 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -18,7 +18,7 @@ const {
   },
   utils: { mapDoc, cleanDoc },
 } = require("../document");
-const { replaceEndOfLineWith } = require("../common/util");
+const { replaceEndOfLineWith, isNonEmptyArray } = require("../common/util");
 const { print: printFrontMatter } = require("../utils/front-matter");
 const clean = require("./clean");
 const {
@@ -657,7 +657,7 @@ function getNodeContent(node, options) {
 function printAttributes(path, options, print) {
   const node = path.getValue();
 
-  if (!node.attrs || node.attrs.length === 0) {
+  if (!isNonEmptyArray(node.attrs)) {
     return node.isSelfClosing
       ? /**
          *     <br />
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index 128026d41..fdf2fda37 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -10,6 +10,7 @@ const {
   addTrailingComment,
   addDanglingComment,
   getNextNonSpaceNonCommentCharacterIndex,
+  isNonEmptyArray,
 } = require("../common/util");
 const {
   isBlockComment,
@@ -386,8 +387,7 @@ function handleClassComments({
       enclosingNode.type === "TSInterfaceDeclaration")
   ) {
     if (
-      enclosingNode.decorators &&
-      enclosingNode.decorators.length > 0 &&
+      isNonEmptyArray(enclosingNode.decorators) &&
       !(followingNode && followingNode.type === "Decorator")
     ) {
       addTrailingComment(
@@ -924,7 +924,7 @@ function getCommentChildNodes(node, options) {
     node.value.type === "FunctionExpression" &&
     getFunctionParameters(node.value).length === 0 &&
     !node.value.returnType &&
-    (!node.value.typeParameters || node.value.typeParameters.length === 0) &&
+    !isNonEmptyArray(node.value.typeParameters) &&
     node.value.body
   ) {
     return [...(node.decorators || []), node.key, node.value.body];
diff --git a/src/language-js/embed/css.js b/src/language-js/embed/css.js
index cfd25cece..13ddda499 100644
--- a/src/language-js/embed/css.js
+++ b/src/language-js/embed/css.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const { isNonEmptyArray } = require("../../common/util");
 const {
   builders: { indent, hardline, softline, concat },
   utils: { mapDoc, replaceNewlinesWithLiterallines, cleanDoc },
@@ -52,7 +53,7 @@ function transformCssDoc(quasisDoc, parentNode, expressionDocs) {
 // returns a new doc with all the placeholders replaced,
 // or null if it couldn't replace any expression
 function replacePlaceholders(quasisDoc, expressionDocs) {
-  if (!expressionDocs || !expressionDocs.length) {
+  if (!isNonEmptyArray(expressionDocs)) {
     return quasisDoc;
   }
   let replaceCounter = 0;
diff --git a/src/language-js/loc.js b/src/language-js/loc.js
index d6409ca92..68b020010 100644
--- a/src/language-js/loc.js
+++ b/src/language-js/loc.js
@@ -1,5 +1,7 @@
 "use strict";
 
+const { isNonEmptyArray } = require("../common/util");
+
 /**
  * @typedef {import("./types/estree").Node} Node
  */
@@ -12,7 +14,7 @@ function locStart(node, opts) {
     const decorators =
       (node.declaration && node.declaration.decorators) || node.decorators;
 
-    if (decorators && decorators.length > 0) {
+    if (isNonEmptyArray(decorators)) {
       return locStart(decorators[0]);
     }
   }
diff --git a/src/language-js/print/assignment.js b/src/language-js/print/assignment.js
index 5088c610a..8155f2d40 100644
--- a/src/language-js/print/assignment.js
+++ b/src/language-js/print/assignment.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const { isNonEmptyArray } = require("../../common/util");
 const {
   builders: { concat, line, group, indent },
 } = require("../../document");
@@ -69,8 +70,7 @@ function printAssignmentRight(leftNode, rightNode, printedRight, options) {
       !shouldInlineLogicalExpression(rightNode.test)) ||
     rightNode.type === "StringLiteralTypeAnnotation" ||
     (rightNode.type === "ClassExpression" &&
-      rightNode.decorators &&
-      rightNode.decorators.length) ||
+      isNonEmptyArray(rightNode.decorators)) ||
     ((leftNode.type === "Identifier" ||
       isStringLiteral(leftNode) ||
       leftNode.type === "MemberExpression") &&
diff --git a/src/language-js/print/block.js b/src/language-js/print/block.js
index 694501fc8..057ad9634 100644
--- a/src/language-js/print/block.js
+++ b/src/language-js/print/block.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const { printDanglingComments } = require("../../main/comments");
-const { isNextLineEmpty } = require("../../common/util");
+const { isNextLineEmpty, isNonEmptyArray } = require("../../common/util");
 const {
   builders: { concat, hardline, indent },
 } = require("../../document");
@@ -21,7 +21,6 @@ function printBlock(path, options, print) {
   }
 
   parts.push("{");
-
   const printed = printBlockBody(path, options, print);
   if (printed) {
     parts.push(indent(concat([hardline, printed])), hardline);
@@ -58,8 +57,7 @@ function printBlock(path, options, print) {
 function printBlockBody(path, options, print) {
   const node = path.getValue();
 
-  const nodeHasDirectives =
-    Array.isArray(node.directives) && node.directives.length > 0;
+  const nodeHasDirectives = isNonEmptyArray(node.directives);
   const nodeHasBody = node.body.some((node) => node.type !== "EmptyStatement");
   const nodeHasComment = hasComment(node, CommentCheckFlags.Dangling);
 
diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
index b0e588c54..d8169cf10 100644
--- a/src/language-js/print/class.js
+++ b/src/language-js/print/class.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const { isNonEmptyArray } = require("../../common/util");
 const { printComments, printDanglingComments } = require("../../main/comments");
 const {
   builders: { concat, join, line, hardline, softline, group, indent, ifBreak },
@@ -35,9 +36,9 @@ function printClass(path, options, print) {
   const groupMode =
     (n.id && hasComment(n.id, CommentCheckFlags.Trailing)) ||
     (n.superClass && hasComment(n.superClass)) ||
-    (n.extends && n.extends.length !== 0) || // DeclareClass
-    (n.mixins && n.mixins.length !== 0) ||
-    (n.implements && n.implements.length !== 0);
+    isNonEmptyArray(n.extends) || // DeclareClass
+    isNonEmptyArray(n.mixins) ||
+    isNonEmptyArray(n.implements);
 
   const partsGroup = [];
   const extendsParts = [];
@@ -113,7 +114,7 @@ function shouldIndentOnlyHeritageClauses(node) {
 
 function printList(path, options, print, listName) {
   const n = path.getValue();
-  if (!n[listName] || n[listName].length === 0) {
+  if (!isNonEmptyArray(n[listName])) {
     return "";
   }
 
@@ -158,7 +159,7 @@ function printClassMethod(path, options, print) {
   const n = path.getValue();
   const parts = [];
 
-  if (n.decorators && n.decorators.length !== 0) {
+  if (isNonEmptyArray(n.decorators)) {
     parts.push(printDecorators(path, options, print));
   }
   if (n.accessibility) {
@@ -197,7 +198,7 @@ function printClassProperty(path, options, print) {
   const parts = [];
   const semi = options.semi ? ";" : "";
 
-  if (n.decorators && n.decorators.length !== 0) {
+  if (isNonEmptyArray(n.decorators)) {
     parts.push(printDecorators(path, options, print));
   }
   if (n.accessibility) {
diff --git a/src/language-js/print/interface.js b/src/language-js/print/interface.js
index 84f42657e..68e7d07e3 100644
--- a/src/language-js/print/interface.js
+++ b/src/language-js/print/interface.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const { isNonEmptyArray } = require("../../common/util");
 const {
   builders: { concat, join, line, group, indent, ifBreak },
 } = require("../../document");
@@ -41,7 +42,7 @@ function printInterface(path, options, print) {
       CommentCheckFlags.Trailing | CommentCheckFlags.Line
     );
 
-  if (n.extends && n.extends.length !== 0) {
+  if (isNonEmptyArray(n.extends)) {
     extendsParts.push(
       shouldIndentOnlyHeritageClauses
         ? ifBreak(" ", line, {
@@ -57,7 +58,7 @@ function printInterface(path, options, print) {
 
   if (
     (n.id && hasComment(n.id, CommentCheckFlags.Trailing)) ||
-    (n.extends && n.extends.length !== 0)
+    isNonEmptyArray(n.extends)
   ) {
     const printedExtends = concat(extendsParts);
     if (shouldIndentOnlyHeritageClauses) {
diff --git a/src/language-js/print/misc.js b/src/language-js/print/misc.js
index 8623edb6a..892365c5f 100644
--- a/src/language-js/print/misc.js
+++ b/src/language-js/print/misc.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const { isNonEmptyArray } = require("../../common/util");
 const {
   builders: { concat, indent, join, line },
 } = require("../../document");
@@ -67,7 +68,7 @@ function printBindExpressionCallee(path, options, print) {
 
 function printTypeScriptModifiers(path, options, print) {
   const n = path.getValue();
-  if (!n.modifiers || !n.modifiers.length) {
+  if (!isNonEmptyArray(n.modifiers)) {
     return "";
   }
   return concat([join(" ", path.map(print, "modifiers")), " "]);
diff --git a/src/language-js/print/module.js b/src/language-js/print/module.js
index af0de27b9..567c6cb54 100644
--- a/src/language-js/print/module.js
+++ b/src/language-js/print/module.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const { isNonEmptyArray } = require("../../common/util");
 const {
   builders: { concat, softline, group, indent, join, line, ifBreak, hardline },
 } = require("../../document");
@@ -168,7 +169,7 @@ function printModuleSpecifiers(path, options, print) {
   /** @type{Doc[]} */
   const parts = [" "];
 
-  if (node.specifiers && node.specifiers.length > 0) {
+  if (isNonEmptyArray(node.specifiers)) {
     const standaloneSpecifiers = [];
     const groupedSpecifiers = [];
 
@@ -246,7 +247,7 @@ function shouldNotPrintSpecifiers(node, options) {
 
   if (
     type !== "ImportDeclaration" ||
-    (Array.isArray(specifiers) && specifiers.length > 0) ||
+    isNonEmptyArray(specifiers) ||
     importKind === "type"
   ) {
     return false;
@@ -260,7 +261,7 @@ function shouldNotPrintSpecifiers(node, options) {
 
 function printImportAssertions(path, options, print) {
   const node = path.getNode();
-  if (Array.isArray(node.assertions) && node.assertions.length !== 0) {
+  if (isNonEmptyArray(node.assertions)) {
     return concat([
       " assert {",
       options.bracketSpacing ? " " : "",
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 32f0abd40..8102d22a7 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -12,6 +12,7 @@ const {
   printString,
   printNumber,
   isNextLineEmpty,
+  isNonEmptyArray,
 } = require("../common/util");
 const {
   builders: {
@@ -127,8 +128,7 @@ function genericPrint(path, options, printPath, args) {
   ) {
     // their decorators are handled themselves
   } else if (
-    node.decorators &&
-    node.decorators.length > 0 &&
+    isNonEmptyArray(node.decorators) &&
     // If the parent node is an export declaration and the decorator
     // was written before the export, the export will be responsible
     // for printing the decorators.
@@ -162,8 +162,7 @@ function genericPrint(path, options, printPath, args) {
   } else if (
     isExportDeclaration(node) &&
     node.declaration &&
-    node.declaration.decorators &&
-    node.declaration.decorators.length > 0 &&
+    isNonEmptyArray(node.declaration.decorators) &&
     // Only print decorators here if they were written before the export,
     // otherwise they are printed by the node.declaration
     locStart(node, { ignoreDecorators: true }) >
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index b3b0bb927..0f49e57eb 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -6,6 +6,7 @@ const {
   hasNewline,
   hasNewlineInRange,
   skipWhitespace,
+  isNonEmptyArray,
 } = require("../common/util");
 const { locStart, locEnd, hasSameLocStart } = require("./loc");
 
@@ -1470,7 +1471,7 @@ const getCommentTestFunction = (flags, fn) => {
  * @returns {boolean}
  */
 function hasComment(node, flags, fn) {
-  if (!node || !Array.isArray(node.comments) || node.comments.length === 0) {
+  if (!node || !isNonEmptyArray(node.comments)) {
     return false;
   }
   const test = getCommentTestFunction(flags, fn);
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index d55d1bb83..82af78a16 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -5,6 +5,7 @@ const {
   getMinNotPresentContinuousCount,
   getMaxContinuousCount,
   getStringWidth,
+  isNonEmptyArray,
 } = require("../common/util");
 const {
   builders: {
@@ -773,7 +774,7 @@ function printChildren(path, options, print, events) {
 
 function getLastDescendantNode(node) {
   let current = node;
-  while (current.children && current.children.length !== 0) {
+  while (isNonEmptyArray(current.children)) {
     current = current.children[current.children.length - 1];
   }
   return current;
diff --git a/src/language-yaml/utils.js b/src/language-yaml/utils.js
index 615be327e..5583ef694 100644
--- a/src/language-yaml/utils.js
+++ b/src/language-yaml/utils.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const { getLast } = require("../common/util");
+const { getLast, isNonEmptyArray } = require("../common/util");
 
 function getAncestorCount(path, filter) {
   let counter = 0;
@@ -98,7 +98,7 @@ function isLastDescendantNode(path) {
 }
 
 function getLastDescendantNode(node) {
-  return "children" in node && node.children.length !== 0
+  return isNonEmptyArray(node.children)
     ? getLastDescendantNode(getLast(node.children))
     : node;
 }
@@ -124,7 +124,7 @@ function hasPrettierIgnore(path) {
 }
 
 function isEmptyNode(node) {
-  return (!node.children || node.children.length === 0) && !hasComments(node);
+  return !isNonEmptyArray(node.children) && !hasComments(node);
 }
 
 function hasComments(node) {
@@ -138,11 +138,11 @@ function hasComments(node) {
 }
 
 function hasLeadingComments(node) {
-  return node && node.leadingComments && node.leadingComments.length !== 0;
+  return node && isNonEmptyArray(node.leadingComments);
 }
 
 function hasMiddleComments(node) {
-  return node && node.middleComments && node.middleComments.length !== 0;
+  return node && isNonEmptyArray(node.middleComments);
 }
 
 function hasIndicatorComment(node) {
@@ -154,7 +154,7 @@ function hasTrailingComment(node) {
 }
 
 function hasEndComments(node) {
-  return node && node.endComments && node.endComments.length !== 0;
+  return node && isNonEmptyArray(node.endComments);
 }
 
 /**
diff --git a/src/main/comments.js b/src/main/comments.js
index a7ee5ba70..8482780c2 100644
--- a/src/main/comments.js
+++ b/src/main/comments.js
@@ -24,6 +24,7 @@ const {
   addLeadingComment,
   addDanglingComment,
   addTrailingComment,
+  isNonEmptyArray,
 } = require("../common/util");
 
 const childNodesCache = new WeakMap();
@@ -559,7 +560,7 @@ function printComments(path, print, options, needsSemi) {
   const printed = print(path);
   const comments = value && value.comments;
 
-  if (!comments || comments.length === 0) {
+  if (!isNonEmptyArray(comments)) {
     return prependCursorPlaceholder(path, options, printed);
   }
 

From ec5f60725b8e7f27bdb14d481604a6e70e069c92 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 17 Dec 2020 15:52:51 +0800
Subject: [PATCH 237/299] Send array to `FastPath#{each,map}` callback (#9901)

---
 src/common/fast-path.js                 |  6 +--
 src/language-css/printer-postcss.js     | 21 +++++------
 src/language-graphql/printer-graphql.js |  4 +-
 src/language-js/print/block.js          |  5 +--
 src/language-js/print/jsx.js            | 50 ++++++++++++-------------
 src/language-js/printer-estree.js       |  4 +-
 6 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/src/common/fast-path.js b/src/common/fast-path.js
index e2959d3af..02ad5893a 100644
--- a/src/common/fast-path.js
+++ b/src/common/fast-path.js
@@ -92,7 +92,7 @@ class FastPath {
 
     for (let i = 0; i < value.length; ++i) {
       stack.push(i, value[i]);
-      callback(this, i);
+      callback(this, i, value);
       stack.length -= 2;
     }
 
@@ -104,8 +104,8 @@ class FastPath {
   // the end of the iteration.
   map(callback, ...names) {
     const result = [];
-    this.each((path, index) => {
-      result[index] = callback(path, index);
+    this.each((path, index, value) => {
+      result[index] = callback(path, index, value);
     }, ...names);
     return result;
   }
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index 346b822ae..48ebc028c 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -979,10 +979,9 @@ function genericPrint(path, options, print) {
 }
 
 function printNodeSequence(path, options, print) {
-  const node = path.getValue();
   const parts = [];
-  path.each((pathChild, i) => {
-    const prevNode = node.nodes[i - 1];
+  path.each((pathChild, i, nodes) => {
+    const prevNode = nodes[i - 1];
     if (
       prevNode &&
       prevNode.type === "css-comment" &&
@@ -996,23 +995,23 @@ function printNodeSequence(path, options, print) {
       parts.push(pathChild.call(print));
     }
 
-    if (i !== node.nodes.length - 1) {
+    if (i !== nodes.length - 1) {
       if (
-        (node.nodes[i + 1].type === "css-comment" &&
-          !hasNewline(options.originalText, locStart(node.nodes[i + 1]), {
+        (nodes[i + 1].type === "css-comment" &&
+          !hasNewline(options.originalText, locStart(nodes[i + 1]), {
             backwards: true,
           }) &&
-          !isFrontMatterNode(node.nodes[i])) ||
-        (node.nodes[i + 1].type === "css-atrule" &&
-          node.nodes[i + 1].name === "else" &&
-          node.nodes[i].type !== "css-comment")
+          !isFrontMatterNode(nodes[i])) ||
+        (nodes[i + 1].type === "css-atrule" &&
+          nodes[i + 1].name === "else" &&
+          nodes[i].type !== "css-comment")
       ) {
         parts.push(" ");
       } else {
         parts.push(options.__isHTMLStyleAttribute ? line : hardline);
         if (
           isNextLineEmpty(options.originalText, pathChild.getValue(), locEnd) &&
-          !isFrontMatterNode(node.nodes[i])
+          !isFrontMatterNode(nodes[i])
         ) {
           parts.push(hardline);
         }
diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js
index f12a86285..161493c63 100644
--- a/src/language-graphql/printer-graphql.js
+++ b/src/language-graphql/printer-graphql.js
@@ -20,9 +20,9 @@ function genericPrint(path, options, print) {
   switch (n.kind) {
     case "Document": {
       const parts = [];
-      path.each((pathChild, index) => {
+      path.each((pathChild, index, definitions) => {
         parts.push(concat([pathChild.call(print)]));
-        if (index !== n.definitions.length - 1) {
+        if (index !== definitions.length - 1) {
           parts.push(hardline);
           if (
             isNextLineEmpty(options.originalText, pathChild.getValue(), locEnd)
diff --git a/src/language-js/print/block.js b/src/language-js/print/block.js
index 057ad9634..57cde0f57 100644
--- a/src/language-js/print/block.js
+++ b/src/language-js/print/block.js
@@ -68,10 +68,9 @@ function printBlockBody(path, options, print) {
   const parts = [];
   // Babel 6
   if (nodeHasDirectives) {
-    const lastDirectiveIndex = path.getValue().directives.length - 1;
-    path.each((childPath, index) => {
+    path.each((childPath, index, directives) => {
       parts.push(print(childPath));
-      if (index < lastDirectiveIndex || nodeHasBody || nodeHasComment) {
+      if (index < directives.length - 1 || nodeHasBody || nodeHasComment) {
         parts.push(hardline);
         if (
           isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index 15d2bb394..1dcb9c0ac 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -278,10 +278,8 @@ function printJsxChildren(
   jsxWhitespace,
   isFacebookTranslationTag
 ) {
-  const n = path.getValue();
-  const children = [];
-
-  path.each((childPath, i) => {
+  const parts = [];
+  path.each((childPath, i, children) => {
     const child = childPath.getValue();
     if (isLiteral(child)) {
       const text = rawText(child);
@@ -292,11 +290,11 @@ function printJsxChildren(
 
         // Starts with whitespace
         if (words[0] === "") {
-          children.push("");
+          parts.push("");
           words.shift();
           if (/\n/.test(words[0])) {
-            const next = n.children[i + 1];
-            children.push(
+            const next = children[i + 1];
+            parts.push(
               separatorWithWhitespace(
                 isFacebookTranslationTag,
                 words[1],
@@ -305,7 +303,7 @@ function printJsxChildren(
               )
             );
           } else {
-            children.push(jsxWhitespace);
+            parts.push(jsxWhitespace);
           }
           words.shift();
         }
@@ -324,32 +322,32 @@ function printJsxChildren(
 
         words.forEach((word, i) => {
           if (i % 2 === 1) {
-            children.push(line);
+            parts.push(line);
           } else {
-            children.push(word);
+            parts.push(word);
           }
         });
 
         if (endWhitespace !== undefined) {
           if (/\n/.test(endWhitespace)) {
-            const next = n.children[i + 1];
-            children.push(
+            const next = children[i + 1];
+            parts.push(
               separatorWithWhitespace(
                 isFacebookTranslationTag,
-                getLast(children),
+                getLast(parts),
                 child,
                 next
               )
             );
           } else {
-            children.push(jsxWhitespace);
+            parts.push(jsxWhitespace);
           }
         } else {
-          const next = n.children[i + 1];
-          children.push(
+          const next = children[i + 1];
+          parts.push(
             separatorNoWhitespace(
               isFacebookTranslationTag,
-              getLast(children),
+              getLast(parts),
               child,
               next
             )
@@ -359,25 +357,25 @@ function printJsxChildren(
         // Keep (up to one) blank line between tags/expressions/text.
         // Note: We don't keep blank lines between text elements.
         if (text.match(/\n/g).length > 1) {
-          children.push("");
-          children.push(hardline);
+          parts.push("");
+          parts.push(hardline);
         }
       } else {
-        children.push("");
-        children.push(jsxWhitespace);
+        parts.push("");
+        parts.push(jsxWhitespace);
       }
     } else {
       const printedChild = print(childPath);
-      children.push(printedChild);
+      parts.push(printedChild);
 
-      const next = n.children[i + 1];
+      const next = children[i + 1];
       const directlyFollowedByMeaningfulText =
         next && isMeaningfulJsxText(next);
       if (directlyFollowedByMeaningfulText) {
         const firstWord = trimJsxWhitespace(rawText(next)).split(
           matchJsxWhitespaceRegex
         )[0];
-        children.push(
+        parts.push(
           separatorNoWhitespace(
             isFacebookTranslationTag,
             firstWord,
@@ -386,12 +384,12 @@ function printJsxChildren(
           )
         );
       } else {
-        children.push(hardline);
+        parts.push(hardline);
       }
     }
   }, "children");
 
-  return children;
+  return parts;
 }
 
 function separatorNoWhitespace(
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 8102d22a7..cd254144a 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -854,11 +854,11 @@ function printPathNoParens(path, options, print, args) {
                 hardline,
                 join(
                   hardline,
-                  path.map((casePath) => {
+                  path.map((casePath, index, cases) => {
                     const caseNode = casePath.getValue();
                     return concat([
                       casePath.call(print),
-                      n.cases.indexOf(caseNode) !== n.cases.length - 1 &&
+                      index !== cases.length - 1 &&
                       isNextLineEmpty(options.originalText, caseNode, locEnd)
                         ? hardline
                         : "",

From 330d3387c520f60883cb9d56c81334baa7c3be01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 08:15:54 +0000
Subject: [PATCH 238/299] Build(deps-dev): Bump @glimmer/reference from 0.71.0
 to 0.72.0 (#9919)

---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++---------------------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index 2eb17fa00..e11835df2 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.11",
     "@babel/types": "7.12.11",
-    "@glimmer/reference": "0.71.0",
+    "@glimmer/reference": "0.72.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index 05f41f1fc..11c9d267e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1057,20 +1057,13 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.71.0":
-  version "0.71.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.71.0.tgz#d0c1ad039b0d29e0502d7f80e7a270f9e80bf14d"
-  integrity sha512-v6ifiCTQXcQCBrtYArXpZ1YRrpnSVmhfHM9Ez5+6wLnBy15cGTpJr7sKVwFsWWqMSPqEGWg6zliI9NI/g++1cQ==
+"@glimmer/global-context@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.72.0.tgz#258d10b3e8185e148ee7235fc00005a781b12317"
+  integrity sha512-OGKHFNLPYnWFr+B+seYpPGJDnXUlq7wBnFe/+ThGbe0gB411uKxAbrhdBFMx/lwjVY8U2xJzglomtGfGXHWj6A==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.71.0":
-  version "0.71.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.71.0.tgz#0258beb3c09e0bfe852201e2e696d66ce4d0caa4"
-  integrity sha512-34OVZsWORRa5mn4vNwDsDDHjGt/EJ3Po5LaNiah/Fm3gaFCNaRnWKOKFF19W2e0hyPbb0nvfdeToPqnuEPmAMQ==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.72.0":
   version "0.72.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.72.0.tgz#34817afba6736f68974cfbd14825a88032d60a63"
@@ -1078,16 +1071,16 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.71.0":
-  version "0.71.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.71.0.tgz#c58be3170e550c1fb94b80f47e2d7229e083bf79"
-  integrity sha512-ZullfLbOuu1wgIPSPgXcWYynEwKc+tp0ccmapwloVNOthmjt6QdBTIeydRwFlT14TLHYTp5t12PQlwGBY4kNtA==
+"@glimmer/reference@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.72.0.tgz#2b0e3fcd7385c663dcda3525e85b2eefd9b6f8a4"
+  integrity sha512-rae42xIBYM6F8ht0KDmiQ+ycOX32umQBRNaGgCrbe1i84w/hkuqzBFyp/pO47IxE0Ob5TXjU8BBxAWQZKVdiJQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.71.0"
-    "@glimmer/interfaces" "0.71.0"
-    "@glimmer/util" "0.71.0"
-    "@glimmer/validator" "0.71.0"
+    "@glimmer/global-context" "0.72.0"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/util" "0.72.0"
+    "@glimmer/validator" "0.72.0"
 
 "@glimmer/syntax@0.72.0":
   version "0.72.0"
@@ -1099,15 +1092,6 @@
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.71.0":
-  version "0.71.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.71.0.tgz#9369c92265ac84154324d5cb8cabb0e1678333d8"
-  integrity sha512-EBKmZTXSzLywsg8dVN30ygWtpeZUbiqawHB1eXtsyBsBNbYdGDlNZjlh67z9Ba1zEeT9b+uD7FyIKYSbOBSGYw==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.71.0"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.72.0":
   version "0.72.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.72.0.tgz#77fdce5c14649651117d5e795b2870c48158b2c9"
@@ -1117,13 +1101,13 @@
     "@glimmer/interfaces" "0.72.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.71.0":
-  version "0.71.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.71.0.tgz#b049d75717e1ef210c6e7096c46b6d18b3bac1c9"
-  integrity sha512-XbC1A/+f/GVoouvUyU50WSJE/NVmvYv1HYr8FQ9MbDpzY9ASiPsfHnBThvx1iy3f+sxt/wfthu70U9Wl68jjPA==
+"@glimmer/validator@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.72.0.tgz#1c2f4b0702c82584f9ea1f5675b4aa00bb0464c7"
+  integrity sha512-Je1zk5iJjStjV3acgQ3Fl2lVnLyhvh+0eyJ/8+FIHp3M3IyR32D/yShYCHMIQhTppXuSV9WZwxif3KsrGxlPqA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.71.0"
+    "@glimmer/global-context" "0.72.0"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From d55d4e90d8aecaadb7ed3a5cf95ba0ed06611525 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 18 Dec 2020 10:14:14 +0800
Subject: [PATCH 239/299] Add JS version `isNextLineEmpty` (#9925)

---
 src/language-js/print/array.js               | 12 ++++++++----
 src/language-js/print/block.js               |  9 +++------
 src/language-js/print/call-arguments.js      | 10 +++-------
 src/language-js/print/function-parameters.js | 10 +++-------
 src/language-js/print/member-chain.js        |  4 ++--
 src/language-js/print/object.js              | 10 +++-------
 src/language-js/print/statement.js           |  6 ++----
 src/language-js/printer-estree.js            |  6 +++---
 src/language-js/utils.js                     |  9 +++++++++
 9 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/language-js/print/array.js b/src/language-js/print/array.js
index ce7925b6b..44fcef77e 100644
--- a/src/language-js/print/array.js
+++ b/src/language-js/print/array.js
@@ -4,9 +4,13 @@ const { printDanglingComments } = require("../../main/comments");
 const {
   builders: { concat, line, softline, group, indent, ifBreak },
 } = require("../../document");
-const { getLast, isNextLineEmpty } = require("../../common/util");
-const { shouldPrintComma, hasComment, CommentCheckFlags } = require("../utils");
-const { locEnd } = require("../loc");
+const { getLast } = require("../../common/util");
+const {
+  shouldPrintComma,
+  hasComment,
+  CommentCheckFlags,
+  isNextLineEmpty,
+} = require("../utils");
 
 const { printOptionalToken, printTypeAnnotation } = require("./misc");
 
@@ -119,7 +123,7 @@ function printArrayItems(path, options, printPath, print) {
     separatorParts = [",", line];
     if (
       childPath.getValue() &&
-      isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)
+      isNextLineEmpty(childPath.getValue(), options)
     ) {
       separatorParts.push(softline);
     }
diff --git a/src/language-js/print/block.js b/src/language-js/print/block.js
index 57cde0f57..4b6e662d3 100644
--- a/src/language-js/print/block.js
+++ b/src/language-js/print/block.js
@@ -1,12 +1,11 @@
 "use strict";
 
 const { printDanglingComments } = require("../../main/comments");
-const { isNextLineEmpty, isNonEmptyArray } = require("../../common/util");
+const { isNonEmptyArray } = require("../../common/util");
 const {
   builders: { concat, hardline, indent },
 } = require("../../document");
-const { hasComment, CommentCheckFlags } = require("../utils");
-const { locEnd } = require("../loc");
+const { hasComment, CommentCheckFlags, isNextLineEmpty } = require("../utils");
 
 const { printBody } = require("./statement");
 
@@ -72,9 +71,7 @@ function printBlockBody(path, options, print) {
       parts.push(print(childPath));
       if (index < directives.length - 1 || nodeHasBody || nodeHasComment) {
         parts.push(hardline);
-        if (
-          isNextLineEmpty(options.originalText, childPath.getValue(), locEnd)
-        ) {
+        if (isNextLineEmpty(childPath.getValue(), options)) {
           parts.push(hardline);
         }
       }
diff --git a/src/language-js/print/call-arguments.js b/src/language-js/print/call-arguments.js
index 2dabfd8e1..f30610c72 100644
--- a/src/language-js/print/call-arguments.js
+++ b/src/language-js/print/call-arguments.js
@@ -1,11 +1,7 @@
 "use strict";
 
 const { printDanglingComments } = require("../../main/comments");
-const {
-  getLast,
-  getPenultimate,
-  isNextLineEmpty,
-} = require("../../common/util");
+const { getLast, getPenultimate } = require("../../common/util");
 const {
   getFunctionParameters,
   iterateFunctionParametersPath,
@@ -17,8 +13,8 @@ const {
   shouldPrintComma,
   getCallArguments,
   iterateCallArgumentsPath,
+  isNextLineEmpty,
 } = require("../utils");
-const { locEnd } = require("../loc");
 
 const {
   builders: {
@@ -103,7 +99,7 @@ function printCallArguments(path, options, print) {
 
     if (index === lastArgIndex) {
       // do nothing
-    } else if (isNextLineEmpty(options.originalText, arg, locEnd)) {
+    } else if (isNextLineEmpty(arg, options)) {
       if (index === 0) {
         hasEmptyLineFollowingFirstArg = true;
       }
diff --git a/src/language-js/print/function-parameters.js b/src/language-js/print/function-parameters.js
index bcdb6c903..d1f6024ad 100644
--- a/src/language-js/print/function-parameters.js
+++ b/src/language-js/print/function-parameters.js
@@ -1,9 +1,6 @@
 "use strict";
 
-const {
-  getNextNonSpaceNonCommentCharacter,
-  isNextLineEmpty,
-} = require("../../common/util");
+const { getNextNonSpaceNonCommentCharacter } = require("../../common/util");
 const { printDanglingComments } = require("../../main/comments");
 const {
   builders: { concat, line, hardline, softline, group, indent, ifBreak },
@@ -20,6 +17,7 @@ const {
   hasRestParameter,
   shouldPrintComma,
   hasComment,
+  isNextLineEmpty,
 } = require("../utils");
 const { locEnd } = require("../loc");
 const { printFunctionTypeParameters } = require("./misc");
@@ -78,9 +76,7 @@ function printFunctionParameters(
       shouldExpandParameters
     ) {
       printed.push(" ");
-    } else if (
-      isNextLineEmpty(options.originalText, parameters[index], locEnd)
-    ) {
+    } else if (isNextLineEmpty(parameters[index], options)) {
       printed.push(hardline, hardline);
     } else {
       printed.push(line);
diff --git a/src/language-js/print/member-chain.js b/src/language-js/print/member-chain.js
index 7669a87df..56136c87c 100644
--- a/src/language-js/print/member-chain.js
+++ b/src/language-js/print/member-chain.js
@@ -5,7 +5,6 @@ const flat = require("lodash/flatten");
 const { printComments } = require("../../main/comments");
 const {
   getLast,
-  isNextLineEmpty,
   isNextLineEmptyAfterIndex,
   getNextNonSpaceNonCommentCharacterIndex,
 } = require("../../common/util");
@@ -19,6 +18,7 @@ const {
   isSimpleCallArgument,
   hasComment,
   CommentCheckFlags,
+  isNextLineEmpty,
 } = require("../utils");
 const { locEnd } = require("../loc");
 
@@ -87,7 +87,7 @@ function printMemberChain(path, options, print) {
       );
     }
 
-    return isNextLineEmpty(originalText, node, locEnd);
+    return isNextLineEmpty(node, options);
   }
 
   function rec(path) {
diff --git a/src/language-js/print/object.js b/src/language-js/print/object.js
index a5546b1a9..6716773f5 100644
--- a/src/language-js/print/object.js
+++ b/src/language-js/print/object.js
@@ -4,17 +4,13 @@ const { printDanglingComments } = require("../../main/comments");
 const {
   builders: { concat, line, softline, group, indent, ifBreak, hardline },
 } = require("../../document");
-const {
-  getLast,
-  isNextLineEmpty,
-  hasNewlineInRange,
-  hasNewline,
-} = require("../../common/util");
+const { getLast, hasNewlineInRange, hasNewline } = require("../../common/util");
 const {
   shouldPrintComma,
   hasComment,
   getComments,
   CommentCheckFlags,
+  isNextLineEmpty,
 } = require("../utils");
 const { locStart, locEnd } = require("../loc");
 
@@ -120,7 +116,7 @@ function printObject(path, options, print) {
       ) {
         separatorParts.shift();
       }
-      if (isNextLineEmpty(options.originalText, prop.node, locEnd)) {
+      if (isNextLineEmpty(prop.node, options)) {
         separatorParts.push(hardline);
       }
       return result;
diff --git a/src/language-js/print/statement.js b/src/language-js/print/statement.js
index 03369bdb3..2aab86927 100644
--- a/src/language-js/print/statement.js
+++ b/src/language-js/print/statement.js
@@ -1,6 +1,5 @@
 "use strict";
 
-const { isNextLineEmpty } = require("../../common/util");
 const {
   builders: { concat, join, hardline },
 } = require("../../document");
@@ -14,8 +13,8 @@ const {
   isTheOnlyJsxElementInMarkdown,
   hasComment,
   CommentCheckFlags,
+  isNextLineEmpty,
 } = require("../utils");
-const { locEnd } = require("../loc");
 const { shouldPrintParamsWithoutParens } = require("./function");
 
 /**
@@ -40,7 +39,6 @@ function printStatement({ path, index, bodyNode, isClass }, options, print) {
   }
 
   const printed = print(path);
-  const text = options.originalText;
   const parts = [];
 
   // in no-semi mode, prepend statement with semicolon if it might break ASI
@@ -74,7 +72,7 @@ function printStatement({ path, index, bodyNode, isClass }, options, print) {
     }
   }
 
-  if (isNextLineEmpty(text, node, locEnd) && !isLastStatement(path)) {
+  if (isNextLineEmpty(node, options) && !isLastStatement(path)) {
     parts.push(hardline);
   }
 
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index cd254144a..0fcaae610 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -11,7 +11,6 @@ const {
   hasNewline,
   printString,
   printNumber,
-  isNextLineEmpty,
   isNonEmptyArray,
 } = require("../common/util");
 const {
@@ -47,6 +46,7 @@ const {
   isTheOnlyJsxElementInMarkdown,
   isBlockComment,
   isLineComment,
+  isNextLineEmpty,
   needsHardlineAfterDanglingComment,
   rawText,
   shouldPrintComma,
@@ -859,7 +859,7 @@ function printPathNoParens(path, options, print, args) {
                     return concat([
                       casePath.call(print),
                       index !== cases.length - 1 &&
-                      isNextLineEmpty(options.originalText, caseNode, locEnd)
+                      isNextLineEmpty(caseNode, options)
                         ? hardline
                         : "",
                     ]);
@@ -1186,7 +1186,7 @@ function printPathNoParens(path, options, print, args) {
     case "InterpreterDirective":
       parts.push("#!", n.value, hardline);
 
-      if (isNextLineEmpty(options.originalText, n, locEnd)) {
+      if (isNextLineEmpty(n, options)) {
         parts.push(hardline);
       }
 
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index 0f49e57eb..25b2939ec 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -7,6 +7,7 @@ const {
   hasNewlineInRange,
   skipWhitespace,
   isNonEmptyArray,
+  isNextLineEmptyAfterIndex,
 } = require("../common/util");
 const { locStart, locEnd, hasSameLocStart } = require("./loc");
 
@@ -1500,6 +1501,13 @@ function getComments(node, flags, fn) {
     : node.comments;
 }
 
+/**
+ * @param {Node} node
+ * @returns {boolean}
+ */
+const isNextLineEmpty = (node, { originalText }) =>
+  isNextLineEmptyAfterIndex(originalText, locEnd(node));
+
 module.exports = {
   classChildNeedsASIProtection,
   classPropMayCauseASIProblems,
@@ -1554,6 +1562,7 @@ module.exports = {
   isTheOnlyJsxElementInMarkdown,
   isTSXFile,
   isTypeAnnotationAFunction,
+  isNextLineEmpty,
   matchJsxWhitespaceRegex,
   needsHardlineAfterDanglingComment,
   rawText,

From 3d25e506a4582326c1a360c4301eded2d650518e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Dec 2020 13:18:09 +0800
Subject: [PATCH 240/299] Build(deps-dev): Bump eslint-plugin-unicorn from
 23.0.0 to 24.0.0 (#9931)

Bumps [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) from 23.0.0 to 24.0.0.
- [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases)
- [Commits](https://github.com/sindresorhus/eslint-plugin-unicorn/compare/v23.0.0...v24.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e11835df2..8eef57e29 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "eslint-plugin-jest": "24.1.3",
     "eslint-plugin-prettier-internal-rules": "link:scripts/tools/eslint-plugin-prettier-internal-rules",
     "eslint-plugin-react": "7.21.5",
-    "eslint-plugin-unicorn": "23.0.0",
+    "eslint-plugin-unicorn": "24.0.0",
     "execa": "5.0.0",
     "jest": "26.6.3",
     "jest-snapshot-serializer-ansi": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 11c9d267e..fa5bade5a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3117,10 +3117,10 @@ eslint-plugin-react@7.21.5:
     resolve "^1.18.1"
     string.prototype.matchall "^4.0.2"
 
-eslint-plugin-unicorn@23.0.0:
-  version "23.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-23.0.0.tgz#b2820212874735f9d91ecc8678b263ecfa6cf5f6"
-  integrity sha512-Vabo3cjl6cjyhcf+76CdQEY6suOFzK0Xh3xo0uL9VDYrDJP5+B6PjV0tHTYm82WZmFWniugFJM3ywHSNYTi/ZQ==
+eslint-plugin-unicorn@24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-24.0.0.tgz#08017ccd7ac704777d459cff6e13a35f54cbcab1"
+  integrity sha512-NfLjIZas/ZUwc3S+pUtbTRqgCkODxPEkJBJ5ZR8wIu90BmX4jmXp10hoOZMScR2CR1NYTtrx0OX4BQvBnbzZzA==
   dependencies:
     ci-info "^2.0.0"
     clean-regexp "^1.0.0"
@@ -3134,7 +3134,7 @@ eslint-plugin-unicorn@23.0.0:
     regexp-tree "^0.1.21"
     reserved-words "^0.1.2"
     safe-regex "^2.1.1"
-    semver "^7.3.2"
+    semver "^7.3.4"
 
 eslint-scope@^5.0.0, eslint-scope@^5.1.1:
   version "5.1.1"
@@ -6434,7 +6434,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.4, semver@^7.2.1, semver@^7.3.2:
+semver@7.3.4, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
   version "7.3.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
   integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==

From 29b9ab076abaefd6f9f6bdfa213e67ad8f198486 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Dec 2020 05:52:05 +0000
Subject: [PATCH 241/299] Build(deps-dev): Bump webpack from 5.10.3 to 5.11.0
 (#9932)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8eef57e29..6a7633c4c 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "synchronous-promise": "2.0.15",
     "tempy": "1.0.0",
     "terser-webpack-plugin": "5.0.3",
-    "webpack": "5.10.3"
+    "webpack": "5.11.0"
   },
   "scripts": {
     "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
diff --git a/yarn.lock b/yarn.lock
index fa5bade5a..1ad346b8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7408,10 +7408,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.10.3:
-  version "5.10.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.3.tgz#933cbd5e79d62040d988049ff0f515a6dc333006"
-  integrity sha512-KFPEbpNKfNU4t2CDsUZJ7KpuUbzDqGUCZqLmz4667KSUWMc9BuR3a8jpa72Emv7JUbdGwISD9OZjoI9S5BnHig==
+webpack@5.11.0:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.11.0.tgz#1647abc060441d86d01d8835b8f0fc1dae2fe76f"
+  integrity sha512-ubWv7iP54RqAC/VjixgpnLLogCFbAfSOREcSWnnOlZEU8GICC5eKmJSu6YEnph2N2amKqY9rvxSwgyHxVqpaRw==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From 12b5dd297f1e8d4a5491380c2064b34dcc37948a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Dec 2020 18:49:34 +0800
Subject: [PATCH 242/299] Build(deps-dev): Bump webpack from 5.10.3 to 5.11.0
 in /website (#9930)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index aa5ed1d78..137f70a1f 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.1",
     "svgo": "1.3.2",
-    "webpack": "5.10.3",
+    "webpack": "5.11.0",
     "webpack-cli": "4.2.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index fbcce8ed4..6867fc3a8 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -7432,10 +7432,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.10.3:
-  version "5.10.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.10.3.tgz#933cbd5e79d62040d988049ff0f515a6dc333006"
-  integrity sha512-KFPEbpNKfNU4t2CDsUZJ7KpuUbzDqGUCZqLmz4667KSUWMc9BuR3a8jpa72Emv7JUbdGwISD9OZjoI9S5BnHig==
+webpack@5.11.0:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.11.0.tgz#1647abc060441d86d01d8835b8f0fc1dae2fe76f"
+  integrity sha512-ubWv7iP54RqAC/VjixgpnLLogCFbAfSOREcSWnnOlZEU8GICC5eKmJSu6YEnph2N2amKqY9rvxSwgyHxVqpaRw==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From aae625a05f581cb2d42ed2d8e8dcaf97b80392df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Dec 2020 19:10:12 +0800
Subject: [PATCH 243/299] Build(deps): Bump codecov/codecov-action from v1.0.15
 to v1.1.0 (#9934)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from v1.0.15 to v1.1.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v1.0.15...7de43a7373de21874ae196a78f8eb633fcf7f0c4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/dev-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml
index 1c4fcbc99..1f0a33e78 100644
--- a/.github/workflows/dev-test.yml
+++ b/.github/workflows/dev-test.yml
@@ -62,7 +62,7 @@ jobs:
         run: yarn test --maxWorkers=2
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@v1.0.15
+        uses: codecov/codecov-action@v1.1.0
         if: matrix.ENABLE_CODE_COVERAGE
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -76,7 +76,7 @@ jobs:
           PRETTIER_FALLBACK_RESOLVE: true
 
       - name: Upload Coverage (PRETTIER_FALLBACK_RESOLVE)
-        uses: codecov/codecov-action@v1.0.15
+        uses: codecov/codecov-action@v1.1.0
         if: matrix.ENABLE_CODE_COVERAGE
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

From 85abe0fccdcda173586ec87121914f05b84b120d Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 18 Dec 2020 19:20:20 +0800
Subject: [PATCH 244/299] Refactor `graphql` parser to use `tryCombinations`
 (#9928)

---
 src/language-graphql/parser-graphql.js        | 56 ++++++++++---------
 src/language-js/parser-babel.js               |  4 +-
 src/language-js/parser-espree.js              |  6 +-
 src/language-js/parser-meriyah.js             |  2 +-
 src/language-js/parser-typescript.js          |  2 +-
 .../parser => utils}/try-combinations.js      |  0
 6 files changed, 36 insertions(+), 34 deletions(-)
 rename src/{language-js/parser => utils}/try-combinations.js (100%)

diff --git a/src/language-graphql/parser-graphql.js b/src/language-graphql/parser-graphql.js
index 5e732eed7..e0129ad3d 100644
--- a/src/language-graphql/parser-graphql.js
+++ b/src/language-graphql/parser-graphql.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const createError = require("../common/parser-create-error");
+const tryCombinations = require("../utils/try-combinations");
 const { hasPragma } = require("./pragma");
 const { locStart, locEnd } = require("./loc");
 
@@ -36,40 +37,41 @@ function removeTokens(node) {
   return node;
 }
 
-function fallbackParser(parse, source) {
-  const parserOptions = {
-    allowLegacySDLImplementsInterfaces: false,
-    experimentalFragmentVariables: true,
-  };
-  try {
-    return parse(source, parserOptions);
-  } catch (_) {
-    parserOptions.allowLegacySDLImplementsInterfaces = true;
-    return parse(source, parserOptions);
+const parseOptions = {
+  allowLegacySDLImplementsInterfaces: false,
+  experimentalFragmentVariables: true,
+};
+
+function createParseError(error) {
+  const { GraphQLError } = require("graphql/error");
+  if (error instanceof GraphQLError) {
+    const {
+      message,
+      locations: [start],
+    } = error;
+    return createError(message, { start });
   }
+
+  /* istanbul ignore next */
+  return error;
 }
 
 function parse(text /*, parsers, opts*/) {
   // Inline the require to avoid loading all the JS if we don't use it
-  const parser = require("graphql/language");
-  try {
-    const ast = fallbackParser(parser.parse, text);
-    ast.comments = parseComments(ast);
-    removeTokens(ast);
-    return ast;
-  } catch (error) {
-    const { GraphQLError } = require("graphql/error");
-    if (error instanceof GraphQLError) {
-      const {
-        message,
-        locations: [start],
-      } = error;
-      throw createError(message, { start });
-    }
+  const { parse } = require("graphql/language");
+  const { result: ast, error } = tryCombinations(
+    () => parse(text, { ...parseOptions }),
+    () =>
+      parse(text, { ...parseOptions, allowLegacySDLImplementsInterfaces: true })
+  );
 
-    /* istanbul ignore next */
-    throw error;
+  if (!ast) {
+    throw createParseError(error);
   }
+
+  ast.comments = parseComments(ast);
+  removeTokens(ast);
+  return ast;
 }
 
 module.exports = {
diff --git a/src/language-js/parser-babel.js b/src/language-js/parser-babel.js
index 0ca12064a..a4023dc1c 100644
--- a/src/language-js/parser-babel.js
+++ b/src/language-js/parser-babel.js
@@ -2,12 +2,12 @@
 
 const flatten = require("lodash/flatten");
 const createError = require("../common/parser-create-error");
+const tryCombinations = require("../utils/try-combinations");
 const {
   getNextNonSpaceNonCommentCharacterIndexWithStartIndex,
   getShebang,
 } = require("../common/util");
 const postprocess = require("./parse-postprocess");
-const tryCombinations = require("./parser/try-combinations");
 const createParser = require("./parser/create-parser");
 
 const parseOptions = {
@@ -92,7 +92,7 @@ function createParseError(error) {
   // so we need our custom error
   const { message, loc } = error;
 
-  throw createError(message.replace(/ \(.*\)/, ""), {
+  return createError(message.replace(/ \(.*\)/, ""), {
     start: {
       line: loc ? loc.line : 0,
       column: loc ? loc.column + 1 : 0,
diff --git a/src/language-js/parser-espree.js b/src/language-js/parser-espree.js
index d3a626ff2..214fe9b20 100644
--- a/src/language-js/parser-espree.js
+++ b/src/language-js/parser-espree.js
@@ -1,8 +1,8 @@
 "use strict";
 const { getShebang } = require("../common/util");
 const createError = require("../common/parser-create-error");
+const tryCombinations = require("../utils/try-combinations");
 const postprocess = require("./parse-postprocess");
-const tryCombinations = require("./parser/try-combinations");
 const createParser = require("./parser/create-parser");
 
 const parseOptions = {
@@ -23,10 +23,10 @@ function createParseError(error) {
 
   /* istanbul ignore next */
   if (typeof lineNumber !== "number") {
-    throw error;
+    return error;
   }
 
-  throw createError(message, { start: { line: lineNumber, column } });
+  return createError(message, { start: { line: lineNumber, column } });
 }
 
 function parse(originalText, parsers, options) {
diff --git a/src/language-js/parser-meriyah.js b/src/language-js/parser-meriyah.js
index 707690110..2566fa993 100644
--- a/src/language-js/parser-meriyah.js
+++ b/src/language-js/parser-meriyah.js
@@ -1,8 +1,8 @@
 "use strict";
 
 const createError = require("../common/parser-create-error");
+const tryCombinations = require("../utils/try-combinations");
 const postprocess = require("./parse-postprocess");
-const tryCombinations = require("./parser/try-combinations");
 const createParser = require("./parser/create-parser");
 
 // https://github.com/meriyah/meriyah/blob/4676f60b6c149d7082bde2c9147f9ae2359c8075/src/parser.ts#L185
diff --git a/src/language-js/parser-typescript.js b/src/language-js/parser-typescript.js
index 259c88efe..107cb7830 100644
--- a/src/language-js/parser-typescript.js
+++ b/src/language-js/parser-typescript.js
@@ -1,8 +1,8 @@
 "use strict";
 
 const createError = require("../common/parser-create-error");
+const tryCombinations = require("../utils/try-combinations");
 const postprocess = require("./parse-postprocess");
-const tryCombinations = require("./parser/try-combinations");
 const createParser = require("./parser/create-parser");
 
 /** @type {import("@typescript-eslint/typescript-estree").TSESTreeOptions} */
diff --git a/src/language-js/parser/try-combinations.js b/src/utils/try-combinations.js
similarity index 100%
rename from src/language-js/parser/try-combinations.js
rename to src/utils/try-combinations.js

From 5d69b2e32456313f27e2724fda708dcfe472f7d6 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 18 Dec 2020 19:21:53 +0800
Subject: [PATCH 245/299] Refactor: Move `jsx` related function to `jsx.js`
 (#9927)

---
 src/language-js/print/jsx.js      | 105 +++++++++++++++++++++++++++--
 src/language-js/printer-estree.js |   8 ++-
 src/language-js/utils.js          | 108 +-----------------------------
 3 files changed, 106 insertions(+), 115 deletions(-)

diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index 1dcb9c0ac..1ce4e861f 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -20,11 +20,7 @@ const {
 
 const { getLast, getPreferredQuote } = require("../../common/util");
 const {
-  isEmptyJsxElement,
-  isJsxWhitespaceExpression,
   isJsxNode,
-  isMeaningfulJsxText,
-  matchJsxWhitespaceRegex,
   rawText,
   isLiteral,
   isCallOrOptionalCallExpression,
@@ -32,11 +28,17 @@ const {
   isBinaryish,
   hasComment,
   CommentCheckFlags,
-  trimJsxWhitespace,
+  hasNodeIgnoreComment,
 } = require("../utils");
 const pathNeedsParens = require("../needs-parens");
 const { willPrintOwnComments } = require("../comments");
 
+/**
+ * @typedef {import("../../common/fast-path")} FastPath
+ * @typedef {import("../types/estree").Node} Node
+ * @typedef {import("../types/estree").JSXElement} JSXElement
+ */
+
 // JSX expands children from the inside-out, instead of the outside-in.
 // This is both to break children before attributes,
 // and to ensure that when children break, their parents do as well.
@@ -764,6 +766,99 @@ function printJsx(path, options, print) {
   }
 }
 
+// Only space, newline, carriage return, and tab are treated as whitespace
+// inside JSX.
+const jsxWhitespaceChars = " \n\r\t";
+const matchJsxWhitespaceRegex = new RegExp("([" + jsxWhitespaceChars + "]+)");
+const containsNonJsxWhitespaceRegex = new RegExp(
+  "[^" + jsxWhitespaceChars + "]"
+);
+const trimJsxWhitespace = (text) =>
+  text.replace(
+    new RegExp(
+      "(?:^" +
+        matchJsxWhitespaceRegex.source +
+        "|" +
+        matchJsxWhitespaceRegex.source +
+        "$)"
+    ),
+    ""
+  );
+
+/**
+ * @param {JSXElement} node
+ * @returns {boolean}
+ */
+function isEmptyJsxElement(node) {
+  if (node.children.length === 0) {
+    return true;
+  }
+  if (node.children.length > 1) {
+    return false;
+  }
+
+  // if there is one text child and does not contain any meaningful text
+  // we can treat the element as empty.
+  const child = node.children[0];
+  return isLiteral(child) && !isMeaningfulJsxText(child);
+}
+
+// Meaningful if it contains non-whitespace characters,
+// or it contains whitespace without a new line.
+/**
+ * @param {Node} node
+ * @returns {boolean}
+ */
+function isMeaningfulJsxText(node) {
+  return (
+    isLiteral(node) &&
+    (containsNonJsxWhitespaceRegex.test(rawText(node)) ||
+      !/\n/.test(rawText(node)))
+  );
+}
+
+// Detect an expression node representing `{" "}`
+function isJsxWhitespaceExpression(node) {
+  return (
+    node.type === "JSXExpressionContainer" &&
+    isLiteral(node.expression) &&
+    node.expression.value === " " &&
+    !hasComment(node.expression)
+  );
+}
+
+/**
+ * @param {FastPath} path
+ * @returns {boolean}
+ */
+function hasJsxIgnoreComment(path) {
+  const node = path.getValue();
+  const parent = path.getParentNode();
+  if (!parent || !node || !isJsxNode(node) || !isJsxNode(parent)) {
+    return false;
+  }
+
+  // Lookup the previous sibling, ignoring any empty JSXText elements
+  const index = parent.children.indexOf(node);
+  let prevSibling = null;
+  for (let i = index; i > 0; i--) {
+    const candidate = parent.children[i - 1];
+    if (candidate.type === "JSXText" && !isMeaningfulJsxText(candidate)) {
+      continue;
+    }
+    prevSibling = candidate;
+    break;
+  }
+
+  return (
+    prevSibling &&
+    prevSibling.type === "JSXExpressionContainer" &&
+    prevSibling.expression.type === "JSXEmptyExpression" &&
+    hasNodeIgnoreComment(prevSibling.expression)
+  );
+}
+
 module.exports = {
+  hasJsxIgnoreComment,
   printJsx,
 };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 0fcaae610..fe2a2b77f 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -37,7 +37,6 @@ const {
   getParentExportDeclaration,
   hasFlowShorthandAnnotationComment,
   hasNewlineBetweenOrAfterDecorators,
-  hasPrettierIgnore,
   hasComment,
   CommentCheckFlags,
   isExportDeclaration,
@@ -50,6 +49,7 @@ const {
   needsHardlineAfterDanglingComment,
   rawText,
   shouldPrintComma,
+  hasIgnoreComment,
 } = require("./utils");
 const { locStart, locEnd } = require("./loc");
 
@@ -58,7 +58,7 @@ const {
   isVueEventBindingExpression,
 } = require("./print/html-binding");
 const { printAngular } = require("./print/angular");
-const { printJsx } = require("./print/jsx");
+const { printJsx, hasJsxIgnoreComment } = require("./print/jsx");
 const { printFlow } = require("./print/flow");
 const { printTypescript } = require("./print/typescript");
 const {
@@ -1241,7 +1241,9 @@ module.exports = {
   embed,
   insertPragma,
   massageAstNode: clean,
-  hasPrettierIgnore,
+  hasPrettierIgnore(path) {
+    return hasIgnoreComment(path) || hasJsxIgnoreComment(path);
+  },
   willPrintOwnComments: handleComments.willPrintOwnComments,
   canAttachComment,
   printComment,
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index 25b2939ec..13f1c617d 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -22,7 +22,6 @@ const { locStart, locEnd, hasSameLocStart } = require("./loc");
  * @typedef {import("./types/estree").Expression} Expression
  * @typedef {import("./types/estree").Property} Property
  * @typedef {import("./types/estree").ObjectTypeProperty} ObjectTypeProperty
- * @typedef {import("./types/estree").JSXElement} JSXElement
  * @typedef {import("./types/estree").TaggedTemplateExpression} TaggedTemplateExpression
  * @typedef {import("./types/estree").Literal} Literal
  *
@@ -340,16 +339,6 @@ function isTheOnlyJsxElementInMarkdown(options, path) {
   return parent.type === "Program" && parent.body.length === 1;
 }
 
-// Detect an expression node representing `{" "}`
-function isJsxWhitespaceExpression(node) {
-  return (
-    node.type === "JSXExpressionContainer" &&
-    isLiteral(node.expression) &&
-    node.expression.value === " " &&
-    !hasComment(node.expression)
-  );
-}
-
 /**
  * @param {Node} node
  * @returns {boolean}
@@ -732,96 +721,6 @@ function hasNewlineBetweenOrAfterDecorators(node, options) {
   );
 }
 
-// Only space, newline, carriage return, and tab are treated as whitespace
-// inside JSX.
-const jsxWhitespaceChars = " \n\r\t";
-const matchJsxWhitespaceRegex = new RegExp("([" + jsxWhitespaceChars + "]+)");
-const containsNonJsxWhitespaceRegex = new RegExp(
-  "[^" + jsxWhitespaceChars + "]"
-);
-const trimJsxWhitespace = (text) =>
-  text.replace(
-    new RegExp(
-      "(?:^" +
-        matchJsxWhitespaceRegex.source +
-        "|" +
-        matchJsxWhitespaceRegex.source +
-        "$)"
-    ),
-    ""
-  );
-
-// Meaningful if it contains non-whitespace characters,
-// or it contains whitespace without a new line.
-/**
- * @param {Node} node
- * @returns {boolean}
- */
-function isMeaningfulJsxText(node) {
-  return (
-    isLiteral(node) &&
-    (containsNonJsxWhitespaceRegex.test(rawText(node)) ||
-      !/\n/.test(rawText(node)))
-  );
-}
-
-/**
- * @param {FastPath} path
- * @returns {boolean}
- */
-function hasJsxIgnoreComment(path) {
-  const node = path.getValue();
-  const parent = path.getParentNode();
-  if (!parent || !node || !isJsxNode(node) || !isJsxNode(parent)) {
-    return false;
-  }
-
-  // Lookup the previous sibling, ignoring any empty JSXText elements
-  const index = parent.children.indexOf(node);
-  let prevSibling = null;
-  for (let i = index; i > 0; i--) {
-    const candidate = parent.children[i - 1];
-    if (candidate.type === "JSXText" && !isMeaningfulJsxText(candidate)) {
-      continue;
-    }
-    prevSibling = candidate;
-    break;
-  }
-
-  return (
-    prevSibling &&
-    prevSibling.type === "JSXExpressionContainer" &&
-    prevSibling.expression.type === "JSXEmptyExpression" &&
-    hasNodeIgnoreComment(prevSibling.expression)
-  );
-}
-
-/**
- * @param {JSXElement} node
- * @returns {boolean}
- */
-function isEmptyJsxElement(node) {
-  if (node.children.length === 0) {
-    return true;
-  }
-  if (node.children.length > 1) {
-    return false;
-  }
-
-  // if there is one text child and does not contain any meaningful text
-  // we can treat the element as empty.
-  const child = node.children[0];
-  return isLiteral(child) && !isMeaningfulJsxText(child);
-}
-
-/**
- * @param {FastPath} path
- * @returns {boolean}
- */
-function hasPrettierIgnore(path) {
-  return hasIgnoreComment(path) || hasJsxIgnoreComment(path);
-}
-
 /**
  * @param {string} text
  * @param {Node} typeAnnotation
@@ -1525,15 +1424,14 @@ module.exports = {
   hasNakedLeftSide,
   hasNewlineBetweenOrAfterDecorators,
   hasNode,
-  hasPrettierIgnore,
   hasIgnoreComment,
+  hasNodeIgnoreComment,
   identity,
   isBinaryish,
   isBlockComment,
   isLineComment,
   isPrettierIgnoreComment,
   isCallOrOptionalCallExpression,
-  isEmptyJsxElement,
   isExportDeclaration,
   isFlowAnnotationComment,
   isFunctionCompositionArgs,
@@ -1542,11 +1440,9 @@ module.exports = {
   isGetterOrSetter,
   isJestEachTemplateLiteral,
   isJsxNode,
-  isJsxWhitespaceExpression,
   isLiteral,
   isLongCurriedCallExpression,
   isSimpleCallArgument,
-  isMeaningfulJsxText,
   isMemberExpressionChain,
   isMemberish,
   isNumericLiteral,
@@ -1563,7 +1459,6 @@ module.exports = {
   isTSXFile,
   isTypeAnnotationAFunction,
   isNextLineEmpty,
-  matchJsxWhitespaceRegex,
   needsHardlineAfterDanglingComment,
   rawText,
   returnArgumentHasLeadingComment,
@@ -1575,5 +1470,4 @@ module.exports = {
   hasComment,
   getComments,
   CommentCheckFlags,
-  trimJsxWhitespace,
 };

From b172717fd918f829b003375a7ce0e9cff9b6aab5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Dec 2020 14:24:03 +0800
Subject: [PATCH 246/299] Build(deps): Bump preactjs/compressed-size-action
 from v2.0.1 to 2.1.0 (#9942)

Bumps [preactjs/compressed-size-action](https://github.com/preactjs/compressed-size-action) from v2.0.1 to 2.1.0.
- [Release notes](https://github.com/preactjs/compressed-size-action/releases)
- [Commits](https://github.com/preactjs/compressed-size-action/compare/v2.0.1...7d87f60a6b0c7d193b8183ce859ed00b356ea92f)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/prod-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prod-test.yml b/.github/workflows/prod-test.yml
index 45dca2c16..7dad9639b 100644
--- a/.github/workflows/prod-test.yml
+++ b/.github/workflows/prod-test.yml
@@ -46,7 +46,7 @@ jobs:
       # The cache step might saving the result of master branch, need investigate
       - name: Check Sizes
         if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'dependabot/npm_and_yarn/')
-        uses: preactjs/compressed-size-action@v2.0.1
+        uses: preactjs/compressed-size-action@2.1.0
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           compression: none

From 76fe06a88f83e1c3763d2cae6b9a40b13b1dc434 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Dec 2020 14:25:31 +0800
Subject: [PATCH 247/299] Build(deps-dev): Bump eslint-config-prettier from
 7.0.0 to 7.1.0 (#9940)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6a7633c4c..5c7edf074 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "cross-env": "7.0.3",
     "cspell": "4.2.5",
     "eslint": "7.15.0",
-    "eslint-config-prettier": "7.0.0",
+    "eslint-config-prettier": "7.1.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jest": "24.1.3",
diff --git a/yarn.lock b/yarn.lock
index 1ad346b8a..a26718f54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3039,10 +3039,10 @@ eslint-ast-utils@^1.1.0:
     lodash.get "^4.4.2"
     lodash.zip "^4.2.0"
 
-eslint-config-prettier@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz#c1ae4106f74e6c0357f44adb076771d032ac0e97"
-  integrity sha512-8Y8lGLVPPZdaNA7JXqnvETVC7IiVRgAP6afQu9gOQRn90YY3otMNh+x7Vr2vMePQntF+5erdSUBqSzCmU/AxaQ==
+eslint-config-prettier@7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.1.0.tgz#5402eb559aa94b894effd6bddfa0b1ca051c858f"
+  integrity sha512-9sm5/PxaFG7qNJvJzTROMM1Bk1ozXVTKI0buKOyb0Bsr1hrwi0H/TzxF/COtf1uxikIK8SwhX7K6zg78jAzbeA==
 
 eslint-formatter-friendly@7.0.0:
   version "7.0.0"

From e154e031a2c72b6829d683551b89a54c33d996a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Dec 2020 14:26:44 +0800
Subject: [PATCH 248/299] Build(deps-dev): Bump @glimmer/reference from 0.72.0
 to 0.73.0 (#9941)

Bumps @glimmer/reference from 0.72.0 to 0.73.0.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 5c7edf074..c0f87ab0d 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.11",
     "@babel/types": "7.12.11",
-    "@glimmer/reference": "0.72.0",
+    "@glimmer/reference": "0.73.0",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index a26718f54..106c37802 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1057,10 +1057,10 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.72.0.tgz#258d10b3e8185e148ee7235fc00005a781b12317"
-  integrity sha512-OGKHFNLPYnWFr+B+seYpPGJDnXUlq7wBnFe/+ThGbe0gB411uKxAbrhdBFMx/lwjVY8U2xJzglomtGfGXHWj6A==
+"@glimmer/global-context@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.73.0.tgz#273f757779a17595cb4cb76685c17087dc619bb8"
+  integrity sha512-DnatUdDcF6STNhN4aOFjSW5cn1lmgMpjaauwIKZSy9O45Eo8uqNCMpYRCKf4fkVmYVDRwg6N6ua0Sv0q6OlWSw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
@@ -1071,16 +1071,23 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.72.0.tgz#2b0e3fcd7385c663dcda3525e85b2eefd9b6f8a4"
-  integrity sha512-rae42xIBYM6F8ht0KDmiQ+ycOX32umQBRNaGgCrbe1i84w/hkuqzBFyp/pO47IxE0Ob5TXjU8BBxAWQZKVdiJQ==
+"@glimmer/interfaces@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.0.tgz#ea926b2542cf666a9a479e8aa67224cc11f7710d"
+  integrity sha512-DagAc0Ul+lrid54QKrUVctlKfloIZMRhaz/oaEJ3nVf4Nqz/6YtT3tOrJ+fOxLYjsDy3Dq0uJMDOHzdd6IqS2g==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/reference@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.73.0.tgz#77d421254c0d58dd0bdcb341bdcb76744d0b28ba"
+  integrity sha512-m2vWCAD0bYLI03EvvJo4ow8a2cmfpLi7mHT+s9tMER7c7/TNenLmh6/5A7NKzbwCb6onqXQGOT4Sb/vAZqFgQw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.72.0"
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/util" "0.72.0"
-    "@glimmer/validator" "0.72.0"
+    "@glimmer/global-context" "0.73.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/util" "0.73.0"
+    "@glimmer/validator" "0.73.0"
 
 "@glimmer/syntax@0.72.0":
   version "0.72.0"
@@ -1101,13 +1108,22 @@
     "@glimmer/interfaces" "0.72.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.72.0.tgz#1c2f4b0702c82584f9ea1f5675b4aa00bb0464c7"
-  integrity sha512-Je1zk5iJjStjV3acgQ3Fl2lVnLyhvh+0eyJ/8+FIHp3M3IyR32D/yShYCHMIQhTppXuSV9WZwxif3KsrGxlPqA==
+"@glimmer/util@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.0.tgz#21c93fd7f822ba641485953c3ad4d7e929ec17c1"
+  integrity sha512-S8DfVvNAIOUxSawKjSSxa8U6yu2VVcZjaMVy4yoJR0QKpo++V6x1HDBjDOQU0xKgr98lCJqoAnPKZT6t1/eahg==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.73.0"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/validator@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.73.0.tgz#d523904f4faff0a3af570d215d679bc7c2148e29"
+  integrity sha512-fAs3XREHTw/ePYkAM8lKkNeo0//d/TJYWn2iM5SuPPglRJGATg/8p1Nk2iw31BofPvsT3WAnFbr0aWGGZF9paQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.72.0"
+    "@glimmer/global-context" "0.73.0"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 6cf7f303fa8a619ee4d111fd5f4b09db2dcb4953 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Dec 2020 14:56:30 +0800
Subject: [PATCH 249/299] Build(deps): Bump flow-parser from 0.140.0 to 0.141.0
 (#9938)

Bumps [flow-parser](https://github.com/facebook/flow) from 0.140.0 to 0.141.0.
- [Release notes](https://github.com/facebook/flow/releases)
- [Changelog](https://github.com/facebook/flow/blob/master/Changelog.md)
- [Commits](https://github.com/facebook/flow/compare/v0.140.0...v0.141.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c0f87ab0d..22fb4d25d 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "fast-glob": "3.2.4",
     "fast-json-stable-stringify": "2.1.0",
     "find-parent-dir": "0.3.0",
-    "flow-parser": "0.140.0",
+    "flow-parser": "0.141.0",
     "get-stdin": "8.0.0",
     "globby": "11.0.1",
     "graphql": "15.4.0",
diff --git a/yarn.lock b/yarn.lock
index 106c37802..c5e281e8c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3557,10 +3557,10 @@ flatten@^1.0.2:
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
   integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
-flow-parser@0.140.0:
-  version "0.140.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.140.0.tgz#f737901bf8343c843417cac695b0b428a54843c6"
-  integrity sha512-z57YJZXcO0mmlNoOf9uvdnoZXanu8ALTqSaAWAv6kQavpnA5Kpdd4R7B3wP56+/yi/yODjrtarQYV/bgv867Iw==
+flow-parser@0.141.0:
+  version "0.141.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.141.0.tgz#b9e176e54dd204b2375e35df10caf6607c3d09a1"
+  integrity sha512-WKdBiR9sDfkgEyPGhIgldUrVM08D57CgHLgd0FOXbhcVYXNfw+eHSApQ8SdcdQQoqrOvhlcVRB8lsn9bD5GQOw==
 
 for-in@^1.0.2:
   version "1.0.2"

From fbe57068e76135ce44cdb3db0877b6cbcf981988 Mon Sep 17 00:00:00 2001
From: Cyrille David <dcyriller@users.noreply.github.com>
Date: Mon, 21 Dec 2020 10:04:18 +0100
Subject: [PATCH 250/299] Handlebars: Add tests for `ignore` and `strict` modes
 (1/3) (#9883)

---
 .../__snapshots__/jsfmt.spec.js.snap          | 617 ++++++++++++++++++
 .../html-whitespace-sensitivity/jsfmt.spec.js |   8 +
 .../html-whitespace-sensitivity/option.hbs    | 116 ++++
 3 files changed, 741 insertions(+)
 create mode 100644 tests/handlebars/html-whitespace-sensitivity/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/handlebars/html-whitespace-sensitivity/jsfmt.spec.js
 create mode 100644 tests/handlebars/html-whitespace-sensitivity/option.hbs

diff --git a/tests/handlebars/html-whitespace-sensitivity/__snapshots__/jsfmt.spec.js.snap b/tests/handlebars/html-whitespace-sensitivity/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..5168494e5
--- /dev/null
+++ b/tests/handlebars/html-whitespace-sensitivity/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,617 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`option.hbs - {"htmlWhitespaceSensitivity":"ignore","printWidth":40} format 1`] = `
+====================================options=====================================
+htmlWhitespaceSensitivity: "ignore"
+parsers: ["glimmer"]
+printWidth: 40
+                                        | printWidth
+=====================================input======================================
+<p>Hi  {{firstName}}  {{lastName}}   , welcome!</p>
+{{#component propA}}
+    for {{propB}}  do {{propC}} f
+{{/component}}
+{{#component propA}}
+    for {{propB}}  <span>name</span>do {{propC}} f
+{{/component}}
+{{propA}} {{propB}}
+{{propC}}{{propD}}
+<span>{{propE}} {{propF}}</span>
+<span>{{propG}}{{propH}}</span>
+
+
+
+hey
+
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+<button>
+Click here! Click here! Click here! Click here! Click here! Click here!
+</button>
+<div>
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button><button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+</div>
+<div>
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+</div>
+<video src="brave.webm"></video>
+
+<SomeComponent />
+{{name}}
+
+
+
+Some sentence with  {{dynamic}}  expressions.
+
+sometimes{{nogaps}}areimportant<Hello></Hello>
+
+
+{{name}}  is your name
+
+
+{{#block}}
+{{/block}}
+
+
+{{#block}}
+  some {{text}}
+{{/block}}
+
+{{#block}}
+
+  some {{text}}
+{{/block}}
+
+<HelloWorld>
+</HelloWorld>
+
+<HelloWorld>
+  some {{text}}
+</HelloWorld>
+
+<HelloWorld>
+
+  some {{text}}
+</HelloWorld>
+
+<div class="a list of classes">
+</div>
+
+<div class="a list of classes">
+
+</div>
+
+<span>This is your name: {{name}}.</span>
+<span>This is your name: {{name}} (employee)</span>
+<span>This is your name: {{name}} ({{role}})</span>
+
+<span>123</span>
+<span>
+123</span>
+<span>123
+</span>
+<span>
+123
+</span>
+
+<div>123</div>
+<div>
+123</div>
+<div>123
+</div>
+<div>
+123
+</div>
+
+<table>
+  <thead>
+    <tr>
+      <th>A</th>
+      <th>B</th>
+      <th>C</th>
+    </tr>
+  </thead>
+</table>
+
+<table><thead><tr><th>A</th><th>B</th><th>C</th></tr></thead></table>
+
+<table> <thead> <tr> <th> A </th> <th> B </th> <th> C </th> </tr> </thead> </table>
+
+<table>
+  <thead>
+    <tr>
+    </tr>
+  </thead>
+</table>
+
+=====================================output=====================================
+<p>
+  Hi {{firstName}} {{
+    lastName
+  }} , welcome!
+</p>
+{{#component propA}}
+  for {{propB}} do {{propC}} f
+{{/component}}
+{{#component propA}}
+  for {{propB}}
+  <span>
+    name
+  </span>
+  do {{propC}} f
+{{/component}}
+{{propA}} {{propB}}
+{{propC}}{{propD}}
+<span>
+  {{propE}} {{propF}}
+</span>
+<span>
+  {{propG}}{{propH}}
+</span>
+
+hey
+
+<button>
+  Click here! Click here! Click here! Click here! Click here! Click here!
+</button>
+<button>
+  Click here! Click here! Click here! Click here! Click here! Click here!
+</button>
+<div>
+  <button>
+    Click here! Click here! Click here! Click here! Click here! Click here!
+  </button>
+  <button>
+    Click here! Click here! Click here! Click here! Click here! Click here!
+  </button>
+</div>
+<div>
+  <button>
+    Click here! Click here! Click here! Click here! Click here! Click here!
+  </button>
+  <button>
+    Click here! Click here! Click here! Click here! Click here! Click here!
+  </button>
+</div>
+<video src="brave.webm"></video>
+
+<SomeComponent />
+{{name}}
+
+Some sentence with {{dynamic
+}} expressions.
+
+sometimes{{nogaps
+}}areimportant
+<Hello />
+
+{{name}} is your name
+
+{{#block}}{{/block}}
+
+{{#block}}
+  some {{text}}
+{{/block}}
+
+{{#block}}
+  some {{text}}
+{{/block}}
+
+<HelloWorld />
+
+<HelloWorld>
+  some {{text}}
+</HelloWorld>
+
+<HelloWorld>
+  some {{text}}
+</HelloWorld>
+
+<div class="a list of classes">
+</div>
+
+<div class="a list of classes">
+</div>
+
+<span>
+  This is your name: {{name}}.
+</span>
+<span>
+  This is your name: {{name}} (employee)
+</span>
+<span>
+  This is your name: {{name}} ({{role}})
+</span>
+
+<span>
+  123
+</span>
+<span>
+  123
+</span>
+<span>
+  123
+</span>
+<span>
+  123
+</span>
+
+<div>
+  123
+</div>
+<div>
+  123
+</div>
+<div>
+  123
+</div>
+<div>
+  123
+</div>
+
+<table>
+  <thead>
+    <tr>
+      <th>
+        A
+      </th>
+      <th>
+        B
+      </th>
+      <th>
+        C
+      </th>
+    </tr>
+  </thead>
+</table>
+
+<table>
+  <thead>
+    <tr>
+      <th>
+        A
+      </th>
+      <th>
+        B
+      </th>
+      <th>
+        C
+      </th>
+    </tr>
+  </thead>
+</table>
+
+<table>
+  <thead>
+    <tr>
+      <th>
+        A
+      </th>
+
+      <th>
+        B
+      </th>
+
+      <th>
+        C
+      </th>
+    </tr>
+  </thead>
+</table>
+
+<table>
+  <thead>
+    <tr>
+    </tr>
+  </thead>
+</table>
+================================================================================
+`;
+
+exports[`option.hbs - {"htmlWhitespaceSensitivity":"strict","printWidth":40} format 1`] = `
+====================================options=====================================
+htmlWhitespaceSensitivity: "strict"
+parsers: ["glimmer"]
+printWidth: 40
+                                        | printWidth
+=====================================input======================================
+<p>Hi  {{firstName}}  {{lastName}}   , welcome!</p>
+{{#component propA}}
+    for {{propB}}  do {{propC}} f
+{{/component}}
+{{#component propA}}
+    for {{propB}}  <span>name</span>do {{propC}} f
+{{/component}}
+{{propA}} {{propB}}
+{{propC}}{{propD}}
+<span>{{propE}} {{propF}}</span>
+<span>{{propG}}{{propH}}</span>
+
+
+
+hey
+
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+<button>
+Click here! Click here! Click here! Click here! Click here! Click here!
+</button>
+<div>
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button><button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+</div>
+<div>
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+</div>
+<video src="brave.webm"></video>
+
+<SomeComponent />
+{{name}}
+
+
+
+Some sentence with  {{dynamic}}  expressions.
+
+sometimes{{nogaps}}areimportant<Hello></Hello>
+
+
+{{name}}  is your name
+
+
+{{#block}}
+{{/block}}
+
+
+{{#block}}
+  some {{text}}
+{{/block}}
+
+{{#block}}
+
+  some {{text}}
+{{/block}}
+
+<HelloWorld>
+</HelloWorld>
+
+<HelloWorld>
+  some {{text}}
+</HelloWorld>
+
+<HelloWorld>
+
+  some {{text}}
+</HelloWorld>
+
+<div class="a list of classes">
+</div>
+
+<div class="a list of classes">
+
+</div>
+
+<span>This is your name: {{name}}.</span>
+<span>This is your name: {{name}} (employee)</span>
+<span>This is your name: {{name}} ({{role}})</span>
+
+<span>123</span>
+<span>
+123</span>
+<span>123
+</span>
+<span>
+123
+</span>
+
+<div>123</div>
+<div>
+123</div>
+<div>123
+</div>
+<div>
+123
+</div>
+
+<table>
+  <thead>
+    <tr>
+      <th>A</th>
+      <th>B</th>
+      <th>C</th>
+    </tr>
+  </thead>
+</table>
+
+<table><thead><tr><th>A</th><th>B</th><th>C</th></tr></thead></table>
+
+<table> <thead> <tr> <th> A </th> <th> B </th> <th> C </th> </tr> </thead> </table>
+
+<table>
+  <thead>
+    <tr>
+    </tr>
+  </thead>
+</table>
+
+=====================================output=====================================
+<p>
+  Hi {{firstName}} {{
+    lastName
+  }} , welcome!
+</p>
+{{#component propA}}
+  for {{propB}} do {{propC}} f
+{{/component}}
+{{#component propA}}
+  for {{propB}}
+  <span>
+    name
+  </span>
+  do {{propC}} f
+{{/component}}
+{{propA}} {{propB}}
+{{propC}}{{propD}}
+<span>
+  {{propE}} {{propF}}
+</span>
+<span>
+  {{propG}}{{propH}}
+</span>
+
+hey
+
+<button>
+  Click here! Click here! Click here! Click here! Click here! Click here!
+</button>
+<button>
+  Click here! Click here! Click here! Click here! Click here! Click here!
+</button>
+<div>
+  <button>
+    Click here! Click here! Click here! Click here! Click here! Click here!
+  </button>
+  <button>
+    Click here! Click here! Click here! Click here! Click here! Click here!
+  </button>
+</div>
+<div>
+  <button>
+    Click here! Click here! Click here! Click here! Click here! Click here!
+  </button>
+  <button>
+    Click here! Click here! Click here! Click here! Click here! Click here!
+  </button>
+</div>
+<video src="brave.webm"></video>
+
+<SomeComponent />
+{{name}}
+
+Some sentence with {{dynamic
+}} expressions.
+
+sometimes{{nogaps
+}}areimportant
+<Hello />
+
+{{name}} is your name
+
+{{#block}}{{/block}}
+
+{{#block}}
+  some {{text}}
+{{/block}}
+
+{{#block}}
+  some {{text}}
+{{/block}}
+
+<HelloWorld />
+
+<HelloWorld>
+  some {{text}}
+</HelloWorld>
+
+<HelloWorld>
+  some {{text}}
+</HelloWorld>
+
+<div class="a list of classes">
+</div>
+
+<div class="a list of classes">
+</div>
+
+<span>
+  This is your name: {{name}}.
+</span>
+<span>
+  This is your name: {{name}} (employee)
+</span>
+<span>
+  This is your name: {{name}} ({{role}})
+</span>
+
+<span>
+  123
+</span>
+<span>
+  123
+</span>
+<span>
+  123
+</span>
+<span>
+  123
+</span>
+
+<div>
+  123
+</div>
+<div>
+  123
+</div>
+<div>
+  123
+</div>
+<div>
+  123
+</div>
+
+<table>
+  <thead>
+    <tr>
+      <th>
+        A
+      </th>
+      <th>
+        B
+      </th>
+      <th>
+        C
+      </th>
+    </tr>
+  </thead>
+</table>
+
+<table>
+  <thead>
+    <tr>
+      <th>
+        A
+      </th>
+      <th>
+        B
+      </th>
+      <th>
+        C
+      </th>
+    </tr>
+  </thead>
+</table>
+
+<table>
+  <thead>
+    <tr>
+      <th>
+        A
+      </th>
+
+      <th>
+        B
+      </th>
+
+      <th>
+        C
+      </th>
+    </tr>
+  </thead>
+</table>
+
+<table>
+  <thead>
+    <tr>
+    </tr>
+  </thead>
+</table>
+================================================================================
+`;
diff --git a/tests/handlebars/html-whitespace-sensitivity/jsfmt.spec.js b/tests/handlebars/html-whitespace-sensitivity/jsfmt.spec.js
new file mode 100644
index 000000000..eecdb7268
--- /dev/null
+++ b/tests/handlebars/html-whitespace-sensitivity/jsfmt.spec.js
@@ -0,0 +1,8 @@
+run_spec(__dirname, ["glimmer"], {
+  htmlWhitespaceSensitivity: "ignore",
+  printWidth: 40,
+});
+run_spec(__dirname, ["glimmer"], {
+  htmlWhitespaceSensitivity: "strict",
+  printWidth: 40,
+});
diff --git a/tests/handlebars/html-whitespace-sensitivity/option.hbs b/tests/handlebars/html-whitespace-sensitivity/option.hbs
new file mode 100644
index 000000000..1d412b815
--- /dev/null
+++ b/tests/handlebars/html-whitespace-sensitivity/option.hbs
@@ -0,0 +1,116 @@
+<p>Hi  {{firstName}}  {{lastName}}   , welcome!</p>
+{{#component propA}}
+    for {{propB}}  do {{propC}} f
+{{/component}}
+{{#component propA}}
+    for {{propB}}  <span>name</span>do {{propC}} f
+{{/component}}
+{{propA}} {{propB}}
+{{propC}}{{propD}}
+<span>{{propE}} {{propF}}</span>
+<span>{{propG}}{{propH}}</span>
+
+
+
+hey
+
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+<button>
+Click here! Click here! Click here! Click here! Click here! Click here!
+</button>
+<div>
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button><button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+</div>
+<div>
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+<button>Click here! Click here! Click here! Click here! Click here! Click here!</button>
+</div>
+<video src="brave.webm"></video>
+
+<SomeComponent />
+{{name}}
+
+
+
+Some sentence with  {{dynamic}}  expressions.
+
+sometimes{{nogaps}}areimportant<Hello></Hello>
+
+
+{{name}}  is your name
+
+
+{{#block}}
+{{/block}}
+
+
+{{#block}}
+  some {{text}}
+{{/block}}
+
+{{#block}}
+
+  some {{text}}
+{{/block}}
+
+<HelloWorld>
+</HelloWorld>
+
+<HelloWorld>
+  some {{text}}
+</HelloWorld>
+
+<HelloWorld>
+
+  some {{text}}
+</HelloWorld>
+
+<div class="a list of classes">
+</div>
+
+<div class="a list of classes">
+
+</div>
+
+<span>This is your name: {{name}}.</span>
+<span>This is your name: {{name}} (employee)</span>
+<span>This is your name: {{name}} ({{role}})</span>
+
+<span>123</span>
+<span>
+123</span>
+<span>123
+</span>
+<span>
+123
+</span>
+
+<div>123</div>
+<div>
+123</div>
+<div>123
+</div>
+<div>
+123
+</div>
+
+<table>
+  <thead>
+    <tr>
+      <th>A</th>
+      <th>B</th>
+      <th>C</th>
+    </tr>
+  </thead>
+</table>
+
+<table><thead><tr><th>A</th><th>B</th><th>C</th></tr></thead></table>
+
+<table> <thead> <tr> <th> A </th> <th> B </th> <th> C </th> </tr> </thead> </table>
+
+<table>
+  <thead>
+    <tr>
+    </tr>
+  </thead>
+</table>

From 6843b51113a297adfe6dc84e86f6741e69c4871e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Dec 2020 09:05:55 +0000
Subject: [PATCH 251/299] Build(deps-dev): Bump eslint from 7.15.0 to 7.16.0
 (#9939)

---
 package.json |  2 +-
 yarn.lock    | 75 ++++++++++++++++++++--------------------------------
 2 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index 22fb4d25d..a9fe0c16e 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "builtin-modules": "3.1.0",
     "cross-env": "7.0.3",
     "cspell": "4.2.5",
-    "eslint": "7.15.0",
+    "eslint": "7.16.0",
     "eslint-config-prettier": "7.1.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.22.1",
diff --git a/yarn.lock b/yarn.lock
index c5e281e8c..20e11216e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1894,7 +1894,7 @@ ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.5.5:
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.5.5:
   version "6.12.5"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
   integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
@@ -1946,7 +1946,7 @@ ansi-regex@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -2057,10 +2057,10 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -2927,11 +2927,6 @@ emittery@^0.7.1:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451"
   integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -3187,10 +3182,10 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@7.15.0:
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7"
-  integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==
+eslint@7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.16.0.tgz#a761605bf9a7b32d24bb7cde59aeb0fd76f06092"
+  integrity sha512-iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@eslint/eslintrc" "^0.2.2"
@@ -3226,7 +3221,7 @@ eslint@7.15.0:
     semver "^7.2.1"
     strip-ansi "^6.0.0"
     strip-json-comments "^3.1.0"
-    table "^5.2.3"
+    table "^6.0.4"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
@@ -4105,11 +4100,6 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -5159,7 +5149,7 @@ lodash.zip@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020"
   integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=
 
-lodash@4.17.20, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4:
+lodash@4.17.20, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -6567,14 +6557,14 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
   dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -6759,15 +6749,6 @@ string-width@4.2.0, string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string-width@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
 string.prototype.matchall@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
@@ -6804,7 +6785,7 @@ string.prototype.trimstart@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
-strip-ansi@5.2.0, strip-ansi@^5.1.0:
+strip-ansi@5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -6889,15 +6870,15 @@ synchronous-promise@2.0.15:
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.15.tgz#07ca1822b9de0001f5ff73595f3d08c4f720eb8e"
   integrity sha512-k8uzYIkIVwmT+TcglpdN50pS2y1BDcUnBPK9iJeGu0Pl1lOI8pD6wtzgw91Pjpe+RxtTncw32tLxs/R0yNL2Mg==
 
-table@^5.2.3:
-  version "5.4.6"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+table@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.0.4.tgz#c523dd182177e926c723eb20e1b341238188aa0d"
+  integrity sha512-sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw==
   dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
+    ajv "^6.12.4"
+    lodash "^4.17.20"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.0"
 
 tapable@^2.0.0, tapable@^2.1.1:
   version "2.1.1"

From f0f18d30900130027dbaaeff3cb658702a1500cf Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 21 Dec 2020 17:09:20 +0800
Subject: [PATCH 252/299] Enable `unicorn/prefer-number-properties` (#9935)

---
 .eslintrc.yml                                     |  1 +
 scripts/release/steps/update-dependents-count.js  |  4 ++--
 src/document/doc-builders.js                      |  4 ++--
 src/document/doc-debug.js                         |  2 +-
 src/document/doc-printer.js                       |  2 +-
 src/language-css/clean.js                         |  2 +-
 src/language-html/utils.js                        |  4 ++--
 src/language-js/print/template-literal.js         |  9 ++++++---
 src/language-yaml/utils.js                        |  2 +-
 src/main/core-options.js                          | 12 ++++++------
 src/main/core.js                                  |  4 ++--
 tests/html/comments/jsfmt.spec.js                 |  2 +-
 tests/html/tags/jsfmt.spec.js                     |  2 +-
 tests_config/utils/create-snapshot.js             |  2 +-
 tests_config/utils/stringify-options-for-title.js |  2 +-
 tests_config/utils/visualize-range.js             |  5 ++++-
 website/playground/Playground.js                  |  2 +-
 website/playground/sidebar/inputs.js              |  2 +-
 18 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index d0e2c6b1a..c111da02a 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -70,6 +70,7 @@ rules:
   unicorn/new-for-builtins: error
   unicorn/no-useless-undefined: error
   unicorn/prefer-includes: error
+  unicorn/prefer-number-properties: error
   unicorn/prefer-string-slice: error
 overrides:
   - files:
diff --git a/scripts/release/steps/update-dependents-count.js b/scripts/release/steps/update-dependents-count.js
index 1167c8182..1fb641bb6 100644
--- a/scripts/release/steps/update-dependents-count.js
+++ b/scripts/release/steps/update-dependents-count.js
@@ -15,7 +15,7 @@ async function update() {
   const dependentsCountNpm = Number(
     npmPage.match(/"dependentsCount":(\d+),/)[1]
   );
-  if (isNaN(dependentsCountNpm)) {
+  if (Number.isNaN(dependentsCountNpm)) {
     throw new TypeError(
       "Invalid data from https://www.npmjs.com/package/prettier"
     );
@@ -35,7 +35,7 @@ async function update() {
       )[1]
       .replace(/,/g, "")
   );
-  if (isNaN(dependentsCountNpm)) {
+  if (Number.isNaN(dependentsCountNpm)) {
     throw new TypeError(
       "Invalid data from https://github.com/prettier/prettier/network/dependents"
     );
diff --git a/src/document/doc-builders.js b/src/document/doc-builders.js
index d6e64df5e..78bb870a8 100644
--- a/src/document/doc-builders.js
+++ b/src/document/doc-builders.js
@@ -94,7 +94,7 @@ function group(contents, opts) {
  * @returns Doc
  */
 function dedentToRoot(contents) {
-  return align(-Infinity, contents);
+  return align(Number.NEGATIVE_INFINITY, contents);
 }
 
 /**
@@ -219,7 +219,7 @@ function addAlignmentToDoc(doc, size, tabWidth) {
     aligned = align(size % tabWidth, aligned);
     // size is absolute from 0 and not relative to the current
     // indentation, so we use -Infinity to reset the indentation to 0
-    aligned = align(-Infinity, aligned);
+    aligned = align(Number.NEGATIVE_INFINITY, aligned);
   }
   return aligned;
 }
diff --git a/src/document/doc-debug.js b/src/document/doc-debug.js
index 3d29a39a6..d9a9a010a 100644
--- a/src/document/doc-debug.js
+++ b/src/document/doc-debug.js
@@ -74,7 +74,7 @@ function printDoc(doc) {
   }
 
   if (doc.type === "align") {
-    return doc.n === -Infinity
+    return doc.n === Number.NEGATIVE_INFINITY
       ? "dedentToRoot(" + printDoc(doc.contents) + ")"
       : doc.n < 0
       ? "dedent(" + printDoc(doc.contents) + ")"
diff --git a/src/document/doc-printer.js b/src/document/doc-printer.js
index 34f1521b9..354d3e68c 100644
--- a/src/document/doc-printer.js
+++ b/src/document/doc-printer.js
@@ -19,7 +19,7 @@ function makeIndent(ind, options) {
 }
 
 function makeAlign(indent, n, options) {
-  if (n === -Infinity) {
+  if (n === Number.NEGATIVE_INFINITY) {
     return indent.root || rootIndent();
   }
 
diff --git a/src/language-css/clean.js b/src/language-css/clean.js
index 500742594..42cfa3ad6 100644
--- a/src/language-css/clean.js
+++ b/src/language-css/clean.js
@@ -144,7 +144,7 @@ function clean(ast, newObj, parent) {
       /([\d+.Ee-]+)([A-Za-z]*)/g,
       (match, numStr, unit) => {
         const num = Number(numStr);
-        return isNaN(num) ? match : num + unit.toLowerCase();
+        return Number.isNaN(num) ? match : num + unit.toLowerCase();
       }
     );
   }
diff --git a/src/language-html/utils.js b/src/language-html/utils.js
index b5792fcf8..91c1cf9c0 100644
--- a/src/language-html/utils.js
+++ b/src/language-html/utils.js
@@ -557,7 +557,7 @@ function getNodeCssStyleWhiteSpace(node) {
 }
 
 function getMinIndentation(text) {
-  let minIndentation = Infinity;
+  let minIndentation = Number.POSITIVE_INFINITY;
 
   for (const lineText of text.split("\n")) {
     if (lineText.length === 0) {
@@ -579,7 +579,7 @@ function getMinIndentation(text) {
     }
   }
 
-  return minIndentation === Infinity ? 0 : minIndentation;
+  return minIndentation === Number.POSITIVE_INFINITY ? 0 : minIndentation;
 }
 
 function dedentString(text, minIndent = getMinIndentation(text)) {
diff --git a/src/language-js/print/template-literal.js b/src/language-js/print/template-literal.js
index ab1289e0d..bf1902ce4 100644
--- a/src/language-js/print/template-literal.js
+++ b/src/language-js/print/template-literal.js
@@ -48,7 +48,10 @@ function printTemplateLiteral(path, print, options) {
   if (isSimple) {
     expressions = expressions.map(
       (doc) =>
-        printDocToString(doc, { ...options, printWidth: Infinity }).formatted
+        printDocToString(doc, {
+          ...options,
+          printWidth: Number.POSITIVE_INFINITY,
+        }).formatted
     );
   }
 
@@ -96,7 +99,7 @@ function printTemplateLiteral(path, print, options) {
 
       const aligned =
         indentSize === 0 && quasi.value.raw.endsWith("\n")
-          ? align(-Infinity, printed)
+          ? align(Number.NEGATIVE_INFINITY, printed)
           : addAlignmentToDoc(printed, indentSize, tabWidth);
 
       parts.push(group(concat(["${", aligned, lineSuffixBoundary, "}"])));
@@ -130,7 +133,7 @@ function printJestEachTemplateLiteral(path, options, print) {
         "${" +
         printDocToString(doc, {
           ...options,
-          printWidth: Infinity,
+          printWidth: Number.POSITIVE_INFINITY,
           endOfLine: "lf",
         }).formatted +
         "}"
diff --git a/src/language-yaml/utils.js b/src/language-yaml/utils.js
index 5583ef694..a7e66520f 100644
--- a/src/language-yaml/utils.js
+++ b/src/language-yaml/utils.js
@@ -252,7 +252,7 @@ function getBlockValueLineContents(
 
   const leadingSpaceCount =
     node.indent === null
-      ? ((match) => (match ? match[1].length : Infinity))(
+      ? ((match) => (match ? match[1].length : Number.POSITIVE_INFINITY))(
           content.match(/^( *)\S/m)
         )
       : node.indent - 1 + parentIndent;
diff --git a/src/main/core-options.js b/src/main/core-options.js
index 3f3039bd3..8f192daa4 100644
--- a/src/main/core-options.js
+++ b/src/main/core-options.js
@@ -54,7 +54,7 @@ const options = {
     category: CATEGORY_SPECIAL,
     type: "int",
     default: -1,
-    range: { start: -1, end: Infinity, step: 1 },
+    range: { start: -1, end: Number.POSITIVE_INFINITY, step: 1 },
     description: outdent`
       Print (to stderr) where a cursor at the given position would move to after formatting.
       This option cannot be used with --range-start and --range-end.
@@ -195,14 +195,14 @@ const options = {
     type: "int",
     default: 80,
     description: "The line length where Prettier will try wrap.",
-    range: { start: 0, end: Infinity, step: 1 },
+    range: { start: 0, end: Number.POSITIVE_INFINITY, step: 1 },
   },
   rangeEnd: {
     since: "1.4.0",
     category: CATEGORY_SPECIAL,
     type: "int",
-    default: Infinity,
-    range: { start: 0, end: Infinity, step: 1 },
+    default: Number.POSITIVE_INFINITY,
+    range: { start: 0, end: Number.POSITIVE_INFINITY, step: 1 },
     description: outdent`
       Format code ending at a given character offset (exclusive).
       The range will extend forwards to the end of the selected statement.
@@ -215,7 +215,7 @@ const options = {
     category: CATEGORY_SPECIAL,
     type: "int",
     default: 0,
-    range: { start: 0, end: Infinity, step: 1 },
+    range: { start: 0, end: Number.POSITIVE_INFINITY, step: 1 },
     description: outdent`
       Format code starting at a given character offset.
       The range will extend backwards to the start of the first line containing the selected statement.
@@ -239,7 +239,7 @@ const options = {
     category: CATEGORY_GLOBAL,
     default: 2,
     description: "Number of spaces per indentation level.",
-    range: { start: 0, end: Infinity, step: 1 },
+    range: { start: 0, end: Number.POSITIVE_INFINITY, step: 1 },
   },
   useTabs: {
     since: "1.0.0",
diff --git a/src/main/core.js b/src/main/core.js
index e4e8cf99f..640a2a55e 100644
--- a/src/main/core.js
+++ b/src/main/core.js
@@ -162,7 +162,7 @@ function formatRange(originalText, opts) {
     {
       ...opts,
       rangeStart: 0,
-      rangeEnd: Infinity,
+      rangeEnd: Number.POSITIVE_INFINITY,
       // Track the cursor offset only if it's within our range
       cursorOffset:
         opts.cursorOffset > rangeStart && opts.cursorOffset < rangeEnd
@@ -209,7 +209,7 @@ function formatRange(originalText, opts) {
 function ensureIndexInText(text, index, defaultValue) {
   if (
     typeof index !== "number" ||
-    isNaN(index) ||
+    Number.isNaN(index) ||
     index < 0 ||
     index > text.length
   ) {
diff --git a/tests/html/comments/jsfmt.spec.js b/tests/html/comments/jsfmt.spec.js
index 27febda27..fb2a2d11b 100644
--- a/tests/html/comments/jsfmt.spec.js
+++ b/tests/html/comments/jsfmt.spec.js
@@ -1,5 +1,5 @@
 run_spec(__dirname, ["html"]);
 run_spec(__dirname, ["html"], { printWidth: 1 });
-run_spec(__dirname, ["html"], { printWidth: Infinity });
+run_spec(__dirname, ["html"], { printWidth: Number.POSITIVE_INFINITY });
 run_spec(__dirname, ["html"], { htmlWhitespaceSensitivity: "strict" });
 run_spec(__dirname, ["html"], { htmlWhitespaceSensitivity: "ignore" });
diff --git a/tests/html/tags/jsfmt.spec.js b/tests/html/tags/jsfmt.spec.js
index 27febda27..fb2a2d11b 100644
--- a/tests/html/tags/jsfmt.spec.js
+++ b/tests/html/tags/jsfmt.spec.js
@@ -1,5 +1,5 @@
 run_spec(__dirname, ["html"]);
 run_spec(__dirname, ["html"], { printWidth: 1 });
-run_spec(__dirname, ["html"], { printWidth: Infinity });
+run_spec(__dirname, ["html"], { printWidth: Number.POSITIVE_INFINITY });
 run_spec(__dirname, ["html"], { htmlWhitespaceSensitivity: "strict" });
 run_spec(__dirname, ["html"], { htmlWhitespaceSensitivity: "ignore" });
diff --git a/tests_config/utils/create-snapshot.js b/tests_config/utils/create-snapshot.js
index 32cf77d33..0db847e48 100644
--- a/tests_config/utils/create-snapshot.js
+++ b/tests_config/utils/create-snapshot.js
@@ -10,7 +10,7 @@ function printSeparator(width, description) {
 }
 
 function stringify(value) {
-  return value === Infinity
+  return value === Number.POSITIVE_INFINITY
     ? "Infinity"
     : Array.isArray(value)
     ? `[${value.map((v) => JSON.stringify(v)).join(", ")}]`
diff --git a/tests_config/utils/stringify-options-for-title.js b/tests_config/utils/stringify-options-for-title.js
index 2ea06ce77..dbc95627f 100644
--- a/tests_config/utils/stringify-options-for-title.js
+++ b/tests_config/utils/stringify-options-for-title.js
@@ -4,7 +4,7 @@ function stringifyOptions(options) {
   const string = JSON.stringify(options || {}, (key, value) =>
     key === "plugins" || key === "errors"
       ? undefined
-      : value === Infinity
+      : value === Number.POSITIVE_INFINITY
       ? "Infinity"
       : value
   );
diff --git a/tests_config/utils/visualize-range.js b/tests_config/utils/visualize-range.js
index d8125a06a..7fca537b0 100644
--- a/tests_config/utils/visualize-range.js
+++ b/tests_config/utils/visualize-range.js
@@ -2,7 +2,10 @@
 
 const LinesAndColumns = require("lines-and-columns").default;
 const { codeFrameColumns } = require("@babel/code-frame");
-const codeFrameColumnsOptions = { linesAbove: Infinity, linesBelow: Infinity };
+const codeFrameColumnsOptions = {
+  linesAbove: Number.POSITIVE_INFINITY,
+  linesBelow: Number.POSITIVE_INFINITY,
+};
 
 const locationForRange = (text, rangeStart, rangeEnd) => {
   if (rangeStart > rangeEnd) {
diff --git a/website/playground/Playground.js b/website/playground/Playground.js
index 14771933a..01b41baad 100644
--- a/website/playground/Playground.js
+++ b/website/playground/Playground.js
@@ -118,7 +118,7 @@ class Playground extends React.Component {
     this.setState((state) => {
       const options = { ...state.options };
 
-      if (option.type === "int" && isNaN(value)) {
+      if (option.type === "int" && Number.isNaN(value)) {
         delete options[option.name];
       } else {
         options[option.name] = value;
diff --git a/website/playground/sidebar/inputs.js b/website/playground/sidebar/inputs.js
index eae51b615..b4c15099c 100644
--- a/website/playground/sidebar/inputs.js
+++ b/website/playground/sidebar/inputs.js
@@ -46,7 +46,7 @@ export function NumberInput({
         max={max}
         step={step}
         value={value}
-        onChange={(ev) => onChange(parseInt(ev.target.value, 10))}
+        onChange={(ev) => onChange(Number.parseInt(ev.target.value, 10))}
       />
     </label>
   );

From be497c3c8f05a4928a72fbe855ac239b1e8a40fc Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 21 Dec 2020 17:10:03 +0800
Subject: [PATCH 253/299] Use `printBlock` to print `ClassBody` (#9915)

---
 src/language-js/print/block.js                 |  3 ++-
 src/language-js/print/class.js                 | 18 ------------------
 src/language-js/printer-estree.js              |  4 +---
 .../__snapshots__/jsfmt.spec.js.snap           |  6 ++----
 .../__snapshots__/jsfmt.spec.js.snap           |  3 +--
 5 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/language-js/print/block.js b/src/language-js/print/block.js
index 4b6e662d3..bb8d67dd9 100644
--- a/src/language-js/print/block.js
+++ b/src/language-js/print/block.js
@@ -41,7 +41,8 @@ function printBlock(path, options, print) {
         (parent.type === "CatchClause" && !parentParent.finalizer) ||
         parent.type === "TSModuleDeclaration" ||
         parent.type === "TSDeclareFunction" ||
-        node.type === "StaticBlock"
+        node.type === "StaticBlock" ||
+        node.type === "ClassBody"
       )
     ) {
       parts.push(hardline);
diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
index d8169cf10..1c66c068f 100644
--- a/src/language-js/print/class.js
+++ b/src/language-js/print/class.js
@@ -13,7 +13,6 @@ const {
 const { getTypeParametersGroupId } = require("./type-parameters");
 const { printMethod } = require("./function");
 const { printOptionalToken, printTypeAnnotation } = require("./misc");
-const { printBody } = require("./statement");
 const { printPropertyKey } = require("./property");
 const { printAssignmentRight } = require("./assignment");
 
@@ -177,22 +176,6 @@ function printClassMethod(path, options, print) {
   return concat(parts);
 }
 
-function printClassBody(path, options, print) {
-  const n = path.getValue();
-  if (!hasComment(n) && n.body.length === 0) {
-    return "{}";
-  }
-
-  return concat([
-    "{",
-    n.body.length > 0
-      ? indent(concat([hardline, printBody(path, options, print)]))
-      : printDanglingComments(path, options),
-    hardline,
-    "}",
-  ]);
-}
-
 function printClassProperty(path, options, print) {
   const n = path.getValue();
   const parts = [];
@@ -249,6 +232,5 @@ function printDecorators(path, options, print) {
 module.exports = {
   printClass,
   printClassMethod,
-  printClassBody,
   printClassProperty,
 };
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index fe2a2b77f..f94e1ebf9 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -80,7 +80,6 @@ const { printObject } = require("./print/object");
 const {
   printClass,
   printClassMethod,
-  printClassBody,
   printClassProperty,
 } = require("./print/class");
 const { printTypeParameters } = require("./print/type-parameters");
@@ -424,6 +423,7 @@ function printPathNoParens(path, options, print, args) {
       return "import";
     case "BlockStatement":
     case "StaticBlock":
+    case "ClassBody":
       return printBlock(path, options, print);
     case "ThrowStatement":
       return printThrowStatement(path, options, print);
@@ -901,8 +901,6 @@ function printPathNoParens(path, options, print, args) {
     case "ClassDeclaration":
     case "ClassExpression":
       return printClass(path, options, print);
-    case "ClassBody":
-      return printClassBody(path, options, print);
     case "ClassMethod":
     case "ClassPrivateMethod":
     case "MethodDefinition":
diff --git a/tests/js/class-comment/__snapshots__/jsfmt.spec.js.snap b/tests/js/class-comment/__snapshots__/jsfmt.spec.js.snap
index b6ab6beae..2496274a9 100644
--- a/tests/js/class-comment/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/js/class-comment/__snapshots__/jsfmt.spec.js.snap
@@ -118,8 +118,7 @@ class A1 extends B {
 }
 
 class A2 /* a */ extends B {}
-class A3 extends B /* a */ {
-}
+class A3 extends B /* a */ {}
 class A4 /* a */ extends B {}
 
 (class A5 // comment 1
@@ -133,8 +132,7 @@ class A4 /* a */ extends B {}
 });
 
 (class A7 /* a */ extends B {});
-(class A8 extends B /* a */ {
-});
+(class A8 extends B /* a */ {});
 (class A9 /* a */ extends B {});
 
 class a extends b {
diff --git a/tests/misc/flow-babel-only/__snapshots__/jsfmt.spec.js.snap b/tests/misc/flow-babel-only/__snapshots__/jsfmt.spec.js.snap
index 1f242e9e9..ac765ce2e 100644
--- a/tests/misc/flow-babel-only/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/flow-babel-only/__snapshots__/jsfmt.spec.js.snap
@@ -28,8 +28,7 @@ import React from "react";
 
 /*:: type State = { baz: number }; */
 
-class Component extends React.Component /*:: <Props, State> */ {
-}
+class Component extends React.Component /*:: <Props, State> */ {}
 
 ================================================================================
 `;

From 2f02f3c5a8a8f7633cac0e6b103a9e9901e07096 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Dec 2020 20:11:33 +0800
Subject: [PATCH 254/299] Build(deps): Bump @glimmer/syntax from 0.72.0 to
 0.73.0 (#9937)

Bumps [@glimmer/syntax](https://github.com/glimmerjs/glimmer-vm) from 0.72.0 to 0.73.0.
- [Release notes](https://github.com/glimmerjs/glimmer-vm/releases)
- [Changelog](https://github.com/glimmerjs/glimmer-vm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/glimmerjs/glimmer-vm/compare/v0.72.0...v0.73.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 28 ++++++----------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index a9fe0c16e..6f075bf7e 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "11.0.5",
     "@babel/code-frame": "7.12.11",
     "@babel/parser": "7.12.11",
-    "@glimmer/syntax": "0.72.0",
+    "@glimmer/syntax": "0.73.0",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.10.0",
     "angular-estree-parser": "2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 20e11216e..5b3c0ed3a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1064,13 +1064,6 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.72.0.tgz#34817afba6736f68974cfbd14825a88032d60a63"
-  integrity sha512-o5zLnfca4FogcO4wfmerLGHpmJHz5mfUUB7uxabnLHBI53ABu+Gfmeaaye24lgQI9NyaHY/eSJlz+GtRtvMnSg==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.73.0":
   version "0.73.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.0.tgz#ea926b2542cf666a9a479e8aa67224cc11f7710d"
@@ -1089,25 +1082,16 @@
     "@glimmer/util" "0.73.0"
     "@glimmer/validator" "0.73.0"
 
-"@glimmer/syntax@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.72.0.tgz#a7c22b8d1d7fb2c307d0df3ad68f826905a81794"
-  integrity sha512-HOA+dsI+tsqEvTZDZZWdnsV9wjAfCoKzmkYnzWOM+5RXOU9muRfRVp0wdu1cYF7J50QKp7gCmHLxzdLG7XcpDg==
+"@glimmer/syntax@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.73.0.tgz#f45f820d19fba8e7d87054f4bb87b7ce9edd1aac"
+  integrity sha512-dgxEUocjkbtlfkDPLFDkJO+RhZigffnOeDkdDAR4lbsEFgm0Pd3zNvnFhYyXSg/UUzioLdknyuixlwihG9OGow==
   dependencies:
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/util" "0.72.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/util" "0.73.0"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.72.0.tgz#77fdce5c14649651117d5e795b2870c48158b2c9"
-  integrity sha512-OlVmdMaV1o7UxWqhmuGXOlgpXgtynwp3zD5ypdWuf6IzNDeFf2OAsHaZY+GYqE+uDjx1u6xb+Q9xTXk7U7Bhow==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.72.0"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.73.0":
   version "0.73.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.0.tgz#21c93fd7f822ba641485953c3ad4d7e929ec17c1"

From aa841a552fc29d0bf4be5d69ab865db61d0606da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:30:57 +0800
Subject: [PATCH 255/299] Build(deps-dev): Bump @glimmer/reference from 0.73.0
 to 0.73.1 (#9945)

Bumps @glimmer/reference from 0.73.0 to 0.73.1.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 6f075bf7e..0df372434 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.11",
     "@babel/types": "7.12.11",
-    "@glimmer/reference": "0.73.0",
+    "@glimmer/reference": "0.73.1",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5b3c0ed3a..bfeb3acdf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1057,10 +1057,10 @@
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.73.0.tgz#273f757779a17595cb4cb76685c17087dc619bb8"
-  integrity sha512-DnatUdDcF6STNhN4aOFjSW5cn1lmgMpjaauwIKZSy9O45Eo8uqNCMpYRCKf4fkVmYVDRwg6N6ua0Sv0q6OlWSw==
+"@glimmer/global-context@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.73.1.tgz#34f7ccabd2656c8d4a19581557593b6bac761a4b"
+  integrity sha512-jilS1HXMf/bzVQETCetlggAFLMYukvOxxGVi5FokL23g3jfWjQncEFf3p3OR17I3HDsEa1FmrZc4iuOp/i2gGQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
@@ -1071,16 +1071,23 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/reference@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.73.0.tgz#77d421254c0d58dd0bdcb341bdcb76744d0b28ba"
-  integrity sha512-m2vWCAD0bYLI03EvvJo4ow8a2cmfpLi7mHT+s9tMER7c7/TNenLmh6/5A7NKzbwCb6onqXQGOT4Sb/vAZqFgQw==
+"@glimmer/interfaces@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.1.tgz#ad1dffb635c19b66230c45894e15f3a34d90e5b0"
+  integrity sha512-MttMIyWGZ+IbiJJpr4q9dwMmn+7eOMdxjMiuaEYeLBN/DXe8T9VePqgapURkSL9CEmKByB/pLvcaVTSYfm0RYg==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/reference@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.73.1.tgz#5f3634fb780018d2aace753ed512b909d50c85bf"
+  integrity sha512-0sUebIjfNGuv6XJyC/f0HsFzNQf7/vNgeg+7/qg8NxDrrDfWeLzcaejWkReP/hxAmqLgidHnYju6IqmWciWcFw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.0"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/validator" "0.73.0"
+    "@glimmer/global-context" "0.73.1"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/util" "0.73.1"
+    "@glimmer/validator" "0.73.1"
 
 "@glimmer/syntax@0.73.0":
   version "0.73.0"
@@ -1101,13 +1108,22 @@
     "@glimmer/interfaces" "0.73.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.73.0.tgz#d523904f4faff0a3af570d215d679bc7c2148e29"
-  integrity sha512-fAs3XREHTw/ePYkAM8lKkNeo0//d/TJYWn2iM5SuPPglRJGATg/8p1Nk2iw31BofPvsT3WAnFbr0aWGGZF9paQ==
+"@glimmer/util@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.1.tgz#f89bb7adba18315e00fbdb5a7c5a4913bbdebc6e"
+  integrity sha512-zFXY9OgR6wx7Cy4yYJkmgoUsdx3MQYAmZytuEDTghLXJyUoSh5Jcvner+qhFkqLSzj2pvE4btn3yUNnx3QOBtg==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.73.1"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/validator@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.73.1.tgz#8d87e502e84d468bb7d1695fdc85e1cfc3d9de29"
+  integrity sha512-DGodNSpf1v9Xsu7l7GSitVhNnESVx9qn6RFQ/zVwvptSXaPvLh5RIxsvYqJwkhBsxyPCVqnjz1p+MwqtfJukDA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.0"
+    "@glimmer/global-context" "0.73.1"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 1d855aeb863ad9a6d373c16859d59176da9a1829 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:31:30 +0800
Subject: [PATCH 256/299] Build(deps-dev): Bump @typescript-eslint/types from
 4.10.0 to 4.11.0 (#9947)

Bumps [@typescript-eslint/types](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/visitor-keys) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/visitor-keys/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.11.0/packages/visitor-keys)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0df372434..9aa029b0b 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@rollup/plugin-replace": "2.3.4",
     "@types/estree": "0.0.45",
     "@types/node": "14.14.0",
-    "@typescript-eslint/types": "4.10.0",
+    "@typescript-eslint/types": "4.11.0",
     "babel-jest": "26.6.3",
     "babel-loader": "8.2.2",
     "benchmark": "2.1.4",
diff --git a/yarn.lock b/yarn.lock
index bfeb3acdf..40dedaea3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1644,6 +1644,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.10.0.tgz#12f983750ebad867f0c806e705c1953cd6415789"
   integrity sha512-+dt5w1+Lqyd7wIPMa4XhJxUuE8+YF+vxQ6zxHyhLGHJjHiunPf0wSV8LtQwkpmAsRi1lEOoOIR30FG5S2HS33g==
 
+"@typescript-eslint/types@4.11.0":
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.0.tgz#86cf95e7eac4ccfd183f9fcf1480cece7caf4ca4"
+  integrity sha512-XXOdt/NPX++txOQHM1kUMgJUS43KSlXGdR/aDyEwuAEETwuPt02Nc7v+s57PzuSqMbNLclblQdv3YcWOdXhQ7g==
+
 "@typescript-eslint/typescript-estree@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.1.tgz#29a43c7060641ec51c902d9f50ac7c5866ec479f"

From 8cfda58f6129bf8b92dbed86a564734f604e735c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Dec 2020 09:18:04 +0800
Subject: [PATCH 257/299] Build(deps): Bump @glimmer/syntax from 0.73.0 to
 0.73.1 (#9944)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 28 ++++++----------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 9aa029b0b..96c3e2744 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@angular/compiler": "11.0.5",
     "@babel/code-frame": "7.12.11",
     "@babel/parser": "7.12.11",
-    "@glimmer/syntax": "0.73.0",
+    "@glimmer/syntax": "0.73.1",
     "@iarna/toml": "2.2.5",
     "@typescript-eslint/typescript-estree": "4.10.0",
     "angular-estree-parser": "2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 40dedaea3..a5d796da4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1064,13 +1064,6 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.0.tgz#ea926b2542cf666a9a479e8aa67224cc11f7710d"
-  integrity sha512-DagAc0Ul+lrid54QKrUVctlKfloIZMRhaz/oaEJ3nVf4Nqz/6YtT3tOrJ+fOxLYjsDy3Dq0uJMDOHzdd6IqS2g==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.73.1":
   version "0.73.1"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.1.tgz#ad1dffb635c19b66230c45894e15f3a34d90e5b0"
@@ -1089,25 +1082,16 @@
     "@glimmer/util" "0.73.1"
     "@glimmer/validator" "0.73.1"
 
-"@glimmer/syntax@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.73.0.tgz#f45f820d19fba8e7d87054f4bb87b7ce9edd1aac"
-  integrity sha512-dgxEUocjkbtlfkDPLFDkJO+RhZigffnOeDkdDAR4lbsEFgm0Pd3zNvnFhYyXSg/UUzioLdknyuixlwihG9OGow==
+"@glimmer/syntax@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.73.1.tgz#9e3c898ba91ddb1d4e6f413452b0b84700910c83"
+  integrity sha512-TpTK9yAaoDOzdo+5itoJPRxrVWacYlGuHtJvATi96RJUTAxPz9b9M3AcVm0atcZW7WiA8X8J/weQ2KcIVgAYmw==
   dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/util" "0.73.1"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.0.tgz#21c93fd7f822ba641485953c3ad4d7e929ec17c1"
-  integrity sha512-S8DfVvNAIOUxSawKjSSxa8U6yu2VVcZjaMVy4yoJR0QKpo++V6x1HDBjDOQU0xKgr98lCJqoAnPKZT6t1/eahg==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.73.1":
   version "0.73.1"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.1.tgz#f89bb7adba18315e00fbdb5a7c5a4913bbdebc6e"

From cbaf683ee0b8f9ca9c2b507e6b51458b7160eae0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Dec 2020 09:18:44 +0800
Subject: [PATCH 258/299] Build(deps): Bump
 @typescript-eslint/typescript-estree from 4.10.0 to 4.11.0 (#9946)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 27 +++++++++++----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 96c3e2744..756479d53 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@babel/parser": "7.12.11",
     "@glimmer/syntax": "0.73.1",
     "@iarna/toml": "2.2.5",
-    "@typescript-eslint/typescript-estree": "4.10.0",
+    "@typescript-eslint/typescript-estree": "4.11.0",
     "angular-estree-parser": "2.3.0",
     "angular-html-parser": "1.7.1",
     "camelcase": "6.2.0",
diff --git a/yarn.lock b/yarn.lock
index a5d796da4..1d595659b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1623,11 +1623,6 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2"
   integrity sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg==
 
-"@typescript-eslint/types@4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.10.0.tgz#12f983750ebad867f0c806e705c1953cd6415789"
-  integrity sha512-+dt5w1+Lqyd7wIPMa4XhJxUuE8+YF+vxQ6zxHyhLGHJjHiunPf0wSV8LtQwkpmAsRi1lEOoOIR30FG5S2HS33g==
-
 "@typescript-eslint/types@4.11.0":
   version "4.11.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.0.tgz#86cf95e7eac4ccfd183f9fcf1480cece7caf4ca4"
@@ -1647,13 +1642,13 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.10.0.tgz#1e62e45fd57866afd42daf5e9fb6bd4e8dbcfa75"
-  integrity sha512-mGK0YRp9TOk6ZqZ98F++bW6X5kMTzCRROJkGXH62d2azhghmq+1LNLylkGe6uGUOQzD452NOAEth5VAF6PDo5g==
+"@typescript-eslint/typescript-estree@4.11.0":
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.11.0.tgz#1144d145841e5987d61c4c845442a24b24165a4b"
+  integrity sha512-eA6sT5dE5RHAFhtcC+b5WDlUIGwnO9b0yrfGa1mIOIAjqwSQCpXbLiFmKTdRbQN/xH2EZkGqqLDrKUuYOZ0+Hg==
   dependencies:
-    "@typescript-eslint/types" "4.10.0"
-    "@typescript-eslint/visitor-keys" "4.10.0"
+    "@typescript-eslint/types" "4.11.0"
+    "@typescript-eslint/visitor-keys" "4.11.0"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
@@ -1669,12 +1664,12 @@
     "@typescript-eslint/types" "4.0.1"
     eslint-visitor-keys "^2.0.0"
 
-"@typescript-eslint/visitor-keys@4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.10.0.tgz#9478822329a9bc8ebcc80623d7f79a01da5ee451"
-  integrity sha512-hPyz5qmDMuZWFtHZkjcCpkAKHX8vdu1G3YsCLEd25ryZgnJfj6FQuJ5/O7R+dB1ueszilJmAFMtlU4CA6se3Jg==
+"@typescript-eslint/visitor-keys@4.11.0":
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.11.0.tgz#906669a50f06aa744378bb84c7d5c4fdbc5b7d51"
+  integrity sha512-tRYKyY0i7cMk6v4UIOCjl1LhuepC/pc6adQqJk4Is3YcC6k46HvsV9Wl7vQoLbm9qADgeujiT7KdLrylvFIQ+A==
   dependencies:
-    "@typescript-eslint/types" "4.10.0"
+    "@typescript-eslint/types" "4.11.0"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.9.1":

From 196dfd207a78b11ddbfdee258ce41b55c3a3fa70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Dec 2020 09:18:59 +0800
Subject: [PATCH 259/299] Build(deps): Bump codecov/codecov-action from v1.1.0
 to v1.1.1 (#9948)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from v1.1.0 to v1.1.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v1.1.0...1fc7722ded4708880a5aea49f2bfafb9336f0c8d)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/dev-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml
index 1f0a33e78..3d23f7cce 100644
--- a/.github/workflows/dev-test.yml
+++ b/.github/workflows/dev-test.yml
@@ -62,7 +62,7 @@ jobs:
         run: yarn test --maxWorkers=2
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@v1.1.0
+        uses: codecov/codecov-action@v1.1.1
         if: matrix.ENABLE_CODE_COVERAGE
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -76,7 +76,7 @@ jobs:
           PRETTIER_FALLBACK_RESOLVE: true
 
       - name: Upload Coverage (PRETTIER_FALLBACK_RESOLVE)
-        uses: codecov/codecov-action@v1.1.0
+        uses: codecov/codecov-action@v1.1.1
         if: matrix.ENABLE_CODE_COVERAGE
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

From f1574a9e7a181f35a79df55b661d64827331bdef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Dec 2020 17:05:03 +0800
Subject: [PATCH 260/299] Build(deps-dev): Bump builtin-modules from 3.1.0 to
 3.2.0 (#9950)

Bumps [builtin-modules](https://github.com/sindresorhus/builtin-modules) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/sindresorhus/builtin-modules/releases)
- [Commits](https://github.com/sindresorhus/builtin-modules/compare/v3.1.0...v3.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 756479d53..e61b03a90 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "babel-jest": "26.6.3",
     "babel-loader": "8.2.2",
     "benchmark": "2.1.4",
-    "builtin-modules": "3.1.0",
+    "builtin-modules": "3.2.0",
     "cross-env": "7.0.3",
     "cspell": "4.2.5",
     "eslint": "7.16.0",
diff --git a/yarn.lock b/yarn.lock
index 1d595659b..2650ed5b9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2268,10 +2268,10 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-builtin-modules@3.1.0, builtin-modules@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
-  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
+builtin-modules@3.2.0, builtin-modules@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
+  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
 
 cache-base@^1.0.1:
   version "1.0.1"

From c55f899b329c2721e169afc3041949c220e32189 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 24 Dec 2020 19:44:17 +0800
Subject: [PATCH 261/299] Test internal eslint rules (#9929)

---
 .github/workflows/eslint-rules.yml            |  28 +++
 .gitignore                                    |   2 +
 ...r-parent-property-check-in-needs-parens.js |   8 +-
 .../no-node-comments.js                       |   7 +
 .../package.json                              |   6 +-
 .../test.js                                   | 190 ++++++++++++++++++
 6 files changed, 238 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/eslint-rules.yml
 create mode 100644 scripts/tools/eslint-plugin-prettier-internal-rules/test.js

diff --git a/.github/workflows/eslint-rules.yml b/.github/workflows/eslint-rules.yml
new file mode 100644
index 000000000..75b183a46
--- /dev/null
+++ b/.github/workflows/eslint-rules.yml
@@ -0,0 +1,28 @@
+name: Internal_ESLint_Rules_Test
+
+on:
+  push:
+    paths:
+      - "scripts/tools/eslint-plugin-prettier-internal-rules"
+      - ".github/workflows/eslint-rules.yml"
+  pull_request:
+    paths:
+      - "scripts/tools/eslint-plugin-prettier-internal-rules"
+      - ".github/workflows/eslint-rules.yml"
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2.3.4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2.1.4
+
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Test
+        run: cd scripts/tools/eslint-plugin-prettier-internal-rules && yarn test-coverage
diff --git a/.gitignore b/.gitignore
index 1a0eb682a..cdee460be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ package-lock.json
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
+.nyc_output
+/scripts/tools/eslint-plugin-prettier-internal-rules/node_modules
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js b/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js
index 44032e57f..0346e4212 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/better-parent-property-check-in-needs-parens.js
@@ -53,7 +53,7 @@ module.exports = {
     },
     messages: {
       [MESSAGE_ID_PREFER_NAME_CHECK]:
-        "Prefer `name {{operator}}　{{property}}` over `parent.{{property}} {{operator}} node`",
+        "Prefer `name {{operator}} {{propertyText}}` over `parent.{{property}} {{operator}} node`.",
       [MESSAGE_ID_NAME_CHECK_FIRST]:
         "`name` comparison should be on left side.",
     },
@@ -79,7 +79,11 @@ module.exports = {
         context.report({
           node,
           messageId: MESSAGE_ID_PREFER_NAME_CHECK,
-          data: { property: propertyText, operator },
+          data: {
+            property: sourceCode.getText(property),
+            propertyText,
+            operator,
+          },
           fix: (fixer) =>
             fixer.replaceText(node, `name ${operator} ${propertyText}`),
         });
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js b/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js
index 761911b0e..493549b52 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/no-node-comments.js
@@ -50,8 +50,14 @@ module.exports = {
         ];
       })
     );
+    // avoid report on `const {comments} = node` twice
+    const reported = new Set();
     return {
       [selector](node) {
+        if (reported.has(node)) {
+          return;
+        }
+
         if (ignored.has(fileName)) {
           const functionNames = ignored.get(fileName);
           if (functionNames === true) {
@@ -75,6 +81,7 @@ module.exports = {
             return;
           }
         }
+        reported.add(node);
         context.report({
           node,
           messageId,
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/package.json b/scripts/tools/eslint-plugin-prettier-internal-rules/package.json
index 6815d7966..aaee2c7dc 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/package.json
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/package.json
@@ -5,5 +5,9 @@
   "private": true,
   "author": "fisker",
   "main": "./index.js",
-  "license": "MIT"
+  "license": "MIT",
+  "scripts": {
+    "test": "node test.js",
+    "test-coverage": "npx nyc node test.js"
+  }
 }
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
new file mode 100644
index 000000000..b0e6ddd04
--- /dev/null
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
@@ -0,0 +1,190 @@
+/* eslint-disable import/no-extraneous-dependencies */
+"use strict";
+
+const path = require("path");
+const { outdent } = require("outdent");
+const { RuleTester } = require("eslint");
+const { rules } = require(".");
+
+const test = (ruleId, tests) => {
+  new RuleTester({ parserOptions: { ecmaVersion: 2021 } }).run(
+    ruleId,
+    rules[ruleId],
+    tests
+  );
+};
+
+test("better-parent-property-check-in-needs-parens", {
+  valid: ["function needsParens() {return parent.test === node;}"],
+  invalid: [
+    {
+      code: 'return parent.type === "MemberExpression" && name === "object";',
+      errors: [{ message: "`name` comparison should be on left side." }],
+    },
+    {
+      code: "return parent.test === node;",
+      output: 'return name === "test";',
+      errors: [
+        { message: 'Prefer `name === "test"` over `parent.test === node`.' },
+      ],
+    },
+    {
+      code: "return parent.test !== node;",
+      output: 'return name !== "test";',
+      errors: [
+        { message: 'Prefer `name !== "test"` over `parent.test !== node`.' },
+      ],
+    },
+    {
+      code: 'return parent["property"] === node;',
+      output: 'return name === "property";',
+      errors: [
+        {
+          message:
+            'Prefer `name === "property"` over `parent."property" === node`.',
+        },
+      ],
+    },
+  ].map((testCase) => ({
+    ...testCase,
+    code: `function needsParens() {${testCase.code}}`,
+    output: `function needsParens() {${testCase.output || testCase.code}}`,
+    filename: "needs-parens.js",
+  })),
+});
+
+test("directly-loc-start-end", {
+  valid: [],
+  invalid: [
+    {
+      code: "options.locStart(node)",
+      output: "locStart(node)",
+      errors: [
+        { message: "Please import `locStart` function and use it directly." },
+      ],
+    },
+    {
+      code: "options.locEnd(node)",
+      output: "locEnd(node)",
+      errors: [
+        { message: "Please import `locEnd` function and use it directly." },
+      ],
+    },
+  ],
+});
+
+test("jsx-identifier-case", {
+  valid: [
+    {
+      code: "const isJSXNode = true",
+      options: ["isJSXNode"],
+    },
+  ],
+  invalid: [
+    {
+      code: "function isJSXNode(){}",
+      output: "function isJsxNode(){}",
+      errors: [{ message: "Please rename 'isJSXNode' to 'isJsxNode'." }],
+    },
+    {
+      code: "const isJSXNode = true",
+      output: "const isJsxNode = true",
+      errors: [{ message: "Please rename 'isJSXNode' to 'isJsxNode'." }],
+    },
+  ],
+});
+
+test("no-node-comments", {
+  valid: [
+    "const comments = node.notComments",
+    {
+      code: "function functionName() {return node.comments;}",
+      filename: path.join(__dirname, "../../..", "a.js"),
+      options: ["a.js"],
+    },
+    {
+      code: "function functionName() {return node.comments;}",
+      filename: path.join(__dirname, "../../..", "a.js"),
+      options: [{ file: "a.js", functions: ["functionName"] }],
+    },
+  ],
+  invalid: [
+    ...[
+      "function functionName() {return node.comments;}",
+      "const {comments} = node",
+      "const {comments: nodeComments} = node",
+    ].map((code) => ({
+      code,
+      output: code,
+      errors: [{ message: "Do not access node.comments." }],
+    })),
+    {
+      code: "function notFunctionName() {return node.comments;}",
+      output: "function notFunctionName() {return node.comments;}",
+      filename: path.join(__dirname, "../../..", "a.js"),
+      options: [{ file: "a.js", functions: ["functionName"] }],
+      errors: [{ message: "Do not access node.comments." }],
+    },
+  ],
+});
+
+test("prefer-fast-path-each", {
+  valid: ["const foo = path.map()"],
+  invalid: [
+    {
+      code: "path.map()",
+      output: "path.each()",
+      errors: 1,
+    },
+  ],
+});
+
+test("prefer-is-non-empty-array", {
+  valid: [
+    // `isNonEmptyArray` self is ignored
+    outdent`
+      function isNonEmptyArray(object){
+        return Array.isArray(object) && object.length;
+      }
+    `,
+    "a.b && a.c.length",
+    "a.b || !a.b.length",
+    '!a["b"] || !a.b.length',
+  ],
+  invalid: [
+    ...[
+      "a && a.b && a.b.length",
+      "a && a.b && a.b.length !== 0",
+      "a && a.b && a.b.length > 0",
+      "a && Array.isArray(a.b) && a.b.length",
+      "a && Array.isArray(a.b) && a.b.length !== 0",
+      "a && Array.isArray(a.b) && a.b.length > 0",
+    ].map((code) => ({
+      code,
+      output: "a && isNonEmptyArray(a.b)",
+      errors: 1,
+    })),
+    ...[
+      "!a || !a.b || !a.b.length",
+      "!a || !a.b || a.b.length === 0",
+      "!a || !Array.isArray(a.b) || !a.b.length",
+      "!a || !Array.isArray(a.b) || a.b.length === 0",
+    ].map((code) => ({
+      code,
+      output: "!a || !isNonEmptyArray(a.b)",
+      errors: 1,
+    })),
+  ],
+});
+
+test("require-json-extensions", {
+  valid: ['require("./not-exists")', 'require("./index")'],
+  invalid: [
+    {
+      code: 'require("./package")',
+      filename: __filename,
+      output: 'require("./package.json")',
+      errors: [{ message: 'Missing file extension ".json" for "./package".' }],
+    },
+  ],
+});

From d5ba6b01ba01841344b11af1ed0a49792a5fd7ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Dec 2020 19:55:34 +0800
Subject: [PATCH 262/299] Build(deps-dev): Bump @babel/types from 7.12.11 to
 7.12.12 (#9957)

Bumps [@babel/types](https://github.com/babel/babel/tree/HEAD/packages/babel-types) from 7.12.11 to 7.12.12.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.12/packages/babel-types)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e61b03a90..c68e517b4 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
   "devDependencies": {
     "@babel/core": "7.12.10",
     "@babel/preset-env": "7.12.11",
-    "@babel/types": "7.12.11",
+    "@babel/types": "7.12.12",
     "@glimmer/reference": "0.73.1",
     "@rollup/plugin-alias": "3.1.1",
     "@rollup/plugin-babel": "5.2.2",
diff --git a/yarn.lock b/yarn.lock
index 2650ed5b9..6dd650b50 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -849,10 +849,10 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@7.12.11", "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.11.tgz#a86e4d71e30a9b6ee102590446c98662589283ce"
-  integrity sha512-ukA9SQtKThINm++CX1CwmliMrE54J6nIYB5XTwL5f/CLFW9owfls+YSU8tVW15RQ2w+a3fSbPjC6HdQNtWZkiA==
+"@babel/types@7.12.12", "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299"
+  integrity sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==
   dependencies:
     "@babel/helper-validator-identifier" "^7.12.11"
     lodash "^4.17.19"

From 60b8ad0c51c46794c45b83fb78a96f460db01132 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Dec 2020 19:55:46 +0800
Subject: [PATCH 263/299] Build(deps-dev): Bump pretty-bytes from 5.4.1 to
 5.5.0 (#9956)

Bumps [pretty-bytes](https://github.com/sindresorhus/pretty-bytes) from 5.4.1 to 5.5.0.
- [Release notes](https://github.com/sindresorhus/pretty-bytes/releases)
- [Commits](https://github.com/sindresorhus/pretty-bytes/compare/v5.4.1...v5.5.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c68e517b4..a118b1168 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "npm-run-all": "4.1.5",
     "path-browserify": "1.0.1",
     "prettier": "2.2.1",
-    "pretty-bytes": "5.4.1",
+    "pretty-bytes": "5.5.0",
     "rimraf": "3.0.2",
     "rollup": "2.35.1",
     "rollup-plugin-node-globals": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 6dd650b50..9a6ff5aae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5901,10 +5901,10 @@ prettier@2.2.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
   integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
-pretty-bytes@5.4.1:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz#cd89f79bbcef21e3d21eb0da68ffe93f803e884b"
-  integrity sha512-s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA==
+pretty-bytes@5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.5.0.tgz#0cecda50a74a941589498011cf23275aa82b339e"
+  integrity sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA==
 
 pretty-format@^26.1.0:
   version "26.1.0"

From eec3e82f48b999a93127edfaa051236250a9595a Mon Sep 17 00:00:00 2001
From: Christopher Chedeau <vjeux@fb.com>
Date: Mon, 28 Dec 2020 15:22:25 -0800
Subject: [PATCH 264/299] Fix absolute path in custom CSS url() calls (#9966)

At Facebook we have some custom pre-processor `-fb-url(/abs/path/)` that gets messed up as `-fb-url(/ abs/path)`  with the current version of prettier.

The parser has hardcoded logic to only parse as path things that use `url()` but not `-fb-url()` and it parses it as `division /` and `abs/path/`. Because we put a space after division, the bug is introduced.

I don't really know the impact of changing the parser, but on the printer side, it is straightforward to not add a space after `/` if it's the first element in a group. I can't think of any reason why you could write `(/ something` in CSS so I think it's a safe change.
---
 changelog_unreleased/css/9966.md              | 14 +++++++++++++
 src/language-css/printer-postcss.js           |  7 +++++++
 .../css/url/__snapshots__/jsfmt.spec.js.snap  | 21 +++++++++++++++++++
 tests/css/url/jsfmt.spec.js                   |  1 +
 tests/css/url/url.css                         |  4 ++++
 5 files changed, 47 insertions(+)
 create mode 100644 changelog_unreleased/css/9966.md
 create mode 100644 tests/css/url/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/css/url/jsfmt.spec.js
 create mode 100644 tests/css/url/url.css

diff --git a/changelog_unreleased/css/9966.md b/changelog_unreleased/css/9966.md
new file mode 100644
index 000000000..7bf310eda
--- /dev/null
+++ b/changelog_unreleased/css/9966.md
@@ -0,0 +1,14 @@
+#### Fix absolute path in custom CSS -custom-url() calls (#9966 by @vjeux)
+
+The CSS parser is parsing this as `["division", "absolute/path"]` instead of a single `"/absolute/path"` token unless you are in a `url()` call. Because we put space after division, it results in an incorrect path. The fix was to avoid printing a space if a division is the first token of a call, which hopefully should be safe.
+
+<!-- prettier-ignore -->
+```css
+-custom-url(/absolute/path)
+
+/* Prettier stable */
+-custom-url(/ absolute/path)
+
+/* Prettier master */
+-custom-url(/absolute/path)
+```
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index 48ebc028c..8386d0bb3 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -675,6 +675,13 @@ function genericPrint(path, options, print) {
           continue;
         }
 
+        // absolute paths are only parsed as one token if they are part of url(/abs/path) call
+        // but if you have custom -fb-url(/abs/path/) then it is parsed as "division /" and rest
+        // of the path. We don't want to put a space after that first division in this case.
+        if (!iPrevNode && isDivisionNode(iNode)) {
+          continue;
+        }
+
         // Print spaces before and after addition and subtraction math operators as is in `calc` function
         // due to the fact that it is not valid syntax
         // (i.e. `calc(1px+1px)`, `calc(1px+ 1px)`, `calc(1px +1px)`, `calc(1px + 1px)`)
diff --git a/tests/css/url/__snapshots__/jsfmt.spec.js.snap b/tests/css/url/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..ff0a122da
--- /dev/null
+++ b/tests/css/url/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`url.css format 1`] = `
+====================================options=====================================
+parsers: ["css"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+div {
+  background: url(/images/bg.png);
+  background: -fb-url(/images/bg.png);
+}
+
+=====================================output=====================================
+div {
+  background: url(/images/bg.png);
+  background: -fb-url(/images/bg.png);
+}
+
+================================================================================
+`;
diff --git a/tests/css/url/jsfmt.spec.js b/tests/css/url/jsfmt.spec.js
new file mode 100644
index 000000000..7d3726c81
--- /dev/null
+++ b/tests/css/url/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["css"]);
diff --git a/tests/css/url/url.css b/tests/css/url/url.css
new file mode 100644
index 000000000..db4e23140
--- /dev/null
+++ b/tests/css/url/url.css
@@ -0,0 +1,4 @@
+div {
+  background: url(/images/bg.png);
+  background: -fb-url(/images/bg.png);
+}

From 1350f57941f4ef6c352c76eb48cb01348d1b532e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 17:07:41 +0900
Subject: [PATCH 265/299] Build(deps): Bump
 @typescript-eslint/typescript-estree (#9968)

Bumps [@typescript-eslint/typescript-estree](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-estree) from 4.11.0 to 4.11.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/typescript-estree/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.11.1/packages/typescript-estree)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 27 ++++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index a118b1168..7dd2bfde5 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@babel/parser": "7.12.11",
     "@glimmer/syntax": "0.73.1",
     "@iarna/toml": "2.2.5",
-    "@typescript-eslint/typescript-estree": "4.11.0",
+    "@typescript-eslint/typescript-estree": "4.11.1",
     "angular-estree-parser": "2.3.0",
     "angular-html-parser": "1.7.1",
     "camelcase": "6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 9a6ff5aae..52886d085 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1628,6 +1628,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.0.tgz#86cf95e7eac4ccfd183f9fcf1480cece7caf4ca4"
   integrity sha512-XXOdt/NPX++txOQHM1kUMgJUS43KSlXGdR/aDyEwuAEETwuPt02Nc7v+s57PzuSqMbNLclblQdv3YcWOdXhQ7g==
 
+"@typescript-eslint/types@4.11.1":
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.1.tgz#3ba30c965963ef9f8ced5a29938dd0c465bd3e05"
+  integrity sha512-5kvd38wZpqGY4yP/6W3qhYX6Hz0NwUbijVsX2rxczpY6OXaMxh0+5E5uLJKVFwaBM7PJe1wnMym85NfKYIh6CA==
+
 "@typescript-eslint/typescript-estree@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.1.tgz#29a43c7060641ec51c902d9f50ac7c5866ec479f"
@@ -1642,13 +1647,13 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@4.11.0":
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.11.0.tgz#1144d145841e5987d61c4c845442a24b24165a4b"
-  integrity sha512-eA6sT5dE5RHAFhtcC+b5WDlUIGwnO9b0yrfGa1mIOIAjqwSQCpXbLiFmKTdRbQN/xH2EZkGqqLDrKUuYOZ0+Hg==
+"@typescript-eslint/typescript-estree@4.11.1":
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.11.1.tgz#a4416b4a65872a48773b9e47afabdf7519eb10bc"
+  integrity sha512-tC7MKZIMRTYxQhrVAFoJq/DlRwv1bnqA4/S2r3+HuHibqvbrPcyf858lNzU7bFmy4mLeIHFYr34ar/1KumwyRw==
   dependencies:
-    "@typescript-eslint/types" "4.11.0"
-    "@typescript-eslint/visitor-keys" "4.11.0"
+    "@typescript-eslint/types" "4.11.1"
+    "@typescript-eslint/visitor-keys" "4.11.1"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
@@ -1664,12 +1669,12 @@
     "@typescript-eslint/types" "4.0.1"
     eslint-visitor-keys "^2.0.0"
 
-"@typescript-eslint/visitor-keys@4.11.0":
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.11.0.tgz#906669a50f06aa744378bb84c7d5c4fdbc5b7d51"
-  integrity sha512-tRYKyY0i7cMk6v4UIOCjl1LhuepC/pc6adQqJk4Is3YcC6k46HvsV9Wl7vQoLbm9qADgeujiT7KdLrylvFIQ+A==
+"@typescript-eslint/visitor-keys@4.11.1":
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.11.1.tgz#4c050a4c1f7239786e2dd4e69691436143024e05"
+  integrity sha512-IrlBhD9bm4bdYcS8xpWarazkKXlE7iYb1HzRuyBP114mIaj5DJPo11Us1HgH60dTt41TCZXMaTCAW+OILIYPOg==
   dependencies:
-    "@typescript-eslint/types" "4.11.0"
+    "@typescript-eslint/types" "4.11.1"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.9.1":

From 3278c8cc6e87d1d96a72c27168e83775dc66c6da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 17:10:13 +0900
Subject: [PATCH 266/299] Build(deps-dev): Bump webpack from 5.11.0 to 5.11.1
 in /website (#9970)

Bumps [webpack](https://github.com/webpack/webpack) from 5.11.0 to 5.11.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.11.0...v5.11.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json | 2 +-
 website/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index 137f70a1f..ada458ff2 100644
--- a/website/package.json
+++ b/website/package.json
@@ -23,7 +23,7 @@
     "docusaurus": "1.14.6",
     "js-yaml": "3.14.1",
     "svgo": "1.3.2",
-    "webpack": "5.11.0",
+    "webpack": "5.11.1",
     "webpack-cli": "4.2.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 6867fc3a8..4af7b85db 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -7432,10 +7432,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.11.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.11.0.tgz#1647abc060441d86d01d8835b8f0fc1dae2fe76f"
-  integrity sha512-ubWv7iP54RqAC/VjixgpnLLogCFbAfSOREcSWnnOlZEU8GICC5eKmJSu6YEnph2N2amKqY9rvxSwgyHxVqpaRw==
+webpack@5.11.1:
+  version "5.11.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.11.1.tgz#39b2b9daeb5c6c620e03b7556ec674eaed4016b4"
+  integrity sha512-tNUIdAmYJv+nupRs/U/gqmADm6fgrf5xE+rSlSsf2PgsGO7j2WG7ccU6AWNlOJlHFl+HnmXlBmHIkiLf+XA9mQ==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From 8db9decfe835c664d4ebec6346804078210be8b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 17:11:10 +0900
Subject: [PATCH 267/299] Build(deps): Bump codemirror-graphql from 0.13.0 to
 0.13.1 in /website (#9971)

Bumps [codemirror-graphql](https://github.com/graphql/graphiql) from 0.13.0 to 0.13.1.
- [Release notes](https://github.com/graphql/graphiql/releases)
- [Changelog](https://github.com/graphql/graphiql/blob/main/CHANGELOG.md)
- [Commits](https://github.com/graphql/graphiql/compare/codemirror-graphql@0.13.0...codemirror-graphql@0.13.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/website/package.json b/website/package.json
index ada458ff2..2c1a92237 100644
--- a/website/package.json
+++ b/website/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "clipboard": "2.0.6",
-    "codemirror-graphql": "0.13.0",
+    "codemirror-graphql": "0.13.1",
     "lz-string": "1.4.4",
     "prop-types": "15.7.2",
     "react": "17.0.1",
diff --git a/website/yarn.lock b/website/yarn.lock
index 4af7b85db..0be782b58 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -2027,13 +2027,13 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-codemirror-graphql@0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.13.0.tgz#bb01039fb4737f462adcdc4fd911d7aa82b72bfd"
-  integrity sha512-f2w/goKJNXL8+f8a14rD7SnfLPrEoAlvT0qmm2yobXqw7O62QbqFxIkSBcePpUyt3Ki+yyzuCiF4GVHUnGj0+Q==
+codemirror-graphql@0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.13.1.tgz#09eb5cb5abdf2376d1e8b792b1848bdf4faf87a4"
+  integrity sha512-/KB4BM0O04rPlOERq7mCy6y+L6OVoOCfvDWiySTJ8huOGw942ETI6vqEL1SpHKv4ozq5ql7UsCcb7nLwv49zcg==
   dependencies:
-    graphql-language-service-interface "^2.5.0"
-    graphql-language-service-parser "^1.6.5"
+    graphql-language-service-interface "^2.6.0"
+    graphql-language-service-parser "^1.7.0"
 
 coffee-script@^1.12.4:
   version "1.12.7"
@@ -3624,20 +3624,20 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graphql-language-service-interface@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.5.0.tgz#5af71b24e85dbb950e837910d5b218995a2327d3"
-  integrity sha512-JOT5X+BqsREMofnnacmyu3oy0CI+15JXp5NQWG+KDp4bQATjTDpiCOFeBNtw6t9z2ozaY8m7PTaknp0YjgDkvA==
+graphql-language-service-interface@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.6.0.tgz#6149255ad81e884d675c934ed404cf6d16af30d7"
+  integrity sha512-tATUud6B9L6JyqxtA/Gs8E0el0UWNb6hczMnnO1OxuzK92gxl+O/rn++GAegYJzAZH+uO7UaGURyAGaZd5+TtA==
   dependencies:
-    graphql-language-service-parser "^1.6.5"
+    graphql-language-service-parser "^1.7.0"
     graphql-language-service-types "^1.6.3"
     graphql-language-service-utils "^2.4.3"
     vscode-languageserver-types "^3.15.1"
 
-graphql-language-service-parser@^1.6.5:
-  version "1.6.5"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-1.6.5.tgz#5c9d4c48cbf4b66171f9ec5f182041627669e4f4"
-  integrity sha512-Xti3aQfnp7rTYg5dzhUnt3eqs9zbdr0tIC7S02RRcO1J5tWAwqXzv3PpYpWXGar11kD7VzP8amkh81CD4Q/m0Q==
+graphql-language-service-parser@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-1.7.0.tgz#695ee6b91791e1b2c92804ef281c290f85f39ed0"
+  integrity sha512-m2tV5qBCBBnJNVWPcGX7+XO2dQ1sE8jg9N9vABabNHIW02TMgPlEjWIa98h5QpXp0txcPgobHB1iTIQRE0qBbQ==
   dependencies:
     graphql-language-service-types "^1.6.3"
 

From 60bbe79fc7178f43f081dc98443ff0b265746484 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 20:44:12 +0900
Subject: [PATCH 268/299] Build(deps-dev): Bump eslint-plugin-unicorn from
 24.0.0 to 25.0.0 (#9969)

Bumps [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) from 24.0.0 to 25.0.0.
- [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases)
- [Commits](https://github.com/sindresorhus/eslint-plugin-unicorn/compare/v24.0.0...v25.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7dd2bfde5..a8ec8a226 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "eslint-plugin-jest": "24.1.3",
     "eslint-plugin-prettier-internal-rules": "link:scripts/tools/eslint-plugin-prettier-internal-rules",
     "eslint-plugin-react": "7.21.5",
-    "eslint-plugin-unicorn": "24.0.0",
+    "eslint-plugin-unicorn": "25.0.0",
     "execa": "5.0.0",
     "jest": "26.6.3",
     "jest-snapshot-serializer-ansi": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 52886d085..5384ba6c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3117,10 +3117,10 @@ eslint-plugin-react@7.21.5:
     resolve "^1.18.1"
     string.prototype.matchall "^4.0.2"
 
-eslint-plugin-unicorn@24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-24.0.0.tgz#08017ccd7ac704777d459cff6e13a35f54cbcab1"
-  integrity sha512-NfLjIZas/ZUwc3S+pUtbTRqgCkODxPEkJBJ5ZR8wIu90BmX4jmXp10hoOZMScR2CR1NYTtrx0OX4BQvBnbzZzA==
+eslint-plugin-unicorn@25.0.0:
+  version "25.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-25.0.0.tgz#b5718381ac615f2bcf7814e4acf0aac78b11a10f"
+  integrity sha512-RuhPUrsKuRj0YGz8lMuh5Z5DJoC/hmUR6omvlquLlY6SYY+oZXMFyp83ckpqLMhbafqUx+JttWOPOjfP4W9Y+Q==
   dependencies:
     ci-info "^2.0.0"
     clean-regexp "^1.0.0"

From 61bb04c2fe7cf7d03e1d2b7b77a05fdcec62bbdd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 21:04:52 +0800
Subject: [PATCH 269/299] Build(deps-dev): Bump webpack from 5.11.0 to 5.11.1
 (#9974)

Bumps [webpack](https://github.com/webpack/webpack) from 5.11.0 to 5.11.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.11.0...v5.11.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a8ec8a226..117d21f1a 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "synchronous-promise": "2.0.15",
     "tempy": "1.0.0",
     "terser-webpack-plugin": "5.0.3",
-    "webpack": "5.11.0"
+    "webpack": "5.11.1"
   },
   "scripts": {
     "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
diff --git a/yarn.lock b/yarn.lock
index 5384ba6c2..2302e884a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7394,10 +7394,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@5.11.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.11.0.tgz#1647abc060441d86d01d8835b8f0fc1dae2fe76f"
-  integrity sha512-ubWv7iP54RqAC/VjixgpnLLogCFbAfSOREcSWnnOlZEU8GICC5eKmJSu6YEnph2N2amKqY9rvxSwgyHxVqpaRw==
+webpack@5.11.1:
+  version "5.11.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.11.1.tgz#39b2b9daeb5c6c620e03b7556ec674eaed4016b4"
+  integrity sha512-tNUIdAmYJv+nupRs/U/gqmADm6fgrf5xE+rSlSsf2PgsGO7j2WG7ccU6AWNlOJlHFl+HnmXlBmHIkiLf+XA9mQ==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.45"

From 55e5f7f43a0f3f8c878ad0d2b5ec8de973fc818d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 21:06:58 +0800
Subject: [PATCH 270/299] Build(deps-dev): Bump webpack-cli from 4.2.0 to 4.3.0
 in /website (#9962)

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.2.0...webpack-cli@4.3.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 87 ++++++++++++++------------------------------
 2 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/website/package.json b/website/package.json
index 2c1a92237..af85e402f 100644
--- a/website/package.json
+++ b/website/package.json
@@ -24,6 +24,6 @@
     "js-yaml": "3.14.1",
     "svgo": "1.3.2",
     "webpack": "5.11.1",
-    "webpack-cli": "4.2.0"
+    "webpack-cli": "4.3.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 0be782b58..11ba3962d 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1026,6 +1026,11 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@discoveryjs/json-ext@^0.5.0":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752"
+  integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -1241,17 +1246,17 @@
     "@webassemblyjs/wast-parser" "1.9.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/info@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.1.0.tgz#c596d5bc48418b39df00c5ed7341bf0f102dbff1"
-  integrity sha512-uNWSdaYHc+f3LdIZNwhdhkjjLDDl3jP2+XBqAq9H8DjrJUvlOKdP8TNruy1yEaDfgpAIgbSAN7pye4FEHg9tYQ==
+"@webpack-cli/info@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.0.tgz#6051d6adf3618df664f4945a2b76355c00f83f0d"
+  integrity sha512-+wA8lBKopgKmN76BSGJVJby5ZXDlsrO6p/nm7fUBsHznRNWB/ozotJP7Yfcz8JPfqeG2LxwYlTH2u6D9a/0XAw==
   dependencies:
     envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.1.0.tgz#13ad38f89b6e53d1133bac0006a128217a6ebf92"
-  integrity sha512-7RfnMXCpJ/NThrhq4gYQYILB18xWyoQcBey81oIyVbmgbc6m5ZHHyFK+DyH7pLHJf0p14MxL4mTsoPAgBSTpIg==
+"@webpack-cli/serve@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.2.0.tgz#8cb2c1e95426f5caed1f3bf9d7ccf3ea41d85f52"
+  integrity sha512-jI3P7jMp/AXDSPkM+ClwRcJZbxnlvNC8bVZBmyRr4scMMZ4p5WQcXkw3Q+Hc7RQekomJlBMN+UQGliT4hhG8Vw==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -1425,11 +1430,6 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-back@^4.0.0, array-back@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.1.tgz#9b80312935a52062e1a233a9c7abeb5481b30e90"
-  integrity sha512-Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg==
-
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -2096,16 +2096,6 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-command-line-usage@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.0.tgz#f28376a3da3361ff3d36cfd31c3c22c9a64c7cb6"
-  integrity sha512-Ew1clU4pkUeo6AFVDFxCbnN7GIZfXl48HIOQeFQnkO3oOqvpI7wdqtLRwv9iOCZ/7A+z4csVZeiDdEcj8g6Wiw==
-  dependencies:
-    array-back "^4.0.0"
-    chalk "^2.4.2"
-    table-layout "^1.0.0"
-    typical "^5.2.0"
-
 commander@^2.15.1, commander@^2.20.0, commander@^2.8.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2520,7 +2510,7 @@ decompress@^4.0.0, decompress@^4.2.0:
     pify "^2.3.0"
     strip-dirs "^2.0.0"
 
-deep-extend@^0.6.0, deep-extend@~0.6.0:
+deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
 
@@ -3128,6 +3118,11 @@ 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"
 
+fastest-levenshtein@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
+  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
+
 faye-websocket@~0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
@@ -6133,11 +6128,6 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
-reduce-flatten@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27"
-  integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==
-
 regenerate-unicode-properties@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
@@ -6964,16 +6954,6 @@ svgo@1.3.2, svgo@^1.0.0, svgo@^1.0.5:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-table-layout@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.1.tgz#8411181ee951278ad0638aea2f779a9ce42894f9"
-  integrity sha512-dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q==
-  dependencies:
-    array-back "^4.0.1"
-    deep-extend "~0.6.0"
-    typical "^5.2.0"
-    wordwrapjs "^4.0.0"
-
 tapable@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
@@ -7211,11 +7191,6 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typical@^5.0.0, typical@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066"
-  integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==
-
 unbzip2-stream@^1.0.9:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
@@ -7398,21 +7373,21 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-cli@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.2.0.tgz#10a09030ad2bd4d8b0f78322fba6ea43ec56aaaa"
-  integrity sha512-EIl3k88vaF4fSxWSgtAQR+VwicfLMTZ9amQtqS4o+TDPW9HGaEpbFBbAZ4A3ZOT5SOnMxNOzROsSTPiE8tBJPA==
+webpack-cli@4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.3.0.tgz#e39303bf9f8002de122903e97029f3443d0f9174"
+  integrity sha512-gve+BBKrzMPTOYDjupzV8JchUznhVWMKtWM1hFIQWi6XoeLvGNoQwkrtMWVb+aJ437GgCKdta7sIn10v621pKA==
   dependencies:
-    "@webpack-cli/info" "^1.1.0"
-    "@webpack-cli/serve" "^1.1.0"
+    "@discoveryjs/json-ext" "^0.5.0"
+    "@webpack-cli/info" "^1.2.0"
+    "@webpack-cli/serve" "^1.2.0"
     colorette "^1.2.1"
-    command-line-usage "^6.1.0"
     commander "^6.2.0"
     enquirer "^2.3.6"
     execa "^4.1.0"
+    fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
     interpret "^2.2.0"
-    leven "^3.1.0"
     rechoir "^0.7.0"
     v8-compile-cache "^2.2.0"
     webpack-merge "^4.2.2"
@@ -7512,14 +7487,6 @@ wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
-wordwrapjs@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.0.tgz#9aa9394155993476e831ba8e59fb5795ebde6800"
-  integrity sha512-Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ==
-  dependencies:
-    reduce-flatten "^2.0.0"
-    typical "^5.0.0"
-
 worker-rpc@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/worker-rpc/-/worker-rpc-0.1.1.tgz#cb565bd6d7071a8f16660686051e969ad32f54d5"

From 092dbcf77f727a4680d7a4c9cff7991453961c55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Dec 2020 22:16:14 +0900
Subject: [PATCH 271/299] Build(deps-dev): Bump eslint-plugin-react from 7.21.5
 to 7.22.0 (#9976)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.21.5 to 7.22.0.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.21.5...v7.22.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 117d21f1a..43d7518b9 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jest": "24.1.3",
     "eslint-plugin-prettier-internal-rules": "link:scripts/tools/eslint-plugin-prettier-internal-rules",
-    "eslint-plugin-react": "7.21.5",
+    "eslint-plugin-react": "7.22.0",
     "eslint-plugin-unicorn": "25.0.0",
     "execa": "5.0.0",
     "jest": "26.6.3",
diff --git a/yarn.lock b/yarn.lock
index 2302e884a..aaed00c0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3100,10 +3100,10 @@ eslint-plugin-jest@24.1.3:
 "eslint-plugin-prettier-internal-rules@link:scripts/tools/eslint-plugin-prettier-internal-rules":
   version "0.0.0"
 
-eslint-plugin-react@7.21.5:
-  version "7.21.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz#50b21a412b9574bfe05b21db176e8b7b3b15bff3"
-  integrity sha512-8MaEggC2et0wSF6bUeywF7qQ46ER81irOdWS4QWxnnlAEsnzeBevk1sWh7fhpCghPpXb+8Ks7hvaft6L/xsR6g==
+eslint-plugin-react@7.22.0:
+  version "7.22.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269"
+  integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA==
   dependencies:
     array-includes "^3.1.1"
     array.prototype.flatmap "^1.2.3"

From f87a3648fed49a4b68ad7a69b3d4bb0f188c71ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Dec 2020 22:17:22 +0900
Subject: [PATCH 272/299] Build(deps-dev): Bump @typescript-eslint/types from
 4.11.0 to 4.11.1 (#9973)

Bumps [@typescript-eslint/types](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/visitor-keys) from 4.11.0 to 4.11.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/visitor-keys/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.11.1/packages/visitor-keys)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 43d7518b9..fab1cc19a 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@rollup/plugin-replace": "2.3.4",
     "@types/estree": "0.0.45",
     "@types/node": "14.14.0",
-    "@typescript-eslint/types": "4.11.0",
+    "@typescript-eslint/types": "4.11.1",
     "babel-jest": "26.6.3",
     "babel-loader": "8.2.2",
     "benchmark": "2.1.4",
diff --git a/yarn.lock b/yarn.lock
index aaed00c0d..e5de9ed62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1623,11 +1623,6 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2"
   integrity sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg==
 
-"@typescript-eslint/types@4.11.0":
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.0.tgz#86cf95e7eac4ccfd183f9fcf1480cece7caf4ca4"
-  integrity sha512-XXOdt/NPX++txOQHM1kUMgJUS43KSlXGdR/aDyEwuAEETwuPt02Nc7v+s57PzuSqMbNLclblQdv3YcWOdXhQ7g==
-
 "@typescript-eslint/types@4.11.1":
   version "4.11.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.1.tgz#3ba30c965963ef9f8ced5a29938dd0c465bd3e05"

From ccf5867357d4e05c714084f2004a5d65b1795958 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 13:57:35 +0800
Subject: [PATCH 273/299] Build(deps-dev): Bump eslint-plugin-unicorn from
 25.0.0 to 25.0.1 (#9983)

Bumps [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) from 25.0.0 to 25.0.1.
- [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases)
- [Commits](https://github.com/sindresorhus/eslint-plugin-unicorn/compare/v25.0.0...v25.0.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fab1cc19a..3ce5be3f1 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "eslint-plugin-jest": "24.1.3",
     "eslint-plugin-prettier-internal-rules": "link:scripts/tools/eslint-plugin-prettier-internal-rules",
     "eslint-plugin-react": "7.22.0",
-    "eslint-plugin-unicorn": "25.0.0",
+    "eslint-plugin-unicorn": "25.0.1",
     "execa": "5.0.0",
     "jest": "26.6.3",
     "jest-snapshot-serializer-ansi": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index e5de9ed62..0c74480d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3112,10 +3112,10 @@ eslint-plugin-react@7.22.0:
     resolve "^1.18.1"
     string.prototype.matchall "^4.0.2"
 
-eslint-plugin-unicorn@25.0.0:
-  version "25.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-25.0.0.tgz#b5718381ac615f2bcf7814e4acf0aac78b11a10f"
-  integrity sha512-RuhPUrsKuRj0YGz8lMuh5Z5DJoC/hmUR6omvlquLlY6SYY+oZXMFyp83ckpqLMhbafqUx+JttWOPOjfP4W9Y+Q==
+eslint-plugin-unicorn@25.0.1:
+  version "25.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-25.0.1.tgz#bedcbc9b817042a44f6501584e8266741120f023"
+  integrity sha512-MEyEWoyou/qhJH6rEER9YHACtCsQT+eewc6Fdxbi2eiTvsGrBR8JZMA6qaeof3oMQeRxOpaERoBKzU7R5c4A/w==
   dependencies:
     ci-info "^2.0.0"
     clean-regexp "^1.0.0"

From 27700e5282516c984ea2be82b58ac0ea0a92042e Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 31 Dec 2020 20:24:24 +0800
Subject: [PATCH 274/299] Add test to close issue 9102 (#9982)

---
 .../__snapshots__/jsfmt.spec.js.snap          | 19 +++++++++++++++++++
 .../issue-9102.ts                             |  3 +++
 2 files changed, 22 insertions(+)
 create mode 100644 tests/misc/errors/invalid-typescript-decorators/issue-9102.ts

diff --git a/tests/misc/errors/invalid-typescript-decorators/__snapshots__/jsfmt.spec.js.snap b/tests/misc/errors/invalid-typescript-decorators/__snapshots__/jsfmt.spec.js.snap
index 3d93c7204..7a3f227b9 100644
--- a/tests/misc/errors/invalid-typescript-decorators/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/misc/errors/invalid-typescript-decorators/__snapshots__/jsfmt.spec.js.snap
@@ -94,3 +94,22 @@ exports[`interface.ts [typescript] format 1`] = `
     | ^^
   7 | "
 `;
+
+exports[`issue-9102.ts [babel-ts] format 1`] = `
+"Leading decorators must be attached to a class declaration (2:1)
+  1 | @Decorator()
+> 2 | type T = 1;
+    | ^
+  3 | class C {}
+  4 | "
+`;
+
+exports[`issue-9102.ts [typescript] format 1`] = `
+"Leading decorators must be attached to a class declaration (1:1)
+> 1 | @Decorator()
+    | ^^^^^^^^^^^^
+> 2 | type T = 1;
+    | ^^^^^^^^^^^^
+  3 | class C {}
+  4 | "
+`;
diff --git a/tests/misc/errors/invalid-typescript-decorators/issue-9102.ts b/tests/misc/errors/invalid-typescript-decorators/issue-9102.ts
new file mode 100644
index 000000000..5be2412c1
--- /dev/null
+++ b/tests/misc/errors/invalid-typescript-decorators/issue-9102.ts
@@ -0,0 +1,3 @@
+@Decorator()
+type T = 1;
+class C {}

From 23521ded6c0ab55b7ce4d72257c0240ac3aae52d Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Fri, 1 Jan 2021 01:56:32 +0900
Subject: [PATCH 275/299] Refactor CLI context with ES2015 class (#9964)

* Remove createContext

* Remove initContext

* Remove pushContextPlugins

* Remove popContextPlugins

* Move JSDoc comments

* Remove updateContextArgv

* Remove normalizeContextArgv

* Remove updateContextOptions

* Fix typedef

* Change exports format

* Add comment for initContext
---
 src/cli/context.js | 199 ++++++++++++++++++++-------------------------
 src/cli/core.js    |   5 +-
 src/cli/index.js   |   4 +-
 src/cli/option.js  |   5 +-
 4 files changed, 96 insertions(+), 117 deletions(-)

diff --git a/src/cli/context.js b/src/cli/context.js
index 95da0f822..898946b06 100644
--- a/src/cli/context.js
+++ b/src/cli/context.js
@@ -30,120 +30,101 @@ const createMinimistOptions = require("./create-minimist-options");
  * @property apiDefaultOptions
  * @property languages
  * @property {Partial<Context>[]} stack
+ * @property initContext
+ * @property pushContextPlugins
+ * @property popContextPlugins
  */
 
-/** @returns {Context} */
-function createContext(args) {
-  /** @type {Context} */
-  const context = { args, stack: [] };
+class Context {
+  constructor(args) {
+    this.args = args;
+    this.stack = [];
+    this._updateContextArgv();
+    this._normalizeContextArgv(["loglevel", "plugin", "plugin-search-dir"]);
+    this.logger = createLogger(this.argv.loglevel);
+    this._updateContextArgv(this.argv.plugin, this.argv["plugin-search-dir"]);
+  }
 
-  updateContextArgv(context);
-  normalizeContextArgv(context, ["loglevel", "plugin", "plugin-search-dir"]);
+  initContext() {
+    // split into 2 step so that we could wrap this in a `try..catch` in cli/index.js
+    this._normalizeContextArgv();
+  }
 
-  context.logger = createLogger(context.argv.loglevel);
+  /**
+   * @param {string[]} plugins
+   * @param {string[]=} pluginSearchDirs
+   */
+  pushContextPlugins(plugins, pluginSearchDirs) {
+    this.stack.push(
+      pick(this, [
+        "supportOptions",
+        "detailedOptions",
+        "detailedOptionMap",
+        "apiDefaultOptions",
+        "languages",
+      ])
+    );
+    this._updateContextOptions(plugins, pluginSearchDirs);
+  }
 
-  updateContextArgv(
-    context,
-    context.argv.plugin,
-    context.argv["plugin-search-dir"]
-  );
+  popContextPlugins() {
+    Object.assign(this, this.stack.pop());
+  }
 
-  return context;
+  _updateContextArgv(plugins, pluginSearchDirs) {
+    this.pushContextPlugins(plugins, pluginSearchDirs);
+    const minimistOptions = createMinimistOptions(this.detailedOptions);
+    const argv = minimist(this.args, minimistOptions);
+    this.argv = argv;
+    this.filePatterns = argv._.map((file) => String(file));
+  }
+
+  _normalizeContextArgv(keys) {
+    const detailedOptions = !keys
+      ? this.detailedOptions
+      : this.detailedOptions.filter((option) => keys.includes(option.name));
+    const argv = !keys ? this.argv : pick(this.argv, keys);
+    this.argv = optionsNormalizer.normalizeCliOptions(argv, detailedOptions, {
+      logger: this.logger,
+    });
+  }
+
+  /**
+   * @param {string[]} plugins
+   * @param {string[]=} pluginSearchDirs
+   */
+  _updateContextOptions(plugins, pluginSearchDirs) {
+    const { options: supportOptions, languages } = prettier.getSupportInfo({
+      showDeprecated: true,
+      showUnreleased: true,
+      showInternal: true,
+      plugins,
+      pluginSearchDirs,
+    });
+    const detailedOptionMap = normalizeDetailedOptionMap({
+      ...createDetailedOptionMap(supportOptions),
+      ...constant.options,
+    });
+
+    const detailedOptions = arrayify(detailedOptionMap, "name");
+
+    const apiDefaultOptions = {
+      ...optionsModule.hiddenDefaults,
+      ...fromPairs(
+        supportOptions
+          .filter(({ deprecated }) => !deprecated)
+          .map((option) => [option.name, option.default])
+      ),
+    };
+
+    Object.assign(this, {
+      supportOptions,
+      detailedOptions,
+      detailedOptionMap,
+      apiDefaultOptions,
+      languages,
+    });
+  }
 }
 
-function initContext(context) {
-  // split into 2 step so that we could wrap this in a `try..catch` in cli/index.js
-  normalizeContextArgv(context);
-}
-
-/**
- * @param {Context} context
- * @param {string[]} plugins
- * @param {string[]=} pluginSearchDirs
- */
-function updateContextOptions(context, plugins, pluginSearchDirs) {
-  const { options: supportOptions, languages } = prettier.getSupportInfo({
-    showDeprecated: true,
-    showUnreleased: true,
-    showInternal: true,
-    plugins,
-    pluginSearchDirs,
-  });
-
-  const detailedOptionMap = normalizeDetailedOptionMap({
-    ...createDetailedOptionMap(supportOptions),
-    ...constant.options,
-  });
-
-  const detailedOptions = arrayify(detailedOptionMap, "name");
-
-  const apiDefaultOptions = {
-    ...optionsModule.hiddenDefaults,
-    ...fromPairs(
-      supportOptions
-        .filter(({ deprecated }) => !deprecated)
-        .map((option) => [option.name, option.default])
-    ),
-  };
-
-  Object.assign(context, {
-    supportOptions,
-    detailedOptions,
-    detailedOptionMap,
-    apiDefaultOptions,
-    languages,
-  });
-}
-
-/**
- * @param {Context} context
- * @param {string[]} plugins
- * @param {string[]=} pluginSearchDirs
- */
-function pushContextPlugins(context, plugins, pluginSearchDirs) {
-  context.stack.push(
-    pick(context, [
-      "supportOptions",
-      "detailedOptions",
-      "detailedOptionMap",
-      "apiDefaultOptions",
-      "languages",
-    ])
-  );
-  updateContextOptions(context, plugins, pluginSearchDirs);
-}
-
-/**
- * @param {Context} context
- */
-function popContextPlugins(context) {
-  Object.assign(context, context.stack.pop());
-}
-
-function updateContextArgv(context, plugins, pluginSearchDirs) {
-  pushContextPlugins(context, plugins, pluginSearchDirs);
-
-  const minimistOptions = createMinimistOptions(context.detailedOptions);
-  const argv = minimist(context.args, minimistOptions);
-
-  context.argv = argv;
-  context.filePatterns = argv._.map((file) => String(file));
-}
-
-function normalizeContextArgv(context, keys) {
-  const detailedOptions = !keys
-    ? context.detailedOptions
-    : context.detailedOptions.filter((option) => keys.includes(option.name));
-  const argv = !keys ? context.argv : pick(context.argv, keys);
-
-  context.argv = optionsNormalizer.normalizeCliOptions(argv, detailedOptions, {
-    logger: context.logger,
-  });
-}
-
-module.exports = {
-  createContext,
-  initContext,
-  popContextPlugins,
-  pushContextPlugins,
-};
+module.exports = Context;
diff --git a/src/cli/core.js b/src/cli/core.js
index fe6c7b002..d13397856 100644
--- a/src/cli/core.js
+++ b/src/cli/core.js
@@ -8,7 +8,7 @@ const stringify = require("fast-json-stable-stringify");
 const prettier = require("../index");
 
 const { format, formatStdin, formatFiles } = require("./format");
-const { createContext, initContext } = require("./context");
+const Context = require("./context");
 const {
   normalizeDetailedOptionMap,
   createDetailedOptionMap,
@@ -44,14 +44,13 @@ function logFileInfoOrDie(context) {
 }
 
 module.exports = {
-  createContext,
+  Context,
   createDetailedOptionMap,
   createDetailedUsage,
   createUsage,
   format,
   formatFiles,
   formatStdin,
-  initContext,
   logResolvedConfigPathOrDie,
   logFileInfoOrDie,
   normalizeDetailedOptionMap,
diff --git a/src/cli/index.js b/src/cli/index.js
index 27b059b4f..2a5db4262 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -9,10 +9,10 @@ const prettier = require("../index");
 const core = require("./core");
 
 function run(args) {
-  const context = core.createContext(args);
+  const context = new core.Context(args);
 
   try {
-    core.initContext(context);
+    context.initContext();
 
     context.logger.debug(`normalized argv: ${JSON.stringify(context.argv)}`);
 
diff --git a/src/cli/option.js b/src/cli/option.js
index 211fc4f8c..b71726382 100644
--- a/src/cli/option.js
+++ b/src/cli/option.js
@@ -8,7 +8,6 @@ const fromPairs = require("lodash/fromPairs");
 const prettier = require("../index");
 
 const minimist = require("./minimist");
-const { popContextPlugins, pushContextPlugins } = require("./context");
 const { optionsNormalizer } = require("./prettier-internal");
 const createMinimistOptions = require("./create-minimist-options");
 
@@ -113,7 +112,7 @@ function getOptionsForFile(context, filepath) {
 
   const hasPlugins = options && options.plugins;
   if (hasPlugins) {
-    pushContextPlugins(context, options.plugins);
+    context.pushContextPlugins(options.plugins);
   }
 
   const appliedOptions = {
@@ -133,7 +132,7 @@ function getOptionsForFile(context, filepath) {
   );
 
   if (hasPlugins) {
-    popContextPlugins(context);
+    context.popContextPlugins();
   }
 
   return appliedOptions;

From 9d9c0e2b6ffca0d85e2cae8eb77ea81b9ce4f322 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 4 Jan 2021 10:04:30 +0800
Subject: [PATCH 276/299] Add `Doc[]` as `Doc` (#9733)

Co-authored-by: Georgii Dolzhykov <thorn.mailbox@gmail.com>
---
 .eslintrc.yml                                 |   4 +
 changelog_unreleased/api/9733.md              |  13 ++
 commands.md                                   |  34 +++--
 docs/plugins.md                               |   2 +-
 docs/technical-details.md                     |   2 +-
 .../index.js                                  |   1 +
 .../no-doc-builder-concat.js                  |  35 +++++
 .../test.js                                   |  16 ++
 src/document/doc-builders.js                  |  27 +++-
 src/document/doc-debug.js                     |  24 +--
 src/document/doc-printer.js                   |  23 ++-
 src/document/doc-utils.js                     |  60 ++++----
 src/language-css/printer-postcss.js           |   9 +-
 src/language-handlebars/printer-glimmer.js    |   3 +-
 src/language-html/printer-html.js             |   6 +-
 src/language-js/print/binaryish.js            |   7 +-
 src/language-js/print/object.js               |   1 +
 src/language-markdown/printer-markdown.js     |   4 +-
 src/language-yaml/print/block.js              |   3 +-
 src/language-yaml/printer-yaml.js             |   3 +-
 tests_integration/__tests__/debug-api.js      |  10 +-
 tests_integration/__tests__/doc-builders.js   | 138 ++++++++++++++++++
 22 files changed, 332 insertions(+), 93 deletions(-)
 create mode 100644 changelog_unreleased/api/9733.md
 create mode 100644 scripts/tools/eslint-plugin-prettier-internal-rules/no-doc-builder-concat.js
 create mode 100644 tests_integration/__tests__/doc-builders.js

diff --git a/.eslintrc.yml b/.eslintrc.yml
index c111da02a..2e630bf4e 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -109,8 +109,12 @@ overrides:
       prettier-internal-rules/better-parent-property-check-in-needs-parens: error
   - files: src/**/*.js
     rules:
+      prettier-internal-rules/no-doc-builder-concat: off
       prettier-internal-rules/prefer-fast-path-each: error
       prettier-internal-rules/prefer-is-non-empty-array: error
+  - files: src/document/*.js
+    rules:
+      prettier-internal-rules/no-doc-builder-concat: off
   - files:
       - src/language-*/**/*.js
     rules:
diff --git a/changelog_unreleased/api/9733.md b/changelog_unreleased/api/9733.md
new file mode 100644
index 000000000..0c903d057
--- /dev/null
+++ b/changelog_unreleased/api/9733.md
@@ -0,0 +1,13 @@
+#### Use arrays instead of `concat` (#9733 by @fisker, @thorn0)
+
+To simplify the code of AST printers, the data structure for the concatenation command has been changed from `{ type: 'concat', parts: Doc[] }` to `Doc[]`. The old format is deprecated, but for compatibility, the doc printer still supports it, and `doc.builders.concat` (as well as some other builder functions) will keep using it until the next major version of Prettier.
+
+If you're a plugin author, this change should only concern you if your plugin introspects or modifies composed docs. If it happens to be the case, please make your plugin compatible with future versions of Prettier by tweaking the introspecting code to support the new format. There also is an off-chance where this change can break things, namely if a plugin calls another plugin to [print an embedded language](https://prettier.io/docs/en/plugins.html#optional-embed) and then introspects the returned doc. There seems to be no reason for plugins to do that though.
+
+```jsx
+// Prettier stable
+myDoc = group(concat(["foo", line, "bar"]));
+
+// Prettier master
+myDoc = group(["foo", line, "bar"]);
+```
diff --git a/commands.md b/commands.md
index 3ca932f2d..0a0145418 100644
--- a/commands.md
+++ b/commands.md
@@ -2,14 +2,6 @@ The core of the algorithm is implemented in `doc-{printer,builders,utils,debug}.
 
 The following commands are available:
 
-### concat
-
-```ts
-declare function concat(docs: Doc[]): Doc;
-```
-
-Combine an array into a single string.
-
 ### group
 
 ```ts
@@ -97,7 +89,7 @@ declare var breakParent: Doc;
 Include this anywhere to force all parent groups to break. See `group` for more info. Example:
 
 ```js
-group(concat([" ", expr, " ", breakParent]));
+group([" ", expr, " ", breakParent]);
 ```
 
 ### join
@@ -149,7 +141,7 @@ declare function lineSuffix(suffix: Doc): Doc;
 This is used to implement trailing comments. In practice, it is not practical to find where the line ends and you don't want to accidentally print some code at the end of the comment. `lineSuffix` will buffer the output and flush it before any new line.
 
 ```js
-concat(["a", lineSuffix(" // comment"), ";", hardline]);
+["a", lineSuffix(" // comment"), ";", hardline];
 ```
 
 will output
@@ -167,7 +159,7 @@ declare var lineSuffixBoundary: Doc;
 In cases where you embed code inside of templates, comments shouldn't be able to leave the code part. lineSuffixBoundary is an explicit marker you can use to flush code in addition to newlines.
 
 ```js
-concat(["{", lineSuffix(" // comment"), lineSuffixBoundary, "}", hardline]);
+["{", lineSuffix(" // comment"), lineSuffixBoundary, "}", hardline];
 ```
 
 will output
@@ -260,21 +252,31 @@ For an example, here's the implementation of the `ArrayExpression` node type:
 <!-- prettier-ignore -->
 ```js
 group(
-  concat([
+  [
     "[",
     indent(
-      concat([
+      [
         line,
         join(
-          concat([",", line]),
+          [",", line],
           path.map(print, "elements")
         )
-      ])
+      ]
     ),
     line,
     "]"
-  ])
+  ]
 );
 ```
 
 This is a group with opening and closing brackets, and possibly indented contents. Because it's a `group` it will always be broken up if any of the sub-expressions are broken.
+
+### [Deprecated] concat
+
+> This command is deprecated, use `Doc[]` instead.
+
+```ts
+declare function concat(docs: Doc[]): Doc;
+```
+
+Combine an array into a single string.
diff --git a/docs/plugins.md b/docs/plugins.md
index e4a80e787..152b87209 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -170,7 +170,7 @@ export const printers = {
 Prettier uses an intermediate representation, called a Doc, which Prettier then turns into a string (based on options like `printWidth`). A _printer_'s job is to take the AST generated by `parsers[<parser name>].parse` and return a Doc. A Doc is constructed using [builder commands](https://github.com/prettier/prettier/blob/master/commands.md):
 
 ```js
-const { concat, join, line, ifBreak, group } = require("prettier").doc.builders;
+const { join, line, ifBreak, group } = require("prettier").doc.builders;
 ```
 
 The printing process works as follows:
diff --git a/docs/technical-details.md b/docs/technical-details.md
index 6c5ba5753..bd67937ca 100644
--- a/docs/technical-details.md
+++ b/docs/technical-details.md
@@ -7,6 +7,6 @@ This printer is a fork of [recast](https://github.com/benjamn/recast)’s printe
 
 The basic idea is that the printer takes an AST and returns an intermediate representation of the output, and the printer uses that to generate a string. The advantage is that the printer can "measure" the IR and see if the output is going to fit on a line, and break if not.
 
-This means that most of the logic of printing an AST involves generating an abstract representation of the output involving certain commands. For example, `concat(["(", line, arg, line, ")"])` would represent a concatenation of opening parens, an argument, and closing parens. But if that doesn’t fit on one line, the printer can break where `line` is specified.
+This means that most of the logic of printing an AST involves generating an abstract representation of the output involving certain commands. For example, `["(", line, arg, line, ")"]` would represent a concatenation of opening parens, an argument, and closing parens. But if that doesn’t fit on one line, the printer can break where `line` is specified.
 
 More (rough) details can be found in [commands.md](https://github.com/prettier/prettier/blob/master/commands.md).
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
index 9837c5ae5..3bec6a3e2 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
@@ -5,6 +5,7 @@ module.exports = {
     "better-parent-property-check-in-needs-parens": require("./better-parent-property-check-in-needs-parens"),
     "directly-loc-start-end": require("./directly-loc-start-end"),
     "jsx-identifier-case": require("./jsx-identifier-case"),
+    "no-doc-builder-concat": require("./no-doc-builder-concat"),
     "no-node-comments": require("./no-node-comments"),
     "prefer-fast-path-each": require("./prefer-fast-path-each"),
     "prefer-is-non-empty-array": require("./prefer-is-non-empty-array"),
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/no-doc-builder-concat.js b/scripts/tools/eslint-plugin-prettier-internal-rules/no-doc-builder-concat.js
new file mode 100644
index 000000000..ab0b83d12
--- /dev/null
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/no-doc-builder-concat.js
@@ -0,0 +1,35 @@
+"use strict";
+
+const selector = [
+  "CallExpression",
+  ">",
+  "Identifier.callee",
+  '[name="concat"]',
+].join("");
+
+const messageId = "no-doc-builder-concat";
+
+module.exports = {
+  meta: {
+    type: "suggestion",
+    docs: {
+      url:
+        "https://github.com/prettier/prettier/blob/master/scripts/eslint-plugin-prettier-internal-rules/no-doc-builder-concat.js",
+    },
+    messages: {
+      [messageId]: "Use array directly instead of `concat([])`",
+    },
+    fixable: "code",
+  },
+  create(context) {
+    return {
+      [selector](node) {
+        context.report({
+          node,
+          messageId,
+          fix: (fixer) => fixer.replaceText(node, ""),
+        });
+      },
+    };
+  },
+};
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
index b0e6ddd04..e02c8008e 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
@@ -94,6 +94,22 @@ test("jsx-identifier-case", {
   ],
 });
 
+test("no-doc-builder-concat", {
+  valid: ["notConcat([])", "concat", "[].concat([])"],
+  invalid: [
+    {
+      code: "concat(parts)",
+      output: "(parts)",
+      errors: 1,
+    },
+    {
+      code: "concat(['foo', line])",
+      output: "(['foo', line])",
+      errors: 1,
+    },
+  ],
+});
+
 test("no-node-comments", {
   valid: [
     "const comments = node.notComments",
diff --git a/src/document/doc-builders.js b/src/document/doc-builders.js
index 78bb870a8..8d04efe5f 100644
--- a/src/document/doc-builders.js
+++ b/src/document/doc-builders.js
@@ -8,21 +8,32 @@
  * @property {boolean} [hard]
  * @property {boolean} [literal]
  *
- * @typedef {string | DocObject} Doc
+ * @typedef {Doc[]} DocArray
+ *
+ * @typedef {string | DocObject | DocArray} Doc
  */
 
 /**
  * @param {Doc} val
  */
 function assertDoc(val) {
-  /* istanbul ignore if */
-  if (
-    !(typeof val === "string" || (val != null && typeof val.type === "string"))
-  ) {
-    throw new Error(
-      "Value " + JSON.stringify(val) + " is not a valid document"
-    );
+  if (typeof val === "string") {
+    return;
   }
+
+  if (Array.isArray(val)) {
+    for (const doc of val) {
+      assertDoc(doc);
+    }
+    return;
+  }
+
+  if (val && typeof val.type === "string") {
+    return;
+  }
+
+  /* istanbul ignore next */
+  throw new Error("Value " + JSON.stringify(val) + " is not a valid document");
 }
 
 /**
diff --git a/src/document/doc-debug.js b/src/document/doc-debug.js
index d9a9a010a..0c31aa99f 100644
--- a/src/document/doc-debug.js
+++ b/src/document/doc-debug.js
@@ -1,12 +1,14 @@
 "use strict";
 
-function flattenDoc(doc) {
-  if (doc.type === "concat") {
-    const res = [];
+const { isConcat, getDocParts } = require("./doc-utils");
 
-    for (let i = 0; i < doc.parts.length; ++i) {
-      const doc2 = doc.parts[i];
-      if (typeof doc2 !== "string" && doc2.type === "concat") {
+function flattenDoc(doc) {
+  if (isConcat(doc)) {
+    const res = [];
+    const parts = getDocParts(doc);
+    for (let i = 0; i < parts.length; ++i) {
+      const doc2 = parts[i];
+      if (typeof doc2 !== "string" && isConcat(doc2)) {
         res.push(...flattenDoc(doc2).parts);
       } else {
         const flattened = flattenDoc(doc2);
@@ -16,7 +18,7 @@ function flattenDoc(doc) {
       }
     }
 
-    return { ...doc, parts: res };
+    return { type: "concat", parts: res };
   } else if (doc.type === "if-break") {
     return {
       ...doc,
@@ -44,6 +46,10 @@ function printDoc(doc) {
     return JSON.stringify(doc);
   }
 
+  if (isConcat(doc)) {
+    return "[" + getDocParts(doc).map(printDoc).join(", ") + "]";
+  }
+
   if (doc.type === "line") {
     if (doc.literal) {
       return "literalline";
@@ -65,10 +71,6 @@ function printDoc(doc) {
     return "trim";
   }
 
-  if (doc.type === "concat") {
-    return "[" + doc.parts.map(printDoc).join(", ") + "]";
-  }
-
   if (doc.type === "indent") {
     return "indent(" + printDoc(doc.contents) + ")";
   }
diff --git a/src/document/doc-printer.js b/src/document/doc-printer.js
index 354d3e68c..9a3dfb9f7 100644
--- a/src/document/doc-printer.js
+++ b/src/document/doc-printer.js
@@ -3,6 +3,7 @@
 const { getStringWidth } = require("../common/util");
 const { convertEndOfLineToChars } = require("../common/end-of-line");
 const { concat, fill, cursor } = require("./doc-builders");
+const { isConcat, getDocParts } = require("./doc-utils");
 
 /** @type {Record<symbol, typeof MODE_BREAK | typeof MODE_FLAT>} */
 let groupModeMap;
@@ -167,14 +168,13 @@ function fits(next, restCommands, width, options, mustBeFlat) {
       out.push(doc);
 
       width -= getStringWidth(doc);
+    } else if (isConcat(doc)) {
+      const parts = getDocParts(doc);
+      for (let i = parts.length - 1; i >= 0; i--) {
+        cmds.push([ind, mode, parts[i]]);
+      }
     } else {
       switch (doc.type) {
-        case "concat":
-          for (let i = doc.parts.length - 1; i >= 0; i--) {
-            cmds.push([ind, mode, doc.parts[i]]);
-          }
-
-          break;
         case "indent":
           cmds.push([makeIndent(ind, options), mode, doc.contents]);
 
@@ -264,17 +264,16 @@ function printDocToString(doc, options) {
       const formatted = newLine !== "\n" ? doc.replace(/\n/g, newLine) : doc;
       out.push(formatted);
       pos += getStringWidth(formatted);
+    } else if (isConcat(doc)) {
+      const parts = getDocParts(doc);
+      for (let i = parts.length - 1; i >= 0; i--) {
+        cmds.push([ind, mode, parts[i]]);
+      }
     } else {
       switch (doc.type) {
         case "cursor":
           out.push(cursor.placeholder);
 
-          break;
-        case "concat":
-          for (let i = doc.parts.length - 1; i >= 0; i--) {
-            cmds.push([ind, mode, doc.parts[i]]);
-          }
-
           break;
         case "indent":
           cmds.push([makeIndent(ind, options), mode, doc.contents]);
diff --git a/src/document/doc-utils.js b/src/document/doc-utils.js
index 453db6107..135056681 100644
--- a/src/document/doc-utils.js
+++ b/src/document/doc-utils.js
@@ -2,6 +2,9 @@
 
 const { literalline, concat } = require("./doc-builders");
 
+const isConcat = (doc) => Array.isArray(doc) || (doc && doc.type === "concat");
+const getDocParts = (doc) => (Array.isArray(doc) ? doc : doc.parts);
+
 // Using a unique object to compare by reference.
 const traverseDocOnExitStackMarker = {};
 
@@ -29,9 +32,10 @@ function traverseDoc(doc, onEnter, onExit, shouldTraverseConditionalGroups) {
       // the parts need to be pushed onto the stack in reverse order,
       // so that they are processed in the original order
       // when the stack is popped.
-      if (doc.type === "concat" || doc.type === "fill") {
-        for (let ic = doc.parts.length, i = ic - 1; i >= 0; --i) {
-          docsStack.push(doc.parts[i]);
+      if (isConcat(doc) || doc.type === "fill") {
+        const parts = getDocParts(doc);
+        for (let ic = parts.length, i = ic - 1; i >= 0; --i) {
+          docsStack.push(parts[i]);
         }
       } else if (doc.type === "if-break") {
         if (doc.flatContents) {
@@ -56,7 +60,9 @@ function traverseDoc(doc, onEnter, onExit, shouldTraverseConditionalGroups) {
 }
 
 function mapDoc(doc, cb) {
-  if (doc.type === "concat" || doc.type === "fill") {
+  if (Array.isArray(doc)) {
+    return cb(doc.map((part) => mapDoc(part, cb)));
+  } else if (doc.type === "concat" || doc.type === "fill") {
     const parts = doc.parts.map((part) => mapDoc(part, cb));
     return cb({ ...doc, parts });
   } else if (doc.type === "if-break") {
@@ -191,23 +197,21 @@ function stripDocTrailingHardlineFromDoc(doc) {
     return doc;
   }
 
-  switch (doc.type) {
-    case "concat":
-    case "fill": {
-      const parts = [...doc.parts];
+  if (isConcat(doc) || doc.type === "fill") {
+    const parts = getDocParts(doc);
 
-      while (parts.length > 1 && isHardline(...parts.slice(-2))) {
-        parts.length -= 2;
-      }
-
-      if (parts.length > 0) {
-        const lastPart = stripDocTrailingHardlineFromDoc(
-          parts[parts.length - 1]
-        );
-        parts[parts.length - 1] = lastPart;
-      }
-      return { ...doc, parts };
+    while (parts.length > 1 && isHardline(...parts.slice(-2))) {
+      parts.length -= 2;
     }
+
+    if (parts.length > 0) {
+      const lastPart = stripDocTrailingHardlineFromDoc(parts[parts.length - 1]);
+      parts[parts.length - 1] = lastPart;
+    }
+    return Array.isArray(doc) ? parts : { ...doc, parts };
+  }
+
+  switch (doc.type) {
     case "align":
     case "indent":
     case "group":
@@ -230,7 +234,6 @@ function stripTrailingHardline(doc) {
   return stripDocTrailingHardlineFromDoc(cleanDoc(doc));
 }
 
-const isConcat = (doc) => doc && doc.type === "concat";
 function cleanDocFn(doc) {
   switch (doc.type) {
     case "fill":
@@ -271,11 +274,13 @@ function cleanDocFn(doc) {
   }
 
   const parts = [];
-  for (const part of doc.parts) {
+  for (const part of getDocParts(doc)) {
     if (!part) {
       continue;
     }
-    const [currentPart, ...restParts] = isConcat(part) ? part.parts : [part];
+    const [currentPart, ...restParts] = isConcat(part)
+      ? getDocParts(part)
+      : [part];
     if (
       typeof currentPart === "string" &&
       typeof parts[parts.length - 1] === "string"
@@ -294,7 +299,7 @@ function cleanDocFn(doc) {
   if (parts.length === 1) {
     return parts[0];
   }
-  return { ...doc, parts };
+  return Array.isArray(doc) ? parts : { ...doc, parts };
 }
 // A safer version of `normalizeDoc`
 // - `normalizeDoc` concat strings and flat "concat" in `fill`, while `cleanDoc` don't
@@ -315,8 +320,8 @@ function normalizeParts(parts) {
       continue;
     }
 
-    if (part.type === "concat") {
-      restParts.unshift(...part.parts);
+    if (isConcat(part)) {
+      restParts.unshift(...getDocParts(part));
       continue;
     }
 
@@ -337,6 +342,9 @@ function normalizeParts(parts) {
 
 function normalizeDoc(doc) {
   return mapDoc(doc, (currentDoc) => {
+    if (Array.isArray(currentDoc)) {
+      return normalizeParts(currentDoc);
+    }
     if (!currentDoc.parts) {
       return currentDoc;
     }
@@ -360,6 +368,8 @@ function replaceNewlinesWithLiterallines(doc) {
 }
 
 module.exports = {
+  isConcat,
+  getDocParts,
   isEmpty,
   willBreak,
   isLineNext,
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index 8386d0bb3..a975379a2 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -22,7 +22,7 @@ const {
     ifBreak,
     breakParent,
   },
-  utils: { removeLines },
+  utils: { removeLines, getDocParts },
 } = require("../document");
 const clean = require("./clean");
 const embed = require("./embed");
@@ -102,7 +102,7 @@ function genericPrint(path, options, print) {
       return concat([
         nodes,
         after ? ` ${after}` : "",
-        nodes.parts.length ? hardline : "",
+        getDocParts(nodes).length ? hardline : "",
       ]);
     }
     case "css-comment": {
@@ -892,9 +892,8 @@ function genericPrint(path, options, print) {
                     node.groups[2] &&
                     node.groups[2].type === "value-paren_group"
                   ) {
-                    printed.contents.contents.parts[1] = group(
-                      printed.contents.contents.parts[1]
-                    );
+                    const parts = getDocParts(printed.contents.contents);
+                    parts[1] = group(parts[1]);
 
                     return group(dedent(printed));
                   }
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 0981f2dd3..126c3336a 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -2,6 +2,7 @@
 
 const {
   builders: { concat, group, hardline, ifBreak, indent, join, line, softline },
+  utils: { getDocParts },
 } = require("../document");
 const { locStart, locEnd } = require("./loc");
 const clean = require("./clean");
@@ -141,7 +142,7 @@ function print(path, options, print) {
       }
       const value = path.call(print, "value");
       const quotedValue = isText
-        ? printStringLiteral(value.parts.join(), options)
+        ? printStringLiteral(getDocParts(value).join(), options)
         : value;
       return concat([n.name, "=", quotedValue]);
     }
diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index 9110cfde0..e0b8a6ce1 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -16,7 +16,7 @@ const {
     softline,
     concat,
   },
-  utils: { mapDoc, cleanDoc },
+  utils: { mapDoc, cleanDoc, getDocParts },
 } = require("../document");
 const { replaceEndOfLineWith, isNonEmptyArray } = require("../common/util");
 const { print: printFrontMatter } = require("../utils/front-matter");
@@ -378,7 +378,7 @@ function genericPrint(path, options, print) {
           printClosingTagSuffix(node, options),
         ])
       );
-      return typeof printed === "string" ? printed : fill(printed.parts);
+      return typeof printed === "string" ? printed : fill(getDocParts(printed));
     }
     case "docType":
       return concat([
@@ -981,7 +981,7 @@ function getTextValueParts(node, value = node.value) {
           dedentString(htmlTrimPreserveIndentation(value)),
           hardline
         )
-    : join(line, splitByHtmlWhitespace(value)).parts;
+    : getDocParts(join(line, splitByHtmlWhitespace(value)));
 }
 
 function printEmbeddedAttributeValue(node, originalTextToDoc, options) {
diff --git a/src/language-js/print/binaryish.js b/src/language-js/print/binaryish.js
index 22fb959b2..132c3a8ae 100644
--- a/src/language-js/print/binaryish.js
+++ b/src/language-js/print/binaryish.js
@@ -4,7 +4,7 @@ const { printComments } = require("../../main/comments");
 const { getLast } = require("../../common/util");
 const {
   builders: { concat, join, line, softline, group, indent, align, ifBreak },
-  utils: { cleanDoc },
+  utils: { cleanDoc, getDocParts },
 } = require("../../document");
 const {
   hasLeadingOwnLineComment,
@@ -130,7 +130,8 @@ function printBinaryishExpression(path, options, print) {
   const hasJsx = isJsxNode(n.right);
 
   const firstGroupIndex = parts.findIndex(
-    (part) => typeof part !== "string" && part.type === "group"
+    (part) =>
+      typeof part !== "string" && !Array.isArray(part) && part.type === "group"
   );
 
   // Separate the leftmost expression, possibly with its leading comments.
@@ -278,7 +279,7 @@ function printBinaryishExpressions(
       if (printed.type === "string") {
         parts = [printed];
       } else {
-        parts = printed.parts;
+        parts = getDocParts(printed);
       }
     }
   } else {
diff --git a/src/language-js/print/object.js b/src/language-js/print/object.js
index 6716773f5..5b39cf0a6 100644
--- a/src/language-js/print/object.js
+++ b/src/language-js/print/object.js
@@ -102,6 +102,7 @@ function printObject(path, options, print) {
     }, field);
   });
 
+  /** @type {Doc[]} */
   let separatorParts = [];
   const props = propsAndLoc
     .sort((a, b) => a.loc - b.loc)
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index 82af78a16..f4f280ab7 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -23,7 +23,7 @@ const {
     indent,
     group,
   },
-  utils: { normalizeDoc },
+  utils: { normalizeDoc, getDocParts },
   printer: { printDocToString },
 } = require("../document");
 const { replaceEndOfLineWith } = require("../common/util");
@@ -578,7 +578,7 @@ function printLine(path, value, options) {
 }
 
 function printTable(path, options, print) {
-  const hardlineWithoutBreakParent = hardline.parts[0];
+  const hardlineWithoutBreakParent = getDocParts(hardline)[0];
   const node = path.getValue();
 
   const columnMaxWidths = [];
diff --git a/src/language-yaml/print/block.js b/src/language-yaml/print/block.js
index ce98e4236..b99f770e9 100644
--- a/src/language-yaml/print/block.js
+++ b/src/language-yaml/print/block.js
@@ -14,6 +14,7 @@ const {
     literalline,
     markAsRoot,
   },
+  utils: { getDocParts },
 } = require("../../document");
 const {
   getAncestorCount,
@@ -55,7 +56,7 @@ function printBlock(path, print, options) {
     if (index === 0) {
       contentsParts.push(hardline);
     }
-    contentsParts.push(fill(join(line, lineWords).parts));
+    contentsParts.push(fill(getDocParts(join(line, lineWords))));
     if (index !== lineContents.length - 1) {
       contentsParts.push(
         lineWords.length === 0 ? hardline : markAsRoot(literalline)
diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js
index b7f4544aa..0be8a3301 100644
--- a/src/language-yaml/printer-yaml.js
+++ b/src/language-yaml/printer-yaml.js
@@ -14,6 +14,7 @@ const {
     lineSuffix,
     literalline,
   },
+  utils: { getDocParts },
 } = require("../document");
 const { replaceEndOfLineWith, isPreviousLineEmpty } = require("../common/util");
 const { insertPragma, isPragma } = require("./pragma");
@@ -444,7 +445,7 @@ function printFlowScalarContent(nodeType, content, options) {
   return join(
     hardline,
     lineContents.map((lineContentWords) =>
-      fill(join(line, lineContentWords).parts)
+      fill(getDocParts(join(line, lineContentWords)))
     )
   );
 }
diff --git a/tests_integration/__tests__/debug-api.js b/tests_integration/__tests__/debug-api.js
index ea7293206..bf49aafcd 100644
--- a/tests_integration/__tests__/debug-api.js
+++ b/tests_integration/__tests__/debug-api.js
@@ -27,9 +27,13 @@ describe("API", () => {
   });
 
   const doc = printToDoc(code, options);
-  test("prettier.printToDoc", () => {
-    expect(doc.type).toBe("concat");
-    expect(Array.isArray(doc.parts)).toBe(true);
+  test("prettier.printToDoc", (done) => {
+    // If it's array, it's a `concat`
+    if (!Array.isArray(doc)) {
+      expect(doc.type).toBe("concat");
+      expect(Array.isArray(doc.parts)).toBe(true);
+    }
+    done();
   });
 
   const formatResultFromDoc = formatDoc(doc, options);
diff --git a/tests_integration/__tests__/doc-builders.js b/tests_integration/__tests__/doc-builders.js
new file mode 100644
index 000000000..47f25516f
--- /dev/null
+++ b/tests_integration/__tests__/doc-builders.js
@@ -0,0 +1,138 @@
+"use strict";
+
+const prettier = require("prettier-local");
+const {
+  concat,
+  join,
+  hardline,
+  literalline,
+  group,
+  fill,
+  lineSuffix,
+  breakParent,
+  ifBreak,
+  indent,
+  align,
+} = prettier.doc.builders;
+
+// TODO: Make these builders to use array if possible in 3.0.0
+describe("doc builders", () => {
+  test.each([
+    ["concat", concat(["1", "2"]), { type: "concat", parts: ["1", "2"] }],
+    [
+      "join",
+      join(concat(["1"]), ["2", concat(["3"])]),
+      {
+        type: "concat",
+        parts: [
+          "2",
+          { type: "concat", parts: ["1"] },
+          { type: "concat", parts: ["3"] },
+        ],
+      },
+    ],
+    [
+      "join(array)",
+      join(["1"], ["2", concat(["3"])]),
+      { type: "concat", parts: ["2", ["1"], { type: "concat", parts: ["3"] }] },
+    ],
+    [
+      "hardline",
+      hardline,
+      { type: "concat", parts: [{ type: "line", hard: true }, breakParent] },
+    ],
+    [
+      "literalline",
+      literalline,
+      {
+        type: "concat",
+        parts: [{ type: "line", hard: true, literal: true }, breakParent],
+      },
+    ],
+    [
+      "group",
+      group(concat(["1"])),
+      {
+        type: "group",
+        id: undefined,
+        contents: { type: "concat", parts: ["1"] },
+        break: false,
+        expandedStates: undefined,
+      },
+    ],
+    [
+      "group (array)",
+      group(["1"]),
+      {
+        type: "group",
+        id: undefined,
+        contents: ["1"],
+        break: false,
+        expandedStates: undefined,
+      },
+    ],
+    ["fill", fill(["1", "2"]), { type: "fill", parts: ["1", "2"] }],
+    [
+      "line-suffix",
+      lineSuffix(concat(["1"])),
+      {
+        type: "line-suffix",
+        contents: { type: "concat", parts: ["1"] },
+      },
+    ],
+    [
+      "line-suffix(array)",
+      lineSuffix(["1"]),
+      {
+        type: "line-suffix",
+        contents: ["1"],
+      },
+    ],
+    [
+      "if-break",
+      ifBreak(concat(["1"]), ["2"]),
+      {
+        type: "if-break",
+        breakContents: { type: "concat", parts: ["1"] },
+        flatContents: ["2"],
+        groupId: undefined,
+      },
+    ],
+    [
+      "indent",
+      indent(concat(["1"])),
+      {
+        type: "indent",
+        contents: { type: "concat", parts: ["1"] },
+      },
+    ],
+    [
+      "indent(array)",
+      indent(["1"]),
+      {
+        type: "indent",
+        contents: ["1"],
+      },
+    ],
+    [
+      "align",
+      align("  ", concat(["1"])),
+      {
+        type: "align",
+        contents: { type: "concat", parts: ["1"] },
+        n: "  ",
+      },
+    ],
+    [
+      "align(array)",
+      align("  ", ["1"]),
+      {
+        type: "align",
+        contents: ["1"],
+        n: "  ",
+      },
+    ],
+  ])("%s", (_, doc, expected) => {
+    expect(doc).toEqual(expected);
+  });
+});

From 181a325c1c07f1a4f3738665b7b28288dfb960bc Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 4 Jan 2021 10:11:57 +0800
Subject: [PATCH 277/299] Enable `unicorn/explicit-length-check` (#9975)

---
 .eslintrc.yml                                    |  1 +
 scripts/draft-blog-post.js                       |  4 ++--
 src/cli/index.js                                 |  6 +++---
 src/cli/usage.js                                 |  2 +-
 src/common/load-plugins.js                       |  2 +-
 src/common/util.js                               |  2 +-
 src/document/doc-printer.js                      |  8 ++++----
 src/document/doc-utils.js                        |  6 +++---
 src/language-css/clean.js                        |  2 +-
 src/language-css/parser-postcss.js               |  2 +-
 src/language-css/printer-postcss.js              |  2 +-
 src/language-handlebars/printer-glimmer.js       | 14 +++++++-------
 src/language-html/parser-html.js                 |  2 +-
 src/language-html/print-preprocess.js            |  6 +++---
 src/language-html/printer-html.js                |  2 +-
 src/language-html/utils.js                       |  4 ++--
 src/language-js/comments.js                      |  2 +-
 src/language-js/parser-babel.js                  |  7 ++++---
 src/language-js/print/binaryish.js               |  9 +++------
 src/language-js/print/jsx.js                     | 12 ++++++------
 src/language-js/print/member-chain.js            |  2 +-
 src/language-js/print/module.js                  |  4 ++--
 src/language-js/print/template-literal.js        |  4 ++--
 src/language-js/printer-estree.js                | 15 ++++++++-------
 src/language-markdown/print-preprocess.js        |  2 +-
 src/language-markdown/printer-markdown.js        |  2 +-
 src/language-yaml/print/flow-mapping-sequence.js |  2 +-
 src/language-yaml/printer-yaml.js                | 13 +++++--------
 src/language-yaml/utils.js                       | 10 +++++-----
 src/main/core.js                                 |  2 +-
 src/main/options-normalizer.js                   |  2 +-
 tests_config/run_spec.js                         |  2 +-
 website/pages/en/versions.js                     |  2 +-
 website/playground/panels.js                     |  2 +-
 34 files changed, 78 insertions(+), 81 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 2e630bf4e..4573377ef 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -67,6 +67,7 @@ rules:
     - never
     - exceptRange: true
   unicorn/better-regex: error
+  unicorn/explicit-length-check: error
   unicorn/new-for-builtins: error
   unicorn/no-useless-undefined: error
   unicorn/prefer-includes: error
diff --git a/scripts/draft-blog-post.js b/scripts/draft-blog-post.js
index b71290e35..512b6ea07 100644
--- a/scripts/draft-blog-post.js
+++ b/scripts/draft-blog-post.js
@@ -120,13 +120,13 @@ function printEntries({ title, filter }) {
 
   for (const { entries = [], title } of categories) {
     const filteredEntries = entries.filter(filter);
-    if (filteredEntries.length) {
+    if (filteredEntries.length > 0) {
       result.push("### " + title);
       result.push(...filteredEntries.map((entry) => entry.content));
     }
   }
 
-  if (result.length) {
+  if (result.length > 0) {
     result.unshift("## " + title);
   }
 
diff --git a/src/cli/index.js b/src/cli/index.js
index 2a5db4262..0ef3099ca 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -26,12 +26,12 @@ function run(args) {
       process.exit(1);
     }
 
-    if (context.argv["find-config-path"] && context.filePatterns.length) {
+    if (context.argv["find-config-path"] && context.filePatterns.length > 0) {
       context.logger.error("Cannot use --find-config-path with multiple files");
       process.exit(1);
     }
 
-    if (context.argv["file-info"] && context.filePatterns.length) {
+    if (context.argv["file-info"] && context.filePatterns.length > 0) {
       context.logger.error("Cannot use --file-info with multiple files");
       process.exit(1);
     }
@@ -59,7 +59,7 @@ function run(args) {
       process.exit(0);
     }
 
-    const hasFilePatterns = context.filePatterns.length !== 0;
+    const hasFilePatterns = context.filePatterns.length > 0;
     const useStdin =
       !hasFilePatterns &&
       (!process.stdin.isTTY || context.args["stdin-filepath"]);
diff --git a/src/cli/usage.js b/src/cli/usage.js
index 222df21fc..2babc28e3 100644
--- a/src/cli/usage.js
+++ b/src/cli/usage.js
@@ -175,7 +175,7 @@ function createDetailedUsage(context, flag) {
       : "";
 
   const pluginDefaults =
-    option.pluginDefaults && Object.keys(option.pluginDefaults).length
+    option.pluginDefaults && Object.keys(option.pluginDefaults).length > 0
       ? `\nPlugin defaults:${Object.keys(option.pluginDefaults).map(
           (key) =>
             `\n* ${key}: ${createDefaultValueDisplay(
diff --git a/src/common/load-plugins.js b/src/common/load-plugins.js
index 98c72d1e3..6b1934133 100644
--- a/src/common/load-plugins.js
+++ b/src/common/load-plugins.js
@@ -26,7 +26,7 @@ function load(plugins, pluginSearchDirs) {
     pluginSearchDirs = [];
   }
   // unless pluginSearchDirs are provided, auto-load plugins from node_modules that are parent to Prettier
-  if (!pluginSearchDirs.length) {
+  if (pluginSearchDirs.length === 0) {
     const autoLoadDir = thirdParty.findParentDir(__dirname, "node_modules");
     if (autoLoadDir) {
       pluginSearchDirs = [autoLoadDir];
diff --git a/src/common/util.js b/src/common/util.js
index e6d6225a8..4551aba63 100644
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -587,7 +587,7 @@ function addTrailingComment(node, comment) {
 function replaceEndOfLineWith(text, replacement) {
   const parts = [];
   for (const part of text.split("\n")) {
-    if (parts.length !== 0) {
+    if (parts.length > 0) {
       parts.push(replacement);
     }
     parts.push(part);
diff --git a/src/document/doc-printer.js b/src/document/doc-printer.js
index 9a3dfb9f7..1498109e8 100644
--- a/src/document/doc-printer.js
+++ b/src/document/doc-printer.js
@@ -135,7 +135,7 @@ function trim(out) {
     trimCount += out.pop().length;
   }
 
-  if (out.length && typeof out[out.length - 1] === "string") {
+  if (out.length > 0 && typeof out[out.length - 1] === "string") {
     const trimmed = out[out.length - 1].replace(/[\t ]*$/, "");
     trimCount += out[out.length - 1].length - trimmed.length;
     out[out.length - 1] = trimmed;
@@ -257,7 +257,7 @@ function printDocToString(doc, options) {
   let shouldRemeasure = false;
   let lineSuffix = [];
 
-  while (cmds.length !== 0) {
+  while (cmds.length > 0) {
     const [ind, mode, doc] = cmds.pop();
 
     if (typeof doc === "string") {
@@ -496,7 +496,7 @@ function printDocToString(doc, options) {
             // fallthrough
 
             case MODE_BREAK:
-              if (lineSuffix.length) {
+              if (lineSuffix.length > 0) {
                 cmds.push([ind, mode, doc]);
                 cmds.push(...lineSuffix.reverse());
                 lineSuffix = [];
@@ -525,7 +525,7 @@ function printDocToString(doc, options) {
 
     // Flush remaining line-suffix contents at the end of the document, in case
     // there is no new line after the line-suffix.
-    if (cmds.length === 0 && lineSuffix.length) {
+    if (cmds.length === 0 && lineSuffix.length > 0) {
       cmds.push(...lineSuffix.reverse());
       lineSuffix = [];
     }
diff --git a/src/document/doc-utils.js b/src/document/doc-utils.js
index 135056681..34f1ba1f2 100644
--- a/src/document/doc-utils.js
+++ b/src/document/doc-utils.js
@@ -11,7 +11,7 @@ const traverseDocOnExitStackMarker = {};
 function traverseDoc(doc, onEnter, onExit, shouldTraverseConditionalGroups) {
   const docsStack = [doc];
 
-  while (docsStack.length !== 0) {
+  while (docsStack.length > 0) {
     const doc = docsStack.pop();
 
     if (doc === traverseDocOnExitStackMarker) {
@@ -313,7 +313,7 @@ function normalizeParts(parts) {
   const newParts = [];
 
   const restParts = parts.filter(Boolean);
-  while (restParts.length !== 0) {
+  while (restParts.length > 0) {
     const part = restParts.shift();
 
     if (!part) {
@@ -326,7 +326,7 @@ function normalizeParts(parts) {
     }
 
     if (
-      newParts.length !== 0 &&
+      newParts.length > 0 &&
       typeof newParts[newParts.length - 1] === "string" &&
       typeof part === "string"
     ) {
diff --git a/src/language-css/clean.js b/src/language-css/clean.js
index 42cfa3ad6..3e103456c 100644
--- a/src/language-css/clean.js
+++ b/src/language-css/clean.js
@@ -21,7 +21,7 @@ function clean(ast, newObj, parent) {
   if (
     ast.type === "css-comment" &&
     parent.type === "css-root" &&
-    parent.nodes.length !== 0
+    parent.nodes.length > 0
   ) {
     // --insert-pragma
     // first non-front-matter comment
diff --git a/src/language-css/parser-postcss.js b/src/language-css/parser-postcss.js
index b2974fe26..1dbdfcb6a 100644
--- a/src/language-css/parser-postcss.js
+++ b/src/language-css/parser-postcss.js
@@ -105,7 +105,7 @@ function parseValueNode(valueNode, options) {
       };
       commaGroupStack.push(commaGroup);
     } else if (node.type === "paren" && node.value === ")") {
-      if (commaGroup.groups.length) {
+      if (commaGroup.groups.length > 0) {
         parenGroup.groups.push(commaGroup);
       }
       parenGroup.close = node;
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index a975379a2..771dd54da 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -102,7 +102,7 @@ function genericPrint(path, options, print) {
       return concat([
         nodes,
         after ? ` ${after}` : "",
-        getDocParts(nodes).length ? hardline : "",
+        getDocParts(nodes).length > 0 ? hardline : "",
       ]);
     }
     case "css-comment": {
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 126c3336a..8047d3041 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -54,7 +54,7 @@ function print(path, options, print) {
         group(
           concat([
             isWhitespaceOnly ? "" : indent(printChildren(path, options, print)),
-            n.children.length ? hardline : "",
+            n.children.length > 0 ? hardline : "",
             concat(["</", n.tag, ">"]),
           ])
         ),
@@ -337,13 +337,13 @@ function printAttributesLike(path, print) {
 
   return indent(
     concat([
-      node.attributes.length ? line : "",
+      node.attributes.length > 0 ? line : "",
       join(line, path.map(print, "attributes")),
 
-      node.modifiers.length ? line : "",
+      node.modifiers.length > 0 ? line : "",
       join(line, path.map(print, "modifiers")),
 
-      node.comments.length ? line : "",
+      node.comments.length > 0 ? line : "",
       join(line, path.map(print, "comments")),
     ])
   );
@@ -631,7 +631,7 @@ function printParams(path, print) {
   const node = path.getValue();
   const parts = [];
 
-  if (node.params.length) {
+  if (node.params.length > 0) {
     const params = path.map(print, "params");
     parts.push(...params);
   }
@@ -641,7 +641,7 @@ function printParams(path, print) {
     parts.push(hash);
   }
 
-  if (!parts.length) {
+  if (parts.length === 0) {
     return "";
   }
 
@@ -649,7 +649,7 @@ function printParams(path, print) {
 }
 
 function printBlockParams(node) {
-  if (!node || !node.blockParams.length) {
+  if (!node || node.blockParams.length === 0) {
     return "";
   }
 
diff --git a/src/language-html/parser-html.js b/src/language-html/parser-html.js
index f6424a7a1..9607e81f0 100644
--- a/src/language-html/parser-html.js
+++ b/src/language-html/parser-html.js
@@ -136,7 +136,7 @@ function ngHtmlParser(
     errors = htmlParseResult.errors;
   }
 
-  if (errors.length !== 0) {
+  if (errors.length > 0) {
     const {
       msg,
       span: { start, end },
diff --git a/src/language-html/print-preprocess.js b/src/language-html/print-preprocess.js
index 60550e81c..5a790780f 100644
--- a/src/language-html/print-preprocess.js
+++ b/src/language-html/print-preprocess.js
@@ -41,7 +41,7 @@ function removeIgnorableFirstLf(ast /*, options */) {
     if (
       node.type === "element" &&
       node.tagDefinition.ignoreFirstLf &&
-      node.children.length !== 0 &&
+      node.children.length > 0 &&
       node.children[0].type === "text" &&
       node.children[0].value[0] === "\n"
     ) {
@@ -260,7 +260,7 @@ function extractInterpolation(ast, options) {
 
         if (i % 2 === 0) {
           endSourceSpan = startSourceSpan.moveBy(value.length);
-          if (value.length !== 0) {
+          if (value.length > 0) {
             newChildren.push({
               type: "text",
               value,
@@ -317,7 +317,7 @@ function extractWhitespaces(ast /*, options*/) {
     ) {
       return node.clone({
         children: [],
-        hasDanglingSpaces: node.children.length !== 0,
+        hasDanglingSpaces: node.children.length > 0,
       });
     }
 
diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index e0b8a6ce1..4315f27c7 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -599,7 +599,7 @@ function printChildren(path, options, print) {
              *             ~
              *       attr
              */
-            (nextNode.type === "element" && nextNode.attrs.length !== 0))) ||
+            (nextNode.type === "element" && nextNode.attrs.length > 0))) ||
         /**
          *     <img
          *       src="long"
diff --git a/src/language-html/utils.js b/src/language-html/utils.js
index 91c1cf9c0..e4ac2446f 100644
--- a/src/language-html/utils.js
+++ b/src/language-html/utils.js
@@ -281,7 +281,7 @@ function forceBreakContent(node) {
   return (
     forceBreakChildren(node) ||
     (node.type === "element" &&
-      node.children.length !== 0 &&
+      node.children.length > 0 &&
       (["body", "script", "style"].includes(node.name) ||
         node.children.some((child) => hasNonTextChild(child)))) ||
     (node.firstChild &&
@@ -297,7 +297,7 @@ function forceBreakContent(node) {
 function forceBreakChildren(node) {
   return (
     node.type === "element" &&
-    node.children.length !== 0 &&
+    node.children.length > 0 &&
     (["html", "head", "ul", "ol", "select"].includes(node.name) ||
       (node.cssDisplay.startsWith("table") && node.cssDisplay !== "table-cell"))
   );
diff --git a/src/language-js/comments.js b/src/language-js/comments.js
index fdf2fda37..a63fb08cc 100644
--- a/src/language-js/comments.js
+++ b/src/language-js/comments.js
@@ -582,7 +582,7 @@ function handleLastFunctionArgComments({
   ) {
     const functionParamRightParenIndex = (() => {
       const parameters = getFunctionParameters(enclosingNode);
-      if (parameters.length !== 0) {
+      if (parameters.length > 0) {
         return getNextNonSpaceNonCommentCharacterIndexWithStartIndex(
           text,
           locEnd(getLast(parameters))
diff --git a/src/language-js/parser-babel.js b/src/language-js/parser-babel.js
index a4023dc1c..9abcc93e9 100644
--- a/src/language-js/parser-babel.js
+++ b/src/language-js/parser-babel.js
@@ -102,9 +102,10 @@ function createParseError(error) {
 
 function createParse(parseMethod, ...pluginCombinations) {
   const commonPlugins = parseOptions.plugins;
-  pluginCombinations = pluginCombinations.length
-    ? pluginCombinations.map((plugins) => [...commonPlugins, ...plugins])
-    : [commonPlugins];
+  pluginCombinations =
+    pluginCombinations.length > 0
+      ? pluginCombinations.map((plugins) => [...commonPlugins, ...plugins])
+      : [commonPlugins];
 
   return (text, parsers, opts = {}) => {
     if (opts.parser === "babel" && isFlowFile(text, opts)) {
diff --git a/src/language-js/print/binaryish.js b/src/language-js/print/binaryish.js
index 132c3a8ae..b895c6f46 100644
--- a/src/language-js/print/binaryish.js
+++ b/src/language-js/print/binaryish.js
@@ -222,7 +222,7 @@ function printBinaryishExpressions(
 
     const operator = node.type === "NGPipeExpression" ? "|" : node.operator;
     const rightSuffix =
-      node.type === "NGPipeExpression" && node.arguments.length !== 0
+      node.type === "NGPipeExpression" && node.arguments.length > 0
         ? group(
             indent(
               concat([
@@ -297,15 +297,12 @@ function shouldInlineLogicalExpression(node) {
 
   if (
     node.right.type === "ObjectExpression" &&
-    node.right.properties.length !== 0
+    node.right.properties.length > 0
   ) {
     return true;
   }
 
-  if (
-    node.right.type === "ArrayExpression" &&
-    node.right.elements.length !== 0
-  ) {
+  if (node.right.type === "ArrayExpression" && node.right.elements.length > 0) {
     return true;
   }
 
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index 1ce4e861f..5d9e38f80 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -181,7 +181,7 @@ function printJsxElementInternal(path, options, print) {
 
   // Trim trailing lines (or empty strings)
   while (
-    children.length &&
+    children.length > 0 &&
     (isLineNext(getLast(children)) || isEmpty(getLast(children)))
   ) {
     children.pop();
@@ -189,7 +189,7 @@ function printJsxElementInternal(path, options, print) {
 
   // Trim leading lines (or empty strings)
   while (
-    children.length &&
+    children.length > 0 &&
     (isLineNext(children[0]) || isEmpty(children[0])) &&
     (isLineNext(children[1]) || isEmpty(children[1]))
   ) {
@@ -549,7 +549,7 @@ function printJsxOpeningElement(path, options, print) {
     (n.typeParameters && hasComment(n.typeParameters));
 
   // Don't break self-closing elements with no attributes and no comments
-  if (n.selfClosing && !n.attributes.length && !nameHasComments) {
+  if (n.selfClosing && n.attributes.length === 0 && !nameHasComments) {
     return concat([
       "<",
       path.call(print, "name"),
@@ -590,13 +590,13 @@ function printJsxOpeningElement(path, options, print) {
   }
 
   const lastAttrHasTrailingComments =
-    n.attributes.length &&
+    n.attributes.length > 0 &&
     hasComment(getLast(n.attributes), CommentCheckFlags.Trailing);
 
   const bracketSameLine =
     // Simple tags (no attributes and no comment in tag name) should be
     // kept unbroken regardless of `jsxBracketSameLine`
-    (!n.attributes.length && !nameHasComments) ||
+    (n.attributes.length === 0 && !nameHasComments) ||
     (options.jsxBracketSameLine &&
       // We should print the bracket in a new line for the following cases:
       // <div
@@ -605,7 +605,7 @@ function printJsxOpeningElement(path, options, print) {
       // <div
       //   attr // comment
       // >
-      (!nameHasComments || n.attributes.length) &&
+      (!nameHasComments || n.attributes.length > 0) &&
       !lastAttrHasTrailingComments);
 
   // We should print the opening element expanded if any prop value is a
diff --git a/src/language-js/print/member-chain.js b/src/language-js/print/member-chain.js
index 56136c87c..eb774e56d 100644
--- a/src/language-js/print/member-chain.js
+++ b/src/language-js/print/member-chain.js
@@ -282,7 +282,7 @@ function printMemberChain(path, options, print) {
   }
 
   function shouldNotWrap(groups) {
-    const hasComputed = groups[1].length && groups[1][0].node.computed;
+    const hasComputed = groups[1].length > 0 && groups[1][0].node.computed;
 
     if (groups[0].length === 1) {
       const firstNode = groups[0][0].node;
diff --git a/src/language-js/print/module.js b/src/language-js/print/module.js
index 567c6cb54..9dfd543cd 100644
--- a/src/language-js/print/module.js
+++ b/src/language-js/print/module.js
@@ -197,8 +197,8 @@ function printModuleSpecifiers(path, options, print) {
 
     parts.push(join(", ", standaloneSpecifiers));
 
-    if (groupedSpecifiers.length !== 0) {
-      if (standaloneSpecifiers.length !== 0) {
+    if (groupedSpecifiers.length > 0) {
+      if (standaloneSpecifiers.length > 0) {
         parts.push(", ");
       }
 
diff --git a/src/language-js/print/template-literal.js b/src/language-js/print/template-literal.js
index bf1902ce4..3308af75e 100644
--- a/src/language-js/print/template-literal.js
+++ b/src/language-js/print/template-literal.js
@@ -122,7 +122,7 @@ function printJestEachTemplateLiteral(path, options, print) {
   const headerNames = node.quasis[0].value.raw.trim().split(/\s*\|\s*/);
   if (
     headerNames.length > 1 ||
-    headerNames.some((headerName) => headerName.length !== 0)
+    headerNames.some((headerName) => headerName.length > 0)
   ) {
     options.__inJestEach = true;
     const expressions = path.map(print, "expressions");
@@ -162,7 +162,7 @@ function printJestEachTemplateLiteral(path, options, print) {
     const maxColumnWidths = Array.from({ length: maxColumnCount }).fill(0);
     const table = [
       { cells: headerNames },
-      ...tableBody.filter((row) => row.cells.length !== 0),
+      ...tableBody.filter((row) => row.cells.length > 0),
     ];
     for (const { cells } of table.filter((row) => !row.hasLineBreak)) {
       cells.forEach((cell, index) => {
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index f94e1ebf9..e6b5d5b2d 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -984,13 +984,14 @@ function printPathNoParens(path, options, print, args) {
           )
         );
       } else {
-        const members = n.members.length
-          ? [
-              hardline,
-              printArrayItems(path, options, "members", print),
-              n.hasUnknownMembers || shouldPrintComma(options) ? "," : "",
-            ]
-          : [];
+        const members =
+          n.members.length > 0
+            ? [
+                hardline,
+                printArrayItems(path, options, "members", print),
+                n.hasUnknownMembers || shouldPrintComma(options) ? "," : "",
+              ]
+            : [];
 
         parts.push(
           group(
diff --git a/src/language-markdown/print-preprocess.js b/src/language-markdown/print-preprocess.js
index afde0c065..fcbac279a 100644
--- a/src/language-markdown/print-preprocess.js
+++ b/src/language-markdown/print-preprocess.js
@@ -164,7 +164,7 @@ function transformIndentedCodeblockAndMarkItsParentList(ast, options) {
 
 function markAlignedList(ast, options) {
   return mapAst(ast, (node, index, parentStack) => {
-    if (node.type === "list" && node.children.length !== 0) {
+    if (node.type === "list" && node.children.length > 0) {
       // if one of its parents is not aligned, it's not possible to be aligned in sub-lists
       for (let i = 0; i < parentStack.length; i++) {
         const parent = parentStack[i];
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index f4f280ab7..31bf7db97 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -688,7 +688,7 @@ function printRoot(path, options, print) {
 
   return printChildren(path, options, print, {
     processor: (childPath, index) => {
-      if (ignoreRanges.length !== 0) {
+      if (ignoreRanges.length > 0) {
         const ignoreRange = ignoreRanges[0];
 
         if (index === ignoreRange.start.index) {
diff --git a/src/language-yaml/print/flow-mapping-sequence.js b/src/language-yaml/print/flow-mapping-sequence.js
index 5d96763bb..779cc0e2b 100644
--- a/src/language-yaml/print/flow-mapping-sequence.js
+++ b/src/language-yaml/print/flow-mapping-sequence.js
@@ -14,7 +14,7 @@ function printFlowMapping(path, print, options) {
 
   /** @type {softline | line} */
   let bracketSpacing = softline;
-  if (isMapping && node.children.length !== 0 && options.bracketSpacing) {
+  if (isMapping && node.children.length > 0 && options.bracketSpacing) {
     bracketSpacing = line;
   }
   const lastItem = getLast(node.children);
diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js
index 0be8a3301..1a867996d 100644
--- a/src/language-yaml/printer-yaml.js
+++ b/src/language-yaml/printer-yaml.js
@@ -207,10 +207,7 @@ function printNode(node, parentNode, path, options, print) {
           options
         ) === "head"
       ) {
-        if (
-          node.head.children.length !== 0 ||
-          node.head.endComments.length !== 0
-        ) {
+        if (node.head.children.length > 0 || node.head.endComments.length > 0) {
           parts.push(path.call(print, "head"));
         }
 
@@ -238,7 +235,7 @@ function printNode(node, parentNode, path, options, print) {
       const { children, endComments } = node;
       /** @type {Doc} */
       let separator = "";
-      if (children.length !== 0 && endComments.length !== 0) {
+      if (children.length > 0 && endComments.length > 0) {
         const lastDescendantNode = getLastDescendantNode(node);
         // there's already a newline printed at the end of blockValue (chomping=keep, lastDescendant=true)
         if (isNode(lastDescendantNode, ["blockFolded", "blockLiteral"])) {
@@ -375,7 +372,7 @@ function printNode(node, parentNode, path, options, print) {
 }
 
 function shouldPrintDocumentBody(document) {
-  return document.body.children.length !== 0 || hasEndComments(document.body);
+  return document.body.children.length > 0 || hasEndComments(document.body);
 }
 
 function shouldPrintDocumentEndMarker(document, nextDocument) {
@@ -390,7 +387,7 @@ function shouldPrintDocumentEndMarker(document, nextDocument) {
        * %DIRECTIVE
        * ---
        */
-      (nextDocument.head.children.length !== 0 ||
+      (nextDocument.head.children.length > 0 ||
         /**
          * ...
          * # endComment
@@ -419,7 +416,7 @@ function shouldPrintDocumentHeadEndMarker(
      * %DIRECTIVE
      * ---
      */
-    document.head.children.length !== 0 ||
+    document.head.children.length > 0 ||
     /**
      * # end comment
      * ---
diff --git a/src/language-yaml/utils.js b/src/language-yaml/utils.js
index a7e66520f..a413cbf6a 100644
--- a/src/language-yaml/utils.js
+++ b/src/language-yaml/utils.js
@@ -218,8 +218,8 @@ function getFlowScalarLineContents(nodeType, content, options) {
     .reduce(
       (reduced, lineContentWords, index) =>
         index !== 0 &&
-        rawLineContents[index - 1].length !== 0 &&
-        lineContentWords.length !== 0 &&
+        rawLineContents[index - 1].length > 0 &&
+        lineContentWords.length > 0 &&
         !(
           // trailing backslash in quoteDouble should be preserved
           (
@@ -277,8 +277,8 @@ function getBlockValueLineContents(
       .reduce(
         (reduced, lineContentWords, index) =>
           index !== 0 &&
-          rawLineContents[index - 1].length !== 0 &&
-          lineContentWords.length !== 0 &&
+          rawLineContents[index - 1].length > 0 &&
+          lineContentWords.length > 0 &&
           !/^\s/.test(lineContentWords[0]) &&
           !/^\s|\s$/.test(getLast(reduced))
             ? reduced.concat([reduced.pop().concat(lineContentWords)])
@@ -289,7 +289,7 @@ function getBlockValueLineContents(
         lineContentWords.reduce(
           (reduced, word) =>
             // disallow trailing spaces
-            reduced.length !== 0 && /\s$/.test(getLast(reduced))
+            reduced.length > 0 && /\s$/.test(getLast(reduced))
               ? reduced.concat(reduced.pop() + " " + word)
               : reduced.concat(word),
           []
diff --git a/src/main/core.js b/src/main/core.js
index 640a2a55e..511df6ce9 100644
--- a/src/main/core.js
+++ b/src/main/core.js
@@ -37,7 +37,7 @@ function attachComments(text, ast, opts) {
 }
 
 function coreFormat(originalText, opts, addAlignmentSize) {
-  if (!originalText || !originalText.trim().length) {
+  if (!originalText || originalText.trim().length === 0) {
     return { formatted: "", cursorOffset: -1 };
   }
 
diff --git a/src/main/options-normalizer.js b/src/main/options-normalizer.js
index 02224dcc7..d8438aac9 100644
--- a/src/main/options-normalizer.js
+++ b/src/main/options-normalizer.js
@@ -26,7 +26,7 @@ class FlagSchema extends vnopts.ChoiceSchema {
   preprocess(value, utils) {
     if (
       typeof value === "string" &&
-      value.length !== 0 &&
+      value.length > 0 &&
       !this._flags.includes(value)
     ) {
       const suggestion = this._flags.find((flag) => leven(flag, value) < 3);
diff --git a/tests_config/run_spec.js b/tests_config/run_spec.js
index 6887e6162..8bb577930 100644
--- a/tests_config/run_spec.js
+++ b/tests_config/run_spec.js
@@ -144,7 +144,7 @@ function runSpec(fixtures, parsers, options) {
 
   // Make sure tests are in correct location
   if (process.env.CHECK_TEST_PARSERS) {
-    if (!Array.isArray(parsers) || !parsers.length) {
+    if (!Array.isArray(parsers) || parsers.length === 0) {
       throw new Error(`No parsers were specified for ${dirname}`);
     }
     checkParsers({ dirname, files }, parsers);
diff --git a/website/pages/en/versions.js b/website/pages/en/versions.js
index 610703022..c7f82c186 100755
--- a/website/pages/en/versions.js
+++ b/website/pages/en/versions.js
@@ -63,7 +63,7 @@ function Versions(props) {
                   (master)
                 </td>
               </tr>
-              {pastDocsVersions.length !== 0 &&
+              {pastDocsVersions.length > 0 &&
                 pastDocsVersions.map((pastDocsVersion, index) => {
                   const pastMajorVersion = pastDocsVersion.replace(/^v/, "");
                   return (
diff --git a/website/playground/panels.js b/website/playground/panels.js
index 6092d6569..ea7bd8f2a 100644
--- a/website/playground/panels.js
+++ b/website/playground/panels.js
@@ -128,7 +128,7 @@ function getIndexPosition(text, indexes) {
   let lineStart = 0;
   const result = [];
 
-  while (indexes.length) {
+  while (indexes.length > 0) {
     const index = indexes.shift();
 
     while (count < index && count < text.length) {

From 3efa3d3c58fbf563809d7cf205c1830d22364cf4 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 4 Jan 2021 10:18:14 +0800
Subject: [PATCH 278/299] Simplify `printBody` (#9926)

---
 src/language-js/print/statement.js | 204 +++++++++++++++++------------
 src/language-js/utils.js           |  72 ----------
 2 files changed, 120 insertions(+), 156 deletions(-)

diff --git a/src/language-js/print/statement.js b/src/language-js/print/statement.js
index 2aab86927..edd017666 100644
--- a/src/language-js/print/statement.js
+++ b/src/language-js/print/statement.js
@@ -1,12 +1,11 @@
 "use strict";
 
+const { getLast } = require("../../common/util");
 const {
-  builders: { concat, join, hardline },
+  builders: { concat, hardline },
 } = require("../../document");
 const pathNeedsParens = require("../needs-parens");
 const {
-  classChildNeedsASIProtection,
-  classPropMayCauseASIProblems,
   getLeftSidePathName,
   hasNakedLeftSide,
   isJsxNode,
@@ -22,85 +21,69 @@ const { shouldPrintParamsWithoutParens } = require("./function");
  * @typedef {import("../../common/fast-path")} FastPath
  */
 
-function printStatement({ path, index, bodyNode, isClass }, options, print) {
+function printStatementSequence(path, options, print, property) {
   const node = path.getValue();
-
-  // Just in case the AST has been modified to contain falsy
-  // "statements," it's safer simply to skip them.
-  /* istanbul ignore if */
-  if (!node) {
-    return;
-  }
-
-  // Skip printing EmptyStatement nodes to avoid leaving stray
-  // semicolons lying around.
-  if (node.type === "EmptyStatement") {
-    return;
-  }
-
-  const printed = print(path);
   const parts = [];
+  const isClassBody = node.type === "ClassBody";
+  const lastStatement = getLast(
+    node[property].filter(({ type }) => type !== "EmptyStatement")
+  );
 
-  // in no-semi mode, prepend statement with semicolon if it might break ASI
-  // don't prepend the only JSX element in a program with semicolon
-  if (
-    !options.semi &&
-    !isClass &&
-    !isTheOnlyJsxElementInMarkdown(options, path) &&
-    statementNeedsASIProtection(path, options)
-  ) {
-    if (hasComment(node, CommentCheckFlags.Leading)) {
-      parts.push(print(path, { needsSemi: true }));
-    } else {
-      parts.push(";", printed);
+  path.each((path, index, statements) => {
+    const node = path.getValue();
+
+    // Skip printing EmptyStatement nodes to avoid leaving stray
+    // semicolons lying around.
+    if (node.type === "EmptyStatement") {
+      return;
     }
-  } else {
-    parts.push(printed);
-  }
 
-  if (!options.semi && isClass) {
-    if (classPropMayCauseASIProblems(path)) {
-      parts.push(";");
-    } else if (
-      node.type === "ClassProperty" ||
-      node.type === "FieldDefinition"
+    const printed = print(path);
+
+    // in no-semi mode, prepend statement with semicolon if it might break ASI
+    // don't prepend the only JSX element in a program with semicolon
+    if (
+      !options.semi &&
+      !isClassBody &&
+      !isTheOnlyJsxElementInMarkdown(options, path) &&
+      statementNeedsASIProtection(path, options)
     ) {
-      const nextChild = bodyNode.body[index + 1];
-      if (classChildNeedsASIProtection(nextChild)) {
+      if (hasComment(node, CommentCheckFlags.Leading)) {
+        parts.push(print(path, { needsSemi: true }));
+      } else {
+        parts.push(";", printed);
+      }
+    } else {
+      parts.push(printed);
+    }
+
+    if (!options.semi && isClassBody) {
+      if (classPropMayCauseASIProblems(node)) {
         parts.push(";");
+      } else if (
+        node.type === "ClassProperty" ||
+        node.type === "FieldDefinition"
+      ) {
+        // `ClassBody` don't allow `EmptyStatement`,
+        // so we can use `statements` to get next node
+        if (classChildNeedsASIProtection(statements[index + 1])) {
+          parts.push(";");
+        }
       }
     }
-  }
 
-  if (isNextLineEmpty(node, options) && !isLastStatement(path)) {
-    parts.push(hardline);
-  }
+    if (node !== lastStatement) {
+      parts.push(hardline);
+
+      if (isNextLineEmpty(node, options)) {
+        parts.push(hardline);
+      }
+    }
+  }, property);
 
   return concat(parts);
 }
 
-function printStatementSequence(path, options, print) {
-  const bodyNode = path.getNode();
-  const isClass = bodyNode.type === "ClassBody";
-
-  const printed = path
-    .map((statementPath, index) =>
-      printStatement(
-        {
-          path,
-          index,
-          bodyNode,
-          isClass,
-        },
-        options,
-        print
-      )
-    )
-    .filter(Boolean);
-
-  return join(hardline, printed);
-}
-
 function statementNeedsASIProtection(path, options) {
   const node = path.getNode();
 
@@ -151,30 +134,83 @@ function expressionNeedsASIProtection(path, options) {
 }
 
 function printBody(path, options, print) {
-  return path.call(
-    (bodyPath) => printStatementSequence(bodyPath, options, print),
-    "body"
-  );
+  return printStatementSequence(path, options, print, "body");
 }
 
 function printSwitchCaseConsequent(path, options, print) {
-  return path.call(
-    (bodyPath) => printStatementSequence(bodyPath, options, print),
-    "consequent"
-  );
+  return printStatementSequence(path, options, print, "consequent");
 }
 
 /**
- * @param {FastPath} path
  * @returns {boolean}
  */
-function isLastStatement(path) {
-  const parent = path.getParentNode();
-  const node = path.getValue();
-  const body = (parent.body || parent.consequent).filter(
-    (stmt) => stmt.type !== "EmptyStatement"
-  );
-  return body[body.length - 1] === node;
+function classPropMayCauseASIProblems(node) {
+  if (node.type !== "ClassProperty" && node.type !== "FieldDefinition") {
+    return false;
+  }
+
+  const name = node.key && node.key.name;
+
+  // this isn't actually possible yet with most parsers available today
+  // so isn't properly tested yet.
+  if (
+    (name === "static" || name === "get" || name === "set") &&
+    !node.value &&
+    !node.typeAnnotation
+  ) {
+    return true;
+  }
+
+  return false;
+}
+
+/**
+ * @returns {boolean}
+ */
+function classChildNeedsASIProtection(node) {
+  if (!node) {
+    return;
+  }
+
+  if (
+    node.static ||
+    node.accessibility // TypeScript
+  ) {
+    return false;
+  }
+
+  if (!node.computed) {
+    const name = node.key && node.key.name;
+    if (name === "in" || name === "instanceof") {
+      return true;
+    }
+  }
+  switch (node.type) {
+    case "ClassProperty":
+    case "FieldDefinition":
+    case "TSAbstractClassProperty":
+      return node.computed;
+    case "MethodDefinition": // Flow
+    case "TSAbstractMethodDefinition": // TypeScript
+    case "ClassMethod":
+    case "ClassPrivateMethod": {
+      // Babel
+      const isAsync = node.value ? node.value.async : node.async;
+      const isGenerator = node.value ? node.value.generator : node.generator;
+      if (isAsync || node.kind === "get" || node.kind === "set") {
+        return false;
+      }
+      if (node.computed || isGenerator) {
+        return true;
+      }
+      return false;
+    }
+    case "TSIndexSignature":
+      return true;
+  }
+
+  /* istanbul ignore next */
+  return false;
 }
 
 module.exports = {
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index 13f1c617d..36e7abf2c 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -627,76 +627,6 @@ function isSimpleTemplateLiteral(node) {
   });
 }
 
-/**
- * @param {FastPath} path
- * @returns {boolean}
- */
-function classPropMayCauseASIProblems(path) {
-  const node = path.getNode();
-
-  if (node.type !== "ClassProperty" && node.type !== "FieldDefinition") {
-    return false;
-  }
-
-  const name = node.key && node.key.name;
-
-  // this isn't actually possible yet with most parsers available today
-  // so isn't properly tested yet.
-  if (
-    (name === "static" || name === "get" || name === "set") &&
-    !node.value &&
-    !node.typeAnnotation
-  ) {
-    return true;
-  }
-}
-
-function classChildNeedsASIProtection(node) {
-  if (!node) {
-    return;
-  }
-
-  if (
-    node.static ||
-    node.accessibility // TypeScript
-  ) {
-    return false;
-  }
-
-  if (!node.computed) {
-    const name = node.key && node.key.name;
-    if (name === "in" || name === "instanceof") {
-      return true;
-    }
-  }
-  switch (node.type) {
-    case "ClassProperty":
-    case "FieldDefinition":
-    case "TSAbstractClassProperty":
-      return node.computed;
-    case "MethodDefinition": // Flow
-    case "TSAbstractMethodDefinition": // TypeScript
-    case "ClassMethod":
-    case "ClassPrivateMethod": {
-      // Babel
-      const isAsync = node.value ? node.value.async : node.async;
-      const isGenerator = node.value ? node.value.generator : node.generator;
-      if (isAsync || node.kind === "get" || node.kind === "set") {
-        return false;
-      }
-      if (node.computed || isGenerator) {
-        return true;
-      }
-      return false;
-    }
-    case "TSIndexSignature":
-      return true;
-    default:
-      /* istanbul ignore next */
-      return false;
-  }
-}
-
 /**
  * @param {string} tokenNode
  * @param {string} keyword
@@ -1408,8 +1338,6 @@ const isNextLineEmpty = (node, { originalText }) =>
   isNextLineEmptyAfterIndex(originalText, locEnd(node));
 
 module.exports = {
-  classChildNeedsASIProtection,
-  classPropMayCauseASIProblems,
   getFunctionParameters,
   iterateFunctionParametersPath,
   getCallArguments,

From 6c37b1979afe694e2529ce32c2d27508f67e5c3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Jan 2021 14:00:01 +0800
Subject: [PATCH 279/299] Build(deps): Bump codemirror-graphql from 0.13.1 to
 0.14.0 in /website (#9997)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 56 ++++++++++++++++++++++----------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/website/package.json b/website/package.json
index af85e402f..ca370237d 100644
--- a/website/package.json
+++ b/website/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "clipboard": "2.0.6",
-    "codemirror-graphql": "0.13.1",
+    "codemirror-graphql": "0.14.0",
     "lz-string": "1.4.4",
     "prop-types": "15.7.2",
     "react": "17.0.1",
diff --git a/website/yarn.lock b/website/yarn.lock
index 11ba3962d..6e4319a0d 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -2027,13 +2027,13 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-codemirror-graphql@0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.13.1.tgz#09eb5cb5abdf2376d1e8b792b1848bdf4faf87a4"
-  integrity sha512-/KB4BM0O04rPlOERq7mCy6y+L6OVoOCfvDWiySTJ8huOGw942ETI6vqEL1SpHKv4ozq5ql7UsCcb7nLwv49zcg==
+codemirror-graphql@0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.14.0.tgz#623d399883310f44a345b0a945110494a8e96ced"
+  integrity sha512-SqBkl9Sey92gEoOcMETqUYtFIpWzLnutcSp1GpLAzTIpgnTOq5p2HksNjndCVZ94hPDUJBteQOacVSoFYtEeqA==
   dependencies:
-    graphql-language-service-interface "^2.6.0"
-    graphql-language-service-parser "^1.7.0"
+    graphql-language-service-interface "^2.7.0"
+    graphql-language-service-parser "^1.8.0"
 
 coffee-script@^1.12.4:
   version "1.12.7"
@@ -3619,34 +3619,34 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graphql-language-service-interface@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.6.0.tgz#6149255ad81e884d675c934ed404cf6d16af30d7"
-  integrity sha512-tATUud6B9L6JyqxtA/Gs8E0el0UWNb6hczMnnO1OxuzK92gxl+O/rn++GAegYJzAZH+uO7UaGURyAGaZd5+TtA==
+graphql-language-service-interface@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.7.0.tgz#238cd7f9634ec18b7e79f0d77ae227d73e3e168e"
+  integrity sha512-MpgKf2qnSP0Eg/sSabDAsqpT94q/XXl31p4A1jAWe0olY9UY9Y2oRznMDlBRq5I9h8elXmOr2blEMkMQRoZE2Q==
   dependencies:
-    graphql-language-service-parser "^1.7.0"
-    graphql-language-service-types "^1.6.3"
-    graphql-language-service-utils "^2.4.3"
+    graphql-language-service-parser "^1.8.0"
+    graphql-language-service-types "^1.7.0"
+    graphql-language-service-utils "^2.4.4"
     vscode-languageserver-types "^3.15.1"
 
-graphql-language-service-parser@^1.7.0:
+graphql-language-service-parser@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-1.8.0.tgz#e0390e4ef54203cc731fb69e3b23e2e8959ab965"
+  integrity sha512-nRVbp+DMAXD1FjUxNOvtU0ULT7yFYNHhcv/vhxNGPlidBNw4jDRJutXwa6zD5LUljTInj7G0Ph/GNIO7Euriow==
+  dependencies:
+    graphql-language-service-types "^1.7.0"
+
+graphql-language-service-types@^1.7.0:
   version "1.7.0"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-1.7.0.tgz#695ee6b91791e1b2c92804ef281c290f85f39ed0"
-  integrity sha512-m2tV5qBCBBnJNVWPcGX7+XO2dQ1sE8jg9N9vABabNHIW02TMgPlEjWIa98h5QpXp0txcPgobHB1iTIQRE0qBbQ==
-  dependencies:
-    graphql-language-service-types "^1.6.3"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-types/-/graphql-language-service-types-1.7.0.tgz#1a0dfe72d9985a586daff9fe21927f5c78061450"
+  integrity sha512-ljT9vns6X7cRDNVH71Ze8voOaw3fgeewLmAp0WI026Xoat6fjdKj5vymPW0G5BL9P12Kb3kDyGJbNkjGzRt3ZQ==
 
-graphql-language-service-types@^1.6.3:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-types/-/graphql-language-service-types-1.6.3.tgz#1a6ba25140ec9ffc6d7f36eca7a4069e91500f3d"
-  integrity sha512-VDtBhdan1iSe7ad7+eBbsO5rrzWQpC6aV4SxSHEi8AtEQOFXpnL9Lq5jSaN8O02pGvAUr4wNUPu0oRU5g2XmVA==
-
-graphql-language-service-utils@^2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-utils/-/graphql-language-service-utils-2.4.3.tgz#e4f4d1a7e950dcc5ada2456096c88ad5b2bab9f2"
-  integrity sha512-XSCMKsV4GuVSGdW8RJTpO/IJDMXgESDJLu67SAuXFXwfel84j1gWrsmBAUeu6Di6NUEoM9NOCEtJv3LbU+/8qw==
+graphql-language-service-utils@^2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-utils/-/graphql-language-service-utils-2.4.4.tgz#be17cc2f7ca05fbe3ffc29d6b74b3a90d7f1e3d9"
+  integrity sha512-t/tilTFGYyFDLTesIUVTsVhZ3cL/jaS+awd2MGLIEX9wzSAXdsW0nCmH2/zY0COrpV1FoMZiKilEkfN8HwBhdA==
   dependencies:
-    graphql-language-service-types "^1.6.3"
+    graphql-language-service-types "^1.7.0"
 
 gray-matter@^2.1.0:
   version "2.1.1"

From 7ec7a0f21f830205ae6cea6d3a4e06027bd03cc5 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 4 Jan 2021 14:40:02 +0800
Subject: [PATCH 280/299] Fix using `concat()` on single `Doc` (#9994)

Co-authored-by: Sosuke Suzuki <aosukeke@gmail.com>
---
 .eslintrc.yml                                 |  1 +
 .../index.js                                  |  1 +
 .../no-single-doc-concat.js                   | 44 +++++++++++++++++++
 .../test.js                                   | 11 +++++
 src/language-css/printer-postcss.js           |  4 +-
 src/language-graphql/printer-graphql.js       |  2 +-
 src/language-handlebars/printer-glimmer.js    | 11 +++--
 src/language-js/print/call-arguments.js       |  2 +-
 src/language-js/print/jsx.js                  |  2 +-
 src/language-js/printer-estree.js             |  4 +-
 src/language-yaml/print/mapping-item.js       |  2 +-
 11 files changed, 71 insertions(+), 13 deletions(-)
 create mode 100644 scripts/tools/eslint-plugin-prettier-internal-rules/no-single-doc-concat.js

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 4573377ef..f5ad72553 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -111,6 +111,7 @@ overrides:
   - files: src/**/*.js
     rules:
       prettier-internal-rules/no-doc-builder-concat: off
+      prettier-internal-rules/no-single-doc-concat: error
       prettier-internal-rules/prefer-fast-path-each: error
       prettier-internal-rules/prefer-is-non-empty-array: error
   - files: src/document/*.js
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
index 3bec6a3e2..02ad369e9 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
@@ -7,6 +7,7 @@ module.exports = {
     "jsx-identifier-case": require("./jsx-identifier-case"),
     "no-doc-builder-concat": require("./no-doc-builder-concat"),
     "no-node-comments": require("./no-node-comments"),
+    "no-single-doc-concat": require("./no-single-doc-concat"),
     "prefer-fast-path-each": require("./prefer-fast-path-each"),
     "prefer-is-non-empty-array": require("./prefer-is-non-empty-array"),
     "require-json-extensions": require("./require-json-extensions"),
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/no-single-doc-concat.js b/scripts/tools/eslint-plugin-prettier-internal-rules/no-single-doc-concat.js
new file mode 100644
index 000000000..25b4b4930
--- /dev/null
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/no-single-doc-concat.js
@@ -0,0 +1,44 @@
+"use strict";
+
+// TODO: Remove this rule when deprecated `concat` is not using in codebase, #9993.
+
+const selector = [
+  "CallExpression",
+  '[callee.type="Identifier"]',
+  '[callee.name="concat"]',
+  "[arguments.length=1]",
+  '[arguments.0.type="ArrayExpression"]',
+  "[arguments.0.elements.length=1]",
+].join("");
+
+const messageId = "no-single-doc-concat";
+
+module.exports = {
+  meta: {
+    type: "suggestion",
+    docs: {
+      url:
+        "https://github.com/prettier/prettier/blob/master/scripts/eslint-plugin-prettier-internal-rules/no-single-doc-concat.js",
+    },
+    messages: {
+      [messageId]: "Do not use `concat()` to concat single `Doc`.",
+    },
+    fixable: "code",
+  },
+  create(context) {
+    const sourceCode = context.getSourceCode();
+    return {
+      [selector](node) {
+        context.report({
+          node,
+          messageId,
+          fix: (fixer) =>
+            fixer.replaceText(
+              node,
+              sourceCode.getText(node.arguments[0].elements[0])
+            ),
+        });
+      },
+    };
+  },
+};
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
index e02c8008e..81cb65e21 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
@@ -144,6 +144,17 @@ test("no-node-comments", {
   ],
 });
 
+test("no-single-doc-concat", {
+  valid: [],
+  invalid: [
+    {
+      code: 'concat([path.call(print, "params")])',
+      output: 'path.call(print, "params")',
+      errors: 1,
+    },
+  ],
+});
+
 test("prefer-fast-path-each", {
   valid: ["const foo = path.map()"],
   invalid: [
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index 771dd54da..97b27b791 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -213,7 +213,7 @@ function genericPrint(path, options, print) {
         if (node.function) {
           return concat([
             node.name,
-            concat([path.call(print, "params")]),
+            path.call(print, "params"),
             isTemplatePlaceholderNodeWithoutSemiColon ? "" : ";",
           ]);
         }
@@ -223,7 +223,7 @@ function genericPrint(path, options, print) {
             "@",
             node.name,
             ": ",
-            node.value ? concat([path.call(print, "value")]) : "",
+            node.value ? path.call(print, "value") : "",
             node.raws.between.trim() ? node.raws.between.trim() + " " : "",
             node.nodes
               ? concat([
diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js
index 161493c63..fe475df15 100644
--- a/src/language-graphql/printer-graphql.js
+++ b/src/language-graphql/printer-graphql.js
@@ -21,7 +21,7 @@ function genericPrint(path, options, print) {
     case "Document": {
       const parts = [];
       path.each((pathChild, index, definitions) => {
-        parts.push(concat([pathChild.call(print)]));
+        parts.push(pathChild.call(print));
         if (index !== definitions.length - 1) {
           parts.push(hardline);
           if (
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 8047d3041..a465561e4 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -138,11 +138,14 @@ function print(path, options, print) {
       // same, there is no value for this AttrNode and it should be printed
       // without the `=""`. Example: `<img data-test>` -> `<img data-test>`
       if (isEmptyText && locStart(n.value) === locEnd(n.value)) {
-        return concat([n.name]);
+        return n.name;
       }
       const value = path.call(print, "value");
       const quotedValue = isText
-        ? printStringLiteral(getDocParts(value).join(), options)
+        ? printStringLiteral(
+            typeof value === "string" ? value : getDocParts(value).join(),
+            options
+          )
         : value;
       return concat([n.name, "=", quotedValue]);
     }
@@ -157,7 +160,7 @@ function print(path, options, print) {
     }
 
     case "Hash": {
-      return concat([join(line, path.map(print, "pairs"))]);
+      return join(line, path.map(print, "pairs"));
     }
     case "HashPair": {
       return concat([n.key, "=", path.call(print, "value")]);
@@ -201,7 +204,7 @@ function print(path, options, print) {
         // TODO: format style and srcset attributes
         // and cleanup concat that is not necessary
         if (!isInAttributeOfName(path, "class")) {
-          return concat([n.chars]);
+          return n.chars;
         }
 
         let leadingSpace = "";
diff --git a/src/language-js/print/call-arguments.js b/src/language-js/print/call-arguments.js
index f30610c72..c7b43e52d 100644
--- a/src/language-js/print/call-arguments.js
+++ b/src/language-js/print/call-arguments.js
@@ -82,7 +82,7 @@ function printCallArguments(path, options, print) {
 
     let shouldBreak = false;
     iterateFunctionParametersPath(argPath, (parameterPath) => {
-      shouldBreak = shouldBreak || willBreak(concat([print(parameterPath)]));
+      shouldBreak = shouldBreak || willBreak(print(parameterPath));
     });
 
     return shouldBreak;
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index 5d9e38f80..3fb1db705 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -118,7 +118,7 @@ function printJsxElementInternal(path, options, print) {
 
   const rawJsxWhitespace = options.singleQuote ? "{' '}" : '{" "}';
   const jsxWhitespace = isMdxBlock
-    ? concat([" "])
+    ? " "
     : ifBreak(concat([rawJsxWhitespace, softline]), " ");
 
   const isFacebookTranslationTag =
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index e6b5d5b2d..619d8289b 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -488,9 +488,7 @@ function printPathNoParens(path, options, print, args) {
         }, "expressions");
         return group(concat(parts));
       }
-      return group(
-        concat([join(concat([",", line]), path.map(print, "expressions"))])
-      );
+      return group(join(concat([",", line]), path.map(print, "expressions")));
     }
     case "ThisExpression":
       return "this";
diff --git a/src/language-yaml/print/mapping-item.js b/src/language-yaml/print/mapping-item.js
index 90aa6c6b1..8d7c686c6 100644
--- a/src/language-yaml/print/mapping-item.js
+++ b/src/language-yaml/print/mapping-item.js
@@ -23,7 +23,7 @@ function printMappingItem(node, parentNode, path, print, options) {
   const isEmptyMappingValue = isEmptyNode(value);
 
   if (isEmptyMappingKey && isEmptyMappingValue) {
-    return concat([": "]);
+    return ": ";
   }
 
   const printedKey = path.call(print, "key");

From f0ca057fa43494a8bd8b83e05692b5a7a2934df4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Jan 2021 19:48:40 +0800
Subject: [PATCH 281/299] Build(deps-dev): Bump eslint from 7.16.0 to 7.17.0
 (#9995)

Bumps [eslint](https://github.com/eslint/eslint) from 7.16.0 to 7.17.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.16.0...v7.17.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3ce5be3f1..877dfe34d 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "builtin-modules": "3.2.0",
     "cross-env": "7.0.3",
     "cspell": "4.2.5",
-    "eslint": "7.16.0",
+    "eslint": "7.17.0",
     "eslint-config-prettier": "7.1.0",
     "eslint-formatter-friendly": "7.0.0",
     "eslint-plugin-import": "2.22.1",
diff --git a/yarn.lock b/yarn.lock
index 0c74480d2..8dbe55ef2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3166,10 +3166,10 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@7.16.0:
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.16.0.tgz#a761605bf9a7b32d24bb7cde59aeb0fd76f06092"
-  integrity sha512-iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw==
+eslint@7.17.0:
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0"
+  integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@eslint/eslintrc" "^0.2.2"

From 1ed8af496afd1c4dfa15a3d0444c26a2383fb6ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Jan 2021 19:59:54 +0800
Subject: [PATCH 282/299] Build(deps-dev): Bump webpack-cli from 4.3.0 to 4.3.1
 in /website (#9989)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 79 +++++++++++++++++++++++---------------------
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/website/package.json b/website/package.json
index ca370237d..62b9bb846 100644
--- a/website/package.json
+++ b/website/package.json
@@ -24,6 +24,6 @@
     "js-yaml": "3.14.1",
     "svgo": "1.3.2",
     "webpack": "5.11.1",
-    "webpack-cli": "4.3.0"
+    "webpack-cli": "4.3.1"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 6e4319a0d..1bc7d8f81 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -1246,17 +1246,17 @@
     "@webassemblyjs/wast-parser" "1.9.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/info@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.0.tgz#6051d6adf3618df664f4945a2b76355c00f83f0d"
-  integrity sha512-+wA8lBKopgKmN76BSGJVJby5ZXDlsrO6p/nm7fUBsHznRNWB/ozotJP7Yfcz8JPfqeG2LxwYlTH2u6D9a/0XAw==
+"@webpack-cli/info@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.1.tgz#af98311f983d0b9fce7284cfcf1acaf1e9f4879c"
+  integrity sha512-fLnDML5HZ5AEKzHul8xLAksoKN2cibu6MgonkUj8R9V7bbeVRkd1XbGEGWrAUNYHbX1jcqCsDEpBviE5StPMzQ==
   dependencies:
     envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.2.0.tgz#8cb2c1e95426f5caed1f3bf9d7ccf3ea41d85f52"
-  integrity sha512-jI3P7jMp/AXDSPkM+ClwRcJZbxnlvNC8bVZBmyRr4scMMZ4p5WQcXkw3Q+Hc7RQekomJlBMN+UQGliT4hhG8Vw==
+"@webpack-cli/serve@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.2.1.tgz#7513d7a769e3f97958de799b5b49874425ae3396"
+  integrity sha512-Zj1z6AyS+vqV6Hfi7ngCjFGdHV5EwZNIHo6QfFTNe9PyW+zBU1zJ9BiOW1pmUEq950RC4+Dym6flyA/61/vhyw==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -2254,7 +2254,7 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0:
+cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -2955,19 +2955,19 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
-  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+execa@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376"
+  integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==
   dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
     is-stream "^2.0.0"
     merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
 executable@^4.1.0:
@@ -3459,12 +3459,10 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
+get-stream@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718"
+  integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
@@ -3838,10 +3836,10 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-human-signals@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
-  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
@@ -5075,7 +5073,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-run-path@^4.0.0:
+npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
@@ -5193,7 +5191,7 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-onetime@^5.1.0:
+onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
@@ -6556,6 +6554,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
+signal-exit@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -7373,18 +7376,18 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-cli@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.3.0.tgz#e39303bf9f8002de122903e97029f3443d0f9174"
-  integrity sha512-gve+BBKrzMPTOYDjupzV8JchUznhVWMKtWM1hFIQWi6XoeLvGNoQwkrtMWVb+aJ437GgCKdta7sIn10v621pKA==
+webpack-cli@4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.3.1.tgz#87a7873bc9c6a4708aa657759274b691e72a04a8"
+  integrity sha512-/F4+9QNZM/qKzzL9/06Am8NXIkGV+/NqQ62Dx7DSqudxxpAgBqYn6V7+zp+0Y7JuWksKUbczRY3wMTd+7Uj6OA==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/info" "^1.2.0"
-    "@webpack-cli/serve" "^1.2.0"
+    "@webpack-cli/info" "^1.2.1"
+    "@webpack-cli/serve" "^1.2.1"
     colorette "^1.2.1"
     commander "^6.2.0"
     enquirer "^2.3.6"
-    execa "^4.1.0"
+    execa "^5.0.0"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
     interpret "^2.2.0"

From 65d719c4f46b0e97d0d319725eb36b9bcf2b3833 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jan 2021 14:11:33 +0800
Subject: [PATCH 283/299] Build(deps): Bump
 @typescript-eslint/typescript-estree from 4.11.1 to 4.12.0 (#10003)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 27 ++++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 877dfe34d..1cf4afdcf 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@babel/parser": "7.12.11",
     "@glimmer/syntax": "0.73.1",
     "@iarna/toml": "2.2.5",
-    "@typescript-eslint/typescript-estree": "4.11.1",
+    "@typescript-eslint/typescript-estree": "4.12.0",
     "angular-estree-parser": "2.3.0",
     "angular-html-parser": "1.7.1",
     "camelcase": "6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 8dbe55ef2..23ebe636a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1628,6 +1628,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.1.tgz#3ba30c965963ef9f8ced5a29938dd0c465bd3e05"
   integrity sha512-5kvd38wZpqGY4yP/6W3qhYX6Hz0NwUbijVsX2rxczpY6OXaMxh0+5E5uLJKVFwaBM7PJe1wnMym85NfKYIh6CA==
 
+"@typescript-eslint/types@4.12.0":
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.12.0.tgz#fb891fe7ccc9ea8b2bbd2780e36da45d0dc055e5"
+  integrity sha512-N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g==
+
 "@typescript-eslint/typescript-estree@4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.1.tgz#29a43c7060641ec51c902d9f50ac7c5866ec479f"
@@ -1642,13 +1647,13 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@4.11.1":
-  version "4.11.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.11.1.tgz#a4416b4a65872a48773b9e47afabdf7519eb10bc"
-  integrity sha512-tC7MKZIMRTYxQhrVAFoJq/DlRwv1bnqA4/S2r3+HuHibqvbrPcyf858lNzU7bFmy4mLeIHFYr34ar/1KumwyRw==
+"@typescript-eslint/typescript-estree@4.12.0":
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz#3963418c850f564bdab3882ae23795d115d6d32e"
+  integrity sha512-gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w==
   dependencies:
-    "@typescript-eslint/types" "4.11.1"
-    "@typescript-eslint/visitor-keys" "4.11.1"
+    "@typescript-eslint/types" "4.12.0"
+    "@typescript-eslint/visitor-keys" "4.12.0"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
@@ -1664,12 +1669,12 @@
     "@typescript-eslint/types" "4.0.1"
     eslint-visitor-keys "^2.0.0"
 
-"@typescript-eslint/visitor-keys@4.11.1":
-  version "4.11.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.11.1.tgz#4c050a4c1f7239786e2dd4e69691436143024e05"
-  integrity sha512-IrlBhD9bm4bdYcS8xpWarazkKXlE7iYb1HzRuyBP114mIaj5DJPo11Us1HgH60dTt41TCZXMaTCAW+OILIYPOg==
+"@typescript-eslint/visitor-keys@4.12.0":
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz#a470a79be6958075fa91c725371a83baf428a67a"
+  integrity sha512-hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw==
   dependencies:
-    "@typescript-eslint/types" "4.11.1"
+    "@typescript-eslint/types" "4.12.0"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.9.1":

From 74d144989659f0a03922f91c28d1f109cf12a14a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jan 2021 14:12:35 +0800
Subject: [PATCH 284/299] Build(deps): Bump codecov/codecov-action from v1.1.1
 to v1.2.0 (#10004)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from v1.1.1 to v1.2.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v1.1.1...a92c414703a4bba586f6df7fcc885c9d0bdff772)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/dev-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml
index 3d23f7cce..bdb05d99e 100644
--- a/.github/workflows/dev-test.yml
+++ b/.github/workflows/dev-test.yml
@@ -62,7 +62,7 @@ jobs:
         run: yarn test --maxWorkers=2
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@v1.1.1
+        uses: codecov/codecov-action@v1.2.0
         if: matrix.ENABLE_CODE_COVERAGE
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -76,7 +76,7 @@ jobs:
           PRETTIER_FALLBACK_RESOLVE: true
 
       - name: Upload Coverage (PRETTIER_FALLBACK_RESOLVE)
-        uses: codecov/codecov-action@v1.1.1
+        uses: codecov/codecov-action@v1.2.0
         if: matrix.ENABLE_CODE_COVERAGE
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

From cb2a0d37fd2f26f3515bb7df8761f6c01b5320e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jan 2021 07:57:58 +0000
Subject: [PATCH 285/299] Build(deps-dev): Bump @typescript-eslint/types from
 4.11.1 to 4.12.0 (#10002)

---
 package.json | 2 +-
 yarn.lock    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 1cf4afdcf..006d240a3 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@rollup/plugin-replace": "2.3.4",
     "@types/estree": "0.0.45",
     "@types/node": "14.14.0",
-    "@typescript-eslint/types": "4.11.1",
+    "@typescript-eslint/types": "4.12.0",
     "babel-jest": "26.6.3",
     "babel-loader": "8.2.2",
     "benchmark": "2.1.4",
diff --git a/yarn.lock b/yarn.lock
index 23ebe636a..ec7296e5c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1623,11 +1623,6 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2"
   integrity sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg==
 
-"@typescript-eslint/types@4.11.1":
-  version "4.11.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.1.tgz#3ba30c965963ef9f8ced5a29938dd0c465bd3e05"
-  integrity sha512-5kvd38wZpqGY4yP/6W3qhYX6Hz0NwUbijVsX2rxczpY6OXaMxh0+5E5uLJKVFwaBM7PJe1wnMym85NfKYIh6CA==
-
 "@typescript-eslint/types@4.12.0":
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.12.0.tgz#fb891fe7ccc9ea8b2bbd2780e36da45d0dc055e5"

From 3970d8960b43dbf9ed68fc6933928a4ad772a5f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Jan 2021 18:50:35 +0800
Subject: [PATCH 286/299] Build(deps-dev): Bump rollup from 2.35.1 to 2.36.0
 (#10010)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 006d240a3..f4f064007 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "prettier": "2.2.1",
     "pretty-bytes": "5.5.0",
     "rimraf": "3.0.2",
-    "rollup": "2.35.1",
+    "rollup": "2.36.0",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-terser": "7.0.2",
     "shelljs": "0.8.4",
diff --git a/yarn.lock b/yarn.lock
index ec7296e5c..a2ecd3295 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6323,10 +6323,10 @@ rollup-pluginutils@^2.3.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@2.35.1:
-  version "2.35.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.35.1.tgz#e6bc8d10893556a638066f89e8c97f422d03968c"
-  integrity sha512-q5KxEyWpprAIcainhVy6HfRttD9kutQpHbeqDTWnqAFNJotiojetK6uqmcydNMymBEtC4I8bCYR+J3mTMqeaUA==
+rollup@2.36.0:
+  version "2.36.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.36.0.tgz#af2cdea36f70fa3de586840c2604882dfb4d0aac"
+  integrity sha512-L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg==
   optionalDependencies:
     fsevents "~2.1.2"
 

From 98f603052fd3deebfc1d4f85b6f5f9d447fa5313 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Jan 2021 18:51:28 +0800
Subject: [PATCH 287/299] Build(deps): Bump codecov/codecov-action from v1.2.0
 to v1.2.1 (#10011)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from v1.2.0 to v1.2.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v1.2.0...e156083f13aff6830c92fc5faa23505779fbf649)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/dev-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml
index bdb05d99e..033660dfb 100644
--- a/.github/workflows/dev-test.yml
+++ b/.github/workflows/dev-test.yml
@@ -62,7 +62,7 @@ jobs:
         run: yarn test --maxWorkers=2
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@v1.2.0
+        uses: codecov/codecov-action@v1.2.1
         if: matrix.ENABLE_CODE_COVERAGE
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -76,7 +76,7 @@ jobs:
           PRETTIER_FALLBACK_RESOLVE: true
 
       - name: Upload Coverage (PRETTIER_FALLBACK_RESOLVE)
-        uses: codecov/codecov-action@v1.2.0
+        uses: codecov/codecov-action@v1.2.1
         if: matrix.ENABLE_CODE_COVERAGE
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

From 29c9522354ca3c4e651b8b7a5b76b354ee1fbd5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Jan 2021 12:25:36 +0800
Subject: [PATCH 288/299] Build(deps): Bump @angular/compiler from 11.0.5 to
 11.0.6 (#10017)

Bumps [@angular/compiler](https://github.com/angular/angular/tree/HEAD/packages/compiler) from 11.0.5 to 11.0.6.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/11.0.6/packages/compiler)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f4f064007..dfe4ef5d4 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "bin"
   ],
   "dependencies": {
-    "@angular/compiler": "11.0.5",
+    "@angular/compiler": "11.0.6",
     "@babel/code-frame": "7.12.11",
     "@babel/parser": "7.12.11",
     "@glimmer/syntax": "0.73.1",
diff --git a/yarn.lock b/yarn.lock
index a2ecd3295..fcf1627d4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/compiler@11.0.5":
-  version "11.0.5"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.5.tgz#7622dbf81356ffc3f58ab034201f71f37c35d2fb"
-  integrity sha512-japxEn07P9z9FnW8ii+M5DIfgRAGNxl6QNQWKBkNo5ytN6iCAB7pVbJI0vn1AUT9TByV3+xDW/FNuoSuzsnX3w==
+"@angular/compiler@11.0.6":
+  version "11.0.6"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.6.tgz#3c5bcc695bf0f5e8e4a73da6a043725e39d955d5"
+  integrity sha512-Scfaowc13HrFr37O05ZwUU6xk25D7DUgzwLTCTCCEM++HMkoWMV44xVzCkx3nBojGN9CgXaOSe0tBkYnDl8WOA==
   dependencies:
     tslib "^2.0.0"
 

From 9e55618aa82d87550a10a04c744c4ffd9edde3a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Jan 2021 12:25:48 +0800
Subject: [PATCH 289/299] Build(deps): Bump flow-parser from 0.141.0 to 0.142.0
 (#10016)

Bumps [flow-parser](https://github.com/facebook/flow) from 0.141.0 to 0.142.0.
- [Release notes](https://github.com/facebook/flow/releases)
- [Changelog](https://github.com/facebook/flow/blob/master/Changelog.md)
- [Commits](https://github.com/facebook/flow/compare/v0.141.0...v0.142.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index dfe4ef5d4..988865ba4 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "fast-glob": "3.2.4",
     "fast-json-stable-stringify": "2.1.0",
     "find-parent-dir": "0.3.0",
-    "flow-parser": "0.141.0",
+    "flow-parser": "0.142.0",
     "get-stdin": "8.0.0",
     "globby": "11.0.1",
     "graphql": "15.4.0",
diff --git a/yarn.lock b/yarn.lock
index fcf1627d4..5e50f98c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3536,10 +3536,10 @@ flatten@^1.0.2:
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
   integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
-flow-parser@0.141.0:
-  version "0.141.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.141.0.tgz#b9e176e54dd204b2375e35df10caf6607c3d09a1"
-  integrity sha512-WKdBiR9sDfkgEyPGhIgldUrVM08D57CgHLgd0FOXbhcVYXNfw+eHSApQ8SdcdQQoqrOvhlcVRB8lsn9bD5GQOw==
+flow-parser@0.142.0:
+  version "0.142.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.142.0.tgz#68792438f2593a9e3d862a5ce2278493991619aa"
+  integrity sha512-gkdbagtuYQw7fo/D1AwCsDpMyxp/bdZkgfq95ev2MoETD1OW84PhU+vitupwte+6AJc2MRJyCdgfWhan8AGhzA==
 
 for-in@^1.0.2:
   version "1.0.2"

From 1b0d7f1b2135d3b5fbf6e4d981899f99698158cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Jan 2021 12:26:02 +0800
Subject: [PATCH 290/299] Build(deps): Bump globby from 11.0.1 to 11.0.2
 (#10015)

Bumps [globby](https://github.com/sindresorhus/globby) from 11.0.1 to 11.0.2.
- [Release notes](https://github.com/sindresorhus/globby/releases)
- [Commits](https://github.com/sindresorhus/globby/compare/v11.0.1...v11.0.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 988865ba4..2f9a81738 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "find-parent-dir": "0.3.0",
     "flow-parser": "0.142.0",
     "get-stdin": "8.0.0",
-    "globby": "11.0.1",
+    "globby": "11.0.2",
     "graphql": "15.4.0",
     "html-element-attributes": "2.3.0",
     "html-styles": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5e50f98c3..644d29b62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3696,10 +3696,10 @@ globals@^12.1.0:
   dependencies:
     type-fest "^0.8.1"
 
-globby@11.0.1, globby@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
-  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
+globby@11.0.2, globby@^11.0.1:
+  version "11.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83"
+  integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"

From 9a42fd651ed769772e4999249b35da9a28580c45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Jan 2021 12:26:12 +0800
Subject: [PATCH 291/299] Build(deps-dev): Bump rollup from 2.36.0 to 2.36.1
 (#10014)

Bumps [rollup](https://github.com/rollup/rollup) from 2.36.0 to 2.36.1.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v2.36.0...v2.36.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2f9a81738..ef652564d 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "prettier": "2.2.1",
     "pretty-bytes": "5.5.0",
     "rimraf": "3.0.2",
-    "rollup": "2.36.0",
+    "rollup": "2.36.1",
     "rollup-plugin-node-globals": "1.4.0",
     "rollup-plugin-terser": "7.0.2",
     "shelljs": "0.8.4",
diff --git a/yarn.lock b/yarn.lock
index 644d29b62..c93d82e7c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6323,10 +6323,10 @@ rollup-pluginutils@^2.3.1:
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@2.36.0:
-  version "2.36.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.36.0.tgz#af2cdea36f70fa3de586840c2604882dfb4d0aac"
-  integrity sha512-L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg==
+rollup@2.36.1:
+  version "2.36.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.36.1.tgz#2174f0c25c7b400d57b05628d0e732c7ae8d2178"
+  integrity sha512-eAfqho8dyzuVvrGqpR0ITgEdq0zG2QJeWYh+HeuTbpcaXk8vNFc48B7bJa1xYosTCKx0CuW+447oQOW8HgBIZQ==
   optionalDependencies:
     fsevents "~2.1.2"
 

From e2c84527e7680ba66fc1fa507f6e9d2831f54388 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Sat, 9 Jan 2021 02:09:40 +0900
Subject: [PATCH 292/299] Use fs.promises in build script (#10025)

---
 scripts/build/build.js | 11 ++++++-----
 scripts/build/cache.js | 12 ++++--------
 scripts/build/util.js  | 16 +++++-----------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/scripts/build/build.js b/scripts/build/build.js
index 5b68c4770..0c4dccc34 100644
--- a/scripts/build/build.js
+++ b/scripts/build/build.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const path = require("path");
-const fs = require("fs");
+const fs = require("fs").promises;
 const readline = require("readline");
 const chalk = require("chalk");
 const execa = require("execa");
@@ -73,7 +73,7 @@ async function createBundle(bundleConfig, cache, options) {
     // `prettier-chrome-extension` https://github.com/prettier/prettier-chrome-extension
     // details https://github.com/prettier/prettier/pull/8534
     if (target === "universal") {
-      const content = fs.readFileSync(file, "utf8");
+      const content = await fs.readFile(file, "utf8");
       if (content.includes("\ufffe")) {
         throw new Error("Bundled umd file should not have U+FFFE character.");
       }
@@ -85,8 +85,9 @@ async function createBundle(bundleConfig, cache, options) {
       readline.cursorTo(process.stdout, 0, null);
 
       const prettyBytes = require("pretty-bytes");
-      const getSizeText = (file) => prettyBytes(fs.statSync(file).size);
-      const sizeTexts = [getSizeText(file)];
+      const getSizeText = async (file) =>
+        prettyBytes((await fs.stat(file)).size);
+      const sizeTexts = [await getSizeText(file)];
       if (
         type !== "core" &&
         format !== "esm" &&
@@ -94,7 +95,7 @@ async function createBundle(bundleConfig, cache, options) {
         target === "universal"
       ) {
         const esmFile = path.join("dist/esm", output.replace(".js", ".mjs"));
-        sizeTexts.push(`esm ${getSizeText(esmFile)}`);
+        sizeTexts.push(`esm ${await getSizeText(esmFile)}`);
       }
       process.stdout.write(
         fitTerminal(output, sizeTexts.join(", ").concat(" "))
diff --git a/scripts/build/cache.js b/scripts/build/cache.js
index ae599f0a1..5d1cdfe3f 100644
--- a/scripts/build/cache.js
+++ b/scripts/build/cache.js
@@ -1,15 +1,11 @@
 "use strict";
 
-const util = require("util");
 const assert = require("assert").strict;
 const crypto = require("crypto");
-const fs = require("fs");
+const fs = require("fs").promises;
 const path = require("path");
 const { rollup } = require("rollup");
 
-const readFile = util.promisify(fs.readFile);
-const writeFile = util.promisify(fs.writeFile);
-
 const ROOT = path.join(__dirname, "..", "..");
 
 class Cache {
@@ -29,12 +25,12 @@ class Cache {
   // Loads the manifest.json file with the information from the last build
   async load() {
     // This should never throw, if it does, let it fail the build
-    const lockfile = await readFile("yarn.lock", "utf-8");
+    const lockfile = await fs.readFile("yarn.lock", "utf-8");
     const lockfileHash = hashString(lockfile);
     this.updated.checksums["yarn.lock"] = lockfileHash;
 
     try {
-      const manifest = await readFile(this.manifest, "utf-8");
+      const manifest = await fs.readFile(this.manifest, "utf-8");
       const { version, checksums, files } = JSON.parse(manifest);
 
       // Ignore the cache if the version changed
@@ -99,7 +95,7 @@ class Cache {
 
   async save() {
     try {
-      await writeFile(this.manifest, JSON.stringify(this.updated, null, 2));
+      await fs.writeFile(this.manifest, JSON.stringify(this.updated, null, 2));
     } catch (err) {
       // Don't fail the build
     }
diff --git a/scripts/build/util.js b/scripts/build/util.js
index 3776858bc..07dfcf76a 100644
--- a/scripts/build/util.js
+++ b/scripts/build/util.js
@@ -1,30 +1,24 @@
 "use strict";
 
-const fs = require("fs");
-const { promisify } = require("util");
-
-const readFile = promisify(fs.readFile);
-const writeFile = promisify(fs.writeFile);
+const fs = require("fs").promises;
 
 async function readJson(file) {
-  const data = await readFile(file);
+  const data = await fs.readFile(file);
   return JSON.parse(data);
 }
 
 function writeJson(file, content) {
   content = JSON.stringify(content, null, 2);
-  return writeFile(file, content);
+  return fs.writeFile(file, content);
 }
 
 async function copyFile(from, to) {
-  const data = await readFile(from);
-  return writeFile(to, data);
+  const data = await fs.readFile(from);
+  return fs.writeFile(to, data);
 }
 
 module.exports = {
   readJson,
   writeJson,
   copyFile,
-  readFile,
-  writeFile,
 };

From 5bd2eec4d273c7e63d29a70be98c1ac53da6d880 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 10 Jan 2021 14:39:35 +0900
Subject: [PATCH 293/299] Build(deps): Bump codemirror-graphql from 0.14.0 to
 0.15.2 in /website (#10020)

Bumps [codemirror-graphql](https://github.com/graphql/graphiql) from 0.14.0 to 0.15.2.
- [Release notes](https://github.com/graphql/graphiql/releases)
- [Changelog](https://github.com/graphql/graphiql/blob/main/CHANGELOG.md)
- [Commits](https://github.com/graphql/graphiql/compare/codemirror-graphql@0.14.0...codemirror-graphql@0.15.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/package.json |  2 +-
 website/yarn.lock    | 62 ++++++++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/website/package.json b/website/package.json
index 62b9bb846..d4266e45a 100644
--- a/website/package.json
+++ b/website/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "clipboard": "2.0.6",
-    "codemirror-graphql": "0.14.0",
+    "codemirror-graphql": "0.15.2",
     "lz-string": "1.4.4",
     "prop-types": "15.7.2",
     "react": "17.0.1",
diff --git a/website/yarn.lock b/website/yarn.lock
index 1bc7d8f81..2bdf087c2 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -2027,13 +2027,13 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-codemirror-graphql@0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.14.0.tgz#623d399883310f44a345b0a945110494a8e96ced"
-  integrity sha512-SqBkl9Sey92gEoOcMETqUYtFIpWzLnutcSp1GpLAzTIpgnTOq5p2HksNjndCVZ94hPDUJBteQOacVSoFYtEeqA==
+codemirror-graphql@0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.15.2.tgz#69e94beee94cba4d5117a2a92ffef92e850aa290"
+  integrity sha512-Hxod/lFyDV3kXXgnqVDzThpxIudBCH70yJ5YospeBAFqdHpd8dgsJLIAlIxeqT3x5hcdWu1Rd1RI3qx84FTvMg==
   dependencies:
-    graphql-language-service-interface "^2.7.0"
-    graphql-language-service-parser "^1.8.0"
+    graphql-language-service-interface "^2.8.2"
+    graphql-language-service-parser "^1.9.0"
 
 coffee-script@^1.12.4:
   version "1.12.7"
@@ -3617,34 +3617,35 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graphql-language-service-interface@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.7.0.tgz#238cd7f9634ec18b7e79f0d77ae227d73e3e168e"
-  integrity sha512-MpgKf2qnSP0Eg/sSabDAsqpT94q/XXl31p4A1jAWe0olY9UY9Y2oRznMDlBRq5I9h8elXmOr2blEMkMQRoZE2Q==
+graphql-language-service-interface@^2.8.2:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.8.2.tgz#b3bb2aef7eaf0dff0b4ea419fa412c5f66fa268b"
+  integrity sha512-otbOQmhgkAJU1QJgQkMztNku6SbJLu/uodoFOYOOtJsizTjrMs93vkYaHCcYnLA3oi1Goj27XcHjMnRCYQOZXQ==
   dependencies:
-    graphql-language-service-parser "^1.8.0"
-    graphql-language-service-types "^1.7.0"
-    graphql-language-service-utils "^2.4.4"
+    graphql-language-service-parser "^1.9.0"
+    graphql-language-service-types "^1.8.0"
+    graphql-language-service-utils "^2.5.1"
     vscode-languageserver-types "^3.15.1"
 
-graphql-language-service-parser@^1.8.0:
+graphql-language-service-parser@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-1.9.0.tgz#79af21294119a0a7e81b6b994a1af36833bab724"
+  integrity sha512-B5xPZLbBmIp0kHvpY1Z35I5DtPoDK9wGxQVRDIzcBaiIvAmlTrDvjo3bu7vKREdjFbYKvWNgrEWENuprMbF17Q==
+  dependencies:
+    graphql-language-service-types "^1.8.0"
+
+graphql-language-service-types@^1.8.0:
   version "1.8.0"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-1.8.0.tgz#e0390e4ef54203cc731fb69e3b23e2e8959ab965"
-  integrity sha512-nRVbp+DMAXD1FjUxNOvtU0ULT7yFYNHhcv/vhxNGPlidBNw4jDRJutXwa6zD5LUljTInj7G0Ph/GNIO7Euriow==
-  dependencies:
-    graphql-language-service-types "^1.7.0"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-types/-/graphql-language-service-types-1.8.0.tgz#b90fd1bc5ec7f394ae45d749305acdc9d9096704"
+  integrity sha512-dEn3vZoQmEIB5jgiIPcKN2a9QYvmOp0kxNirEI0pSVugNvGEgZzgiUQQLyJ4wDoUfp6M1xQDLVaFf8zbATxYzg==
 
-graphql-language-service-types@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-types/-/graphql-language-service-types-1.7.0.tgz#1a0dfe72d9985a586daff9fe21927f5c78061450"
-  integrity sha512-ljT9vns6X7cRDNVH71Ze8voOaw3fgeewLmAp0WI026Xoat6fjdKj5vymPW0G5BL9P12Kb3kDyGJbNkjGzRt3ZQ==
-
-graphql-language-service-utils@^2.4.4:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/graphql-language-service-utils/-/graphql-language-service-utils-2.4.4.tgz#be17cc2f7ca05fbe3ffc29d6b74b3a90d7f1e3d9"
-  integrity sha512-t/tilTFGYyFDLTesIUVTsVhZ3cL/jaS+awd2MGLIEX9wzSAXdsW0nCmH2/zY0COrpV1FoMZiKilEkfN8HwBhdA==
+graphql-language-service-utils@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/graphql-language-service-utils/-/graphql-language-service-utils-2.5.1.tgz#832ad4b0a9da03fdded756932c27e057ccf71302"
+  integrity sha512-Lzz723cYrYlVN4WVzIyFGg3ogoe+QYAIBfdtDboiIILoy0FTmqbyC2TOErqbmWKqO4NK9xDA95cSRFbWiHYj0g==
   dependencies:
-    graphql-language-service-types "^1.7.0"
+    graphql-language-service-types "^1.8.0"
+    nullthrows "^1.0.0"
 
 gray-matter@^2.1.0:
   version "2.1.1"
@@ -5097,6 +5098,11 @@ nth-check@^1.0.2, nth-check@~1.0.1:
   dependencies:
     boolbase "~1.0.0"
 
+nullthrows@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
+  integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
+
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"

From 1e7fa4a6848efa3c4e1c9caa9bdca06e327c2010 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Jan 2021 10:15:37 +0800
Subject: [PATCH 294/299] Build(deps): Bump cjk-regex from 2.0.0 to 2.0.1
 (#10021)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sosukesuzuki <aosukeke@gmail.com>
---
 package.json                                         |  2 +-
 .../paragraph/__snapshots__/jsfmt.spec.js.snap       | 12 ++++++++++++
 tests/markdown/paragraph/cjk.md                      |  2 ++
 yarn.lock                                            |  8 ++++----
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ef652564d..f2f925b45 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "camelcase": "6.2.0",
     "chalk": "4.1.0",
     "ci-info": "watson/ci-info#f43f6a1cefff47fb361c88cf4b943fdbcaafe540",
-    "cjk-regex": "2.0.0",
+    "cjk-regex": "2.0.1",
     "cosmiconfig": "7.0.0",
     "dashify": "2.0.0",
     "diff": "5.0.0",
diff --git a/tests/markdown/paragraph/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/paragraph/__snapshots__/jsfmt.spec.js.snap
index a83ea1754..6bb45612b 100644
--- a/tests/markdown/paragraph/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/markdown/paragraph/__snapshots__/jsfmt.spec.js.snap
@@ -25,6 +25,8 @@ This ia an english paragraph with a CJK quote “中文“.
 
 IVS 麻󠄁羽󠄀‼️
 
+⿰あ⿱あ⿲あ⿳あ⿴あ⿵あ⿶あ⿷あ⿸あ⿹あ⿺あ⿻あ
+
 =====================================output=====================================
 這是一段很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長
 很長的段落
@@ -53,6 +55,8 @@ This ia an english paragraph with a CJK quote “中文“.
 
 IVS 麻󠄁羽󠄀‼️
 
+⿰あ⿱あ⿲あ⿳あ⿴あ⿵あ⿶あ⿷あ⿸あ⿹あ⿺あ⿻あ
+
 ================================================================================
 `;
 
@@ -81,6 +85,8 @@ This ia an english paragraph with a CJK quote “中文“.
 
 IVS 麻󠄁羽󠄀‼️
 
+⿰あ⿱あ⿲あ⿳あ⿴あ⿵あ⿶あ⿷あ⿸あ⿹あ⿺あ⿻あ
+
 =====================================output=====================================
 這是一段很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長的段落
 
@@ -98,6 +104,8 @@ This ia an english paragraph with a CJK quote “中文“.
 
 IVS 麻󠄁羽󠄀‼️
 
+⿰あ⿱あ⿲あ⿳あ⿴あ⿵あ⿶あ⿷あ⿸あ⿹あ⿺あ⿻あ
+
 ================================================================================
 `;
 
@@ -126,6 +134,8 @@ This ia an english paragraph with a CJK quote “中文“.
 
 IVS 麻󠄁羽󠄀‼️
 
+⿰あ⿱あ⿲あ⿳あ⿴あ⿵あ⿶あ⿷あ⿸あ⿹あ⿺あ⿻あ
+
 =====================================output=====================================
 這是一段很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長很長的段落
 
@@ -145,6 +155,8 @@ This ia an english paragraph with a CJK quote “中文“.
 
 IVS 麻󠄁羽󠄀‼️
 
+⿰あ⿱あ⿲あ⿳あ⿴あ⿵あ⿶あ⿷あ⿸あ⿹あ⿺あ⿻あ
+
 ================================================================================
 `;
 
diff --git a/tests/markdown/paragraph/cjk.md b/tests/markdown/paragraph/cjk.md
index ba29c5ccc..5d7dc6d1f 100644
--- a/tests/markdown/paragraph/cjk.md
+++ b/tests/markdown/paragraph/cjk.md
@@ -15,3 +15,5 @@ This ia an english paragraph with a CJK quote “中文“.
 :::
 
 IVS 麻󠄁羽󠄀‼️
+
+⿰あ⿱あ⿲あ⿳あ⿴あ⿵あ⿶あ⿷あ⿸あ⿹あ⿺あ⿻あ
diff --git a/yarn.lock b/yarn.lock
index c93d82e7c..7f56ca773 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2373,10 +2373,10 @@ ci-info@^2.0.0, ci-info@watson/ci-info#f43f6a1cefff47fb361c88cf4b943fdbcaafe540:
   version "2.0.0"
   resolved "https://codeload.github.com/watson/ci-info/tar.gz/f43f6a1cefff47fb361c88cf4b943fdbcaafe540"
 
-cjk-regex@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/cjk-regex/-/cjk-regex-2.0.0.tgz#060aa111e61092768c438ccc9c643a53e8fe1ee5"
-  integrity sha512-E4gFi2f3jC0zFVHpaAcupW+gv9OejZ2aV3DP/LlSO0dDcZJAXw7W0ivn+vN17edN/PhU4HCgs1bfx7lPK7FpdA==
+cjk-regex@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/cjk-regex/-/cjk-regex-2.0.1.tgz#98cca187aa67931db14f0d9dde556150c8116d95"
+  integrity sha512-4YTL4Zxzy33EhD2YMBQg6qavT+3OrYYu45RHcLANXhbVTXmVcwNQIv0vL1TUWjOS7bH0n0dVcGAdJAGzWSAa3A==
   dependencies:
     regexp-util "^1.2.1"
     unicode-regex "^2.0.0"

From 1000c57110b033e23bc31bd20d26caa3db8172ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Jan 2021 10:16:32 +0800
Subject: [PATCH 295/299] Build(deps): Bump @angular/compiler from 11.0.6 to
 11.0.7 (#10022)

Bumps [@angular/compiler](https://github.com/angular/angular/tree/HEAD/packages/compiler) from 11.0.6 to 11.0.7.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/11.0.7/packages/compiler)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f2f925b45..5715bbb39 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "bin"
   ],
   "dependencies": {
-    "@angular/compiler": "11.0.6",
+    "@angular/compiler": "11.0.7",
     "@babel/code-frame": "7.12.11",
     "@babel/parser": "7.12.11",
     "@glimmer/syntax": "0.73.1",
diff --git a/yarn.lock b/yarn.lock
index 7f56ca773..d81df87d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/compiler@11.0.6":
-  version "11.0.6"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.6.tgz#3c5bcc695bf0f5e8e4a73da6a043725e39d955d5"
-  integrity sha512-Scfaowc13HrFr37O05ZwUU6xk25D7DUgzwLTCTCCEM++HMkoWMV44xVzCkx3nBojGN9CgXaOSe0tBkYnDl8WOA==
+"@angular/compiler@11.0.7":
+  version "11.0.7"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-11.0.7.tgz#994251520cb4b810240e8081dddb4baddae7551c"
+  integrity sha512-U+aGn6lP3iB184D2Z+OSK5vCwNtxtsF59T7nNJBMCCwcN7Qc5tfDBbSj1GI11XrIiuuoOxXbAp9BKS0dAyNCWw==
   dependencies:
     tslib "^2.0.0"
 

From 358ad36a84a0d21b3b2031a6c91704f9763338e7 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 11 Jan 2021 10:19:13 +0800
Subject: [PATCH 296/299] Forbid use `concat()` in `concat()` (#9998)

---
 .eslintrc.yml                                 |  1 +
 .../index.js                                  |  1 +
 .../no-concat-in-concat.js                    | 75 +++++++++++++++++++
 .../test.js                                   | 21 ++++++
 src/language-css/printer-postcss.js           |  2 +-
 src/language-graphql/printer-graphql.js       | 15 ++--
 src/language-handlebars/printer-glimmer.js    |  4 +-
 src/language-html/printer-html.js             | 72 +++++++++---------
 src/language-js/print/binaryish.js            |  2 +-
 src/language-js/print/call-arguments.js       | 10 +--
 src/language-js/print/call-expression.js      |  4 +-
 src/language-js/print/function-parameters.js  | 15 ++--
 src/language-js/print/function.js             |  6 +-
 src/language-js/print/jsx.js                  | 21 ++----
 src/language-js/print/module.js               |  2 +-
 src/language-js/print/object.js               |  5 +-
 src/language-js/printer-estree.js             |  4 +-
 src/language-markdown/printer-markdown.js     | 23 +++---
 18 files changed, 180 insertions(+), 103 deletions(-)
 create mode 100644 scripts/tools/eslint-plugin-prettier-internal-rules/no-concat-in-concat.js

diff --git a/.eslintrc.yml b/.eslintrc.yml
index f5ad72553..27e54d729 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -110,6 +110,7 @@ overrides:
       prettier-internal-rules/better-parent-property-check-in-needs-parens: error
   - files: src/**/*.js
     rules:
+      prettier-internal-rules/no-concat-in-concat: error
       prettier-internal-rules/no-doc-builder-concat: off
       prettier-internal-rules/no-single-doc-concat: error
       prettier-internal-rules/prefer-fast-path-each: error
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
index 02ad369e9..b082e9c10 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
@@ -5,6 +5,7 @@ module.exports = {
     "better-parent-property-check-in-needs-parens": require("./better-parent-property-check-in-needs-parens"),
     "directly-loc-start-end": require("./directly-loc-start-end"),
     "jsx-identifier-case": require("./jsx-identifier-case"),
+    "no-concat-in-concat": require("./no-concat-in-concat"),
     "no-doc-builder-concat": require("./no-doc-builder-concat"),
     "no-node-comments": require("./no-node-comments"),
     "no-single-doc-concat": require("./no-single-doc-concat"),
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/no-concat-in-concat.js b/scripts/tools/eslint-plugin-prettier-internal-rules/no-concat-in-concat.js
new file mode 100644
index 000000000..7a81a4ee9
--- /dev/null
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/no-concat-in-concat.js
@@ -0,0 +1,75 @@
+"use strict";
+
+// TODO: Remove this rule when deprecated `concat` is not using in codebase, #9993.
+
+const concatCallSelector = [
+  "CallExpression",
+  '[callee.type="Identifier"]',
+  '[callee.name="concat"]',
+  "[arguments.length=1]",
+].join("");
+const selector = [
+  concatCallSelector,
+  ">",
+  "ArrayExpression.arguments",
+  ">",
+  `${concatCallSelector}.elements`,
+].join("");
+
+const messageId = "no-concat-in-concat";
+
+module.exports = {
+  meta: {
+    type: "suggestion",
+    docs: {
+      url:
+        "https://github.com/prettier/prettier/blob/master/scripts/eslint-plugin-prettier-internal-rules/no-concat-in-concat.js",
+    },
+    messages: {
+      [messageId]: "Do not use `concat()` in `concat()`.",
+    },
+    fixable: "code",
+  },
+  create(context) {
+    const sourceCode = context.getSourceCode();
+    return {
+      [selector](node) {
+        context.report({
+          node,
+          messageId,
+          *fix(fixer) {
+            // Remove `concat`
+            yield fixer.remove(node.callee);
+            const openingParenthesisToken = sourceCode.getTokenAfter(
+              node.callee
+            );
+            yield fixer.remove(openingParenthesisToken);
+            const closingParenthesisToken = sourceCode.getLastToken(node);
+            yield fixer.remove(closingParenthesisToken);
+
+            const [concatParts] = node.arguments;
+            if (concatParts.type === "ArrayExpression") {
+              const firstToken = sourceCode.getFirstToken(concatParts);
+              yield fixer.remove(firstToken);
+              const lastToken = sourceCode.getLastToken(concatParts);
+              yield fixer.remove(lastToken);
+
+              // trailing comma
+              const lastElement =
+                concatParts.elements[concatParts.elements.length - 1];
+              const penultimateToken = sourceCode.getTokenAfter(lastElement);
+              if (
+                penultimateToken.type === "Punctuator" &&
+                penultimateToken.value === ","
+              ) {
+                yield fixer.remove(penultimateToken);
+              }
+            } else {
+              yield fixer.insertTextBefore(concatParts, "...");
+            }
+          },
+        });
+      },
+    };
+  },
+};
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
index 81cb65e21..5fb68f3a8 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
@@ -94,6 +94,27 @@ test("jsx-identifier-case", {
   ],
 });
 
+test("no-concat-in-concat", {
+  valid: [],
+  invalid: [
+    {
+      code: "concat([concat([hardline, hardline]), 'extra'])",
+      output: "concat([hardline, hardline, 'extra'])",
+      errors: 1,
+    },
+    {
+      code: "concat([concat([hardline, hardline, ]), 'extra'])",
+      output: "concat([hardline, hardline , 'extra'])",
+      errors: 1,
+    },
+    {
+      code: "concat([concat(parts), 'extra'])",
+      output: "concat([...parts, 'extra'])",
+      errors: 1,
+    },
+  ],
+});
+
 test("no-doc-builder-concat", {
   valid: ["notConcat([])", "concat", "[].concat([])"],
   invalid: [
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index 97b27b791..890244513 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -341,7 +341,7 @@ function genericPrint(path, options, print) {
       if (!node.nodes) {
         return node.value;
       }
-      return concat(["(", concat(path.map(print, "nodes")), ")"]);
+      return concat(["(", ...path.map(print, "nodes"), ")"]);
     }
     case "media-feature": {
       return maybeToLowerCase(
diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js
index fe475df15..023270a00 100644
--- a/src/language-graphql/printer-graphql.js
+++ b/src/language-graphql/printer-graphql.js
@@ -31,7 +31,7 @@ function genericPrint(path, options, print) {
           }
         }
       }, "definitions");
-      return concat([concat(parts), hardline]);
+      return concat([...parts, hardline]);
     }
     case "OperationDefinition": {
       const hasOperation = options.originalText[locStart(n)] !== "{";
@@ -274,10 +274,7 @@ function genericPrint(path, options, print) {
         "type ",
         path.call(print, "name"),
         n.interfaces.length > 0
-          ? concat([
-              " implements ",
-              concat(printInterfaces(path, options, print)),
-            ])
+          ? concat([" implements ", ...printInterfaces(path, options, print)])
           : "",
         printDirectives(path, print, n),
         n.fields.length > 0
@@ -363,7 +360,8 @@ function genericPrint(path, options, print) {
             )
           : "",
         n.repeatable ? " repeatable" : "",
-        concat([" on ", join(" | ", path.map(print, "locations"))]),
+        " on ",
+        join(" | ", path.map(print, "locations")),
       ]);
     }
 
@@ -492,10 +490,7 @@ function genericPrint(path, options, print) {
         "interface ",
         path.call(print, "name"),
         n.interfaces.length > 0
-          ? concat([
-              " implements ",
-              concat(printInterfaces(path, options, print)),
-            ])
+          ? concat([" implements ", ...printInterfaces(path, options, print)])
           : "",
         printDirectives(path, print, n),
         n.fields.length > 0
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index a465561e4..0dceed30e 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -55,7 +55,9 @@ function print(path, options, print) {
           concat([
             isWhitespaceOnly ? "" : indent(printChildren(path, options, print)),
             n.children.length > 0 ? hardline : "",
-            concat(["</", n.tag, ">"]),
+            "</",
+            n.tag,
+            ">",
           ])
         ),
         bim,
diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index 4315f27c7..9db1e0711 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -354,7 +354,7 @@ function genericPrint(path, options, print) {
     case "interpolation":
       return concat([
         printOpeningTagStart(node, options),
-        concat(path.map(print, "children")),
+        ...path.map(print, "children"),
         printClosingTagEnd(node, options),
       ]);
     case "text": {
@@ -366,7 +366,7 @@ function genericPrint(path, options, print) {
           ? node.value.replace(trailingNewlineRegex, "")
           : node.value;
         return concat([
-          concat(replaceEndOfLineWith(value, literalline)),
+          ...replaceEndOfLineWith(value, literalline),
           hasTrailingNewline ? hardline : "",
         ]);
       }
@@ -394,11 +394,10 @@ function genericPrint(path, options, print) {
     case "comment": {
       return concat([
         printOpeningTagPrefix(node, options),
-        concat(
-          replaceEndOfLineWith(
-            options.originalText.slice(locStart(node), locEnd(node)),
-            literalline
-          )
+
+        ...replaceEndOfLineWith(
+          options.originalText.slice(locStart(node), locEnd(node)),
+          literalline
         ),
         printClosingTagSuffix(node, options),
       ]);
@@ -413,19 +412,17 @@ function genericPrint(path, options, print) {
       const quote = singleQuoteCount < doubleQuoteCount ? "'" : '"';
       return concat([
         node.rawName,
-        concat([
-          "=",
-          quote,
-          concat(
-            replaceEndOfLineWith(
-              quote === '"'
-                ? value.replace(/"/g, "&quot;")
-                : value.replace(/'/g, "&apos;"),
-              literalline
-            )
-          ),
-          quote,
-        ]),
+
+        "=",
+        quote,
+
+        ...replaceEndOfLineWith(
+          quote === '"'
+            ? value.replace(/"/g, "&quot;")
+            : value.replace(/'/g, "&apos;"),
+          literalline
+        ),
+        quote,
       ]);
     }
     default:
@@ -440,23 +437,22 @@ function printChildren(path, options, print) {
   if (forceBreakChildren(node)) {
     return concat([
       breakParent,
-      concat(
-        path.map((childPath) => {
-          const childNode = childPath.getValue();
-          const prevBetweenLine = !childNode.prev
+
+      ...path.map((childPath) => {
+        const childNode = childPath.getValue();
+        const prevBetweenLine = !childNode.prev
+          ? ""
+          : printBetweenLine(childNode.prev, childNode);
+        return concat([
+          !prevBetweenLine
             ? ""
-            : printBetweenLine(childNode.prev, childNode);
-          return concat([
-            !prevBetweenLine
-              ? ""
-              : concat([
-                  prevBetweenLine,
-                  forceNextEmptyLine(childNode.prev) ? hardline : "",
-                ]),
-            printChild(childPath),
-          ]);
-        }, "children")
-      ),
+            : concat([
+                prevBetweenLine,
+                forceNextEmptyLine(childNode.prev) ? hardline : "",
+              ]),
+          printChild(childPath),
+        ]);
+      }, "children"),
     ]);
   }
 
@@ -528,8 +524,8 @@ function printChildren(path, options, print) {
           prevParts,
           group(
             concat([
-              concat(leadingParts),
-              group(concat([printChild(childPath), concat(trailingParts)]), {
+              ...leadingParts,
+              group(concat([printChild(childPath), ...trailingParts]), {
                 id: groupIds[childIndex],
               }),
             ])
diff --git a/src/language-js/print/binaryish.js b/src/language-js/print/binaryish.js
index b895c6f46..ce1649606 100644
--- a/src/language-js/print/binaryish.js
+++ b/src/language-js/print/binaryish.js
@@ -68,7 +68,7 @@ function printBinaryishExpression(path, options, print) {
       parent.type === "OptionalMemberExpression") &&
       !parent.computed)
   ) {
-    return group(concat([indent(concat([softline, concat(parts)])), softline]));
+    return group(concat([indent(concat([softline, ...parts])), softline]));
   }
 
   // Avoid indenting sub-expressions in some cases where the first sub-expression is already
diff --git a/src/language-js/print/call-arguments.js b/src/language-js/print/call-arguments.js
index c7b43e52d..3dd7559b7 100644
--- a/src/language-js/print/call-arguments.js
+++ b/src/language-js/print/call-arguments.js
@@ -129,7 +129,7 @@ function printCallArguments(path, options, print) {
     return group(
       concat([
         "(",
-        indent(concat([line, concat(printedArguments)])),
+        indent(concat([line, ...printedArguments])),
         maybeTrailingComma,
         line,
         ")",
@@ -177,7 +177,7 @@ function printCallArguments(path, options, print) {
 
     const somePrintedArgumentsWillBreak = printedArguments.some(willBreak);
 
-    const simpleConcat = concat(["(", concat(printedExpanded), ")"]);
+    const simpleConcat = concat(["(", ...printedExpanded, ")"]);
 
     return concat([
       somePrintedArgumentsWillBreak ? breakParent : "",
@@ -192,12 +192,12 @@ function printCallArguments(path, options, print) {
             ? concat([
                 "(",
                 group(printedExpanded[0], { shouldBreak: true }),
-                concat(printedExpanded.slice(1)),
+                ...printedExpanded.slice(1),
                 ")",
               ])
             : concat([
                 "(",
-                concat(printedArguments.slice(0, -1)),
+                ...printedArguments.slice(0, -1),
                 group(getLast(printedExpanded), {
                   shouldBreak: true,
                 }),
@@ -212,7 +212,7 @@ function printCallArguments(path, options, print) {
 
   const contents = concat([
     "(",
-    indent(concat([softline, concat(printedArguments)])),
+    indent(concat([softline, ...printedArguments])),
     ifBreak(maybeTrailingComma),
     softline,
     ")",
diff --git a/src/language-js/print/call-expression.js b/src/language-js/print/call-expression.js
index 11d683863..6b799255c 100644
--- a/src/language-js/print/call-expression.js
+++ b/src/language-js/print/call-expression.js
@@ -50,7 +50,9 @@ function printCallExpression(path, options, print) {
       path.call(print, "callee"),
       optional,
       printFunctionTypeParameters(path, options, print),
-      concat(["(", join(", ", printed), ")"]),
+      "(",
+      join(", ", printed),
+      ")",
     ]);
   }
 
diff --git a/src/language-js/print/function-parameters.js b/src/language-js/print/function-parameters.js
index d1f6024ad..d194e255f 100644
--- a/src/language-js/print/function-parameters.js
+++ b/src/language-js/print/function-parameters.js
@@ -95,12 +95,7 @@ function printFunctionParameters(
   //                         })
   if (shouldExpandParameters) {
     return group(
-      concat([
-        removeLines(typeParams),
-        "(",
-        concat(printed.map(removeLines)),
-        ")",
-      ])
+      concat([removeLines(typeParams), "(", ...printed.map(removeLines), ")"])
     );
   }
 
@@ -113,12 +108,12 @@ function printFunctionParameters(
   // }) {}
   const hasNotParameterDecorator = parameters.every((node) => !node.decorators);
   if (shouldHugParameters && hasNotParameterDecorator) {
-    return concat([typeParams, "(", concat(printed), ")"]);
+    return concat([typeParams, "(", ...printed, ")"]);
   }
 
   // don't break in specs, eg; `it("should maintain parens around done even when long", (done) => {})`
   if (isParametersInTestCall) {
-    return concat([typeParams, "(", concat(printed), ")"]);
+    return concat([typeParams, "(", ...printed, ")"]);
   }
 
   const isFlowShorthandWithOneArg =
@@ -141,7 +136,7 @@ function printFunctionParameters(
 
   if (isFlowShorthandWithOneArg) {
     if (options.arrowParens === "always") {
-      return concat(["(", concat(printed), ")"]);
+      return concat(["(", ...printed, ")"]);
     }
     return concat(printed);
   }
@@ -149,7 +144,7 @@ function printFunctionParameters(
   return concat([
     typeParams,
     "(",
-    indent(concat([softline, concat(printed)])),
+    indent(concat([softline, ...printed])),
     ifBreak(
       !hasRestParameter(functionNode) && shouldPrintComma(options, "all")
         ? ","
diff --git a/src/language-js/print/function.js b/src/language-js/print/function.js
index 18c8e513c..df8fa0e0b 100644
--- a/src/language-js/print/function.js
+++ b/src/language-js/print/function.js
@@ -195,7 +195,7 @@ function printArrowFunctionExpression(path, options, print, args) {
       n.body.type === "ArrowFunctionExpression" ||
       n.body.type === "DoExpression")
   ) {
-    return group(concat([concat(parts), " ", body]));
+    return group(concat([...parts, " ", body]));
   }
 
   // We handle sequence expressions as the body of arrows specially,
@@ -203,7 +203,7 @@ function printArrowFunctionExpression(path, options, print, args) {
   if (n.body.type === "SequenceExpression") {
     return group(
       concat([
-        concat(parts),
+        ...parts,
         group(concat([" (", indent(concat([softline, body])), softline, ")"])),
       ])
     );
@@ -230,7 +230,7 @@ function printArrowFunctionExpression(path, options, print, args) {
 
   return group(
     concat([
-      concat(parts),
+      ...parts,
       group(
         concat([
           indent(
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index 3fb1db705..1b0dd0429 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -79,11 +79,7 @@ function printJsxElementInternal(path, options, print) {
     (n.children[0].expression.type === "TemplateLiteral" ||
       n.children[0].expression.type === "TaggedTemplateExpression")
   ) {
-    return concat([
-      openingLines,
-      concat(path.map(print, "children")),
-      closingLines,
-    ]);
+    return concat([openingLines, ...path.map(print, "children"), closingLines]);
   }
 
   // Convert `{" "}` to text nodes containing a space.
@@ -256,7 +252,7 @@ function printJsxElementInternal(path, options, print) {
   }
 
   return conditionalGroup([
-    group(concat([openingLines, concat(children), closingLines])),
+    group(concat([openingLines, ...children, closingLines])),
     multiLineElem,
   ]);
 }
@@ -583,7 +579,7 @@ function printJsxOpeningElement(path, options, print) {
         path.call(print, "name"),
         path.call(print, "typeParameters"),
         " ",
-        concat(path.map(print, "attributes")),
+        ...path.map(print, "attributes"),
         n.selfClosing ? " />" : ">",
       ])
     );
@@ -624,12 +620,11 @@ function printJsxOpeningElement(path, options, print) {
       "<",
       path.call(print, "name"),
       path.call(print, "typeParameters"),
-      concat([
-        indent(
-          concat(path.map((attr) => concat([line, print(attr)]), "attributes"))
-        ),
-        n.selfClosing ? line : bracketSameLine ? ">" : softline,
-      ]),
+
+      indent(
+        concat(path.map((attr) => concat([line, print(attr)]), "attributes"))
+      ),
+      n.selfClosing ? line : bracketSameLine ? ">" : softline,
       n.selfClosing ? "/>" : bracketSameLine ? "" : ">",
     ]),
     { shouldBreak }
diff --git a/src/language-js/print/module.js b/src/language-js/print/module.js
index 9dfd543cd..9fc03fa94 100644
--- a/src/language-js/print/module.js
+++ b/src/language-js/print/module.js
@@ -229,7 +229,7 @@ function printModuleSpecifiers(path, options, print) {
           concat([
             "{",
             options.bracketSpacing ? " " : "",
-            concat(groupedSpecifiers),
+            ...groupedSpecifiers,
             options.bracketSpacing ? " " : "",
             "}",
           ])
diff --git a/src/language-js/print/object.js b/src/language-js/print/object.js
index 5b39cf0a6..ab4d1b001 100644
--- a/src/language-js/print/object.js
+++ b/src/language-js/print/object.js
@@ -182,14 +182,15 @@ function printObject(path, options, print) {
   } else {
     content = concat([
       leftBrace,
-      indent(concat([options.bracketSpacing ? line : softline, concat(props)])),
+      indent(concat([options.bracketSpacing ? line : softline, ...props])),
       ifBreak(
         canHaveTrailingSeparator &&
           (separator !== "," || shouldPrintComma(options))
           ? separator
           : ""
       ),
-      concat([options.bracketSpacing ? line : softline, rightBrace]),
+      options.bracketSpacing ? line : softline,
+      rightBrace,
       printOptionalToken(path),
       printTypeAnnotation(path, options, print),
     ]);
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 619d8289b..39eec9e89 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -397,9 +397,7 @@ function printPathNoParens(path, options, print, args) {
           parent.type === "OptionalMemberExpression") &&
           parent.object === n)
       ) {
-        return group(
-          concat([indent(concat([softline, concat(parts)])), softline])
-        );
+        return group(concat([indent(concat([softline, ...parts])), softline]));
       }
       return concat(parts);
     }
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index 31bf7db97..e416d092f 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -248,10 +248,7 @@ function genericPrint(path, options, print) {
         const alignment = " ".repeat(4);
         return align(
           alignment,
-          concat([
-            alignment,
-            concat(replaceEndOfLineWith(node.value, hardline)),
-          ])
+          concat([alignment, ...replaceEndOfLineWith(node.value, hardline)])
         );
       }
 
@@ -265,11 +262,10 @@ function genericPrint(path, options, print) {
         node.lang || "",
         node.meta ? " " + node.meta : "",
         hardline,
-        concat(
-          replaceEndOfLineWith(
-            getFencedCodeBlockValue(node, options.originalText),
-            hardline
-          )
+
+        ...replaceEndOfLineWith(
+          getFencedCodeBlockValue(node, options.originalText),
+          hardline
         ),
         hardline,
         style,
@@ -383,7 +379,9 @@ function genericPrint(path, options, print) {
       const lineOrSpace = options.proseWrap === "always" ? line : " ";
       return group(
         concat([
-          concat(["[", node.identifier, "]:"]),
+          "[",
+          node.identifier,
+          "]:",
           indent(
             concat([
               lineOrSpace,
@@ -458,10 +456,7 @@ function genericPrint(path, options, print) {
         "$$",
         hardline,
         node.value
-          ? concat([
-              concat(replaceEndOfLineWith(node.value, hardline)),
-              hardline,
-            ])
+          ? concat([...replaceEndOfLineWith(node.value, hardline), hardline])
           : "",
         "$$",
       ]);

From e70ad5b7fb5b181d63849514ddc73ed61f0c1c97 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Mon, 11 Jan 2021 11:24:24 +0900
Subject: [PATCH 297/299] Check cache only when purge-cache is off (#10031)

Co-authored-by: fisker Cheung <lionkay@gmail.com>
---
 scripts/build/bundler.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/build/bundler.js b/scripts/build/bundler.js
index 06494ff4e..44acfd168 100644
--- a/scripts/build/bundler.js
+++ b/scripts/build/bundler.js
@@ -367,12 +367,16 @@ module.exports = async function createBundle(bundle, cache, options) {
     return { skipped: true };
   }
 
-  const checkCacheResults = await Promise.all(
-    outputOptions.map((outputOption) =>
-      checkCache(cache, inputOptions, outputOption)
-    )
-  );
-  if (checkCacheResults.every((r) => r === true)) {
+  if (
+    !options["purge-cache"] &&
+    (
+      await Promise.all(
+        outputOptions.map((outputOption) =>
+          checkCache(cache, inputOptions, outputOption)
+        )
+      )
+    ).every((cached) => cached)
+  ) {
     return { cached: true };
   }
 

From 671fa5ddaf5227ddd54095476f7c6b5c1e6e9101 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Mon, 11 Jan 2021 13:25:34 +0900
Subject: [PATCH 298/299] Move checkCache to Cache class (#10029)

* Move checkCache to Cache class

* Address reviews
---
 scripts/build/bundler.js | 26 +-------------------------
 scripts/build/cache.js   | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/scripts/build/bundler.js b/scripts/build/bundler.js
index 44acfd168..1fc4b05a2 100644
--- a/scripts/build/bundler.js
+++ b/scripts/build/bundler.js
@@ -2,7 +2,6 @@
 
 const path = require("path");
 const fs = require("fs");
-const execa = require("execa");
 const { rollup } = require("rollup");
 const webpack = require("webpack");
 const { nodeResolve } = require("@rollup/plugin-node-resolve");
@@ -336,29 +335,6 @@ function runWebpack(config) {
   });
 }
 
-async function checkCache(cache, inputOptions, outputOption) {
-  const useCache = await cache.checkBundle(
-    outputOption.file,
-    inputOptions,
-    outputOption
-  );
-
-  if (useCache) {
-    try {
-      await execa("cp", [
-        path.join(cache.cacheDir, outputOption.file.replace("dist", "files")),
-        outputOption.file,
-      ]);
-      return true;
-    } catch (err) {
-      console.log(err);
-      // Proceed to build
-    }
-  }
-
-  return false;
-}
-
 module.exports = async function createBundle(bundle, cache, options) {
   const inputOptions = getRollupConfig(bundle);
   const outputOptions = getRollupOutputOptions(bundle, options);
@@ -372,7 +348,7 @@ module.exports = async function createBundle(bundle, cache, options) {
     (
       await Promise.all(
         outputOptions.map((outputOption) =>
-          checkCache(cache, inputOptions, outputOption)
+          cache.isCached(inputOptions, outputOption)
         )
       )
     ).every((cached) => cached)
diff --git a/scripts/build/cache.js b/scripts/build/cache.js
index 5d1cdfe3f..8f7b5c961 100644
--- a/scripts/build/cache.js
+++ b/scripts/build/cache.js
@@ -4,6 +4,7 @@ const assert = require("assert").strict;
 const crypto = require("crypto");
 const fs = require("fs").promises;
 const path = require("path");
+const execa = require("execa");
 const { rollup } = require("rollup");
 
 const ROOT = path.join(__dirname, "..", "..");
@@ -100,6 +101,27 @@ class Cache {
       // Don't fail the build
     }
   }
+
+  async isCached(inputOptions, outputOption) {
+    const useCache = await this.checkBundle(
+      outputOption.file,
+      inputOptions,
+      outputOption
+    );
+    if (useCache) {
+      try {
+        await execa("cp", [
+          path.join(this.cacheDir, outputOption.file.replace("dist", "files")),
+          outputOption.file,
+        ]);
+        return true;
+      } catch (err) {
+        console.log(err);
+        // Proceed to build
+      }
+    }
+    return false;
+  }
 }
 
 function required(name) {

From 7b24335064019e4c46d890e81947d5991d22f465 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 11 Jan 2021 13:46:05 +0800
Subject: [PATCH 299/299] Refactor: Use `Doc[]` instead of `concat()` (#9993)

---
 .eslintrc.yml                                 |   4 +-
 .../index.js                                  |   2 -
 .../no-concat-in-concat.js                    |  75 ---
 .../no-single-doc-concat.js                   |  44 --
 .../test.js                                   |  32 -
 src/language-css/embed.js                     |   4 +-
 src/language-css/printer-postcss.js           | 259 ++++----
 src/language-graphql/printer-graphql.js       | 567 ++++++++----------
 src/language-handlebars/printer-glimmer.js    | 204 +++----
 src/language-html/printer-html.js             | 508 +++++++---------
 src/language-html/syntax-attribute.js         |   6 +-
 src/language-html/syntax-vue.js               |   6 +-
 src/language-js/embed/css.js                  |  24 +-
 src/language-js/embed/graphql.js              |  11 +-
 src/language-js/embed/html.js                 |  29 +-
 src/language-js/embed/markdown.js             |  10 +-
 src/language-js/print/angular.js              |  65 +-
 src/language-js/print/array.js                |  33 +-
 src/language-js/print/assignment.js           |  12 +-
 src/language-js/print/binaryish.js            |  46 +-
 src/language-js/print/block.js                |   8 +-
 src/language-js/print/call-arguments.js       |  43 +-
 src/language-js/print/call-expression.js      |  10 +-
 src/language-js/print/class.js                |  45 +-
 src/language-js/print/comment.js              |   8 +-
 src/language-js/print/flow.js                 |  61 +-
 src/language-js/print/function-parameters.js  |  29 +-
 src/language-js/print/function.js             | 135 ++---
 src/language-js/print/html-binding.js         |  13 +-
 src/language-js/print/interface.js            |  14 +-
 src/language-js/print/jsx.js                  | 134 ++---
 src/language-js/print/member-chain.js         |  49 +-
 src/language-js/print/member.js               |  18 +-
 src/language-js/print/misc.js                 |  16 +-
 src/language-js/print/module.js               |  54 +-
 src/language-js/print/object.js               |  42 +-
 src/language-js/print/property.js             |   7 +-
 src/language-js/print/statement.js            |   4 +-
 src/language-js/print/template-literal.js     |  43 +-
 src/language-js/print/ternary.js              |  40 +-
 src/language-js/print/type-annotation.js      |  56 +-
 src/language-js/print/type-parameters.js      |  23 +-
 src/language-js/print/typescript.js           | 202 +++----
 src/language-js/printer-estree-json.js        |  38 +-
 src/language-js/printer-estree.js             | 468 ++++++---------
 src/language-markdown/embed.js                |  26 +-
 src/language-markdown/printer-markdown.js     | 194 +++---
 src/language-yaml/print/block.js              |   9 +-
 .../print/flow-mapping-sequence.js            |  54 +-
 src/language-yaml/print/mapping-item.js       |  32 +-
 src/language-yaml/printer-yaml.js             | 134 ++---
 src/main/ast-to-doc.js                        |   8 +-
 src/main/comments.js                          |  29 +-
 src/utils/front-matter.js                     |   6 +-
 54 files changed, 1681 insertions(+), 2312 deletions(-)
 delete mode 100644 scripts/tools/eslint-plugin-prettier-internal-rules/no-concat-in-concat.js
 delete mode 100644 scripts/tools/eslint-plugin-prettier-internal-rules/no-single-doc-concat.js

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 27e54d729..6ac823ea0 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -110,9 +110,7 @@ overrides:
       prettier-internal-rules/better-parent-property-check-in-needs-parens: error
   - files: src/**/*.js
     rules:
-      prettier-internal-rules/no-concat-in-concat: error
-      prettier-internal-rules/no-doc-builder-concat: off
-      prettier-internal-rules/no-single-doc-concat: error
+      prettier-internal-rules/no-doc-builder-concat: error
       prettier-internal-rules/prefer-fast-path-each: error
       prettier-internal-rules/prefer-is-non-empty-array: error
   - files: src/document/*.js
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
index b082e9c10..3bec6a3e2 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/index.js
@@ -5,10 +5,8 @@ module.exports = {
     "better-parent-property-check-in-needs-parens": require("./better-parent-property-check-in-needs-parens"),
     "directly-loc-start-end": require("./directly-loc-start-end"),
     "jsx-identifier-case": require("./jsx-identifier-case"),
-    "no-concat-in-concat": require("./no-concat-in-concat"),
     "no-doc-builder-concat": require("./no-doc-builder-concat"),
     "no-node-comments": require("./no-node-comments"),
-    "no-single-doc-concat": require("./no-single-doc-concat"),
     "prefer-fast-path-each": require("./prefer-fast-path-each"),
     "prefer-is-non-empty-array": require("./prefer-is-non-empty-array"),
     "require-json-extensions": require("./require-json-extensions"),
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/no-concat-in-concat.js b/scripts/tools/eslint-plugin-prettier-internal-rules/no-concat-in-concat.js
deleted file mode 100644
index 7a81a4ee9..000000000
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/no-concat-in-concat.js
+++ /dev/null
@@ -1,75 +0,0 @@
-"use strict";
-
-// TODO: Remove this rule when deprecated `concat` is not using in codebase, #9993.
-
-const concatCallSelector = [
-  "CallExpression",
-  '[callee.type="Identifier"]',
-  '[callee.name="concat"]',
-  "[arguments.length=1]",
-].join("");
-const selector = [
-  concatCallSelector,
-  ">",
-  "ArrayExpression.arguments",
-  ">",
-  `${concatCallSelector}.elements`,
-].join("");
-
-const messageId = "no-concat-in-concat";
-
-module.exports = {
-  meta: {
-    type: "suggestion",
-    docs: {
-      url:
-        "https://github.com/prettier/prettier/blob/master/scripts/eslint-plugin-prettier-internal-rules/no-concat-in-concat.js",
-    },
-    messages: {
-      [messageId]: "Do not use `concat()` in `concat()`.",
-    },
-    fixable: "code",
-  },
-  create(context) {
-    const sourceCode = context.getSourceCode();
-    return {
-      [selector](node) {
-        context.report({
-          node,
-          messageId,
-          *fix(fixer) {
-            // Remove `concat`
-            yield fixer.remove(node.callee);
-            const openingParenthesisToken = sourceCode.getTokenAfter(
-              node.callee
-            );
-            yield fixer.remove(openingParenthesisToken);
-            const closingParenthesisToken = sourceCode.getLastToken(node);
-            yield fixer.remove(closingParenthesisToken);
-
-            const [concatParts] = node.arguments;
-            if (concatParts.type === "ArrayExpression") {
-              const firstToken = sourceCode.getFirstToken(concatParts);
-              yield fixer.remove(firstToken);
-              const lastToken = sourceCode.getLastToken(concatParts);
-              yield fixer.remove(lastToken);
-
-              // trailing comma
-              const lastElement =
-                concatParts.elements[concatParts.elements.length - 1];
-              const penultimateToken = sourceCode.getTokenAfter(lastElement);
-              if (
-                penultimateToken.type === "Punctuator" &&
-                penultimateToken.value === ","
-              ) {
-                yield fixer.remove(penultimateToken);
-              }
-            } else {
-              yield fixer.insertTextBefore(concatParts, "...");
-            }
-          },
-        });
-      },
-    };
-  },
-};
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/no-single-doc-concat.js b/scripts/tools/eslint-plugin-prettier-internal-rules/no-single-doc-concat.js
deleted file mode 100644
index 25b4b4930..000000000
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/no-single-doc-concat.js
+++ /dev/null
@@ -1,44 +0,0 @@
-"use strict";
-
-// TODO: Remove this rule when deprecated `concat` is not using in codebase, #9993.
-
-const selector = [
-  "CallExpression",
-  '[callee.type="Identifier"]',
-  '[callee.name="concat"]',
-  "[arguments.length=1]",
-  '[arguments.0.type="ArrayExpression"]',
-  "[arguments.0.elements.length=1]",
-].join("");
-
-const messageId = "no-single-doc-concat";
-
-module.exports = {
-  meta: {
-    type: "suggestion",
-    docs: {
-      url:
-        "https://github.com/prettier/prettier/blob/master/scripts/eslint-plugin-prettier-internal-rules/no-single-doc-concat.js",
-    },
-    messages: {
-      [messageId]: "Do not use `concat()` to concat single `Doc`.",
-    },
-    fixable: "code",
-  },
-  create(context) {
-    const sourceCode = context.getSourceCode();
-    return {
-      [selector](node) {
-        context.report({
-          node,
-          messageId,
-          fix: (fixer) =>
-            fixer.replaceText(
-              node,
-              sourceCode.getText(node.arguments[0].elements[0])
-            ),
-        });
-      },
-    };
-  },
-};
diff --git a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
index 5fb68f3a8..e02c8008e 100644
--- a/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
+++ b/scripts/tools/eslint-plugin-prettier-internal-rules/test.js
@@ -94,27 +94,6 @@ test("jsx-identifier-case", {
   ],
 });
 
-test("no-concat-in-concat", {
-  valid: [],
-  invalid: [
-    {
-      code: "concat([concat([hardline, hardline]), 'extra'])",
-      output: "concat([hardline, hardline, 'extra'])",
-      errors: 1,
-    },
-    {
-      code: "concat([concat([hardline, hardline, ]), 'extra'])",
-      output: "concat([hardline, hardline , 'extra'])",
-      errors: 1,
-    },
-    {
-      code: "concat([concat(parts), 'extra'])",
-      output: "concat([...parts, 'extra'])",
-      errors: 1,
-    },
-  ],
-});
-
 test("no-doc-builder-concat", {
   valid: ["notConcat([])", "concat", "[].concat([])"],
   invalid: [
@@ -165,17 +144,6 @@ test("no-node-comments", {
   ],
 });
 
-test("no-single-doc-concat", {
-  valid: [],
-  invalid: [
-    {
-      code: 'concat([path.call(print, "params")])',
-      output: 'path.call(print, "params")',
-      errors: 1,
-    },
-  ],
-});
-
 test("prefer-fast-path-each", {
   valid: ["const foo = path.map()"],
   invalid: [
diff --git a/src/language-css/embed.js b/src/language-css/embed.js
index c175b6245..30bfde8af 100644
--- a/src/language-css/embed.js
+++ b/src/language-css/embed.js
@@ -1,6 +1,6 @@
 "use strict";
 const {
-  builders: { hardline, concat },
+  builders: { hardline },
 } = require("../document");
 const { print: printFrontMatter } = require("../utils/front-matter");
 
@@ -9,7 +9,7 @@ function embed(path, print, textToDoc /*, options */) {
 
   if (node.type === "front-matter") {
     const doc = printFrontMatter(node, textToDoc);
-    return doc ? concat([doc, hardline]) : "";
+    return doc ? [doc, hardline] : "";
   }
 }
 
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index 890244513..b21297d1c 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -10,7 +10,6 @@ const {
 } = require("../common/util");
 const {
   builders: {
-    concat,
     join,
     line,
     hardline,
@@ -94,16 +93,16 @@ function genericPrint(path, options, print) {
 
   switch (node.type) {
     case "front-matter":
-      return concat([node.raw, hardline]);
+      return [node.raw, hardline];
     case "css-root": {
       const nodes = printNodeSequence(path, options, print);
       const after = node.raws.after.trim();
 
-      return concat([
+      return [
         nodes,
         after ? ` ${after}` : "",
         getDocParts(nodes).length > 0 ? hardline : "",
-      ]);
+      ];
     }
     case "css-comment": {
       const isInlineComment = node.inline || node.raws.inline;
@@ -113,11 +112,11 @@ function genericPrint(path, options, print) {
       return isInlineComment ? text.trimEnd() : text;
     }
     case "css-rule": {
-      return concat([
+      return [
         path.call(print, "selector"),
         node.important ? " !important" : "",
         node.nodes
-          ? concat([
+          ? [
               node.selector &&
               node.selector.type === "selector-unknown" &&
               lastLineHasInlineComment(node.selector.value)
@@ -125,16 +124,14 @@ function genericPrint(path, options, print) {
                 : " ",
               "{",
               node.nodes.length > 0
-                ? indent(
-                    concat([hardline, printNodeSequence(path, options, print)])
-                  )
+                ? indent([hardline, printNodeSequence(path, options, print)])
                 : "",
               hardline,
               "}",
               isDetachedRulesetDeclarationNode(node) ? ";" : "",
-            ])
+            ]
           : ";",
-      ]);
+      ];
     }
     case "css-decl": {
       const parentNode = path.getParentNode();
@@ -148,17 +145,17 @@ function genericPrint(path, options, print) {
         : path.call(print, "value");
 
       if (!isColon && lastLineHasInlineComment(trimmedBetween)) {
-        value = indent(concat([hardline, dedent(value)]));
+        value = indent([hardline, dedent(value)]);
       }
 
-      return concat([
+      return [
         node.raws.before.replace(/[\s;]/g, ""),
         insideICSSRuleNode(path) ? node.prop : maybeToLowerCase(node.prop),
         trimmedBetween.startsWith("//") ? " " : "",
         trimmedBetween,
         node.extend ? "" : " ",
         isLessParser(options) && node.extend && node.selector
-          ? concat(["extend(", path.call(print, "selector"), ")"])
+          ? ["extend(", path.call(print, "selector"), ")"]
           : "",
         value,
         node.raws.important
@@ -177,14 +174,12 @@ function genericPrint(path, options, print) {
           ? " !global"
           : "",
         node.nodes
-          ? concat([
+          ? [
               " {",
-              indent(
-                concat([softline, printNodeSequence(path, options, print)])
-              ),
+              indent([softline, printNodeSequence(path, options, print)]),
               softline,
               "}",
-            ])
+            ]
           : isTemplatePropNode(node) &&
             !parentNode.raws.semicolon &&
             options.originalText[locEnd(node) - 1] !== ";"
@@ -192,7 +187,7 @@ function genericPrint(path, options, print) {
           : options.__isHTMLStyleAttribute && isLastNode(path, node)
           ? ifBreak(";", "")
           : ";",
-      ]);
+      ];
     }
     case "css-atrule": {
       const parentNode = path.getParentNode();
@@ -203,47 +198,45 @@ function genericPrint(path, options, print) {
 
       if (isLessParser(options)) {
         if (node.mixin) {
-          return concat([
+          return [
             path.call(print, "selector"),
             node.important ? " !important" : "",
             isTemplatePlaceholderNodeWithoutSemiColon ? "" : ";",
-          ]);
+          ];
         }
 
         if (node.function) {
-          return concat([
+          return [
             node.name,
             path.call(print, "params"),
             isTemplatePlaceholderNodeWithoutSemiColon ? "" : ";",
-          ]);
+          ];
         }
 
         if (node.variable) {
-          return concat([
+          return [
             "@",
             node.name,
             ": ",
             node.value ? path.call(print, "value") : "",
             node.raws.between.trim() ? node.raws.between.trim() + " " : "",
             node.nodes
-              ? concat([
+              ? [
                   "{",
-                  indent(
-                    concat([
-                      node.nodes.length > 0 ? softline : "",
-                      printNodeSequence(path, options, print),
-                    ])
-                  ),
+                  indent([
+                    node.nodes.length > 0 ? softline : "",
+                    printNodeSequence(path, options, print),
+                  ]),
                   softline,
                   "}",
-                ])
+                ]
               : "",
             isTemplatePlaceholderNodeWithoutSemiColon ? "" : ";",
-          ]);
+          ];
         }
       }
 
-      return concat([
+      return [
         "@",
         // If a Less file ends up being parsed with the SCSS parser, Less
         // variable declarations will be parsed as at-rules with names ending
@@ -252,7 +245,7 @@ function genericPrint(path, options, print) {
           ? node.name
           : maybeToLowerCase(node.name),
         node.params
-          ? concat([
+          ? [
               isDetachedRulesetCallNode(node)
                 ? ""
                 : isTemplatePlaceholderNode(node)
@@ -261,34 +254,30 @@ function genericPrint(path, options, print) {
                   : node.name.endsWith(":")
                   ? " "
                   : /^\s*\n\s*\n/.test(node.raws.afterName)
-                  ? concat([hardline, hardline])
+                  ? [hardline, hardline]
                   : /^\s*\n/.test(node.raws.afterName)
                   ? hardline
                   : " "
                 : " ",
               path.call(print, "params"),
-            ])
-          : "",
-        node.selector
-          ? indent(concat([" ", path.call(print, "selector")]))
+            ]
           : "",
+        node.selector ? indent([" ", path.call(print, "selector")]) : "",
         node.value
-          ? group(
-              concat([
-                " ",
-                path.call(print, "value"),
-                isSCSSControlDirectiveNode(node)
-                  ? hasParensAroundNode(node)
-                    ? " "
-                    : line
-                  : "",
-              ])
-            )
+          ? group([
+              " ",
+              path.call(print, "value"),
+              isSCSSControlDirectiveNode(node)
+                ? hasParensAroundNode(node)
+                  ? " "
+                  : line
+                : "",
+            ])
           : node.name === "else"
           ? " "
           : "",
         node.nodes
-          ? concat([
+          ? [
               isSCSSControlDirectiveNode(node)
                 ? ""
                 : (node.selector &&
@@ -301,19 +290,17 @@ function genericPrint(path, options, print) {
                 ? line
                 : " ",
               "{",
-              indent(
-                concat([
-                  node.nodes.length > 0 ? softline : "",
-                  printNodeSequence(path, options, print),
-                ])
-              ),
+              indent([
+                node.nodes.length > 0 ? softline : "",
+                printNodeSequence(path, options, print),
+              ]),
               softline,
               "}",
-            ])
+            ]
           : isTemplatePlaceholderNodeWithoutSemiColon
           ? ""
           : ";",
-      ]);
+      ];
     }
     // postcss-media-query-parser
     case "media-query-list": {
@@ -329,10 +316,10 @@ function genericPrint(path, options, print) {
       return group(indent(join(line, parts)));
     }
     case "media-query": {
-      return concat([
+      return [
         join(" ", path.map(print, "nodes")),
         isLastNode(path, node) ? "" : ",",
-      ]);
+      ];
     }
     case "media-type": {
       return adjustNumbers(adjustStrings(node.value, options));
@@ -341,7 +328,7 @@ function genericPrint(path, options, print) {
       if (!node.nodes) {
         return node.value;
       }
-      return concat(["(", ...path.map(print, "nodes"), ")"]);
+      return ["(", ...path.map(print, "nodes"), ")"];
     }
     case "media-feature": {
       return maybeToLowerCase(
@@ -349,7 +336,7 @@ function genericPrint(path, options, print) {
       );
     }
     case "media-colon": {
-      return concat([node.value, " "]);
+      return [node.value, " "];
     }
     case "media-value": {
       return adjustNumbers(adjustStrings(node.value, options));
@@ -368,25 +355,23 @@ function genericPrint(path, options, print) {
     }
     // postcss-selector-parser
     case "selector-root": {
-      return group(
-        concat([
-          insideAtRuleNode(path, "custom-selector")
-            ? concat([getAncestorNode(path, "css-atrule").customSelector, line])
-            : "",
-          join(
-            concat([
-              ",",
-              insideAtRuleNode(path, ["extend", "custom-selector", "nest"])
-                ? line
-                : hardline,
-            ]),
-            path.map(print, "nodes")
-          ),
-        ])
-      );
+      return group([
+        insideAtRuleNode(path, "custom-selector")
+          ? [getAncestorNode(path, "css-atrule").customSelector, line]
+          : "",
+        join(
+          [
+            ",",
+            insideAtRuleNode(path, ["extend", "custom-selector", "nest"])
+              ? line
+              : hardline,
+          ],
+          path.map(print, "nodes")
+        ),
+      ]);
     }
     case "selector-selector": {
-      return group(indent(concat(path.map(print, "nodes"))));
+      return group(indent(path.map(print, "nodes")));
     }
     case "selector-comment": {
       return node.value;
@@ -399,9 +384,9 @@ function genericPrint(path, options, print) {
       const index = parentNode && parentNode.nodes.indexOf(node);
       const prevNode = index && parentNode.nodes[index - 1];
 
-      return concat([
+      return [
         node.namespace
-          ? concat([node.namespace === true ? "" : node.namespace.trim(), "|"])
+          ? [node.namespace === true ? "" : node.namespace.trim(), "|"]
           : "",
         prevNode.type === "selector-nesting"
           ? node.value
@@ -410,19 +395,19 @@ function genericPrint(path, options, print) {
                 ? node.value.toLowerCase()
                 : node.value
             ),
-      ]);
+      ];
     }
     case "selector-id": {
-      return concat(["#", node.value]);
+      return ["#", node.value];
     }
     case "selector-class": {
-      return concat([".", adjustNumbers(adjustStrings(node.value, options))]);
+      return [".", adjustNumbers(adjustStrings(node.value, options))];
     }
     case "selector-attribute": {
-      return concat([
+      return [
         "[",
         node.namespace
-          ? concat([node.namespace === true ? "" : node.namespace.trim(), "|"])
+          ? [node.namespace === true ? "" : node.namespace.trim(), "|"]
           : "",
         node.attribute.trim(),
         node.operator ? node.operator : "",
@@ -434,7 +419,7 @@ function genericPrint(path, options, print) {
           : "",
         node.insensitive ? " i" : "",
         "]",
-      ]);
+      ];
     }
     case "selector-combinator": {
       if (
@@ -450,30 +435,30 @@ function genericPrint(path, options, print) {
             ? ""
             : line;
 
-        return concat([leading, node.value, isLastNode(path, node) ? "" : " "]);
+        return [leading, node.value, isLastNode(path, node) ? "" : " "];
       }
 
       const leading = node.value.trim().startsWith("(") ? line : "";
       const value =
         adjustNumbers(adjustStrings(node.value.trim(), options)) || line;
 
-      return concat([leading, value]);
+      return [leading, value];
     }
     case "selector-universal": {
-      return concat([
+      return [
         node.namespace
-          ? concat([node.namespace === true ? "" : node.namespace.trim(), "|"])
+          ? [node.namespace === true ? "" : node.namespace.trim(), "|"]
           : "",
         node.value,
-      ]);
+      ];
     }
     case "selector-pseudo": {
-      return concat([
+      return [
         maybeToLowerCase(node.value),
         isNonEmptyArray(node.nodes)
-          ? concat(["(", join(", ", path.map(print, "nodes")), ")"])
+          ? ["(", join(", ", path.map(print, "nodes")), ")"]
           : "",
-      ]);
+      ];
     }
     case "selector-nesting": {
       return node.value;
@@ -509,7 +494,7 @@ function genericPrint(path, options, print) {
         const selector = options.originalText.slice(start, end).trim();
 
         return lastLineHasInlineComment(selector)
-          ? concat([breakParent, selector])
+          ? [breakParent, selector]
           : selector;
       }
 
@@ -820,7 +805,7 @@ function genericPrint(path, options, print) {
       }
 
       if (isControlDirective) {
-        return group(indent(concat(parts)));
+        return group(indent(parts));
       }
 
       // Indent is not needed for import url when url is very long
@@ -846,11 +831,11 @@ function genericPrint(path, options, print) {
             node.groups[0].groups[0].type === "value-word" &&
             node.groups[0].groups[0].value.startsWith("data:")))
       ) {
-        return concat([
+        return [
           node.open ? path.call(print, "open") : "",
           join(",", path.map(print, "groups")),
           node.close ? path.call(print, "close") : "",
-        ]);
+        ];
       }
 
       if (!node.open) {
@@ -859,7 +844,7 @@ function genericPrint(path, options, print) {
 
         for (let i = 0; i < printed.length; i++) {
           if (i !== 0) {
-            res.push(concat([",", line]));
+            res.push([",", line]);
           }
           res.push(printed[i]);
         }
@@ -873,36 +858,34 @@ function genericPrint(path, options, print) {
       const isLastItemComment = lastItem && lastItem.type === "value-comment";
 
       return group(
-        concat([
+        [
           node.open ? path.call(print, "open") : "",
-          indent(
-            concat([
-              softline,
-              join(
-                concat([",", line]),
-                path.map((childPath) => {
-                  const node = childPath.getValue();
-                  const printed = print(childPath);
+          indent([
+            softline,
+            join(
+              [",", line],
+              path.map((childPath) => {
+                const node = childPath.getValue();
+                const printed = print(childPath);
 
-                  // Key/Value pair in open paren already indented
-                  if (
-                    isKeyValuePairNode(node) &&
-                    node.type === "value-comma_group" &&
-                    node.groups &&
-                    node.groups[2] &&
-                    node.groups[2].type === "value-paren_group"
-                  ) {
-                    const parts = getDocParts(printed.contents.contents);
-                    parts[1] = group(parts[1]);
+                // Key/Value pair in open paren already indented
+                if (
+                  isKeyValuePairNode(node) &&
+                  node.type === "value-comma_group" &&
+                  node.groups &&
+                  node.groups[2] &&
+                  node.groups[2].type === "value-paren_group"
+                ) {
+                  const parts = getDocParts(printed.contents.contents);
+                  parts[1] = group(parts[1]);
 
-                    return group(dedent(printed));
-                  }
+                  return group(dedent(printed));
+                }
 
-                  return printed;
-                }, "groups")
-              ),
-            ])
-          ),
+                return printed;
+              }, "groups")
+            ),
+          ]),
           ifBreak(
             !isLastItemComment &&
               isSCSS(options.parser, options.originalText) &&
@@ -913,26 +896,26 @@ function genericPrint(path, options, print) {
           ),
           softline,
           node.close ? path.call(print, "close") : "",
-        ]),
+        ],
         {
           shouldBreak: isSCSSMapItem,
         }
       );
     }
     case "value-func": {
-      return concat([
+      return [
         node.value,
         insideAtRuleNode(path, "supports") && isMediaAndSupportsKeywords(node)
           ? " "
           : "",
         path.call(print, "group"),
-      ]);
+      ];
     }
     case "value-paren": {
       return node.value;
     }
     case "value-number": {
-      return concat([printCssNumber(node.value), maybeToLowerCase(node.unit)]);
+      return [printCssNumber(node.value), maybeToLowerCase(node.unit)];
     }
     case "value-operator": {
       return node.value;
@@ -948,7 +931,7 @@ function genericPrint(path, options, print) {
       const parentNode = path.getParentNode();
       const index = parentNode && parentNode.groups.indexOf(node);
       const prevNode = index && parentNode.groups[index - 1];
-      return concat([
+      return [
         node.value,
         // Don't add spaces on escaped colon `:`, e.g: grid-template-rows: [row-1-00\:00] auto;
         (prevNode && prevNode.value[prevNode.value.length - 1] === "\\") ||
@@ -956,12 +939,12 @@ function genericPrint(path, options, print) {
         insideValueFunctionNode(path, "url")
           ? ""
           : line,
-      ]);
+      ];
     }
     // TODO: confirm this code is dead
     /* istanbul ignore next */
     case "value-comma": {
-      return concat([node.value, " "]);
+      return [node.value, " "];
     }
     case "value-string": {
       return printString(
@@ -970,7 +953,7 @@ function genericPrint(path, options, print) {
       );
     }
     case "value-atword": {
-      return concat(["@", node.value]);
+      return ["@", node.value];
     }
     case "value-unicode-range": {
       return node.value;
@@ -1025,7 +1008,7 @@ function printNodeSequence(path, options, print) {
     }
   }, "nodes");
 
-  return concat(parts);
+  return parts;
 }
 
 const STRING_REGEX = /(["'])(?:(?!\1)[^\\]|\\[\S\s])*\1/g;
diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js
index 023270a00..b751d283d 100644
--- a/src/language-graphql/printer-graphql.js
+++ b/src/language-graphql/printer-graphql.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { concat, join, hardline, line, softline, group, indent, ifBreak },
+  builders: { join, hardline, line, softline, group, indent, ifBreak },
 } = require("../document");
 const { isNextLineEmpty, isNonEmptyArray } = require("../common/util");
 const { insertPragma } = require("./pragma");
@@ -31,136 +31,119 @@ function genericPrint(path, options, print) {
           }
         }
       }, "definitions");
-      return concat([...parts, hardline]);
+      return [...parts, hardline];
     }
     case "OperationDefinition": {
       const hasOperation = options.originalText[locStart(n)] !== "{";
       const hasName = !!n.name;
-      return concat([
+      return [
         hasOperation ? n.operation : "",
-        hasOperation && hasName ? concat([" ", path.call(print, "name")]) : "",
+        hasOperation && hasName ? [" ", path.call(print, "name")] : "",
         isNonEmptyArray(n.variableDefinitions)
-          ? group(
-              concat([
-                "(",
-                indent(
-                  concat([
-                    softline,
-                    join(
-                      concat([ifBreak("", ", "), softline]),
-                      path.map(print, "variableDefinitions")
-                    ),
-                  ])
-                ),
+          ? group([
+              "(",
+              indent([
                 softline,
-                ")",
-              ])
-            )
+                join(
+                  [ifBreak("", ", "), softline],
+                  path.map(print, "variableDefinitions")
+                ),
+              ]),
+              softline,
+              ")",
+            ])
           : "",
         printDirectives(path, print, n),
         n.selectionSet ? (!hasOperation && !hasName ? "" : " ") : "",
         path.call(print, "selectionSet"),
-      ]);
+      ];
     }
     case "FragmentDefinition": {
-      return concat([
+      return [
         "fragment ",
         path.call(print, "name"),
         isNonEmptyArray(n.variableDefinitions)
-          ? group(
-              concat([
-                "(",
-                indent(
-                  concat([
-                    softline,
-                    join(
-                      concat([ifBreak("", ", "), softline]),
-                      path.map(print, "variableDefinitions")
-                    ),
-                  ])
-                ),
+          ? group([
+              "(",
+              indent([
                 softline,
-                ")",
-              ])
-            )
+                join(
+                  [ifBreak("", ", "), softline],
+                  path.map(print, "variableDefinitions")
+                ),
+              ]),
+              softline,
+              ")",
+            ])
           : "",
         " on ",
         path.call(print, "typeCondition"),
         printDirectives(path, print, n),
         " ",
         path.call(print, "selectionSet"),
-      ]);
+      ];
     }
     case "SelectionSet": {
-      return concat([
+      return [
         "{",
-        indent(
-          concat([
+        indent([
+          hardline,
+          join(
             hardline,
-            join(
-              hardline,
-              path.call(
-                (selectionsPath) =>
-                  printSequence(selectionsPath, options, print),
-                "selections"
-              )
-            ),
-          ])
-        ),
+            path.call(
+              (selectionsPath) => printSequence(selectionsPath, options, print),
+              "selections"
+            )
+          ),
+        ]),
         hardline,
         "}",
-      ]);
+      ];
     }
     case "Field": {
-      return group(
-        concat([
-          n.alias ? concat([path.call(print, "alias"), ": "]) : "",
-          path.call(print, "name"),
-          n.arguments.length > 0
-            ? group(
-                concat([
-                  "(",
-                  indent(
-                    concat([
-                      softline,
-                      join(
-                        concat([ifBreak("", ", "), softline]),
-                        path.call(
-                          (argsPath) => printSequence(argsPath, options, print),
-                          "arguments"
-                        )
-                      ),
-                    ])
-                  ),
-                  softline,
-                  ")",
-                ])
-              )
-            : "",
-          printDirectives(path, print, n),
-          n.selectionSet ? " " : "",
-          path.call(print, "selectionSet"),
-        ])
-      );
+      return group([
+        n.alias ? [path.call(print, "alias"), ": "] : "",
+        path.call(print, "name"),
+        n.arguments.length > 0
+          ? group([
+              "(",
+              indent([
+                softline,
+                join(
+                  [ifBreak("", ", "), softline],
+                  path.call(
+                    (argsPath) => printSequence(argsPath, options, print),
+                    "arguments"
+                  )
+                ),
+              ]),
+              softline,
+              ")",
+            ])
+          : "",
+        printDirectives(path, print, n),
+        n.selectionSet ? " " : "",
+        path.call(print, "selectionSet"),
+      ]);
     }
     case "Name": {
       return n.value;
     }
     case "StringValue": {
       if (n.block) {
-        return concat([
+        return [
           '"""',
           hardline,
           join(hardline, n.value.replace(/"""/g, "\\$&").split("\n")),
           hardline,
           '"""',
-        ]);
+        ];
       }
-      return concat([
+      return [
         '"',
         n.value.replace(/["\\]/g, "\\$&").replace(/\n/g, "\\n"),
         '"',
-      ]);
+      ];
     }
     case "IntValue":
     case "FloatValue":
@@ -174,81 +157,59 @@ function genericPrint(path, options, print) {
       return "null";
     }
     case "Variable": {
-      return concat(["$", path.call(print, "name")]);
+      return ["$", path.call(print, "name")];
     }
     case "ListValue": {
-      return group(
-        concat([
-          "[",
-          indent(
-            concat([
-              softline,
-              join(
-                concat([ifBreak("", ", "), softline]),
-                path.map(print, "values")
-              ),
-            ])
-          ),
+      return group([
+        "[",
+        indent([
           softline,
-          "]",
-        ])
-      );
+          join([ifBreak("", ", "), softline], path.map(print, "values")),
+        ]),
+        softline,
+        "]",
+      ]);
     }
     case "ObjectValue": {
-      return group(
-        concat([
-          "{",
-          options.bracketSpacing && n.fields.length > 0 ? " " : "",
-          indent(
-            concat([
-              softline,
-              join(
-                concat([ifBreak("", ", "), softline]),
-                path.map(print, "fields")
-              ),
-            ])
-          ),
+      return group([
+        "{",
+        options.bracketSpacing && n.fields.length > 0 ? " " : "",
+        indent([
           softline,
-          ifBreak("", options.bracketSpacing && n.fields.length > 0 ? " " : ""),
-          "}",
-        ])
-      );
+          join([ifBreak("", ", "), softline], path.map(print, "fields")),
+        ]),
+        softline,
+        ifBreak("", options.bracketSpacing && n.fields.length > 0 ? " " : ""),
+        "}",
+      ]);
     }
     case "ObjectField":
     case "Argument": {
-      return concat([
-        path.call(print, "name"),
-        ": ",
-        path.call(print, "value"),
-      ]);
+      return [path.call(print, "name"), ": ", path.call(print, "value")];
     }
 
     case "Directive": {
-      return concat([
+      return [
         "@",
         path.call(print, "name"),
         n.arguments.length > 0
-          ? group(
-              concat([
-                "(",
-                indent(
-                  concat([
-                    softline,
-                    join(
-                      concat([ifBreak("", ", "), softline]),
-                      path.call(
-                        (argsPath) => printSequence(argsPath, options, print),
-                        "arguments"
-                      )
-                    ),
-                  ])
-                ),
+          ? group([
+              "(",
+              indent([
                 softline,
-                ")",
-              ])
-            )
+                join(
+                  [ifBreak("", ", "), softline],
+                  path.call(
+                    (argsPath) => printSequence(argsPath, options, print),
+                    "arguments"
+                  )
+                ),
+              ]),
+              softline,
+              ")",
+            ])
           : "",
-      ]);
+      ];
     }
 
     case "NamedType": {
@@ -256,118 +217,108 @@ function genericPrint(path, options, print) {
     }
 
     case "VariableDefinition": {
-      return concat([
+      return [
         path.call(print, "variable"),
         ": ",
         path.call(print, "type"),
-        n.defaultValue ? concat([" = ", path.call(print, "defaultValue")]) : "",
+        n.defaultValue ? [" = ", path.call(print, "defaultValue")] : "",
         printDirectives(path, print, n),
-      ]);
+      ];
     }
 
     case "ObjectTypeExtension":
     case "ObjectTypeDefinition": {
-      return concat([
+      return [
         path.call(print, "description"),
         n.description ? hardline : "",
         n.kind === "ObjectTypeExtension" ? "extend " : "",
         "type ",
         path.call(print, "name"),
         n.interfaces.length > 0
-          ? concat([" implements ", ...printInterfaces(path, options, print)])
+          ? [" implements ", ...printInterfaces(path, options, print)]
           : "",
         printDirectives(path, print, n),
         n.fields.length > 0
-          ? concat([
+          ? [
               " {",
-              indent(
-                concat([
+              indent([
+                hardline,
+                join(
                   hardline,
-                  join(
-                    hardline,
-                    path.call(
-                      (fieldsPath) => printSequence(fieldsPath, options, print),
-                      "fields"
-                    )
-                  ),
-                ])
-              ),
+                  path.call(
+                    (fieldsPath) => printSequence(fieldsPath, options, print),
+                    "fields"
+                  )
+                ),
+              ]),
               hardline,
               "}",
-            ])
+            ]
           : "",
-      ]);
+      ];
     }
 
     case "FieldDefinition": {
-      return concat([
+      return [
         path.call(print, "description"),
         n.description ? hardline : "",
         path.call(print, "name"),
         n.arguments.length > 0
-          ? group(
-              concat([
-                "(",
-                indent(
-                  concat([
-                    softline,
-                    join(
-                      concat([ifBreak("", ", "), softline]),
-                      path.call(
-                        (argsPath) => printSequence(argsPath, options, print),
-                        "arguments"
-                      )
-                    ),
-                  ])
-                ),
+          ? group([
+              "(",
+              indent([
                 softline,
-                ")",
-              ])
-            )
+                join(
+                  [ifBreak("", ", "), softline],
+                  path.call(
+                    (argsPath) => printSequence(argsPath, options, print),
+                    "arguments"
+                  )
+                ),
+              ]),
+              softline,
+              ")",
+            ])
           : "",
         ": ",
         path.call(print, "type"),
         printDirectives(path, print, n),
-      ]);
+      ];
     }
 
     case "DirectiveDefinition": {
-      return concat([
+      return [
         path.call(print, "description"),
         n.description ? hardline : "",
         "directive ",
         "@",
         path.call(print, "name"),
         n.arguments.length > 0
-          ? group(
-              concat([
-                "(",
-                indent(
-                  concat([
-                    softline,
-                    join(
-                      concat([ifBreak("", ", "), softline]),
-                      path.call(
-                        (argsPath) => printSequence(argsPath, options, print),
-                        "arguments"
-                      )
-                    ),
-                  ])
-                ),
+          ? group([
+              "(",
+              indent([
                 softline,
-                ")",
-              ])
-            )
+                join(
+                  [ifBreak("", ", "), softline],
+                  path.call(
+                    (argsPath) => printSequence(argsPath, options, print),
+                    "arguments"
+                  )
+                ),
+              ]),
+              softline,
+              ")",
+            ])
           : "",
         n.repeatable ? " repeatable" : "",
         " on ",
         join(" | ", path.map(print, "locations")),
-      ]);
+      ];
     }
 
     case "EnumTypeExtension":
     case "EnumTypeDefinition": {
-      return concat([
+      return [
         path.call(print, "description"),
         n.description ? hardline : "",
         n.kind === "EnumTypeExtension" ? "extend " : "",
@@ -376,51 +327,49 @@ function genericPrint(path, options, print) {
         printDirectives(path, print, n),
 
         n.values.length > 0
-          ? concat([
+          ? [
               " {",
-              indent(
-                concat([
+              indent([
+                hardline,
+                join(
                   hardline,
-                  join(
-                    hardline,
-                    path.call(
-                      (valuesPath) => printSequence(valuesPath, options, print),
-                      "values"
-                    )
-                  ),
-                ])
-              ),
+                  path.call(
+                    (valuesPath) => printSequence(valuesPath, options, print),
+                    "values"
+                  )
+                ),
+              ]),
               hardline,
               "}",
-            ])
+            ]
           : "",
-      ]);
+      ];
     }
 
     case "EnumValueDefinition": {
-      return concat([
+      return [
         path.call(print, "description"),
         n.description ? hardline : "",
         path.call(print, "name"),
         printDirectives(path, print, n),
-      ]);
+      ];
     }
 
     case "InputValueDefinition": {
-      return concat([
+      return [
         path.call(print, "description"),
         n.description ? (n.description.block ? hardline : line) : "",
         path.call(print, "name"),
         ": ",
         path.call(print, "type"),
-        n.defaultValue ? concat([" = ", path.call(print, "defaultValue")]) : "",
+        n.defaultValue ? [" = ", path.call(print, "defaultValue")] : "",
         printDirectives(path, print, n),
-      ]);
+      ];
     }
 
     case "InputObjectTypeExtension":
     case "InputObjectTypeDefinition": {
-      return concat([
+      return [
         path.call(print, "description"),
         n.description ? hardline : "",
         n.kind === "InputObjectTypeExtension" ? "extend " : "",
@@ -428,161 +377,139 @@ function genericPrint(path, options, print) {
         path.call(print, "name"),
         printDirectives(path, print, n),
         n.fields.length > 0
-          ? concat([
+          ? [
               " {",
-              indent(
-                concat([
-                  hardline,
-                  join(
-                    hardline,
-                    path.call(
-                      (fieldsPath) => printSequence(fieldsPath, options, print),
-                      "fields"
-                    )
-                  ),
-                ])
-              ),
-              hardline,
-              "}",
-            ])
-          : "",
-      ]);
-    }
-
-    case "SchemaDefinition": {
-      return concat([
-        "schema",
-        printDirectives(path, print, n),
-        " {",
-        n.operationTypes.length > 0
-          ? indent(
-              concat([
+              indent([
                 hardline,
                 join(
                   hardline,
                   path.call(
-                    (opsPath) => printSequence(opsPath, options, print),
-                    "operationTypes"
+                    (fieldsPath) => printSequence(fieldsPath, options, print),
+                    "fields"
                   )
                 ),
-              ])
-            )
+              ]),
+              hardline,
+              "}",
+            ]
+          : "",
+      ];
+    }
+
+    case "SchemaDefinition": {
+      return [
+        "schema",
+        printDirectives(path, print, n),
+        " {",
+        n.operationTypes.length > 0
+          ? indent([
+              hardline,
+              join(
+                hardline,
+                path.call(
+                  (opsPath) => printSequence(opsPath, options, print),
+                  "operationTypes"
+                )
+              ),
+            ])
           : "",
         hardline,
         "}",
-      ]);
+      ];
     }
 
     case "OperationTypeDefinition": {
-      return concat([
-        path.call(print, "operation"),
-        ": ",
-        path.call(print, "type"),
-      ]);
+      return [path.call(print, "operation"), ": ", path.call(print, "type")];
     }
 
     case "InterfaceTypeExtension":
     case "InterfaceTypeDefinition": {
-      return concat([
+      return [
         path.call(print, "description"),
         n.description ? hardline : "",
         n.kind === "InterfaceTypeExtension" ? "extend " : "",
         "interface ",
         path.call(print, "name"),
         n.interfaces.length > 0
-          ? concat([" implements ", ...printInterfaces(path, options, print)])
+          ? [" implements ", ...printInterfaces(path, options, print)]
           : "",
         printDirectives(path, print, n),
         n.fields.length > 0
-          ? concat([
+          ? [
               " {",
-              indent(
-                concat([
+              indent([
+                hardline,
+                join(
                   hardline,
-                  join(
-                    hardline,
-                    path.call(
-                      (fieldsPath) => printSequence(fieldsPath, options, print),
-                      "fields"
-                    )
-                  ),
-                ])
-              ),
+                  path.call(
+                    (fieldsPath) => printSequence(fieldsPath, options, print),
+                    "fields"
+                  )
+                ),
+              ]),
               hardline,
               "}",
-            ])
+            ]
           : "",
-      ]);
+      ];
     }
 
     case "FragmentSpread": {
-      return concat([
-        "...",
-        path.call(print, "name"),
-        printDirectives(path, print, n),
-      ]);
+      return ["...", path.call(print, "name"), printDirectives(path, print, n)];
     }
 
     case "InlineFragment": {
-      return concat([
+      return [
         "...",
-        n.typeCondition
-          ? concat([" on ", path.call(print, "typeCondition")])
-          : "",
+        n.typeCondition ? [" on ", path.call(print, "typeCondition")] : "",
         printDirectives(path, print, n),
         " ",
         path.call(print, "selectionSet"),
-      ]);
+      ];
     }
 
     case "UnionTypeExtension":
     case "UnionTypeDefinition": {
-      return group(
-        concat([
-          path.call(print, "description"),
-          n.description ? hardline : "",
-          group(
-            concat([
-              n.kind === "UnionTypeExtension" ? "extend " : "",
-              "union ",
-              path.call(print, "name"),
-              printDirectives(path, print, n),
-              n.types.length > 0
-                ? concat([
-                    " =",
-                    ifBreak("", " "),
-                    indent(
-                      concat([
-                        ifBreak(concat([line, "  "])),
-                        join(concat([line, "| "]), path.map(print, "types")),
-                      ])
-                    ),
-                  ])
-                : "",
-            ])
-          ),
-        ])
-      );
+      return group([
+        path.call(print, "description"),
+        n.description ? hardline : "",
+        group([
+          n.kind === "UnionTypeExtension" ? "extend " : "",
+          "union ",
+          path.call(print, "name"),
+          printDirectives(path, print, n),
+          n.types.length > 0
+            ? [
+                " =",
+                ifBreak("", " "),
+                indent([
+                  ifBreak([line, "  "]),
+                  join([line, "| "], path.map(print, "types")),
+                ]),
+              ]
+            : "",
+        ]),
+      ]);
     }
 
     case "ScalarTypeExtension":
     case "ScalarTypeDefinition": {
-      return concat([
+      return [
         path.call(print, "description"),
         n.description ? hardline : "",
         n.kind === "ScalarTypeExtension" ? "extend " : "",
         "scalar ",
         path.call(print, "name"),
         printDirectives(path, print, n),
-      ]);
+      ];
     }
 
     case "NonNullType": {
-      return concat([path.call(print, "type"), "!"]);
+      return [path.call(print, "type"), "!"];
     }
 
     case "ListType": {
-      return concat(["[", path.call(print, "type"), "]"]);
+      return ["[", path.call(print, "type"), "]"];
     }
 
     default:
@@ -599,10 +526,10 @@ function printDirectives(path, print, n) {
   const printed = join(line, path.map(print, "directives"));
 
   if (n.kind === "FragmentDefinition" || n.kind === "OperationDefinition") {
-    return group(concat([line, printed]));
+    return group([line, printed]);
   }
 
-  return concat([" ", group(indent(concat([softline, printed])))]);
+  return [" ", group(indent([softline, printed]))];
 }
 
 function printSequence(sequencePath, options, print) {
@@ -615,7 +542,7 @@ function printSequence(sequencePath, options, print) {
       isNextLineEmpty(options.originalText, path.getValue(), locEnd) &&
       i < count - 1
     ) {
-      return concat([printed, hardline]);
+      return [printed, hardline];
     }
 
     return printed;
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 0dceed30e..26d1c5d25 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { concat, group, hardline, ifBreak, indent, join, line, softline },
+  builders: { group, hardline, ifBreak, indent, join, line, softline },
   utils: { getDocParts },
 } = require("../document");
 const { locStart, locEnd } = require("./loc");
@@ -37,31 +37,29 @@ function print(path, options, print) {
     case "Block":
     case "Program":
     case "Template": {
-      return group(concat(path.map(print, "body")));
+      return group(path.map(print, "body"));
     }
     case "ElementNode": {
       // TODO: make it whitespace sensitive
       const bim = isNextNodeOfSomeType(path, ["ElementNode"]) ? hardline : "";
 
       if (isVoid(n)) {
-        return concat([group(printStartingTag(path, print)), bim]);
+        return [group(printStartingTag(path, print)), bim];
       }
 
       const isWhitespaceOnly = n.children.every((n) => isWhitespaceNode(n));
 
-      return concat([
+      return [
         group(printStartingTag(path, print)),
-        group(
-          concat([
-            isWhitespaceOnly ? "" : indent(printChildren(path, options, print)),
-            n.children.length > 0 ? hardline : "",
-            "</",
-            n.tag,
-            ">",
-          ])
-        ),
+        group([
+          isWhitespaceOnly ? "" : indent(printChildren(path, options, print)),
+          n.children.length > 0 ? hardline : "",
+          "</",
+          n.tag,
+          ">",
+        ]),
         bim,
-      ]);
+      ];
     }
     case "BlockStatement": {
       const pp = path.getParentNode(1);
@@ -74,28 +72,24 @@ function print(path, options, print) {
         pp.inverse.body[0].path.parts[0] === "if";
 
       if (isElseIf) {
-        return concat([
+        return [
           printElseIfBlock(path, print),
           printProgram(path, print),
           printInverse(path, print),
-        ]);
+        ];
       }
 
-      return concat([
+      return [
         printOpenBlock(path, print),
-        group(
-          concat([
-            printProgram(path, print),
-            printInverse(path, print),
-            printCloseBlock(path, print),
-          ])
-        ),
-      ]);
+        group([
+          printProgram(path, print),
+          printInverse(path, print),
+          printCloseBlock(path, print),
+        ]),
+      ];
     }
     case "ElementModifierStatement": {
-      return group(
-        concat(["{{", printPathAndParams(path, print), softline, "}}"])
-      );
+      return group(["{{", printPathAndParams(path, print), softline, "}}"]);
     }
     case "MustacheStatement": {
       const isParentOfSpecifiedTypes = isParentOfSomeType(path, [
@@ -111,26 +105,22 @@ function print(path, options, print) {
       const shouldBreakOpeningMustache =
         isParentOfSpecifiedTypes || isChildOfElementNodeAndDoesNotHaveParams;
 
-      return group(
-        concat([
-          printOpeningMustache(n),
-          shouldBreakOpeningMustache ? indent(softline) : "",
-          printPathAndParams(path, print),
-          softline,
-          printClosingMustache(n),
-        ])
-      );
+      return group([
+        printOpeningMustache(n),
+        shouldBreakOpeningMustache ? indent(softline) : "",
+        printPathAndParams(path, print),
+        softline,
+        printClosingMustache(n),
+      ]);
     }
 
     case "SubExpression": {
-      return group(
-        concat([
-          "(",
-          printSubExpressionPathAndParams(path, print),
-          softline,
-          ")",
-        ])
-      );
+      return group([
+        "(",
+        printSubExpressionPathAndParams(path, print),
+        softline,
+        ")",
+      ]);
     }
     case "AttrNode": {
       const isText = n.value.type === "TextNode";
@@ -149,23 +139,23 @@ function print(path, options, print) {
             options
           )
         : value;
-      return concat([n.name, "=", quotedValue]);
+      return [n.name, "=", quotedValue];
     }
 
     case "ConcatStatement": {
       const quote = options.singleQuote ? "'" : '"';
-      return concat([
+      return [
         quote,
         ...path.map((partPath) => print(partPath), "parts"),
         quote,
-      ]);
+      ];
     }
 
     case "Hash": {
       return join(line, path.map(print, "pairs"));
     }
     case "HashPair": {
-      return concat([n.key, "=", path.call(print, "value")]);
+      return [n.key, "=", path.call(print, "value")];
     }
     case "TextNode": {
       const maxLineBreaksToPreserve = 2;
@@ -221,14 +211,14 @@ function print(path, options, print) {
           }
         }
 
-        return concat([
+        return [
           ...generateHardlines(leadingLineBreaksCount, maxLineBreaksToPreserve),
           n.chars.replace(/^\s+/g, leadingSpace).replace(/\s+$/, trailingSpace),
           ...generateHardlines(
             trailingLineBreaksCount,
             maxLineBreaksToPreserve
           ),
-        ]);
+        ];
       }
 
       let leadingSpace = "";
@@ -267,11 +257,11 @@ function print(path, options, print) {
         text = "\\" + text;
       }
 
-      return concat([
+      return [
         ...generateHardlines(leadingLineBreaksCount, maxLineBreaksToPreserve),
         text.replace(/^\s+/g, leadingSpace).replace(/\s+$/, trailingSpace),
         ...generateHardlines(trailingLineBreaksCount, maxLineBreaksToPreserve),
-      ]);
+      ];
     }
     case "MustacheCommentStatement": {
       const start = locStart(n);
@@ -284,7 +274,7 @@ function print(path, options, print) {
         options.originalText.charAt(end - 3) === "~";
 
       const dashes = n.value.includes("}}") ? "--" : "";
-      return concat([
+      return [
         "{{",
         isLeftWhiteSpaceSensitive ? "~" : "",
         "!",
@@ -293,7 +283,7 @@ function print(path, options, print) {
         dashes,
         isRightWhitespaceSensitive ? "~" : "",
         "}}",
-      ]);
+      ];
     }
     case "PathExpression": {
       return n.original;
@@ -302,7 +292,7 @@ function print(path, options, print) {
       return String(n.value);
     }
     case "CommentStatement": {
-      return concat(["<!--", n.value, "-->"]);
+      return ["<!--", n.value, "-->"];
     }
     case "StringLiteral": {
       return printStringLiteral(n.value, options);
@@ -328,50 +318,46 @@ function print(path, options, print) {
 function printStartingTag(path, print) {
   const node = path.getValue();
 
-  return concat([
+  return [
     "<",
     node.tag,
     printAttributesLike(path, print),
     printBlockParams(node),
     printStartingTagEndMarker(node),
-  ]);
+  ];
 }
 
 function printAttributesLike(path, print) {
   const node = path.getValue();
 
-  return indent(
-    concat([
-      node.attributes.length > 0 ? line : "",
-      join(line, path.map(print, "attributes")),
+  return indent([
+    node.attributes.length > 0 ? line : "",
+    join(line, path.map(print, "attributes")),
 
-      node.modifiers.length > 0 ? line : "",
-      join(line, path.map(print, "modifiers")),
+    node.modifiers.length > 0 ? line : "",
+    join(line, path.map(print, "modifiers")),
 
-      node.comments.length > 0 ? line : "",
-      join(line, path.map(print, "comments")),
-    ])
-  );
+    node.comments.length > 0 ? line : "",
+    join(line, path.map(print, "comments")),
+  ]);
 }
 
 function printChildren(path, options, print) {
-  return concat(
-    path.map((childPath, childIndex) => {
-      if (childIndex === 0) {
-        return concat([softline, print(childPath, options, print)]);
-      }
+  return path.map((childPath, childIndex) => {
+    if (childIndex === 0) {
+      return [softline, print(childPath, options, print)];
+    }
 
-      return print(childPath, options, print);
-    }, "children")
-  );
+    return print(childPath, options, print);
+  }, "children");
 }
 
 function printStartingTagEndMarker(node) {
   if (isVoid(node)) {
-    return ifBreak(concat([softline, "/>"]), concat([" />", softline]));
+    return ifBreak([softline, "/>"], [" />", softline]);
   }
 
-  return ifBreak(concat([softline, ">"]), ">");
+  return ifBreak([softline, ">"], ">");
 }
 
 /* MustacheStatement print helpers */
@@ -379,13 +365,13 @@ function printStartingTagEndMarker(node) {
 function printOpeningMustache(node) {
   const mustache = node.escaped === false ? "{{{" : "{{";
   const strip = node.strip && node.strip.open ? "~" : "";
-  return concat([mustache, strip]);
+  return [mustache, strip];
 }
 
 function printClosingMustache(node) {
   const mustache = node.escaped === false ? "}}}" : "}}";
   const strip = node.strip && node.strip.close ? "~" : "";
-  return concat([strip, mustache]);
+  return [strip, mustache];
 }
 
 /* BlockStatement print helpers */
@@ -393,82 +379,80 @@ function printClosingMustache(node) {
 function printOpeningBlockOpeningMustache(node) {
   const opening = printOpeningMustache(node);
   const strip = node.openStrip.open ? "~" : "";
-  return concat([opening, strip, "#"]);
+  return [opening, strip, "#"];
 }
 
 function printOpeningBlockClosingMustache(node) {
   const closing = printClosingMustache(node);
   const strip = node.openStrip.close ? "~" : "";
-  return concat([strip, closing]);
+  return [strip, closing];
 }
 
 function printClosingBlockOpeningMustache(node) {
   const opening = printOpeningMustache(node);
   const strip = node.closeStrip.open ? "~" : "";
-  return concat([opening, strip, "/"]);
+  return [opening, strip, "/"];
 }
 
 function printClosingBlockClosingMustache(node) {
   const closing = printClosingMustache(node);
   const strip = node.closeStrip.close ? "~" : "";
-  return concat([strip, closing]);
+  return [strip, closing];
 }
 
 function printInverseBlockOpeningMustache(node) {
   const opening = printOpeningMustache(node);
   const strip = node.inverseStrip.open ? "~" : "";
-  return concat([opening, strip]);
+  return [opening, strip];
 }
 
 function printInverseBlockClosingMustache(node) {
   const closing = printClosingMustache(node);
   const strip = node.inverseStrip.close ? "~" : "";
-  return concat([strip, closing]);
+  return [strip, closing];
 }
 
 function printOpenBlock(path, print) {
   const node = path.getValue();
 
-  return group(
-    concat([
-      printOpeningBlockOpeningMustache(node),
-      printPathAndParams(path, print),
-      printBlockParams(node.program),
-      softline,
-      printOpeningBlockClosingMustache(node),
-    ])
-  );
+  return group([
+    printOpeningBlockOpeningMustache(node),
+    printPathAndParams(path, print),
+    printBlockParams(node.program),
+    softline,
+    printOpeningBlockClosingMustache(node),
+  ]);
 }
 
 function printElseBlock(node) {
-  return concat([
+  return [
     hardline,
     printInverseBlockOpeningMustache(node),
     "else",
     printInverseBlockClosingMustache(node),
-  ]);
+  ];
 }
 
 function printElseIfBlock(path, print) {
   const parentNode = path.getParentNode(1);
 
-  return concat([
+  return [
     printInverseBlockOpeningMustache(parentNode),
     "else ",
     printPathAndParams(path, print),
     printInverseBlockClosingMustache(parentNode),
-  ]);
+  ];
 }
 
 function printCloseBlock(path, print) {
   const node = path.getValue();
 
-  return concat([
+  return [
     blockStatementHasOnlyWhitespaceInProgram(node) ? softline : hardline,
     printClosingBlockOpeningMustache(node),
     path.call(print, "path"),
     printClosingBlockClosingMustache(node),
-  ]);
+  ];
 }
 
 function blockStatementHasOnlyWhitespaceInProgram(node) {
@@ -499,21 +483,21 @@ function printProgram(path, print) {
   }
 
   const program = path.call(print, "program");
-  return indent(concat([hardline, program]));
+  return indent([hardline, program]);
 }
 
 function printInverse(path, print) {
   const node = path.getValue();
 
   const inverse = path.call(print, "inverse");
-  const parts = concat([hardline, inverse]);
+  const parts = [hardline, inverse];
 
   if (blockStatementHasElseIf(node)) {
     return parts;
   }
 
   if (blockStatementHasElse(node)) {
-    return concat([printElseBlock(node), indent(parts)]);
+    return [printElseBlock(node), indent(parts)];
   }
 
   return "";
@@ -595,11 +579,7 @@ function printStringLiteral(stringLiteral, options) {
     `\\${enclosingQuote.quote}`
   );
 
-  return concat([
-    enclosingQuote.quote,
-    escapedStringLiteral,
-    enclosingQuote.quote,
-  ]);
+  return [enclosingQuote.quote, escapedStringLiteral, enclosingQuote.quote];
 }
 
 /* SubExpression print helpers */
@@ -612,7 +592,7 @@ function printSubExpressionPathAndParams(path, print) {
     return p;
   }
 
-  return indent(concat([p, line, group(params)]));
+  return indent([p, line, group(params)]);
 }
 
 /* misc. print helpers */
@@ -625,7 +605,7 @@ function printPathAndParams(path, print) {
     return p;
   }
 
-  return indent(group(concat([p, line, params])));
+  return indent(group([p, line, params]));
 }
 
 function printPath(path, print) {
@@ -658,7 +638,7 @@ function printBlockParams(node) {
     return "";
   }
 
-  return concat([" as |", node.blockParams.join(" "), "|"]);
+  return [" as |", node.blockParams.join(" "), "|"];
 }
 
 function doesNotHaveHashParams(node) {
diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index 9db1e0711..d72cc68b3 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -14,7 +14,6 @@ const {
     line,
     literalline,
     softline,
-    concat,
   },
   utils: { mapDoc, cleanDoc, getDocParts },
 } = require("../document");
@@ -84,7 +83,7 @@ function embed(path, print, textToDoc, options) {
           isEmpty = doc === "";
         }
 
-        return concat([
+        return [
           printOpeningTagPrefix(node, options),
           group(printOpeningTag(path, options, print)),
           isEmpty ? "" : hardline,
@@ -92,7 +91,7 @@ function embed(path, print, textToDoc, options) {
           isEmpty ? "" : hardline,
           printClosingTag(node, options),
           printClosingTagSuffix(node, options),
-        ]);
+        ];
       }
       break;
     }
@@ -118,39 +117,37 @@ function embed(path, print, textToDoc, options) {
             }
             textToDocOptions.__babelSourceType = sourceType;
           }
-          return concat([
+          return [
             breakParent,
             printOpeningTagPrefix(node, options),
             textToDoc(value, textToDocOptions, {
               stripTrailingHardline: true,
             }),
             printClosingTagSuffix(node, options),
-          ]);
+          ];
         }
       } else if (node.parent.type === "interpolation") {
-        return concat([
-          indent(
-            concat([
-              line,
-              textToDoc(
-                node.value,
-                {
-                  __isInHtmlInterpolation: true, // to avoid unexpected `}}`
-                  ...(options.parser === "angular"
-                    ? { parser: "__ng_interpolation", trailingComma: "none" }
-                    : options.parser === "vue"
-                    ? { parser: "__vue_expression" }
-                    : { parser: "__js_expression" }),
-                },
-                { stripTrailingHardline: true }
-              ),
-            ])
-          ),
+        return [
+          indent([
+            line,
+            textToDoc(
+              node.value,
+              {
+                __isInHtmlInterpolation: true, // to avoid unexpected `}}`
+                ...(options.parser === "angular"
+                  ? { parser: "__ng_interpolation", trailingComma: "none" }
+                  : options.parser === "vue"
+                  ? { parser: "__vue_expression" }
+                  : { parser: "__js_expression" }),
+              },
+              { stripTrailingHardline: true }
+            ),
+          ]),
           node.parent.next &&
           needsToBorrowPrevClosingTagEndMarker(node.parent.next)
             ? " "
             : line,
-        ]);
+        ];
       }
       break;
     }
@@ -168,7 +165,7 @@ function embed(path, print, textToDoc, options) {
           )
         )
       ) {
-        return concat([node.rawName, "=", node.value]);
+        return [node.rawName, "=", node.value];
       }
 
       // lwc: html`<my-element data-for={value}></my-element>`
@@ -182,7 +179,7 @@ function embed(path, print, textToDoc, options) {
             )
           )
         ) {
-          return concat([node.rawName, "=", node.value]);
+          return [node.rawName, "=", node.value];
         }
       }
 
@@ -198,7 +195,7 @@ function embed(path, print, textToDoc, options) {
         options
       );
       if (embeddedAttributeValueDoc) {
-        return concat([
+        return [
           node.rawName,
           '="',
           group(
@@ -207,7 +204,7 @@ function embed(path, print, textToDoc, options) {
             )
           ),
           '"',
-        ]);
+        ];
       }
       break;
     }
@@ -221,24 +218,22 @@ function genericPrint(path, options, print) {
 
   switch (node.type) {
     case "front-matter":
-      return concat(replaceEndOfLineWith(node.raw, literalline));
+      return replaceEndOfLineWith(node.raw, literalline);
     case "root":
       if (options.__onHtmlRoot) {
         options.__onHtmlRoot(node);
       }
       // use original concat to not break stripTrailingHardline
-      return concat([group(printChildren(path, options, print)), hardline]);
+      return [group(printChildren(path, options, print)), hardline];
     case "element":
     case "ieConditionalComment": {
       if (shouldPreserveContent(node, options)) {
-        return concat(
-          [].concat(
-            printOpeningTagPrefix(node, options),
-            group(printOpeningTag(path, options, print)),
-            replaceEndOfLineWith(getNodeContent(node, options), literalline),
-            printClosingTag(node, options),
-            printClosingTagSuffix(node, options)
-          )
+        return [].concat(
+          printOpeningTagPrefix(node, options),
+          group(printOpeningTag(path, options, print)),
+          replaceEndOfLineWith(getNodeContent(node, options), literalline),
+          printClosingTag(node, options),
+          printClosingTagSuffix(node, options)
         );
       }
       /**
@@ -269,94 +264,90 @@ function genericPrint(path, options, print) {
         node.lastChild.isTrailingSpaceSensitive &&
         !node.lastChild.hasTrailingSpaces;
       const attrGroupId = Symbol("element-attr-group-id");
-      return concat([
-        group(
-          concat([
-            group(printOpeningTag(path, options, print), { id: attrGroupId }),
-            node.children.length === 0
-              ? node.hasDanglingSpaces && node.isDanglingSpaceSensitive
-                ? line
-                : ""
-              : concat([
-                  forceBreakContent(node) ? breakParent : "",
-                  ((childrenDoc) =>
-                    shouldHugContent
-                      ? ifBreak(indent(childrenDoc), childrenDoc, {
-                          groupId: attrGroupId,
-                        })
-                      : (isScriptLikeTag(node) ||
-                          isVueCustomBlock(node, options)) &&
-                        node.parent.type === "root" &&
-                        options.parser === "vue" &&
-                        !options.vueIndentScriptAndStyle
-                      ? childrenDoc
-                      : indent(childrenDoc))(
-                    concat([
-                      shouldHugContent
-                        ? ifBreak(softline, "", { groupId: attrGroupId })
-                        : node.firstChild.hasLeadingSpaces &&
-                          node.firstChild.isLeadingSpaceSensitive
-                        ? line
-                        : node.firstChild.type === "text" &&
-                          node.isWhitespaceSensitive &&
-                          node.isIndentationSensitive
-                        ? dedentToRoot(softline)
-                        : softline,
-                      printChildren(path, options, print),
-                    ])
-                  ),
-                  (
-                    node.next
-                      ? needsToBorrowPrevClosingTagEndMarker(node.next)
-                      : needsToBorrowLastChildClosingTagEndMarker(node.parent)
-                  )
-                    ? node.lastChild.hasTrailingSpaces &&
-                      node.lastChild.isTrailingSpaceSensitive
-                      ? " "
-                      : ""
-                    : shouldHugContent
+      return [
+        group([
+          group(printOpeningTag(path, options, print), { id: attrGroupId }),
+          node.children.length === 0
+            ? node.hasDanglingSpaces && node.isDanglingSpaceSensitive
+              ? line
+              : ""
+            : [
+                forceBreakContent(node) ? breakParent : "",
+                ((childrenDoc) =>
+                  shouldHugContent
+                    ? ifBreak(indent(childrenDoc), childrenDoc, {
+                        groupId: attrGroupId,
+                      })
+                    : (isScriptLikeTag(node) ||
+                        isVueCustomBlock(node, options)) &&
+                      node.parent.type === "root" &&
+                      options.parser === "vue" &&
+                      !options.vueIndentScriptAndStyle
+                    ? childrenDoc
+                    : indent(childrenDoc))([
+                  shouldHugContent
                     ? ifBreak(softline, "", { groupId: attrGroupId })
-                    : node.lastChild.hasTrailingSpaces &&
-                      node.lastChild.isTrailingSpaceSensitive
+                    : node.firstChild.hasLeadingSpaces &&
+                      node.firstChild.isLeadingSpaceSensitive
                     ? line
-                    : (node.lastChild.type === "comment" ||
-                        (node.lastChild.type === "text" &&
-                          node.isWhitespaceSensitive &&
-                          node.isIndentationSensitive)) &&
-                      new RegExp(
-                        `\\n[\\t ]{${
-                          options.tabWidth *
-                          countParents(
-                            path,
-                            (n) => n.parent && n.parent.type !== "root"
-                          )
-                        }}$`
-                      ).test(node.lastChild.value)
-                    ? /**
-                       *     <div>
-                       *       <pre>
-                       *         something
-                       *       </pre>
-                       *            ~
-                       *     </div>
-                       */
-                      ""
+                    : node.firstChild.type === "text" &&
+                      node.isWhitespaceSensitive &&
+                      node.isIndentationSensitive
+                    ? dedentToRoot(softline)
                     : softline,
+                  printChildren(path, options, print),
                 ]),
-          ])
-        ),
+                (
+                  node.next
+                    ? needsToBorrowPrevClosingTagEndMarker(node.next)
+                    : needsToBorrowLastChildClosingTagEndMarker(node.parent)
+                )
+                  ? node.lastChild.hasTrailingSpaces &&
+                    node.lastChild.isTrailingSpaceSensitive
+                    ? " "
+                    : ""
+                  : shouldHugContent
+                  ? ifBreak(softline, "", { groupId: attrGroupId })
+                  : node.lastChild.hasTrailingSpaces &&
+                    node.lastChild.isTrailingSpaceSensitive
+                  ? line
+                  : (node.lastChild.type === "comment" ||
+                      (node.lastChild.type === "text" &&
+                        node.isWhitespaceSensitive &&
+                        node.isIndentationSensitive)) &&
+                    new RegExp(
+                      `\\n[\\t ]{${
+                        options.tabWidth *
+                        countParents(
+                          path,
+                          (n) => n.parent && n.parent.type !== "root"
+                        )
+                      }}$`
+                    ).test(node.lastChild.value)
+                  ? /**
+                     *     <div>
+                     *       <pre>
+                     *         something
+                     *       </pre>
+                     *            ~
+                     *     </div>
+                     */
+                    ""
+                  : softline,
+              ],
+        ]),
         printClosingTag(node, options),
-      ]);
+      ];
     }
     case "ieConditionalStartComment":
     case "ieConditionalEndComment":
-      return concat([printOpeningTagStart(node), printClosingTagEnd(node)]);
+      return [printOpeningTagStart(node), printClosingTagEnd(node)];
     case "interpolation":
-      return concat([
+      return [
         printOpeningTagStart(node, options),
         ...path.map(print, "children"),
         printClosingTagEnd(node, options),
-      ]);
+      ];
     case "text": {
       if (node.parent.type === "interpolation") {
         // replace the trailing literalline with hardline for better readability
@@ -365,34 +356,30 @@ function genericPrint(path, options, print) {
         const value = hasTrailingNewline
           ? node.value.replace(trailingNewlineRegex, "")
           : node.value;
-        return concat([
+        return [
           ...replaceEndOfLineWith(value, literalline),
           hasTrailingNewline ? hardline : "",
-        ]);
+        ];
       }
 
-      const printed = cleanDoc(
-        concat([
-          printOpeningTagPrefix(node, options),
-          ...getTextValueParts(node),
-          printClosingTagSuffix(node, options),
-        ])
-      );
+      const printed = cleanDoc([
+        printOpeningTagPrefix(node, options),
+        ...getTextValueParts(node),
+        printClosingTagSuffix(node, options),
+      ]);
       return typeof printed === "string" ? printed : fill(getDocParts(printed));
     }
     case "docType":
-      return concat([
-        group(
-          concat([
-            printOpeningTagStart(node, options),
-            " ",
-            node.value.replace(/^html\b/i, "html").replace(/\s+/g, " "),
-          ])
-        ),
+      return [
+        group([
+          printOpeningTagStart(node, options),
+          " ",
+          node.value.replace(/^html\b/i, "html").replace(/\s+/g, " "),
+        ]),
         printClosingTagEnd(node, options),
-      ]);
+      ];
     case "comment": {
-      return concat([
+      return [
         printOpeningTagPrefix(node, options),
 
         ...replaceEndOfLineWith(
@@ -400,7 +387,7 @@ function genericPrint(path, options, print) {
           literalline
         ),
         printClosingTagSuffix(node, options),
-      ]);
+      ];
     }
     case "attribute": {
       if (node.value === null) {
@@ -410,7 +397,7 @@ function genericPrint(path, options, print) {
       const singleQuoteCount = countChars(value, "'");
       const doubleQuoteCount = countChars(value, '"');
       const quote = singleQuoteCount < doubleQuoteCount ? "'" : '"';
-      return concat([
+      return [
         node.rawName,
 
         "=",
@@ -423,7 +410,7 @@ function genericPrint(path, options, print) {
           literalline
         ),
         quote,
-      ]);
+      ];
     }
     default:
       /* istanbul ignore next */
@@ -435,7 +422,7 @@ function printChildren(path, options, print) {
   const node = path.getValue();
 
   if (forceBreakChildren(node)) {
-    return concat([
+    return [
       breakParent,
 
       ...path.map((childPath) => {
@@ -443,122 +430,113 @@ function printChildren(path, options, print) {
         const prevBetweenLine = !childNode.prev
           ? ""
           : printBetweenLine(childNode.prev, childNode);
-        return concat([
+        return [
           !prevBetweenLine
             ? ""
-            : concat([
+            : [
                 prevBetweenLine,
                 forceNextEmptyLine(childNode.prev) ? hardline : "",
-              ]),
+              ],
           printChild(childPath),
-        ]);
+        ];
       }, "children"),
-    ]);
+    ];
   }
 
   const groupIds = node.children.map(() => Symbol(""));
-  return concat(
-    path.map((childPath, childIndex) => {
-      const childNode = childPath.getValue();
+  return path.map((childPath, childIndex) => {
+    const childNode = childPath.getValue();
 
-      if (isTextLikeNode(childNode)) {
-        if (childNode.prev && isTextLikeNode(childNode.prev)) {
-          const prevBetweenLine = printBetweenLine(childNode.prev, childNode);
-          if (prevBetweenLine) {
-            if (forceNextEmptyLine(childNode.prev)) {
-              return concat([hardline, hardline, printChild(childPath)]);
-            }
-            return concat([prevBetweenLine, printChild(childPath)]);
+    if (isTextLikeNode(childNode)) {
+      if (childNode.prev && isTextLikeNode(childNode.prev)) {
+        const prevBetweenLine = printBetweenLine(childNode.prev, childNode);
+        if (prevBetweenLine) {
+          if (forceNextEmptyLine(childNode.prev)) {
+            return [hardline, hardline, printChild(childPath)];
           }
+          return [prevBetweenLine, printChild(childPath)];
         }
-        return printChild(childPath);
       }
+      return printChild(childPath);
+    }
 
-      const prevParts = [];
-      const leadingParts = [];
-      const trailingParts = [];
-      const nextParts = [];
+    const prevParts = [];
+    const leadingParts = [];
+    const trailingParts = [];
+    const nextParts = [];
 
-      const prevBetweenLine = childNode.prev
-        ? printBetweenLine(childNode.prev, childNode)
-        : "";
+    const prevBetweenLine = childNode.prev
+      ? printBetweenLine(childNode.prev, childNode)
+      : "";
 
-      const nextBetweenLine = childNode.next
-        ? printBetweenLine(childNode, childNode.next)
-        : "";
+    const nextBetweenLine = childNode.next
+      ? printBetweenLine(childNode, childNode.next)
+      : "";
 
-      if (prevBetweenLine) {
-        if (forceNextEmptyLine(childNode.prev)) {
-          prevParts.push(hardline, hardline);
-        } else if (prevBetweenLine === hardline) {
-          prevParts.push(hardline);
+    if (prevBetweenLine) {
+      if (forceNextEmptyLine(childNode.prev)) {
+        prevParts.push(hardline, hardline);
+      } else if (prevBetweenLine === hardline) {
+        prevParts.push(hardline);
+      } else {
+        if (isTextLikeNode(childNode.prev)) {
+          leadingParts.push(prevBetweenLine);
         } else {
-          if (isTextLikeNode(childNode.prev)) {
-            leadingParts.push(prevBetweenLine);
-          } else {
-            leadingParts.push(
-              ifBreak("", softline, {
-                groupId: groupIds[childIndex - 1],
-              })
-            );
-          }
+          leadingParts.push(
+            ifBreak("", softline, {
+              groupId: groupIds[childIndex - 1],
+            })
+          );
         }
       }
+    }
 
-      if (nextBetweenLine) {
-        if (forceNextEmptyLine(childNode)) {
-          if (isTextLikeNode(childNode.next)) {
-            nextParts.push(hardline, hardline);
-          }
-        } else if (nextBetweenLine === hardline) {
-          if (isTextLikeNode(childNode.next)) {
-            nextParts.push(hardline);
-          }
-        } else {
-          trailingParts.push(nextBetweenLine);
+    if (nextBetweenLine) {
+      if (forceNextEmptyLine(childNode)) {
+        if (isTextLikeNode(childNode.next)) {
+          nextParts.push(hardline, hardline);
         }
+      } else if (nextBetweenLine === hardline) {
+        if (isTextLikeNode(childNode.next)) {
+          nextParts.push(hardline);
+        }
+      } else {
+        trailingParts.push(nextBetweenLine);
       }
+    }
 
-      return concat(
-        [].concat(
-          prevParts,
-          group(
-            concat([
-              ...leadingParts,
-              group(concat([printChild(childPath), ...trailingParts]), {
-                id: groupIds[childIndex],
-              }),
-            ])
-          ),
-          nextParts
-        )
-      );
-    }, "children")
-  );
+    return [].concat(
+      prevParts,
+      group([
+        ...leadingParts,
+        group([printChild(childPath), ...trailingParts], {
+          id: groupIds[childIndex],
+        }),
+      ]),
+      nextParts
+    );
+  }, "children");
 
   function printChild(childPath) {
     const child = childPath.getValue();
 
     if (hasPrettierIgnore(child)) {
-      return concat(
-        [].concat(
-          printOpeningTagPrefix(child, options),
-          replaceEndOfLineWith(
-            options.originalText.slice(
-              locStart(child) +
-                (child.prev &&
-                needsToBorrowNextOpeningTagStartMarker(child.prev)
-                  ? printOpeningTagStartMarker(child).length
-                  : 0),
-              locEnd(child) -
-                (child.next && needsToBorrowPrevClosingTagEndMarker(child.next)
-                  ? printClosingTagEndMarker(child, options).length
-                  : 0)
-            ),
-            literalline
+      return [].concat(
+        printOpeningTagPrefix(child, options),
+        replaceEndOfLineWith(
+          options.originalText.slice(
+            locStart(child) +
+              (child.prev && needsToBorrowNextOpeningTagStartMarker(child.prev)
+                ? printOpeningTagStartMarker(child).length
+                : 0),
+            locEnd(child) -
+              (child.next && needsToBorrowPrevClosingTagEndMarker(child.next)
+                ? printClosingTagEndMarker(child, options).length
+                : 0)
           ),
-          printClosingTagSuffix(child, options)
-        )
+          literalline
+        ),
+        printClosingTagSuffix(child, options)
       );
     }
 
@@ -678,11 +656,9 @@ function printAttributes(path, options, print) {
   const printedAttributes = path.map((attributePath) => {
     const attribute = attributePath.getValue();
     return hasPrettierIgnoreAttribute(attribute)
-      ? concat(
-          replaceEndOfLineWith(
-            options.originalText.slice(locStart(attribute), locEnd(attribute)),
-            literalline
-          )
+      ? replaceEndOfLineWith(
+          options.originalText.slice(locStart(attribute), locEnd(attribute)),
+          literalline
         )
       : print(attributePath);
   }, "attrs");
@@ -695,12 +671,10 @@ function printAttributes(path, options, print) {
     node.children.length === 0;
 
   const parts = [
-    indent(
-      concat([
-        forceNotToBreakAttrContent ? " " : line,
-        join(line, printedAttributes),
-      ])
-    ),
+    indent([
+      forceNotToBreakAttrContent ? " " : line,
+      join(line, printedAttributes),
+    ]),
   ];
 
   if (
@@ -727,26 +701,23 @@ function printAttributes(path, options, print) {
     parts.push(node.isSelfClosing ? line : softline);
   }
 
-  return concat(parts);
+  return parts;
 }
 
 function printOpeningTag(path, options, print) {
   const node = path.getValue();
 
-  return concat([
+  return [
     printOpeningTagStart(node, options),
     printAttributes(path, options, print),
     node.isSelfClosing ? "" : printOpeningTagEnd(node),
-  ]);
+  ];
 }
 
 function printOpeningTagStart(node, options) {
   return node.prev && needsToBorrowNextOpeningTagStartMarker(node.prev)
     ? ""
-    : concat([
-        printOpeningTagPrefix(node, options),
-        printOpeningTagStartMarker(node),
-      ]);
+    : [printOpeningTagPrefix(node, options), printOpeningTagStartMarker(node)];
 }
 
 function printOpeningTagEnd(node) {
@@ -757,20 +728,20 @@ function printOpeningTagEnd(node) {
 }
 
 function printClosingTag(node, options) {
-  return concat([
+  return [
     node.isSelfClosing ? "" : printClosingTagStart(node, options),
     printClosingTagEnd(node, options),
-  ]);
+  ];
 }
 
 function printClosingTagStart(node, options) {
   return node.lastChild &&
     needsToBorrowParentClosingTagStartMarker(node.lastChild)
     ? ""
-    : concat([
+    : [
         printClosingTagPrefix(node, options),
         printClosingTagStartMarker(node, options),
-      ]);
+      ];
 }
 
 function printClosingTagEnd(node, options) {
@@ -780,10 +751,10 @@ function printClosingTagEnd(node, options) {
       : needsToBorrowLastChildClosingTagEndMarker(node.parent)
   )
     ? ""
-    : concat([
+    : [
         printClosingTagEndMarker(node, options),
         printClosingTagSuffix(node, options),
-      ]);
+      ];
 }
 
 function needsToBorrowNextOpeningTagStartMarker(node) {
@@ -1012,12 +983,7 @@ function printEmbeddedAttributeValue(node, originalTextToDoc, options) {
 
   const printHug = (doc) => group(doc);
   const printExpand = (doc, canHaveTrailingWhitespace = true) =>
-    group(
-      concat([
-        indent(concat([softline, doc])),
-        canHaveTrailingWhitespace ? softline : "",
-      ])
-    );
+    group([indent([softline, doc]), canHaveTrailingWhitespace ? softline : ""]);
   const printMaybeHug = (doc) => (shouldHug ? printHug(doc) : printExpand(doc));
 
   const textToDoc = (code, opts) =>
@@ -1183,37 +1149,29 @@ function printEmbeddedAttributeValue(node, originalTextToDoc, options) {
       const parts = [];
       value.split(interpolationRegex).forEach((part, index) => {
         if (index % 2 === 0) {
-          parts.push(concat(replaceEndOfLineWith(part, literalline)));
+          parts.push(replaceEndOfLineWith(part, literalline));
         } else {
           try {
             parts.push(
-              group(
-                concat([
-                  "{{",
-                  indent(
-                    concat([
-                      line,
-                      ngTextToDoc(part, {
-                        parser: "__ng_interpolation",
-                        __isInHtmlInterpolation: true, // to avoid unexpected `}}`
-                      }),
-                    ])
-                  ),
+              group([
+                "{{",
+                indent([
                   line,
-                  "}}",
-                ])
-              )
+                  ngTextToDoc(part, {
+                    parser: "__ng_interpolation",
+                    __isInHtmlInterpolation: true, // to avoid unexpected `}}`
+                  }),
+                ]),
+                line,
+                "}}",
+              ])
             );
           } catch (e) {
-            parts.push(
-              "{{",
-              concat(replaceEndOfLineWith(part, literalline)),
-              "}}"
-            );
+            parts.push("{{", replaceEndOfLineWith(part, literalline), "}}");
           }
         }
       });
-      return group(concat(parts));
+      return group(parts);
     }
   }
 
diff --git a/src/language-html/syntax-attribute.js b/src/language-html/syntax-attribute.js
index 982e55fa0..bc2802a32 100644
--- a/src/language-html/syntax-attribute.js
+++ b/src/language-html/syntax-attribute.js
@@ -2,7 +2,7 @@
 
 const parseSrcset = require("parse-srcset");
 const {
-  builders: { concat, ifBreak, join, line },
+  builders: { ifBreak, join, line },
 } = require("../document");
 
 function printImgSrcset(value) {
@@ -40,7 +40,7 @@ function printImgSrcset(value) {
   const maxDescriptorLeftLength = getMax(descriptorLeftLengths);
 
   return join(
-    concat([",", line]),
+    [",", line],
     urls.map((url, index) => {
       const parts = [url];
 
@@ -54,7 +54,7 @@ function printImgSrcset(value) {
         parts.push(ifBreak(alignment, " "), descriptor + unit);
       }
 
-      return concat(parts);
+      return parts;
     })
   );
 }
diff --git a/src/language-html/syntax-vue.js b/src/language-html/syntax-vue.js
index 1a0ea9b9a..0ce5bb005 100644
--- a/src/language-html/syntax-vue.js
+++ b/src/language-html/syntax-vue.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { concat, group },
+  builders: { group },
 } = require("../document");
 
 /**
@@ -12,7 +12,7 @@ const {
  */
 function printVueFor(value, textToDoc) {
   const { left, operator, right } = parseVueFor(value);
-  return concat([
+  return [
     group(
       textToDoc(`function _(${left}) {}`, {
         parser: "babel",
@@ -27,7 +27,7 @@ function printVueFor(value, textToDoc) {
       { parser: "__js_expression" },
       { stripTrailingHardline: true }
     ),
-  ]);
+  ];
 }
 
 // modified from https://github.com/vuejs/vue/blob/v2.5.17/src/compiler/parser/index.js#L370-L387
diff --git a/src/language-js/embed/css.js b/src/language-js/embed/css.js
index 13ddda499..7ff50144c 100644
--- a/src/language-js/embed/css.js
+++ b/src/language-js/embed/css.js
@@ -2,7 +2,7 @@
 
 const { isNonEmptyArray } = require("../../common/util");
 const {
-  builders: { indent, hardline, softline, concat },
+  builders: { indent, hardline, softline },
   utils: { mapDoc, replaceNewlinesWithLiterallines, cleanDoc },
 } = require("../../document");
 const { printTemplateExpressions } = require("../print/template-literal");
@@ -45,7 +45,7 @@ function transformCssDoc(quasisDoc, parentNode, expressionDocs) {
   if (!newDoc) {
     throw new Error("Couldn't insert all the expressions");
   }
-  return concat(["`", indent(concat([hardline, newDoc])), softline, "`"]);
+  return ["`", indent([hardline, newDoc]), softline, "`"];
 }
 
 // Search all the placeholders in the quasisDoc tree
@@ -63,18 +63,16 @@ function replacePlaceholders(quasisDoc, expressionDocs) {
     }
     // When we have multiple placeholders in one line, like:
     // ${Child}${Child2}:not(:first-child)
-    return concat(
-      doc.split(/@prettier-placeholder-(\d+)-id/).map((component, idx) => {
-        // The placeholder is always at odd indices
-        if (idx % 2 === 0) {
-          return replaceNewlinesWithLiterallines(component);
-        }
+    return doc.split(/@prettier-placeholder-(\d+)-id/).map((component, idx) => {
+      // The placeholder is always at odd indices
+      if (idx % 2 === 0) {
+        return replaceNewlinesWithLiterallines(component);
+      }
 
-        // The component will always be a number at odd index
-        replaceCounter++;
-        return expressionDocs[component];
-      })
-    );
+      // The component will always be a number at odd index
+      replaceCounter++;
+      return expressionDocs[component];
+    });
   });
   return expressionDocs.length === replaceCounter ? newDoc : null;
 }
diff --git a/src/language-js/embed/graphql.js b/src/language-js/embed/graphql.js
index ba0b4efe1..895545f44 100644
--- a/src/language-js/embed/graphql.js
+++ b/src/language-js/embed/graphql.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { indent, join, hardline, concat },
+  builders: { indent, join, hardline },
 } = require("../../document");
 const {
   escapeTemplateCharacters,
@@ -75,12 +75,7 @@ function format(path, print, textToDoc) {
     }
   }
 
-  return concat([
-    "`",
-    indent(concat([hardline, join(hardline, parts)])),
-    hardline,
-    "`",
-  ]);
+  return ["`", indent([hardline, join(hardline, parts)]), hardline, "`"];
 }
 
 function printGraphqlComments(lines) {
@@ -99,7 +94,7 @@ function printGraphqlComments(lines) {
       if (array[i - 1] === "" && seenComment) {
         // If a non-first comment is preceded by a blank (whitespace only) line,
         // add in a blank line.
-        parts.push(concat([hardline, textLine]));
+        parts.push([hardline, textLine]);
       } else {
         parts.push(textLine);
       }
diff --git a/src/language-js/embed/html.js b/src/language-js/embed/html.js
index f7042de40..cb2e41306 100644
--- a/src/language-js/embed/html.js
+++ b/src/language-js/embed/html.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { indent, line, hardline, concat, group },
+  builders: { indent, line, hardline, group },
   utils: { mapDoc },
 } = require("../../document");
 const {
@@ -71,7 +71,7 @@ function format(path, print, textToDoc, options, { parser }) {
       parts.push(expressionDocs[placeholderIndex]);
     }
 
-    return concat(parts);
+    return parts;
   });
 
   const leadingWhitespace = /^\s/.test(text) ? " " : "";
@@ -85,25 +85,16 @@ function format(path, print, textToDoc, options, { parser }) {
       : null;
 
   if (linebreak) {
-    return group(
-      concat([
-        "`",
-        indent(concat([linebreak, group(contentDoc)])),
-        linebreak,
-        "`",
-      ])
-    );
+    return group(["`", indent([linebreak, group(contentDoc)]), linebreak, "`"]);
   }
 
-  return group(
-    concat([
-      "`",
-      leadingWhitespace,
-      topLevelCount > 1 ? indent(group(contentDoc)) : group(contentDoc),
-      trailingWhitespace,
-      "`",
-    ])
-  );
+  return group([
+    "`",
+    leadingWhitespace,
+    topLevelCount > 1 ? indent(group(contentDoc)) : group(contentDoc),
+    trailingWhitespace,
+    "`",
+  ]);
 }
 
 module.exports = format;
diff --git a/src/language-js/embed/markdown.js b/src/language-js/embed/markdown.js
index 2cef8f5d9..2edf5471a 100644
--- a/src/language-js/embed/markdown.js
+++ b/src/language-js/embed/markdown.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { indent, softline, literalline, concat, dedentToRoot },
+  builders: { indent, softline, literalline, dedentToRoot },
 } = require("../../document");
 const { escapeTemplateCharacters } = require("../print/template-literal");
 
@@ -24,14 +24,12 @@ function format(path, print, textToDoc) {
     ),
     true
   );
-  return concat([
+  return [
     "`",
-    hasIndent
-      ? indent(concat([softline, doc]))
-      : concat([literalline, dedentToRoot(doc)]),
+    hasIndent ? indent([softline, doc]) : [literalline, dedentToRoot(doc)],
     softline,
     "`",
-  ]);
+  ];
 }
 
 function getIndentation(str) {
diff --git a/src/language-js/print/angular.js b/src/language-js/print/angular.js
index f025aeeae..166150a0f 100644
--- a/src/language-js/print/angular.js
+++ b/src/language-js/print/angular.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { concat, join, line, group },
+  builders: { join, line, group },
 } = require("../../document");
 const { hasNode, hasComment, getComments } = require("../utils");
 const { printBinaryishExpression } = require("./binaryish");
@@ -12,25 +12,23 @@ function printAngular(path, options, print) {
   const n = path.getValue();
   switch (n.type) {
     case "NGRoot":
-      return concat(
-        [].concat(
-          path.call(print, "node"),
-          !hasComment(n.node)
-            ? []
-            : concat([" //", getComments(n.node)[0].value.trimEnd()])
-        )
+      return [].concat(
+        path.call(print, "node"),
+        !hasComment(n.node)
+          ? []
+          : [" //", getComments(n.node)[0].value.trimEnd()]
       );
     case "NGPipeExpression":
       return printBinaryishExpression(path, options, print);
     case "NGChainedExpression":
       return group(
         join(
-          concat([";", line]),
+          [";", line],
           path.map(
             (childPath) =>
               hasNgSideEffect(childPath)
                 ? print(childPath)
-                : concat(["(", print(childPath), ")"]),
+                : ["(", print(childPath), ")"],
             "expressions"
           )
         )
@@ -38,31 +36,28 @@ function printAngular(path, options, print) {
     case "NGEmptyExpression":
       return "";
     case "NGQuotedExpression":
-      return concat([n.prefix, ": ", n.value.trim()]);
+      return [n.prefix, ": ", n.value.trim()];
     case "NGMicrosyntax":
-      return concat(
-        path.map(
-          (childPath, index) =>
-            concat([
-              index === 0
-                ? ""
-                : isNgForOf(childPath.getValue(), index, n)
-                ? " "
-                : concat([";", line]),
-              print(childPath),
-            ]),
-          "body"
-        )
+      return path.map(
+        (childPath, index) => [
+          index === 0
+            ? ""
+            : isNgForOf(childPath.getValue(), index, n)
+            ? " "
+            : [";", line],
+          print(childPath),
+        ],
+        "body"
       );
     case "NGMicrosyntaxKey":
       return /^[$_a-z][\w$]*(-[$_a-z][\w$])*$/i.test(n.name)
         ? n.name
         : JSON.stringify(n.name);
     case "NGMicrosyntaxExpression":
-      return concat([
+      return [
         path.call(print, "expression"),
-        n.alias === null ? "" : concat([" as ", path.call(print, "alias")]),
-      ]);
+        n.alias === null ? "" : [" as ", path.call(print, "alias")],
+      ];
     case "NGMicrosyntaxKeyedExpression": {
       const index = path.getName();
       const parentNode = path.getParentNode();
@@ -75,24 +70,20 @@ function printAngular(path, options, print) {
               "NGMicrosyntaxKeyedExpression" &&
             parentNode.body[index - 1].key.name === "then")) &&
           parentNode.body[0].type === "NGMicrosyntaxExpression");
-      return concat([
+      return [
         path.call(print, "key"),
         shouldNotPrintColon ? " " : ": ",
         path.call(print, "expression"),
-      ]);
+      ];
     }
     case "NGMicrosyntaxLet":
-      return concat([
+      return [
         "let ",
         path.call(print, "key"),
-        n.value === null ? "" : concat([" = ", path.call(print, "value")]),
-      ]);
+        n.value === null ? "" : [" = ", path.call(print, "value")],
+      ];
     case "NGMicrosyntaxAs":
-      return concat([
-        path.call(print, "key"),
-        " as ",
-        path.call(print, "alias"),
-      ]);
+      return [path.call(print, "key"), " as ", path.call(print, "alias")];
   }
 }
 
diff --git a/src/language-js/print/array.js b/src/language-js/print/array.js
index 44fcef77e..49edca22b 100644
--- a/src/language-js/print/array.js
+++ b/src/language-js/print/array.js
@@ -2,7 +2,7 @@
 
 const { printDanglingComments } = require("../../main/comments");
 const {
-  builders: { concat, line, softline, group, indent, ifBreak },
+  builders: { line, softline, group, indent, ifBreak },
 } = require("../../document");
 const { getLast } = require("../../common/util");
 const {
@@ -28,14 +28,12 @@ function printArray(path, options, print) {
       parts.push(openBracket, closeBracket);
     } else {
       parts.push(
-        group(
-          concat([
-            openBracket,
-            printDanglingComments(path, options),
-            softline,
-            closeBracket,
-          ])
-        )
+        group([
+          openBracket,
+          printDanglingComments(path, options),
+          softline,
+          closeBracket,
+        ])
       );
     }
   } else {
@@ -79,14 +77,9 @@ function printArray(path, options, print) {
 
     parts.push(
       group(
-        concat([
+        [
           openBracket,
-          indent(
-            concat([
-              softline,
-              printArrayItems(path, options, "elements", print),
-            ])
-          ),
+          indent([softline, printArrayItems(path, options, "elements", print)]),
           needsForcedTrailingComma ? "," : "",
           ifBreak(
             canHaveTrailingComma &&
@@ -98,7 +91,7 @@ function printArray(path, options, print) {
           printDanglingComments(path, options, /* sameIndent */ true),
           softline,
           closeBracket,
-        ]),
+        ],
         { shouldBreak }
       )
     );
@@ -109,7 +102,7 @@ function printArray(path, options, print) {
     printTypeAnnotation(path, options, print)
   );
 
-  return concat(parts);
+  return parts;
 }
 
 function printArrayItems(path, options, printPath, print) {
@@ -117,7 +110,7 @@ function printArrayItems(path, options, printPath, print) {
   let separatorParts = [];
 
   path.each((childPath) => {
-    printedElements.push(concat(separatorParts));
+    printedElements.push(separatorParts);
     printedElements.push(group(print(childPath)));
 
     separatorParts = [",", line];
@@ -129,7 +122,7 @@ function printArrayItems(path, options, printPath, print) {
     }
   }, printPath);
 
-  return concat(printedElements);
+  return printedElements;
 }
 
 module.exports = { printArray, printArrayItems };
diff --git a/src/language-js/print/assignment.js b/src/language-js/print/assignment.js
index 8155f2d40..1a90748f1 100644
--- a/src/language-js/print/assignment.js
+++ b/src/language-js/print/assignment.js
@@ -2,7 +2,7 @@
 
 const { isNonEmptyArray } = require("../../common/util");
 const {
-  builders: { concat, line, group, indent },
+  builders: { line, group, indent },
 } = require("../../document");
 const {
   hasLeadingOwnLineComment,
@@ -31,7 +31,7 @@ function printAssignment(
     options
   );
 
-  return group(concat([printedLeft, operator, printed]));
+  return group([printedLeft, operator, printed]);
 }
 
 function printAssignmentExpression(path, options, print) {
@@ -39,7 +39,7 @@ function printAssignmentExpression(path, options, print) {
   return printAssignment(
     n.left,
     path.call(print, "left"),
-    concat([" ", n.operator]),
+    [" ", n.operator],
     n.right,
     path.call(print, "right"),
     options
@@ -60,7 +60,7 @@ function printVariableDeclarator(path, options, print) {
 
 function printAssignmentRight(leftNode, rightNode, printedRight, options) {
   if (hasLeadingOwnLineComment(options.originalText, rightNode)) {
-    return indent(concat([line, printedRight]));
+    return indent([line, printedRight]);
   }
 
   const canBreak =
@@ -81,10 +81,10 @@ function printAssignmentRight(leftNode, rightNode, printedRight, options) {
     rightNode.type === "SequenceExpression";
 
   if (canBreak) {
-    return group(indent(concat([line, printedRight])));
+    return group(indent([line, printedRight]));
   }
 
-  return concat([" ", printedRight]);
+  return [" ", printedRight];
 }
 
 module.exports = {
diff --git a/src/language-js/print/binaryish.js b/src/language-js/print/binaryish.js
index ce1649606..f9c34b881 100644
--- a/src/language-js/print/binaryish.js
+++ b/src/language-js/print/binaryish.js
@@ -3,7 +3,7 @@
 const { printComments } = require("../../main/comments");
 const { getLast } = require("../../common/util");
 const {
-  builders: { concat, join, line, softline, group, indent, align, ifBreak },
+  builders: { join, line, softline, group, indent, align, ifBreak },
   utils: { cleanDoc, getDocParts },
 } = require("../../document");
 const {
@@ -48,7 +48,7 @@ function printBinaryishExpression(path, options, print) {
   //     this.lookahead().type === tt.parenLeft
   //   ) {
   if (isInsideParenthesis) {
-    return concat(parts);
+    return parts;
   }
 
   // Break between the parens in
@@ -68,7 +68,7 @@ function printBinaryishExpression(path, options, print) {
       parent.type === "OptionalMemberExpression") &&
       !parent.computed)
   ) {
-    return group(concat([indent(concat([softline, ...parts])), softline]));
+    return group([indent([softline, ...parts]), softline]);
   }
 
   // Avoid indenting sub-expressions in some cases where the first sub-expression is already
@@ -111,7 +111,7 @@ function printBinaryishExpression(path, options, print) {
     (shouldInlineLogicalExpression(n) && !samePrecedenceSubExpression) ||
     (!shouldInlineLogicalExpression(n) && shouldIndentIfInlining)
   ) {
-    return group(concat(parts));
+    return group(parts);
   }
 
   if (parts.length === 0) {
@@ -140,18 +140,18 @@ function printBinaryishExpression(path, options, print) {
     firstGroupIndex === -1 ? 1 : firstGroupIndex + 1
   );
 
-  const rest = concat(parts.slice(headParts.length, hasJsx ? -1 : undefined));
+  const rest = parts.slice(headParts.length, hasJsx ? -1 : undefined);
 
   const groupId = Symbol("logicalChain-" + ++uid);
 
   const chain = group(
-    concat([
+    [
       // Don't include the initial expression in the indentation
       // level. The first item is guaranteed to be the first
       // left-most expression.
       ...headParts,
       indent(rest),
-    ]),
+    ],
     { id: groupId }
   );
 
@@ -160,7 +160,7 @@ function printBinaryishExpression(path, options, print) {
   }
 
   const jsxPart = getLast(parts);
-  return group(concat([chain, ifBreak(indent(jsxPart), jsxPart, { groupId })]));
+  return group([chain, ifBreak(indent(jsxPart), jsxPart, { groupId })]);
 }
 
 // For binary expressions to be consistent, we need to group
@@ -224,30 +224,26 @@ function printBinaryishExpressions(
     const rightSuffix =
       node.type === "NGPipeExpression" && node.arguments.length > 0
         ? group(
-            indent(
-              concat([
-                softline,
-                ": ",
-                join(
-                  concat([softline, ":", ifBreak(" ")]),
-                  path
-                    .map(print, "arguments")
-                    .map((arg) => align(2, group(arg)))
-                ),
-              ])
-            )
+            indent([
+              softline,
+              ": ",
+              join(
+                [softline, ":", ifBreak(" ")],
+                path.map(print, "arguments").map((arg) => align(2, group(arg)))
+              ),
+            ])
           )
         : "";
 
     const right = shouldInline
-      ? concat([operator, " ", path.call(print, "right"), rightSuffix])
-      : concat([
+      ? [operator, " ", path.call(print, "right"), rightSuffix]
+      : [
           lineBeforeOperator ? line : "",
           operator,
           lineBeforeOperator ? " " : line,
           path.call(print, "right"),
           rightSuffix,
-        ]);
+        ];
 
     // If there's only a single binary expression, we want to create a group
     // in order to avoid having a small right part like -1 be on its own line.
@@ -272,9 +268,7 @@ function printBinaryishExpressions(
     // the other ones since we don't call the normal print on BinaryExpression,
     // only for the left and right parts
     if (isNested && hasComment(node)) {
-      const printed = cleanDoc(
-        printComments(path, () => concat(parts), options)
-      );
+      const printed = cleanDoc(printComments(path, () => parts, options));
       /* istanbul ignore if */
       if (printed.type === "string") {
         parts = [printed];
diff --git a/src/language-js/print/block.js b/src/language-js/print/block.js
index bb8d67dd9..09a349bf0 100644
--- a/src/language-js/print/block.js
+++ b/src/language-js/print/block.js
@@ -3,7 +3,7 @@
 const { printDanglingComments } = require("../../main/comments");
 const { isNonEmptyArray } = require("../../common/util");
 const {
-  builders: { concat, hardline, indent },
+  builders: { hardline, indent },
 } = require("../../document");
 const { hasComment, CommentCheckFlags, isNextLineEmpty } = require("../utils");
 
@@ -22,7 +22,7 @@ function printBlock(path, options, print) {
   parts.push("{");
   const printed = printBlockBody(path, options, print);
   if (printed) {
-    parts.push(indent(concat([hardline, printed])), hardline);
+    parts.push(indent([hardline, printed]), hardline);
   } else {
     const parent = path.getParentNode();
     const parentParent = path.getParentNode(1);
@@ -51,7 +51,7 @@ function printBlock(path, options, print) {
 
   parts.push("}");
 
-  return concat(parts);
+  return parts;
 }
 
 function printBlockBody(path, options, print) {
@@ -91,7 +91,7 @@ function printBlockBody(path, options, print) {
     parts.push(hardline);
   }
 
-  return concat(parts);
+  return parts;
 }
 
 module.exports = { printBlock, printBlockBody };
diff --git a/src/language-js/print/call-arguments.js b/src/language-js/print/call-arguments.js
index 3dd7559b7..9ee644498 100644
--- a/src/language-js/print/call-arguments.js
+++ b/src/language-js/print/call-arguments.js
@@ -18,7 +18,6 @@ const {
 
 const {
   builders: {
-    concat,
     line,
     hardline,
     softline,
@@ -37,11 +36,11 @@ function printCallArguments(path, options, print) {
 
   const args = getCallArguments(node);
   if (args.length === 0) {
-    return concat([
+    return [
       "(",
       printDanglingComments(path, options, /* sameIndent */ true),
       ")",
-    ]);
+    ];
   }
 
   // useEffect(() => { ... }, [foo, bar, baz])
@@ -53,13 +52,13 @@ function printCallArguments(path, options, print) {
     args[1].type === "ArrayExpression" &&
     !args.some((arg) => hasComment(arg))
   ) {
-    return concat([
+    return [
       "(",
       path.call(print, "arguments", 0),
       ", ",
       path.call(print, "arguments", 1),
       ")",
-    ]);
+    ];
   }
 
   // func(
@@ -115,7 +114,7 @@ function printCallArguments(path, options, print) {
       argPath
     );
 
-    printedArguments.push(concat(parts));
+    printedArguments.push(parts);
   });
 
   const maybeTrailingComma =
@@ -127,13 +126,7 @@ function printCallArguments(path, options, print) {
 
   function allArgsBrokenOut() {
     return group(
-      concat([
-        "(",
-        indent(concat([line, ...printedArguments])),
-        maybeTrailingComma,
-        line,
-        ")",
-      ]),
+      ["(", indent([line, ...printedArguments]), maybeTrailingComma, line, ")"],
       { shouldBreak: true }
     );
   }
@@ -160,12 +153,12 @@ function printCallArguments(path, options, print) {
     iterateCallArgumentsPath(path, (argPath, i) => {
       if (shouldGroupFirst && i === 0) {
         printedExpanded = [
-          concat([
+          [
             argPath.call((p) => print(p, { expandFirstArg: true })),
             printedArguments.length > 1 ? "," : "",
             hasEmptyLineFollowingFirstArg ? hardline : line,
             hasEmptyLineFollowingFirstArg ? hardline : "",
-          ]),
+          ],
         ].concat(printedArguments.slice(1));
       }
       if (shouldGroupLast && i === args.length - 1) {
@@ -177,9 +170,9 @@ function printCallArguments(path, options, print) {
 
     const somePrintedArgumentsWillBreak = printedArguments.some(willBreak);
 
-    const simpleConcat = concat(["(", ...printedExpanded, ")"]);
+    const simpleConcat = ["(", ...printedExpanded, ")"];
 
-    return concat([
+    return [
       somePrintedArgumentsWillBreak ? breakParent : "",
       conditionalGroup(
         [
@@ -189,34 +182,34 @@ function printCallArguments(path, options, print) {
             ? simpleConcat
             : ifBreak(allArgsBrokenOut(), simpleConcat),
           shouldGroupFirst
-            ? concat([
+            ? [
                 "(",
                 group(printedExpanded[0], { shouldBreak: true }),
                 ...printedExpanded.slice(1),
                 ")",
-              ])
-            : concat([
+              ]
+            : [
                 "(",
                 ...printedArguments.slice(0, -1),
                 group(getLast(printedExpanded), {
                   shouldBreak: true,
                 }),
                 ")",
-              ]),
+              ],
           allArgsBrokenOut(),
         ],
         { shouldBreak }
       ),
-    ]);
+    ];
   }
 
-  const contents = concat([
+  const contents = [
     "(",
-    indent(concat([softline, ...printedArguments])),
+    indent([softline, ...printedArguments]),
     ifBreak(maybeTrailingComma),
     softline,
     ")",
-  ]);
+  ];
   if (isLongCurriedCallExpression(path)) {
     // By not wrapping the arguments in a group, the printer prioritizes
     // breaking up these arguments rather than the args of the parent call.
diff --git a/src/language-js/print/call-expression.js b/src/language-js/print/call-expression.js
index 6b799255c..2b5a0941e 100644
--- a/src/language-js/print/call-expression.js
+++ b/src/language-js/print/call-expression.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { concat, join, group },
+  builders: { join, group },
 } = require("../../document");
 const pathNeedsParens = require("../needs-parens");
 const {
@@ -45,7 +45,7 @@ function printCallExpression(path, options, print) {
     iterateCallArgumentsPath(path, (argPath) => {
       printed.push(print(argPath));
     });
-    return concat([
+    return [
       isNew ? "new " : "",
       path.call(print, "callee"),
       optional,
@@ -53,7 +53,7 @@ function printCallExpression(path, options, print) {
       "(",
       join(", ", printed),
       ")",
-    ]);
+    ];
   }
 
   // Inline Flow annotation comments following Identifiers in Call nodes need to
@@ -82,7 +82,7 @@ function printCallExpression(path, options, print) {
     return printMemberChain(path, options, print);
   }
 
-  const contents = concat([
+  const contents = [
     isNew ? "new " : "",
     isDynamicImport ? "import" : path.call(print, "callee"),
     optional,
@@ -91,7 +91,7 @@ function printCallExpression(path, options, print) {
       : "",
     printFunctionTypeParameters(path, options, print),
     printCallArguments(path, options, print),
-  ]);
+  ];
 
   // We group here when the callee is itself a call expression.
   // See `isLongCurriedCallExpression` for more info.
diff --git a/src/language-js/print/class.js b/src/language-js/print/class.js
index 1c66c068f..bd1962b68 100644
--- a/src/language-js/print/class.js
+++ b/src/language-js/print/class.js
@@ -3,7 +3,7 @@
 const { isNonEmptyArray } = require("../../common/util");
 const { printComments, printDanglingComments } = require("../../main/comments");
 const {
-  builders: { concat, join, line, hardline, softline, group, indent, ifBreak },
+  builders: { join, line, hardline, softline, group, indent, ifBreak },
 } = require("../../document");
 const {
   hasComment,
@@ -49,11 +49,11 @@ function printClass(path, options, print) {
   partsGroup.push(path.call(print, "typeParameters"));
 
   if (n.superClass) {
-    const printed = concat([
+    const printed = [
       "extends ",
       printSuperClass(path, options, print),
       path.call(print, "superTypeParameters"),
-    ]);
+    ];
     const printedWithComments = path.call(
       (superClass) => printComments(superClass, () => printed, options),
       "superClass"
@@ -71,17 +71,15 @@ function printClass(path, options, print) {
   extendsParts.push(printList(path, options, print, "implements"));
 
   if (groupMode) {
-    const printedExtends = concat(extendsParts);
+    const printedExtends = extendsParts;
     if (shouldIndentOnlyHeritageClauses(n)) {
       parts.push(
         group(
-          concat(
-            partsGroup.concat(ifBreak(indent(printedExtends), printedExtends))
-          )
+          partsGroup.concat(ifBreak(indent(printedExtends), printedExtends))
         )
       );
     } else {
-      parts.push(group(indent(concat(partsGroup.concat(printedExtends)))));
+      parts.push(group(indent(partsGroup.concat(printedExtends))));
     }
   } else {
     parts.push(...partsGroup, ...extendsParts);
@@ -89,7 +87,7 @@ function printClass(path, options, print) {
 
   parts.push(" ", path.call(print, "body"));
 
-  return concat(parts);
+  return parts;
 }
 
 function hasMultipleHeritage(node) {
@@ -123,7 +121,7 @@ function printList(path, options, print, listName) {
     /* sameIndent */ true,
     ({ marker }) => marker === listName
   );
-  return concat([
+  return [
     shouldIndentOnlyHeritageClauses(n)
       ? ifBreak(" ", line, {
           groupId: getTypeParametersGroupId(n.typeParameters),
@@ -132,12 +130,8 @@ function printList(path, options, print, listName) {
     printedLeadingComments,
     printedLeadingComments && hardline,
     listName,
-    group(
-      indent(
-        concat([line, join(concat([",", line]), path.map(print, listName))])
-      )
-    ),
-  ]);
+    group(indent([line, join([",", line], path.map(print, listName))])),
+  ];
 }
 
 function printSuperClass(path, options, print) {
@@ -145,10 +139,7 @@ function printSuperClass(path, options, print) {
   const parent = path.getParentNode();
   if (parent.type === "AssignmentExpression") {
     return group(
-      ifBreak(
-        concat(["(", indent(concat([softline, printed])), softline, ")"]),
-        printed
-      )
+      ifBreak(["(", indent([softline, printed]), softline, ")"], printed)
     );
   }
   return printed;
@@ -173,7 +164,7 @@ function printClassMethod(path, options, print) {
 
   parts.push(printMethod(path, options, print));
 
-  return concat(parts);
+  return parts;
 }
 
 function printClassProperty(path, options, print) {
@@ -216,17 +207,15 @@ function printClassProperty(path, options, print) {
 
   parts.push(semi);
 
-  return group(concat(parts));
+  return group(parts);
 }
 
 function printDecorators(path, options, print) {
   const node = path.getValue();
-  return group(
-    concat([
-      join(line, path.map(print, "decorators")),
-      hasNewlineBetweenOrAfterDecorators(node, options) ? hardline : line,
-    ])
-  );
+  return group([
+    join(line, path.map(print, "decorators")),
+    hasNewlineBetweenOrAfterDecorators(node, options) ? hardline : line,
+  ]);
 }
 
 module.exports = {
diff --git a/src/language-js/print/comment.js b/src/language-js/print/comment.js
index b41b1236c..a1de75358 100644
--- a/src/language-js/print/comment.js
+++ b/src/language-js/print/comment.js
@@ -2,7 +2,7 @@
 
 const { hasNewline } = require("../../common/util");
 const {
-  builders: { concat, join, hardline },
+  builders: { join, hardline },
 } = require("../../document");
 
 const { isLineComment, isBlockComment } = require("../utils");
@@ -30,7 +30,7 @@ function printComment(commentPath, options) {
           backwards: true,
         })
       ) {
-        return concat([hardline, printed]);
+        return [hardline, printed];
       }
       return printed;
     }
@@ -57,7 +57,7 @@ function isIndentableBlockComment(comment) {
 function printIndentableBlockComment(comment) {
   const lines = comment.value.split("\n");
 
-  return concat([
+  return [
     "/*",
     join(
       hardline,
@@ -68,7 +68,7 @@ function printIndentableBlockComment(comment) {
       )
     ),
     "*/",
-  ]);
+  ];
 }
 
 module.exports = { printComment };
diff --git a/src/language-js/print/flow.js b/src/language-js/print/flow.js
index 454594f10..d4eecef9d 100644
--- a/src/language-js/print/flow.js
+++ b/src/language-js/print/flow.js
@@ -1,9 +1,6 @@
 "use strict";
 
 const assert = require("assert");
-const {
-  builders: { concat },
-} = require("../../document");
 const { getParentExportDeclaration } = require("../utils");
 const { printClass } = require("./class");
 const {
@@ -28,41 +25,29 @@ function printFlow(path, options, print) {
     case "DeclareClass":
       return printFlowDeclaration(path, printClass(path, options, print));
     case "DeclareFunction":
-      return printFlowDeclaration(
-        path,
-        concat([
-          "function ",
-          path.call(print, "id"),
-          n.predicate ? " " : "",
-          path.call(print, "predicate"),
-          semi,
-        ])
-      );
+      return printFlowDeclaration(path, [
+        "function ",
+        path.call(print, "id"),
+        n.predicate ? " " : "",
+        path.call(print, "predicate"),
+        semi,
+      ]);
     case "DeclareModule":
-      return printFlowDeclaration(
-        path,
-        concat([
-          "module ",
-          path.call(print, "id"),
-          " ",
-          path.call(print, "body"),
-        ])
-      );
+      return printFlowDeclaration(path, [
+        "module ",
+        path.call(print, "id"),
+        " ",
+        path.call(print, "body"),
+      ]);
     case "DeclareModuleExports":
-      return printFlowDeclaration(
-        path,
-        concat([
-          "module.exports",
-          ": ",
-          path.call(print, "typeAnnotation"),
-          semi,
-        ])
-      );
+      return printFlowDeclaration(path, [
+        "module.exports",
+        ": ",
+        path.call(print, "typeAnnotation"),
+        semi,
+      ]);
     case "DeclareVariable":
-      return printFlowDeclaration(
-        path,
-        concat(["var ", path.call(print, "id"), semi])
-      );
+      return printFlowDeclaration(path, ["var ", path.call(print, "id"), semi]);
     case "DeclareOpaqueType":
       return printFlowDeclaration(path, printOpaqueType(path, options, print));
     case "DeclareInterface":
@@ -92,10 +77,10 @@ function printFlow(path, options, print) {
     case "TupleTypeAnnotation":
       return printTupleType(path, options, print);
     case "GenericTypeAnnotation":
-      return concat([
+      return [
         path.call(print, "id"),
         printTypeParameters(path, options, print, "typeParameters"),
-      ]);
+      ];
     // Type Annotations for Facebook Flow, typically stripped out or
     // transformed away before printing.
     case "TypeAnnotation":
@@ -114,7 +99,7 @@ function printFlowDeclaration(path, printed) {
   // If the parent node has type DeclareExportDeclaration, then it
   // will be responsible for printing the "declare" token. Otherwise
   // it needs to be printed with this non-exported declaration node.
-  return concat(["declare ", printed]);
+  return ["declare ", printed];
 }
 
 module.exports = { printFlow };
diff --git a/src/language-js/print/function-parameters.js b/src/language-js/print/function-parameters.js
index d194e255f..6841d282f 100644
--- a/src/language-js/print/function-parameters.js
+++ b/src/language-js/print/function-parameters.js
@@ -3,7 +3,7 @@
 const { getNextNonSpaceNonCommentCharacter } = require("../../common/util");
 const { printDanglingComments } = require("../../main/comments");
 const {
-  builders: { concat, line, hardline, softline, group, indent, ifBreak },
+  builders: { line, hardline, softline, group, indent, ifBreak },
   utils: { removeLines },
 } = require("../../document");
 const {
@@ -36,7 +36,7 @@ function printFunctionParameters(
     : "";
 
   if (parameters.length === 0) {
-    return concat([
+    return [
       typeParams,
       "(",
       printDanglingComments(
@@ -51,7 +51,7 @@ function printFunctionParameters(
           ) === ")"
       ),
       ")",
-    ]);
+    ];
   }
 
   const parent = path.getParentNode();
@@ -94,9 +94,12 @@ function printFunctionParameters(
   //   })                    ) => {
   //                         })
   if (shouldExpandParameters) {
-    return group(
-      concat([removeLines(typeParams), "(", ...printed.map(removeLines), ")"])
-    );
+    return group([
+      removeLines(typeParams),
+      "(",
+      ...printed.map(removeLines),
+      ")",
+    ]);
   }
 
   // Single object destructuring should hug
@@ -108,12 +111,12 @@ function printFunctionParameters(
   // }) {}
   const hasNotParameterDecorator = parameters.every((node) => !node.decorators);
   if (shouldHugParameters && hasNotParameterDecorator) {
-    return concat([typeParams, "(", ...printed, ")"]);
+    return [typeParams, "(", ...printed, ")"];
   }
 
   // don't break in specs, eg; `it("should maintain parens around done even when long", (done) => {})`
   if (isParametersInTestCall) {
-    return concat([typeParams, "(", ...printed, ")"]);
+    return [typeParams, "(", ...printed, ")"];
   }
 
   const isFlowShorthandWithOneArg =
@@ -136,15 +139,15 @@ function printFunctionParameters(
 
   if (isFlowShorthandWithOneArg) {
     if (options.arrowParens === "always") {
-      return concat(["(", ...printed, ")"]);
+      return ["(", ...printed, ")"];
     }
-    return concat(printed);
+    return printed;
   }
 
-  return concat([
+  return [
     typeParams,
     "(",
-    indent(concat([softline, ...printed])),
+    indent([softline, ...printed]),
     ifBreak(
       !hasRestParameter(functionNode) && shouldPrintComma(options, "all")
         ? ","
@@ -152,7 +155,7 @@ function printFunctionParameters(
     ),
     softline,
     ")",
-  ]);
+  ];
 }
 
 function shouldHugFunctionParameters(node) {
diff --git a/src/language-js/print/function.js b/src/language-js/print/function.js
index df8fa0e0b..745bfe57d 100644
--- a/src/language-js/print/function.js
+++ b/src/language-js/print/function.js
@@ -7,7 +7,7 @@ const {
   getNextNonSpaceNonCommentCharacterIndex,
 } = require("../../common/util");
 const {
-  builders: { concat, line, softline, group, indent, ifBreak, hardline },
+  builders: { line, softline, group, indent, ifBreak, hardline },
 } = require("../../document");
 const {
   getFunctionParameters,
@@ -55,12 +55,10 @@ function printFunctionDeclaration(path, print, options, expandArg) {
 
   parts.push(
     printFunctionTypeParameters(path, options, print),
-    group(
-      concat([
-        printFunctionParameters(path, print, options, expandArg),
-        printReturnType(path, print, options),
-      ])
-    ),
+    group([
+      printFunctionParameters(path, print, options, expandArg),
+      printReturnType(path, print, options),
+    ]),
     n.body ? " " : "",
     path.call(print, "body")
   );
@@ -69,7 +67,7 @@ function printFunctionDeclaration(path, print, options, expandArg) {
     parts.push(";");
   }
 
-  return concat(parts);
+  return parts;
 }
 
 function printMethod(path, options, print) {
@@ -108,18 +106,16 @@ function printMethod(path, options, print) {
     parts.push(path.call(print, "value"));
   }
 
-  return concat(parts);
+  return parts;
 }
 
 function printMethodInternal(path, options, print) {
   const parts = [
     printFunctionTypeParameters(path, options, print),
-    group(
-      concat([
-        printFunctionParameters(path, print, options),
-        printReturnType(path, print, options),
-      ])
-    ),
+    group([
+      printFunctionParameters(path, print, options),
+      printReturnType(path, print, options),
+    ]),
   ];
 
   if (path.getNode().body) {
@@ -128,7 +124,7 @@ function printMethodInternal(path, options, print) {
     parts.push(options.semi ? ";" : "");
   }
 
-  return concat(parts);
+  return parts;
 }
 
 function printArrowFunctionExpression(path, options, print, args) {
@@ -143,19 +139,16 @@ function printArrowFunctionExpression(path, options, print, args) {
     parts.push(path.call(print, "params", 0));
   } else {
     parts.push(
-      group(
-        concat([
-          printFunctionParameters(
-            path,
-            print,
-            options,
-            /* expandLast */ args &&
-              (args.expandLastArg || args.expandFirstArg),
-            /* printTypeParams */ true
-          ),
-          printReturnType(path, print, options),
-        ])
-      )
+      group([
+        printFunctionParameters(
+          path,
+          print,
+          options,
+          /* expandLast */ args && (args.expandLastArg || args.expandFirstArg),
+          /* printTypeParams */ true
+        ),
+        printReturnType(path, print, options),
+      ])
     );
   }
 
@@ -195,18 +188,16 @@ function printArrowFunctionExpression(path, options, print, args) {
       n.body.type === "ArrowFunctionExpression" ||
       n.body.type === "DoExpression")
   ) {
-    return group(concat([...parts, " ", body]));
+    return group([...parts, " ", body]);
   }
 
   // We handle sequence expressions as the body of arrows specially,
   // so that the required parentheses end up on their own lines.
   if (n.body.type === "SequenceExpression") {
-    return group(
-      concat([
-        ...parts,
-        group(concat([" (", indent(concat([softline, body])), softline, ")"])),
-      ])
-    );
+    return group([
+      ...parts,
+      group([" (", indent([softline, body]), softline, ")"]),
+    ]);
   }
 
   // if the arrow function is expanded as last argument, we are adding a
@@ -228,26 +219,20 @@ function printArrowFunctionExpression(path, options, print, args) {
     n.body.type === "ConditionalExpression" &&
     !startsWithNoLookaheadToken(n.body, /* forbidFunctionAndClass */ false);
 
-  return group(
-    concat([
-      ...parts,
-      group(
-        concat([
-          indent(
-            concat([
-              line,
-              shouldAddParens ? ifBreak("", "(") : "",
-              body,
-              shouldAddParens ? ifBreak("", ")") : "",
-            ])
-          ),
-          shouldAddSoftLine
-            ? concat([ifBreak(printTrailingComma ? "," : ""), softline])
-            : "",
-        ])
-      ),
-    ])
-  );
+  return group([
+    ...parts,
+    group([
+      indent([
+        line,
+        shouldAddParens ? ifBreak("", "(") : "",
+        body,
+        shouldAddParens ? ifBreak("", ")") : "",
+      ]),
+      shouldAddSoftLine
+        ? [ifBreak(printTrailingComma ? "," : ""), softline]
+        : "",
+    ]),
+  ]);
 }
 
 function canPrintParamsWithoutParens(node) {
@@ -288,7 +273,7 @@ function printReturnType(path, print, options) {
     n.returnType &&
     isFlowAnnotationComment(options.originalText, n.returnType)
   ) {
-    return concat([" /*: ", returnType, " */"]);
+    return [" /*: ", returnType, " */"];
   }
 
   const parts = [returnType];
@@ -304,7 +289,7 @@ function printReturnType(path, print, options) {
     parts.push(n.returnType ? " " : ": ", path.call(print, "predicate"));
   }
 
-  return concat(parts);
+  return parts;
 }
 
 // `ReturnStatement` and `ThrowStatement`
@@ -315,27 +300,23 @@ function printReturnAndThrowArgument(path, options, print) {
 
   if (node.argument) {
     if (returnArgumentHasLeadingComment(options, node.argument)) {
-      parts.push(
-        concat([
-          " (",
-          indent(concat([hardline, path.call(print, "argument")])),
-          hardline,
-          ")",
-        ])
-      );
+      parts.push([
+        " (",
+        indent([hardline, path.call(print, "argument")]),
+        hardline,
+        ")",
+      ]);
     } else if (
       isBinaryish(node.argument) ||
       node.argument.type === "SequenceExpression"
     ) {
       parts.push(
-        group(
-          concat([
-            ifBreak(" (", " "),
-            indent(concat([softline, path.call(print, "argument")])),
-            softline,
-            ifBreak(")"),
-          ])
-        )
+        group([
+          ifBreak(" (", " "),
+          indent([softline, path.call(print, "argument")]),
+          softline,
+          ifBreak(")"),
+        ])
       );
     } else {
       parts.push(" ", path.call(print, "argument"));
@@ -361,15 +342,15 @@ function printReturnAndThrowArgument(path, options, print) {
     parts.push(semi);
   }
 
-  return concat(parts);
+  return parts;
 }
 
 function printReturnStatement(path, options, print) {
-  return concat(["return", printReturnAndThrowArgument(path, options, print)]);
+  return ["return", printReturnAndThrowArgument(path, options, print)];
 }
 
 function printThrowStatement(path, options, print) {
-  return concat(["throw", printReturnAndThrowArgument(path, options, print)]);
+  return ["throw", printReturnAndThrowArgument(path, options, print)];
 }
 
 module.exports = {
diff --git a/src/language-js/print/html-binding.js b/src/language-js/print/html-binding.js
index ebf1cbf18..17d988686 100644
--- a/src/language-js/print/html-binding.js
+++ b/src/language-js/print/html-binding.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { concat, join, line, group, softline, indent },
+  builders: { join, line, group, softline, indent },
 } = require("../../document");
 
 function printHtmlBinding(path, options, print) {
@@ -19,7 +19,7 @@ function printHtmlBinding(path, options, print) {
     return path.call(
       (functionDeclarationPath) => {
         const printed = join(
-          concat([",", line]),
+          [",", line],
           functionDeclarationPath.map(print, "params")
         );
 
@@ -28,12 +28,7 @@ function printHtmlBinding(path, options, print) {
           return printed;
         }
 
-        return concat([
-          "(",
-          indent(concat([softline, group(printed)])),
-          softline,
-          ")",
-        ]);
+        return ["(", indent([softline, group(printed)]), softline, ")"];
       },
       "program",
       "body",
@@ -44,7 +39,7 @@ function printHtmlBinding(path, options, print) {
   if (options.__isVueBindings) {
     return path.call(
       (functionDeclarationPath) =>
-        join(concat([",", line]), functionDeclarationPath.map(print, "params")),
+        join([",", line], functionDeclarationPath.map(print, "params")),
       "program",
       "body",
       0
diff --git a/src/language-js/print/interface.js b/src/language-js/print/interface.js
index 68e7d07e3..c6811babe 100644
--- a/src/language-js/print/interface.js
+++ b/src/language-js/print/interface.js
@@ -2,7 +2,7 @@
 
 const { isNonEmptyArray } = require("../../common/util");
 const {
-  builders: { concat, join, line, group, indent, ifBreak },
+  builders: { join, line, group, indent, ifBreak },
 } = require("../../document");
 const { hasComment, identity, CommentCheckFlags } = require("../utils");
 const { getTypeParametersGroupId } = require("./type-parameters");
@@ -51,7 +51,7 @@ function printInterface(path, options, print) {
         : line,
       "extends ",
       (n.extends.length === 1 ? identity : indent)(
-        join(concat([",", line]), path.map(print, "extends"))
+        join([",", line], path.map(print, "extends"))
       )
     );
   }
@@ -60,17 +60,15 @@ function printInterface(path, options, print) {
     (n.id && hasComment(n.id, CommentCheckFlags.Trailing)) ||
     isNonEmptyArray(n.extends)
   ) {
-    const printedExtends = concat(extendsParts);
+    const printedExtends = extendsParts;
     if (shouldIndentOnlyHeritageClauses) {
       parts.push(
         group(
-          concat(
-            partsGroup.concat(ifBreak(indent(printedExtends), printedExtends))
-          )
+          partsGroup.concat(ifBreak(indent(printedExtends), printedExtends))
         )
       );
     } else {
-      parts.push(group(indent(concat(partsGroup.concat(printedExtends)))));
+      parts.push(group(indent(partsGroup.concat(printedExtends))));
     }
   } else {
     parts.push(...partsGroup, ...extendsParts);
@@ -78,7 +76,7 @@ function printInterface(path, options, print) {
 
   parts.push(" ", path.call(print, "body"));
 
-  return group(concat(parts));
+  return group(parts);
 }
 
 module.exports = { printInterface };
diff --git a/src/language-js/print/jsx.js b/src/language-js/print/jsx.js
index 1b0dd0429..78d37bf28 100644
--- a/src/language-js/print/jsx.js
+++ b/src/language-js/print/jsx.js
@@ -3,7 +3,6 @@
 const { printComments, printDanglingComments } = require("../../main/comments");
 const {
   builders: {
-    concat,
     line,
     hardline,
     softline,
@@ -58,10 +57,10 @@ function printJsxElementInternal(path, options, print) {
   const n = path.getValue();
 
   if (n.type === "JSXElement" && isEmptyJsxElement(n)) {
-    return concat([
+    return [
       path.call(print, "openingElement"),
       path.call(print, "closingElement"),
-    ]);
+    ];
   }
 
   const openingLines =
@@ -79,7 +78,7 @@ function printJsxElementInternal(path, options, print) {
     (n.children[0].expression.type === "TemplateLiteral" ||
       n.children[0].expression.type === "TaggedTemplateExpression")
   ) {
-    return concat([openingLines, ...path.map(print, "children"), closingLines]);
+    return [openingLines, ...path.map(print, "children"), closingLines];
   }
 
   // Convert `{" "}` to text nodes containing a space.
@@ -115,7 +114,7 @@ function printJsxElementInternal(path, options, print) {
   const rawJsxWhitespace = options.singleQuote ? "{' '}" : '{" "}';
   const jsxWhitespace = isMdxBlock
     ? " "
-    : ifBreak(concat([rawJsxWhitespace, softline]), " ");
+    : ifBreak([rawJsxWhitespace, softline], " ");
 
   const isFacebookTranslationTag =
     n.openingElement &&
@@ -207,7 +206,7 @@ function printJsxElementInternal(path, options, print) {
           return;
         }
         // Leading whitespace
-        multilineChildren.push(concat([rawJsxWhitespace, hardline]));
+        multilineChildren.push([rawJsxWhitespace, hardline]);
         return;
       } else if (i === children.length - 1) {
         // Trailing whitespace
@@ -232,27 +231,25 @@ function printJsxElementInternal(path, options, print) {
   // to output each on a separate line.
   const content = containsText
     ? fill(multilineChildren)
-    : group(concat(multilineChildren), { shouldBreak: true });
+    : group(multilineChildren, { shouldBreak: true });
 
   if (isMdxBlock) {
     return content;
   }
 
-  const multiLineElem = group(
-    concat([
-      openingLines,
-      indent(concat([hardline, content])),
-      hardline,
-      closingLines,
-    ])
-  );
+  const multiLineElem = group([
+    openingLines,
+    indent([hardline, content]),
+    hardline,
+    closingLines,
+  ]);
 
   if (forcedBreak) {
     return multiLineElem;
   }
 
   return conditionalGroup([
-    group(concat([openingLines, ...children, closingLines])),
+    group([openingLines, ...children, closingLines]),
     multiLineElem,
   ]);
 }
@@ -463,12 +460,12 @@ function maybeWrapJsxElementInParens(path, elem, options) {
   const needsParens = pathNeedsParens(path, options);
 
   return group(
-    concat([
+    [
       needsParens ? "" : ifBreak("("),
-      indent(concat([softline, elem])),
+      indent([softline, elem]),
       softline,
       needsParens ? "" : ifBreak(")"),
-    ]),
+    ],
     { shouldBreak }
   );
 }
@@ -490,14 +487,14 @@ function printJsxAttribute(path, options, print) {
       );
       const escape = quote === "'" ? "&apos;" : "&quot;";
       final = final.slice(1, -1).replace(new RegExp(quote, "g"), escape);
-      res = concat([quote, final, quote]);
+      res = [quote, final, quote];
     } else {
       res = path.call(print, "value");
     }
     parts.push("=", res);
   }
 
-  return concat(parts);
+  return parts;
 }
 
 function printJsxExpressionContainer(path, options, print) {
@@ -521,20 +518,21 @@ function printJsxExpressionContainer(path, options, print) {
             isBinaryish(n.expression)))));
 
   if (shouldInline) {
-    return group(
-      concat(["{", path.call(print, "expression"), lineSuffixBoundary, "}"])
-    );
-  }
-
-  return group(
-    concat([
+    return group([
       "{",
-      indent(concat([softline, path.call(print, "expression")])),
-      softline,
+      path.call(print, "expression"),
       lineSuffixBoundary,
       "}",
-    ])
-  );
+    ]);
+  }
+
+  return group([
+    "{",
+    indent([softline, path.call(print, "expression")]),
+    softline,
+    lineSuffixBoundary,
+    "}",
+  ]);
 }
 
 function printJsxOpeningElement(path, options, print) {
@@ -546,12 +544,12 @@ function printJsxOpeningElement(path, options, print) {
 
   // Don't break self-closing elements with no attributes and no comments
   if (n.selfClosing && n.attributes.length === 0 && !nameHasComments) {
-    return concat([
+    return [
       "<",
       path.call(print, "name"),
       path.call(print, "typeParameters"),
       " />",
-    ]);
+    ];
   }
 
   // don't break up opening elements with a single long text attribute
@@ -573,16 +571,14 @@ function printJsxOpeningElement(path, options, print) {
     !nameHasComments &&
     !hasComment(n.attributes[0])
   ) {
-    return group(
-      concat([
-        "<",
-        path.call(print, "name"),
-        path.call(print, "typeParameters"),
-        " ",
-        ...path.map(print, "attributes"),
-        n.selfClosing ? " />" : ">",
-      ])
-    );
+    return group([
+      "<",
+      path.call(print, "name"),
+      path.call(print, "typeParameters"),
+      " ",
+      ...path.map(print, "attributes"),
+      n.selfClosing ? " />" : ">",
+    ]);
   }
 
   const lastAttrHasTrailingComments =
@@ -616,17 +612,15 @@ function printJsxOpeningElement(path, options, print) {
     );
 
   return group(
-    concat([
+    [
       "<",
       path.call(print, "name"),
       path.call(print, "typeParameters"),
 
-      indent(
-        concat(path.map((attr) => concat([line, print(attr)]), "attributes"))
-      ),
+      indent(path.map((attr) => [line, print(attr)], "attributes")),
       n.selfClosing ? line : bracketSameLine ? ">" : softline,
       n.selfClosing ? "/>" : bracketSameLine ? "" : ">",
-    ]),
+    ],
     { shouldBreak }
   );
 }
@@ -639,7 +633,7 @@ function printJsxClosingElement(path, options, print) {
 
   const printed = path.call(print, "name");
   if (hasComment(n.name, CommentCheckFlags.Leading | CommentCheckFlags.Line)) {
-    parts.push(indent(concat([hardline, printed])), hardline);
+    parts.push(indent([hardline, printed]), hardline);
   } else if (
     hasComment(n.name, CommentCheckFlags.Leading | CommentCheckFlags.Block)
   ) {
@@ -650,7 +644,7 @@ function printJsxClosingElement(path, options, print) {
 
   parts.push(">");
 
-  return concat(parts);
+  return parts;
 }
 
 function printJsxOpeningClosingFragment(path, options /*, print*/) {
@@ -658,21 +652,19 @@ function printJsxOpeningClosingFragment(path, options /*, print*/) {
   const nodeHasComment = hasComment(n);
   const hasOwnLineComment = hasComment(n, CommentCheckFlags.Line);
   const isOpeningFragment = n.type === "JSXOpeningFragment";
-  return concat([
+  return [
     isOpeningFragment ? "<" : "</",
-    indent(
-      concat([
-        hasOwnLineComment
-          ? hardline
-          : nodeHasComment && !isOpeningFragment
-          ? " "
-          : "",
-        printDanglingComments(path, options, true),
-      ])
-    ),
+    indent([
+      hasOwnLineComment
+        ? hardline
+        : nodeHasComment && !isOpeningFragment
+        ? " "
+        : "",
+      printDanglingComments(path, options, true),
+    ]),
     hasOwnLineComment ? hardline : "",
     ">",
-  ]);
+  ];
 }
 
 function printJsxElement(path, options, print) {
@@ -688,33 +680,33 @@ function printJsxEmptyExpression(path, options /*, print*/) {
   const n = path.getValue();
   const requiresHardline = hasComment(n, CommentCheckFlags.Line);
 
-  return concat([
+  return [
     printDanglingComments(path, options, /* sameIndent */ !requiresHardline),
     requiresHardline ? hardline : "",
-  ]);
+  ];
 }
 
 // `JSXSpreadAttribute` and `JSXSpreadChild`
 function printJsxSpreadAttribute(path, options, print) {
   const n = path.getValue();
-  return concat([
+  return [
     "{",
     path.call(
       (p) => {
-        const printed = concat(["...", print(p)]);
+        const printed = ["...", print(p)];
         const n = p.getValue();
         if (!hasComment(n) || !willPrintOwnComments(p)) {
           return printed;
         }
-        return concat([
-          indent(concat([softline, printComments(p, () => printed, options)])),
+        return [
+          indent([softline, printComments(p, () => printed, options)]),
           softline,
-        ]);
+        ];
       },
       n.type === "JSXSpreadAttribute" ? "argument" : "expression"
     ),
     "}",
-  ]);
+  ];
 }
 
 function printJsx(path, options, print) {
diff --git a/src/language-js/print/member-chain.js b/src/language-js/print/member-chain.js
index eb774e56d..b12c6c191 100644
--- a/src/language-js/print/member-chain.js
+++ b/src/language-js/print/member-chain.js
@@ -23,15 +23,7 @@ const {
 const { locEnd } = require("../loc");
 
 const {
-  builders: {
-    concat,
-    join,
-    hardline,
-    group,
-    indent,
-    conditionalGroup,
-    breakParent,
-  },
+  builders: { join, hardline, group, indent, conditionalGroup, breakParent },
   utils: { willBreak },
 } = require("../../document");
 const printCallArguments = require("./call-arguments");
@@ -98,19 +90,18 @@ function printMemberChain(path, options, print) {
     ) {
       printedNodes.unshift({
         node,
-        printed: concat([
+        printed: [
           printComments(
             path,
-            () =>
-              concat([
-                printOptionalToken(path),
-                printFunctionTypeParameters(path, options, print),
-                printCallArguments(path, options, print),
-              ]),
+            () => [
+              printOptionalToken(path),
+              printFunctionTypeParameters(path, options, print),
+              printCallArguments(path, options, print),
+            ],
             options
           ),
           shouldInsertEmptyLineAfter(node) ? hardline : "",
-        ]),
+        ],
       });
       path.call((callee) => rec(callee), "callee");
     } else if (isMemberish(node)) {
@@ -147,11 +138,11 @@ function printMemberChain(path, options, print) {
   const node = path.getValue();
   printedNodes.unshift({
     node,
-    printed: concat([
+    printed: [
       printOptionalToken(path),
       printFunctionTypeParameters(path, options, print),
       printCallArguments(path, options, print),
-    ]),
+    ],
   });
 
   if (node.callee) {
@@ -317,9 +308,9 @@ function printMemberChain(path, options, print) {
       printedGroup.length > 0 &&
       printedGroup[printedGroup.length - 1].needsParens
     ) {
-      return concat(["(", ...printed, ")"]);
+      return ["(", ...printed, ")"];
     }
-    return concat(printed);
+    return printed;
   }
 
   function printIndentedGroup(groups) {
@@ -327,13 +318,11 @@ function printMemberChain(path, options, print) {
     if (groups.length === 0) {
       return "";
     }
-    return indent(
-      group(concat([hardline, join(hardline, groups.map(printGroup))]))
-    );
+    return indent(group([hardline, join(hardline, groups.map(printGroup))]));
   }
 
   const printedGroups = groups.map(printGroup);
-  const oneLine = concat(printedGroups);
+  const oneLine = printedGroups;
 
   const cutoff = shouldMerge ? 3 : 2;
   const flatGroups = flat(groups);
@@ -364,12 +353,12 @@ function printMemberChain(path, options, print) {
     !isCallOrOptionalCallExpression(lastNodeBeforeIndent) &&
     shouldInsertEmptyLineAfter(lastNodeBeforeIndent);
 
-  const expanded = concat([
+  const expanded = [
     printGroup(groups[0]),
-    shouldMerge ? concat(groups.slice(1, 2).map(printGroup)) : "",
+    shouldMerge ? groups.slice(1, 2).map(printGroup) : "",
     shouldHaveEmptyLineBeforeIndent ? hardline : "",
     printIndentedGroup(groups.slice(shouldMerge ? 2 : 1)),
-  ]);
+  ];
 
   const callExpressions = printedNodes
     .map(({ node }) => node)
@@ -405,13 +394,13 @@ function printMemberChain(path, options, print) {
     return group(expanded);
   }
 
-  return concat([
+  return [
     // We only need to check `oneLine` because if `expanded` is chosen
     // that means that the parent group has already been broken
     // naturally
     willBreak(oneLine) || shouldHaveEmptyLineBeforeIndent ? breakParent : "",
     conditionalGroup([oneLine, expanded]),
-  ]);
+  ];
 }
 
 module.exports = printMemberChain;
diff --git a/src/language-js/print/member.js b/src/language-js/print/member.js
index 78201b27f..01cc8b1eb 100644
--- a/src/language-js/print/member.js
+++ b/src/language-js/print/member.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { concat, softline, group, indent },
+  builders: { softline, group, indent },
 } = require("../../document");
 const { isNumericLiteral } = require("../utils");
 const { printOptionalToken } = require("./misc");
@@ -36,14 +36,12 @@ function printMemberExpression(path, options, print) {
       parent.type !== "MemberExpression" &&
       parent.type !== "OptionalMemberExpression");
 
-  return concat([
+  return [
     path.call(print, "object"),
     shouldInline
       ? printMemberLookup(path, options, print)
-      : group(
-          indent(concat([softline, printMemberLookup(path, options, print)]))
-        ),
-  ]);
+      : group(indent([softline, printMemberLookup(path, options, print)])),
+  ];
 }
 
 function printMemberLookup(path, options, print) {
@@ -52,16 +50,14 @@ function printMemberLookup(path, options, print) {
   const optional = printOptionalToken(path);
 
   if (!n.computed) {
-    return concat([optional, ".", property]);
+    return [optional, ".", property];
   }
 
   if (!n.property || isNumericLiteral(n.property)) {
-    return concat([optional, "[", property, "]"]);
+    return [optional, "[", property, "]"];
   }
 
-  return group(
-    concat([optional, "[", indent(concat([softline, property])), softline, "]"])
-  );
+  return group([optional, "[", indent([softline, property]), softline, "]"]);
 }
 
 module.exports = { printMemberExpression, printMemberLookup };
diff --git a/src/language-js/print/misc.js b/src/language-js/print/misc.js
index 892365c5f..e50bf21f2 100644
--- a/src/language-js/print/misc.js
+++ b/src/language-js/print/misc.js
@@ -2,7 +2,7 @@
 
 const { isNonEmptyArray } = require("../../common/util");
 const {
-  builders: { concat, indent, join, line },
+  builders: { indent, join, line },
 } = require("../../document");
 const { isFlowAnnotationComment } = require("../utils");
 
@@ -53,17 +53,17 @@ function printTypeAnnotation(path, options, print) {
     parentNode.type === "DeclareFunction" && parentNode.id === node;
 
   if (isFlowAnnotationComment(options.originalText, node.typeAnnotation)) {
-    return concat([" /*: ", path.call(print, "typeAnnotation"), " */"]);
+    return [" /*: ", path.call(print, "typeAnnotation"), " */"];
   }
 
-  return concat([
+  return [
     isFunctionDeclarationIdentifier ? "" : isDefinite ? "!: " : ": ",
     path.call(print, "typeAnnotation"),
-  ]);
+  ];
 }
 
 function printBindExpressionCallee(path, options, print) {
-  return concat(["::", path.call(print, "callee")]);
+  return ["::", path.call(print, "callee")];
 }
 
 function printTypeScriptModifiers(path, options, print) {
@@ -71,7 +71,7 @@ function printTypeScriptModifiers(path, options, print) {
   if (!isNonEmptyArray(n.modifiers)) {
     return "";
   }
-  return concat([join(" ", path.map(print, "modifiers")), " "]);
+  return [join(" ", path.map(print, "modifiers")), " "];
 }
 
 function adjustClause(node, clause, forceSpace) {
@@ -80,10 +80,10 @@ function adjustClause(node, clause, forceSpace) {
   }
 
   if (node.type === "BlockStatement" || forceSpace) {
-    return concat([" ", clause]);
+    return [" ", clause];
   }
 
-  return indent(concat([line, clause]));
+  return indent([line, clause]);
 }
 
 module.exports = {
diff --git a/src/language-js/print/module.js b/src/language-js/print/module.js
index 9fc03fa94..83e5c8501 100644
--- a/src/language-js/print/module.js
+++ b/src/language-js/print/module.js
@@ -2,7 +2,7 @@
 
 const { isNonEmptyArray } = require("../../common/util");
 const {
-  builders: { concat, softline, group, indent, join, line, ifBreak, hardline },
+  builders: { softline, group, indent, join, line, ifBreak, hardline },
 } = require("../../document");
 const { printDanglingComments } = require("../../main/comments");
 
@@ -40,7 +40,7 @@ function printImportDeclaration(path, options, print) {
 
   parts.push(semi);
 
-  return concat(parts);
+  return parts;
 }
 
 function printExportDeclaration(path, options, print) {
@@ -83,7 +83,7 @@ function printExportDeclaration(path, options, print) {
     parts.push(";");
   }
 
-  return concat(parts);
+  return parts;
 }
 
 function printExportAllDeclaration(path, options, print) {
@@ -112,7 +112,7 @@ function printExportAllDeclaration(path, options, print) {
     semi
   );
 
-  return concat(parts);
+  return parts;
 }
 
 function shouldExportDeclarationPrintSemi(node, options) {
@@ -156,7 +156,7 @@ function printModuleSource(path, options, print) {
   }
   parts.push(" ", path.call(print, "source"));
 
-  return concat(parts);
+  return parts;
 }
 
 function printModuleSpecifiers(path, options, print) {
@@ -209,37 +209,31 @@ function printModuleSpecifiers(path, options, print) {
 
       if (canBreak) {
         parts.push(
-          group(
-            concat([
-              "{",
-              indent(
-                concat([
-                  options.bracketSpacing ? line : softline,
-                  join(concat([",", line]), groupedSpecifiers),
-                ])
-              ),
-              ifBreak(shouldPrintComma(options) ? "," : ""),
-              options.bracketSpacing ? line : softline,
-              "}",
-            ])
-          )
-        );
-      } else {
-        parts.push(
-          concat([
+          group([
             "{",
-            options.bracketSpacing ? " " : "",
-            ...groupedSpecifiers,
-            options.bracketSpacing ? " " : "",
+            indent([
+              options.bracketSpacing ? line : softline,
+              join([",", line], groupedSpecifiers),
+            ]),
+            ifBreak(shouldPrintComma(options) ? "," : ""),
+            options.bracketSpacing ? line : softline,
             "}",
           ])
         );
+      } else {
+        parts.push([
+          "{",
+          options.bracketSpacing ? " " : "",
+          ...groupedSpecifiers,
+          options.bracketSpacing ? " " : "",
+          "}",
+        ]);
       }
     }
   } else {
     parts.push("{}");
   }
-  return concat(parts);
+  return parts;
 }
 
 function shouldNotPrintSpecifiers(node, options) {
@@ -262,13 +256,13 @@ function shouldNotPrintSpecifiers(node, options) {
 function printImportAssertions(path, options, print) {
   const node = path.getNode();
   if (isNonEmptyArray(node.assertions)) {
-    return concat([
+    return [
       " assert {",
       options.bracketSpacing ? " " : "",
       join(", ", path.map(print, "assertions")),
       options.bracketSpacing ? " " : "",
       "}",
-    ]);
+    ];
   }
   return "";
 }
@@ -307,7 +301,7 @@ function printModuleSpecifier(path, options, print) {
   }
 
   parts.push(left, left && right ? " as " : "", right);
-  return concat(parts);
+  return parts;
 }
 
 module.exports = {
diff --git a/src/language-js/print/object.js b/src/language-js/print/object.js
index ab4d1b001..222bb441f 100644
--- a/src/language-js/print/object.js
+++ b/src/language-js/print/object.js
@@ -2,7 +2,7 @@
 
 const { printDanglingComments } = require("../../main/comments");
 const {
-  builders: { concat, line, softline, group, indent, ifBreak, hardline },
+  builders: { line, softline, group, indent, ifBreak, hardline },
 } = require("../../document");
 const { getLast, hasNewlineInRange, hasNewline } = require("../../common/util");
 const {
@@ -107,7 +107,7 @@ function printObject(path, options, print) {
   const props = propsAndLoc
     .sort((a, b) => a.loc - b.loc)
     .map((prop) => {
-      const result = concat(separatorParts.concat(group(prop.printed)));
+      const result = separatorParts.concat(group(prop.printed));
       separatorParts = [separator, line];
       if (
         (prop.node.type === "TSPropertySignature" ||
@@ -132,18 +132,18 @@ function printObject(path, options, print) {
         options,
         /* sameIndent */ true
       );
-      printed = concat([
+      printed = [
         printedDanglingComments,
         hasLineComments ||
         hasNewline(options.originalText, locEnd(getLast(getComments(n))))
           ? hardline
           : line,
         "...",
-      ]);
+      ];
     } else {
       printed = "...";
     }
-    props.push(concat(separatorParts.concat(printed)));
+    props.push(separatorParts.concat(printed));
   }
 
   const lastElem = getLast(n[propertiesField]);
@@ -162,27 +162,21 @@ function printObject(path, options, print) {
   let content;
   if (props.length === 0) {
     if (!hasComment(n, CommentCheckFlags.Dangling)) {
-      return concat([
-        leftBrace,
-        rightBrace,
-        printTypeAnnotation(path, options, print),
-      ]);
+      return [leftBrace, rightBrace, printTypeAnnotation(path, options, print)];
     }
 
-    content = group(
-      concat([
-        leftBrace,
-        printDanglingComments(path, options),
-        softline,
-        rightBrace,
-        printOptionalToken(path),
-        printTypeAnnotation(path, options, print),
-      ])
-    );
-  } else {
-    content = concat([
+    content = group([
       leftBrace,
-      indent(concat([options.bracketSpacing ? line : softline, ...props])),
+      printDanglingComments(path, options),
+      softline,
+      rightBrace,
+      printOptionalToken(path),
+      printTypeAnnotation(path, options, print),
+    ]);
+  } else {
+    content = [
+      leftBrace,
+      indent([options.bracketSpacing ? line : softline, ...props]),
       ifBreak(
         canHaveTrailingSeparator &&
           (separator !== "," || shouldPrintComma(options))
@@ -193,7 +187,7 @@ function printObject(path, options, print) {
       rightBrace,
       printOptionalToken(path),
       printTypeAnnotation(path, options, print),
-    ]);
+    ];
   }
 
   // If we inline the object as first argument of the parent, we don't want
diff --git a/src/language-js/print/property.js b/src/language-js/print/property.js
index af3d23058..fa81565a3 100644
--- a/src/language-js/print/property.js
+++ b/src/language-js/print/property.js
@@ -2,9 +2,6 @@
 
 const { printComments } = require("../../main/comments");
 const { printString, printNumber } = require("../../common/util");
-const {
-  builders: { concat },
-} = require("../../document");
 const {
   isNumericLiteral,
   isSimpleNumber,
@@ -20,7 +17,7 @@ function printPropertyKey(path, options, print) {
   const node = path.getNode();
 
   if (node.computed) {
-    return concat(["[", path.call(print, "key"), "]"]);
+    return ["[", path.call(print, "key"), "]"];
   }
 
   const parent = path.getParentNode();
@@ -31,7 +28,7 @@ function printPropertyKey(path, options, print) {
     // flow has `Identifier` key, and babel has `PrivateName` key
     key.type === "Identifier"
   ) {
-    return concat(["#", path.call(print, "key")]);
+    return ["#", path.call(print, "key")];
   }
 
   if (options.quoteProps === "consistent" && !needsQuoteProps.has(parent)) {
diff --git a/src/language-js/print/statement.js b/src/language-js/print/statement.js
index edd017666..d03c8b314 100644
--- a/src/language-js/print/statement.js
+++ b/src/language-js/print/statement.js
@@ -2,7 +2,7 @@
 
 const { getLast } = require("../../common/util");
 const {
-  builders: { concat, hardline },
+  builders: { hardline },
 } = require("../../document");
 const pathNeedsParens = require("../needs-parens");
 const {
@@ -81,7 +81,7 @@ function printStatementSequence(path, options, print, property) {
     }
   }, property);
 
-  return concat(parts);
+  return parts;
 }
 
 function statementNeedsASIProtection(path, options) {
diff --git a/src/language-js/print/template-literal.js b/src/language-js/print/template-literal.js
index 3308af75e..ad185cffb 100644
--- a/src/language-js/print/template-literal.js
+++ b/src/language-js/print/template-literal.js
@@ -3,7 +3,6 @@
 const { getStringWidth, getIndentSize } = require("../../common/util");
 const {
   builders: {
-    concat,
     join,
     hardline,
     softline,
@@ -93,7 +92,7 @@ function printTemplateLiteral(path, print, options) {
           expression.type === "TSAsExpression" ||
           isBinaryish(expression)
         ) {
-          printed = concat([indent(concat([softline, printed])), softline]);
+          printed = [indent([softline, printed]), softline];
         }
       }
 
@@ -102,13 +101,13 @@ function printTemplateLiteral(path, print, options) {
           ? align(Number.NEGATIVE_INFINITY, printed)
           : addAlignmentToDoc(printed, indentSize, tabWidth);
 
-      parts.push(group(concat(["${", aligned, lineSuffixBoundary, "}"])));
+      parts.push(group(["${", aligned, lineSuffixBoundary, "}"]));
     }
   }, "quasis");
 
   parts.push("`");
 
-  return concat(parts);
+  return parts;
 }
 
 function printJestEachTemplateLiteral(path, options, print) {
@@ -176,29 +175,27 @@ function printJestEachTemplateLiteral(path, options, print) {
     parts.push(
       lineSuffixBoundary,
       "`",
-      indent(
-        concat([
+      indent([
+        hardline,
+        join(
           hardline,
-          join(
-            hardline,
-            table.map((row) =>
-              join(
-                " | ",
-                row.cells.map((cell, index) =>
-                  row.hasLineBreak
-                    ? cell
-                    : cell +
-                      " ".repeat(maxColumnWidths[index] - getStringWidth(cell))
-                )
+          table.map((row) =>
+            join(
+              " | ",
+              row.cells.map((cell, index) =>
+                row.hasLineBreak
+                  ? cell
+                  : cell +
+                    " ".repeat(maxColumnWidths[index] - getStringWidth(cell))
               )
             )
-          ),
-        ])
-      ),
+          )
+        ),
+      ]),
       hardline,
       "`"
     );
-    return concat(parts);
+    return parts;
   }
 }
 
@@ -206,9 +203,9 @@ function printTemplateExpression(path, print) {
   const node = path.getValue();
   let printed = print(path);
   if (hasComment(node)) {
-    printed = group(concat([indent(concat([softline, printed])), softline]));
+    printed = group([indent([softline, printed]), softline]);
   }
-  return concat(["${", printed, lineSuffixBoundary, "}"]);
+  return ["${", printed, lineSuffixBoundary, "}"];
 }
 
 function printTemplateExpressions(path, print) {
diff --git a/src/language-js/print/ternary.js b/src/language-js/print/ternary.js
index 031a9dc18..bcbf7315f 100644
--- a/src/language-js/print/ternary.js
+++ b/src/language-js/print/ternary.js
@@ -6,7 +6,6 @@ const { isJsxNode, isBlockComment, getComments } = require("../utils");
 const { locStart, locEnd } = require("../loc");
 const {
   builders: {
-    concat,
     line,
     softline,
     group,
@@ -131,13 +130,13 @@ function printTernaryTest(path, options, print) {
 
   const printed = isConditionalExpression
     ? path.call(print, "test")
-    : concat([
+    : [
         path.call(print, "checkType"),
         " ",
         "extends",
         " ",
         path.call(print, "extendsType"),
-      ]);
+      ];
   /**
    *     a
    *       ? b
@@ -221,13 +220,12 @@ function printTernary(path, options, print) {
     // Even though they don't need parens, we wrap (almost) everything in
     // parens when using ?: within JSX, because the parens are analogous to
     // curly braces in an if statement.
-    const wrap = (doc) =>
-      concat([
-        ifBreak("(", ""),
-        indent(concat([softline, doc])),
-        softline,
-        ifBreak(")", ""),
-      ]);
+    const wrap = (doc) => [
+      ifBreak("(", ""),
+      indent([softline, doc]),
+      softline,
+      ifBreak(")", ""),
+    ];
 
     // The only things we don't wrap are:
     // * Nested conditional expressions in alternates
@@ -250,7 +248,7 @@ function printTernary(path, options, print) {
     );
   } else {
     // normal mode
-    const part = concat([
+    const part = [
       line,
       "? ",
       consequentNode.type === node.type ? ifBreak("", "(") : "",
@@ -261,7 +259,7 @@ function printTernary(path, options, print) {
       alternateNode.type === node.type
         ? path.call(print, alternateNodePropertyName)
         : align(2, path.call(print, alternateNodePropertyName)),
-    ]);
+    ];
     parts.push(
       parent.type !== node.type ||
         parent[alternateNodePropertyName] === node ||
@@ -296,7 +294,7 @@ function printTernary(path, options, print) {
     parent === firstNonConditionalParent
       ? group(doc, { shouldBreak })
       : shouldBreak
-      ? concat([doc, breakParent])
+      ? [doc, breakParent]
       : doc;
 
   // Break the closing paren to keep the chain right after it:
@@ -311,17 +309,13 @@ function printTernary(path, options, print) {
       (parent.type === "NGPipeExpression" && parent.left === node)) &&
     !parent.computed;
 
-  const result = maybeGroup(
-    concat([
-      printTernaryTest(path, options, print),
-      forceNoIndent ? concat(parts) : indent(concat(parts)),
-      isConditionalExpression && breakClosingParen ? softline : "",
-    ])
-  );
+  const result = maybeGroup([
+    printTernaryTest(path, options, print),
+    forceNoIndent ? parts : indent(parts),
+    isConditionalExpression && breakClosingParen ? softline : "",
+  ]);
 
-  return isParentTest
-    ? group(concat([indent(concat([softline, result])), softline]))
-    : result;
+  return isParentTest ? group([indent([softline, result]), softline]) : result;
 }
 
 module.exports = { printTernary };
diff --git a/src/language-js/print/type-annotation.js b/src/language-js/print/type-annotation.js
index bc1895a41..101143a0d 100644
--- a/src/language-js/print/type-annotation.js
+++ b/src/language-js/print/type-annotation.js
@@ -3,7 +3,7 @@
 const { printComments, printDanglingComments } = require("../../main/comments");
 const { getLast } = require("../../common/util");
 const {
-  builders: { concat, group, join, line, softline, indent, align, ifBreak },
+  builders: { group, join, line, softline, indent, align, ifBreak },
 } = require("../../document");
 const pathNeedsParens = require("../needs-parens");
 const { locStart } = require("../loc");
@@ -69,7 +69,7 @@ function printOpaqueType(path, options, print) {
 
   parts.push(semi);
 
-  return concat(parts);
+  return parts;
 }
 
 function printTypeAlias(path, options, print) {
@@ -96,7 +96,7 @@ function printTypeAlias(path, options, print) {
     semi
   );
 
-  return group(concat(parts));
+  return group(parts);
 }
 
 // `TSIntersectionType` and `IntersectionTypeAnnotation`
@@ -110,10 +110,10 @@ function printIntersectionType(path, options, print) {
       result.push(types[i]);
     } else if (isObjectType(n.types[i - 1]) && isObjectType(n.types[i])) {
       // If both are objects, don't indent
-      result.push(concat([" & ", wasIndented ? indent(types[i]) : types[i]]));
+      result.push([" & ", wasIndented ? indent(types[i]) : types[i]]);
     } else if (!isObjectType(n.types[i - 1]) && !isObjectType(n.types[i])) {
       // If no object is involved, go to the next line if it breaks
-      result.push(indent(concat([" &", line, types[i]])));
+      result.push(indent([" &", line, types[i]]));
     } else {
       // If you go from object to non-object or vis-versa, then inline it
       if (i > 1) {
@@ -122,7 +122,7 @@ function printIntersectionType(path, options, print) {
       result.push(" & ", i > 1 ? indent(types[i]) : types[i]);
     }
   }
-  return group(concat(result));
+  return group(result);
 }
 
 // `TSUnionType` and `UnionTypeAnnotation`
@@ -184,26 +184,24 @@ function printUnionType(path, options, print) {
   const shouldAddStartLine =
     shouldIndent && !hasLeadingOwnLineComment(options.originalText, n);
 
-  const code = concat([
-    ifBreak(concat([shouldAddStartLine ? line : "", "| "])),
-    join(concat([line, "| "]), printed),
-  ]);
+  const code = [
+    ifBreak([shouldAddStartLine ? line : "", "| "]),
+    join([line, "| "], printed),
+  ];
 
   if (pathNeedsParens(path, options)) {
-    return group(concat([indent(code), softline]));
+    return group([indent(code), softline]);
   }
 
   if (
     (parent.type === "TupleTypeAnnotation" && parent.types.length > 1) ||
     (parent.type === "TSTupleType" && parent.elementTypes.length > 1)
   ) {
-    return group(
-      concat([
-        indent(concat([ifBreak(concat(["(", softline])), code])),
-        softline,
-        ifBreak(")"),
-      ])
-    );
+    return group([
+      indent([ifBreak(["(", softline]), code]),
+      softline,
+      ifBreak(")"),
+    ]);
   }
 
   return group(shouldIndent ? indent(code) : code);
@@ -277,7 +275,7 @@ function printFunctionType(path, options, print) {
     parts.push(")");
   }
 
-  return group(concat(parts));
+  return group(parts);
 }
 
 // `TSTupleType` and `TupleTypeAnnotation`
@@ -286,18 +284,14 @@ function printTupleType(path, options, print) {
   const typesField = n.type === "TSTupleType" ? "elementTypes" : "types";
   const hasRest =
     n[typesField].length > 0 && getLast(n[typesField]).type === "TSRestType";
-  return group(
-    concat([
-      "[",
-      indent(
-        concat([softline, printArrayItems(path, options, typesField, print)])
-      ),
-      ifBreak(shouldPrintComma(options, "all") && !hasRest ? "," : ""),
-      printDanglingComments(path, options, /* sameIndent */ true),
-      softline,
-      "]",
-    ])
-  );
+  return group([
+    "[",
+    indent([softline, printArrayItems(path, options, typesField, print)]),
+    ifBreak(shouldPrintComma(options, "all") && !hasRest ? "," : ""),
+    printDanglingComments(path, options, /* sameIndent */ true),
+    softline,
+    "]",
+  ]);
 }
 
 module.exports = {
diff --git a/src/language-js/print/type-parameters.js b/src/language-js/print/type-parameters.js
index 438510527..15df513f8 100644
--- a/src/language-js/print/type-parameters.js
+++ b/src/language-js/print/type-parameters.js
@@ -2,7 +2,7 @@
 
 const { printDanglingComments } = require("../../main/comments");
 const {
-  builders: { concat, join, line, hardline, softline, group, indent, ifBreak },
+  builders: { join, line, hardline, softline, group, indent, ifBreak },
 } = require("../../document");
 const {
   isTestCall,
@@ -49,23 +49,18 @@ function printTypeParameters(path, options, print, paramsKey) {
         n[paramsKey][0].type === "NullableTypeAnnotation"));
 
   if (shouldInline) {
-    return concat([
+    return [
       "<",
       join(", ", path.map(print, paramsKey)),
       printDanglingCommentsForInline(path, options),
       ">",
-    ]);
+    ];
   }
 
   return group(
-    concat([
+    [
       "<",
-      indent(
-        concat([
-          softline,
-          join(concat([",", line]), path.map(print, paramsKey)),
-        ])
-      ),
+      indent([softline, join([",", line], path.map(print, paramsKey))]),
       ifBreak(
         options.parser !== "typescript" &&
           options.parser !== "babel-ts" &&
@@ -75,7 +70,7 @@ function printTypeParameters(path, options, print, paramsKey) {
       ),
       softline,
       ">",
-    ]),
+    ],
     { id: getTypeParametersGroupId(n) }
   );
 }
@@ -94,7 +89,7 @@ function printDanglingCommentsForInline(path, options) {
   if (hasOnlyBlockComments) {
     return printed;
   }
-  return concat([printed, hardline]);
+  return [printed, hardline];
 }
 
 function printTypeParameter(path, options, print) {
@@ -113,7 +108,7 @@ function printTypeParameter(path, options, print) {
       );
     }
     parts.push("]");
-    return concat(parts);
+    return parts;
   }
 
   if (n.variance) {
@@ -148,7 +143,7 @@ function printTypeParameter(path, options, print) {
     parts.push(",");
   }
 
-  return concat(parts);
+  return parts;
 }
 
 module.exports = {
diff --git a/src/language-js/print/typescript.js b/src/language-js/print/typescript.js
index 77c67791f..7c01f435e 100644
--- a/src/language-js/print/typescript.js
+++ b/src/language-js/print/typescript.js
@@ -4,7 +4,6 @@ const { printDanglingComments } = require("../../main/comments");
 const { hasNewlineInRange } = require("../../common/util");
 const {
   builders: {
-    concat,
     join,
     line,
     hardline,
@@ -56,35 +55,33 @@ function printTypescript(path, options, print) {
         n.expression.type === "ObjectExpression"
       );
 
-      const castGroup = group(
-        concat([
-          "<",
-          indent(concat([softline, path.call(print, "typeAnnotation")])),
-          softline,
-          ">",
-        ])
-      );
+      const castGroup = group([
+        "<",
+        indent([softline, path.call(print, "typeAnnotation")]),
+        softline,
+        ">",
+      ]);
 
-      const exprContents = concat([
+      const exprContents = [
         ifBreak("("),
-        indent(concat([softline, path.call(print, "expression")])),
+        indent([softline, path.call(print, "expression")]),
         softline,
         ifBreak(")"),
-      ]);
+      ];
 
       if (shouldBreakAfterCast) {
         return conditionalGroup([
-          concat([castGroup, path.call(print, "expression")]),
-          concat([castGroup, group(exprContents, { shouldBreak: true })]),
-          concat([castGroup, path.call(print, "expression")]),
+          [castGroup, path.call(print, "expression")],
+          [castGroup, group(exprContents, { shouldBreak: true })],
+          [castGroup, path.call(print, "expression")],
         ]);
       }
-      return group(concat([castGroup, path.call(print, "expression")]));
+      return group([castGroup, path.call(print, "expression")]);
     }
     case "TSDeclareFunction":
       return printFunctionDeclaration(path, print, options);
     case "TSExportAssignment":
-      return concat(["export = ", path.call(print, "expression"), semi]);
+      return ["export = ", path.call(print, "expression"), semi];
     case "TSModuleBlock":
       return printBlock(path, options, print);
     case "TSInterfaceBody":
@@ -111,7 +108,7 @@ function printTypescript(path, options, print) {
         semi
       );
 
-      return group(concat(parts));
+      return group(parts);
     }
     case "TSQualifiedName":
       return join(".", [path.call(print, "left"), path.call(print, "right")]);
@@ -128,27 +125,27 @@ function printTypescript(path, options, print) {
         parts.push(path.call(print, "typeParameters"));
       }
 
-      return concat(parts);
+      return parts;
     case "TSTemplateLiteralType":
       return printTemplateLiteral(path, print, options);
     case "TSNamedTupleMember":
-      return concat([
+      return [
         path.call(print, "label"),
         n.optional ? "?" : "",
         ": ",
         path.call(print, "elementType"),
-      ]);
+      ];
     case "TSRestType":
-      return concat(["...", path.call(print, "typeAnnotation")]);
+      return ["...", path.call(print, "typeAnnotation")];
     case "TSOptionalType":
-      return concat([path.call(print, "typeAnnotation"), "?"]);
+      return [path.call(print, "typeAnnotation"), "?"];
     case "TSInterfaceDeclaration":
       return printInterface(path, options, print);
     case "TSClassImplements":
-      return concat([
+      return [
         path.call(print, "expression"),
         path.call(print, "typeParameters"),
-      ]);
+      ];
     case "TSTypeParameterDeclaration":
     case "TSTypeParameterInstantiation":
       return printTypeParameters(path, options, print, "params");
@@ -157,7 +154,7 @@ function printTypescript(path, options, print) {
     case "TypeParameter":
       return printTypeParameter(path, options, print);
     case "TypeofTypeAnnotation":
-      return concat(["typeof ", path.call(print, "argument")]);
+      return ["typeof ", path.call(print, "argument")];
     case "TSAbstractKeyword":
       return "abstract";
     case "TSAsyncKeyword":
@@ -185,13 +182,13 @@ function printTypescript(path, options, print) {
     case "TSUnknownKeyword":
       return "unknown";
     case "TSAsExpression":
-      return concat([
+      return [
         path.call(print, "expression"),
         " as ",
         path.call(print, "typeAnnotation"),
-      ]);
+      ];
     case "TSArrayType":
-      return concat([path.call(print, "elementType"), "[]"]);
+      return [path.call(print, "elementType"), "[]"];
     case "TSPropertySignature": {
       if (n.export) {
         parts.push("export ");
@@ -221,7 +218,7 @@ function printTypescript(path, options, print) {
         parts.push(" = ", path.call(print, "initializer"));
       }
 
-      return concat(parts);
+      return parts;
     }
     case "TSParameterProperty":
       if (n.accessibility) {
@@ -239,9 +236,9 @@ function printTypescript(path, options, print) {
 
       parts.push(path.call(print, "parameter"));
 
-      return concat(parts);
+      return parts;
     case "TSTypeQuery":
-      return concat(["typeof ", path.call(print, "exprName")]);
+      return ["typeof ", path.call(print, "exprName")];
     case "TSIndexSignature": {
       const parent = path.getParentNode();
 
@@ -254,22 +251,18 @@ function printTypescript(path, options, print) {
           ? ifBreak(shouldPrintComma(options) ? "," : "")
           : "";
 
-      const parametersGroup = group(
-        concat([
-          indent(
-            concat([
-              softline,
-              join(concat([", ", softline]), path.map(print, "parameters")),
-            ])
-          ),
-          trailingComma,
+      const parametersGroup = group([
+        indent([
           softline,
-        ])
-      );
+          join([", ", softline], path.map(print, "parameters")),
+        ]),
+        trailingComma,
+        softline,
+      ]);
 
-      return concat([
+      return [
         n.export ? "export " : "",
-        n.accessibility ? concat([n.accessibility, " "]) : "",
+        n.accessibility ? [n.accessibility, " "] : "",
         n.static ? "static " : "",
         n.readonly ? "readonly " : "",
         n.declare ? "declare " : "",
@@ -278,36 +271,34 @@ function printTypescript(path, options, print) {
         n.typeAnnotation ? "]: " : "]",
         n.typeAnnotation ? path.call(print, "typeAnnotation") : "",
         parent.type === "ClassBody" ? semi : "",
-      ]);
+      ];
     }
     case "TSTypePredicate":
-      return concat([
+      return [
         n.asserts ? "asserts " : "",
         path.call(print, "parameterName"),
-        n.typeAnnotation
-          ? concat([" is ", path.call(print, "typeAnnotation")])
-          : "",
-      ]);
+        n.typeAnnotation ? [" is ", path.call(print, "typeAnnotation")] : "",
+      ];
     case "TSNonNullExpression":
-      return concat([path.call(print, "expression"), "!"]);
+      return [path.call(print, "expression"), "!"];
     case "TSImportType":
-      return concat([
+      return [
         !n.isTypeOf ? "" : "typeof ",
         "import(",
         path.call(print, n.parameter ? "parameter" : "argument"),
         ")",
-        !n.qualifier ? "" : concat([".", path.call(print, "qualifier")]),
+        !n.qualifier ? "" : [".", path.call(print, "qualifier")],
         printTypeParameters(path, options, print, "typeParameters"),
-      ]);
+      ];
     case "TSLiteralType":
       return path.call(print, "literal");
     case "TSIndexedAccessType":
-      return concat([
+      return [
         path.call(print, "objectType"),
         "[",
         path.call(print, "indexType"),
         "]",
-      ]);
+      ];
     case "TSConstructSignatureDeclaration":
     case "TSCallSignatureDeclaration":
     case "TSConstructorType": {
@@ -335,10 +326,10 @@ function printTypescript(path, options, print) {
           path.call(print, "typeAnnotation")
         );
       }
-      return concat(parts);
+      return parts;
     }
     case "TSTypeOperator":
-      return concat([n.operator, " ", path.call(print, "typeAnnotation")]);
+      return [n.operator, " ", path.call(print, "typeAnnotation")];
     case "TSMappedType": {
       const shouldBreak = hasNewlineInRange(
         options.originalText,
@@ -346,37 +337,30 @@ function printTypescript(path, options, print) {
         locEnd(n)
       );
       return group(
-        concat([
+        [
           "{",
-          indent(
-            concat([
-              options.bracketSpacing ? line : softline,
-              n.readonly
-                ? concat([
-                    getTypeScriptMappedTypeModifier(n.readonly, "readonly"),
-                    " ",
-                  ])
-                : "",
-              printTypeScriptModifiers(path, options, print),
-              path.call(print, "typeParameter"),
-              n.optional
-                ? getTypeScriptMappedTypeModifier(n.optional, "?")
-                : "",
-              n.typeAnnotation ? ": " : "",
-              path.call(print, "typeAnnotation"),
-              ifBreak(semi, ""),
-            ])
-          ),
+          indent([
+            options.bracketSpacing ? line : softline,
+            n.readonly
+              ? [getTypeScriptMappedTypeModifier(n.readonly, "readonly"), " "]
+              : "",
+            printTypeScriptModifiers(path, options, print),
+            path.call(print, "typeParameter"),
+            n.optional ? getTypeScriptMappedTypeModifier(n.optional, "?") : "",
+            n.typeAnnotation ? ": " : "",
+            path.call(print, "typeAnnotation"),
+            ifBreak(semi, ""),
+          ]),
           printDanglingComments(path, options, /* sameIndent */ true),
           options.bracketSpacing ? line : softline,
           "}",
-        ]),
+        ],
         { shouldBreak }
       );
     }
     case "TSMethodSignature":
       parts.push(
-        n.accessibility ? concat([n.accessibility, " "]) : "",
+        n.accessibility ? [n.accessibility, " "] : "",
         n.export ? "export " : "",
         n.static ? "static " : "",
         n.readonly ? "readonly " : "",
@@ -400,7 +384,7 @@ function printTypescript(path, options, print) {
           path.call(print, "typeAnnotation")
         );
       }
-      return group(concat(parts));
+      return group(parts);
     case "TSNamespaceExportDeclaration":
       parts.push("export as namespace ", path.call(print, "id"));
 
@@ -408,7 +392,7 @@ function printTypescript(path, options, print) {
         parts.push(";");
       }
 
-      return group(concat(parts));
+      return group(parts);
     case "TSEnumDeclaration":
       if (n.declare) {
         parts.push("declare ");
@@ -425,37 +409,31 @@ function printTypescript(path, options, print) {
 
       if (n.members.length === 0) {
         parts.push(
-          group(
-            concat(["{", printDanglingComments(path, options), softline, "}"])
-          )
+          group(["{", printDanglingComments(path, options), softline, "}"])
         );
       } else {
         parts.push(
-          group(
-            concat([
-              "{",
-              indent(
-                concat([
-                  hardline,
-                  printArrayItems(path, options, "members", print),
-                  shouldPrintComma(options, "es5") ? "," : "",
-                ])
-              ),
-              printDanglingComments(path, options, /* sameIndent */ true),
+          group([
+            "{",
+            indent([
               hardline,
-              "}",
-            ])
-          )
+              printArrayItems(path, options, "members", print),
+              shouldPrintComma(options, "es5") ? "," : "",
+            ]),
+            printDanglingComments(path, options, /* sameIndent */ true),
+            hardline,
+            "}",
+          ])
         );
       }
 
-      return concat(parts);
+      return parts;
     case "TSEnumMember":
       parts.push(path.call(print, "id"));
       if (n.initializer) {
         parts.push(" = ", path.call(print, "initializer"));
       }
-      return concat(parts);
+      return parts;
     case "TSImportEqualsDeclaration":
       if (n.isExport) {
         parts.push("export ");
@@ -471,9 +449,9 @@ function printTypescript(path, options, print) {
         parts.push(";");
       }
 
-      return group(concat(parts));
+      return group(parts);
     case "TSExternalModuleReference":
-      return concat(["require(", path.call(print, "expression"), ")"]);
+      return ["require(", path.call(print, "expression"), ")"];
     case "TSModuleDeclaration": {
       const parent = path.getParentNode();
       const isExternalModule = isLiteral(n.id);
@@ -520,7 +498,7 @@ function printTypescript(path, options, print) {
         parts.push(semi);
       }
 
-      return concat(parts);
+      return parts;
     }
     // TODO: Temporary auto-generated node type. To remove when typescript-estree has proper support for private fields.
     case "TSPrivateIdentifier":
@@ -530,7 +508,7 @@ function printTypescript(path, options, print) {
       return printTernary(path, options, print);
 
     case "TSInferType":
-      return concat(["infer", " ", path.call(print, "typeParameter")]);
+      return ["infer", " ", path.call(print, "typeParameter")];
     case "TSIntersectionType":
       return printIntersectionType(path, options, print);
     case "TSUnionType":
@@ -540,10 +518,10 @@ function printTypescript(path, options, print) {
     case "TSTupleType":
       return printTupleType(path, options, print);
     case "TSTypeReference":
-      return concat([
+      return [
         path.call(print, "typeName"),
         printTypeParameters(path, options, print, "typeParameters"),
-      ]);
+      ];
     case "TSTypeAnnotation":
       return path.call(print, "typeAnnotation");
     case "TSEmptyBodyFunctionExpression":
@@ -555,16 +533,16 @@ function printTypescript(path, options, print) {
     case "TSJSDocUnknownType":
       return "?";
     case "TSJSDocNullableType":
-      return concat(["?", path.call(print, "typeAnnotation")]);
+      return ["?", path.call(print, "typeAnnotation")];
     case "TSJSDocNonNullableType":
-      return concat(["!", path.call(print, "typeAnnotation")]);
+      return ["!", path.call(print, "typeAnnotation")];
     case "TSJSDocFunctionType":
-      return concat([
+      return [
         "function(",
         // The parameters could be here, but typescript-estree doesn't convert them anyway (throws an error).
         "): ",
         path.call(print, "typeAnnotation"),
-      ]);
+      ];
   }
 }
 
diff --git a/src/language-js/printer-estree-json.js b/src/language-js/printer-estree-json.js
index 4ba8849ba..b058000d4 100644
--- a/src/language-js/printer-estree-json.js
+++ b/src/language-js/printer-estree-json.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { concat, hardline, indent, join },
+  builders: { hardline, indent, join },
 } = require("../document");
 const preprocess = require("./print-preprocess");
 
@@ -9,42 +9,38 @@ function genericPrint(path, options, print) {
   const node = path.getValue();
   switch (node.type) {
     case "JsonRoot":
-      return concat([path.call(print, "node"), hardline]);
+      return [path.call(print, "node"), hardline];
     case "ArrayExpression":
       return node.elements.length === 0
         ? "[]"
-        : concat([
+        : [
             "[",
-            indent(
-              concat([
-                hardline,
-                join(concat([",", hardline]), path.map(print, "elements")),
-              ])
-            ),
+            indent([
+              hardline,
+              join([",", hardline], path.map(print, "elements")),
+            ]),
             hardline,
             "]",
-          ]);
+          ];
     case "ObjectExpression":
       return node.properties.length === 0
         ? "{}"
-        : concat([
+        : [
             "{",
-            indent(
-              concat([
-                hardline,
-                join(concat([",", hardline]), path.map(print, "properties")),
-              ])
-            ),
+            indent([
+              hardline,
+              join([",", hardline], path.map(print, "properties")),
+            ]),
             hardline,
             "}",
-          ]);
+          ];
     case "ObjectProperty":
-      return concat([path.call(print, "key"), ": ", path.call(print, "value")]);
+      return [path.call(print, "key"), ": ", path.call(print, "value")];
     case "UnaryExpression":
-      return concat([
+      return [
         node.operator === "+" ? "" : node.operator,
         path.call(print, "argument"),
-      ]);
+      ];
     case "NullLiteral":
       return "null";
     case "BooleanLiteral":
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 39eec9e89..cd80d2983 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -14,16 +14,7 @@ const {
   isNonEmptyArray,
 } = require("../common/util");
 const {
-  builders: {
-    concat,
-    join,
-    line,
-    hardline,
-    softline,
-    literalline,
-    group,
-    indent,
-  },
+  builders: { join, line, hardline, softline, literalline, group, indent },
   utils: { isEmpty },
 } = require("../document");
 const embed = require("./embed");
@@ -204,9 +195,9 @@ function genericPrint(path, options, printPath, args) {
   }
 
   if (decorators.length > 0) {
-    return group(concat(decorators.concat(parts)));
+    return group(decorators.concat(parts));
   }
-  return concat(parts);
+  return parts;
 }
 
 function printPathNoParens(path, options, print, args) {
@@ -241,7 +232,7 @@ function printPathNoParens(path, options, print, args) {
     case "JsExpressionRoot":
       return path.call(print, "node");
     case "JsonRoot":
-      return concat([path.call(print, "node"), hardline]);
+      return [path.call(print, "node"), hardline];
     case "File":
       // Print @babel/parser's InterpreterDirective here so that
       // leading comments on the `Program` node get printed after the hashbang.
@@ -256,7 +247,7 @@ function printPathNoParens(path, options, print, args) {
 
       parts.push(path.call(print, "program"));
 
-      return concat(parts);
+      return parts;
 
     case "Program":
       return printBlockBody(path, options, print);
@@ -266,7 +257,7 @@ function printPathNoParens(path, options, print, args) {
     case "ExpressionStatement":
       // Detect Flow and TypeScript directives
       if (n.directive) {
-        return concat([nodeStr(n.expression, options, true), semi]);
+        return [nodeStr(n.expression, options, true), semi];
       }
 
       if (options.parser === "__vue_event_binding") {
@@ -276,32 +267,30 @@ function printPathNoParens(path, options, print, args) {
           parent.body.length === 1 &&
           parent.body[0] === n
         ) {
-          return concat([
+          return [
             path.call(print, "expression"),
             isVueEventBindingExpression(n.expression) ? ";" : "",
-          ]);
+          ];
         }
       }
 
       // Do not append semicolon after the only JSX element in a program
-      return concat([
+      return [
         path.call(print, "expression"),
         isTheOnlyJsxElementInMarkdown(options, path) ? "" : semi,
-      ]);
+      ];
     // Babel non-standard node. Used for Closure-style type casts. See postprocess.js.
     case "ParenthesizedExpression": {
       const shouldHug = !hasComment(n.expression);
       if (shouldHug) {
-        return concat(["(", path.call(print, "expression"), ")"]);
+        return ["(", path.call(print, "expression"), ")"];
       }
-      return group(
-        concat([
-          "(",
-          indent(concat([softline, path.call(print, "expression")])),
-          softline,
-          ")",
-        ])
-      );
+      return group([
+        "(",
+        indent([softline, path.call(print, "expression")]),
+        softline,
+        ")",
+      ]);
     }
     case "AssignmentExpression":
       return printAssignmentExpression(path, options, print);
@@ -311,21 +300,13 @@ function printPathNoParens(path, options, print, args) {
     case "LogicalExpression":
       return printBinaryishExpression(path, options, print);
     case "AssignmentPattern":
-      return concat([
-        path.call(print, "left"),
-        " = ",
-        path.call(print, "right"),
-      ]);
+      return [path.call(print, "left"), " = ", path.call(print, "right")];
     case "OptionalMemberExpression":
     case "MemberExpression": {
       return printMemberExpression(path, options, print);
     }
     case "MetaProperty":
-      return concat([
-        path.call(print, "meta"),
-        ".",
-        path.call(print, "property"),
-      ]);
+      return [path.call(print, "meta"), ".", path.call(print, "property")];
     case "BindExpression":
       if (n.object) {
         parts.push(path.call(print, "object"));
@@ -333,33 +314,31 @@ function printPathNoParens(path, options, print, args) {
 
       parts.push(
         group(
-          indent(
-            concat([softline, printBindExpressionCallee(path, options, print)])
-          )
+          indent([softline, printBindExpressionCallee(path, options, print)])
         )
       );
 
-      return concat(parts);
+      return parts;
     case "Identifier": {
-      return concat([
+      return [
         n.name,
         printOptionalToken(path),
         printTypeAnnotation(path, options, print),
-      ]);
+      ];
     }
     case "V8IntrinsicIdentifier":
-      return concat(["%", n.name]);
+      return ["%", n.name];
     case "SpreadElement":
     case "SpreadElementPattern":
     case "SpreadProperty":
     case "SpreadPropertyPattern":
     case "RestElement":
     case "ObjectTypeSpreadProperty":
-      return concat([
+      return [
         "...",
         path.call(print, "argument"),
         printTypeAnnotation(path, options, print),
-      ]);
+      ];
     case "FunctionDeclaration":
     case "FunctionExpression":
       return printFunctionDeclaration(
@@ -382,7 +361,7 @@ function printPathNoParens(path, options, print, args) {
         parts.push(" ", path.call(print, "argument"));
       }
 
-      return concat(parts);
+      return parts;
     case "AwaitExpression": {
       parts.push("await");
       if (n.argument) {
@@ -397,9 +376,9 @@ function printPathNoParens(path, options, print, args) {
           parent.type === "OptionalMemberExpression") &&
           parent.object === n)
       ) {
-        return group(concat([indent(concat([softline, ...parts])), softline]));
+        return group([indent([softline, ...parts]), softline]);
       }
-      return concat(parts);
+      return parts;
     }
     case "ExportDefaultDeclaration":
     case "ExportNamedDeclaration":
@@ -416,7 +395,7 @@ function printPathNoParens(path, options, print, args) {
     case "ExportDefaultSpecifier":
       return printModuleSpecifier(path, options, print);
     case "ImportAttribute":
-      return concat([path.call(print, "key"), ": ", path.call(print, "value")]);
+      return [path.call(print, "key"), ": ", path.call(print, "value")];
     case "Import":
       return "import";
     case "BlockStatement":
@@ -433,7 +412,7 @@ function printPathNoParens(path, options, print, args) {
     case "CallExpression":
       return printCallExpression(path, options, print);
     case "ObjectTypeInternalSlot":
-      return concat([
+      return [
         n.static ? "static " : "",
         "[[",
         path.call(print, "id"),
@@ -441,7 +420,7 @@ function printPathNoParens(path, options, print, args) {
         printOptionalToken(path),
         n.method ? "" : ": ",
         path.call(print, "value"),
-      ]);
+      ];
 
     case "ObjectExpression":
     case "ObjectPattern":
@@ -458,11 +437,7 @@ function printPathNoParens(path, options, print, args) {
     case "ObjectMethod":
       return printMethod(path, options, print);
     case "Decorator":
-      return concat([
-        "@",
-        path.call(print, "expression"),
-        path.call(print, "callee"),
-      ]);
+      return ["@", path.call(print, "expression"), path.call(print, "callee")];
     case "ArrayExpression":
     case "ArrayPattern":
     case "TupleExpression":
@@ -481,12 +456,12 @@ function printPathNoParens(path, options, print, args) {
           if (index === 0) {
             parts.push(print(expressionPath));
           } else {
-            parts.push(",", indent(concat([line, print(expressionPath)])));
+            parts.push(",", indent([line, print(expressionPath)]));
           }
         }, "expressions");
-        return group(concat(parts));
+        return group(parts);
       }
-      return group(join(concat([",", line]), path.map(print, "expressions")));
+      return group(join([",", line], path.map(print, "expressions")));
     }
     case "ThisExpression":
       return "this";
@@ -521,7 +496,7 @@ function printPathNoParens(path, options, print, args) {
       }
       return nodeStr(n, options);
     case "Directive":
-      return concat([path.call(print, "value"), semi]); // Babel 6
+      return [path.call(print, "value"), semi]; // Babel 6
     case "DirectiveLiteral":
       return nodeStr(n, options);
     case "UnaryExpression":
@@ -533,20 +508,18 @@ function printPathNoParens(path, options, print, args) {
 
       if (hasComment(n.argument)) {
         parts.push(
-          group(
-            concat([
-              "(",
-              indent(concat([softline, path.call(print, "argument")])),
-              softline,
-              ")",
-            ])
-          )
+          group([
+            "(",
+            indent([softline, path.call(print, "argument")]),
+            softline,
+            ")",
+          ])
         );
       } else {
         parts.push(path.call(print, "argument"));
       }
 
-      return concat(parts);
+      return parts;
     case "UpdateExpression":
       parts.push(path.call(print, "argument"), n.operator);
 
@@ -554,7 +527,7 @@ function printPathNoParens(path, options, print, args) {
         parts.reverse();
       }
 
-      return concat(parts);
+      return parts;
     case "ConditionalExpression":
       return printTernary(path, options, print);
     case "VariableDeclaration": {
@@ -582,15 +555,15 @@ function printPathNoParens(path, options, print, args) {
       parts = [
         n.declare ? "declare " : "",
         n.kind,
-        firstVariable ? concat([" ", firstVariable]) : "",
+        firstVariable ? [" ", firstVariable] : "",
         indent(
-          concat(
-            printed
-              .slice(1)
-              .map((p) =>
-                concat([",", hasValue && !isParentForLoop ? hardline : line, p])
-              )
-          )
+          printed
+            .slice(1)
+            .map((p) => [
+              ",",
+              hasValue && !isParentForLoop ? hardline : line,
+              p,
+            ])
         ),
       ];
 
@@ -598,32 +571,23 @@ function printPathNoParens(path, options, print, args) {
         parts.push(semi);
       }
 
-      return group(concat(parts));
+      return group(parts);
     }
     case "WithStatement":
-      return group(
-        concat([
-          "with (",
-          path.call(print, "object"),
-          ")",
-          adjustClause(n.body, path.call(print, "body")),
-        ])
-      );
+      return group([
+        "with (",
+        path.call(print, "object"),
+        ")",
+        adjustClause(n.body, path.call(print, "body")),
+      ]);
     case "IfStatement": {
       const con = adjustClause(n.consequent, path.call(print, "consequent"));
-      const opening = group(
-        concat([
-          "if (",
-          group(
-            concat([
-              indent(concat([softline, path.call(print, "test")])),
-              softline,
-            ])
-          ),
-          ")",
-          con,
-        ])
-      );
+      const opening = group([
+        "if (",
+        group([indent([softline, path.call(print, "test")]), softline]),
+        ")",
+        con,
+      ]);
 
       parts.push(opening);
 
@@ -656,7 +620,7 @@ function printPathNoParens(path, options, print, args) {
         );
       }
 
-      return concat(parts);
+      return parts;
     }
     case "ForStatement": {
       const body = adjustClause(n.body, path.call(print, "body"));
@@ -669,83 +633,66 @@ function printPathNoParens(path, options, print, args) {
         options,
         /* sameLine */ true
       );
-      const printedComments = dangling ? concat([dangling, softline]) : "";
+      const printedComments = dangling ? [dangling, softline] : "";
 
       if (!n.init && !n.test && !n.update) {
-        return concat([printedComments, group(concat(["for (;;)", body]))]);
+        return [printedComments, group(["for (;;)", body])];
       }
 
-      return concat([
+      return [
         printedComments,
-        group(
-          concat([
-            "for (",
-            group(
-              concat([
-                indent(
-                  concat([
-                    softline,
-                    path.call(print, "init"),
-                    ";",
-                    line,
-                    path.call(print, "test"),
-                    ";",
-                    line,
-                    path.call(print, "update"),
-                  ])
-                ),
-                softline,
-              ])
-            ),
-            ")",
-            body,
-          ])
-        ),
-      ]);
+        group([
+          "for (",
+          group([
+            indent([
+              softline,
+              path.call(print, "init"),
+              ";",
+              line,
+              path.call(print, "test"),
+              ";",
+              line,
+              path.call(print, "update"),
+            ]),
+            softline,
+          ]),
+          ")",
+          body,
+        ]),
+      ];
     }
     case "WhileStatement":
-      return group(
-        concat([
-          "while (",
-          group(
-            concat([
-              indent(concat([softline, path.call(print, "test")])),
-              softline,
-            ])
-          ),
-          ")",
-          adjustClause(n.body, path.call(print, "body")),
-        ])
-      );
+      return group([
+        "while (",
+        group([indent([softline, path.call(print, "test")]), softline]),
+        ")",
+        adjustClause(n.body, path.call(print, "body")),
+      ]);
     case "ForInStatement":
-      return group(
-        concat([
-          "for (",
-          path.call(print, "left"),
-          " in ",
-          path.call(print, "right"),
-          ")",
-          adjustClause(n.body, path.call(print, "body")),
-        ])
-      );
+      return group([
+        "for (",
+        path.call(print, "left"),
+        " in ",
+        path.call(print, "right"),
+        ")",
+        adjustClause(n.body, path.call(print, "body")),
+      ]);
 
     case "ForOfStatement":
-      return group(
-        concat([
-          "for",
-          n.await ? " await" : "",
-          " (",
-          path.call(print, "left"),
-          " of ",
-          path.call(print, "right"),
-          ")",
-          adjustClause(n.body, path.call(print, "body")),
-        ])
-      );
+      return group([
+        "for",
+        n.await ? " await" : "",
+        " (",
+        path.call(print, "left"),
+        " of ",
+        path.call(print, "right"),
+        ")",
+        adjustClause(n.body, path.call(print, "body")),
+      ]);
 
     case "DoWhileStatement": {
       const clause = adjustClause(n.body, path.call(print, "body"));
-      const doBody = group(concat(["do", clause]));
+      const doBody = group(["do", clause]);
       parts = [doBody];
 
       if (n.body.type === "BlockStatement") {
@@ -756,20 +703,15 @@ function printPathNoParens(path, options, print, args) {
       parts.push("while (");
 
       parts.push(
-        group(
-          concat([
-            indent(concat([softline, path.call(print, "test")])),
-            softline,
-          ])
-        ),
+        group([indent([softline, path.call(print, "test")]), softline]),
         ")",
         semi
       );
 
-      return concat(parts);
+      return parts;
     }
     case "DoExpression":
-      return concat(["do ", path.call(print, "body")]);
+      return ["do ", path.call(print, "body")];
     case "BreakStatement":
       parts.push("break");
 
@@ -779,7 +721,7 @@ function printPathNoParens(path, options, print, args) {
 
       parts.push(semi);
 
-      return concat(parts);
+      return parts;
     case "ContinueStatement":
       parts.push("continue");
 
@@ -789,24 +731,20 @@ function printPathNoParens(path, options, print, args) {
 
       parts.push(semi);
 
-      return concat(parts);
+      return parts;
     case "LabeledStatement":
       if (n.body.type === "EmptyStatement") {
-        return concat([path.call(print, "label"), ":;"]);
+        return [path.call(print, "label"), ":;"];
       }
 
-      return concat([
-        path.call(print, "label"),
-        ": ",
-        path.call(print, "body"),
-      ]);
+      return [path.call(print, "label"), ": ", path.call(print, "body")];
     case "TryStatement":
-      return concat([
+      return [
         "try ",
         path.call(print, "block"),
-        n.handler ? concat([" ", path.call(print, "handler")]) : "",
-        n.finalizer ? concat([" finally ", path.call(print, "finalizer")]) : "",
-      ]);
+        n.handler ? [" ", path.call(print, "handler")] : "",
+        n.finalizer ? [" finally ", path.call(print, "finalizer")] : "",
+      ];
     case "CatchClause":
       if (n.param) {
         const parameterHasComments = hasComment(
@@ -822,51 +760,47 @@ function printPathNoParens(path, options, print, args) {
         );
         const param = path.call(print, "param");
 
-        return concat([
+        return [
           "catch ",
           parameterHasComments
-            ? concat(["(", indent(concat([softline, param])), softline, ") "])
-            : concat(["(", param, ") "]),
+            ? ["(", indent([softline, param]), softline, ") "]
+            : ["(", param, ") "],
           path.call(print, "body"),
-        ]);
+        ];
       }
 
-      return concat(["catch ", path.call(print, "body")]);
+      return ["catch ", path.call(print, "body")];
     // Note: ignoring n.lexical because it has no printing consequences.
     case "SwitchStatement":
-      return concat([
-        group(
-          concat([
-            "switch (",
-            indent(concat([softline, path.call(print, "discriminant")])),
-            softline,
-            ")",
-          ])
-        ),
+      return [
+        group([
+          "switch (",
+          indent([softline, path.call(print, "discriminant")]),
+          softline,
+          ")",
+        ]),
         " {",
         n.cases.length > 0
-          ? indent(
-              concat([
+          ? indent([
+              hardline,
+              join(
                 hardline,
-                join(
-                  hardline,
-                  path.map((casePath, index, cases) => {
-                    const caseNode = casePath.getValue();
-                    return concat([
-                      casePath.call(print),
-                      index !== cases.length - 1 &&
-                      isNextLineEmpty(caseNode, options)
-                        ? hardline
-                        : "",
-                    ]);
-                  }, "cases")
-                ),
-              ])
-            )
+                path.map((casePath, index, cases) => {
+                  const caseNode = casePath.getValue();
+                  return [
+                    casePath.call(print),
+                    index !== cases.length - 1 &&
+                    isNextLineEmpty(caseNode, options)
+                      ? hardline
+                      : "",
+                  ];
+                }, "cases")
+              ),
+            ])
           : "",
         hardline,
         "}",
-      ]);
+      ];
     case "SwitchCase": {
       if (n.test) {
         parts.push("case ", path.call(print, "test"), ":");
@@ -883,16 +817,16 @@ function printPathNoParens(path, options, print, args) {
 
         parts.push(
           consequent.length === 1 && consequent[0].type === "BlockStatement"
-            ? concat([" ", cons])
-            : indent(concat([hardline, cons]))
+            ? [" ", cons]
+            : indent([hardline, cons])
         );
       }
 
-      return concat(parts);
+      return parts;
     }
     // JSX extensions below.
     case "DebuggerStatement":
-      return concat(["debugger", semi]);
+      return ["debugger", semi];
 
     case "ClassDeclaration":
     case "ClassExpression":
@@ -910,11 +844,11 @@ function printPathNoParens(path, options, print, args) {
     case "TemplateLiteral":
       return printTemplateLiteral(path, print, options);
     case "TaggedTemplateExpression":
-      return concat([
+      return [
         path.call(print, "tag"),
         path.call(print, "typeParameters"),
         path.call(print, "quasi"),
-      ]);
+      ];
     // These types are unprintable because they serve as abstract
     // supertypes for other (printable) types.
     case "Node":
@@ -940,17 +874,12 @@ function printPathNoParens(path, options, print, args) {
     case "MixedTypeAnnotation":
       return "mixed";
     case "ArrayTypeAnnotation":
-      return concat([path.call(print, "elementType"), "[]"]);
+      return [path.call(print, "elementType"), "[]"];
     case "BooleanLiteralTypeAnnotation":
       return "" + n.value;
 
     case "EnumDeclaration":
-      return concat([
-        "enum ",
-        path.call(print, "id"),
-        " ",
-        path.call(print, "body"),
-      ]);
+      return ["enum ", path.call(print, "id"), " ", path.call(print, "body")];
     case "EnumBooleanBody":
     case "EnumNumberBody":
     case "EnumStringBody":
@@ -975,9 +904,7 @@ function printPathNoParens(path, options, print, args) {
       }
       if (n.members.length === 0 && !n.hasUnknownMembers) {
         parts.push(
-          group(
-            concat(["{", printDanglingComments(path, options), softline, "}"])
-          )
+          group(["{", printDanglingComments(path, options), softline, "}"])
         );
       } else {
         const members =
@@ -990,32 +917,28 @@ function printPathNoParens(path, options, print, args) {
             : [];
 
         parts.push(
-          group(
-            concat([
-              "{",
-              indent(
-                concat([
-                  ...members,
-                  ...(n.hasUnknownMembers ? [hardline, "..."] : []),
-                ])
-              ),
-              printDanglingComments(path, options, /* sameIndent */ true),
-              hardline,
-              "}",
-            ])
-          )
+          group([
+            "{",
+            indent([
+              ...members,
+              ...(n.hasUnknownMembers ? [hardline, "..."] : []),
+            ]),
+            printDanglingComments(path, options, /* sameIndent */ true),
+            hardline,
+            "}",
+          ])
         );
       }
-      return concat(parts);
+      return parts;
     }
     case "EnumBooleanMember":
     case "EnumNumberMember":
     case "EnumStringMember":
-      return concat([
+      return [
         path.call(print, "id"),
         " = ",
         typeof n.init === "object" ? path.call(print, "init") : String(n.init),
-      ]);
+      ];
     case "EnumDefaultedMember":
       return path.call(print, "id");
     case "FunctionTypeParam": {
@@ -1024,12 +947,12 @@ function printPathNoParens(path, options, print, args) {
         : path.getParentNode().this === n
         ? "this"
         : "";
-      return concat([
+      return [
         name,
         printOptionalToken(path),
         name ? ": " : "",
         path.call(print, "typeAnnotation"),
-      ]);
+      ];
     }
 
     case "InterfaceDeclaration":
@@ -1037,12 +960,9 @@ function printPathNoParens(path, options, print, args) {
       return printInterface(path, options, print);
     case "ClassImplements":
     case "InterfaceExtends":
-      return concat([
-        path.call(print, "id"),
-        path.call(print, "typeParameters"),
-      ]);
+      return [path.call(print, "id"), path.call(print, "typeParameters")];
     case "NullableTypeAnnotation":
-      return concat(["?", path.call(print, "typeAnnotation")]);
+      return ["?", path.call(print, "typeAnnotation")];
     case "Variance": {
       const { kind } = n;
       assert.ok(kind === "plus" || kind === "minus");
@@ -1055,9 +975,9 @@ function printPathNoParens(path, options, print, args) {
 
       parts.push(path.call(print, "value"));
 
-      return concat(parts);
+      return parts;
     case "ObjectTypeIndexer": {
-      return concat([
+      return [
         n.variance ? path.call(print, "variance") : "",
         "[",
         path.call(print, "id"),
@@ -1065,7 +985,7 @@ function printPathNoParens(path, options, print, args) {
         path.call(print, "key"),
         "]: ",
         path.call(print, "value"),
-      ]);
+      ];
     }
     case "ObjectTypeProperty": {
       let modifier = "";
@@ -1076,7 +996,7 @@ function printPathNoParens(path, options, print, args) {
         modifier = "static ";
       }
 
-      return concat([
+      return [
         modifier,
         isGetterOrSetter(n) ? n.kind + " " : "",
         n.variance ? path.call(print, "variance") : "",
@@ -1084,14 +1004,10 @@ function printPathNoParens(path, options, print, args) {
         printOptionalToken(path),
         isFunctionNotation(n) ? "" : ": ",
         path.call(print, "value"),
-      ]);
+      ];
     }
     case "QualifiedTypeIdentifier":
-      return concat([
-        path.call(print, "qualification"),
-        ".",
-        path.call(print, "id"),
-      ]);
+      return [path.call(print, "qualification"), ".", path.call(print, "id")];
     case "StringLiteralTypeAnnotation":
       return nodeStr(n, options);
     case "NumberLiteralTypeAnnotation":
@@ -1103,12 +1019,12 @@ function printPathNoParens(path, options, print, args) {
       }
       return printNumber(n.raw);
     case "TypeCastExpression": {
-      return concat([
+      return [
         "(",
         path.call(print, "expression"),
         printTypeAnnotation(path, options, print),
         ")",
-      ]);
+      ];
     }
 
     case "TypeParameterDeclaration":
@@ -1129,7 +1045,7 @@ function printPathNoParens(path, options, print, args) {
             !comment.includes("/*") &&
             !comment.includes("*/")
           ) {
-            return concat(["/*:: ", printed, " */"]);
+            return ["/*:: ", printed, " */"];
           }
         }
       }
@@ -1143,7 +1059,7 @@ function printPathNoParens(path, options, print, args) {
     // be either left alone or desugared into AST types that are fully
     // supported by the pretty-printer.
     case "DeclaredPredicate":
-      return concat(["%checks(", path.call(print, "value"), ")"]);
+      return ["%checks(", path.call(print, "value"), ")"];
     case "AnyTypeAnnotation":
     case "TSAnyKeyword":
       return "any";
@@ -1176,7 +1092,7 @@ function printPathNoParens(path, options, print, args) {
 
     case "PrivateName":
       // babel use `id`, meriyah use `name`
-      return concat(["#", path.call(print, n.id ? "id" : "name")]);
+      return ["#", path.call(print, n.id ? "id" : "name")];
 
     case "InterpreterDirective":
       parts.push("#!", n.value, hardline);
@@ -1185,7 +1101,7 @@ function printPathNoParens(path, options, print, args) {
         parts.push(hardline);
       }
 
-      return concat(parts);
+      return parts;
 
     case "PipelineBareFunction":
       return path.call(print, "callee");
@@ -1193,7 +1109,7 @@ function printPathNoParens(path, options, print, args) {
       return path.call(print, "expression");
     case "PipelinePrimaryTopicReference": {
       parts.push("#");
-      return concat(parts);
+      return parts;
     }
 
     case "ArgumentPlaceholder":
diff --git a/src/language-markdown/embed.js b/src/language-markdown/embed.js
index 69cfdbf65..8ca02011d 100644
--- a/src/language-markdown/embed.js
+++ b/src/language-markdown/embed.js
@@ -5,7 +5,7 @@ const {
   getMaxContinuousCount,
 } = require("../common/util");
 const {
-  builders: { hardline, concat, markAsRoot },
+  builders: { hardline, markAsRoot },
   utils: { replaceNewlinesWithLiterallines },
 } = require("../document");
 const { print: printFrontMatter } = require("../utils/front-matter");
@@ -26,17 +26,15 @@ function embed(path, print, textToDoc, options) {
         { parser },
         { stripTrailingHardline: true }
       );
-      return markAsRoot(
-        concat([
-          style,
-          node.lang,
-          node.meta ? " " + node.meta : "",
-          hardline,
-          replaceNewlinesWithLiterallines(doc),
-          hardline,
-          style,
-        ])
-      );
+      return markAsRoot([
+        style,
+        node.lang,
+        node.meta ? " " + node.meta : "",
+        hardline,
+        replaceNewlinesWithLiterallines(doc),
+        hardline,
+        style,
+      ]);
     }
   }
 
@@ -46,14 +44,14 @@ function embed(path, print, textToDoc, options) {
 
     // MDX
     case "importExport":
-      return concat([
+      return [
         textToDoc(
           node.value,
           { parser: "babel" },
           { stripTrailingHardline: true }
         ),
         hardline,
-      ]);
+      ];
     case "jsx":
       return textToDoc(
         `<$>${node.value}</$>`,
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index e416d092f..14fefd4c8 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -10,7 +10,6 @@ const {
 const {
   builders: {
     breakParent,
-    concat,
     join,
     line,
     literalline,
@@ -58,20 +57,18 @@ function genericPrint(path, options, print) {
   const node = path.getValue();
 
   if (shouldRemainTheSameContent(path)) {
-    return concat(
-      splitText(
-        options.originalText.slice(
-          node.position.start.offset,
-          node.position.end.offset
-        ),
-        options
-      ).map((node) =>
-        node.type === "word"
-          ? node.value
-          : node.value === ""
-          ? ""
-          : printLine(path, node.value, options)
-      )
+    return splitText(
+      options.originalText.slice(
+        node.position.start.offset,
+        node.position.end.offset
+      ),
+      options
+    ).map((node) =>
+      node.type === "word"
+        ? node.value
+        : node.value === ""
+        ? ""
+        : printLine(path, node.value, options)
     );
   }
 
@@ -85,12 +82,12 @@ function genericPrint(path, options, print) {
       if (node.children.length === 0) {
         return "";
       }
-      return concat([
+      return [
         normalizeDoc(printRoot(path, options, print)),
         !TRAILING_HARDLINE_NODES.has(getLastDescendantNode(node).type)
           ? hardline
           : "",
-      ]);
+      ];
     case "paragraph":
       return printChildren(path, options, print, {
         postprocessor: fill,
@@ -174,17 +171,17 @@ function genericPrint(path, options, print) {
         style =
           hasPrevOrNextWord || getAncestorNode(path, "emphasis") ? "*" : "_";
       }
-      return concat([style, printChildren(path, options, print), style]);
+      return [style, printChildren(path, options, print), style];
     }
     case "strong":
-      return concat(["**", printChildren(path, options, print), "**"]);
+      return ["**", printChildren(path, options, print), "**"];
     case "delete":
-      return concat(["~~", printChildren(path, options, print), "~~"]);
+      return ["~~", printChildren(path, options, print), "~~"];
     case "inlineCode": {
       const backtickCount = getMinNotPresentContinuousCount(node.value, "`");
       const style = "`".repeat(backtickCount || 1);
       const gap = backtickCount && !/^\s/.test(node.value) ? " " : "";
-      return concat([style, gap, node.value, gap, style]);
+      return [style, gap, node.value, gap, style];
     }
     case "wikiLink": {
       let contents = "";
@@ -194,7 +191,7 @@ function genericPrint(path, options, print) {
         contents = node.value.replace(/[\t\n]+/g, " ");
       }
 
-      return concat(["[[", contents, "]]"]);
+      return ["[[", contents, "]]"];
     }
     case "link":
       switch (options.originalText[node.position.start.offset]) {
@@ -209,17 +206,17 @@ function genericPrint(path, options, print) {
             ) !== mailto
               ? node.url.slice(mailto.length)
               : node.url;
-          return concat(["<", url, ">"]);
+          return ["<", url, ">"];
         }
         case "[":
-          return concat([
+          return [
             "[",
             printChildren(path, options, print),
             "](",
             printUrl(node.url, ")"),
             printTitle(node.title, options),
             ")",
-          ]);
+          ];
         default:
           return options.originalText.slice(
             node.position.start.offset,
@@ -227,29 +224,29 @@ function genericPrint(path, options, print) {
           );
       }
     case "image":
-      return concat([
+      return [
         "![",
         node.alt || "",
         "](",
         printUrl(node.url, ")"),
         printTitle(node.title, options),
         ")",
-      ]);
+      ];
     case "blockquote":
-      return concat(["> ", align("> ", printChildren(path, options, print))]);
+      return ["> ", align("> ", printChildren(path, options, print))];
     case "heading":
-      return concat([
+      return [
         "#".repeat(node.depth) + " ",
         printChildren(path, options, print),
-      ]);
+      ];
     case "code": {
       if (node.isIndented) {
         // indented code block
         const alignment = " ".repeat(4);
-        return align(
+        return align(alignment, [
           alignment,
-          concat([alignment, ...replaceEndOfLineWith(node.value, hardline)])
-        );
+          ...replaceEndOfLineWith(node.value, hardline),
+        ]);
       }
 
       // fenced code block
@@ -257,7 +254,7 @@ function genericPrint(path, options, print) {
       const style = styleUnit.repeat(
         Math.max(3, getMaxContinuousCount(node.value, styleUnit) + 1)
       );
-      return concat([
+      return [
         style,
         node.lang || "",
         node.meta ? " " + node.meta : "",
@@ -269,7 +266,7 @@ function genericPrint(path, options, print) {
         ),
         hardline,
         style,
-      ]);
+      ];
     }
     case "html": {
       const parentNode = path.getParentNode();
@@ -278,11 +275,9 @@ function genericPrint(path, options, print) {
           ? node.value.trimEnd()
           : node.value;
       const isHtmlComment = /^<!--[\S\s]*-->$/.test(value);
-      return concat(
-        replaceEndOfLineWith(
-          value,
-          isHtmlComment ? hardline : markAsRoot(literalline)
-        )
+      return replaceEndOfLineWith(
+        value,
+        isHtmlComment ? hardline : markAsRoot(literalline)
       );
     }
     case "list": {
@@ -307,19 +302,16 @@ function genericPrint(path, options, print) {
             childNode.children[0].position.start.column !==
               childNode.children[1].position.start.column
           ) {
-            return concat([
-              prefix,
-              printListItem(childPath, options, print, prefix),
-            ]);
+            return [prefix, printListItem(childPath, options, print, prefix)];
           }
 
-          return concat([
+          return [
             prefix,
             align(
               " ".repeat(prefix.length),
               printListItem(childPath, options, print, prefix)
             ),
-          ]);
+          ];
 
           function getPrefix() {
             const rawPrefix = node.ordered
@@ -353,54 +345,50 @@ function genericPrint(path, options, print) {
       return nthSiblingIndex % 2 === 0 ? "***" : "---";
     }
     case "linkReference":
-      return concat([
+      return [
         "[",
         printChildren(path, options, print),
         "]",
         node.referenceType === "full"
-          ? concat(["[", node.identifier, "]"])
+          ? ["[", node.identifier, "]"]
           : node.referenceType === "collapsed"
           ? "[]"
           : "",
-      ]);
+      ];
     case "imageReference":
       switch (node.referenceType) {
         case "full":
-          return concat(["![", node.alt || "", "][", node.identifier, "]"]);
+          return ["![", node.alt || "", "][", node.identifier, "]"];
         default:
-          return concat([
+          return [
             "![",
             node.alt,
             "]",
             node.referenceType === "collapsed" ? "[]" : "",
-          ]);
+          ];
       }
     case "definition": {
       const lineOrSpace = options.proseWrap === "always" ? line : " ";
-      return group(
-        concat([
-          "[",
-          node.identifier,
-          "]:",
-          indent(
-            concat([
-              lineOrSpace,
-              printUrl(node.url),
-              node.title === null
-                ? ""
-                : concat([lineOrSpace, printTitle(node.title, options, false)]),
-            ])
-          ),
-        ])
-      );
+      return group([
+        "[",
+        node.identifier,
+        "]:",
+        indent([
+          lineOrSpace,
+          printUrl(node.url),
+          node.title === null
+            ? ""
+            : [lineOrSpace, printTitle(node.title, options, false)],
+        ]),
+      ]);
     }
     // `footnote` requires `.use(footnotes, {inlineNotes: true})`, we are not using this option
     // https://github.com/remarkjs/remark-footnotes#optionsinlinenotes
     /* istanbul ignore next */
     case "footnote":
-      return concat(["[^", printChildren(path, options, print), "]"]);
+      return ["[^", printChildren(path, options, print), "]"];
     case "footnoteReference":
-      return concat(["[^", node.identifier, "]"]);
+      return ["[^", node.identifier, "]"];
     case "footnoteDefinition": {
       const nextNode = path.getParentNode().children[path.getName() + 1];
       const shouldInlineFootnote =
@@ -410,29 +398,27 @@ function genericPrint(path, options, print) {
           (options.proseWrap === "preserve" &&
             node.children[0].position.start.line ===
               node.children[0].position.end.line));
-      return concat([
+      return [
         "[^",
         node.identifier,
         "]: ",
         shouldInlineFootnote
           ? printChildren(path, options, print)
-          : group(
-              concat([
-                align(
-                  " ".repeat(4),
-                  printChildren(path, options, print, {
-                    processor: (childPath, index) =>
-                      index === 0
-                        ? group(concat([softline, childPath.call(print)]))
-                        : childPath.call(print),
-                  })
-                ),
-                nextNode && nextNode.type === "footnoteDefinition"
-                  ? softline
-                  : "",
-              ])
-            ),
-      ]);
+          : group([
+              align(
+                " ".repeat(4),
+                printChildren(path, options, print, {
+                  processor: (childPath, index) =>
+                    index === 0
+                      ? group([softline, childPath.call(print)])
+                      : childPath.call(print),
+                })
+              ),
+              nextNode && nextNode.type === "footnoteDefinition"
+                ? softline
+                : "",
+            ]),
+      ];
     }
     case "table":
       return printTable(path, options, print);
@@ -440,26 +426,26 @@ function genericPrint(path, options, print) {
       return printChildren(path, options, print);
     case "break":
       return /\s/.test(options.originalText[node.position.start.offset])
-        ? concat(["  ", markAsRoot(literalline)])
-        : concat(["\\", hardline]);
+        ? ["  ", markAsRoot(literalline)]
+        : ["\\", hardline];
     case "liquidNode":
-      return concat(replaceEndOfLineWith(node.value, hardline));
+      return replaceEndOfLineWith(node.value, hardline);
     // MDX
     // fallback to the original text if multiparser failed
     // or `embeddedLanguageFormatting: "off"`
     case "importExport":
-      return concat([node.value, hardline]);
+      return [node.value, hardline];
     case "jsx":
       return node.value;
     case "math":
-      return concat([
+      return [
         "$$",
         hardline,
         node.value
-          ? concat([...replaceEndOfLineWith(node.value, hardline), hardline])
+          ? [...replaceEndOfLineWith(node.value, hardline), hardline]
           : "",
         "$$",
-      ]);
+      ];
     case "inlineMath": {
       // remark-math trims content but we don't want to remove whitespaces
       // since it's very possible that it's recognized as math accidentally
@@ -477,7 +463,7 @@ function genericPrint(path, options, print) {
 function printListItem(path, options, print, listPrefix) {
   const node = path.getValue();
   const prefix = node.checked === null ? "" : node.checked ? "[x] " : "[ ] ";
-  return concat([
+  return [
     prefix,
     printChildren(path, options, print, {
       processor: (childPath, index) => {
@@ -488,10 +474,10 @@ function printListItem(path, options, print, listPrefix) {
         const alignment = " ".repeat(
           clamp(options.tabWidth - listPrefix.length, 0, 3) // 4+ will cause indented code block
         );
-        return concat([alignment, align(alignment, childPath.call(print))]);
+        return [alignment, align(alignment, childPath.call(print))];
       },
     }),
-  ]);
+  ];
 }
 
 function alignListPrefix(prefix, options) {
@@ -594,12 +580,12 @@ function printTable(path, options, print) {
 
   const alignedTable = printTableContents(/* isCompact */ false);
   if (options.proseWrap !== "never") {
-    return concat([breakParent, alignedTable]);
+    return [breakParent, alignedTable];
   }
 
   // Only if the --prose-wrap never is set and it exceeds the print width.
   const compactTable = printTableContents(/* isCompact */ true);
-  return concat([breakParent, group(ifBreak(compactTable, alignedTable))]);
+  return [breakParent, group(ifBreak(compactTable, alignedTable))];
 
   function printTableContents(isCompact) {
     /** @type{Doc[]} */
@@ -687,14 +673,14 @@ function printRoot(path, options, print) {
         const ignoreRange = ignoreRanges[0];
 
         if (index === ignoreRange.start.index) {
-          return concat([
+          return [
             children[ignoreRange.start.index].value,
             options.originalText.slice(
               ignoreRange.start.offset,
               ignoreRange.end.offset
             ),
             children[ignoreRange.end.index].value,
-          ]);
+          ];
         }
 
         if (ignoreRange.start.index < index && index < ignoreRange.end.index) {
@@ -715,7 +701,7 @@ function printRoot(path, options, print) {
 function printChildren(path, options, print, events) {
   events = events || {};
 
-  const postprocessor = events.postprocessor || concat;
+  const { postprocessor } = events;
   const processor = events.processor || ((childPath) => childPath.call(print));
 
   const node = path.getValue();
@@ -764,7 +750,7 @@ function printChildren(path, options, print, events) {
     }
   }, "children");
 
-  return postprocessor(parts);
+  return postprocessor ? postprocessor(parts) : parts;
 }
 
 function getLastDescendantNode(node) {
diff --git a/src/language-yaml/print/block.js b/src/language-yaml/print/block.js
index b99f770e9..fcb603908 100644
--- a/src/language-yaml/print/block.js
+++ b/src/language-yaml/print/block.js
@@ -4,7 +4,6 @@
 
 const {
   builders: {
-    concat,
     dedent,
     dedentToRoot,
     fill,
@@ -68,18 +67,16 @@ function printBlock(path, print, options) {
     }
   }
   if (node.indent === null) {
-    parts.push(
-      dedent(alignWithSpaces(options.tabWidth, concat(contentsParts)))
-    );
+    parts.push(dedent(alignWithSpaces(options.tabWidth, contentsParts)));
   } else {
     parts.push(
       dedentToRoot(
-        alignWithSpaces(node.indent - 1 + parentIndent, concat(contentsParts))
+        alignWithSpaces(node.indent - 1 + parentIndent, contentsParts)
       )
     );
   }
 
-  return concat(parts);
+  return parts;
 }
 
 module.exports = printBlock;
diff --git a/src/language-yaml/print/flow-mapping-sequence.js b/src/language-yaml/print/flow-mapping-sequence.js
index 779cc0e2b..28b87a059 100644
--- a/src/language-yaml/print/flow-mapping-sequence.js
+++ b/src/language-yaml/print/flow-mapping-sequence.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const {
-  builders: { concat, ifBreak, line, softline, hardline, join },
+  builders: { ifBreak, line, softline, hardline, join },
 } = require("../../document");
 const { isEmptyNode, getLast, hasEndComments } = require("../utils");
 const { printNextEmptyLine, alignWithSpaces } = require("./misc");
@@ -24,44 +24,40 @@ function printFlowMapping(path, print, options) {
     isEmptyNode(lastItem.key) &&
     isEmptyNode(lastItem.value);
 
-  return concat([
+  return [
     openMarker,
-    alignWithSpaces(
-      options.tabWidth,
-      concat([
-        bracketSpacing,
-        printChildren(path, print, options),
-        options.trailingComma === "none" ? "" : ifBreak(",", ""),
-        hasEndComments(node)
-          ? concat([hardline, join(hardline, path.map(print, "endComments"))])
-          : "",
-      ])
-    ),
+    alignWithSpaces(options.tabWidth, [
+      bracketSpacing,
+      printChildren(path, print, options),
+      options.trailingComma === "none" ? "" : ifBreak(",", ""),
+      hasEndComments(node)
+        ? [hardline, join(hardline, path.map(print, "endComments"))]
+        : "",
+    ]),
     isLastItemEmptyMappingItem ? "" : bracketSpacing,
     closeMarker,
-  ]);
+  ];
 }
 
 function printChildren(path, print, options) {
   const node = path.getValue();
   const parts = path.map(
-    (childPath, index) =>
-      concat([
-        print(childPath),
-        index === node.children.length - 1
-          ? ""
-          : concat([
-              ",",
-              line,
-              node.children[index].position.start.line !==
-              node.children[index + 1].position.start.line
-                ? printNextEmptyLine(childPath, options.originalText)
-                : "",
-            ]),
-      ]),
+    (childPath, index) => [
+      print(childPath),
+      index === node.children.length - 1
+        ? ""
+        : [
+            ",",
+            line,
+            node.children[index].position.start.line !==
+            node.children[index + 1].position.start.line
+              ? printNextEmptyLine(childPath, options.originalText)
+              : "",
+          ],
+    ],
     "children"
   );
-  return concat(parts);
+  return parts;
 }
 
 module.exports = {
diff --git a/src/language-yaml/print/mapping-item.js b/src/language-yaml/print/mapping-item.js
index 8d7c686c6..8b43bbfe2 100644
--- a/src/language-yaml/print/mapping-item.js
+++ b/src/language-yaml/print/mapping-item.js
@@ -3,7 +3,7 @@
 /** @typedef {import("../../document").Doc} Doc */
 
 const {
-  builders: { conditionalGroup, concat, group, hardline, ifBreak, join, line },
+  builders: { conditionalGroup, group, hardline, ifBreak, join, line },
 } = require("../../document");
 const {
   hasLeadingComments,
@@ -40,20 +40,20 @@ function printMappingItem(node, parentNode, path, print, options) {
       !hasTrailingComment(key.content) &&
       (!parentNode.tag || parentNode.tag.value !== "tag:yaml.org,2002:set")
     ) {
-      return concat([printedKey, spaceBeforeColon, ":"]);
+      return [printedKey, spaceBeforeColon, ":"];
     }
 
-    return concat(["? ", alignWithSpaces(2, printedKey)]);
+    return ["? ", alignWithSpaces(2, printedKey)];
   }
 
   const printedValue = path.call(print, "value");
   if (isEmptyMappingKey) {
-    return concat([": ", alignWithSpaces(2, printedValue)]);
+    return [": ", alignWithSpaces(2, printedValue)];
   }
 
   // force explicit Key
   if (hasLeadingComments(value) || !isInlineNode(key.content)) {
-    return concat([
+    return [
       "? ",
       alignWithSpaces(2, printedKey),
       hardline,
@@ -61,11 +61,11 @@ function printMappingItem(node, parentNode, path, print, options) {
         "",
         path
           .map(print, "value", "leadingComments")
-          .map((comment) => concat([comment, hardline]))
+          .map((comment) => [comment, hardline])
       ),
       ": ",
       alignWithSpaces(2, printedValue),
-    ]);
+    ];
   }
 
   // force singleline
@@ -80,17 +80,15 @@ function printMappingItem(node, parentNode, path, print, options) {
     !hasEndComments(value) &&
     isAbsolutelyPrintedAsSingleLineNode(value.content, options)
   ) {
-    return concat([printedKey, spaceBeforeColon, ": ", printedValue]);
+    return [printedKey, spaceBeforeColon, ": ", printedValue];
   }
 
   const groupId = Symbol("mappingKey");
-  const groupedKey = group(
-    concat([
-      ifBreak("? "),
-      group(alignWithSpaces(2, printedKey), { id: groupId }),
-    ])
-  );
-  const breakValue = concat([hardline, ": ", alignWithSpaces(2, printedValue)]);
+  const groupedKey = group([
+    ifBreak("? "),
+    group(alignWithSpaces(2, printedKey), { id: groupId }),
+  ]);
+  const breakValue = [hardline, ": ", alignWithSpaces(2, printedValue)];
   /** @type {Doc[]} */
   const flatValueParts = [spaceBeforeColon, ":"];
   if (
@@ -110,10 +108,10 @@ function printMappingItem(node, parentNode, path, print, options) {
     flatValueParts.push(line);
   }
   flatValueParts.push(printedValue);
-  const flatValue = alignWithSpaces(options.tabWidth, concat(flatValueParts));
+  const flatValue = alignWithSpaces(options.tabWidth, flatValueParts);
 
   return conditionalGroup([
-    concat([groupedKey, ifBreak(breakValue, flatValue, { groupId })]),
+    [groupedKey, ifBreak(breakValue, flatValue, { groupId })],
   ]);
 }
 
diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js
index 1a867996d..bf6da30b5 100644
--- a/src/language-yaml/printer-yaml.js
+++ b/src/language-yaml/printer-yaml.js
@@ -5,7 +5,7 @@
 const {
   builders: {
     breakParent,
-    concat,
+
     fill,
     group,
     hardline,
@@ -51,9 +51,7 @@ function genericPrint(path, options, print) {
   const parts = [];
 
   if (node.type !== "mappingValue" && hasLeadingComments(node)) {
-    parts.push(
-      concat([join(hardline, path.map(print, "leadingComments")), hardline])
-    );
+    parts.push([join(hardline, path.map(print, "leadingComments")), hardline]);
   }
 
   const { tag, anchor } = node;
@@ -93,25 +91,21 @@ function genericPrint(path, options, print) {
   }
 
   if (hasMiddleComments(node)) {
-    parts.push(
-      concat([
-        node.middleComments.length === 1 ? "" : hardline,
-        join(hardline, path.map(print, "middleComments")),
-        hardline,
-      ])
-    );
+    parts.push([
+      node.middleComments.length === 1 ? "" : hardline,
+      join(hardline, path.map(print, "middleComments")),
+      hardline,
+    ]);
   }
 
   const parentNode = path.getParentNode();
   if (hasPrettierIgnore(path)) {
     parts.push(
-      concat(
-        replaceEndOfLineWith(
-          options.originalText
-            .slice(node.position.start.offset, node.position.end.offset)
-            .trimEnd(),
-          literalline
-        )
+      replaceEndOfLineWith(
+        options.originalText
+          .slice(node.position.start.offset, node.position.end.offset)
+          .trimEnd(),
+        literalline
       )
     );
   } else {
@@ -120,49 +114,43 @@ function genericPrint(path, options, print) {
 
   if (hasTrailingComment(node) && !isNode(node, ["document", "documentHead"])) {
     parts.push(
-      lineSuffix(
-        concat([
-          node.type === "mappingValue" && !node.content ? "" : " ",
-          parentNode.type === "mappingKey" &&
-          path.getParentNode(2).type === "mapping" &&
-          isInlineNode(node)
-            ? ""
-            : breakParent,
-          path.call(print, "trailingComment"),
-        ])
-      )
+      lineSuffix([
+        node.type === "mappingValue" && !node.content ? "" : " ",
+        parentNode.type === "mappingKey" &&
+        path.getParentNode(2).type === "mapping" &&
+        isInlineNode(node)
+          ? ""
+          : breakParent,
+        path.call(print, "trailingComment"),
+      ])
     );
   }
 
   if (shouldPrintEndComments(node)) {
     parts.push(
-      alignWithSpaces(
-        node.type === "sequenceItem" ? 2 : 0,
-        concat([
+      alignWithSpaces(node.type === "sequenceItem" ? 2 : 0, [
+        hardline,
+        join(
           hardline,
-          join(
-            hardline,
-            path.map(
-              (path) =>
-                concat([
-                  isPreviousLineEmpty(
-                    options.originalText,
-                    path.getValue(),
-                    locStart
-                  )
-                    ? hardline
-                    : "",
-                  print(path),
-                ]),
-              "endComments"
-            )
-          ),
-        ])
-      )
+          path.map(
+            (path) => [
+              isPreviousLineEmpty(
+                options.originalText,
+                path.getValue(),
+                locStart
+              )
+                ? hardline
+                : "",
+              print(path),
+            ],
+            "endComments"
+          )
+        ),
+      ])
     );
   }
   parts.push(nextEmptyLine);
-  return concat(parts);
+  return parts;
 }
 
 function printNode(node, parentNode, path, options, print) {
@@ -194,7 +182,7 @@ function printNode(node, parentNode, path, options, print) {
       ) {
         parts.push(hardline);
       }
-      return concat(parts);
+      return parts;
     }
     case "document": {
       const nextDocument = parentNode.children[path.getName() + 1];
@@ -212,9 +200,7 @@ function printNode(node, parentNode, path, options, print) {
         }
 
         if (hasTrailingComment(node.head)) {
-          parts.push(
-            concat(["---", " ", path.call(print, "head", "trailingComment")])
-          );
+          parts.push(["---", " ", path.call(print, "head", "trailingComment")]);
         } else {
           parts.push("---");
         }
@@ -241,32 +227,32 @@ function printNode(node, parentNode, path, options, print) {
         if (isNode(lastDescendantNode, ["blockFolded", "blockLiteral"])) {
           // an extra newline for better readability
           if (lastDescendantNode.chomping !== "keep") {
-            separator = concat([hardline, hardline]);
+            separator = [hardline, hardline];
           }
         } else {
           separator = hardline;
         }
       }
 
-      return concat([
+      return [
         join(hardline, path.map(print, "children")),
         separator,
         join(hardline, path.map(print, "endComments")),
-      ]);
+      ];
     }
     case "directive":
-      return concat(["%", join(" ", [node.name].concat(node.parameters))]);
+      return ["%", join(" ", [node.name].concat(node.parameters))];
     case "comment":
-      return concat(["#", node.value]);
+      return ["#", node.value];
     case "alias":
-      return concat(["*", node.value]);
+      return ["*", node.value];
     case "tag":
       return options.originalText.slice(
         node.position.start.offset,
         node.position.end.offset
       );
     case "anchor":
-      return concat(["&", node.value]);
+      return ["&", node.value];
     case "plain":
       return printFlowScalarContent(
         node.type,
@@ -294,13 +280,13 @@ function printNode(node, parentNode, path, options, print) {
         // and quoteSingle do not need to escape backslashes
         const originalQuote =
           node.type === "quoteDouble" ? doubleQuote : singleQuote;
-        return concat([
+        return [
           originalQuote,
           printFlowScalarContent(node.type, raw, options),
           originalQuote,
-        ]);
+        ];
       } else if (raw.includes(doubleQuote)) {
-        return concat([
+        return [
           singleQuote,
           printFlowScalarContent(
             node.type,
@@ -313,11 +299,11 @@ function printNode(node, parentNode, path, options, print) {
             options
           ),
           singleQuote,
-        ]);
+        ];
       }
 
       if (raw.includes(singleQuote)) {
-        return concat([
+        return [
           doubleQuote,
           printFlowScalarContent(
             node.type,
@@ -328,15 +314,11 @@ function printNode(node, parentNode, path, options, print) {
             options
           ),
           doubleQuote,
-        ]);
+        ];
       }
 
       const quote = options.singleQuote ? singleQuote : doubleQuote;
-      return concat([
-        quote,
-        printFlowScalarContent(node.type, raw, options),
-        quote,
-      ]);
+      return [quote, printFlowScalarContent(node.type, raw, options), quote];
     }
     case "blockFolded":
     case "blockLiteral": {
@@ -345,10 +327,10 @@ function printNode(node, parentNode, path, options, print) {
     case "sequence":
       return join(hardline, path.map(print, "children"));
     case "sequenceItem":
-      return concat([
+      return [
         "- ",
         alignWithSpaces(2, !node.content ? "" : path.call(print, "content")),
-      ]);
+      ];
     case "mappingKey":
       return !node.content ? "" : path.call(print, "content");
     case "mappingValue":
diff --git a/src/main/ast-to-doc.js b/src/main/ast-to-doc.js
index 712ef02dc..369e6fc50 100644
--- a/src/main/ast-to-doc.js
+++ b/src/main/ast-to-doc.js
@@ -7,7 +7,7 @@ const { printComments } = require("./comments");
 const multiparser = require("./multiparser");
 
 const docBuilders = doc.builders;
-const { concat, hardline, addAlignmentToDoc } = docBuilders;
+const { hardline, addAlignmentToDoc } = docBuilders;
 const docUtils = doc.utils;
 
 /**
@@ -78,11 +78,7 @@ function printAstToDoc(ast, options, alignmentSize = 0) {
   if (alignmentSize > 0) {
     // Add a hardline to make the indents take effect
     // It should be removed in index.js format()
-    doc = addAlignmentToDoc(
-      concat([hardline, doc]),
-      alignmentSize,
-      options.tabWidth
-    );
+    doc = addAlignmentToDoc([hardline, doc], alignmentSize, options.tabWidth);
   }
   docUtils.propagateBreaks(doc);
 
diff --git a/src/main/comments.js b/src/main/comments.js
index 8482780c2..15dc38dc0 100644
--- a/src/main/comments.js
+++ b/src/main/comments.js
@@ -4,16 +4,7 @@
 const assert = require("assert");
 
 const {
-  builders: {
-    concat,
-    line,
-    hardline,
-    breakParent,
-    indent,
-    lineSuffix,
-    join,
-    cursor,
-  },
+  builders: { line, hardline, breakParent, indent, lineSuffix, join, cursor },
 } = require("../document");
 
 const {
@@ -468,10 +459,10 @@ function printLeadingComment(commentPath, options) {
         : line
       : " ";
 
-    return concat([contents, lineBreak]);
+    return [contents, lineBreak];
   }
 
-  return concat([contents, hardline]);
+  return [contents, hardline];
 }
 
 function printTrailingComment(commentPath, options) {
@@ -503,16 +494,14 @@ function printTrailingComment(commentPath, options) {
       locStart
     );
 
-    return lineSuffix(
-      concat([hardline, isLineBeforeEmpty ? hardline : "", contents])
-    );
+    return lineSuffix([hardline, isLineBeforeEmpty ? hardline : "", contents]);
   }
 
-  let printed = concat([" ", contents]);
+  let printed = [" ", contents];
 
   // Trailing block comments never need a newline
   if (!isBlock) {
-    printed = concat([lineSuffix(printed), breakParent]);
+    printed = [lineSuffix(printed), breakParent];
   }
 
   return printed;
@@ -545,12 +534,12 @@ function printDanglingComments(path, options, sameIndent, filter) {
   if (sameIndent) {
     return join(hardline, parts);
   }
-  return indent(concat([hardline, join(hardline, parts)]));
+  return indent([hardline, join(hardline, parts)]);
 }
 
 function prependCursorPlaceholder(path, options, printed) {
   if (path.getNode() === options.cursorNode && path.getValue()) {
-    return concat([cursor, printed, cursor]);
+    return [cursor, printed, cursor];
   }
   return printed;
 }
@@ -595,7 +584,7 @@ function printComments(path, print, options, needsSemi) {
   return prependCursorPlaceholder(
     path,
     options,
-    concat(leadingParts.concat(trailingParts))
+    leadingParts.concat(trailingParts)
   );
 }
 
diff --git a/src/utils/front-matter.js b/src/utils/front-matter.js
index d4d9c4119..b24e86221 100644
--- a/src/utils/front-matter.js
+++ b/src/utils/front-matter.js
@@ -2,7 +2,7 @@
 
 const escape = require("escape-string-regexp");
 const {
-  builders: { hardline, concat, markAsRoot },
+  builders: { hardline, markAsRoot },
 } = require("../document");
 
 const DELIMITER_MAP = {
@@ -47,9 +47,7 @@ function print(node, textToDoc) {
     const doc = value
       ? textToDoc(value, { parser: "yaml" }, { stripTrailingHardline: true })
       : "";
-    return markAsRoot(
-      concat(["---", hardline, doc, doc ? hardline : "", "---"])
-    );
+    return markAsRoot(["---", hardline, doc, doc ? hardline : "", "---"]);
   }
 }