From e44c360c62e0bf8c5896804fd54e6f25253fbc8b Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 14 Nov 2019 01:08:40 +0800
Subject: [PATCH 01/13] Update build scripts to target Node.js 10 (#6908)

---
 package.json                                  |  2 +-
 .../replace-array-includes-with-indexof.js    | 32 -------------------
 scripts/build/build.js                        |  3 +-
 scripts/build/bundler.js                      |  2 +-
 scripts/build/config.js                       | 10 ++----
 5 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 scripts/build/babel-plugins/replace-array-includes-with-indexof.js

diff --git a/package.json b/package.json
index 7536c355f..b79cab194 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "main": "./index.js",
   "engines": {
-    "node": ">=8"
+    "node": ">=10"
   },
   "dependencies": {
     "@angular/compiler": "8.2.13",
diff --git a/scripts/build/babel-plugins/replace-array-includes-with-indexof.js b/scripts/build/babel-plugins/replace-array-includes-with-indexof.js
deleted file mode 100644
index 18514344b..000000000
--- a/scripts/build/babel-plugins/replace-array-includes-with-indexof.js
+++ /dev/null
@@ -1,32 +0,0 @@
-"use strict";
-
-//
-// BEFORE:
-//   [__something__].includes(__something__)
-//   CONSTANT_CASE.includes(__something__)
-//
-// AFTER:
-//   [__something__].indexOf(__something__) !== -1
-//   CONSTANT_CASE.indexOf(__something__) !== -1
-//
-
-module.exports = ({ types: t }) => ({
-  visitor: {
-    CallExpression(path) {
-      const node = path.node;
-      const callee = node.callee;
-      if (
-        t.isMemberExpression(callee, { computed: false }) &&
-        (t.isArrayExpression(callee.object) ||
-          (t.isIdentifier(callee.object) &&
-            (/^[A-Z_]+$/.test(callee.object.name) ||
-              // https://github.com/eemeli/yaml/blob/1005d01/src/Anchors.js#L45
-              callee.object.name === "names"))) &&
-        t.isIdentifier(callee.property, { name: "includes" })
-      ) {
-        callee.property.name = "indexOf";
-        path.replaceWith(t.binaryExpression("!==", node, t.numericLiteral(-1)));
-      }
-    }
-  }
-});
diff --git a/scripts/build/build.js b/scripts/build/build.js
index ad5c9fca8..e775029fb 100644
--- a/scripts/build/build.js
+++ b/scripts/build/build.js
@@ -77,7 +77,6 @@ async function cacheFiles() {
 async function preparePackage() {
   const pkg = await util.readJson("package.json");
   pkg.bin = "./bin-prettier.js";
-  pkg.engines.node = ">=4";
   delete pkg.dependencies;
   delete pkg.devDependencies;
   pkg.scripts = {
@@ -99,7 +98,7 @@ async function run(params) {
     await execa("rm", ["-rf", ".cache"]);
   }
 
-  const bundleCache = new Cache(".cache/", "v19");
+  const bundleCache = new Cache(".cache/", "v20");
   await bundleCache.load();
 
   console.log(chalk.inverse(" Building packages "));
diff --git a/scripts/build/bundler.js b/scripts/build/bundler.js
index 7cdc86387..8af0ef60e 100644
--- a/scripts/build/bundler.js
+++ b/scripts/build/bundler.js
@@ -47,7 +47,7 @@ function getBabelConfig(bundle) {
       require.resolve("./babel-plugins/transform-custom-require")
     );
   }
-  const targets = { node: 4 };
+  const targets = { node: "10" };
   if (bundle.target === "universal") {
     // From https://jamie.build/last-2-versions
     targets.browsers = [">0.25%", "not ie 11", "not op_mini all"];
diff --git a/scripts/build/config.js b/scripts/build/config.js
index bacf93787..301aadab3 100644
--- a/scripts/build/config.js
+++ b/scripts/build/config.js
@@ -2,9 +2,6 @@
 
 const path = require("path");
 const PROJECT_ROOT = path.resolve(__dirname, "../..");
-const babelReplaceArrayIncludesWithIndexof = require.resolve(
-  "./babel-plugins/replace-array-includes-with-indexof"
-);
 
 /**
  * @typedef {Object} Bundle
@@ -29,8 +26,7 @@ const babelReplaceArrayIncludesWithIndexof = require.resolve(
 const parsers = [
   {
     input: "src/language-js/parser-babylon.js",
-    target: "universal",
-    babelPlugins: [babelReplaceArrayIncludesWithIndexof]
+    target: "universal"
   },
   {
     input: "src/language-js/parser-flow.js",
@@ -40,7 +36,6 @@ const parsers = [
   {
     input: "src/language-js/parser-typescript.js",
     target: "universal",
-    babelPlugins: [babelReplaceArrayIncludesWithIndexof],
     commonjs: {
       ignore: [
         // Optional package for TypeScript that logs ETW events (a Windows-only technology).
@@ -133,8 +128,7 @@ const parsers = [
           replacement: require.resolve("lines-and-columns")
         }
       ]
-    },
-    babelPlugins: [babelReplaceArrayIncludesWithIndexof]
+    }
   }
 ].map(parser => {
   const name = getFileOutput(parser)

From 584fc5920bf21b845fc218f118b5ec339e0b47eb Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 14 Nov 2019 18:14:23 +0800
Subject: [PATCH 02/13] Update `snapshot-diff` to v0.6.1 (#6955)

* update `snapshot-diff` to 0.6.1

* update snapshot
---
 package.json                                  |   2 +-
 .../__snapshots__/support-info.js.snap        | 100 +++++++++--------
 yarn.lock                                     | 104 ++++++++++++++++--
 3 files changed, 142 insertions(+), 64 deletions(-)

diff --git a/package.json b/package.json
index b79cab194..10f16b0aa 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-terser": "5.1.2",
     "shelljs": "0.8.3",
-    "snapshot-diff": "0.4.0",
+    "snapshot-diff": "0.6.1",
     "strip-ansi": "5.2.0",
     "synchronous-promise": "2.0.10",
     "tempy": "0.2.1",
diff --git a/tests_integration/__tests__/__snapshots__/support-info.js.snap b/tests_integration/__tests__/__snapshots__/support-info.js.snap
index 5a8351f88..67656b4ec 100644
--- a/tests_integration/__tests__/__snapshots__/support-info.js.snap
+++ b/tests_integration/__tests__/__snapshots__/support-info.js.snap
@@ -141,12 +141,13 @@ exports[`API getSupportInfo() with version 1.0.0 -> 1.4.0 1`] = `
         \\"flow\\",
       ],
       \\"JSX\\": Array [
-@@ -10,24 +13,54 @@
+@@ -9,31 +12,79 @@
+        \\"flow\\",
       ],
       \\"JavaScript\\": Array [
         \\"babylon\\",
         \\"flow\\",
-      ],
++     ],
 +     \\"Less\\": Array [
 +       \\"postcss\\",
 +     ],
@@ -155,7 +156,7 @@ exports[`API getSupportInfo() with version 1.0.0 -> 1.4.0 1`] = `
 +     ],
 +     \\"SCSS\\": Array [
 +       \\"postcss\\",
-+     ],
+      ],
 +     \\"TSX\\": Array [
 +       \\"typescript\\",
 +     ],
@@ -167,14 +168,14 @@ exports[`API getSupportInfo() with version 1.0.0 -> 1.4.0 1`] = `
       \\"bracketSpacing\\": Object {
         \\"default\\": true,
         \\"type\\": \\"boolean\\",
-      },
++     },
 +     \\"cursorOffset\\": Object {
 +       \\"default\\": -1,
 +       \\"range\\": Object {
 +         \\"end\\": Infinity,
 +         \\"start\\": -1,
 +         \\"step\\": 1,
-+       },
+        },
 +       \\"type\\": \\"int\\",
 +     },
 +     \\"filepath\\": Object {
@@ -196,12 +197,14 @@ exports[`API getSupportInfo() with version 1.0.0 -> 1.4.0 1`] = `
         \\"type\\": \\"choice\\",
       },
       \\"printWidth\\": Object {
-@@ -37,10 +70,28 @@
-          \\"start\\": 0,
-          \\"step\\": 1,
-        },
-        \\"type\\": \\"int\\",
-      },
+        \\"default\\": 80,
++       \\"range\\": Object {
++         \\"end\\": Infinity,
++         \\"start\\": 0,
++         \\"step\\": 1,
++       },
++       \\"type\\": \\"int\\",
++     },
 +     \\"rangeEnd\\": Object {
 +       \\"default\\": Infinity,
 +       \\"range\\": Object {
@@ -213,18 +216,11 @@ exports[`API getSupportInfo() with version 1.0.0 -> 1.4.0 1`] = `
 +     },
 +     \\"rangeStart\\": Object {
 +       \\"default\\": 0,
-+       \\"range\\": Object {
-+         \\"end\\": Infinity,
-+         \\"start\\": 0,
-+         \\"step\\": 1,
-+       },
-+       \\"type\\": \\"int\\",
-+     },
-      \\"semi\\": Object {
-        \\"default\\": true,
-        \\"type\\": \\"boolean\\",
-      },
-      \\"singleQuote\\": Object {"
+        \\"range\\": Object {
+          \\"end\\": Infinity,
+          \\"start\\": 0,
+          \\"step\\": 1,
+        },"
 `;
 
 exports[`API getSupportInfo() with version 1.4.0 -> 1.5.0 1`] = `
@@ -319,21 +315,21 @@ exports[`API getSupportInfo() with version 1.5.0 -> 1.7.1 1`] = `
         ],
         \\"default\\": \\"babylon\\",
         \\"type\\": \\"choice\\",
-@@ -99,10 +101,14 @@
+@@ -98,10 +100,14 @@
+          \\"end\\": Infinity,
           \\"start\\": 0,
           \\"step\\": 1,
         },
         \\"type\\": \\"int\\",
-      },
++     },
 +     \\"requirePragma\\": Object {
 +       \\"default\\": false,
 +       \\"type\\": \\"boolean\\",
-+     },
+      },
       \\"semi\\": Object {
         \\"default\\": true,
         \\"type\\": \\"boolean\\",
-      },
-      \\"singleQuote\\": Object {"
+      },"
 `;
 
 exports[`API getSupportInfo() with version 1.7.1 -> 1.8.0 1`] = `
@@ -355,21 +351,21 @@ exports[`API getSupportInfo() with version 1.7.1 -> 1.8.0 1`] = `
       ],
       \\"SCSS\\": Array [
         \\"scss\\",
-@@ -56,10 +59,14 @@
+@@ -55,10 +58,14 @@
+        \\"type\\": \\"int\\",
       },
       \\"filepath\\": Object {
         \\"default\\": undefined,
         \\"type\\": \\"path\\",
-      },
++     },
 +     \\"insertPragma\\": Object {
 +       \\"default\\": false,
 +       \\"type\\": \\"boolean\\",
-+     },
+      },
       \\"jsxBracketSameLine\\": Object {
         \\"default\\": false,
         \\"type\\": \\"boolean\\",
       },
-      \\"parser\\": Object {
 @@ -70,10 +77,11 @@
           \\"css\\",
           \\"less\\",
@@ -415,7 +411,7 @@ exports[`API getSupportInfo() with version 1.8.2 -> 1.16.0 1`] = `
 - First value
 + Second value
 
-@@ -1,34 +1,49 @@
+@@ -1,33 +1,48 @@
   Object {
     \\"languages\\": Object {
 +     \\"Angular\\": Array [
@@ -431,10 +427,10 @@ exports[`API getSupportInfo() with version 1.8.2 -> 1.16.0 1`] = `
       ],
       \\"GraphQL\\": Array [
         \\"graphql\\",
-      ],
++     ],
 +     \\"HTML\\": Array [
 +       \\"html\\",
-+     ],
+      ],
       \\"JSON\\": Array [
         \\"json\\",
       ],
@@ -459,27 +455,27 @@ exports[`API getSupportInfo() with version 1.8.2 -> 1.16.0 1`] = `
       ],
       \\"Less\\": Array [
         \\"less\\",
-      ],
++     ],
 +     \\"MDX\\": Array [
 +       \\"mdx\\",
-+     ],
+      ],
       \\"Markdown\\": Array [
         \\"markdown\\",
       ],
       \\"PostCSS\\": Array [
-        \\"css\\",
-@@ -40,12 +55,26 @@
+@@ -39,13 +54,27 @@
+      \\"TSX\\": Array [
         \\"typescript\\",
       ],
       \\"TypeScript\\": Array [
         \\"typescript\\",
-      ],
++     ],
 +     \\"Vue\\": Array [
 +       \\"vue\\",
 +     ],
 +     \\"YAML\\": Array [
 +       \\"yaml\\",
-+     ],
+      ],
     },
     \\"options\\": Object {
 +     \\"arrowParens\\": Object {
@@ -495,7 +491,7 @@ exports[`API getSupportInfo() with version 1.8.2 -> 1.16.0 1`] = `
         \\"type\\": \\"boolean\\",
       },
       \\"cursorOffset\\": Object {
-@@ -55,37 +84,76 @@
+@@ -55,36 +84,75 @@
           \\"start\\": -1,
           \\"step\\": 1,
         },
@@ -560,7 +556,7 @@ exports[`API getSupportInfo() with version 1.8.2 -> 1.16.0 1`] = `
 -       \\"default\\": \\"babylon\\",
 +       \\"default\\": undefined,
         \\"type\\": \\"choice\\",
-      },
++     },
 +     \\"pluginSearchDirs\\": Object {
 +       \\"default\\": Array [],
 +       \\"type\\": \\"path\\",
@@ -568,12 +564,11 @@ exports[`API getSupportInfo() with version 1.8.2 -> 1.16.0 1`] = `
 +     \\"plugins\\": Object {
 +       \\"default\\": Array [],
 +       \\"type\\": \\"path\\",
-+     },
+      },
       \\"printWidth\\": Object {
         \\"default\\": 80,
         \\"range\\": Object {
           \\"end\\": Infinity,
-          \\"start\\": 0,
 @@ -93,14 +161,15 @@
         },
         \\"type\\": \\"int\\",
@@ -646,17 +641,20 @@ exports[`API getSupportInfo() with version 1.16.0 -> undefined 1`] = `
         \\"range\\": Object {
           \\"end\\": Infinity,
           \\"start\\": 0,
-@@ -220,7 +233,11 @@
+@@ -217,10 +230,14 @@
+        ],
+        \\"default\\": \\"none\\",
+        \\"type\\": \\"choice\\",
       },
       \\"useTabs\\": Object {
++       \\"default\\": false,
++       \\"type\\": \\"boolean\\",
++     },
++     \\"vueIndentScriptAndStyle\\": Object {
         \\"default\\": false,
         \\"type\\": \\"boolean\\",
       },
-+     \\"vueIndentScriptAndStyle\\": Object {
-+       \\"default\\": false,
-+       \\"type\\": \\"boolean\\",
-      },
-+   },
+    },
   }"
 `;
 
diff --git a/yarn.lock b/yarn.lock
index 5641f7017..6fc5dca10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2245,6 +2245,11 @@ detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
 
+diff-sequences@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
+  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
+
 diff@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
@@ -2728,6 +2733,18 @@ expect@^23.4.0:
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
 
+expect@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
+  integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==
+  dependencies:
+    "@jest/types" "^24.9.0"
+    ansi-styles "^3.2.0"
+    jest-get-type "^24.9.0"
+    jest-matcher-utils "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-regex-util "^24.9.0"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -3891,7 +3908,7 @@ jest-config@^23.4.2:
     jest-validate "^23.4.0"
     pretty-format "^23.2.0"
 
-jest-diff@^23.0.1, jest-diff@^23.2.0:
+jest-diff@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.2.0.tgz#9f2cf4b51e12c791550200abc16b47130af1062a"
   dependencies:
@@ -3900,6 +3917,16 @@ jest-diff@^23.0.1, jest-diff@^23.2.0:
     jest-get-type "^22.1.0"
     pretty-format "^23.2.0"
 
+jest-diff@^24.0.0, jest-diff@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
+  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
+  dependencies:
+    chalk "^2.0.1"
+    diff-sequences "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
+
 jest-docblock@24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2"
@@ -4002,6 +4029,16 @@ jest-matcher-utils@^23.2.0:
     jest-get-type "^22.1.0"
     pretty-format "^23.2.0"
 
+jest-matcher-utils@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
+  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
+  dependencies:
+    chalk "^2.0.1"
+    jest-diff "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
+
 jest-message-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
@@ -4037,6 +4074,11 @@ jest-mock@^24.9.0:
   dependencies:
     "@jest/types" "^24.9.0"
 
+jest-pnp-resolver@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
+  integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
+
 jest-regex-util@^23.3.0:
   version "23.3.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
@@ -4061,6 +4103,17 @@ jest-resolve@^23.4.1:
     chalk "^2.0.1"
     realpath-native "^1.0.0"
 
+jest-resolve@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.9.0.tgz#dff04c7687af34c4dd7e524892d9cf77e5d17321"
+  integrity sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==
+  dependencies:
+    "@jest/types" "^24.9.0"
+    browser-resolve "^1.11.3"
+    chalk "^2.0.1"
+    jest-pnp-resolver "^1.2.1"
+    realpath-native "^1.1.0"
+
 jest-runner@^23.4.2:
   version "23.4.2"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.4.2.tgz#579a88524ac52c846075b0129a21c7b483e75a7e"
@@ -4120,7 +4173,7 @@ jest-snapshot-serializer-raw@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot-serializer-raw/-/jest-snapshot-serializer-raw-1.1.0.tgz#1d7f09c02f3dbbc3ae70b5b7598fb2f45e37d6c8"
 
-jest-snapshot@^23.0.1, jest-snapshot@^23.4.2:
+jest-snapshot@^23.4.2:
   version "23.4.2"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.4.2.tgz#8fa6130feb5a527dac73e5fa80d86f29f7c42ab6"
   dependencies:
@@ -4135,6 +4188,25 @@ jest-snapshot@^23.0.1, jest-snapshot@^23.4.2:
     pretty-format "^23.2.0"
     semver "^5.5.0"
 
+jest-snapshot@^24.0.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba"
+  integrity sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==
+  dependencies:
+    "@babel/types" "^7.0.0"
+    "@jest/types" "^24.9.0"
+    chalk "^2.0.1"
+    expect "^24.9.0"
+    jest-diff "^24.9.0"
+    jest-get-type "^24.9.0"
+    jest-matcher-utils "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-resolve "^24.9.0"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    pretty-format "^24.9.0"
+    semver "^6.2.0"
+
 jest-util@^23.4.0:
   version "23.4.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
@@ -5511,14 +5583,14 @@ prettier@1.19.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-pretty-format@^23.0.1, pretty-format@^23.2.0:
+pretty-format@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.2.0.tgz#3b0aaa63c018a53583373c1cb3a5d96cc5e83017"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-pretty-format@^24.9.0:
+pretty-format@^24.0.0, pretty-format@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
   integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
@@ -5737,6 +5809,13 @@ realpath-native@^1.0.0:
   dependencies:
     util.promisify "^1.0.0"
 
+realpath-native@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
+  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
+  dependencies:
+    util.promisify "^1.0.0"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -6154,7 +6233,7 @@ schema-utils@^2.5.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
 
-semver@6.3.0, semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0:
+semver@6.3.0, semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -6303,14 +6382,15 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-snapshot-diff@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/snapshot-diff/-/snapshot-diff-0.4.0.tgz#6db5e1698a1ffdf64641530ee07919c4225de043"
+snapshot-diff@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/snapshot-diff/-/snapshot-diff-0.6.1.tgz#26a84b04dd4bce7ae9f457a5c5e9af0b5f5202f1"
+  integrity sha512-wWt3x4fb7FJIcV05Ng9NceVSTvQYE493sIqebzUoQbQlRG6rIR03KaRt8o/7W7znaYjUbP0eOq1iK+DfpZXaeQ==
   dependencies:
-    jest-diff "^23.0.1"
-    jest-snapshot "^23.0.1"
-    pretty-format "^23.0.1"
-    strip-ansi "^4.0.0"
+    jest-diff "^24.0.0"
+    jest-snapshot "^24.0.0"
+    pretty-format "^24.0.0"
+    strip-ansi "^5.0.0"
 
 source-list-map@^2.0.0:
   version "2.0.0"

From ab88423a4a4e48884ac4c8ddbf4f63c0ff5dfb0b Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 15 Nov 2019 00:06:45 +0800
Subject: [PATCH 03/13] Disable trailingComma for Angular internal parser
 (#6912)

---
 src/language-js/printer-estree.js             |  10 +
 .../__snapshots__/jsfmt.spec.js.snap          | 176 ++++++++++++++++++
 tests/angular_interpolation/jsfmt.spec.js     |   2 +
 3 files changed, 188 insertions(+)

diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index 9c588dfb6..c9f73d0ca 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -120,6 +120,16 @@ const {
 let uid = 0;
 
 function shouldPrintComma(options, level) {
+  // angular does not allow trailing comma
+  if (
+    options.parser === "__ng_interpolation" ||
+    options.parser === "__ng_action" ||
+    options.parser === "__ng_binding" ||
+    options.parser === "__ng_directive"
+  ) {
+    return false;
+  }
+
   level = level || "es5";
 
   switch (options.trailingComma) {
diff --git a/tests/angular_interpolation/__snapshots__/jsfmt.spec.js.snap b/tests/angular_interpolation/__snapshots__/jsfmt.spec.js.snap
index 6a5d630a4..41c46208c 100644
--- a/tests/angular_interpolation/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/angular_interpolation/__snapshots__/jsfmt.spec.js.snap
@@ -20,6 +20,48 @@ printWidth: 80
 ================================================================================
 `;
 
+exports[`logical-expression.ng 2`] = `
+====================================options=====================================
+parsers: ["__ng_interpolation"]
+printWidth: 80
+trailingComma: "es5"
+                                                                                | printWidth
+=====================================input======================================
+[
+    advancedSearchService.patientInformationFieldsRow2 && advancedSearchService.patientInformationFieldsRow2.indexOf(advancedSearchService.formElementData.customFieldList[i].customFieldType) !== -1
+]
+
+=====================================output=====================================
+[
+  advancedSearchService.patientInformationFieldsRow2 &&
+    advancedSearchService.patientInformationFieldsRow2.indexOf(
+      advancedSearchService.formElementData.customFieldList[i].customFieldType
+    ) !== -1
+]
+================================================================================
+`;
+
+exports[`logical-expression.ng 3`] = `
+====================================options=====================================
+parsers: ["__ng_interpolation"]
+printWidth: 80
+trailingComma: "all"
+                                                                                | printWidth
+=====================================input======================================
+[
+    advancedSearchService.patientInformationFieldsRow2 && advancedSearchService.patientInformationFieldsRow2.indexOf(advancedSearchService.formElementData.customFieldList[i].customFieldType) !== -1
+]
+
+=====================================output=====================================
+[
+  advancedSearchService.patientInformationFieldsRow2 &&
+    advancedSearchService.patientInformationFieldsRow2.indexOf(
+      advancedSearchService.formElementData.customFieldList[i].customFieldType
+    ) !== -1
+]
+================================================================================
+`;
+
 exports[`pipe-expression.ng 1`] = `
 ====================================options=====================================
 parsers: ["__ng_interpolation"]
@@ -85,3 +127,137 @@ printWidth: 80
 ]
 ================================================================================
 `;
+
+exports[`pipe-expression.ng 2`] = `
+====================================options=====================================
+parsers: ["__ng_interpolation"]
+printWidth: 80
+trailingComma: "es5"
+                                                                                | printWidth
+=====================================input======================================
+[
+    a ? (b | c : d) : (e | f : g),
+    a | b | c | d,
+    ((a | b) | c) | d,
+    a | b:(c | d),
+    { a: b | c },
+    (a + b) | c,
+    (a | b) + c,
+    fn(a | b),
+    a?.b(c | d),
+    a[b | c],
+    ($students | async).items,
+    ($students | async)(),
+    myData | myPipe:'arg1':'arg2':'arg3',
+    value
+      | pipeA: {
+        keyA: reallySuperLongValue,
+        keyB: shortValue | pipeB | pipeC: valueToPipeC
+      } : {
+        keyA: reallySuperLongValue,
+        keyB: shortValue | pipeB | pipeC: valueToPipeC
+      }
+      | aaa,
+   (hideLinqPanel ? "ReportSelection.HideShowLabel_Show.String" : "ReportSelection.HideShowLabel_Hide.String") | localize:(localizationSection) 
+]
+
+=====================================output=====================================
+[
+  a ? (b | c: d) : (e | f: g),
+  a | b | c | d,
+  a | b | c | d,
+  a | b: (c | d),
+  { a: b | c },
+  a + b | c,
+  (a | b) + c,
+  fn(a | b),
+  a?.b(c | d),
+  a[b | c],
+  ($students | async).items,
+  ($students | async)(),
+  myData | myPipe: "arg1":"arg2":"arg3",
+  value
+    | pipeA
+      : {
+          keyA: reallySuperLongValue,
+          keyB: shortValue | pipeB | pipeC: valueToPipeC
+        }
+      : {
+          keyA: reallySuperLongValue,
+          keyB: shortValue | pipeB | pipeC: valueToPipeC
+        }
+    | aaa,
+  (hideLinqPanel
+    ? "ReportSelection.HideShowLabel_Show.String"
+    : "ReportSelection.HideShowLabel_Hide.String"
+  ) | localize: localizationSection
+]
+================================================================================
+`;
+
+exports[`pipe-expression.ng 3`] = `
+====================================options=====================================
+parsers: ["__ng_interpolation"]
+printWidth: 80
+trailingComma: "all"
+                                                                                | printWidth
+=====================================input======================================
+[
+    a ? (b | c : d) : (e | f : g),
+    a | b | c | d,
+    ((a | b) | c) | d,
+    a | b:(c | d),
+    { a: b | c },
+    (a + b) | c,
+    (a | b) + c,
+    fn(a | b),
+    a?.b(c | d),
+    a[b | c],
+    ($students | async).items,
+    ($students | async)(),
+    myData | myPipe:'arg1':'arg2':'arg3',
+    value
+      | pipeA: {
+        keyA: reallySuperLongValue,
+        keyB: shortValue | pipeB | pipeC: valueToPipeC
+      } : {
+        keyA: reallySuperLongValue,
+        keyB: shortValue | pipeB | pipeC: valueToPipeC
+      }
+      | aaa,
+   (hideLinqPanel ? "ReportSelection.HideShowLabel_Show.String" : "ReportSelection.HideShowLabel_Hide.String") | localize:(localizationSection) 
+]
+
+=====================================output=====================================
+[
+  a ? (b | c: d) : (e | f: g),
+  a | b | c | d,
+  a | b | c | d,
+  a | b: (c | d),
+  { a: b | c },
+  a + b | c,
+  (a | b) + c,
+  fn(a | b),
+  a?.b(c | d),
+  a[b | c],
+  ($students | async).items,
+  ($students | async)(),
+  myData | myPipe: "arg1":"arg2":"arg3",
+  value
+    | pipeA
+      : {
+          keyA: reallySuperLongValue,
+          keyB: shortValue | pipeB | pipeC: valueToPipeC
+        }
+      : {
+          keyA: reallySuperLongValue,
+          keyB: shortValue | pipeB | pipeC: valueToPipeC
+        }
+    | aaa,
+  (hideLinqPanel
+    ? "ReportSelection.HideShowLabel_Show.String"
+    : "ReportSelection.HideShowLabel_Hide.String"
+  ) | localize: localizationSection
+]
+================================================================================
+`;
diff --git a/tests/angular_interpolation/jsfmt.spec.js b/tests/angular_interpolation/jsfmt.spec.js
index 09a639b7b..509a66203 100644
--- a/tests/angular_interpolation/jsfmt.spec.js
+++ b/tests/angular_interpolation/jsfmt.spec.js
@@ -1 +1,3 @@
 run_spec(__dirname, ["__ng_interpolation"]);
+run_spec(__dirname, ["__ng_interpolation"], { trailingComma: "es5" });
+run_spec(__dirname, ["__ng_interpolation"], { trailingComma: "all" });

From 98ec2c4512014649e2c82d18b4f9e4163a0c1784 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Fri, 15 Nov 2019 01:23:06 +0800
Subject: [PATCH 04/13] Style: use async functions (#6935)

---
 .eslintrc.yml                |  2 ++
 src/common/create-ignorer.js | 11 ++++++-----
 src/common/get-file-info.js  | 25 +++++++++++--------------
 src/config/resolve-config.js |  7 +++----
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 52280121c..5ddea1bff 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -6,6 +6,8 @@ extends:
   - eslint:recommended
   - plugin:react/recommended
   - plugin:prettier/recommended
+parserOptions:
+  ecmaVersion: 2017
 plugins:
   - import
 rules:
diff --git a/src/common/create-ignorer.js b/src/common/create-ignorer.js
index 705e1c60d..8996b71d9 100644
--- a/src/common/create-ignorer.js
+++ b/src/common/create-ignorer.js
@@ -8,11 +8,12 @@ const getFileContentOrNull = require("../utils/get-file-content-or-null");
  * @param {undefined | string} ignorePath
  * @param {undefined | boolean} withNodeModules
  */
-function createIgnorer(ignorePath, withNodeModules) {
-  return (!ignorePath
-    ? Promise.resolve(null)
-    : getFileContentOrNull(path.resolve(ignorePath))
-  ).then(ignoreContent => _createIgnorer(ignoreContent, withNodeModules));
+async function createIgnorer(ignorePath, withNodeModules) {
+  const ignoreContent = ignorePath
+    ? await getFileContentOrNull(path.resolve(ignorePath))
+    : null;
+
+  return _createIgnorer(ignoreContent, withNodeModules);
 }
 
 /**
diff --git a/src/common/get-file-info.js b/src/common/get-file-info.js
index ca7b9f0cd..688a98252 100644
--- a/src/common/get-file-info.js
+++ b/src/common/get-file-info.js
@@ -19,24 +19,21 @@ const path = require("path");
  * not an object. A transformation from this array to an object is automatically done
  * internally by the method wrapper. See withPlugins() in index.js.
  */
-function getFileInfo(filePath, opts) {
+async function getFileInfo(filePath, opts) {
   if (typeof filePath !== "string") {
-    return Promise.reject(
-      new TypeError(
-        `expect \`filePath\` to be a string, got \`${typeof filePath}\``
-      )
+    throw new TypeError(
+      `expect \`filePath\` to be a string, got \`${typeof filePath}\``
     );
   }
 
-  return createIgnorer(opts.ignorePath, opts.withNodeModules).then(ignorer =>
-    _getFileInfo({
-      ignorer,
-      filePath: normalizeFilePath(filePath, opts.ignorePath),
-      plugins: opts.plugins,
-      resolveConfig: opts.resolveConfig,
-      sync: false
-    })
-  );
+  const ignorer = await createIgnorer(opts.ignorePath, opts.withNodeModules);
+  return _getFileInfo({
+    ignorer,
+    filePath: normalizeFilePath(filePath, opts.ignorePath),
+    plugins: opts.plugins,
+    resolveConfig: opts.resolveConfig,
+    sync: false
+  });
 }
 
 /**
diff --git a/src/config/resolve-config.js b/src/config/resolve-config.js
index 0c27eed05..a1c47eabf 100644
--- a/src/config/resolve-config.js
+++ b/src/config/resolve-config.js
@@ -117,11 +117,10 @@ function clearCache() {
   resolveEditorConfig.clearCache();
 }
 
-function resolveConfigFile(filePath) {
+async function resolveConfigFile(filePath) {
   const load = getLoadFunction({ sync: false });
-  return load(filePath).then(result => {
-    return result ? result.filepath : null;
-  });
+  const result = await load(filePath);
+  return result ? result.filepath : null;
 }
 
 resolveConfigFile.sync = filePath => {

From 61a2482c480f1b59f1fde0bdc4068d5f1584f32e Mon Sep 17 00:00:00 2001
From: Evilebot Tnawi <evilebottnawi@users.noreply.github.com>
Date: Thu, 14 Nov 2019 20:59:20 +0300
Subject: [PATCH 05/13] fix: issue #6813 (Zero-based lists are broken) (#6852)

---
 changelog_unreleased/markdown/pr-6852.md      |  19 +
 src/language-markdown/printer-markdown.js     |  11 +-
 src/language-markdown/utils.js                |  29 +
 .../__snapshots__/jsfmt.spec.js.snap          | 756 ++++++++++++++++++
 tests/markdown_list/start.md                  |  95 +++
 5 files changed, 904 insertions(+), 6 deletions(-)
 create mode 100644 changelog_unreleased/markdown/pr-6852.md

diff --git a/changelog_unreleased/markdown/pr-6852.md b/changelog_unreleased/markdown/pr-6852.md
new file mode 100644
index 000000000..05c1136e9
--- /dev/null
+++ b/changelog_unreleased/markdown/pr-6852.md
@@ -0,0 +1,19 @@
+#### Handle zero-based lists correctly ([#6852](https://github.com/prettier/prettier/pull/6852) by [@evilebottnawi](https://github.com/evilebottnawi))
+
+<!-- prettier-ignore -->
+```md
+<!-- Input -->
+0. List
+1. List
+2. List
+
+<!-- Prettier stable -->
+0. List
+1. List
+1. List
+
+<!-- Prettier master -->
+0. List
+1. List
+2. List
+```
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index 16571274c..b4effa98f 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -25,7 +25,7 @@ const {
 } = require("../doc");
 const {
   getFencedCodeBlockValue,
-  getOrderedListItemInfo,
+  hasGitDiffFriendlyOrderedList,
   splitText,
   punctuationPattern,
   INLINE_NODE_TYPES,
@@ -251,11 +251,10 @@ function genericPrint(path, options, print) {
         path.getParentNode()
       );
 
-      const isGitDiffFriendlyOrderedList =
-        node.ordered &&
-        node.children.length > 1 &&
-        +getOrderedListItemInfo(node.children[1], options.originalText)
-          .numberText === 1;
+      const isGitDiffFriendlyOrderedList = hasGitDiffFriendlyOrderedList(
+        node,
+        options
+      );
 
       return printChildren(path, options, print, {
         processor: (childPath, index) => {
diff --git a/src/language-markdown/utils.js b/src/language-markdown/utils.js
index 702c7ccb7..9fd68f037 100644
--- a/src/language-markdown/utils.js
+++ b/src/language-markdown/utils.js
@@ -162,6 +162,34 @@ function getOrderedListItemInfo(orderListItem, originalText) {
   return { numberText, marker, leadingSpaces };
 }
 
+function hasGitDiffFriendlyOrderedList(node, options) {
+  if (!node.ordered) {
+    return false;
+  }
+
+  if (node.children.length < 2) {
+    return false;
+  }
+
+  const firstNumber = Number(
+    getOrderedListItemInfo(node.children[0], options.originalText).numberText
+  );
+
+  const secondNumber = Number(
+    getOrderedListItemInfo(node.children[1], options.originalText).numberText
+  );
+
+  if (firstNumber === 0 && node.children.length > 2) {
+    const thirdNumber = Number(
+      getOrderedListItemInfo(node.children[2], options.originalText).numberText
+    );
+
+    return secondNumber === 1 && thirdNumber === 1;
+  }
+
+  return secondNumber === 1;
+}
+
 // workaround for https://github.com/remarkjs/remark/issues/351
 // leading and trailing newlines are stripped by remark
 function getFencedCodeBlockValue(node, originalText) {
@@ -229,6 +257,7 @@ module.exports = {
   punctuationPattern,
   getFencedCodeBlockValue,
   getOrderedListItemInfo,
+  hasGitDiffFriendlyOrderedList,
   INLINE_NODE_TYPES,
   INLINE_NODE_WRAPPER_TYPES
 };
diff --git a/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap b/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap
index a483b07f4..492abaece 100644
--- a/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap
@@ -2458,11 +2458,200 @@ proseWrap: "always"
 6. def
 7. ghi
 
+---
+
+0. abc
+0. def
+0. ghi
+
+---
+
+1. abc
+1. def
+1. ghi
+
+---
+
+2. abc
+2. def
+2. ghi
+
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+0. abc
+1. def
+1. ghi
+
+---
+
+1. abc
+2. def
+3. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+999. abc
+145. def
+69. ghi
+
+---
+
+0. abc
+
+---
+
+1. abc
+
+---
+
+2. abc
+
+---
+
+999. abc
+
+---
+
+0. abc
+1. def
+
+---
+
+1. abc
+2. def
+
+---
+
+
+1. abc
+1. def
+
+---
+
+2. abc
+3. def
+
+---
+
+999. abc
+1. def
+
+---
+
+999. abc
+2. def
+
 =====================================output=====================================
 5. abc
 6. def
 7. ghi
 
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+1. abc
+1. def
+1. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+0. abc
+1. def
+1. ghi
+
+---
+
+1. abc
+2. def
+3. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+999. abc
+1000. def
+1001. ghi
+
+---
+
+0. abc
+
+---
+
+1. abc
+
+---
+
+2. abc
+
+---
+
+999. abc
+
+---
+
+0. abc
+1. def
+
+---
+
+1. abc
+2. def
+
+---
+
+1. abc
+1. def
+
+---
+
+2. abc
+3. def
+
+---
+
+999. abc
+1. def
+
+---
+
+999. abc
+1000. def
+
 ================================================================================
 `;
 
@@ -2478,11 +2667,200 @@ tabWidth: 4
 6. def
 7. ghi
 
+---
+
+0. abc
+0. def
+0. ghi
+
+---
+
+1. abc
+1. def
+1. ghi
+
+---
+
+2. abc
+2. def
+2. ghi
+
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+0. abc
+1. def
+1. ghi
+
+---
+
+1. abc
+2. def
+3. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+999. abc
+145. def
+69. ghi
+
+---
+
+0. abc
+
+---
+
+1. abc
+
+---
+
+2. abc
+
+---
+
+999. abc
+
+---
+
+0. abc
+1. def
+
+---
+
+1. abc
+2. def
+
+---
+
+
+1. abc
+1. def
+
+---
+
+2. abc
+3. def
+
+---
+
+999. abc
+1. def
+
+---
+
+999. abc
+2. def
+
 =====================================output=====================================
 5. abc
 6. def
 7. ghi
 
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+1. abc
+1. def
+1. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+0. abc
+1. def
+1. ghi
+
+---
+
+1. abc
+2. def
+3. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+999. abc
+1000. def
+1001. ghi
+
+---
+
+0. abc
+
+---
+
+1. abc
+
+---
+
+2. abc
+
+---
+
+999. abc
+
+---
+
+0. abc
+1. def
+
+---
+
+1. abc
+2. def
+
+---
+
+1. abc
+1. def
+
+---
+
+2. abc
+3. def
+
+---
+
+999. abc
+1. def
+
+---
+
+999. abc
+1000. def
+
 ================================================================================
 `;
 
@@ -2498,11 +2876,200 @@ tabWidth: 999
 6. def
 7. ghi
 
+---
+
+0. abc
+0. def
+0. ghi
+
+---
+
+1. abc
+1. def
+1. ghi
+
+---
+
+2. abc
+2. def
+2. ghi
+
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+0. abc
+1. def
+1. ghi
+
+---
+
+1. abc
+2. def
+3. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+999. abc
+145. def
+69. ghi
+
+---
+
+0. abc
+
+---
+
+1. abc
+
+---
+
+2. abc
+
+---
+
+999. abc
+
+---
+
+0. abc
+1. def
+
+---
+
+1. abc
+2. def
+
+---
+
+
+1. abc
+1. def
+
+---
+
+2. abc
+3. def
+
+---
+
+999. abc
+1. def
+
+---
+
+999. abc
+2. def
+
 =====================================output=====================================
 5. abc
 6. def
 7. ghi
 
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+1. abc
+1. def
+1. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+0. abc
+1. def
+1. ghi
+
+---
+
+1. abc
+2. def
+3. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+999. abc
+1000. def
+1001. ghi
+
+---
+
+0. abc
+
+---
+
+1. abc
+
+---
+
+2. abc
+
+---
+
+999. abc
+
+---
+
+0. abc
+1. def
+
+---
+
+1. abc
+2. def
+
+---
+
+1. abc
+1. def
+
+---
+
+2. abc
+3. def
+
+---
+
+999. abc
+1. def
+
+---
+
+999. abc
+1000. def
+
 ================================================================================
 `;
 
@@ -2518,10 +3085,199 @@ tabWidth: 0
 6. def
 7. ghi
 
+---
+
+0. abc
+0. def
+0. ghi
+
+---
+
+1. abc
+1. def
+1. ghi
+
+---
+
+2. abc
+2. def
+2. ghi
+
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+0. abc
+1. def
+1. ghi
+
+---
+
+1. abc
+2. def
+3. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+999. abc
+145. def
+69. ghi
+
+---
+
+0. abc
+
+---
+
+1. abc
+
+---
+
+2. abc
+
+---
+
+999. abc
+
+---
+
+0. abc
+1. def
+
+---
+
+1. abc
+2. def
+
+---
+
+
+1. abc
+1. def
+
+---
+
+2. abc
+3. def
+
+---
+
+999. abc
+1. def
+
+---
+
+999. abc
+2. def
+
 =====================================output=====================================
 5. abc
 6. def
 7. ghi
 
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+1. abc
+1. def
+1. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+0. abc
+1. def
+1. ghi
+
+---
+
+1. abc
+2. def
+3. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+999. abc
+1000. def
+1001. ghi
+
+---
+
+0. abc
+
+---
+
+1. abc
+
+---
+
+2. abc
+
+---
+
+999. abc
+
+---
+
+0. abc
+1. def
+
+---
+
+1. abc
+2. def
+
+---
+
+1. abc
+1. def
+
+---
+
+2. abc
+3. def
+
+---
+
+999. abc
+1. def
+
+---
+
+999. abc
+1000. def
+
 ================================================================================
 `;
diff --git a/tests/markdown_list/start.md b/tests/markdown_list/start.md
index 49db6cfcc..b58f3551f 100644
--- a/tests/markdown_list/start.md
+++ b/tests/markdown_list/start.md
@@ -1,3 +1,98 @@
 5. abc
 6. def
 7. ghi
+
+---
+
+0. abc
+0. def
+0. ghi
+
+---
+
+1. abc
+1. def
+1. ghi
+
+---
+
+2. abc
+2. def
+2. ghi
+
+---
+
+0. abc
+1. def
+2. ghi
+
+---
+
+0. abc
+1. def
+1. ghi
+
+---
+
+1. abc
+2. def
+3. ghi
+
+---
+
+2. abc
+3. def
+4. ghi
+
+---
+
+999. abc
+145. def
+69. ghi
+
+---
+
+0. abc
+
+---
+
+1. abc
+
+---
+
+2. abc
+
+---
+
+999. abc
+
+---
+
+0. abc
+1. def
+
+---
+
+1. abc
+2. def
+
+---
+
+
+1. abc
+1. def
+
+---
+
+2. abc
+3. def
+
+---
+
+999. abc
+1. def
+
+---
+
+999. abc
+2. def

From e76ce2725be3a2b217579a3dcc523576c43bac0a Mon Sep 17 00:00:00 2001
From: Gustav Tiger <gustav@tiger.name>
Date: Fri, 15 Nov 2019 11:01:58 +0100
Subject: [PATCH 06/13] Fix MDX html parsing errors (#6949)

* Fix MDX html parsing errors

For MDX wrap JSX parsing in a fragment before sending it of to babel for
parsing and formatting. In MDX adjacent JSX tags are permitted in the
root.

An option sent to the babel parser omits printing the root fragment and
instead just prints its children.

Solves #6943

* an attempt to address JounQin's comments

* use <$>...</$> instead of <>...</>

* refactoring
---
 changelog_unreleased/mdx/pr-6949.md        |  43 ++++++++
 src/language-js/preprocess.js              |   3 +-
 src/language-js/printer-estree.js          |  10 +-
 src/language-markdown/embed.js             |   5 +-
 src/language-markdown/parser-markdown.js   |  25 +----
 src/language-markdown/printer-markdown.js  |  68 ++++--------
 src/language-markdown/utils.js             |  18 +---
 tests/mdx/__snapshots__/jsfmt.spec.js.snap | 117 ++++++++++++++++++++-
 tests/mdx/levels.mdx                       |  22 ++++
 9 files changed, 221 insertions(+), 90 deletions(-)
 create mode 100644 changelog_unreleased/mdx/pr-6949.md
 create mode 100644 tests/mdx/levels.mdx

diff --git a/changelog_unreleased/mdx/pr-6949.md b/changelog_unreleased/mdx/pr-6949.md
new file mode 100644
index 000000000..bf24baca1
--- /dev/null
+++ b/changelog_unreleased/mdx/pr-6949.md
@@ -0,0 +1,43 @@
+#### Fix MDX html parsing errors ([#6949](https://github.com/prettier/prettier/pull/6949) by [@Tigge](https://github.com/Tigge) & [@thorn0](https://github.com/thorn0))
+
+MDX parsing for JSX failed when encountering JSX elements that where not
+parsable as HTML. Such as `<Tag value={{a: 'b'}}>test</Tag>`
+
+<!-- prettier-ignore -->
+````md
+<!-- Input -->
+
+<Tag  value={ {a :  'b'   } }>test</ Tag>
+
+<Foo bg={ 'red' } >
+   <div  style={{   display:   'block'}   }>
+      <Bar    >hi    </Bar>
+       {  hello       }
+         {     /* another comment */}
+            </div>
+</Foo>
+
+<!-- Prettier stable -->
+
+```
+SyntaxError: Unexpected closing tag "Tag". It may happen when the tag has already been closed by another tag. For more info see https://www.w3.org/TR/html5/syntax.html#closing-elements-that-have-implied-end-tags (1:35)
+> 1 | <Tag  value={ {a :  'b'   } }>test</ Tag>
+    |                                   ^
+  2 | 
+  3 | <Foo bg={ 'red' } >
+  4 |    <div  style={{   display:   'block'}   }>
+```
+
+<!-- Prettier master -->
+
+<Tag value={{ a: "b" }}>test</Tag>
+
+<Foo bg={"red"}>
+  <div style={{ display: "block" }}>
+    <Bar>hi </Bar>
+    {hello}
+    {/* another comment */}
+  </div>
+</Foo>
+
+````
diff --git a/src/language-js/preprocess.js b/src/language-js/preprocess.js
index 57489c7b7..fc39070b8 100644
--- a/src/language-js/preprocess.js
+++ b/src/language-js/preprocess.js
@@ -10,7 +10,8 @@ function preprocess(ast, options) {
       return Object.assign({}, ast, {
         type: options.parser.startsWith("__") ? "JsExpressionRoot" : "JsonRoot",
         node: ast,
-        comments: []
+        comments: [],
+        rootMarker: options.rootMarker
       });
     default:
       return ast;
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index c9f73d0ca..df2dea511 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -5398,8 +5398,12 @@ function printJSXElement(path, options, print) {
     containsMultipleAttributes ||
     containsMultipleExpressions;
 
+  const isMdxBlock = path.getParentNode().rootMarker === "mdx";
+
   const rawJsxWhitespace = options.singleQuote ? "{' '}" : '{" "}';
-  const jsxWhitespace = ifBreak(concat([rawJsxWhitespace, softline]), " ");
+  const jsxWhitespace = isMdxBlock
+    ? concat([" "])
+    : ifBreak(concat([rawJsxWhitespace, softline]), " ");
 
   const isFacebookTranslationTag =
     n.openingElement &&
@@ -5519,6 +5523,10 @@ function printJSXElement(path, options, print) {
     ? fill(multilineChildren)
     : group(concat(multilineChildren), { shouldBreak: true });
 
+  if (isMdxBlock) {
+    return content;
+  }
+
   const multiLineElem = group(
     concat([
       openingLines,
diff --git a/src/language-markdown/embed.js b/src/language-markdown/embed.js
index bd5339131..d06de68f6 100644
--- a/src/language-markdown/embed.js
+++ b/src/language-markdown/embed.js
@@ -57,7 +57,10 @@ function embed(path, print, textToDoc, options) {
     case "importExport":
       return textToDoc(node.value, { parser: "babel" });
     case "jsx":
-      return textToDoc(node.value, { parser: "__js_expression" });
+      return textToDoc(`<$>${node.value}</$>`, {
+        parser: "__js_expression",
+        rootMarker: "mdx"
+      });
   }
 
   return null;
diff --git a/src/language-markdown/parser-markdown.js b/src/language-markdown/parser-markdown.js
index 30b0b41b0..5a33dc8a2 100644
--- a/src/language-markdown/parser-markdown.js
+++ b/src/language-markdown/parser-markdown.js
@@ -7,7 +7,6 @@ const parseFrontMatter = require("../utils/front-matter");
 const { mapAst, INLINE_NODE_WRAPPER_TYPES } = require("./utils");
 const mdx = require("./mdx");
 const remarkMath = require("remark-math");
-const htmlParser = require("../language-html/parser-html").parsers.html;
 
 /**
  * based on [MDAST](https://github.com/syntax-tree/mdast) with following modifications:
@@ -60,29 +59,7 @@ function htmlToJsx() {
         return node;
       }
 
-      const nodes = htmlParser.parse(node.value).children;
-
-      // find out if there are adjacent JSX elements which should be allowed in mdx alike in markdown
-      if (nodes.length <= 1) {
-        return Object.assign({}, node, { type: "jsx" });
-      }
-
-      return nodes.reduce((newNodes, { sourceSpan: position, type }) => {
-        const value = node.value.slice(
-          position.start.offset,
-          position.end.offset
-        );
-
-        if (value) {
-          newNodes.push({
-            type: type === "element" ? "jsx" : type,
-            value,
-            position
-          });
-        }
-
-        return newNodes;
-      }, []);
+      return Object.assign({}, node, { type: "jsx" });
     });
 }
 
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index b4effa98f..dc588f1ce 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -35,12 +35,7 @@ const { replaceEndOfLineWith } = require("../common/util");
 
 const TRAILING_HARDLINE_NODES = ["importExport"];
 const SINGLE_LINE_NODE_TYPES = ["heading", "tableCell", "link"];
-const SIBLING_NODE_TYPES = [
-  "listItem",
-  "definition",
-  "footnoteDefinition",
-  "jsx"
-];
+const SIBLING_NODE_TYPES = ["listItem", "definition", "footnoteDefinition"];
 
 function genericPrint(path, options, print) {
   const node = path.getValue();
@@ -769,55 +764,35 @@ function isPrettierIgnore(node) {
   return match === null ? false : match[1] ? match[1] : "next";
 }
 
-function isInlineNode(node) {
-  return node && INLINE_NODE_TYPES.indexOf(node.type) !== -1;
-}
-
-function isEndsWithHardLine(node) {
-  return node && /\n+$/.test(node.value);
-}
-
-function last(nodes) {
-  return nodes && nodes[nodes.length - 1];
-}
-
-function shouldNotPrePrintHardline(node, { parentNode, parts, prevNode }) {
-  const isFirstNode = parts.length === 0;
+function shouldNotPrePrintHardline(node, data) {
+  const isFirstNode = data.parts.length === 0;
+  const isInlineNode = INLINE_NODE_TYPES.indexOf(node.type) !== -1;
 
   const isInlineHTML =
     node.type === "html" &&
-    INLINE_NODE_WRAPPER_TYPES.indexOf(parentNode.type) !== -1;
+    INLINE_NODE_WRAPPER_TYPES.indexOf(data.parentNode.type) !== -1;
 
-  const isAfterHardlineNode =
-    prevNode &&
-    (isEndsWithHardLine(prevNode) ||
-      isEndsWithHardLine(last(prevNode.children)));
-
-  return (
-    isFirstNode || isInlineNode(node) || isInlineHTML || isAfterHardlineNode
-  );
+  return isFirstNode || isInlineNode || isInlineHTML;
 }
 
-function shouldPrePrintDoubleHardline(node, { parentNode, prevNode }) {
-  const prevNodeType = prevNode && prevNode.type;
-  const nodeType = node.type;
-
-  const isSequence = prevNodeType === nodeType;
+function shouldPrePrintDoubleHardline(node, data) {
+  const isSequence = (data.prevNode && data.prevNode.type) === node.type;
   const isSiblingNode =
-    isSequence && SIBLING_NODE_TYPES.indexOf(nodeType) !== -1;
+    isSequence && SIBLING_NODE_TYPES.indexOf(node.type) !== -1;
 
-  const isInTightListItem = parentNode.type === "listItem" && !parentNode.loose;
-  const isPrevNodeLooseListItem = prevNodeType === "listItem" && prevNode.loose;
-  const isPrevNodePrettierIgnore = isPrettierIgnore(prevNode) === "next";
+  const isInTightListItem =
+    data.parentNode.type === "listItem" && !data.parentNode.loose;
+
+  const isPrevNodeLooseListItem =
+    data.prevNode && data.prevNode.type === "listItem" && data.prevNode.loose;
+
+  const isPrevNodePrettierIgnore = isPrettierIgnore(data.prevNode) === "next";
 
   const isBlockHtmlWithoutBlankLineBetweenPrevHtml =
-    nodeType === "html" &&
-    prevNodeType === "html" &&
-    prevNode.position.end.line + 1 === node.position.start.line;
-
-  const isJsxInlineSibling =
-    (prevNodeType === "jsx" && isInlineNode(node)) ||
-    (nodeType === "jsx" && isInlineNode(prevNode));
+    node.type === "html" &&
+    data.prevNode &&
+    data.prevNode.type === "html" &&
+    data.prevNode.position.end.line + 1 === node.position.start.line;
 
   return (
     isPrevNodeLooseListItem ||
@@ -825,8 +800,7 @@ function shouldPrePrintDoubleHardline(node, { parentNode, prevNode }) {
       isSiblingNode ||
       isInTightListItem ||
       isPrevNodePrettierIgnore ||
-      isBlockHtmlWithoutBlankLineBetweenPrevHtml ||
-      isJsxInlineSibling
+      isBlockHtmlWithoutBlankLineBetweenPrevHtml
     )
   );
 }
diff --git a/src/language-markdown/utils.js b/src/language-markdown/utils.js
index 9fd68f037..dd1f00528 100644
--- a/src/language-markdown/utils.js
+++ b/src/language-markdown/utils.js
@@ -230,21 +230,11 @@ function mapAst(ast, handler) {
   return (function preorder(node, index, parentStack) {
     parentStack = parentStack || [];
 
-    let newNode = handler(node, index, parentStack);
-    if (Array.isArray(newNode)) {
-      return newNode;
-    }
-
-    newNode = Object.assign({}, newNode);
+    const newNode = Object.assign({}, handler(node, index, parentStack));
     if (newNode.children) {
-      newNode.children = newNode.children.reduce((nodes, child, index) => {
-        let newNodes = preorder(child, index, [newNode].concat(parentStack));
-        if (!Array.isArray(newNodes)) {
-          newNodes = [newNodes];
-        }
-        nodes.push.apply(nodes, newNodes);
-        return nodes;
-      }, []);
+      newNode.children = newNode.children.map((child, index) => {
+        return preorder(child, index, [newNode].concat(parentStack));
+      });
     }
 
     return newNode;
diff --git a/tests/mdx/__snapshots__/jsfmt.spec.js.snap b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
index 942f1e22a..f5dc83bc8 100644
--- a/tests/mdx/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
@@ -276,7 +276,8 @@ printWidth: 80
 
 <Hello>
   test <World /> test
-</Hello>123
+</Hello>
+123
 
 ---
 
@@ -352,7 +353,8 @@ semi: false
 
 <Hello>
   test <World /> test
-</Hello>123
+</Hello>
+123
 
 ---
 
@@ -438,6 +440,117 @@ const a = 1
 ================================================================================
 `;
 
+exports[`levels.mdx 1`] = `
+====================================options=====================================
+parsers: ["mdx"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+import     {     Foo,  Bar } from     './Fixture'
+
+# Hello,    world!
+
+<Foo bg='red'>
+   <div style={{   display:   'block'}   }>
+      <Bar    >hi    </Bar>
+       {  hello       }
+       {     /* another comment */}
+       </div>
+</Foo>
+
+asdfsdf <strong style={{fontWeight: 'bolder'}}>asdfasdf</strong>
+
+<Foo/>
+test
+
+<ul>
+      <li   >item    {' '} </li>
+      <li/>
+        </ul >
+
+
+=====================================output=====================================
+import { Foo, Bar } from "./Fixture";
+
+# Hello, world!
+
+<Foo bg="red">
+  <div style={{ display: "block" }}>
+    <Bar>hi </Bar>
+    {hello}
+    {/* another comment */}
+  </div>
+</Foo>
+
+asdfsdf <strong style={{fontWeight: 'bolder'}}>asdfasdf</strong>
+
+<Foo />
+test
+
+<ul>
+  <li>item </li>
+  <li />
+</ul>
+
+================================================================================
+`;
+
+exports[`levels.mdx 2`] = `
+====================================options=====================================
+parsers: ["mdx"]
+printWidth: 80
+semi: false
+                                                                                | printWidth
+=====================================input======================================
+import     {     Foo,  Bar } from     './Fixture'
+
+# Hello,    world!
+
+<Foo bg='red'>
+   <div style={{   display:   'block'}   }>
+      <Bar    >hi    </Bar>
+       {  hello       }
+       {     /* another comment */}
+       </div>
+</Foo>
+
+asdfsdf <strong style={{fontWeight: 'bolder'}}>asdfasdf</strong>
+
+<Foo/>
+test
+
+<ul>
+      <li   >item    {' '} </li>
+      <li/>
+        </ul >
+
+
+=====================================output=====================================
+import { Foo, Bar } from "./Fixture"
+
+# Hello, world!
+
+<Foo bg="red">
+  <div style={{ display: "block" }}>
+    <Bar>hi </Bar>
+    {hello}
+    {/* another comment */}
+  </div>
+</Foo>
+
+asdfsdf <strong style={{fontWeight: 'bolder'}}>asdfasdf</strong>
+
+<Foo />
+test
+
+<ul>
+  <li>item </li>
+  <li />
+</ul>
+
+================================================================================
+`;
+
 exports[`mixed.mdx 1`] = `
 ====================================options=====================================
 parsers: ["mdx"]
diff --git a/tests/mdx/levels.mdx b/tests/mdx/levels.mdx
new file mode 100644
index 000000000..b036a001d
--- /dev/null
+++ b/tests/mdx/levels.mdx
@@ -0,0 +1,22 @@
+import     {     Foo,  Bar } from     './Fixture'
+
+# Hello,    world!
+
+<Foo bg='red'>
+   <div style={{   display:   'block'}   }>
+      <Bar    >hi    </Bar>
+       {  hello       }
+       {     /* another comment */}
+       </div>
+</Foo>
+
+asdfsdf <strong style={{fontWeight: 'bolder'}}>asdfasdf</strong>
+
+<Foo/>
+test
+
+<ul>
+      <li   >item    {' '} </li>
+      <li/>
+        </ul >
+

From a9217a76e568bb2b840b4143d21526ddab12aa17 Mon Sep 17 00:00:00 2001
From: Evilebot Tnawi <evilebottnawi@users.noreply.github.com>
Date: Fri, 15 Nov 2019 13:10:13 +0300
Subject: [PATCH 07/13] fix: tests for empty type parameters in TS (#6960)

---
 .../__snapshots__/jsfmt.spec.js.snap          | 51 +++++++++++++++++++
 tests/typescript_error_recovery/generic.ts    | 19 +++++++
 tests/typescript_error_recovery/jsfmt.spec.js |  1 +
 3 files changed, 71 insertions(+)
 create mode 100644 tests/typescript_error_recovery/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/typescript_error_recovery/generic.ts
 create mode 100644 tests/typescript_error_recovery/jsfmt.spec.js

diff --git a/tests/typescript_error_recovery/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_error_recovery/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..e37181540
--- /dev/null
+++ b/tests/typescript_error_recovery/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,51 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`generic.ts 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+f1<>();
+
+new f2<>();
+
+function f3<>() {}
+
+class f4 {
+    constructor<>() {}
+}
+
+const f5 = function<>() {}
+
+interface f6<> {
+    test<>();
+}
+
+class f7<> {
+    test<>() {}
+}
+
+=====================================output=====================================
+f1<>();
+
+new f2<>();
+
+function f3<>() {}
+
+class f4 {
+  constructor<>() {}
+}
+
+const f5 = function<>() {};
+
+interface f6<> {
+  test<>();
+}
+
+class f7<> {
+  test<>() {}
+}
+
+================================================================================
+`;
diff --git a/tests/typescript_error_recovery/generic.ts b/tests/typescript_error_recovery/generic.ts
new file mode 100644
index 000000000..aa18ea0f9
--- /dev/null
+++ b/tests/typescript_error_recovery/generic.ts
@@ -0,0 +1,19 @@
+f1<>();
+
+new f2<>();
+
+function f3<>() {}
+
+class f4 {
+    constructor<>() {}
+}
+
+const f5 = function<>() {}
+
+interface f6<> {
+    test<>();
+}
+
+class f7<> {
+    test<>() {}
+}
diff --git a/tests/typescript_error_recovery/jsfmt.spec.js b/tests/typescript_error_recovery/jsfmt.spec.js
new file mode 100644
index 000000000..2ea3bb6eb
--- /dev/null
+++ b/tests/typescript_error_recovery/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["typescript"]);

From 57f0dd56dd63c5546ff902dbd006fdb7a2ef3e48 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sun, 17 Nov 2019 18:06:14 +0800
Subject: [PATCH 08/13] Replace `indexOf` with `includes` (#6967)

* Replace `indexOf` with `includes`

* Add `unicorn/prefer-includes`
---
 .eslintrc.yml                              |   2 +
 package.json                               |   1 +
 src/cli/util.js                            |   7 +-
 src/common/util.js                         |   2 +-
 src/language-css/clean.js                  |   6 +-
 src/language-css/parser-postcss.js         |   4 +-
 src/language-css/printer-postcss.js        |   4 +-
 src/language-css/utils.js                  |  31 ++--
 src/language-handlebars/printer-glimmer.js |   8 +-
 src/language-html/printer-html.js          |   2 +-
 src/language-html/utils.js                 |  10 +-
 src/language-js/pragma.js                  |   2 +-
 src/language-js/printer-estree.js          |   4 +-
 src/language-js/utils.js                   |   2 +-
 src/language-markdown/embed.js             |   2 +-
 src/language-markdown/parser-markdown.js   |   2 +-
 src/language-markdown/printer-markdown.js  |  13 +-
 src/language-yaml/printer-yaml.js          |   2 +-
 src/language-yaml/utils.js                 |   2 +-
 src/main/core.js                           |   8 +-
 src/main/options-normalizer.js             |   4 +-
 src/main/options.js                        |   4 +-
 src/main/range-util.js                     |   6 +-
 src/main/support.js                        |   2 +-
 tests_integration/path-serializer.js       |   4 +-
 website/playground/urlHash.js              |   7 +-
 yarn.lock                                  | 178 ++++++++++++++++++++-
 27 files changed, 242 insertions(+), 77 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 5ddea1bff..927262197 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -10,6 +10,7 @@ parserOptions:
   ecmaVersion: 2017
 plugins:
   - import
+  - unicorn
 rules:
   curly: error
   import/no-extraneous-dependencies:
@@ -34,3 +35,4 @@ rules:
     - error
     - never
     - exceptRange: true
+  unicorn/prefer-includes: error
diff --git a/package.json b/package.json
index 10f16b0aa..12603ebaf 100644
--- a/package.json
+++ b/package.json
@@ -89,6 +89,7 @@
     "eslint-plugin-import": "2.18.2",
     "eslint-plugin-prettier": "3.1.1",
     "eslint-plugin-react": "7.16.0",
+    "eslint-plugin-unicorn": "13.0.0",
     "execa": "3.2.0",
     "jest": "23.3.0",
     "jest-junit": "9.0.0",
diff --git a/src/cli/util.js b/src/cli/util.js
index e419a11ec..e5134a675 100644
--- a/src/cli/util.js
+++ b/src/cli/util.js
@@ -600,8 +600,7 @@ function createUsage(context) {
   const lastCategories = constant.categoryOrder.slice(-1);
   const restCategories = Object.keys(groupedOptions).filter(
     category =>
-      firstCategories.indexOf(category) === -1 &&
-      lastCategories.indexOf(category) === -1
+      !firstCategories.includes(category) && !lastCategories.includes(category)
   );
   const allCategories = firstCategories.concat(restCategories, lastCategories);
 
@@ -990,9 +989,7 @@ function updateContextArgv(context, plugins, pluginSearchDirs) {
 function normalizeContextArgv(context, keys) {
   const detailedOptions = !keys
     ? context.detailedOptions
-    : context.detailedOptions.filter(
-        option => keys.indexOf(option.name) !== -1
-      );
+    : context.detailedOptions.filter(option => keys.includes(option.name));
   const argv = !keys ? context.argv : pick(context.argv, keys);
 
   context.argv = optionsNormalizer.normalizeCliOptions(argv, detailedOptions, {
diff --git a/src/common/util.js b/src/common/util.js
index 9f13f83c6..4a5667bda 100644
--- a/src/common/util.js
+++ b/src/common/util.js
@@ -64,7 +64,7 @@ function skip(chars) {
         if (!chars.test(c)) {
           return cursor;
         }
-      } else if (chars.indexOf(c) === -1) {
+      } else if (!chars.includes(c)) {
         return cursor;
       }
 
diff --git a/src/language-css/clean.js b/src/language-css/clean.js
index 054428ce7..fcfee341b 100644
--- a/src/language-css/clean.js
+++ b/src/language-css/clean.js
@@ -63,9 +63,9 @@ function clean(ast, newObj, parent) {
   if (
     (ast.type === "value-word" &&
       ((ast.isColor && ast.isHex) ||
-        ["initial", "inherit", "unset", "revert"].indexOf(
+        ["initial", "inherit", "unset", "revert"].includes(
           newObj.value.replace().toLowerCase()
-        ) !== -1)) ||
+        ))) ||
     ast.type === "media-feature" ||
     ast.type === "selector-root-invalid" ||
     ast.type === "selector-pseudo"
@@ -140,7 +140,7 @@ function clean(ast, newObj, parent) {
   if (ast.type === "selector-tag") {
     const lowercasedValue = ast.value.toLowerCase();
 
-    if (["from", "to"].indexOf(lowercasedValue) !== -1) {
+    if (["from", "to"].includes(lowercasedValue)) {
       newObj.value = lowercasedValue;
     }
   }
diff --git a/src/language-css/parser-postcss.js b/src/language-css/parser-postcss.js
index 447a8593e..d0e2287c4 100644
--- a/src/language-css/parser-postcss.js
+++ b/src/language-css/parser-postcss.js
@@ -442,7 +442,7 @@ function parseNestedCSS(node, options) {
           "return",
           "define-mixin",
           "add-mixin"
-        ].indexOf(name) !== -1
+        ].includes(name)
       ) {
         // Remove unnecessary spaces in SCSS variable arguments
         params = params.replace(/(\$\S+?)\s+?\.\.\./, "$1...");
@@ -465,7 +465,7 @@ function parseNestedCSS(node, options) {
         return node;
       }
 
-      if (["media", "custom-media"].indexOf(lowercasedName) !== -1) {
+      if (["media", "custom-media"].includes(lowercasedName)) {
         if (params.includes("#{")) {
           // Workaround for media at rule with scss interpolation
           return {
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index b2b57ab00..722311ed8 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -118,7 +118,7 @@ function genericPrint(path, options, print) {
       const rawText = node.raws.text || node.text;
       // Workaround a bug where the location is off.
       // https://github.com/postcss/postcss-scss/issues/63
-      if (text.indexOf(rawText) === -1) {
+      if (!text.includes(rawText)) {
         if (node.raws.inline) {
           return concat(["// ", rawText]);
         }
@@ -512,7 +512,7 @@ function genericPrint(path, options, print) {
         // Ignore escape `\`
         if (
           iNode.value &&
-          iNode.value.indexOf("\\") !== -1 &&
+          iNode.value.includes("\\") &&
           iNextNode &&
           iNextNode.type !== "value-comment"
         ) {
diff --git a/src/language-css/utils.js b/src/language-css/utils.js
index a45e666ca..cb8583448 100644
--- a/src/language-css/utils.js
+++ b/src/language-css/utils.js
@@ -35,7 +35,7 @@ function getAncestorCounter(path, typeOrTypes) {
   let ancestorNode;
 
   while ((ancestorNode = path.getParentNode(++counter))) {
-    if (types.indexOf(ancestorNode.type) !== -1) {
+    if (types.includes(ancestorNode.type)) {
       return counter;
     }
   }
@@ -67,9 +67,8 @@ function isSCSS(parser, text) {
 }
 
 function isWideKeywords(value) {
-  return (
-    ["initial", "inherit", "unset", "revert"].indexOf(value.toLowerCase()) !==
-    -1
+  return ["initial", "inherit", "unset", "revert"].includes(
+    value.toLowerCase()
   );
 }
 
@@ -79,7 +78,7 @@ function isKeyframeAtRuleKeywords(path, value) {
     atRuleAncestorNode &&
     atRuleAncestorNode.name &&
     atRuleAncestorNode.name.toLowerCase().endsWith("keyframes") &&
-    ["from", "to"].indexOf(value.toLowerCase()) !== -1
+    ["from", "to"].includes(value.toLowerCase())
   );
 }
 
@@ -122,7 +121,7 @@ function insideAtRuleNode(path, atRuleNameOrAtRuleNames) {
 
   return (
     atRuleAncestorNode &&
-    atRuleNames.indexOf(atRuleAncestorNode.name.toLowerCase()) !== -1
+    atRuleNames.includes(atRuleAncestorNode.name.toLowerCase())
   );
 }
 
@@ -168,14 +167,13 @@ function isDetachedRulesetDeclarationNode(node) {
 function isForKeywordNode(node) {
   return (
     node.type === "value-word" &&
-    ["from", "through", "end"].indexOf(node.value) !== -1
+    ["from", "through", "end"].includes(node.value)
   );
 }
 
 function isIfElseKeywordNode(node) {
   return (
-    node.type === "value-word" &&
-    ["and", "or", "not"].indexOf(node.value) !== -1
+    node.type === "value-word" && ["and", "or", "not"].includes(node.value)
   );
 }
 
@@ -214,20 +212,19 @@ function isMathOperatorNode(node) {
 }
 
 function isEqualityOperatorNode(node) {
-  return node.type === "value-word" && ["==", "!="].indexOf(node.value) !== -1;
+  return node.type === "value-word" && ["==", "!="].includes(node.value);
 }
 
 function isRelationalOperatorNode(node) {
   return (
-    node.type === "value-word" &&
-    ["<", ">", "<=", ">="].indexOf(node.value) !== -1
+    node.type === "value-word" && ["<", ">", "<=", ">="].includes(node.value)
   );
 }
 
 function isSCSSControlDirectiveNode(node) {
   return (
     node.type === "css-atrule" &&
-    ["if", "else", "for", "each", "while"].indexOf(node.name) !== -1
+    ["if", "else", "for", "each", "while"].includes(node.name)
   );
 }
 
@@ -363,7 +360,7 @@ function isRightCurlyBraceNode(node) {
 }
 
 function isWordNode(node) {
-  return ["value-word", "value-atword"].indexOf(node.type) !== -1;
+  return ["value-word", "value-atword"].includes(node.type);
 }
 
 function isColonNode(node) {
@@ -371,9 +368,7 @@ function isColonNode(node) {
 }
 
 function isMediaAndSupportsKeywords(node) {
-  return (
-    node.value && ["not", "and", "or"].indexOf(node.value.toLowerCase()) !== -1
-  );
+  return node.value && ["not", "and", "or"].includes(node.value.toLowerCase());
 }
 
 function isColorAdjusterFuncNode(node) {
@@ -381,7 +376,7 @@ function isColorAdjusterFuncNode(node) {
     return false;
   }
 
-  return colorAdjusterFunctions.indexOf(node.value.toLowerCase()) !== -1;
+  return colorAdjusterFunctions.includes(node.value.toLowerCase());
 }
 
 module.exports = {
diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 55631ea7b..6fd2a9abf 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -68,7 +68,7 @@ function print(path, options, print) {
     }
     case "ElementNode": {
       const tagFirstChar = n.tag[0];
-      const isLocal = n.tag.indexOf(".") !== -1;
+      const isLocal = n.tag.includes(".");
       const isGlimmerComponent =
         tagFirstChar.toUpperCase() === tagFirstChar || isLocal;
       const hasChildren = n.children.length > 0;
@@ -79,7 +79,7 @@ function print(path, options, print) {
 
       const isVoid =
         (isGlimmerComponent && (!hasChildren || !hasNonWhitespaceChildren)) ||
-        voidTags.indexOf(n.tag) !== -1;
+        voidTags.includes(n.tag);
       const closeTagForNoBreak = isVoid ? concat([" />", softline]) : ">";
       const closeTagForBreak = isVoid ? "/>" : ">";
       const getParams = (path, print) =>
@@ -275,7 +275,7 @@ function print(path, options, print) {
 
       // preserve a space inside of an attribute node where whitespace present,
       // when next to mustache statement.
-      const inAttrNode = path.stack.indexOf("attributes") >= 0;
+      const inAttrNode = path.stack.includes("attributes");
       if (inAttrNode) {
         const parentNode = path.getParentNode(0);
         const isConcat = parentNode.type === "ConcatStatement";
@@ -334,7 +334,7 @@ function print(path, options, print) {
       );
     }
     case "MustacheCommentStatement": {
-      const dashes = n.value.indexOf("}}") > -1 ? "--" : "";
+      const dashes = n.value.includes("}}") ? "--" : "";
       return concat(["{{!", dashes, n.value, dashes, "}}"]);
     }
     case "PathExpression": {
diff --git a/src/language-html/printer-html.js b/src/language-html/printer-html.js
index ebf2ce56b..02e45f3a3 100644
--- a/src/language-html/printer-html.js
+++ b/src/language-html/printer-html.js
@@ -631,7 +631,7 @@ function printOpeningTag(path, options, print) {
                     typeof ignoreAttributeData === "boolean"
                       ? () => ignoreAttributeData
                       : Array.isArray(ignoreAttributeData)
-                      ? attr => ignoreAttributeData.indexOf(attr.rawName) !== -1
+                      ? attr => ignoreAttributeData.includes(attr.rawName)
                       : () => false;
                   return path.map(attrPath => {
                     const attr = attrPath.getValue();
diff --git a/src/language-html/utils.js b/src/language-html/utils.js
index 0b7827312..a923aeb8e 100644
--- a/src/language-html/utils.js
+++ b/src/language-html/utils.js
@@ -62,13 +62,13 @@ function shouldPreserveContent(node, options) {
     options.parser === "vue" &&
     node.type === "element" &&
     node.parent.type === "root" &&
-    [
+    ![
       "template",
       "style",
       "script",
       // vue parser can be used for vue dom template as well, so we should still format top-level <html>
       "html"
-    ].indexOf(node.fullName) === -1
+    ].includes(node.fullName)
   ) {
     return true;
   }
@@ -272,7 +272,7 @@ function forceBreakContent(node) {
     forceBreakChildren(node) ||
     (node.type === "element" &&
       node.children.length !== 0 &&
-      (["body", "script", "style"].indexOf(node.name) !== -1 ||
+      (["body", "script", "style"].includes(node.name) ||
         node.children.some(child => hasNonTextChild(child)))) ||
     (node.firstChild &&
       node.firstChild === node.lastChild &&
@@ -287,7 +287,7 @@ function forceBreakChildren(node) {
   return (
     node.type === "element" &&
     node.children.length !== 0 &&
-    (["html", "head", "ul", "ol", "select"].indexOf(node.name) !== -1 ||
+    (["html", "head", "ul", "ol", "select"].includes(node.name) ||
       (node.cssDisplay.startsWith("table") && node.cssDisplay !== "table-cell"))
   );
 }
@@ -339,7 +339,7 @@ function preferHardlineAsSurroundingSpaces(node) {
     case "directive":
       return true;
     case "element":
-      return ["script", "select"].indexOf(node.name) !== -1;
+      return ["script", "select"].includes(node.name);
   }
   return false;
 }
diff --git a/src/language-js/pragma.js b/src/language-js/pragma.js
index 6bd14660c..ca67d5cc9 100644
--- a/src/language-js/pragma.js
+++ b/src/language-js/pragma.js
@@ -4,7 +4,7 @@ const docblock = require("jest-docblock");
 
 function hasPragma(text) {
   const pragmas = Object.keys(docblock.parse(docblock.extract(text)));
-  return pragmas.indexOf("prettier") !== -1 || pragmas.indexOf("format") !== -1;
+  return pragmas.includes("prettier") || pragmas.includes("format");
 }
 
 function insertPragma(text) {
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index df2dea511..bc61c4a51 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -3909,11 +3909,11 @@ function printJestEachTemplateLiteral(node, expressions, options) {
       const correspondingExpression = stringifiedExpressions[i - 1];
 
       row.cells.push(correspondingExpression);
-      if (correspondingExpression.indexOf("\n") !== -1) {
+      if (correspondingExpression.includes("\n")) {
         row.hasLineBreak = true;
       }
 
-      if (node.quasis[i].value.raw.indexOf("\n") !== -1) {
+      if (node.quasis[i].value.raw.includes("\n")) {
         tableBody.push({ hasLineBreak: false, cells: [] });
       }
     }
diff --git a/src/language-js/utils.js b/src/language-js/utils.js
index 6fb301d56..fb51d4f2d 100644
--- a/src/language-js/utils.js
+++ b/src/language-js/utils.js
@@ -298,7 +298,7 @@ function isSimpleFlowType(node) {
 
   return (
     node &&
-    flowTypeAnnotations.indexOf(node.type) !== -1 &&
+    flowTypeAnnotations.includes(node.type) &&
     !(node.type === "GenericTypeAnnotation" && node.typeParameters)
   );
 }
diff --git a/src/language-markdown/embed.js b/src/language-markdown/embed.js
index d06de68f6..29261f35e 100644
--- a/src/language-markdown/embed.js
+++ b/src/language-markdown/embed.js
@@ -72,7 +72,7 @@ function embed(path, print, textToDoc, options) {
     const language = supportInfo.languages.find(
       language =>
         language.name.toLowerCase() === lang ||
-        (language.aliases && language.aliases.indexOf(lang) !== -1) ||
+        (language.aliases && language.aliases.includes(lang)) ||
         (language.extensions &&
           language.extensions.find(ext => ext.substring(1) === lang))
     );
diff --git a/src/language-markdown/parser-markdown.js b/src/language-markdown/parser-markdown.js
index 5a33dc8a2..2881da96d 100644
--- a/src/language-markdown/parser-markdown.js
+++ b/src/language-markdown/parser-markdown.js
@@ -54,7 +54,7 @@ function htmlToJsx() {
       if (
         node.type !== "html" ||
         node.value.match(mdx.COMMENT_REGEX) ||
-        INLINE_NODE_WRAPPER_TYPES.indexOf(parent.type) !== -1
+        INLINE_NODE_WRAPPER_TYPES.includes(parent.type)
       ) {
         return node;
       }
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index dc588f1ce..d00487ed4 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -65,7 +65,7 @@ function genericPrint(path, options, print) {
       }
       return concat([
         normalizeDoc(printRoot(path, options, print)),
-        TRAILING_HARDLINE_NODES.indexOf(getLastDescendantNode(node).type) === -1
+        !TRAILING_HARDLINE_NODES.includes(getLastDescendantNode(node).type)
           ? hardline
           : ""
       ]);
@@ -482,7 +482,7 @@ function getAncestorCounter(path, typeOrTypes) {
   let ancestorNode;
 
   while ((ancestorNode = path.getParentNode(++counter))) {
-    if (types.indexOf(ancestorNode.type) !== -1) {
+    if (types.includes(ancestorNode.type)) {
       return counter;
     }
   }
@@ -717,7 +717,7 @@ function printChildren(path, options, print, events) {
 
         if (
           lastChildNode &&
-          TRAILING_HARDLINE_NODES.indexOf(lastChildNode.type) !== -1
+          TRAILING_HARDLINE_NODES.includes(lastChildNode.type)
         ) {
           if (shouldPrePrintTripleHardline(childNode, data)) {
             parts.push(hardline);
@@ -766,19 +766,18 @@ function isPrettierIgnore(node) {
 
 function shouldNotPrePrintHardline(node, data) {
   const isFirstNode = data.parts.length === 0;
-  const isInlineNode = INLINE_NODE_TYPES.indexOf(node.type) !== -1;
+  const isInlineNode = INLINE_NODE_TYPES.includes(node.type);
 
   const isInlineHTML =
     node.type === "html" &&
-    INLINE_NODE_WRAPPER_TYPES.indexOf(data.parentNode.type) !== -1;
+    INLINE_NODE_WRAPPER_TYPES.includes(data.parentNode.type);
 
   return isFirstNode || isInlineNode || isInlineHTML;
 }
 
 function shouldPrePrintDoubleHardline(node, data) {
   const isSequence = (data.prevNode && data.prevNode.type) === node.type;
-  const isSiblingNode =
-    isSequence && SIBLING_NODE_TYPES.indexOf(node.type) !== -1;
+  const isSiblingNode = isSequence && SIBLING_NODE_TYPES.includes(node.type);
 
   const isInTightListItem =
     data.parentNode.type === "listItem" && !data.parentNode.loose;
diff --git a/src/language-yaml/printer-yaml.js b/src/language-yaml/printer-yaml.js
index 96d757a2b..8ab01f211 100644
--- a/src/language-yaml/printer-yaml.js
+++ b/src/language-yaml/printer-yaml.js
@@ -670,7 +670,7 @@ function isAbsolutelyPrintedAsSingleLineNode(node, options) {
 
   switch (options.proseWrap) {
     case "never":
-      return node.value.indexOf("\n") === -1;
+      return !node.value.includes("\n");
     case "always":
       return !/[\n ]/.test(node.value);
     // istanbul ignore next
diff --git a/src/language-yaml/utils.js b/src/language-yaml/utils.js
index 4a1e8d74c..8990f05c2 100644
--- a/src/language-yaml/utils.js
+++ b/src/language-yaml/utils.js
@@ -22,7 +22,7 @@ function isNode(value, types) {
   return (
     value &&
     typeof value.type === "string" &&
-    (!types || types.indexOf(value.type) !== -1)
+    (!types || types.includes(value.type))
   );
 }
 
diff --git a/src/main/core.js b/src/main/core.js
index 0f37afe6a..4d6e98a61 100644
--- a/src/main/core.js
+++ b/src/main/core.js
@@ -90,7 +90,7 @@ function coreFormat(text, opts, addAlignmentSize) {
     opts.endOfLine === "lf"
       ? doc
       : mapDoc(doc, currentDoc =>
-          typeof currentDoc === "string" && currentDoc.indexOf("\n") !== -1
+          typeof currentDoc === "string" && currentDoc.includes("\n")
             ? currentDoc.replace(/\n/g, eol)
             : currentDoc
         ),
@@ -167,7 +167,7 @@ function coreFormat(text, opts, addAlignmentSize) {
     let cursorOffset = newCursorNodeStart;
     for (const entry of cursorNodeDiff) {
       if (entry.removed) {
-        if (entry.value.indexOf(CURSOR) > -1) {
+        if (entry.value.includes(CURSOR)) {
           break;
         }
       } else {
@@ -293,7 +293,7 @@ function format(text, opts) {
   const hasRangeEnd = opts.rangeEnd < text.length;
 
   // get rid of CR/CRLF parsing
-  if (text.indexOf("\r") !== -1) {
+  if (text.includes("\r")) {
     const offsetKeys = [
       hasCursor && "cursorOffset",
       hasRangeStart && "rangeStart",
@@ -372,7 +372,7 @@ module.exports = {
 
   parse(text, opts, massage) {
     opts = normalizeOptions(opts);
-    if (text.indexOf("\r") !== -1) {
+    if (text.includes("\r")) {
       text = text.replace(/\r\n?/g, "\n");
     }
     const parsed = parser.parse(text, opts);
diff --git a/src/main/options-normalizer.js b/src/main/options-normalizer.js
index a46a579df..73c8eb695 100644
--- a/src/main/options-normalizer.js
+++ b/src/main/options-normalizer.js
@@ -26,7 +26,7 @@ class FlagSchema extends vnopts.ChoiceSchema {
     if (
       typeof value === "string" &&
       value.length !== 0 &&
-      this._flags.indexOf(value) === -1
+      !this._flags.includes(value)
     ) {
       const suggestion = this._flags.find(flag => leven(flag, value) < 3);
       if (suggestion) {
@@ -57,7 +57,7 @@ function normalizeOptions(
     ? vnopts.levenUnknownHandler
     : Array.isArray(passThrough)
     ? (key, value) =>
-        passThrough.indexOf(key) === -1 ? undefined : { [key]: value }
+        !passThrough.includes(key) ? undefined : { [key]: value }
     : (key, value) => ({ [key]: value });
 
   const descriptor = isCLI ? cliDescriptor : vnopts.apiDescriptor;
diff --git a/src/main/options.js b/src/main/options.js
index 0e01509c0..ebddeaa14 100644
--- a/src/main/options.js
+++ b/src/main/options.js
@@ -176,9 +176,9 @@ function inferParser(filepath, plugins) {
         language.extensions.some(extension => filename.endsWith(extension))) ||
         (language.filenames &&
           language.filenames.find(name => name.toLowerCase() === filename)) ||
-        (filename.indexOf(".") === -1 &&
+        (!filename.includes(".") &&
           language.interpreters &&
-          language.interpreters.indexOf(getInterpreter(filepath)) !== -1))
+          language.interpreters.includes(getInterpreter(filepath))))
   );
 
   return language && language.parsers[0];
diff --git a/src/main/range-util.js b/src/main/range-util.js
index ac80f89bd..657a52f97 100644
--- a/src/main/range-util.js
+++ b/src/main/range-util.js
@@ -138,11 +138,11 @@ function isSourceElement(opts, node) {
     case "flow":
     case "babel":
     case "typescript":
-      return jsSourceElements.indexOf(node.type) > -1;
+      return jsSourceElements.includes(node.type);
     case "json":
-      return jsonSourceElements.indexOf(node.type) > -1;
+      return jsonSourceElements.includes(node.type);
     case "graphql":
-      return graphqlSourceElements.indexOf(node.kind) > -1;
+      return graphqlSourceElements.includes(node.kind);
     case "vue":
       return node.tag !== "root";
   }
diff --git a/src/main/support.js b/src/main/support.js
index 15c428064..2674fea32 100644
--- a/src/main/support.js
+++ b/src/main/support.js
@@ -96,7 +96,7 @@ function getSupportInfo(version, opts) {
       }
 
       // "babylon" was renamed to "babel" in 1.16.0
-      if (useBabylonParser && language.parsers.indexOf("babel") !== -1) {
+      if (useBabylonParser && language.parsers.includes("babel")) {
         return Object.assign({}, language, {
           parsers: language.parsers.map(parser =>
             parser === "babel" ? "babylon" : parser
diff --git a/tests_integration/path-serializer.js b/tests_integration/path-serializer.js
index da80071ce..089c88dc8 100644
--- a/tests_integration/path-serializer.js
+++ b/tests_integration/path-serializer.js
@@ -2,7 +2,7 @@
 
 const replaceCWD = text => {
   const cwd = process.cwd();
-  while (text.indexOf(cwd) !== -1) {
+  while (text.includes(cwd)) {
     text = text.replace(cwd, "<cwd>");
   }
 
@@ -12,7 +12,7 @@ const replaceCWD = text => {
 module.exports = {
   test: value =>
     typeof value === "string" &&
-    (value.indexOf("\\") > -1 || value.indexOf(process.cwd()) > -1),
+    (value.includes("\\") || value.includes(process.cwd())),
   print: (value, serializer) =>
     serializer(replaceCWD(value).replace(/\\/g, "/"))
 };
diff --git a/website/playground/urlHash.js b/website/playground/urlHash.js
index 530f65015..b37cd4e6b 100644
--- a/website/playground/urlHash.js
+++ b/website/playground/urlHash.js
@@ -7,10 +7,9 @@ export function read() {
   }
 
   // backwards support for old json encoded URIComponent
-  const decode =
-    hash.indexOf("%7B%22") !== -1
-      ? decodeURIComponent
-      : LZString.decompressFromEncodedURIComponent;
+  const decode = hash.includes("%7B%22")
+    ? decodeURIComponent
+    : LZString.decompressFromEncodedURIComponent;
 
   try {
     return JSON.parse(decode(hash));
diff --git a/yarn.lock b/yarn.lock
index 6fc5dca10..b3ff0d44a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -781,6 +781,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.7.tgz#4f2563bad652b2acb1722d7e7aae2b0ff62d192c"
   integrity sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
 "@types/resolve@0.0.8":
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
@@ -1834,6 +1839,13 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
+clean-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-regexp/-/clean-regexp-1.0.0.tgz#8df7c7aae51fd36874e8f8d05b9180bc11a3fed7"
+  integrity sha1-jffHquUf02h06PjQW5GAvBGj/tc=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 clean-stack@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
@@ -2434,6 +2446,14 @@ escodegen@^1.9.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-ast-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-ast-utils/-/eslint-ast-utils-1.1.0.tgz#3d58ba557801cfb1c941d68131ee9f8c34bd1586"
+  integrity sha512-otzzTim2/1+lVrlH19EfQQJEhVJSu0zOb9ygb3iapN6UlyaDtyRq4b5U1FuW0v1lRa9Fp/GJyHkSwm6NqABgCA==
+  dependencies:
+    lodash.get "^4.4.2"
+    lodash.zip "^4.2.0"
+
 eslint-config-prettier@6.5.0:
   version "6.5.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.5.0.tgz#aaf9a495e2a816865e541bfdbb73a65cc162b3eb"
@@ -2524,6 +2544,28 @@ eslint-plugin-react@7.16.0:
     prop-types "^15.7.2"
     resolve "^1.12.0"
 
+eslint-plugin-unicorn@13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-13.0.0.tgz#3d73a17cc34ade1aaa02655ae78bbd8a2053fa81"
+  integrity sha512-9CQk0v74vQpETMt6iqNgjf3IbWEFhrT0sjaLnjkl9SF3rJH6ZL9f7H42BXJ6LPENQR97QzhrIvB8VG0nD05wxQ==
+  dependencies:
+    ci-info "^2.0.0"
+    clean-regexp "^1.0.0"
+    eslint-ast-utils "^1.1.0"
+    eslint-template-visitor "^1.1.0"
+    import-modules "^2.0.0"
+    lodash.camelcase "^4.3.0"
+    lodash.defaultsdeep "^4.6.1"
+    lodash.kebabcase "^4.1.1"
+    lodash.snakecase "^4.1.1"
+    lodash.topairs "^4.3.0"
+    lodash.upperfirst "^4.3.1"
+    read-pkg-up "^7.0.0"
+    regexpp "^3.0.0"
+    reserved-words "^0.1.2"
+    safe-regex "^2.1.1"
+    semver "^6.3.0"
+
 eslint-scope@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@@ -2540,6 +2582,15 @@ eslint-scope@^5.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-template-visitor@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-template-visitor/-/eslint-template-visitor-1.1.0.tgz#f090d124d1a52e05552149fc50468ed59608b166"
+  integrity sha512-Lmy6QVlmFiIGl5fPi+8ACnov3sare+0Ouf7deJAGGhmUfeWJ5fVarELUxZRpsZ9sHejiJUq8626d0dn9uvcZTw==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+    espree "^6.1.1"
+    multimap "^1.0.2"
+
 eslint-utils@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
@@ -2595,7 +2646,7 @@ eslint@6.6.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^6.1.2:
+espree@^6.1.1, espree@^6.1.2:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
   integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==
@@ -2917,7 +2968,7 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^4.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"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -3380,6 +3431,11 @@ import-local@^1.0.0:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
 
+import-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-modules/-/import-modules-2.0.0.tgz#9c1e13b4e7a15682f70a6e3fa29534e4540cfc5d"
+  integrity sha512-iczM/v9drffdNnABOKwj0f9G3cFDon99VcG1mxeBsdqnbd+vnQ5c2uAiCHNQITqFTOPaEvwg3VjoWCur0uHLEw==
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -4562,10 +4618,40 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
+
+lodash.defaultsdeep@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"
+  integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==
+
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+
+lodash.kebabcase@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
+  integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY=
+
+lodash.snakecase@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
+  integrity sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40=
+
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
 
+lodash.topairs@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.topairs/-/lodash.topairs-4.3.0.tgz#3b6deaa37d60fb116713c46c5f17ea190ec48d64"
+  integrity sha1-O23qo31g+xFnE8RsXxfqGQ7EjWQ=
+
 lodash.unescape@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
@@ -4574,6 +4660,16 @@ lodash.uniqby@4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
 
+lodash.upperfirst@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
+  integrity sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984=
+
+lodash.zip@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020"
+  integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=
+
 lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
@@ -4912,6 +5008,11 @@ ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
 
+multimap@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/multimap/-/multimap-1.1.0.tgz#5263febc085a1791c33b59bb3afc6a76a2a10ca8"
+  integrity sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw==
+
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -5049,6 +5150,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+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"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@3.0.0, normalize-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -5374,6 +5485,16 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-json@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f"
+  integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+    lines-and-columns "^1.1.6"
+
 parse-srcset@ikatyang/parse-srcset#54eb9c1cb21db5c62b4d0e275d7249516df6f0ee:
   version "1.0.2"
   resolved "https://codeload.github.com/ikatyang/parse-srcset/tar.gz/54eb9c1cb21db5c62b4d0e275d7249516df6f0ee"
@@ -5765,6 +5886,15 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
+read-pkg-up@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.0.tgz#3f3e53858ec5ae5e6fe14bc479da0a7c98f85ff3"
+  integrity sha512-t2ODkS/vTTcRlKwZiZsaLGb5iwfx9Urp924aGzVyboU6+7Z2i6eGr/G1Z4mjvwLLQV3uFOBKobNRGM3ux2PD/w==
+  dependencies:
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
+
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -5781,6 +5911,16 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -5870,6 +6010,11 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexp-tree@~0.1.1:
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.16.tgz#0715feadb6f766aad7eac5ef4287d2c39acf2fc5"
+  integrity sha512-nXWhGJLTWLNdhWF1uqoXQgAOgv8mQGpgXTOk8BWp08YMOKCtn74VoyOJ+AXZ68Dj50Myd+msYs+aGRBzWJ5dJA==
+
 regexp-util@1.2.2, regexp-util@^1.2.0, regexp-util@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/regexp-util/-/regexp-util-1.2.2.tgz#5cf599134921eb0d776e41d41e9c0da33f0fa2fc"
@@ -5881,6 +6026,11 @@ regexpp@^2.0.1:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
+regexpp@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e"
+  integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==
+
 regexpu-core@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
@@ -6001,6 +6151,11 @@ require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
 
+reserved-words@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1"
+  integrity sha1-AKCUD5jNUBrqqsMWQR2a3FKzGrE=
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -6024,7 +6179,7 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@1.12.0, resolve@^1.1.6, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0:
+resolve@1.12.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
   integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
@@ -6187,6 +6342,13 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
+safe-regex@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.1.1.tgz#f7128f00d056e2fe5c11e81a1324dd974aadced2"
+  integrity sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==
+  dependencies:
+    regexp-tree "~0.1.1"
+
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -6926,6 +7088,16 @@ type-fest@^0.5.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz#d6ef42a0356c6cd45f49485c3b6281fc148e48a2"
   integrity sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==
 
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

From eac6fba2c381241217f04c84bd3fe0a00fd9fbee Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Sun, 17 Nov 2019 18:36:21 +0800
Subject: [PATCH 09/13] Fix `new` usage for builtin objects (#6968)

---
 .eslintrc.yml                                 | 1 +
 scripts/build/build.js                        | 2 +-
 scripts/release/steps/check-git-status.js     | 2 +-
 scripts/release/steps/generate-bundles.js     | 2 +-
 scripts/release/steps/install-dependencies.js | 2 +-
 scripts/release/steps/update-changelog.js     | 4 ++--
 scripts/release/steps/validate-new-version.js | 6 ++++--
 scripts/release/utils.js                      | 6 +++---
 src/language-css/printer-postcss.js           | 2 +-
 src/language-js/embed.js                      | 2 +-
 website/playground/markdown.js                | 2 +-
 11 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 927262197..e20b2b87f 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -35,4 +35,5 @@ rules:
     - error
     - never
     - exceptRange: true
+  unicorn/new-for-builtins: error
   unicorn/prefer-includes: error
diff --git a/scripts/build/build.js b/scripts/build/build.js
index e775029fb..e99f2ef9f 100644
--- a/scripts/build/build.js
+++ b/scripts/build/build.js
@@ -29,7 +29,7 @@ function fitTerminal(input) {
   const columns = Math.min(process.stdout.columns || 40, 80);
   const WIDTH = columns - stringWidth(OK) + 1;
   if (input.length < WIDTH) {
-    input += Array(WIDTH - input.length).join(chalk.dim("."));
+    input += new Array(WIDTH - input.length).join(chalk.dim("."));
   }
   return input;
 }
diff --git a/scripts/release/steps/check-git-status.js b/scripts/release/steps/check-git-status.js
index 779addb83..94f27da3c 100644
--- a/scripts/release/steps/check-git-status.js
+++ b/scripts/release/steps/check-git-status.js
@@ -6,7 +6,7 @@ module.exports = async function() {
   const status = await execa.stdout("git", ["status", "--porcelain"]);
 
   if (status) {
-    throw Error(
+    throw new Error(
       "Uncommitted local changes. " +
         "Please revert or commit all local changes before making a release."
     );
diff --git a/scripts/release/steps/generate-bundles.js b/scripts/release/steps/generate-bundles.js
index 2b96073b7..16051f512 100644
--- a/scripts/release/steps/generate-bundles.js
+++ b/scripts/release/steps/generate-bundles.js
@@ -8,7 +8,7 @@ module.exports = async function({ version }) {
 
   const builtPkg = await readJson("dist/package.json");
   if (builtPkg.version !== version) {
-    throw Error(
+    throw new Error(
       `Expected ${version} in dist/package.json but found ${builtPkg.version}`
     );
   }
diff --git a/scripts/release/steps/install-dependencies.js b/scripts/release/steps/install-dependencies.js
index 07c5be28d..89453c081 100644
--- a/scripts/release/steps/install-dependencies.js
+++ b/scripts/release/steps/install-dependencies.js
@@ -9,7 +9,7 @@ async function install() {
 
   const status = await execa.stdout("git", ["ls-files", "-m"]);
   if (status) {
-    throw Error(
+    throw new Error(
       "The lockfile needs to be updated, commit it before making the release."
     );
   }
diff --git a/scripts/release/steps/update-changelog.js b/scripts/release/steps/update-changelog.js
index d45d5b1b1..b0a61210e 100644
--- a/scripts/release/steps/update-changelog.js
+++ b/scripts/release/steps/update-changelog.js
@@ -10,8 +10,8 @@ const { waitForEnter } = require("../utils");
 function getBlogPostInfo(version) {
   const date = new Date();
   const year = date.getFullYear();
-  const month = new String(date.getMonth() + 1).padStart(2, "0");
-  const day = new String(date.getDate()).padStart(2, "0");
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
 
   return {
     file: `website/blog/${year}-${month}-${day}-${version}.md`,
diff --git a/scripts/release/steps/validate-new-version.js b/scripts/release/steps/validate-new-version.js
index 3f529c0be..65b5323bf 100644
--- a/scripts/release/steps/validate-new-version.js
+++ b/scripts/release/steps/validate-new-version.js
@@ -5,10 +5,12 @@ const semver = require("semver");
 
 module.exports = async function({ version, previousVersion }) {
   if (!semver.valid(version)) {
-    throw Error(`Invalid version specified`);
+    throw new Error(`Invalid version specified`);
   }
 
   if (!semver.gt(version, previousVersion)) {
-    throw Error(`Version ${chalk.yellow(version)} has already been published`);
+    throw new Error(
+      `Version ${chalk.yellow(version)} has already been published`
+    );
   }
 };
diff --git a/scripts/release/utils.js b/scripts/release/utils.js
index 55a7d940d..833c4aa90 100644
--- a/scripts/release/utils.js
+++ b/scripts/release/utils.js
@@ -14,7 +14,7 @@ function fitTerminal(input) {
   const columns = Math.min(process.stdout.columns, 80);
   const WIDTH = columns - stringWidth(OK) + 1;
   if (input.length < WIDTH) {
-    input += Array(WIDTH - input.length).join(chalk.dim("."));
+    input += new Array(WIDTH - input.length).join(chalk.dim("."));
   }
   return input;
 }
@@ -38,7 +38,7 @@ function runYarn(script) {
     script = [script];
   }
   return execa("yarn", ["--silent"].concat(script)).catch(error => {
-    throw Error(`\`yarn ${script}\` failed\n${error.stdout}`);
+    throw new Error(`\`yarn ${script}\` failed\n${error.stdout}`);
   });
 }
 
@@ -56,7 +56,7 @@ function waitForEnter() {
         process.stdin.pause();
         resolve();
       } else if (key.ctrl && key.name === "c") {
-        reject(Error("Process terminated by the user"));
+        reject(new Error("Process terminated by the user"));
       }
     }
   });
diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js
index 722311ed8..8b3f7f7c0 100644
--- a/src/language-css/printer-postcss.js
+++ b/src/language-css/printer-postcss.js
@@ -907,7 +907,7 @@ const STRING_REGEX = /(['"])(?:(?!\1)[^\\]|\\[\s\S])*\1/g;
 const NUMBER_REGEX = /(?:\d*\.\d+|\d+\.?)(?:[eE][+-]?\d+)?/g;
 const STANDARD_UNIT_REGEX = /[a-zA-Z]+/g;
 const WORD_PART_REGEX = /[$@]?[a-zA-Z_\u0080-\uFFFF][\w\-\u0080-\uFFFF]*/g;
-const ADJUST_NUMBERS_REGEX = RegExp(
+const ADJUST_NUMBERS_REGEX = new RegExp(
   STRING_REGEX.source +
     `|` +
     `(${WORD_PART_REGEX.source})?` +
diff --git a/src/language-js/embed.js b/src/language-js/embed.js
index 0e5454648..f556ebc4b 100644
--- a/src/language-js/embed.js
+++ b/src/language-js/embed.js
@@ -615,7 +615,7 @@ function printHtmlTemplateLiteral(
     return "``";
   }
 
-  const placeholderRegex = RegExp(composePlaceholder("(\\d+)"), "g");
+  const placeholderRegex = new RegExp(composePlaceholder("(\\d+)"), "g");
 
   const contentDoc = mapDoc(
     stripTrailingHardline(textToDoc(text, { parser })),
diff --git a/website/playground/markdown.js b/website/playground/markdown.js
index 4f469754f..b1bf85320 100644
--- a/website/playground/markdown.js
+++ b/website/playground/markdown.js
@@ -72,7 +72,7 @@ function codeBlock(content, syntax) {
     backtickSequences.map(backticks => backticks.length)
   );
   const fenceLength = Math.max(3, longestBacktickSequenceLength + 1);
-  const fence = Array(fenceLength + 1).join("`");
+  const fence = new Array(fenceLength + 1).join("`");
   return [fence + (syntax || ""), content, fence].join("\n");
 }
 

From 791996df7b8f6e7273c168eeee412a7e894859ea Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Mon, 18 Nov 2019 18:39:12 +0800
Subject: [PATCH 10/13] Set `trailingComma` default value to `es5` (#6963)

* Set `trailingComma` default value to `es5`

* Update `options` documentation

* Update tests

* style

* fix js code style

* change options order

* update tests_integration snap

* disable es5 for __ng_interpolation

* fix angular tests

* fix scss test

* fix `css_trailing_comma` snap

* fix css_scss snapshot
---
 docs/options.md                               |    8 +-
 src/language-js/options.js                    |    5 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../angular_component_examples/jsfmt.spec.js  |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 tests/angular_interpolation/jsfmt.spec.js     |    2 +-
 tests/arrays/__snapshots__/jsfmt.spec.js.snap |   10 +-
 tests/arrows/__snapshots__/jsfmt.spec.js.snap |  264 +--
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   34 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../classes/__snapshots__/jsfmt.spec.js.snap  |    6 +-
 .../comments/__snapshots__/jsfmt.spec.js.snap |   48 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    6 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   28 +-
 .../css_scss/__snapshots__/jsfmt.spec.js.snap |    4 +-
 tests/css_scss/jsfmt.spec.js                  |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   12 +-
 tests/css_trailing_comma/jsfmt.spec.js        |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   10 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   18 +-
 tests/do/__snapshots__/jsfmt.spec.js.snap     |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 tests/export/__snapshots__/jsfmt.spec.js.snap |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../exports/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../annot/__snapshots__/jsfmt.spec.js.snap    |    8 +-
 .../arith/__snapshots__/jsfmt.spec.js.snap    |    4 +-
 .../arraylib/__snapshots__/jsfmt.spec.js.snap |    2 +-
 .../arrays/__snapshots__/jsfmt.spec.js.snap   |    2 +-
 .../async/__snapshots__/jsfmt.spec.js.snap    |    6 +-
 .../binary/__snapshots__/jsfmt.spec.js.snap   |    2 +-
 .../callable/__snapshots__/jsfmt.spec.js.snap |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../classes/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../closure/__snapshots__/jsfmt.spec.js.snap  |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   14 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    6 +-
 .../lib/__snapshots__/jsfmt.spec.js.snap      |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   10 +-
 .../lib/__snapshots__/jsfmt.spec.js.snap      |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   14 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   16 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   90 +-
 .../flow/dom/__snapshots__/jsfmt.spec.js.snap |   44 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    6 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   12 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    8 +-
 .../fetch/__snapshots__/jsfmt.spec.js.snap    |   36 +-
 .../function/__snapshots__/jsfmt.spec.js.snap |    4 +-
 .../get-def/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../lib/__snapshots__/jsfmt.spec.js.snap      |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    8 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../indexer/__snapshots__/jsfmt.spec.js.snap  |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../lib/__snapshots__/jsfmt.spec.js.snap      |    4 +-
 .../iterable/__snapshots__/jsfmt.spec.js.snap |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../lib/__snapshots__/jsfmt.spec.js.snap      |    2 +-
 .../keyvalue/__snapshots__/jsfmt.spec.js.snap |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../literal/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../logical/__snapshots__/jsfmt.spec.js.snap  |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   12 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   12 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   74 +-
 .../crypto/__snapshots__/jsfmt.spec.js.snap   |    2 +-
 .../package2/__snapshots__/jsfmt.spec.js.snap |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    6 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    8 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   14 +-
 .../objects/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../objmap/__snapshots__/jsfmt.spec.js.snap   |    4 +-
 .../parse/__snapshots__/jsfmt.spec.js.snap    |    2 +-
 .../poly/__snapshots__/jsfmt.spec.js.snap     |    6 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../promises/__snapshots__/jsfmt.spec.js.snap |    2 +-
 .../react/__snapshots__/jsfmt.spec.js.snap    |  244 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   14 +-
 .../flow/rec/__snapshots__/jsfmt.spec.js.snap |    6 +-
 .../tmplibk/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../record/__snapshots__/jsfmt.spec.js.snap   |    2 +-
 .../refi/__snapshots__/jsfmt.spec.js.snap     |   14 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   30 +-
 .../require/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../sealed/__snapshots__/jsfmt.spec.js.snap   |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../shape/__snapshots__/jsfmt.spec.js.snap    |    2 +-
 .../spread/__snapshots__/jsfmt.spec.js.snap   |   20 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../suppress/__snapshots__/jsfmt.spec.js.snap |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   20 +-
 .../taint/__snapshots__/jsfmt.spec.js.snap    |    4 +-
 .../template/__snapshots__/jsfmt.spec.js.snap |    2 +-
 .../traces/__snapshots__/jsfmt.spec.js.snap   |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   12 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 1324 +++++------
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../typecast/__snapshots__/jsfmt.spec.js.snap |    2 +-
 .../unary/__snapshots__/jsfmt.spec.js.snap    |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          | 2000 ++++++++---------
 .../union/__snapshots__/jsfmt.spec.js.snap    |   20 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   38 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    6 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    6 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 tests/flow_object_inexact/jsfmt.spec.js       |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    6 +-
 .../function/__snapshots__/jsfmt.spec.js.snap |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    8 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   18 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    8 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 tests/graphql_trailing_comma/jsfmt.spec.js    |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   14 +-
 tests/html_angular/jsfmt.spec.js              |    2 +-
 .../html_js/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../html_lwc/__snapshots__/jsfmt.spec.js.snap |    2 +-
 tests/html_lwc/jsfmt.spec.js                  |    2 +-
 .../html_vue/__snapshots__/jsfmt.spec.js.snap |   50 +-
 tests/html_vue/jsfmt.spec.js                  |    2 +-
 tests/if/__snapshots__/jsfmt.spec.js.snap     |    4 +-
 tests/ignore/__snapshots__/jsfmt.spec.js.snap |    2 +-
 tests/import/__snapshots__/jsfmt.spec.js.snap |   40 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   22 +-
 tests/json/__snapshots__/jsfmt.spec.js.snap   |   10 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    6 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 tests/jsx/__snapshots__/jsfmt.spec.js.snap    |   80 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   30 +-
 .../markdown/__snapshots__/jsfmt.spec.js.snap |    4 +-
 tests/mdx/__snapshots__/jsfmt.spec.js.snap    |   20 +-
 tests/member/__snapshots__/jsfmt.spec.js.snap |   10 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   48 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   14 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   20 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   10 +-
 .../objects/__snapshots__/jsfmt.spec.js.snap  |   12 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   12 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   64 +-
 tests/quotes/__snapshots__/jsfmt.spec.js.snap |    4 +-
 tests/range/__snapshots__/jsfmt.spec.js.snap  |    8 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../require/__snapshots__/jsfmt.spec.js.snap  |    4 +-
 .../strings/__snapshots__/jsfmt.spec.js.snap  |   10 +-
 .../template/__snapshots__/jsfmt.spec.js.snap |   16 +-
 .../__snapshots__/jsfmt.spec.js.snap          |  280 +--
 .../__snapshots__/jsfmt.spec.js.snap          |    8 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   12 +-
 tests/trailing_comma/jsfmt.spec.js            |    4 +-
 .../compiler/__snapshots__/jsfmt.spec.js.snap |    4 +-
 .../classes/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../webhost/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   16 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    6 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    6 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    4 +-
 tests/typescript_tuple/jsfmt.spec.js          |    2 +-
 tests/unary/__snapshots__/jsfmt.spec.js.snap  |    2 +-
 .../__snapshots__/jsfmt.spec.js.snap          |   18 +-
 .../__snapshots__/jsfmt.spec.js.snap          |    2 +-
 .../__snapshots__/config-resolution.js.snap   |    4 +-
 .../__snapshots__/cursor-offset.js.snap       |    2 +-
 .../__snapshots__/early-exit.js.snap          |    8 +-
 .../__snapshots__/help-options.js.snap        |    6 +-
 .../__tests__/__snapshots__/schema.js.snap    |   12 +-
 .../__snapshots__/support-info.js.snap        |    6 +-
 .../with-config-precedence.js.snap            |    8 +-
 205 files changed, 2933 insertions(+), 2932 deletions(-)

diff --git a/docs/options.md b/docs/options.md
index 00f647107..bc5521774 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -97,13 +97,13 @@ Print trailing commas wherever possible when multi-line. (A single-line array, f
 
 Valid options:
 
-- `"none"` - No trailing commas.
 - `"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/).
 
-| Default  | CLI Override                                           | API Override                                           |
-| -------- | ------------------------------------------------------ | ------------------------------------------------------ |
-| `"none"` | <code>--trailing-comma <none&#124;es5&#124;all></code> | <code>trailingComma: "<none&#124;es5&#124;all>"</code> |
+| Default | CLI Override                                           | API Override                                           |
+| ------- | ------------------------------------------------------ | ------------------------------------------------------ |
+| `"es5"` | <code>--trailing-comma <es5&#124;none&#124;all></code> | <code>trailingComma: "<es5&#124;none&#124;all>"</code> |
 
 ## Bracket Spacing
 
diff --git a/src/language-js/options.js b/src/language-js/options.js
index daf365f98..f8f21ea6a 100644
--- a/src/language-js/options.js
+++ b/src/language-js/options.js
@@ -76,16 +76,17 @@ module.exports = {
     type: "choice",
     default: [
       { since: "0.0.0", value: false },
-      { since: "0.19.0", value: "none" }
+      { since: "0.19.0", value: "none" },
+      { since: "2.0.0", value: "es5" }
     ],
     description: "Print trailing commas wherever possible when multi-line.",
     choices: [
-      { value: "none", description: "No trailing commas." },
       {
         value: "es5",
         description:
           "Trailing commas where valid in ES5 (objects, arrays, etc.)"
       },
+      { value: "none", description: "No trailing commas." },
       {
         value: "all",
         description:
diff --git a/tests/angular_component_examples/__snapshots__/jsfmt.spec.js.snap b/tests/angular_component_examples/__snapshots__/jsfmt.spec.js.snap
index 6fcbdffec..21ae6bd3d 100644
--- a/tests/angular_component_examples/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/angular_component_examples/__snapshots__/jsfmt.spec.js.snap
@@ -4,6 +4,7 @@ exports[`test.component.ts 1`] = `
 ====================================options=====================================
 parsers: ["typescript"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 @Component({
@@ -52,7 +53,6 @@ exports[`test.component.ts 2`] = `
 ====================================options=====================================
 parsers: ["typescript"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 @Component({
diff --git a/tests/angular_component_examples/jsfmt.spec.js b/tests/angular_component_examples/jsfmt.spec.js
index ecbf77cc1..69598203b 100644
--- a/tests/angular_component_examples/jsfmt.spec.js
+++ b/tests/angular_component_examples/jsfmt.spec.js
@@ -1,2 +1,2 @@
+run_spec(__dirname, ["typescript"], { trailingComma: "none" });
 run_spec(__dirname, ["typescript"]);
-run_spec(__dirname, ["typescript"], { trailingComma: "es5" });
diff --git a/tests/angular_interpolation/__snapshots__/jsfmt.spec.js.snap b/tests/angular_interpolation/__snapshots__/jsfmt.spec.js.snap
index 41c46208c..5bc48f0b1 100644
--- a/tests/angular_interpolation/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/angular_interpolation/__snapshots__/jsfmt.spec.js.snap
@@ -4,6 +4,7 @@ exports[`logical-expression.ng 1`] = `
 ====================================options=====================================
 parsers: ["__ng_interpolation"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 [
@@ -24,7 +25,6 @@ exports[`logical-expression.ng 2`] = `
 ====================================options=====================================
 parsers: ["__ng_interpolation"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 [
@@ -66,6 +66,7 @@ exports[`pipe-expression.ng 1`] = `
 ====================================options=====================================
 parsers: ["__ng_interpolation"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 [
@@ -132,7 +133,6 @@ exports[`pipe-expression.ng 2`] = `
 ====================================options=====================================
 parsers: ["__ng_interpolation"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 [
diff --git a/tests/angular_interpolation/jsfmt.spec.js b/tests/angular_interpolation/jsfmt.spec.js
index 509a66203..62daf3216 100644
--- a/tests/angular_interpolation/jsfmt.spec.js
+++ b/tests/angular_interpolation/jsfmt.spec.js
@@ -1,3 +1,3 @@
+run_spec(__dirname, ["__ng_interpolation"], { trailingComma: "none" });
 run_spec(__dirname, ["__ng_interpolation"]);
-run_spec(__dirname, ["__ng_interpolation"], { trailingComma: "es5" });
 run_spec(__dirname, ["__ng_interpolation"], { trailingComma: "all" });
diff --git a/tests/arrays/__snapshots__/jsfmt.spec.js.snap b/tests/arrays/__snapshots__/jsfmt.spec.js.snap
index 235a17c3d..dbef45d26 100644
--- a/tests/arrays/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/arrays/__snapshots__/jsfmt.spec.js.snap
@@ -110,17 +110,17 @@ printWidth: 80
 [
   [0, 1],
   [0, 1],
-  [0, 1]
+  [0, 1],
 ];
 [[], [1, 2, 3]];
 [[1], [1]];
 [
   [1, 2],
-  [1, 2, 3]
+  [1, 2, 3],
 ];
 [
   [1, 0],
-  [1, 0]
+  [1, 0],
 ];
 [{}];
 [{}, {}];
@@ -138,11 +138,11 @@ printWidth: 80
 [{ a, b }, { a }, { a }];
 [
   { a, b },
-  { a, b }
+  { a, b },
 ];
 [
   { a, b },
-  { a, b, c }
+  { a, b, c },
 ];
 
 ================================================================================
diff --git a/tests/arrows/__snapshots__/jsfmt.spec.js.snap b/tests/arrows/__snapshots__/jsfmt.spec.js.snap
index 6ee696948..c8de85468 100644
--- a/tests/arrows/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/arrows/__snapshots__/jsfmt.spec.js.snap
@@ -609,7 +609,7 @@ Seq(typeDef.interface.groups).forEach(group =>
   Seq(group.members).forEach((member, memberName) =>
     markdownDoc(member.doc, {
       typePath: typePath.concat(memberName.slice(1)),
-      signatures: member.signatures
+      signatures: member.signatures,
     })
   )
 );
@@ -640,7 +640,7 @@ function render() {
           this.setState({
             progress: Math.round(
               (100 * e.nativeEvent.loaded) / e.nativeEvent.total
-            )
+            ),
           })
         }
       />
@@ -656,7 +656,7 @@ function render() {
           this.setState({
             progress: Math.round(
               (100 * e.nativeEvent.loaded) / e.nativeEvent.total
-            )
+            ),
           })
         }
       />
@@ -672,7 +672,7 @@ function render() {
           this.setState({
             progress: Math.round(
               (100 * e.nativeEvent.loaded) / e.nativeEvent.total
-            )
+            ),
           })
         }
       />
@@ -698,7 +698,7 @@ foo(
   ({
     a,
 
-    b
+    b,
   }) => {}
 );
 
@@ -711,7 +711,7 @@ foo(
   ({
     a,
 
-    b
+    b,
   }) => {}
 );
 
@@ -719,7 +719,7 @@ foo(
   ({
     a,
 
-    b
+    b,
   }) => a
 );
 
@@ -732,8 +732,8 @@ foo(
     a: {
       a,
 
-      b
-    }
+      b,
+    },
   }) => {}
 );
 
@@ -743,9 +743,9 @@ foo(
       b: {
         c,
 
-        d
-      }
-    }
+        d,
+      },
+    },
   }) => {}
 );
 
@@ -756,10 +756,10 @@ foo(
         c: {
           d,
 
-          e
-        }
-      }
-    }
+          e,
+        },
+      },
+    },
   }) => {}
 );
 
@@ -768,8 +768,8 @@ foo(
     a: {
       a,
 
-      b
-    }
+      b,
+    },
   }) => a
 );
 
@@ -779,9 +779,9 @@ foo(
       b: {
         c,
 
-        d
-      }
-    }
+        d,
+      },
+    },
   }) => a
 );
 
@@ -792,10 +792,10 @@ foo(
         c: {
           d,
 
-          e
-        }
-      }
-    }
+          e,
+        },
+      },
+    },
   }) => a
 );
 
@@ -807,11 +807,11 @@ foo(
           c: {
             d,
 
-            e
-          }
-        }
-      }
-    }
+            e,
+          },
+        },
+      },
+    },
   ]) => {}
 );
 
@@ -823,10 +823,10 @@ foo(
           c: {
             d,
 
-            e
-          }
-        }
-      }
+            e,
+          },
+        },
+      },
     }
   ]) => {}
 );
@@ -839,10 +839,10 @@ foo(
           c: {
             d,
 
-            e
-          }
-        }
-      }
+            e,
+          },
+        },
+      },
     }
   ) => {}
 );
@@ -853,9 +853,9 @@ foo(
       {
         a,
 
-        b
-      }
-    ]
+        b,
+      },
+    ],
   }) => {}
 );
 
@@ -865,8 +865,8 @@ foo(
       {
         a,
 
-        b
-      }
+        b,
+      },
     ]
   ) => a
 );
@@ -877,9 +877,9 @@ foo(
       {
         a,
 
-        b
-      }
-    ]
+        b,
+      },
+    ],
   ]) => {}
 );
 
@@ -895,13 +895,13 @@ foo(
               d: {
                 e,
 
-                f
-              }
-            }
-          }
-        ]
-      ]
-    ]
+                f,
+              },
+            },
+          },
+        ],
+      ],
+    ],
   ]) => {}
 );
 
@@ -910,7 +910,7 @@ foo(
     ...{
       a,
 
-      b
+      b,
     }
   ) => {}
 );
@@ -921,8 +921,8 @@ foo(
       {
         a,
 
-        b
-      }
+        b,
+      },
     ]
   ) => {}
 );
@@ -933,8 +933,8 @@ foo(
       {
         a,
 
-        b
-      }
+        b,
+      },
     ]
   ]) => {}
 );
@@ -945,8 +945,8 @@ foo(
       {
         a,
 
-        b
-      }
+        b,
+      },
     ]
   ) => {}
 );
@@ -956,7 +956,7 @@ foo(
     a = (({
       a,
 
-      b
+      b,
     }) => {})()
   ) => {}
 );
@@ -966,7 +966,7 @@ foo(
     a = f({
       a,
 
-      b
+      b,
     })
   ) => {}
 );
@@ -976,7 +976,7 @@ foo(
     a = ({
       a,
 
-      b
+      b,
     }) => {}
   ) => {}
 );
@@ -987,7 +987,7 @@ foo(
       f({
         a,
 
-        b
+        b,
       })
   ) => {}
 );
@@ -1406,7 +1406,7 @@ Seq(typeDef.interface.groups).forEach((group) =>
   Seq(group.members).forEach((member, memberName) =>
     markdownDoc(member.doc, {
       typePath: typePath.concat(memberName.slice(1)),
-      signatures: member.signatures
+      signatures: member.signatures,
     })
   )
 );
@@ -1437,7 +1437,7 @@ function render() {
           this.setState({
             progress: Math.round(
               (100 * e.nativeEvent.loaded) / e.nativeEvent.total
-            )
+            ),
           })
         }
       />
@@ -1453,7 +1453,7 @@ function render() {
           this.setState({
             progress: Math.round(
               (100 * e.nativeEvent.loaded) / e.nativeEvent.total
-            )
+            ),
           })
         }
       />
@@ -1469,7 +1469,7 @@ function render() {
           this.setState({
             progress: Math.round(
               (100 * e.nativeEvent.loaded) / e.nativeEvent.total
-            )
+            ),
           })
         }
       />
@@ -1495,7 +1495,7 @@ foo(
   ({
     a,
 
-    b
+    b,
   }) => {}
 );
 
@@ -1508,7 +1508,7 @@ foo(
   ({
     a,
 
-    b
+    b,
   }) => {}
 );
 
@@ -1516,7 +1516,7 @@ foo(
   ({
     a,
 
-    b
+    b,
   }) => a
 );
 
@@ -1529,8 +1529,8 @@ foo(
     a: {
       a,
 
-      b
-    }
+      b,
+    },
   }) => {}
 );
 
@@ -1540,9 +1540,9 @@ foo(
       b: {
         c,
 
-        d
-      }
-    }
+        d,
+      },
+    },
   }) => {}
 );
 
@@ -1553,10 +1553,10 @@ foo(
         c: {
           d,
 
-          e
-        }
-      }
-    }
+          e,
+        },
+      },
+    },
   }) => {}
 );
 
@@ -1565,8 +1565,8 @@ foo(
     a: {
       a,
 
-      b
-    }
+      b,
+    },
   }) => a
 );
 
@@ -1576,9 +1576,9 @@ foo(
       b: {
         c,
 
-        d
-      }
-    }
+        d,
+      },
+    },
   }) => a
 );
 
@@ -1589,10 +1589,10 @@ foo(
         c: {
           d,
 
-          e
-        }
-      }
-    }
+          e,
+        },
+      },
+    },
   }) => a
 );
 
@@ -1604,11 +1604,11 @@ foo(
           c: {
             d,
 
-            e
-          }
-        }
-      }
-    }
+            e,
+          },
+        },
+      },
+    },
   ]) => {}
 );
 
@@ -1620,10 +1620,10 @@ foo(
           c: {
             d,
 
-            e
-          }
-        }
-      }
+            e,
+          },
+        },
+      },
     }
   ]) => {}
 );
@@ -1636,10 +1636,10 @@ foo(
           c: {
             d,
 
-            e
-          }
-        }
-      }
+            e,
+          },
+        },
+      },
     }
   ) => {}
 );
@@ -1650,9 +1650,9 @@ foo(
       {
         a,
 
-        b
-      }
-    ]
+        b,
+      },
+    ],
   }) => {}
 );
 
@@ -1662,8 +1662,8 @@ foo(
       {
         a,
 
-        b
-      }
+        b,
+      },
     ]
   ) => a
 );
@@ -1674,9 +1674,9 @@ foo(
       {
         a,
 
-        b
-      }
-    ]
+        b,
+      },
+    ],
   ]) => {}
 );
 
@@ -1692,13 +1692,13 @@ foo(
               d: {
                 e,
 
-                f
-              }
-            }
-          }
-        ]
-      ]
-    ]
+                f,
+              },
+            },
+          },
+        ],
+      ],
+    ],
   ]) => {}
 );
 
@@ -1707,7 +1707,7 @@ foo(
     ...{
       a,
 
-      b
+      b,
     }
   ) => {}
 );
@@ -1718,8 +1718,8 @@ foo(
       {
         a,
 
-        b
-      }
+        b,
+      },
     ]
   ) => {}
 );
@@ -1730,8 +1730,8 @@ foo(
       {
         a,
 
-        b
-      }
+        b,
+      },
     ]
   ]) => {}
 );
@@ -1742,8 +1742,8 @@ foo(
       {
         a,
 
-        b
-      }
+        b,
+      },
     ]
   ) => {}
 );
@@ -1753,7 +1753,7 @@ foo(
     a = (({
       a,
 
-      b
+      b,
     }) => {})()
   ) => {}
 );
@@ -1763,7 +1763,7 @@ foo(
     a = f({
       a,
 
-      b
+      b,
     })
   ) => {}
 );
@@ -1773,7 +1773,7 @@ foo(
     a = ({
       a,
 
-      b
+      b,
     }) => {}
   ) => {}
 );
@@ -1784,7 +1784,7 @@ foo(
       f({
         a,
 
-        b
+        b,
       })
   ) => {}
 );
@@ -1852,7 +1852,7 @@ export const bem = block =>
         ".",
         css(block),
         element ? \`__\${css(element)}\` : "",
-        modifier ? \`--\${css(modifier)}\` : ""
+        modifier ? \`--\${css(modifier)}\` : "",
       ].join("");
 
 <FlatList
@@ -1925,7 +1925,7 @@ export const bem = (block) =>
         ".",
         css(block),
         element ? \`__\${css(element)}\` : "",
-        modifier ? \`--\${css(modifier)}\` : ""
+        modifier ? \`--\${css(modifier)}\` : "",
       ].join("");
 
 <FlatList
@@ -2085,7 +2085,7 @@ const foo = () => {
     message: "test",
     messageType: "SMS",
     status: "Unknown",
-    created: "11/01/2017 13:36"
+    created: "11/01/2017 13:36",
   });
 };
 
@@ -2109,7 +2109,7 @@ const foo = () => {
     message: "test",
     messageType: "SMS",
     status: "Unknown",
-    created: "11/01/2017 13:36"
+    created: "11/01/2017 13:36",
   });
 };
 
diff --git a/tests/assignment/__snapshots__/jsfmt.spec.js.snap b/tests/assignment/__snapshots__/jsfmt.spec.js.snap
index 7ad60db40..7f17be2c1 100644
--- a/tests/assignment/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/assignment/__snapshots__/jsfmt.spec.js.snap
@@ -51,14 +51,14 @@ let {
   bottom: offsetBottom,
   left: offsetLeft,
   right: offsetRight,
-  top: offsetTop
+  top: offsetTop,
 } = getPressRectOffset == null ? DEFAULT_PRESS_RECT : getPressRectOffset();
 
 const {
   accessibilityModule: FooAccessibilityModule,
   accessibilityModule: FooAccessibilityModule2,
   accessibilityModule: FooAccessibilityModule3,
-  accessibilityModule: FooAccessibilityModule4
+  accessibilityModule: FooAccessibilityModule4,
 } = foo || {};
 
 ({ prop: toAssign = "default" } = { prop: "propval" });
diff --git a/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap b/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap
index f6b34ef95..7f120df44 100644
--- a/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap
@@ -38,7 +38,7 @@ function f() {
       entity.isInstallAvailable() &&
       !entity.isQueue() &&
       entity.isDisabled() && {
-        id: entity.id
+        id: entity.id,
       }
   );
 }
@@ -459,7 +459,7 @@ prevState = prevState || {
   loadState: LOADED,
   opened: false,
   searchQuery: "",
-  selectedCatalog: null
+  selectedCatalog: null,
 };
 
 prevState = prevState ||
@@ -468,7 +468,7 @@ prevState = prevState ||
     loadState: LOADED,
     opened: false,
     searchQuery: "",
-    selectedCatalog: null
+    selectedCatalog: null,
   };
 
 prevState =
@@ -478,7 +478,7 @@ prevState =
     loadState: LOADED,
     opened: false,
     searchQuery: "",
-    selectedCatalog: null
+    selectedCatalog: null,
   });
 
 prevState = prevState ||
@@ -487,14 +487,14 @@ prevState = prevState ||
     loadState: LOADED,
     opened: false,
     searchQuery: "",
-    selectedCatalog: null
+    selectedCatalog: null,
   };
 
 this.steps = steps || [
   {
     name: "mock-module",
-    path: "/nux/mock-module"
-  }
+    path: "/nux/mock-module",
+  },
 ];
 
 this.steps =
@@ -502,15 +502,15 @@ this.steps =
   (checkStep && [
     {
       name: "mock-module",
-      path: "/nux/mock-module"
-    }
+      path: "/nux/mock-module",
+    },
   ]);
 
 this.steps = (steps && checkStep) || [
   {
     name: "mock-module",
-    path: "/nux/mock-module"
-  }
+    path: "/nux/mock-module",
+  },
 ];
 
 const create = () => {
@@ -520,7 +520,7 @@ const create = () => {
     result.ok && {
       status: "ok",
       createdAt: result.createdAt,
-      updatedAt: result.updatedAt
+      updatedAt: result.updatedAt,
     }
   );
 };
@@ -531,7 +531,7 @@ const create = () => {
     (shouldReturn && result.ok && result) || {
       status: "ok",
       createdAt: result.createdAt,
-      updatedAt: result.updatedAt
+      updatedAt: result.updatedAt,
     }
   );
 };
@@ -540,12 +540,12 @@ const obj = {
   state: shouldHaveState &&
     stateIsOK && {
       loadState: LOADED,
-      opened: false
+      opened: false,
     },
   loadNext: (stateIsOK && hasNext) || {
-    skipNext: true
+    skipNext: true,
   },
-  loaded: true
+  loaded: true,
 };
 
 ================================================================================
@@ -611,7 +611,7 @@ printWidth: 80
     !isJellyfishEnabled &&
     diffUpdateMessageInput && {
       fontSize: 14,
-      color: "#fff"
+      color: "#fff",
     }
   }
 />;
diff --git a/tests/break-calls/__snapshots__/jsfmt.spec.js.snap b/tests/break-calls/__snapshots__/jsfmt.spec.js.snap
index 033f231d7..c3c7d27b9 100644
--- a/tests/break-calls/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/break-calls/__snapshots__/jsfmt.spec.js.snap
@@ -189,7 +189,7 @@ function helloWorld() {
     props.value,
     props.value,
     props.value,
-    props.value
+    props.value,
   ]);
 }
 
@@ -210,7 +210,7 @@ function helloWorldWithReact() {
     props.value,
     props.value,
     props.value,
-    props.value
+    props.value,
   ]);
 }
 
diff --git a/tests/classes/__snapshots__/jsfmt.spec.js.snap b/tests/classes/__snapshots__/jsfmt.spec.js.snap
index 2ed9a8969..24bc14877 100644
--- a/tests/classes/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/classes/__snapshots__/jsfmt.spec.js.snap
@@ -88,7 +88,7 @@ class InMemoryAppender extends log4javascript.Appender
   implements ICachedLogMessageProvider {}
 
 class Foo extends Immutable.Record({
-  ipaddress: ""
+  ipaddress: "",
 }) {
   ipaddress: string;
 }
@@ -197,7 +197,7 @@ class C {
 }
 
 ({
-  name /*comment*/() {}
+  name /*comment*/() {},
 });
 
 ================================================================================
@@ -258,7 +258,7 @@ class B {
     this.props.foofoofoofoofoofoo && this.props.barbarbarbar;
 
   someInstanceProperty2 = {
-    foo: this.props.foofoofoofoofoofoo && this.props.barbarbarbar
+    foo: this.props.foofoofoofoofoofoo && this.props.barbarbarbar,
   };
 
   someInstanceProperty3 = "foo";
diff --git a/tests/comments/__snapshots__/jsfmt.spec.js.snap b/tests/comments/__snapshots__/jsfmt.spec.js.snap
index 099b640e1..b9f83a6fd 100644
--- a/tests/comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/comments/__snapshots__/jsfmt.spec.js.snap
@@ -37,7 +37,7 @@ const { a /* comment */ = 1 } = b;
 const { c = 1 /* comment */ } = d;
 
 let {
-  d = b //comment
+  d = b, //comment
 } = c;
 
 ================================================================================
@@ -61,7 +61,7 @@ const foo = {
   a: "a" /* comment for this line */,
 
   /* Section B */
-  b: "b"
+  b: "b",
 };
 
 ================================================================================
@@ -527,20 +527,20 @@ export /* comment */{};
 
 const foo = "";
 export {
-  foo // comment
+  foo, // comment
 };
 
 const bar = "";
 export {
   // comment
-  bar
+  bar,
 };
 
 const fooo = "";
 const barr = "";
 export {
   fooo, // comment
-  barr // comment
+  barr, // comment
 };
 
 ================================================================================
@@ -702,7 +702,7 @@ const obj = {
   f1 /* f */() {},
   f2(/* args */) {},
   f3() /* returns */ {},
-  f4 /* f */(/* args */) /* returns */ {}
+  f4 /* f */(/* args */) /* returns */ {},
 };
 
 (function f /* f */() {})();
@@ -1022,7 +1022,7 @@ function f(
 // not one before and one after.
 throw new ProcessSystemError({
   code: acc.error.code, // Alias of errno
-  originalError: acc.error // Just in case.
+  originalError: acc.error, // Just in case.
 });
 
 // Adding a comment stops the pretty printing process and everything is
@@ -1030,30 +1030,30 @@ throw new ProcessSystemError({
 export type BuckWebSocketMessage =
   | {
       // Not actually from Buck - this is to let the receiver know that the socket is connected.
-      type: "SocketConnected"
+      type: "SocketConnected",
     }
   | {
       type: "BuildProgressUpdated",
-      progressValue: number
+      progressValue: number,
     }
   | {
       type: "BuildFinished",
-      exitCode: number
+      exitCode: number,
     }
   | {
-      type: "BuildStarted"
+      type: "BuildStarted",
     }
   | {
-      type: "ParseStarted"
+      type: "ParseStarted",
     }
   | {
-      type: "ParseFinished"
+      type: "ParseFinished",
     }
   | {
-      type: "RunStarted"
+      type: "RunStarted",
     }
   | {
-      type: "RunComplete"
+      type: "RunComplete",
     };
 
 // Missing one level of indentation because of the comment
@@ -1069,7 +1069,7 @@ const rootEpic = (actions, store) =>
 export type AsyncExecuteOptions = child_process$execFileOpts & {
   // The contents to write to stdin.
   stdin?: ?string,
-  dontLogInNuclide?: ?boolean
+  dontLogInNuclide?: ?boolean,
 };
 
 // optional trailing comma gets moved all the way to the beginning
@@ -1571,7 +1571,7 @@ var x = {
     sectionMetaData: SectionMetaData
     /* $FlowFixMe This error was exposed while converting keyMirror
      * to keyMirrorRecursive */
-  ): $Enum<SectionMode> {}
+  ): $Enum<SectionMode> {},
 };
 
 class X2 {
@@ -2231,7 +2231,7 @@ const CONNECTION_STATUS = (exports.CONNECTION_STATUS = {
   CLOSED: Object.freeze({ kind: "CLOSED" }),
   CONNECTED: Object.freeze({ kind: "CONNECTED" }),
   CONNECTING: Object.freeze({ kind: "CONNECTING" }),
-  NOT_CONNECTED: Object.freeze({ kind: "NOT_CONNECTED" })
+  NOT_CONNECTED: Object.freeze({ kind: "NOT_CONNECTED" }),
 });
 
 /* A comment */
@@ -2374,23 +2374,23 @@ const foo3 = 123
 let obj1 =
   // Comment
   {
-    key: "val"
+    key: "val",
   };
 
 let obj2 =
   // Comment
   {
-    key: "val"
+    key: "val",
   };
 
 let obj3 = {
   // Comment
-  key: "val"
+  key: "val",
 };
 
 let obj4 = {
   // Comment
-  key: "val"
+  key: "val",
 };
 
 let obj5 =
@@ -2403,12 +2403,12 @@ let obj6 =
 
 let obj7 = [
   // Comment
-  "val"
+  "val",
 ];
 
 let obj8 = [
   // Comment
-  "val"
+  "val",
 ];
 
 let obj9 =
diff --git a/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap b/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap
index 109e446fe..d4df30ce9 100644
--- a/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap
@@ -86,7 +86,7 @@ let inlineComment = /* some comment */ someReallyLongFunctionCall(
 );
 
 let object = {
-  key: /* some comment */ someReallyLongFunctionCall(withLots, ofArguments)
+  key: /* some comment */ someReallyLongFunctionCall(withLots, ofArguments),
 };
 
 // preserve parens only for type casts
@@ -138,7 +138,7 @@ const style = /** @type {{
 }} */ ({
   width,
   height,
-  ...margins
+  ...margins,
 });
 
 const style2 = /**
@@ -146,7 +146,7 @@ const style2 = /**
  *   width: number,
  * }}
  */ ({
-  width
+  width,
 });
 
 // Spaces aren't necessary
diff --git a/tests/css_atrule/__snapshots__/jsfmt.spec.js.snap b/tests/css_atrule/__snapshots__/jsfmt.spec.js.snap
index 62029906e..242282b7e 100644
--- a/tests/css_atrule/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/css_atrule/__snapshots__/jsfmt.spec.js.snap
@@ -2584,29 +2584,20 @@ a {
   @include section-type-1(
     $header: (
       margin: 0 0 $margin-base,
-      text-align: left
+      text-align: left,
     ),
     $decoration: (
       type: base,
       margin: 0 auto -1px 0,
       primary-color: $brand-primary,
-      secondary-color: $gray-light
+      secondary-color: $gray-light,
     ),
     $title: (
       margin: 0 0 $margin-small,
       color: false,
       font-size: $font-size-h3,
       font-weight: false,
-      line-height: $line-height-h3
-    )
-  );
-}
-
-a {
-  @include item-spotlight-properties-transition(
-    "-title",
-    (
-      box-shadow: 0 3px 10px rgba(0, 0, 0, 0.15)
+      line-height: $line-height-h3,
     )
   );
 }
@@ -2616,7 +2607,16 @@ a {
     "-title",
     (
       box-shadow: 0 3px 10px rgba(0, 0, 0, 0.15),
-      border-color: $brand-primary
+    )
+  );
+}
+
+a {
+  @include item-spotlight-properties-transition(
+    "-title",
+    (
+      box-shadow: 0 3px 10px rgba(0, 0, 0, 0.15),
+      border-color: $brand-primary,
     )
   );
 }
@@ -2627,7 +2627,7 @@ a {
     (
       box-shadow: 0 3px 10px rgba(0, 0, 0, 0.15),
       border-color:
-        $very-very-very-very-very-very-very-very-very-very-very-very-very-long-value
+        $very-very-very-very-very-very-very-very-very-very-very-very-very-long-value,
     )
   );
 }
diff --git a/tests/css_scss/__snapshots__/jsfmt.spec.js.snap b/tests/css_scss/__snapshots__/jsfmt.spec.js.snap
index fc75d517c..e4d1b17e3 100644
--- a/tests/css_scss/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/css_scss/__snapshots__/jsfmt.spec.js.snap
@@ -4,6 +4,7 @@ exports[`import_comma.scss 1`] = `
 ====================================options=====================================
 parsers: ["scss"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 @import "rounded-corners", "text-shadow";
@@ -18,7 +19,6 @@ exports[`import_comma.scss 2`] = `
 ====================================options=====================================
 parsers: ["scss"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 @import "rounded-corners", "text-shadow";
@@ -33,6 +33,7 @@ exports[`scss.scss 1`] = `
 ====================================options=====================================
 parsers: ["scss"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 @media #{$g-breakpoint-tiny} {}
@@ -2055,7 +2056,6 @@ exports[`scss.scss 2`] = `
 ====================================options=====================================
 parsers: ["scss"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 @media #{$g-breakpoint-tiny} {}
diff --git a/tests/css_scss/jsfmt.spec.js b/tests/css_scss/jsfmt.spec.js
index 548d429d8..f2558a4a9 100644
--- a/tests/css_scss/jsfmt.spec.js
+++ b/tests/css_scss/jsfmt.spec.js
@@ -1,2 +1,2 @@
+run_spec(__dirname, ["scss"], { trailingComma: "none" });
 run_spec(__dirname, ["scss"]);
-run_spec(__dirname, ["scss"], { trailingComma: "es5" });
diff --git a/tests/css_trailing_comma/__snapshots__/jsfmt.spec.js.snap b/tests/css_trailing_comma/__snapshots__/jsfmt.spec.js.snap
index 95cde73f2..387b0efa0 100644
--- a/tests/css_trailing_comma/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/css_trailing_comma/__snapshots__/jsfmt.spec.js.snap
@@ -4,6 +4,7 @@ exports[`at-rules.css 1`] = `
 ====================================options=====================================
 parsers: ["css"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 a {
@@ -79,7 +80,6 @@ exports[`at-rules.css 2`] = `
 ====================================options=====================================
 parsers: ["scss"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 a {
@@ -155,6 +155,7 @@ exports[`declaration.css 1`] = `
 ====================================options=====================================
 parsers: ["css"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 a {
@@ -173,7 +174,6 @@ exports[`declaration.css 2`] = `
 ====================================options=====================================
 parsers: ["scss"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 a {
@@ -192,6 +192,7 @@ exports[`list.css 1`] = `
 ====================================options=====================================
 parsers: ["css"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 $colors: hotpink deepskyblue firebrick,;
@@ -297,7 +298,6 @@ exports[`list.css 2`] = `
 ====================================options=====================================
 parsers: ["scss"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 $colors: hotpink deepskyblue firebrick,;
@@ -403,6 +403,7 @@ exports[`map.css 1`] = `
 ====================================options=====================================
 parsers: ["css"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 $map: (
@@ -447,7 +448,6 @@ exports[`map.css 2`] = `
 ====================================options=====================================
 parsers: ["scss"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 $map: (
@@ -492,6 +492,7 @@ exports[`selector_list.css 1`] = `
 ====================================options=====================================
 parsers: ["css"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 asdasldaskdhjkashdahsdkjahskdjhakjsdkjahsdhkasdhkajsdhakjsdhkajsdhjkahskjdkjahsjkdjkakjsdm,
@@ -523,7 +524,6 @@ exports[`selector_list.css 2`] = `
 ====================================options=====================================
 parsers: ["scss"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 asdasldaskdhjkashdahsdkjahskdjhakjsdkjahsdhkasdhkajsdhakjsdhkajsdhjkahskjdkjahsjkdjkakjsdm,
@@ -555,6 +555,7 @@ exports[`variable.css 1`] = `
 ====================================options=====================================
 parsers: ["css"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 $test: 1,;
@@ -572,7 +573,6 @@ exports[`variable.css 2`] = `
 ====================================options=====================================
 parsers: ["scss"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 $test: 1,;
diff --git a/tests/css_trailing_comma/jsfmt.spec.js b/tests/css_trailing_comma/jsfmt.spec.js
index ddf82c2c8..c9fbdf77d 100644
--- a/tests/css_trailing_comma/jsfmt.spec.js
+++ b/tests/css_trailing_comma/jsfmt.spec.js
@@ -1,2 +1,2 @@
-run_spec(__dirname, ["css"]);
-run_spec(__dirname, ["scss"], { trailingComma: "es5" });
+run_spec(__dirname, ["css"], { trailingComma: "none" });
+run_spec(__dirname, ["scss"]);
diff --git a/tests/decorators-ts/__snapshots__/jsfmt.spec.js.snap b/tests/decorators-ts/__snapshots__/jsfmt.spec.js.snap
index 898ab7e2f..a71428437 100644
--- a/tests/decorators-ts/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/decorators-ts/__snapshots__/jsfmt.spec.js.snap
@@ -68,7 +68,7 @@ export class HeroButtonComponent {
   selector: "toh-hero-button",
   template: \`
     <button>{{ label }}</button>
-  \`
+  \`,
 })
 export class HeroButtonComponent {
   @Output() change = new EventEmitter<any>();
diff --git a/tests/decorators/__snapshots__/jsfmt.spec.js.snap b/tests/decorators/__snapshots__/jsfmt.spec.js.snap
index c62a7faa8..0043aa91f 100644
--- a/tests/decorators/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/decorators/__snapshots__/jsfmt.spec.js.snap
@@ -91,7 +91,7 @@ var x = 100;
 @Hello({
   a: "a", // Comment is in the wrong place
   // test
-  b: "2"
+  b: "2",
 })
 class X {}
 
@@ -103,8 +103,8 @@ class X {}
 
     // App modules.
     CoreModule,
-    SharedModule
-  ]
+    SharedModule,
+  ],
 })
 export class AppModule {}
 
@@ -324,14 +324,14 @@ const dog = {
   @readonly
   @nonenumerable
   @doubledValue
-  eyes: 2
+  eyes: 2,
 };
 
 const foo = {
   @multipleDecorators
   @inline
   @theyWontAllFitInOneline
-  aVeryLongPropName: "A very long string as value"
+  aVeryLongPropName: "A very long string as value",
 };
 
 ================================================================================
diff --git a/tests/destructuring/__snapshots__/jsfmt.spec.js.snap b/tests/destructuring/__snapshots__/jsfmt.spec.js.snap
index ba16e29d9..36f112ae8 100644
--- a/tests/destructuring/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/destructuring/__snapshots__/jsfmt.spec.js.snap
@@ -58,14 +58,14 @@ a = ([s = 1]) => 1;
 const { children, ...props } = this.props;
 
 const {
-  user: { firstName, lastName }
+  user: { firstName, lastName },
 } = this.props;
 
 const {
   name: { first, last },
   organisation: {
-    address: { street: orgStreetAddress, postcode: orgPostcode }
-  }
+    address: { street: orgStreetAddress, postcode: orgPostcode },
+  },
 } = user;
 
 function f({ data: { name } }) {}
@@ -73,8 +73,8 @@ function f({ data: { name } }) {}
 const UserComponent = function({
   name: { first, last },
   organisation: {
-    address: { street: orgStreetAddress, postcode: orgPostcode }
-  }
+    address: { street: orgStreetAddress, postcode: orgPostcode },
+  },
 }) {
   return;
 };
@@ -83,7 +83,7 @@ const {
   a,
   b,
   c,
-  d: { e }
+  d: { e },
 } = someObject;
 
 try {
@@ -96,8 +96,8 @@ try {
   // code
 } catch ({
   data: {
-    message: { errors }
-  }
+    message: { errors },
+  },
 }) {
   // code
 }
@@ -105,7 +105,7 @@ try {
 const obj = {
   func(id, { blog: { title } }) {
     return id + title;
-  }
+  },
 };
 
 class A {
diff --git a/tests/do/__snapshots__/jsfmt.spec.js.snap b/tests/do/__snapshots__/jsfmt.spec.js.snap
index 74b5471dd..1794a10c0 100644
--- a/tests/do/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/do/__snapshots__/jsfmt.spec.js.snap
@@ -66,7 +66,7 @@ const envSpecific = {
   domain: do {
     if (env === "production") "https://abc.mno.com/";
     else if (env === "development") "http://localhost:4000";
-  }
+  },
 };
 
 let x = do {
diff --git a/tests/empty_paren_comment/__snapshots__/jsfmt.spec.js.snap b/tests/empty_paren_comment/__snapshots__/jsfmt.spec.js.snap
index f18e3604a..9196d71be 100644
--- a/tests/empty_paren_comment/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/empty_paren_comment/__snapshots__/jsfmt.spec.js.snap
@@ -69,7 +69,7 @@ const obj = {
   f(/* ... */) {},
   f: (/* ... */) => {},
   f: function(/* ... */) {},
-  f: function f(/* ... */) {}
+  f: function f(/* ... */) {},
 };
 
 class Foo {
diff --git a/tests/export/__snapshots__/jsfmt.spec.js.snap b/tests/export/__snapshots__/jsfmt.spec.js.snap
index fc1d82ed2..43bc02edb 100644
--- a/tests/export/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/export/__snapshots__/jsfmt.spec.js.snap
@@ -27,7 +27,7 @@ export {
   itGo,
   multiLine,
   andMore,
-  soWeCanGetItTo80Columns
+  soWeCanGetItTo80Columns,
 };
 export { fitsIn, oneLine };
 
@@ -62,7 +62,7 @@ export {
   itGo,
   multiLine,
   andMore,
-  soWeCanGetItTo80Columns
+  soWeCanGetItTo80Columns,
 };
 export {fitsIn, oneLine};
 
diff --git a/tests/export_extension/__snapshots__/jsfmt.spec.js.snap b/tests/export_extension/__snapshots__/jsfmt.spec.js.snap
index 3f4f650ce..1cf43ab4d 100644
--- a/tests/export_extension/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/export_extension/__snapshots__/jsfmt.spec.js.snap
@@ -23,11 +23,11 @@ export c, { foo } from "mod";
 export * as d, { bar } from "mod";
 export { fooooooooooooooooooooooooooooooooooooooooooooooooo } from "fooooooooooooooooooooooooooooo";
 export Bar, {
-  barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
+  barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr,
 } from "barrrrrrrrrrrrrrrrrrrrrrrrrrrr";
 export {
   foooooooooooooooooooooooooooooooooooooooooooooo,
-  fooooooooooooooooooooooooooooooooooooooooooooooo
+  fooooooooooooooooooooooooooooooooooooooooooooooo,
 } from "fooooooooooooooooooooooooooooo";
 
 ================================================================================
diff --git a/tests/exports/__snapshots__/jsfmt.spec.js.snap b/tests/exports/__snapshots__/jsfmt.spec.js.snap
index 8f1bf6388..29c751c00 100644
--- a/tests/exports/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/exports/__snapshots__/jsfmt.spec.js.snap
@@ -22,7 +22,7 @@ export {
   value2 as value2_renamed,
   value3,
   value4 as value4_renamed,
-  value5
+  value5,
 } from "exports";
 
 export a, { b } from "./baz";
diff --git a/tests/flow/annot/__snapshots__/jsfmt.spec.js.snap b/tests/flow/annot/__snapshots__/jsfmt.spec.js.snap
index 2e12dbe04..f98241fbd 100644
--- a/tests/flow/annot/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/annot/__snapshots__/jsfmt.spec.js.snap
@@ -80,7 +80,7 @@ var qux = function(str: string, i: number): number {
 var obj: { str: string, i: number, j: boolean } = {
   str: "...",
   i: "...",
-  k: false
+  k: false,
 };
 
 var arr: Array<number> = [1, 2, "..."];
@@ -90,7 +90,7 @@ var array: number[] = [1, 2, "..."];
 
 var matrix: number[][] = [
   [1, 2],
-  [3, 4]
+  [3, 4],
 ];
 var matrix_parens: number[][] = matrix;
 
@@ -101,7 +101,7 @@ var array_of_nullable: (?number)[] = [null, 3];
 
 var array_of_tuple: [number, string][] = [
   [0, "foo"],
-  [1, "bar"]
+  [1, "bar"],
 ];
 var array_of_tuple_parens: [number, string][] = array_of_tuple;
 
@@ -127,7 +127,7 @@ function param_anno2(
     return {
       method: request.method,
       params: request.params,
-      relative_url: request.path
+      relative_url: request.path,
     };
   });
   // ...
diff --git a/tests/flow/arith/__snapshots__/jsfmt.spec.js.snap b/tests/flow/arith/__snapshots__/jsfmt.spec.js.snap
index 013e7b4ca..2210d6018 100644
--- a/tests/flow/arith/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/arith/__snapshots__/jsfmt.spec.js.snap
@@ -187,7 +187,7 @@ let tests = [
 
     (x + z: empty); // error, string ~> empty
     (z + x: empty); // error, string ~> empty
-  }
+  },
 ];
 
 ================================================================================
@@ -365,7 +365,7 @@ let tests = [
   function(x: any, y: number, z: string) {
     x > y;
     x > z;
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/arraylib/__snapshots__/jsfmt.spec.js.snap b/tests/flow/arraylib/__snapshots__/jsfmt.spec.js.snap
index 616a5cba2..130d92dfc 100644
--- a/tests/flow/arraylib/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/arraylib/__snapshots__/jsfmt.spec.js.snap
@@ -111,7 +111,7 @@ function reduce_test() {
   var flattened = [
     [0, 1],
     [2, 3],
-    [4, 5]
+    [4, 5],
   ].reduce(function(a, b) {
     return a.concat(b);
   });
diff --git a/tests/flow/arrays/__snapshots__/jsfmt.spec.js.snap b/tests/flow/arrays/__snapshots__/jsfmt.spec.js.snap
index d2f576877..bb93e6a16 100644
--- a/tests/flow/arrays/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/arrays/__snapshots__/jsfmt.spec.js.snap
@@ -81,7 +81,7 @@ var abig2: Array<{ x: number, y: number }> = [
   { x: 0, y: 0, a: true },
   { x: 0, y: 0, b: "hey" },
   { x: 0, y: 0, c: 1 },
-  { x: 0, y: 0, c: "hey" }
+  { x: 0, y: 0, c: "hey" },
 ];
 
 module.exports = "arrays";
diff --git a/tests/flow/async/__snapshots__/jsfmt.spec.js.snap b/tests/flow/async/__snapshots__/jsfmt.spec.js.snap
index e0781b82d..f5a4550f4 100644
--- a/tests/flow/async/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/async/__snapshots__/jsfmt.spec.js.snap
@@ -559,17 +559,17 @@ var n = new (async function() {
 var o = {
   async m() {
     await 1;
-  }
+  },
 };
 var ot = {
   async m<T>(a: T) {
     await 1;
-  }
+  },
 };
 var oz = {
   async async(async) {
     await async;
-  }
+  },
 };
 
 var x = { await: 5 };
diff --git a/tests/flow/binary/__snapshots__/jsfmt.spec.js.snap b/tests/flow/binary/__snapshots__/jsfmt.spec.js.snap
index 3a372e3d3..9e32fdb03 100644
--- a/tests/flow/binary/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/binary/__snapshots__/jsfmt.spec.js.snap
@@ -117,7 +117,7 @@ let tests = [
   function(x: Object, y: mixed) {
     "foo" in x; // ok
     "foo" in y; // error
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/callable/__snapshots__/jsfmt.spec.js.snap b/tests/flow/callable/__snapshots__/jsfmt.spec.js.snap
index b3a6b3ca0..8b73f94a2 100644
--- a/tests/flow/callable/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/callable/__snapshots__/jsfmt.spec.js.snap
@@ -20,7 +20,7 @@ function f(x) {
 =====================================output=====================================
 type F = {
   (x: string): number,
-  p?: string
+  p?: string,
 };
 
 function f(x) {
@@ -76,7 +76,7 @@ icall(0); // error, number ~> string
 icall.call(null, 0); // error, number ~> string
 
 type Callable = {
-  (x: string): void
+  (x: string): void,
 };
 
 declare var callable: Callable;
diff --git a/tests/flow/class_statics/__snapshots__/jsfmt.spec.js.snap b/tests/flow/class_statics/__snapshots__/jsfmt.spec.js.snap
index 75fe34463..39990a863 100644
--- a/tests/flow/class_statics/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/class_statics/__snapshots__/jsfmt.spec.js.snap
@@ -132,7 +132,7 @@ module.exports = {
   B: B,
   C: C,
   D: D,
-  E: E
+  E: E,
 };
 
 ================================================================================
diff --git a/tests/flow/classes/__snapshots__/jsfmt.spec.js.snap b/tests/flow/classes/__snapshots__/jsfmt.spec.js.snap
index bd7ccea15..4bc3bc97e 100644
--- a/tests/flow/classes/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/classes/__snapshots__/jsfmt.spec.js.snap
@@ -149,7 +149,7 @@ type Foo = {
   a: string, // exists in TestClass
   b: string, // doesn't exist
   c?: ?string, // exists in TestClass, optional
-  d?: number // doesn't exist
+  d?: number, // doesn't exist
 };
 
 class TestClass {
diff --git a/tests/flow/closure/__snapshots__/jsfmt.spec.js.snap b/tests/flow/closure/__snapshots__/jsfmt.spec.js.snap
index 076901bc0..8ad754b9b 100644
--- a/tests/flow/closure/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/closure/__snapshots__/jsfmt.spec.js.snap
@@ -142,7 +142,7 @@ var global_o = {
   f: function() {},
   g: function() {
     global_y = 42;
-  }
+  },
 };
 
 global_o.f();
@@ -163,7 +163,7 @@ function local_meth() {
     f: function() {},
     g: function() {
       local_y = 42;
-    }
+    },
   };
 
   local_o.f();
diff --git a/tests/flow/computed_props/__snapshots__/jsfmt.spec.js.snap b/tests/flow/computed_props/__snapshots__/jsfmt.spec.js.snap
index bbbf897cd..40e89cfdb 100644
--- a/tests/flow/computed_props/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/computed_props/__snapshots__/jsfmt.spec.js.snap
@@ -34,19 +34,19 @@ module.exports = { ColorId, ColorNumber };
 var ColorId = {
   RED: "R",
   GREEN: "G",
-  BLUE: "B"
+  BLUE: "B",
 };
 
 var ColorNumber = {
   RED: "ff0000",
   GREEN: "00ff00",
-  BLUE: "0000ff"
+  BLUE: "0000ff",
 };
 
 var ColorIdToNumber = {
   [ColorId.RED]: ColorNumber.RED,
   [ColorId.GREEN]: ColorNumber.GREEN,
-  [ColorId.BLUE]: ColorNumber.BLUE
+  [ColorId.BLUE]: ColorNumber.BLUE,
 };
 
 (ColorIdToNumber[ColorId.RED]: "ffffff"); // oops
@@ -80,7 +80,7 @@ var { ColorId, ColorNumber } = require("./test");
 var ColorIdToNumber = {
   [ColorId.RED]: ColorNumber.RED,
   [ColorId.GREEN]: ColorNumber.GREEN,
-  [ColorId.BLUE]: ColorNumber.BLUE
+  [ColorId.BLUE]: ColorNumber.BLUE,
 };
 
 (ColorIdToNumber[ColorId.GREEN]: "ffffff"); // oops
@@ -144,7 +144,7 @@ var dummy = require("./test");
 module.exports = {
   ...dummy,
   [hello]: "world",
-  ...dummy
+  ...dummy,
 };
 
 ================================================================================
@@ -183,14 +183,14 @@ var obj = {
   x: 0,
   m() {
     return this.x;
-  }
+  },
 };
 var x: string = obj["m"](); // error, number ~> string
 
 var arr = [
   function() {
     return this.length;
-  }
+  },
 ];
 var y: string = arr[0](); // error: number ~> string
 
diff --git a/tests/flow/config_module_name_rewrite_haste/__snapshots__/jsfmt.spec.js.snap b/tests/flow/config_module_name_rewrite_haste/__snapshots__/jsfmt.spec.js.snap
index 1c5bca2a0..904cb4c77 100644
--- a/tests/flow/config_module_name_rewrite_haste/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/config_module_name_rewrite_haste/__snapshots__/jsfmt.spec.js.snap
@@ -60,7 +60,7 @@ module.exports = {
  */
 
 module.exports = {
-  numVal: 42
+  numVal: 42,
 };
 
 ================================================================================
diff --git a/tests/flow/config_module_name_rewrite_node/__snapshots__/jsfmt.spec.js.snap b/tests/flow/config_module_name_rewrite_node/__snapshots__/jsfmt.spec.js.snap
index d2ebbabe2..186f69711 100644
--- a/tests/flow/config_module_name_rewrite_node/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/config_module_name_rewrite_node/__snapshots__/jsfmt.spec.js.snap
@@ -78,7 +78,7 @@ module.exports = {
 /* @flow */
 
 module.exports = {
-  numVal: 42
+  numVal: 42,
 };
 
 ================================================================================
diff --git a/tests/flow/constructor_annots/__snapshots__/jsfmt.spec.js.snap b/tests/flow/constructor_annots/__snapshots__/jsfmt.spec.js.snap
index 3011a2702..2c80a42e2 100644
--- a/tests/flow/constructor_annots/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/constructor_annots/__snapshots__/jsfmt.spec.js.snap
@@ -37,7 +37,7 @@ Foo.y = 0; // has static property y
 Foo.prototype = {
   m() {
     return 0;
-  }
+  },
 };
 
 // exporting Foo directly doesn't work
diff --git a/tests/flow/core_tests/__snapshots__/jsfmt.spec.js.snap b/tests/flow/core_tests/__snapshots__/jsfmt.spec.js.snap
index fd4ea9ff1..2c1a9bb53 100644
--- a/tests/flow/core_tests/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/core_tests/__snapshots__/jsfmt.spec.js.snap
@@ -90,7 +90,7 @@ let tests = [
     Boolean(NaN);
     Boolean(undefined);
     Boolean("");
-  }
+  },
 ];
 
 ================================================================================
@@ -166,7 +166,7 @@ let tests = [
   function(x: Map<string, number>) {
     (x.get("foo"): boolean); // error, string | void
     x.get(123); // error, wrong key type
-  }
+  },
 ];
 
 ================================================================================
@@ -236,7 +236,7 @@ let tests = [
   function() {
     RegExp("foo", "z"); // error
     new RegExp("foo", "z"); // error
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/declare_class/lib/__snapshots__/jsfmt.spec.js.snap b/tests/flow/declare_class/lib/__snapshots__/jsfmt.spec.js.snap
index 7ca26589c..cfbe46114 100644
--- a/tests/flow/declare_class/lib/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/declare_class/lib/__snapshots__/jsfmt.spec.js.snap
@@ -21,7 +21,7 @@ declare class _C {
   foo(): number;
 }
 declare var _module: {
-  C: Class<_C>
+  C: Class<_C>,
 };
 declare class D extends _module.C {
   foo(): string;
diff --git a/tests/flow/declare_export/__snapshots__/jsfmt.spec.js.snap b/tests/flow/declare_export/__snapshots__/jsfmt.spec.js.snap
index 30e9e385d..c2255276b 100644
--- a/tests/flow/declare_export/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/declare_export/__snapshots__/jsfmt.spec.js.snap
@@ -126,7 +126,7 @@ module.exports = {
   numberValue2: 2,
   numberValue3: 3,
   numberValue4: 4,
-  numberValue5: 5
+  numberValue5: 5,
 };
 
 ================================================================================
@@ -484,7 +484,7 @@ declare export {
 
 declare export {
   numberValue1,
-  numberValue2 as numberValue2_renamed
+  numberValue2 as numberValue2_renamed,
 } from "ES6_ExportFrom_Source1";
 
 ================================================================================
@@ -514,7 +514,7 @@ declare export {
 
 declare export {
   numberValue1,
-  numberValue2 as numberValue2_renamed2
+  numberValue2 as numberValue2_renamed2,
 } from "ES6_ExportFrom_Source2";
 
 ================================================================================
@@ -734,7 +734,7 @@ module.exports = {
  */
 
 module.exports = {
-  numberValue: 42
+  numberValue: 42,
 };
 
 ================================================================================
@@ -1365,7 +1365,7 @@ import { specifierNumber } from "ES6_Named1"; // Error: Did you mean \`specifier
 ///////////////////////////////////////////////////
 import {
   numberValue1 as numberValue8,
-  numberValue2 as numberValue9
+  numberValue2 as numberValue9,
 } from "./ES6_ExportAllFromMulti";
 
 var at1: number = numberValue8;
diff --git a/tests/flow/declare_type/lib/__snapshots__/jsfmt.spec.js.snap b/tests/flow/declare_type/lib/__snapshots__/jsfmt.spec.js.snap
index 61fc535d7..87bf8bb91 100644
--- a/tests/flow/declare_type/lib/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/declare_type/lib/__snapshots__/jsfmt.spec.js.snap
@@ -69,7 +69,7 @@ declare module "foo" {
   declare type Id<T> = T;
 
   declare var exports: {
-    (a: number, b: number): number
+    (a: number, b: number): number,
   };
 }
 
diff --git a/tests/flow/destructuring/__snapshots__/jsfmt.spec.js.snap b/tests/flow/destructuring/__snapshots__/jsfmt.spec.js.snap
index 3d31ace49..37f21cab2 100644
--- a/tests/flow/destructuring/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/destructuring/__snapshots__/jsfmt.spec.js.snap
@@ -201,22 +201,22 @@ obj_rest({ p: { q: 0, r: null } });
 
 function obj_prop_annot(
   {
-    p = true // error: boolean ~> string
+    p = true, // error: boolean ~> string
   }: {
-    p: string
+    p: string,
   } = {
-    p: 0 // error: number ~> string
+    p: 0, // error: number ~> string
   }
 ) {
   (p: void); // error: string ~> void
 }
 
 var {
-  p = true // error: boolean ~> string
+  p = true, // error: boolean ~> string
 }: {
-  p: string
+  p: string,
 } = {
-  p: 0 // error: number ~> string
+  p: 0, // error: number ~> string
 };
 (p: void); // error: string ~> void
 
@@ -620,7 +620,7 @@ function bar() {
 // @flow
 
 var { x } = {
-  x: { foo: "foo" }
+  x: { foo: "foo" },
 };
 
 function bar() {
diff --git a/tests/flow/dictionary/__snapshots__/jsfmt.spec.js.snap b/tests/flow/dictionary/__snapshots__/jsfmt.spec.js.snap
index bb54b9a0c..98d328ee5 100644
--- a/tests/flow/dictionary/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/dictionary/__snapshots__/jsfmt.spec.js.snap
@@ -57,7 +57,7 @@ function foo0(
 }
 
 function foo2(x: {
-  [key: string]: number
+  [key: string]: number,
 }): { [key: string]: number, +toString: () => string } {
   // x's prototype has a toString method
   return x;
@@ -469,7 +469,7 @@ function mix_with_declared_props(o: { [k: number]: X, p: Y }, x: X, y: Y) {
 
 // Indeed, dict types are still Objects and have Object.prototype stuff
 function object_prototype(o: {
-  [k: string]: number
+  [k: string]: number,
 }): { [k: string]: number, +toString: () => string } {
   (o.toString(): boolean); // error: string ~> boolean
   return o; // ok
@@ -480,7 +480,7 @@ function object_prototype(o: {
 // write into a declared prop unsoundly.
 function unsound_string_conversion_alias_declared_prop(o: {
   [k: number]: any,
-  "0": X
+  "0": X,
 }) {
   o[0] = "not-x"; // a["0"] no longer X
 }
@@ -509,19 +509,19 @@ function subtype_dict_values_fresh_exception() {
   let a: { [k: string]: A } = {
     a: new A(), // ok, A == A
     b: new B(), // ok, B <: A
-    c: new C() // ok, C <: A
+    c: new C(), // ok, C <: A
   };
 
   let b: { [k: string]: B } = {
     a: new A(), // error, A not <: B
     b: new B(), // ok, B == B
-    c: new C() // ok, C <: A
+    c: new C(), // ok, C <: A
   };
 
   let c: { [k: string]: C } = {
     a: new A(), // error, A not <: C
     b: new B(), // error, A not <: C
-    c: new C() // ok, C == C
+    c: new C(), // ok, C == C
   };
 }
 
@@ -777,7 +777,7 @@ function foo3(x: { [key: string]: number }): { foo: number } {
 
 // error: foo can't exist in x
 function foo4(x: {
-  [key: string]: number
+  [key: string]: number,
 }): { [key: string]: number, foo: string } {
   return x;
 }
@@ -890,7 +890,7 @@ type QueryFunction = (params: Params) => string;
 var o: { foo: QueryFunction } = {
   foo(params) {
     return params.count; // error, number ~/~ string
-  }
+  },
 };
 
 module.exports = o;
diff --git a/tests/flow/disjoint-union-perf/__snapshots__/jsfmt.spec.js.snap b/tests/flow/disjoint-union-perf/__snapshots__/jsfmt.spec.js.snap
index 734f26e47..17ad46002 100644
--- a/tests/flow/disjoint-union-perf/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/disjoint-union-perf/__snapshots__/jsfmt.spec.js.snap
@@ -105,7 +105,7 @@ export type Pos = {
   firstLine: number,
   firstColumn: number,
   lastLine: number,
-  lastColumn: number
+  lastColumn: number,
 };
 
 export type TypedBinaryOpNode = {
@@ -115,7 +115,7 @@ export type TypedBinaryOpNode = {
   rhs: TypedNode,
   pos: Pos,
   exprType: InferredType,
-  typed: true
+  typed: true,
 };
 
 export type TypedUnaryMinusNode = {
@@ -123,7 +123,7 @@ export type TypedUnaryMinusNode = {
   op: TypedNode,
   pos: Pos,
   exprType: InferredType,
-  typed: true
+  typed: true,
 };
 
 export type TypedNumberNode = {
@@ -131,7 +131,7 @@ export type TypedNumberNode = {
   value: number,
   pos: Pos,
   exprType: "number",
-  typed: true
+  typed: true,
 };
 
 export type TypedStringLiteralNode = {
@@ -139,7 +139,7 @@ export type TypedStringLiteralNode = {
   value: string,
   pos: Pos,
   exprType: "string",
-  typed: true
+  typed: true,
 };
 
 export type TypedVariableNode = {
@@ -147,7 +147,7 @@ export type TypedVariableNode = {
   name: string,
   pos: Pos,
   exprType: InferredType,
-  typed: true
+  typed: true,
 };
 
 export type TypedFunctionInvocationNode = {
@@ -156,7 +156,7 @@ export type TypedFunctionInvocationNode = {
   parameters: TypedNode[],
   pos: Pos,
   exprType: "error" | "string",
-  typed: true
+  typed: true,
 };
 
 export type TypedNode =
@@ -961,18 +961,18 @@ export type Comment = {
   loc: ?SourceLocation,
   value: string,
   leading: boolean,
-  trailing: boolean
+  trailing: boolean,
 };
 
 export type SourceLocation = {
   start: SourcePosition,
   end: SourcePosition,
-  source: ?string
+  source: ?string,
 };
 
 export type SourcePosition = {
   line: number,
-  column: number
+  column: number,
 };
 
 export type File = {
@@ -981,7 +981,7 @@ export type File = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "File",
-  program: Program
+  program: Program,
 };
 
 export type Program = {
@@ -990,7 +990,7 @@ export type Program = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "Program",
-  body: Statement[]
+  body: Statement[],
 };
 
 export type BinaryOperator =
@@ -1098,7 +1098,7 @@ export type EmptyStatement = {
   start: SourcePosition,
   end: SourcePosition,
   comments: ?Array<Comment>,
-  type: "EmptyStatement"
+  type: "EmptyStatement",
 };
 
 export type BlockStatement = {
@@ -1107,7 +1107,7 @@ export type BlockStatement = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "BlockStatement",
-  body: Statement[]
+  body: Statement[],
 };
 
 export type ExpressionStatement = {
@@ -1116,7 +1116,7 @@ export type ExpressionStatement = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "ExpressionStatement",
-  expression: Expression
+  expression: Expression,
 };
 
 export type IfStatement = {
@@ -1127,7 +1127,7 @@ export type IfStatement = {
   type: "IfStatement",
   test: Expression,
   consequent: Statement,
-  alternate: ?Statement
+  alternate: ?Statement,
 };
 
 export type BreakStatement = {
@@ -1136,7 +1136,7 @@ export type BreakStatement = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "BreakStatement",
-  label: ?Identifier
+  label: ?Identifier,
 };
 
 export type ContinueStatement = {
@@ -1145,7 +1145,7 @@ export type ContinueStatement = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "ContinueStatement",
-  label: ?Identifier
+  label: ?Identifier,
 };
 
 export type ReturnStatement = {
@@ -1154,7 +1154,7 @@ export type ReturnStatement = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "ReturnStatement",
-  argument: ?Expression
+  argument: ?Expression,
 };
 
 export type ThrowStatement = {
@@ -1163,7 +1163,7 @@ export type ThrowStatement = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "ThrowStatement",
-  argument: ?Expression
+  argument: ?Expression,
 };
 
 export type WhileStatement = {
@@ -1173,7 +1173,7 @@ export type WhileStatement = {
   comments: ?Array<Comment>,
   type: "WhileStatement",
   test: Expression,
-  body: Statement
+  body: Statement,
 };
 
 export type ForStatement = {
@@ -1185,7 +1185,7 @@ export type ForStatement = {
   init: ?(VariableDeclaration | Expression),
   test: ?Expression,
   update: ?Expression,
-  body: Statement
+  body: Statement,
 };
 
 export type ForInStatement = {
@@ -1196,7 +1196,7 @@ export type ForInStatement = {
   type: "ForInStatement",
   left: VariableDeclaration | Expression,
   right: Expression,
-  body: Statement
+  body: Statement,
 };
 
 export type TryStatement = {
@@ -1208,7 +1208,7 @@ export type TryStatement = {
   block: BlockStatement,
   handler: ?CatchClause,
   handlers: CatchClause[],
-  finalizer: ?BlockStatement
+  finalizer: ?BlockStatement,
 };
 
 export type CatchClause = {
@@ -1219,7 +1219,7 @@ export type CatchClause = {
   type: "CatchClause",
   param: Pattern,
   guard: ?Expression,
-  body: BlockStatement
+  body: BlockStatement,
 };
 
 export type Expression =
@@ -1245,7 +1245,7 @@ export type Identifier = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "Identifier",
-  name: string
+  name: string,
 };
 
 export type Literal = {
@@ -1255,7 +1255,7 @@ export type Literal = {
   comments: ?Array<Comment>,
   type: "Literal",
   value: ?(string | boolean | number | RegExp),
-  regex: ?{ pattern: string, flags: string }
+  regex: ?{ pattern: string, flags: string },
 };
 
 export type ThisExpression = {
@@ -1263,7 +1263,7 @@ export type ThisExpression = {
   start: SourcePosition,
   end: SourcePosition,
   comments: ?Array<Comment>,
-  type: "ThisExpression"
+  type: "ThisExpression",
 };
 
 export type ArrayExpression = {
@@ -1272,7 +1272,7 @@ export type ArrayExpression = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "ArrayExpression",
-  elements: Expression[]
+  elements: Expression[],
 };
 
 export type ObjectExpreession = {
@@ -1281,7 +1281,7 @@ export type ObjectExpreession = {
   end: SourcePosition,
   comments: ?Array<Comment>,
   type: "ObjectExpression",
-  properties: Property[]
+  properties: Property[],
 };
 
 export type Property = {
@@ -1292,7 +1292,7 @@ export type Property = {
   type: "Property",
   kind: "init" | "get" | "set",
   key: Literal | Identifier,
-  value: Expression
+  value: Expression,
 };
 
 export type FunctionExpression = {
@@ -1303,7 +1303,7 @@ export type FunctionExpression = {
   type: "FunctionExpression",
   id: ?Identifier,
   params: Pattern[],
-  body: BlockStatement
+  body: BlockStatement,
 };
 
 export type BinaryExpression = {
@@ -1314,7 +1314,7 @@ export type BinaryExpression = {
   type: "BinaryExpression",
   operator: BinaryOperator,
   left: Expression,
-  right: Expression
+  right: Expression,
 };
 
 export type UnaryExpression = {
@@ -1325,7 +1325,7 @@ export type UnaryExpression = {
   type: "UnaryExpression",
   operator: UnaryOperator,
   argument: Expression,
-  prefix: boolean
+  prefix: boolean,
 };
 
 export type AssignmentExpression = {
@@ -1336,7 +1336,7 @@ export type AssignmentExpression = {
   type: "AssignmentExpression",
   operator: AssignmentOperator,
   left: Pattern,
-  right: Expression
+  right: Expression,
 };
 
 export type UpdateExpression = {
@@ -1347,7 +1347,7 @@ export type UpdateExpression = {
   type: "UpdateExpression",
   operator: UpdateOperator,
   argument: Expression,
-  prefix: boolean
+  prefix: boolean,
 };
 
 export type LogicalExpression = {
@@ -1358,7 +1358,7 @@ export type LogicalExpression = {
   type: "LogicalExpression",
   operator: LogicalOperator,
   left: Expression,
-  right: Expression
+  right: Expression,
 };
 
 export type ConditionalExpression = {
@@ -1369,7 +1369,7 @@ export type ConditionalExpression = {
   type: "ConditionalExpression",
   test: Expression,
   consequent: Expression,
-  alternate: Expression
+  alternate: Expression,
 };
 
 export type NewExpression = {
@@ -1379,7 +1379,7 @@ export type NewExpression = {
   comments: ?Array<Comment>,
   type: "NewExpression",
   callee: Expression,
-  arguments: Expression[]
+  arguments: Expression[],
 };
 
 export type CallExpression = {
@@ -1389,7 +1389,7 @@ export type CallExpression = {
   comments: ?Array<Comment>,
   type: "CallExpression",
   callee: Expression,
-  arguments: Expression[]
+  arguments: Expression[],
 };
 
 export type MemberExpression = {
@@ -1400,7 +1400,7 @@ export type MemberExpression = {
   type: "MemberExpression",
   object: Expression,
   property: Identifier | Expression,
-  computed: boolean
+  computed: boolean,
 };
 // ast-types exports all expressions as patterns.
 // That seems not like it was intended.
@@ -1415,7 +1415,7 @@ export type VariableDeclaration = {
   comments: ?Array<Comment>,
   type: "VariableDeclaration",
   kind: "var" | "let" | "const",
-  declarations: VariableDeclarator[]
+  declarations: VariableDeclarator[],
 };
 
 export type FunctionDeclaration = {
@@ -1426,7 +1426,7 @@ export type FunctionDeclaration = {
   type: "FunctionDeclaration",
   id: Identifier,
   body: BlockStatement,
-  params: Pattern[]
+  params: Pattern[],
 };
 
 export type VariableDeclarator = {
@@ -1436,7 +1436,7 @@ export type VariableDeclarator = {
   comments: ?Array<Comment>,
   type: "VariableDeclarator",
   id: Pattern,
-  init: ?Expression
+  init: ?Expression,
 };
 
 const a: any = null;
@@ -1541,7 +1541,7 @@ export const builders: {
     body: BlockStatement,
     params: Pattern[]
   ): FunctionDeclaration,
-  variableDeclarator(id: Pattern, init?: Expression): VariableDeclarator
+  variableDeclarator(id: Pattern, init?: Expression): VariableDeclarator,
 } = a;
 
 ================================================================================
diff --git a/tests/flow/dom/__snapshots__/jsfmt.spec.js.snap b/tests/flow/dom/__snapshots__/jsfmt.spec.js.snap
index 75a42a91f..58624762c 100644
--- a/tests/flow/dom/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/dom/__snapshots__/jsfmt.spec.js.snap
@@ -32,7 +32,7 @@ let tests = [
   // moveTo
   function(ctx: CanvasRenderingContext2D) {
     ctx.moveTo("0", "1"); // error: should be numbers
-  }
+  },
 ];
 
 ================================================================================
@@ -62,7 +62,7 @@ let tests = [
   function(document: Document) {
     const event = document.createEvent("CustomEvent");
     event.initCustomEvent("butts", true, false, { nice: 42 });
-  }
+  },
 ];
 
 ================================================================================
@@ -100,7 +100,7 @@ let tests = [
     (document.createElement("select"): HTMLSelectElement);
     (document.querySelector("select"): HTMLSelectElement | null);
     (document.createElement("hr"): HTMLElement); // GH #3752
-  }
+  },
 ];
 
 ================================================================================
@@ -148,7 +148,7 @@ let tests = [
     element.scrollIntoView({ behavior: "invalid" });
     element.scrollIntoView({ block: "invalid" });
     element.scrollIntoView(1);
-  }
+  },
 ];
 
 ================================================================================
@@ -176,7 +176,7 @@ let tests = [
   // getContext
   function(el: HTMLCanvasElement) {
     (el.getContext("2d"): ?CanvasRenderingContext2D);
-  }
+  },
 ];
 
 ================================================================================
@@ -224,7 +224,7 @@ let tests = [
     element.scrollIntoView({ behavior: "invalid" });
     element.scrollIntoView({ block: "invalid" });
     element.scrollIntoView(1);
-  }
+  },
 ];
 
 ================================================================================
@@ -260,7 +260,7 @@ let tests = [
     el.setRangeText("foo", 123, 234);
     el.setRangeText("foo", 123, 234, "select");
     el.setRangeText("foo", 123, 234, "bogus"); // invalid value
-  }
+  },
 ];
 
 ================================================================================
@@ -374,7 +374,7 @@ let tests = [
     window.onmessage = (event: MessageEvent) => {
       (event.target: window);
     };
-  }
+  },
 ];
 
 ================================================================================
@@ -408,7 +408,7 @@ let tests = [
     (path.arcTo(0, 0, 0, 0, 10): void); // valid
     (path.arcTo(0, 0, 0, 0, 10, 20, 5): void); // valid
     (path.arcTo(0, 0, 0, 0, 10, "20", 5): void); // invalid
-  }
+  },
 ];
 
 ================================================================================
@@ -496,9 +496,9 @@ let tests = [
             oldAttributeValue,
             newAttributeValue,
             attributeNamespace
-          ) {}
-        }
-      })
+          ) {},
+        },
+      }),
     });
   },
   // or with Object.assign()
@@ -513,8 +513,8 @@ let tests = [
           oldAttributeValue,
           newAttributeValue,
           attributeNamespace
-        ) {}
-      })
+        ) {},
+      }),
     });
   },
   // should complain about invalid callback parameters
@@ -526,10 +526,10 @@ let tests = [
           oldVal: string, // Error: This might be null
           newVal: string, // Error: This might be null
           namespace: string
-        ) {}
-      }
+        ) {},
+      },
     });
-  }
+  },
 ];
 
 ================================================================================
@@ -930,10 +930,10 @@ let tests = [
     ); // valid
     document.createNodeIterator(document.body, -1, node => "accept"); // invalid
     document.createNodeIterator(document.body, -1, {
-      acceptNode: node => NodeFilter.FILTER_ACCEPT
+      acceptNode: node => NodeFilter.FILTER_ACCEPT,
     }); // valid
     document.createNodeIterator(document.body, -1, {
-      acceptNode: node => "accept"
+      acceptNode: node => "accept",
     }); // invalid
     document.createNodeIterator(document.body, -1, {}); // invalid
   },
@@ -945,13 +945,13 @@ let tests = [
     ); // valid
     document.createTreeWalker(document.body, -1, node => "accept"); // invalid
     document.createTreeWalker(document.body, -1, {
-      acceptNode: node => NodeFilter.FILTER_ACCEPT
+      acceptNode: node => NodeFilter.FILTER_ACCEPT,
     }); // valid
     document.createTreeWalker(document.body, -1, {
-      acceptNode: node => "accept"
+      acceptNode: node => "accept",
     }); // invalid
     document.createTreeWalker(document.body, -1, {}); // invalid
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/enumerror/__snapshots__/jsfmt.spec.js.snap b/tests/flow/enumerror/__snapshots__/jsfmt.spec.js.snap
index 0d54df5e3..8b359a7cd 100644
--- a/tests/flow/enumerror/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/enumerror/__snapshots__/jsfmt.spec.js.snap
@@ -40,8 +40,8 @@ function isActive(ad: {
   state: $Keys<{
     PAUSED: string,
     ACTIVE: string,
-    DELETED: string
-  }>
+    DELETED: string,
+  }>,
 }): boolean {
   return ad.state === "ACTIVE";
 }
@@ -50,7 +50,7 @@ isActive({ state: "PAUSE" });
 var MyStates = {
   PAUSED: "PAUSED",
   ACTIVE: "ACTIVE",
-  DELETED: "DELETED"
+  DELETED: "DELETED",
 };
 function isActive2(ad: { state: $Keys<typeof MyStates> }): boolean {
   return ad.state === MyStates.ACTIVE;
diff --git a/tests/flow/es6modules/__snapshots__/jsfmt.spec.js.snap b/tests/flow/es6modules/__snapshots__/jsfmt.spec.js.snap
index 08fc212e6..be1a4a441 100644
--- a/tests/flow/es6modules/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/es6modules/__snapshots__/jsfmt.spec.js.snap
@@ -118,7 +118,7 @@ module.exports = Object.freeze({
  */
 
 module.exports = Object.freeze({
-  numberValue1: 1
+  numberValue1: 1,
 });
 
 ================================================================================
@@ -154,7 +154,7 @@ module.exports = {
   numberValue2: 2,
   numberValue3: 3,
   numberValue4: 4,
-  numberValue5: 5
+  numberValue5: 5,
 };
 
 ================================================================================
@@ -578,7 +578,7 @@ export {
 
 export {
   numberValue1,
-  numberValue2 as numberValue2_renamed
+  numberValue2 as numberValue2_renamed,
 } from "ES6_ExportFrom_Source1";
 
 ================================================================================
@@ -608,7 +608,7 @@ export {
 
 export {
   numberValue1,
-  numberValue2 as numberValue2_renamed2
+  numberValue2 as numberValue2_renamed2,
 } from "ES6_ExportFrom_Source2";
 
 ================================================================================
@@ -858,7 +858,7 @@ module.exports = {
  */
 
 module.exports = {
-  numberValue: 42
+  numberValue: 42,
 };
 
 ================================================================================
@@ -1518,7 +1518,7 @@ import { specifierNumber } from "ES6_Named1"; // Error: Did you mean \`specifier
 ///////////////////////////////////////////////////
 import {
   numberValue1 as numberValue8,
-  numberValue2 as numberValue9
+  numberValue2 as numberValue9,
 } from "./ES6_ExportAllFromMulti";
 
 var at1: number = numberValue8;
diff --git a/tests/flow/es_declare_module/flow-typed/__snapshots__/jsfmt.spec.js.snap b/tests/flow/es_declare_module/flow-typed/__snapshots__/jsfmt.spec.js.snap
index df15de788..75c37f9f0 100644
--- a/tests/flow/es_declare_module/flow-typed/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/es_declare_module/flow-typed/__snapshots__/jsfmt.spec.js.snap
@@ -38,7 +38,7 @@ declare module "CJS_Clobbered" {
   declare var num2: number;
   declare type numType = number;
   declare var exports: {
-    numExport: number
+    numExport: number,
   };
 }
 
diff --git a/tests/flow/export_type/__snapshots__/jsfmt.spec.js.snap b/tests/flow/export_type/__snapshots__/jsfmt.spec.js.snap
index fa89e7a1a..e7818d1e3 100644
--- a/tests/flow/export_type/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/export_type/__snapshots__/jsfmt.spec.js.snap
@@ -72,7 +72,7 @@ import type {
   inlinedType1,
   standaloneType1,
   talias1,
-  talias3
+  talias3,
 } from "./types_only";
 
 var a: inlinedType1 = 42;
diff --git a/tests/flow/facebookisms/__snapshots__/jsfmt.spec.js.snap b/tests/flow/facebookisms/__snapshots__/jsfmt.spec.js.snap
index a0f8da778..d0204a912 100644
--- a/tests/flow/facebookisms/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/facebookisms/__snapshots__/jsfmt.spec.js.snap
@@ -78,7 +78,7 @@ let tests = [
     (copyProperties(result, { foo: "a" }, { bar: 123 }): {
       foo: string,
       bar: number,
-      baz: boolean
+      baz: boolean,
     });
   },
 
@@ -100,7 +100,7 @@ let tests = [
   function(copyProperties: Object$Assign) {
     function x(cb: Function) {}
     x(copyProperties);
-  }
+  },
 ];
 
 ================================================================================
@@ -140,7 +140,7 @@ let tests = [
     let x: ?string = null;
     invariant(x);
     (x: string);
-  }
+  },
 ];
 
 ================================================================================
@@ -254,7 +254,7 @@ let tests = [
   function(mergeInto: $Facebookism$MergeInto) {
     function x(cb: Function) {}
     x(mergeInto);
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/fetch/__snapshots__/jsfmt.spec.js.snap b/tests/flow/fetch/__snapshots__/jsfmt.spec.js.snap
index 99749677d..3c41d6ab0 100644
--- a/tests/flow/fetch/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/fetch/__snapshots__/jsfmt.spec.js.snap
@@ -47,10 +47,10 @@ const b: Promise<string> = fetch(myRequest); // incorrect
 var myInit = {
   method: "GET",
   headers: {
-    "Content-Type": "image/jpeg"
+    "Content-Type": "image/jpeg",
   },
   mode: "cors",
-  cache: "default"
+  cache: "default",
 };
 
 const c: Promise<Blob> = fetch("image.png").then(response => response.blob()); // correct
@@ -221,10 +221,10 @@ new Request(new URL("http://example.org")); // correct
 const h: Request = new Request("http://example.org", {
   method: "GET",
   headers: {
-    "Content-Type": "image/jpeg"
+    "Content-Type": "image/jpeg",
   },
   mode: "cors",
-  cache: "default"
+  cache: "default",
 }); // correct
 
 var bodyUsed: boolean = h.bodyUsed;
@@ -237,34 +237,34 @@ h.arrayBuffer().then((ab: Buffer) => ab); // incorrect
 const i: Request = new Request("http://example.org", {
   method: "POST",
   headers: {
-    "Content-Type": "application/octet-stream"
+    "Content-Type": "application/octet-stream",
   },
-  body: new ArrayBuffer(10)
+  body: new ArrayBuffer(10),
 }); // correct
 
 const j: Request = new Request("http://example.org", {
   method: "POST",
   headers: {
-    "Content-Type": "application/octet-stream"
+    "Content-Type": "application/octet-stream",
   },
-  body: new Uint8Array(10)
+  body: new Uint8Array(10),
 }); // correct
 
 const k: Request = new Request("http://example.org", {
   method: "POST",
   headers: {
-    "Content-Type": "image/jpeg"
+    "Content-Type": "image/jpeg",
   },
   body: new URLSearchParams("key=value"),
   mode: "cors",
-  cache: "default"
+  cache: "default",
 }); // correct
 
 const l: Request = new Request("http://example.org", {
   method: "GET",
   headers: "Content-Type: image/jpeg",
   mode: "cors",
-  cache: "default"
+  cache: "default",
 }); // incorrect - headers is string
 
 new Request("/", { method: "post" }); // correct
@@ -338,28 +338,28 @@ new Response("", { status: null }); // incorrect
 
 const f: Response = new Response("responsebody", {
   status: 404,
-  headers: "'Content-Type': 'image/jpeg'"
+  headers: "'Content-Type': 'image/jpeg'",
 }); // incorrect
 
 const g: Response = new Response("responsebody", {
   status: 404,
   headers: {
-    "Content-Type": "image/jpeg"
-  }
+    "Content-Type": "image/jpeg",
+  },
 }); // correct
 
 const h: Response = new Response("responsebody", {
   status: 404,
   headers: new Headers({
-    "Content-Type": "image/jpeg"
-  })
+    "Content-Type": "image/jpeg",
+  }),
 }); // correct, if verbose
 
 const i: Response = new Response({
   status: 404,
   headers: new Headers({
-    "Content-Type": "image/jpeg"
-  })
+    "Content-Type": "image/jpeg",
+  }),
 }); // incorrect
 
 const ok: boolean = h.ok;
diff --git a/tests/flow/function/__snapshots__/jsfmt.spec.js.snap b/tests/flow/function/__snapshots__/jsfmt.spec.js.snap
index cdac9b498..f0eaa5ca4 100644
--- a/tests/flow/function/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/function/__snapshots__/jsfmt.spec.js.snap
@@ -173,7 +173,7 @@ let tests = [
   function(x: { (a: string, b: string): void, bind(a: string): void }) {
     (x.bind("foo"): void); // ok
     (x.bind(123): void); // error, number !~> string
-  }
+  },
 ];
 
 ================================================================================
@@ -411,7 +411,7 @@ let tests = [
     // Non-(Function.prototype) properties on a \`Function\` type should be \`any\`
     (z.foo: number);
     (z.foo: string);
-  }
+  },
 ];
 
 // \`Function\` types can be bound (resulting in a \`Function\` type)
diff --git a/tests/flow/get-def/__snapshots__/jsfmt.spec.js.snap b/tests/flow/get-def/__snapshots__/jsfmt.spec.js.snap
index 671677e1b..497a4d3a5 100644
--- a/tests/flow/get-def/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/get-def/__snapshots__/jsfmt.spec.js.snap
@@ -106,7 +106,7 @@ module.exports = {
 
   bar: function(): number {
     return 42;
-  }
+  },
 };
 
 ================================================================================
diff --git a/tests/flow/get-def2/lib/__snapshots__/jsfmt.spec.js.snap b/tests/flow/get-def2/lib/__snapshots__/jsfmt.spec.js.snap
index 53dbbd415..6bab10bb3 100644
--- a/tests/flow/get-def2/lib/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/get-def2/lib/__snapshots__/jsfmt.spec.js.snap
@@ -20,7 +20,7 @@ type $JSXIntrinsic<T> = Class<$React.Component<void, T, mixed>>;
 
 type $JSXIntrinsics = {
   div: $JSXIntrinsic<{ id: string }>,
-  span: $JSXIntrinsic<{ id: string, class: string }>
+  span: $JSXIntrinsic<{ id: string, class: string }>,
 };
 
 ================================================================================
diff --git a/tests/flow/getters_and_setters_disabled/__snapshots__/jsfmt.spec.js.snap b/tests/flow/getters_and_setters_disabled/__snapshots__/jsfmt.spec.js.snap
index 4974d7ad2..1769f05db 100644
--- a/tests/flow/getters_and_setters_disabled/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/getters_and_setters_disabled/__snapshots__/jsfmt.spec.js.snap
@@ -54,13 +54,13 @@ var f = {
   get ["d"]() {
     return "foo";
   },
-  set ["d"](x: number) {}
+  set ["d"](x: number) {},
 };
 
 type T = {
   get a(): number,
   set b(x: number): void,
-  c: 10
+  c: 10,
 };
 
 declare class Foo {
diff --git a/tests/flow/getters_and_setters_enabled/__snapshots__/jsfmt.spec.js.snap b/tests/flow/getters_and_setters_enabled/__snapshots__/jsfmt.spec.js.snap
index 9d117c1a5..b1723bb70 100644
--- a/tests/flow/getters_and_setters_enabled/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/getters_and_setters_enabled/__snapshots__/jsfmt.spec.js.snap
@@ -379,7 +379,7 @@ var obj = {
   set [z](x: string) {},
   get [z](): string {
     return string;
-  }
+  },
 };
 
 // Test getting properties with getters
@@ -499,7 +499,7 @@ type T = {
   set exampleOfOrderOfGetterAndSetter(x: B): void,
 
   set exampleOfOrderOfGetterAndSetterReordered(x: B): void,
-  get exampleOfOrderOfGetterAndSetterReordered(): A
+  get exampleOfOrderOfGetterAndSetterReordered(): A,
 };
 
 function test(obj: T) {
@@ -569,8 +569,8 @@ const Example = React.createClass({
     set b(x: number) {
       this.c = x;
     },
-    c: React.PropTypes.string
-  }
+    c: React.PropTypes.string,
+  },
 });
 
 <Example />; // error: property \`a\` not found
diff --git a/tests/flow/import_type/__snapshots__/jsfmt.spec.js.snap b/tests/flow/import_type/__snapshots__/jsfmt.spec.js.snap
index ae07c78b8..e09bf87a9 100644
--- a/tests/flow/import_type/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/import_type/__snapshots__/jsfmt.spec.js.snap
@@ -155,13 +155,13 @@ export function givesAFoo3Obj(): AliasFoo3 {
  */
 
 export type AliasFoo3 = {
-  givesANum(): number
+  givesANum(): number,
 };
 export function givesAFoo3Obj(): AliasFoo3 {
   return {
     givesANum(): number {
       return 42;
-    }
+    },
   };
 }
 
diff --git a/tests/flow/import_typeof/__snapshots__/jsfmt.spec.js.snap b/tests/flow/import_typeof/__snapshots__/jsfmt.spec.js.snap
index b715c63fc..b8c34820c 100644
--- a/tests/flow/import_typeof/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/import_typeof/__snapshots__/jsfmt.spec.js.snap
@@ -175,13 +175,13 @@ export function givesAFoo3Obj(): AliasFoo3 {
  */
 
 export type AliasFoo3 = {
-  givesANum(): number
+  givesANum(): number,
 };
 export function givesAFoo3Obj(): AliasFoo3 {
   return {
     givesANum(): number {
       return 42;
-    }
+    },
   };
 }
 
diff --git a/tests/flow/indexer/__snapshots__/jsfmt.spec.js.snap b/tests/flow/indexer/__snapshots__/jsfmt.spec.js.snap
index ba3e11edd..d1fafacad 100644
--- a/tests/flow/indexer/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/indexer/__snapshots__/jsfmt.spec.js.snap
@@ -114,9 +114,9 @@ let tests = [
   function() {
     ({}: {
       [k1: string]: string,
-      [k2: number]: number // error: not supported (yet)
+      [k2: number]: number, // error: not supported (yet)
     });
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/intersection/__snapshots__/jsfmt.spec.js.snap b/tests/flow/intersection/__snapshots__/jsfmt.spec.js.snap
index 10b6db13c..01c0d886a 100644
--- a/tests/flow/intersection/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/intersection/__snapshots__/jsfmt.spec.js.snap
@@ -103,7 +103,7 @@ type DuplexStreamOptions = ReadableStreamOptions &
   WritableStreamOptions & {
     allowHalfOpen?: boolean,
     readableObjectMode?: boolean,
-    writableObjectMode?: boolean
+    writableObjectMode?: boolean,
   };
 
 function hasObjectMode_bad(options: DuplexStreamOptions): boolean {
diff --git a/tests/flow/intersection/lib/__snapshots__/jsfmt.spec.js.snap b/tests/flow/intersection/lib/__snapshots__/jsfmt.spec.js.snap
index f459e752e..fe67ca38e 100644
--- a/tests/flow/intersection/lib/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/intersection/lib/__snapshots__/jsfmt.spec.js.snap
@@ -55,13 +55,13 @@ type ObjAssignT = { foo: string } & { bar: string };
 type ReadableStreamOptions = {
   highWaterMark?: number,
   encoding?: ?string,
-  objectMode?: boolean
+  objectMode?: boolean,
 };
 
 type WritableStreamOptions = {
   highWaterMark?: number,
   decodeString?: boolean,
-  objectMode?: boolean
+  objectMode?: boolean,
 };
 
 // used in test_fun.js
diff --git a/tests/flow/iterable/__snapshots__/jsfmt.spec.js.snap b/tests/flow/iterable/__snapshots__/jsfmt.spec.js.snap
index fa37d4bac..286e45fef 100644
--- a/tests/flow/iterable/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/iterable/__snapshots__/jsfmt.spec.js.snap
@@ -171,7 +171,7 @@ function makeIterator(coin_flip: () => boolean): Iterator<string> {
       } else {
         return { done };
       }
-    }
+    },
   };
 }
 
@@ -188,7 +188,7 @@ function makeIterator(coin_flip: () => boolean): Iterator<string> {
       } else {
         return { done }; // Error void ~> string
       }
-    }
+    },
   };
 }
 
diff --git a/tests/flow/jsx_intrinsics.builtin/__snapshots__/jsfmt.spec.js.snap b/tests/flow/jsx_intrinsics.builtin/__snapshots__/jsfmt.spec.js.snap
index de9eaa75c..3e7696b36 100644
--- a/tests/flow/jsx_intrinsics.builtin/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/jsx_intrinsics.builtin/__snapshots__/jsfmt.spec.js.snap
@@ -35,7 +35,7 @@ var React = require("react");
 
 class CustomComponent extends React.Component {
   props: {
-    prop: string
+    prop: string,
   };
 }
 
diff --git a/tests/flow/jsx_intrinsics.custom/__snapshots__/jsfmt.spec.js.snap b/tests/flow/jsx_intrinsics.custom/__snapshots__/jsfmt.spec.js.snap
index 3d34522b5..64474b137 100644
--- a/tests/flow/jsx_intrinsics.custom/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/jsx_intrinsics.custom/__snapshots__/jsfmt.spec.js.snap
@@ -31,7 +31,7 @@ var React = require("react");
 
 class CustomComponent extends React.Component {
   props: {
-    prop: string
+    prop: string,
   };
 }
 
diff --git a/tests/flow/jsx_intrinsics.custom/lib/__snapshots__/jsfmt.spec.js.snap b/tests/flow/jsx_intrinsics.custom/lib/__snapshots__/jsfmt.spec.js.snap
index 53dbbd415..6bab10bb3 100644
--- a/tests/flow/jsx_intrinsics.custom/lib/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/jsx_intrinsics.custom/lib/__snapshots__/jsfmt.spec.js.snap
@@ -20,7 +20,7 @@ type $JSXIntrinsic<T> = Class<$React.Component<void, T, mixed>>;
 
 type $JSXIntrinsics = {
   div: $JSXIntrinsic<{ id: string }>,
-  span: $JSXIntrinsic<{ id: string, class: string }>
+  span: $JSXIntrinsic<{ id: string, class: string }>,
 };
 
 ================================================================================
diff --git a/tests/flow/keyvalue/__snapshots__/jsfmt.spec.js.snap b/tests/flow/keyvalue/__snapshots__/jsfmt.spec.js.snap
index 7a1e8cef1..390076d5f 100644
--- a/tests/flow/keyvalue/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/keyvalue/__snapshots__/jsfmt.spec.js.snap
@@ -20,7 +20,7 @@ let tests = [
 let tests = [
   function(x: { [key: number]: string }) {
     (x[""]: number);
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/last_duplicate_property_wins/__snapshots__/jsfmt.spec.js.snap b/tests/flow/last_duplicate_property_wins/__snapshots__/jsfmt.spec.js.snap
index 3aeea8c65..0307f81c1 100644
--- a/tests/flow/last_duplicate_property_wins/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/last_duplicate_property_wins/__snapshots__/jsfmt.spec.js.snap
@@ -97,7 +97,7 @@ const o = {
   qux: 42,
   qux(): string {
     return "hello";
-  } // last wins
+  }, // last wins
 };
 
 // check
diff --git a/tests/flow/literal/__snapshots__/jsfmt.spec.js.snap b/tests/flow/literal/__snapshots__/jsfmt.spec.js.snap
index 0e6875d23..6d49e6ddf 100644
--- a/tests/flow/literal/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/literal/__snapshots__/jsfmt.spec.js.snap
@@ -16,7 +16,7 @@ module.exports = APIKeys;
 =====================================output=====================================
 var APIKeys = {
   AGE: "age",
-  NAME: "name"
+  NAME: "name",
 };
 
 module.exports = APIKeys;
diff --git a/tests/flow/logical/__snapshots__/jsfmt.spec.js.snap b/tests/flow/logical/__snapshots__/jsfmt.spec.js.snap
index cdc9bb14a..66939ae06 100644
--- a/tests/flow/logical/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/logical/__snapshots__/jsfmt.spec.js.snap
@@ -916,7 +916,7 @@ function logical13(x: number): Array<{ x: string }> {
     { x: 1 && "bar" },
     { x: "foo" && "bar" },
     { x: "foo" && "bar" },
-    { x: "foo" && "bar" }
+    { x: "foo" && "bar" },
   ];
 }
 
@@ -932,7 +932,7 @@ function logical14(x: number): Array<{ x: string }> {
     { x: 0 || "bar" },
     { x: "foo" || "bar" },
     { x: "foo" || "bar" },
-    { x: "foo" || "bar" }
+    { x: "foo" || "bar" },
   ];
 }
 
diff --git a/tests/flow/missing_annotation/__snapshots__/jsfmt.spec.js.snap b/tests/flow/missing_annotation/__snapshots__/jsfmt.spec.js.snap
index e5a140386..74ec57481 100644
--- a/tests/flow/missing_annotation/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/missing_annotation/__snapshots__/jsfmt.spec.js.snap
@@ -121,24 +121,24 @@ var Foo = {
   b: function(arg) {
     // missing arg annotation
     return {
-      bar: arg
+      bar: arg,
     };
   },
 
   c: function(arg: string) {
     // no return annotation required
     return {
-      bar: arg
+      bar: arg,
     };
   },
 
   d: function(
     arg: string
   ): {
-    bar: string
+    bar: string,
   } {
     return {
-      bar: arg
+      bar: arg,
     };
   },
 
@@ -158,7 +158,7 @@ var Foo = {
       // no error
       return x;
     };
-  }
+  },
 };
 
 var Bar = {
@@ -170,7 +170,7 @@ var Bar = {
 
   c: Foo.c("bar"), // no annotation required
 
-  d: Foo.d("bar") // no annotation required
+  d: Foo.d("bar"), // no annotation required
 };
 
 (module.exports = Foo), Bar;
diff --git a/tests/flow/more_react/__snapshots__/jsfmt.spec.js.snap b/tests/flow/more_react/__snapshots__/jsfmt.spec.js.snap
index 1f9b6d610..c32b96549 100644
--- a/tests/flow/more_react/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/more_react/__snapshots__/jsfmt.spec.js.snap
@@ -116,7 +116,7 @@ var App = React.createClass({
         {foo(z, x)} // error, since z: number
       </div>
     );
-  }
+  },
 });
 
 module.exports = App;
@@ -156,7 +156,7 @@ var React = require("react");
  * react classes as initialized, when the class was created with createClass().
  * This would manifest as complaining that metric requires an annotation */
 var App = React.createClass({
-  metrics: [1, 2, 3]
+  metrics: [1, 2, 3],
 });
 
 module.exports = App;
@@ -296,14 +296,14 @@ var React = require("React");
 
 var C = React.createClass({
   propTypes: {
-    title: React.PropTypes.string.isRequired
-  }
+    title: React.PropTypes.string.isRequired,
+  },
 });
 var D = React.createClass({
   propTypes: {
     name: React.PropTypes.string.isRequired,
-    ...C.propTypes
-  }
+    ...C.propTypes,
+  },
 });
 
 <D />; // errors: properties \`name\` and \`title\` not found
diff --git a/tests/flow/new_react/__snapshots__/jsfmt.spec.js.snap b/tests/flow/new_react/__snapshots__/jsfmt.spec.js.snap
index ba0820e7d..457ea98f7 100644
--- a/tests/flow/new_react/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/new_react/__snapshots__/jsfmt.spec.js.snap
@@ -68,7 +68,7 @@ var FeedUFI = React.createClass({
       className: "",
       key: "",
       feedback: { feedback },
-      permalink: ""
+      permalink: "",
     };
     var ignored = <UFILikeCount {...props} />;
     return (
@@ -78,7 +78,7 @@ var FeedUFI = React.createClass({
 
   render: function(): ?React.Element<any> {
     return <div />;
-  }
+  },
 });
 
 module.exports = FeedUFI;
@@ -100,7 +100,7 @@ module.exports = {
 =====================================output=====================================
 /* @providesModule Mixin */
 module.exports = {
-  success: function() {}
+  success: function() {},
 };
 
 ================================================================================
@@ -151,12 +151,12 @@ var React = require("react");
 var UFILikeCount = React.createClass({
   propTypes: {
     permalink: React.PropTypes.string,
-    feedback: React.PropTypes.object.isRequired
+    feedback: React.PropTypes.object.isRequired,
   },
 
   render: function(): ?React.Element<any> {
     return <div />;
-  }
+  },
 });
 
 module.exports = UFILikeCount;
@@ -377,7 +377,7 @@ var FooLegacy = React.createClass({
   is_mounted: (undefined: ?boolean),
 
   propTypes: {
-    x: React.PropTypes.number.isRequired
+    x: React.PropTypes.number.isRequired,
   },
 
   getDefaultProps(): DefaultProps {
@@ -385,7 +385,7 @@ var FooLegacy = React.createClass({
   },
 
   statics: {
-    bar(): void {}
+    bar(): void {},
   },
 
   qux(): void {
@@ -404,7 +404,7 @@ var FooLegacy = React.createClass({
 
   componentWillReceiveProps(nextProps: Object, nextContext: any): void {
     this.qux();
-  }
+  },
 });
 
 FooLegacy.defaultProps = 0;
@@ -512,7 +512,7 @@ var C = React.createClass({
   propTypes: {
     x: React.PropTypes.string.isRequired,
     y: React.PropTypes.array,
-    z: React.PropTypes.number
+    z: React.PropTypes.number,
   },
   replaceProps(props: {}) {},
 
@@ -531,7 +531,7 @@ var C = React.createClass({
     var len: number = this.props.x.length;
     this.success();
     return <div />;
-  }
+  },
 });
 
 var element = <C x={0} />;
@@ -579,17 +579,17 @@ var C = React.createClass({
     statistics: PropTypes.arrayOf(
       PropTypes.shape({
         label: PropTypes.string.isRequired,
-        value: PropTypes.number
+        value: PropTypes.number,
       })
-    ).isRequired
-  }
+    ).isRequired,
+  },
 });
 
 <C statistics={[{}, { label: "", value: undefined }]} />; // error (label is required, value not required)
 
 var props: Array<{ label: string, value?: number }> = [
   {},
-  { label: "", value: undefined }
+  { label: "", value: undefined },
 ]; // error (same as ^)
 
 ================================================================================
@@ -634,7 +634,7 @@ var React = require("react");
 var TestProps = React.createClass({
   propTypes: {
     x: React.PropTypes.string,
-    z: React.PropTypes.number
+    z: React.PropTypes.number,
   },
 
   getDefaultProps: function() {
@@ -645,7 +645,7 @@ var TestProps = React.createClass({
     var a: number = this.props.x; // error
     var b: string = this.props.y; // error
     var c: string = this.props.z; // error
-  }
+  },
 });
 
 var element = <TestProps x={false} y={false} z={false} />; // 3 errors
@@ -653,7 +653,7 @@ var element = <TestProps x={false} y={false} z={false} />; // 3 errors
 (element: $jsx<*>);
 (element: $jsx<TestProps>);
 var FooProps = React.createClass({
-  propTypes: { w: React.PropTypes.string.isRequired }
+  propTypes: { w: React.PropTypes.string.isRequired },
 });
 (element: $jsx<FooProps>);
 
@@ -689,8 +689,8 @@ var React = require("react");
 var C = React.createClass({
   propTypes: {
     foo: React.PropTypes.string.isRequired,
-    bar: React.PropTypes.string.isRequired
-  }
+    bar: React.PropTypes.string.isRequired,
+  },
 });
 var D = React.createClass({
   getInitialState: function(): { bar: number } {
@@ -700,7 +700,7 @@ var D = React.createClass({
     var obj = { bar: 0 };
     var s: string = this.state.bar;
     return <C {...this.state} foo={0} />;
-  }
+  },
 });
 
 ================================================================================
@@ -800,25 +800,25 @@ var TestProps = React.createClass({
     oneOf_rec: React.PropTypes.oneOf(["yes", "no"]).isRequired,
     oneOfType: React.PropTypes.oneOfType([
       React.PropTypes.string,
-      React.PropTypes.number
+      React.PropTypes.number,
     ]),
     oneOfType_rec: React.PropTypes.oneOfType([
       React.PropTypes.string,
-      React.PropTypes.number
+      React.PropTypes.number,
     ]).isRequired,
     shape: React.PropTypes.shape({
       foo: React.PropTypes.string,
-      bar: React.PropTypes.number
+      bar: React.PropTypes.number,
     }),
     shape_rec: React.PropTypes.shape({
       foo: React.PropTypes.string,
-      bar: React.PropTypes.number
+      bar: React.PropTypes.number,
     }).isRequired,
 
     // And do something bad here
     bad_one: React.PropTypes.imaginaryType,
-    bad_two: React.PropTypes.string.inRequired
-  }
+    bad_two: React.PropTypes.string.inRequired,
+  },
 });
 
 ================================================================================
@@ -865,7 +865,7 @@ import React from "React";
 class JDiv extends React.Component {
   // static defaultProps: { };
   props: {
-    id: string
+    id: string,
   };
 }
 
@@ -907,7 +907,7 @@ var React = require("React");
 var C = React.createClass({
   getDefaultProps: function() {
     return { x: 0 };
-  }
+  },
 });
 
 module.exports = C;
@@ -951,7 +951,7 @@ var ReactClass = React.createClass({
 var React = require("react");
 
 type State = {
-  bar: ?{ qux: string }
+  bar: ?{ qux: string },
 };
 
 var ReactClass = React.createClass({
@@ -963,7 +963,7 @@ var ReactClass = React.createClass({
     // Any state access here seems to make state any
     this.state;
     return <div>{this.state.bar.qux}</div>;
-  }
+  },
 });
 
 ================================================================================
@@ -999,15 +999,15 @@ module.exports = Comp;
 var React = require("react");
 
 type FooState = {
-  key: ?Object
+  key: ?Object,
 };
 
 var Comp = React.createClass({
   getInitialState: function(): FooState {
     return {
-      key: null // this used to cause a missing annotation error
+      key: null, // this used to cause a missing annotation error
     };
-  }
+  },
 });
 
 module.exports = Comp;
@@ -1045,7 +1045,7 @@ var React = require("react");
 var TestState = React.createClass({
   getInitialState: function(): { x: string } {
     return {
-      x: ""
+      x: "",
     };
   },
 
@@ -1053,9 +1053,9 @@ var TestState = React.createClass({
     var a: number = this.state.x; // error
 
     this.setState({
-      x: false // error
+      x: false, // error
     });
-  }
+  },
 });
 
 ================================================================================
@@ -1092,7 +1092,7 @@ var C = React.createClass({
   render() {
     this.setState({ y: 0 });
     return <div>{this.state.z}</div>;
-  }
+  },
 });
 
 ================================================================================
diff --git a/tests/flow/node_tests/crypto/__snapshots__/jsfmt.spec.js.snap b/tests/flow/node_tests/crypto/__snapshots__/jsfmt.spec.js.snap
index 6b4d5b21e..ad81f6583 100644
--- a/tests/flow/node_tests/crypto/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/node_tests/crypto/__snapshots__/jsfmt.spec.js.snap
@@ -85,7 +85,7 @@ let tests = [
     (hmac.digest(): Buffer);
     (hmac.digest("hex"): void); // 1 error
     (hmac.digest(): void); // 1 error
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/node_tests/json_file/package2/__snapshots__/jsfmt.spec.js.snap b/tests/flow/node_tests/json_file/package2/__snapshots__/jsfmt.spec.js.snap
index f0b18c8e4..35a8e2325 100644
--- a/tests/flow/node_tests/json_file/package2/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/node_tests/json_file/package2/__snapshots__/jsfmt.spec.js.snap
@@ -16,7 +16,7 @@ module.exports = {
 // @flow
 
 module.exports = {
-  foo: 123
+  foo: 123,
 };
 
 ================================================================================
diff --git a/tests/flow/object-method/__snapshots__/jsfmt.spec.js.snap b/tests/flow/object-method/__snapshots__/jsfmt.spec.js.snap
index b5980b1d6..cf6b45ab8 100644
--- a/tests/flow/object-method/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/object-method/__snapshots__/jsfmt.spec.js.snap
@@ -68,7 +68,7 @@ module.exports = id(
 const id = require("./id");
 
 export type ObjectType = {
-  +m: () => void
+  +m: () => void,
 };
 
 function methodCaller(x: ObjectType) {
@@ -113,11 +113,11 @@ function f() {
 
 var a = {
   p: 0,
-  f
+  f,
 };
 
 var b = {
-  f
+  f,
 };
 
 a.f(); // okey-dokie
diff --git a/tests/flow/object_api/__snapshots__/jsfmt.spec.js.snap b/tests/flow/object_api/__snapshots__/jsfmt.spec.js.snap
index 6e2a47df3..c8345052e 100644
--- a/tests/flow/object_api/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/object_api/__snapshots__/jsfmt.spec.js.snap
@@ -89,7 +89,7 @@ var export_ = Object.assign(
   {
     foo: function(param) {
       return param;
-    }
+    },
   }
 );
 
@@ -179,7 +179,7 @@ let tests = [
   function() {
     const x = new Bar();
     (Object.getPrototypeOf(x): Foo);
-  }
+  },
 ];
 
 ================================================================================
@@ -281,7 +281,7 @@ let tests = [
 let tests = [
   function() {
     Object.doesNotExist();
-  }
+  },
 ];
 
 ================================================================================
@@ -474,7 +474,7 @@ var c = {
   foo: "bar",
   toString: function(): number {
     return 123;
-  }
+  },
 };
 var d: { [key: string]: string } = { foo: "bar" };
 var x = new Date();
diff --git a/tests/flow/object_assign/__snapshots__/jsfmt.spec.js.snap b/tests/flow/object_assign/__snapshots__/jsfmt.spec.js.snap
index 1503d83a5..746d81dcc 100644
--- a/tests/flow/object_assign/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/object_assign/__snapshots__/jsfmt.spec.js.snap
@@ -44,7 +44,7 @@ var EventEmitter = require("events").EventEmitter;
 var Bad = Object.assign({}, EventEmitter.prototype, {
   foo: function(): string {
     return "hi";
-  }
+  },
 });
 
 // Calling Bad.foo() in the same file doesn't error
@@ -55,14 +55,14 @@ class MyEventEmitter extends events$EventEmitter {}
 var Good = Object.assign({}, MyEventEmitter.prototype, {
   foo: function(): string {
     return "hi";
-  }
+  },
 });
 // Calling Good.foo() in the same file doesn't error
 var good: number = Good.foo();
 
 module.exports = {
   Bad: Bad,
-  Good: Good
+  Good: Good,
 };
 
 ================================================================================
@@ -129,7 +129,7 @@ printWidth: 80
 
 (Object.assign.apply(null, [{}, { a: 1 }, { b: "foo" }]): {
   a: number,
-  b: string
+  b: string,
 });
 
 ================================================================================
@@ -193,7 +193,7 @@ declare var tup: [{ foo: string }, { bar: number }];
 (Object.assign({}, ...[{ a: 1 }, { b: "foo" }], ...[{ c: true }]): {
   a: number,
   b: true,
-  c: boolean
+  c: boolean,
 }); // Error: 'foo' => true
 
 ================================================================================
@@ -232,11 +232,11 @@ class MyReactThing extends React.Component {
 var React = require("react");
 
 type DefaultProps = {
-  foo: number
+  foo: number,
 };
 
 type Props = {
-  foo: number
+  foo: number,
 };
 
 class MyReactThing extends React.Component {
diff --git a/tests/flow/objects/__snapshots__/jsfmt.spec.js.snap b/tests/flow/objects/__snapshots__/jsfmt.spec.js.snap
index 5c1237e66..936a1e57f 100644
--- a/tests/flow/objects/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/objects/__snapshots__/jsfmt.spec.js.snap
@@ -64,7 +64,7 @@ let tests = [
 
   function(x: { x: { -foo: string } }, y: { x: { -foo: number } }) {
     x = y; // 2 errors: string !~> number; number !~> string
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/objmap/__snapshots__/jsfmt.spec.js.snap b/tests/flow/objmap/__snapshots__/jsfmt.spec.js.snap
index fb5f4563b..12f4b705c 100644
--- a/tests/flow/objmap/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/objmap/__snapshots__/jsfmt.spec.js.snap
@@ -31,7 +31,7 @@ declare function keyMirror<O>(o: O): $ObjMapi<O, <K>(k: K) => K>;
 
 var o = keyMirror({
   FOO: null,
-  BAR: null
+  BAR: null,
 });
 
 (o.FOO: "FOO"); // ok
@@ -39,7 +39,7 @@ var o = keyMirror({
 
 promiseAllByKey({
   foo: Promise.resolve(0),
-  bar: "bar"
+  bar: "bar",
 }).then(o => {
   (o.foo: string); // error, number ~> string
   (o.bar: "bar"); // ok
diff --git a/tests/flow/parse/__snapshots__/jsfmt.spec.js.snap b/tests/flow/parse/__snapshots__/jsfmt.spec.js.snap
index 7159b0402..72d04100f 100644
--- a/tests/flow/parse/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/parse/__snapshots__/jsfmt.spec.js.snap
@@ -28,7 +28,7 @@ var y = 5 / x;
 
 var z: {
   type: number,
-  y: string
+  y: string,
 } = { type: 1, y: "hey" };
 
 ================================================================================
diff --git a/tests/flow/poly/__snapshots__/jsfmt.spec.js.snap b/tests/flow/poly/__snapshots__/jsfmt.spec.js.snap
index 02734f737..4d62341d9 100644
--- a/tests/flow/poly/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/poly/__snapshots__/jsfmt.spec.js.snap
@@ -124,7 +124,7 @@ declare type Box<T> = {
   map2<U>(f: (x: T) => U): Box<U>,
   map3<U>(f: (x: T) => U): Box<U>,
   map4<U>(f: (x: T) => U): Box<U>,
-  map5<U>(f: (x: T) => U): Box<U>
+  map5<U>(f: (x: T) => U): Box<U>,
 };
 
 declare var bool: Box<boolean>;
@@ -174,11 +174,11 @@ function bar<S>(foo: Foo<S>, y: S): Foo<S> {
 }
 
 var P = {
-  bar: bar
+  bar: bar,
 };
 
 declare var Q: {
-  bar<S>(foo: Foo<S>, y: S): Foo<S>
+  bar<S>(foo: Foo<S>, y: S): Foo<S>,
 };
 
 var foo = new Foo(0);
diff --git a/tests/flow/predicates-declared/__snapshots__/jsfmt.spec.js.snap b/tests/flow/predicates-declared/__snapshots__/jsfmt.spec.js.snap
index 6b91439cf..bcb59b1e3 100644
--- a/tests/flow/predicates-declared/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/predicates-declared/__snapshots__/jsfmt.spec.js.snap
@@ -285,11 +285,11 @@ function f(_this: { m: ?Meeting }): string {
 
 type Meeting = {
   organizer: ?Invitee,
-  es: Array<Invitee>
+  es: Array<Invitee>,
 };
 
 type Invitee = {
-  fbid: number
+  fbid: number,
 };
 
 function f(_this: { m: ?Meeting }): string {
diff --git a/tests/flow/promises/__snapshots__/jsfmt.spec.js.snap b/tests/flow/promises/__snapshots__/jsfmt.spec.js.snap
index 9303f26e1..a6a28ac46 100644
--- a/tests/flow/promises/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/promises/__snapshots__/jsfmt.spec.js.snap
@@ -55,7 +55,7 @@ declare var pnum: Promise<number>;
 Promise.all([
   pstr,
   pnum,
-  true // non-Promise values passed through
+  true, // non-Promise values passed through
 ]).then(xs => {
   // tuple information is preserved
   let [a, b, c] = xs;
diff --git a/tests/flow/react/__snapshots__/jsfmt.spec.js.snap b/tests/flow/react/__snapshots__/jsfmt.spec.js.snap
index 40c19af85..b8328838f 100644
--- a/tests/flow/react/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/react/__snapshots__/jsfmt.spec.js.snap
@@ -26,7 +26,7 @@ var React = require("react");
 var AudienceInsightsContainer = React.createClass({
   renderComponent(AudienceInsights: ReactClass<*>) {
     return <AudienceInsights />;
-  }
+  },
 });
 
 module.exports = AudienceInsightsContainer;
@@ -224,7 +224,7 @@ const A = React.createClass({
   m() {
     (this.props.foo: empty); // error: string ~> empty
     (this.props.bar: empty); // error: number ~> empty
-  }
+  },
 });
 
 const B = React.createClass({
@@ -234,7 +234,7 @@ const B = React.createClass({
   },
   mm() {
     this.m.apply(null); // OK: this.m is autobound, so \`this.p\` will always be found
-  }
+  },
 });
 
 const C = React.createClass({
@@ -243,7 +243,7 @@ const C = React.createClass({
   },
   m() {
     this.state.foo; // OK: state is unknown
-  }
+  },
 });
 
 const D = React.createClass({
@@ -251,15 +251,15 @@ const D = React.createClass({
     {
       getInitialState(): Object {
         return { foo: 0 };
-      }
-    }
+      },
+    },
   ],
   getInitialState() {
     return { bar: 0 };
   },
   m() {
     this.state.foo; // OK: state is unknown (due to unknown mixin)
-  }
+  },
 });
 
 const E = React.createClass({
@@ -270,7 +270,7 @@ const E = React.createClass({
   mm() {
     var props: { m(): void } = { m: this.m };
     props.m(); // OK: this.m is autobound, so \`this.foo\` will always be found
-  }
+  },
 });
 
 const F = React.createClass({
@@ -280,7 +280,7 @@ const F = React.createClass({
   m() {
     this.state.foo;
     this.state.bar;
-  }
+  },
 });
 
 const G = React.createClass({
@@ -291,7 +291,7 @@ const G = React.createClass({
     (this.mixins: mixed); // error: property \`mixins\` not found
     (this.autobind: mixed); // error: property \`autobind\` not found
     (this.statics: mixed); // error: property \`statics\` not found
-  }
+  },
 });
 
 const H = React.createClass({
@@ -299,14 +299,14 @@ const H = React.createClass({
   getDefaultProps() {
     (this.q: empty); // error: number ~> empty
     return {};
-  }
+  },
 });
 
 const I = React.createClass({
   propTypes: ({}: { [string]: any }),
   m() {
     (this.props.foo: empty); // OK
-  }
+  },
 });
 
 const J = React.createClass({
@@ -314,22 +314,22 @@ const J = React.createClass({
     {
       getInitialState() {
         return this.constructor.calculateState();
-      }
-    }
+      },
+    },
   ],
   statics: {
     calculateState() {
       return { foo: 0 };
-    }
+    },
   },
   m() {
     (this.state.foo: empty); // number ~> empty
-  }
+  },
 });
 
 const K = React.createClass({
   propTypes: {
-    foo: React.PropTypes.string.isRequired
+    foo: React.PropTypes.string.isRequired,
   },
   getInitialState() {
     this.mm(); // cause error in mm below
@@ -341,12 +341,12 @@ const K = React.createClass({
   },
   mm() {
     this.state.foo; // error: property fo not found (called by getInitialState)
-  }
+  },
 });
 
 const L = React.createClass({
   propTypes: {
-    foo: React.PropTypes.string.isRequired
+    foo: React.PropTypes.string.isRequired,
   },
   getInitialState() {
     return { bar: 0 };
@@ -389,7 +389,7 @@ const L = React.createClass({
     (this.props.foo: empty); // string ~> empty
     (this.state.bar: empty); // number ~> empty
     return 0; // number ~> void
-  }
+  },
 });
 
 React.createClass({}); // error: spec must be [x] exact and [ ] sealed
@@ -501,7 +501,7 @@ React.createClass({
   },
   g() {
     (this.state.q: empty); // number ~> empty
-  }
+  },
 });
 
 // initial state = Some (exact & sealed) [lit]
@@ -514,7 +514,7 @@ React.createClass({
   },
   g() {
     (this.state.q: empty); // number ~> empty
-  }
+  },
 });
 
 // initial state = Some (exact & sealed) [annot]
@@ -527,7 +527,7 @@ React.createClass({
   },
   g() {
     (this.state.q: empty); // number ~> empty
-  }
+  },
 });
 
 // initial state = Some (inexact & sealed) [annot]
@@ -540,7 +540,7 @@ React.createClass({
   },
   g() {
     (this.state.q: empty); // property \`q\` not found
-  }
+  },
 });
 
 // mixins = (exact & sealed) + (exact & sealed)
@@ -549,8 +549,8 @@ React.createClass({
     {
       getInitialState() {
         return { foo: 0 };
-      }
-    }
+      },
+    },
   ],
   getInitialState() {
     return { bar: 0 };
@@ -560,7 +560,7 @@ React.createClass({
   },
   g() {
     (this.state.baz: empty); // number ~> empty
-  }
+  },
 });
 
 // mixins = (exact & sealed) + (inexact & sealed)
@@ -569,8 +569,8 @@ React.createClass({
     {
       getInitialState(): { foo: number } {
         return { foo: 0 };
-      }
-    }
+      },
+    },
   ],
   getInitialState() {
     return { bar: 0 };
@@ -580,7 +580,7 @@ React.createClass({
   },
   g() {
     (this.state.baz: empty); // property \`baz\` not found
-  }
+  },
 });
 
 ================================================================================
@@ -657,7 +657,7 @@ A.bar = 0;
 
 // statics = Some (exact & sealed) [lit]
 const B = React.createClass({
-  statics: { foo: 0 }
+  statics: { foo: 0 },
 });
 (B.foo: empty); // number ~> empty
 (B.bar: empty); // number ~> empty (inflow below)
@@ -665,7 +665,7 @@ B.bar = 0;
 
 // statics = Some (exact & sealed) [annot]
 const C = React.createClass({
-  statics: ({ foo: 0 }: {| foo: number |})
+  statics: ({ foo: 0 }: {| foo: number |}),
 });
 (C.foo: empty); // number ~> empty
 (C.bar: empty); // number ~> empty (inflow below)
@@ -673,7 +673,7 @@ C.bar = 0;
 
 // statics = Some (inexact & sealed) [annot]
 const D = React.createClass({
-  statics: ({ foo: 0 }: { foo: number })
+  statics: ({ foo: 0 }: { foo: number }),
 });
 (D.foo: empty); // number ~> empty
 (D.bar: empty); // property \`bar\` not found
@@ -683,10 +683,10 @@ D.bar = 0; // property \`bar\` not found
 const E = React.createClass({
   mixins: [
     {
-      statics: { foo: 0 }
-    }
+      statics: { foo: 0 },
+    },
   ],
-  statics: { bar: 0 }
+  statics: { bar: 0 },
 });
 (E.foo: empty); // number ~> empty
 (E.bar: empty); // number ~> empty
@@ -697,10 +697,10 @@ E.baz = 0;
 const F = React.createClass({
   mixins: [
     {
-      statics: ({ foo: 0 }: { foo: number })
-    }
+      statics: ({ foo: 0 }: { foo: number }),
+    },
   ],
-  statics: { bar: 0 }
+  statics: { bar: 0 },
 });
 (F.foo: empty); // number ~> empty
 (F.bar: empty); // number ~> empty
@@ -779,7 +779,7 @@ import React from "react";
 
 class Bar extends React.Component {
   props: {
-    test: number
+    test: number,
   };
   render() {
     return <div>{this.props.test}</div>;
@@ -846,8 +846,8 @@ var blah = <Foo {...props} />; // error bar, number given string expected
 var React = require("react");
 var Foo = React.createClass({
   propTypes: {
-    bar: React.PropTypes.string.isRequired
-  }
+    bar: React.PropTypes.string.isRequired,
+  },
 });
 
 var props = { bar: 42 };
@@ -887,8 +887,8 @@ const React = require("react");
 
 var AnyExample = React.createClass({
   propTypes: {
-    foo: (0: any) // OK
-  }
+    foo: (0: any), // OK
+  },
 });
 
 <AnyExample />; // OK
@@ -896,8 +896,8 @@ var AnyExample = React.createClass({
 
 var AnyFunExample = React.createClass({
   propTypes: {
-    foo: (() => {}: Function) // OK
-  }
+    foo: (() => {}: Function), // OK
+  },
 });
 
 <AnyFunExample />; // OK
@@ -964,8 +964,8 @@ var InvalidExample = React.createClass({
 var React = require("react");
 var Example = React.createClass({
   propTypes: {
-    arr: React.PropTypes.arrayOf(React.PropTypes.number).isRequired
-  }
+    arr: React.PropTypes.arrayOf(React.PropTypes.number).isRequired,
+  },
 });
 
 var ok_empty = <Example arr={[]} />;
@@ -982,8 +982,8 @@ var todo_required = <Example arr={[null]} />;
 
 var OptionalExample = React.createClass({
   propTypes: {
-    arr: React.PropTypes.arrayOf(React.PropTypes.number)
-  }
+    arr: React.PropTypes.arrayOf(React.PropTypes.number),
+  },
 });
 
 <OptionalExample />; // OK
@@ -992,8 +992,8 @@ var OptionalExample = React.createClass({
 
 var AnyExample = React.createClass({
   propTypes: {
-    arr: React.PropTypes.arrayOf((0: any)) // OK
-  }
+    arr: React.PropTypes.arrayOf((0: any)), // OK
+  },
 });
 
 <AnyExample arr={0} />; // error: still needs to be an array
@@ -1001,8 +1001,8 @@ var AnyExample = React.createClass({
 
 var InvalidExample = React.createClass({
   propTypes: {
-    arr: React.PropTypes.arrayOf(0) // error: number not a prop type
-  }
+    arr: React.PropTypes.arrayOf(0), // error: number not a prop type
+  },
 });
 
 ================================================================================
@@ -1045,8 +1045,8 @@ var Example = React.createClass({
       (componentName: empty); // error: componentName is a string
       (href: empty); // error: href is an optional string
       return (0: mixed); // error: should return ?Error
-    }
-  }
+    },
+  },
 });
 
 // Inferred prop type is optional \`any\`
@@ -1083,8 +1083,8 @@ var fail_mistyped = <Example func={2} />
 var React = require("react");
 var Example = React.createClass({
   propTypes: {
-    func: React.PropTypes.func.isRequired
-  }
+    func: React.PropTypes.func.isRequired,
+  },
 });
 
 var ok_void = <Example func={() => {}} />;
@@ -1118,8 +1118,8 @@ const React = require("react");
 
 var Example = React.createClass({
   propTypes: {
-    foo: 0 // error: \`0\` is not a prop type
-  }
+    foo: 0, // error: \`0\` is not a prop type
+  },
 });
 
 <Example />; // OK: don't cascade errors
@@ -1186,8 +1186,8 @@ class C extends B {}
 var React = require("react");
 var Example = React.createClass({
   propTypes: {
-    x: React.PropTypes.instanceOf(B)
-  }
+    x: React.PropTypes.instanceOf(B),
+  },
 });
 
 <Example x={new A()} />; // error: A ~> B
@@ -1200,11 +1200,11 @@ class Poly<T> {
 }
 var PolyExample = React.createClass({
   propTypes: {
-    x: React.PropTypes.instanceOf(Poly).isRequired
+    x: React.PropTypes.instanceOf(Poly).isRequired,
   },
   m() {
     (this.props.x.x: empty); // OK, T instantiated to \`any\`
-  }
+  },
 });
 
 // Different instantiations don't interact
@@ -1216,11 +1216,11 @@ class PolyDefault<T = string> {
 }
 var PolyDefaultExample = React.createClass({
   propTypes: {
-    x: React.PropTypes.instanceOf(PolyDefault).isRequired
+    x: React.PropTypes.instanceOf(PolyDefault).isRequired,
   },
   m() {
     (this.props.x.x: empty); // OK, T instantiated to \`any\`
-  }
+  },
 });
 
 ================================================================================
@@ -1296,7 +1296,7 @@ var Foo = React.createClass({
   render() {
     // But this never errored
     return <div id={this.props.name} />;
-  }
+  },
 });
 
 ================================================================================
@@ -1328,8 +1328,8 @@ var fail_mistyped = <Example object={2} />
 var React = require("react");
 var Example = React.createClass({
   propTypes: {
-    object: React.PropTypes.object.isRequired
-  }
+    object: React.PropTypes.object.isRequired,
+  },
 });
 
 var ok_empty = <Example object={{}} />;
@@ -1398,8 +1398,8 @@ var InvalidExample = React.createClass({
 var React = require("react");
 var Example = React.createClass({
   propTypes: {
-    obj: React.PropTypes.objectOf(React.PropTypes.number).isRequired
-  }
+    obj: React.PropTypes.objectOf(React.PropTypes.number).isRequired,
+  },
 });
 
 var ok_empty = <Example obj={{}} />;
@@ -1416,8 +1416,8 @@ var todo_required = <Example obj={{ p: null }} />;
 
 var OptionalExample = React.createClass({
   propTypes: {
-    obj: React.PropTypes.objectOf(React.PropTypes.number)
-  }
+    obj: React.PropTypes.objectOf(React.PropTypes.number),
+  },
 });
 
 <OptionalExample />; // OK
@@ -1426,8 +1426,8 @@ var OptionalExample = React.createClass({
 
 var AnyExample = React.createClass({
   propTypes: {
-    obj: React.PropTypes.objectOf((0: any)) // OK
-  }
+    obj: React.PropTypes.objectOf((0: any)), // OK
+  },
 });
 
 <AnyExample obj={0} />; // error: still needs to be an object
@@ -1435,8 +1435,8 @@ var AnyExample = React.createClass({
 
 var InvalidExample = React.createClass({
   propTypes: {
-    obj: React.PropTypes.objectOf(0) // error: number not a prop type
-  }
+    obj: React.PropTypes.objectOf(0), // error: number not a prop type
+  },
 });
 
 ================================================================================
@@ -1545,8 +1545,8 @@ var Example = React.createClass({
     str: React.PropTypes.oneOf(["foo", "bar"]),
     num: React.PropTypes.oneOf([0, 1, 2]),
     bool: React.PropTypes.oneOf([true]),
-    mixed: React.PropTypes.oneOf(["foo", 0, true])
-  }
+    mixed: React.PropTypes.oneOf(["foo", 0, true]),
+  },
 });
 
 <Example str="foo" />; // OK
@@ -1564,64 +1564,64 @@ var Example = React.createClass({
 
 var RequiredExample = React.createClass({
   propTypes: {
-    p: React.PropTypes.oneOf([]).isRequired
-  }
+    p: React.PropTypes.oneOf([]).isRequired,
+  },
 });
 
 <RequiredExample />; // error: \`p\` not found
 
 var EmptyExample = React.createClass({
   propTypes: {
-    nil: React.PropTypes.oneOf([]) // i.e., \`empty\`
-  }
+    nil: React.PropTypes.oneOf([]), // i.e., \`empty\`
+  },
 });
 
 <EmptyExample nil={0} />; // number ~> empty
 
 var AnyArrayExample = React.createClass({
   propTypes: {
-    any: React.PropTypes.oneOf((0: any))
-  }
+    any: React.PropTypes.oneOf((0: any)),
+  },
 });
 
 <AnyArrayExample any={0} />; // OK
 
 var AnyElemExample = React.createClass({
   propTypes: {
-    any: React.PropTypes.oneOf(["foo", (0: any)])
-  }
+    any: React.PropTypes.oneOf(["foo", (0: any)]),
+  },
 });
 
 <AnyElemExample any={0} />; // OK
 
 var DynamicArrayExample = React.createClass({
   propTypes: {
-    dyn: React.PropTypes.oneOf(([]: Array<string>))
-  }
+    dyn: React.PropTypes.oneOf(([]: Array<string>)),
+  },
 });
 
 <DynamicArrayExample dyn={0} />; // OK
 
 var DynamicElemExample = React.createClass({
   propTypes: {
-    dyn: React.PropTypes.oneOf(["foo", ("": string)])
-  }
+    dyn: React.PropTypes.oneOf(["foo", ("": string)]),
+  },
 });
 
 <DynamicElemExample dyn={0} />; // OK
 
 var InvalidArrayExample = React.createClass({
   propTypes: {
-    p: React.PropTypes.oneOf(0) // error: expected array, got 0
-  }
+    p: React.PropTypes.oneOf(0), // error: expected array, got 0
+  },
 });
 
 <InvalidArrayExample p={0} />; // OK, don't cascade errors
 
 var NonLiteralElemExample = React.createClass({
   propTypes: {
-    p: React.PropTypes.oneOf([{}]) // OK: allow non-literals
-  }
+    p: React.PropTypes.oneOf([{}]), // OK: allow non-literals
+  },
 });
 <NonLiteralElemExample p={0} />; // OK, result is unknown/any
 
@@ -1746,8 +1746,8 @@ var Example = React.createClass({
   propTypes: {
     prop: React.PropTypes.oneOfType([
       React.PropTypes.string,
-      React.PropTypes.number
-    ]).isRequired
+      React.PropTypes.number,
+    ]).isRequired,
   },
   render() {
     if (typeof this.props.prop === "string") {
@@ -1755,7 +1755,7 @@ var Example = React.createClass({
     } else {
       return <div>{this.props.prop.toFixed(2)}</div>;
     }
-  }
+  },
 });
 
 var ok_number = <Example prop={42} />;
@@ -1771,8 +1771,8 @@ var todo_required = <Example prop={null} />;
 
 var OptionalExample = React.createClass({
   propTypes: {
-    p: React.PropTypes.oneOfType([React.PropTypes.string])
-  }
+    p: React.PropTypes.oneOfType([React.PropTypes.string]),
+  },
 });
 
 <OptionalExample />; // OK
@@ -1781,32 +1781,32 @@ var OptionalExample = React.createClass({
 
 var EmptyExample = React.createClass({
   propTypes: {
-    nil: React.PropTypes.oneOfType([]) // i.e., \`empty\`
-  }
+    nil: React.PropTypes.oneOfType([]), // i.e., \`empty\`
+  },
 });
 
 <EmptyExample nil={0} />; // number ~> empty
 
 var AnyArrayExample = React.createClass({
   propTypes: {
-    any: React.PropTypes.oneOfType((0: any))
-  }
+    any: React.PropTypes.oneOfType((0: any)),
+  },
 });
 
 <AnyArrayExample any={0} />; // OK
 
 var AnyElemExample = React.createClass({
   propTypes: {
-    any: React.PropTypes.oneOfType([React.PropTypes.string, (0: any)])
-  }
+    any: React.PropTypes.oneOfType([React.PropTypes.string, (0: any)]),
+  },
 });
 
 <AnyElemExample any={0} />; // OK
 
 var DynamicArrayExample = React.createClass({
   propTypes: {
-    dyn: React.PropTypes.oneOfType(([]: Array<Function>))
-  }
+    dyn: React.PropTypes.oneOfType(([]: Array<Function>)),
+  },
 });
 
 <DynamicArrayExample dyn={0} />; // OK
@@ -1815,25 +1815,25 @@ var DynamicElemExample = React.createClass({
   propTypes: {
     dyn: React.PropTypes.oneOfType([
       React.PropTypes.string,
-      (() => {}: Function)
-    ])
-  }
+      (() => {}: Function),
+    ]),
+  },
 });
 
 <DynamicElemExample dyn={0} />; // OK
 
 var InvalidArrayExample = React.createClass({
   propTypes: {
-    p: React.PropTypes.oneOfType(0) // error: expected array, got 0
-  }
+    p: React.PropTypes.oneOfType(0), // error: expected array, got 0
+  },
 });
 
 <InvalidArrayExample p={0} />; // OK, don't cascade errors
 
 var InvalidElemExample = React.createClass({
   propTypes: {
-    p: React.PropTypes.oneOfType([{}]) // error: expected prop type, got {}
-  }
+    p: React.PropTypes.oneOfType([{}]), // error: expected prop type, got {}
+  },
 });
 
 <InvalidElemExample p={0} />; // OK, don't cascade errors
@@ -1898,8 +1898,8 @@ import React from "react";
 React.createClass({
   propTypes: {
     foo: React.PropTypes.shape({
-      bar: React.PropTypes.string.isRequired
-    }).isRequired
+      bar: React.PropTypes.string.isRequired,
+    }).isRequired,
   },
 
   f() {
@@ -1908,16 +1908,16 @@ React.createClass({
 
   g() {
     this.props.foo.baz = 0;
-  }
+  },
 });
 
 React.createClass({
   propTypes: {
-    foo: React.PropTypes.shape(({}: { [string]: any })).isRequired
+    foo: React.PropTypes.shape(({}: { [string]: any })).isRequired,
   },
   f() {
     (this.props.foo.bar: empty); // OK
-  }
+  },
 });
 
 ================================================================================
@@ -2034,7 +2034,7 @@ import React from "react";
 
 React.createClass({
   propTypes: {
-    foo: React.PropTypes.string.isRequired
+    foo: React.PropTypes.string.isRequired,
   },
 
   f() {
@@ -2043,7 +2043,7 @@ React.createClass({
 
   g() {
     this.props.baz = 0;
-  }
+  },
 });
 
 ================================================================================
diff --git a/tests/flow/react_modules/__snapshots__/jsfmt.spec.js.snap b/tests/flow/react_modules/__snapshots__/jsfmt.spec.js.snap
index 9b2b6d282..f051ade9e 100644
--- a/tests/flow/react_modules/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/react_modules/__snapshots__/jsfmt.spec.js.snap
@@ -40,12 +40,12 @@ var Hello = require("./createclass-module");
 
 var HelloLocal = React.createClass({
   propTypes: {
-    name: React.PropTypes.string.isRequired
+    name: React.PropTypes.string.isRequired,
   },
 
   render: function(): React.Element<*> {
     return <div>{this.props.name}</div>;
-  }
+  },
 });
 
 var Callsite = React.createClass({
@@ -56,7 +56,7 @@ var Callsite = React.createClass({
         <HelloLocal />
       </div>
     );
-  }
+  },
 });
 
 module.exports = Callsite;
@@ -91,12 +91,12 @@ var React = require("react");
 
 var Hello = React.createClass({
   propTypes: {
-    name: React.PropTypes.string.isRequired
+    name: React.PropTypes.string.isRequired,
   },
 
   render: function(): React.Element<*> {
     return <div>{this.props.name}</div>;
-  }
+  },
 });
 
 module.exports = Hello;
@@ -145,7 +145,7 @@ import Hello from "./es6class-proptypes-module";
 class HelloLocal extends React.Component<void, { name: string }, void> {
   defaultProps = {};
   propTypes = {
-    name: React.PropTypes.string.isRequired
+    name: React.PropTypes.string.isRequired,
   };
   render(): React.Element<*> {
     return <div>{this.props.name}</div>;
@@ -197,7 +197,7 @@ import React from "react";
 class Hello extends React.Component<void, { name: string }, void> {
   defaultProps = {};
   propTypes = {
-    name: React.PropTypes.string.isRequired
+    name: React.PropTypes.string.isRequired,
   };
 
   render(): React.Element<*> {
diff --git a/tests/flow/rec/__snapshots__/jsfmt.spec.js.snap b/tests/flow/rec/__snapshots__/jsfmt.spec.js.snap
index b870aa46c..37978ed6e 100644
--- a/tests/flow/rec/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/rec/__snapshots__/jsfmt.spec.js.snap
@@ -44,14 +44,14 @@ function bar2<X>(y: F<any>): F<X> {
 }
 
 type Functor<A> = {
-  map<B>(f: (val: A) => B): Functor<B>
+  map<B>(f: (val: A) => B): Functor<B>,
 };
 
 function identity<A>(val: A): Functor<A> {
   return {
     map<B>(f: (_: typeof val) => B): Functor<B> {
       return identity(f(val));
-    }
+    },
   };
 }
 
@@ -79,7 +79,7 @@ function id(x: Task<any,any>): Task<any,any> { return x; }
 type Task<error, value> = {
   chain<tagged>(
     next: (input: value) => Task<error, tagged>
-  ): Task<error, tagged>
+  ): Task<error, tagged>,
 };
 
 function id(x: Task<any, any>): Task<any, any> {
diff --git a/tests/flow/recheck/tmplibk/__snapshots__/jsfmt.spec.js.snap b/tests/flow/recheck/tmplibk/__snapshots__/jsfmt.spec.js.snap
index a3cac724b..edc5b7e41 100644
--- a/tests/flow/recheck/tmplibk/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/recheck/tmplibk/__snapshots__/jsfmt.spec.js.snap
@@ -26,7 +26,7 @@ type LibK = {
 
 =====================================output=====================================
 type LibK = {
-  p: string
+  p: string,
 };
 
 ================================================================================
diff --git a/tests/flow/record/__snapshots__/jsfmt.spec.js.snap b/tests/flow/record/__snapshots__/jsfmt.spec.js.snap
index 877bc5156..4b0c88072 100644
--- a/tests/flow/record/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/record/__snapshots__/jsfmt.spec.js.snap
@@ -35,7 +35,7 @@ var o3: {[key: AnyKey]: number} = { foo: 0 };
 type Key1 = "foo" | "bar"; // make an enum type with known key set
 var o1: { [key: Key1]: number } = {
   foo: 0,
-  bar: "" // error: string ~/~ number
+  bar: "", // error: string ~/~ number
 };
 o1.foo; // OK
 o1.qux; // error: qux not found
diff --git a/tests/flow/refi/__snapshots__/jsfmt.spec.js.snap b/tests/flow/refi/__snapshots__/jsfmt.spec.js.snap
index ac23dce3b..27f4db557 100644
--- a/tests/flow/refi/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/refi/__snapshots__/jsfmt.spec.js.snap
@@ -135,7 +135,7 @@ var tests = [
 
   function() {
     var y: string = x || ""; // ok
-  }
+  },
 ];
 
 ================================================================================
@@ -625,7 +625,7 @@ var tests = [
       var { p } = x; // TODO: annot checked against type of x
       (p: string); // ok
     }
-  }
+  },
 ];
 
 ================================================================================
@@ -890,7 +890,7 @@ var paths = [
       x = "xxx";
     }
     var y: string = x;
-  }
+  },
 ];
 
 ================================================================================
@@ -1158,7 +1158,7 @@ var null_tests = [
     } else {
       var y: string | void = x.p.q; // ok
     }
-  }
+  },
 ];
 
 // this.p op null
@@ -1586,7 +1586,7 @@ var null_tests = [
     } else {
       var y: string = x.p.q; // ok
     }
-  }
+  },
 ];
 
 // typeof this.p op typename
@@ -1754,7 +1754,7 @@ var undef_tests = [
     } else {
       var y: string = x.p.q; // ok
     }
-  }
+  },
 ];
 
 // this.p op undefined
@@ -1912,7 +1912,7 @@ var void_tests = [
     } else {
       var y: string = x.p.q; // ok
     }
-  }
+  },
 ];
 
 // this.p op void(...)
diff --git a/tests/flow/refinements/__snapshots__/jsfmt.spec.js.snap b/tests/flow/refinements/__snapshots__/jsfmt.spec.js.snap
index b6cd798bb..06caccde0 100644
--- a/tests/flow/refinements/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/refinements/__snapshots__/jsfmt.spec.js.snap
@@ -51,7 +51,7 @@ function foo(x: ?number) {
 
 type Bar = {
   parent: ?Bar,
-  doStuff: () => void
+  doStuff: () => void,
 };
 
 function bar0(x: Bar) {
@@ -99,12 +99,12 @@ export type ASTNode = Node1 | Node2;
 =====================================output=====================================
 type Node1 = {
   kind: "Node1",
-  prop1?: string
+  prop1?: string,
 };
 
 type Node2 = {
   kind: "Node2",
-  prop2?: string
+  prop2?: string,
 };
 
 export type ASTNode = Node1 | Node2;
@@ -210,7 +210,7 @@ let tests = [
       return x.result;
     }
     return x.result; // error
-  }
+  },
 ];
 
 ================================================================================
@@ -246,7 +246,7 @@ function testLiteralProperty(a: A) {
 // @flow
 
 type A = {
-  b_c: ?string
+  b_c: ?string,
 };
 
 function stuff(str: string) {}
@@ -374,7 +374,7 @@ let tests = [
         (t.quux: string); // error, consider { foo: {}, bar: "" }
       }
     }
-  }
+  },
 ];
 
 ================================================================================
@@ -457,7 +457,7 @@ let tests = [
     } // error
     if (x.y === 123) {
     } // ok
-  }
+  },
 ];
 
 ================================================================================
@@ -535,7 +535,7 @@ let tests = [
       // incorrectly.
       x.y.indexOf(z()); // no error
     }
-  }
+  },
 ];
 
 ================================================================================
@@ -927,7 +927,7 @@ function foo8(o: { p: mixed }) {
 }
 
 type Foo9Expected = {
-  foo: string
+  foo: string,
 };
 
 function foo9() {
@@ -1319,7 +1319,7 @@ let tests = [
   },
   function(x: TestClass) {
     (!x: false); // ok, classes are always truthy
-  }
+  },
 ];
 
 ================================================================================
@@ -1605,7 +1605,7 @@ let tests = [
     } else {
       return x; // no error, inferred to be 0
     }
-  }
+  },
 ];
 
 ================================================================================
@@ -2234,7 +2234,7 @@ let tests = [
       return x;
     }
     return "foo";
-  }
+  },
 ];
 
 ================================================================================
@@ -2998,7 +2998,7 @@ let tests = [
       (x.y: string);
       x.z; // error
     }
-  }
+  },
 ];
 
 ================================================================================
@@ -3041,12 +3041,12 @@ import { SUCCESS, ERROR } from "./constants";
 
 type Success = {
   type: typeof SUCCESS,
-  message: string
+  message: string,
 };
 
 type Error = {
   type: typeof ERROR,
-  error: string
+  error: string,
 };
 
 function handleStatus(status: Success | Error) {
diff --git a/tests/flow/require/__snapshots__/jsfmt.spec.js.snap b/tests/flow/require/__snapshots__/jsfmt.spec.js.snap
index 3be6802e9..b98f8a5ae 100644
--- a/tests/flow/require/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/require/__snapshots__/jsfmt.spec.js.snap
@@ -56,7 +56,7 @@ exports = {stringValue: ''};
 // value will affect the exports object but re-binding it makes it useless and
 // does not affect the exports value.
 module.exports = {
-  numberValue: 42
+  numberValue: 42,
 };
 
 exports = { stringValue: "" };
diff --git a/tests/flow/requireLazy/__snapshots__/jsfmt.spec.js.snap b/tests/flow/requireLazy/__snapshots__/jsfmt.spec.js.snap
index 96705e4fa..2230e7732 100644
--- a/tests/flow/requireLazy/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/requireLazy/__snapshots__/jsfmt.spec.js.snap
@@ -24,7 +24,7 @@ module.exports = {
 
 module.exports = {
   numberValueA: 1,
-  stringValueA: "someString"
+  stringValueA: "someString",
 };
 
 ================================================================================
@@ -54,7 +54,7 @@ module.exports = {
 
 module.exports = {
   numberValueB: 1,
-  stringValueB: "someString"
+  stringValueB: "someString",
 };
 
 ================================================================================
diff --git a/tests/flow/sealed/__snapshots__/jsfmt.spec.js.snap b/tests/flow/sealed/__snapshots__/jsfmt.spec.js.snap
index f4242ed8b..9648a309b 100644
--- a/tests/flow/sealed/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/sealed/__snapshots__/jsfmt.spec.js.snap
@@ -70,7 +70,7 @@ o.x = "...";
 Foo.prototype = {
   m: function() {
     return false;
-  }
+  },
 };
 
 var export_o: { x: any } = o; // awkward type cast
diff --git a/tests/flow/sealed_objects/__snapshots__/jsfmt.spec.js.snap b/tests/flow/sealed_objects/__snapshots__/jsfmt.spec.js.snap
index d07d080be..c13aa3d5a 100644
--- a/tests/flow/sealed_objects/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/sealed_objects/__snapshots__/jsfmt.spec.js.snap
@@ -47,7 +47,7 @@ var s6: string = o6.y; // ok  (indexers make object types extensible)
 
 var o7: { x: number, y?: string } = ({ x: 0, y: 0 }: {
   x: number,
-  [_: any]: number
+  [_: any]: number,
 }); // error
 
 ================================================================================
diff --git a/tests/flow/shape/__snapshots__/jsfmt.spec.js.snap b/tests/flow/shape/__snapshots__/jsfmt.spec.js.snap
index 9d1450f42..42ea56de3 100644
--- a/tests/flow/shape/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/shape/__snapshots__/jsfmt.spec.js.snap
@@ -34,7 +34,7 @@ var y: $Shape<Foo> = x;
 
 =====================================output=====================================
 type Foo = {
-  field: number
+  field: number,
 };
 
 var x: { field?: number } = {};
diff --git a/tests/flow/spread/__snapshots__/jsfmt.spec.js.snap b/tests/flow/spread/__snapshots__/jsfmt.spec.js.snap
index c15c0ee3c..fc9fff176 100644
--- a/tests/flow/spread/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/spread/__snapshots__/jsfmt.spec.js.snap
@@ -52,14 +52,14 @@ function parseGroup(
   counter: number,
   begin: number,
   end: number,
-  text: string
+  text: string,
 } {
   var counter = parseCounter(lines[0]);
   var timeframe = parseTimeframe(lines[1]);
   return {
     counter,
     ...timeframe,
-    text: lines[2]
+    text: lines[2],
   };
 }
 
@@ -67,7 +67,7 @@ function parseTimeframe(line: string): { begin: number, end: number } {
   var timestamps = line.split("-->");
   return {
     begin: parseTimestamp(timestamps[0].trim()),
-    end: parseTimestamp(timestamps[1].trim())
+    end: parseTimestamp(timestamps[1].trim()),
   };
 }
 
@@ -134,7 +134,7 @@ var q = { z: "" };
 var o = {
   x: 5,
   ...p,
-  ...q
+  ...q,
 };
 var y: number = o.y;
 var z: number = o.z;
@@ -143,7 +143,7 @@ var z: number = o.z;
 var r = { y: 123 };
 var s = {
   ...p,
-  ...r
+  ...r,
 };
 var t: boolean = s.y; // error, string or number
 
@@ -224,7 +224,7 @@ function test(
     (value: string); // OK
     return {
       ...x,
-      kind: value
+      kind: value,
     };
   });
 }
@@ -261,20 +261,20 @@ for (var i = 0; i < 10; i++) {
 
 =====================================output=====================================
 var o = {
-  foo: "bar"
+  foo: "bar",
 };
 o = { ...o };
 (o: { foo: string });
 
 var p = {
-  foo: "bar"
+  foo: "bar",
 };
 (p: { foo: string, abc: string }); // error, p doesn't have \`abc\` yet
 p = { ...p, abc: "def" };
 (p: { foo: string, abc: string });
 
 var q = {
-  foo: "bar"
+  foo: "bar",
 };
 for (var i = 0; i < 10; i++) {
   q = { ...q };
@@ -306,7 +306,7 @@ let tests = [
   function(x: Object) {
     ({ ...x }: Object);
     ({ ...x }: void); // error, Object
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/strict_requires/__snapshots__/jsfmt.spec.js.snap b/tests/flow/strict_requires/__snapshots__/jsfmt.spec.js.snap
index a0b474021..1d2fe9855 100644
--- a/tests/flow/strict_requires/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/strict_requires/__snapshots__/jsfmt.spec.js.snap
@@ -49,7 +49,7 @@ module.exports = o;
 /* @flow */
 var o = {
   A: require("./A"),
-  ...require("./B")
+  ...require("./B"),
 };
 module.exports = o;
 
diff --git a/tests/flow/suppress/__snapshots__/jsfmt.spec.js.snap b/tests/flow/suppress/__snapshots__/jsfmt.spec.js.snap
index 69b5b7591..7950dc95b 100644
--- a/tests/flow/suppress/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/suppress/__snapshots__/jsfmt.spec.js.snap
@@ -121,11 +121,11 @@ x = y;
 
 =====================================output=====================================
 declare var x: {
-  x: { foo: string }
+  x: { foo: string },
 };
 declare var y: {
   // $FlowFixMe - this location is only mentioned in the extra section
-  x: { bar: number }
+  x: { bar: number },
 };
 x = y;
 
diff --git a/tests/flow/tagged-unions/__snapshots__/jsfmt.spec.js.snap b/tests/flow/tagged-unions/__snapshots__/jsfmt.spec.js.snap
index d9303b1ee..95701fa43 100644
--- a/tests/flow/tagged-unions/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/tagged-unions/__snapshots__/jsfmt.spec.js.snap
@@ -128,7 +128,7 @@ declare type IData = IUserData | ISystemData;
 const data: IData = {
   id: "",
   name: "",
-  kind: "system"
+  kind: "system",
 };
 
 if (data.kind === "user") {
@@ -192,7 +192,7 @@ declare type IData = IUserData | ISystemData;
 const data: IData = {
   id: "",
   name: "",
-  kind: "system"
+  kind: "system",
 };
 
 if (data.kind === "system") {
@@ -244,19 +244,19 @@ if (data.kind === "user") {
 
 type DataBase = {
   id: string,
-  name: string
+  name: string,
 };
 
 type UserData = {
   id: string,
   name: string,
-  kind: "user"
+  kind: "user",
 };
 
 type SystemData = {
   id: string,
   name: string,
-  kind: "system"
+  kind: "system",
 };
 
 declare type Data = UserData | SystemData;
@@ -264,7 +264,7 @@ declare type Data = UserData | SystemData;
 const data: Data = {
   id: "",
   name: "",
-  kind: "system"
+  kind: "system",
 };
 
 if (data.kind === "user") {
@@ -316,19 +316,19 @@ if (data.kind === "system") {
 
 type DataBase = {
   id: string,
-  name: string
+  name: string,
 };
 
 type UserData = {
   id: string,
   name: string,
-  kind: "user"
+  kind: "user",
 };
 
 type SystemData = {
   id: string,
   name: string,
-  kind: "system"
+  kind: "system",
 };
 
 declare type Data = UserData | SystemData;
@@ -336,7 +336,7 @@ declare type Data = UserData | SystemData;
 const data: Data = {
   id: "",
   name: "",
-  kind: "system"
+  kind: "system",
 };
 
 if (data.kind === "system") {
diff --git a/tests/flow/taint/__snapshots__/jsfmt.spec.js.snap b/tests/flow/taint/__snapshots__/jsfmt.spec.js.snap
index 9bd03ee7e..ee69f4763 100644
--- a/tests/flow/taint/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/taint/__snapshots__/jsfmt.spec.js.snap
@@ -130,7 +130,7 @@ let tests = [
 
     let foo = obj.foo;
     foo(x); // error, taint ~> any
-  }
+  },
 ];
 
 ================================================================================
@@ -280,7 +280,7 @@ let tests = [
   function(x: any, y: $Tainted<string>) {
     let z = x();
     z(y);
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/template/__snapshots__/jsfmt.spec.js.snap b/tests/flow/template/__snapshots__/jsfmt.spec.js.snap
index ee2d1e39f..79942ad98 100644
--- a/tests/flow/template/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/template/__snapshots__/jsfmt.spec.js.snap
@@ -68,7 +68,7 @@ let tests = [
     \`foo \${x}\`; // error
     \`\${x} bar\`; // error
     \`foo \${"bar"} \${x}\`; // error
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/traces/__snapshots__/jsfmt.spec.js.snap b/tests/flow/traces/__snapshots__/jsfmt.spec.js.snap
index 61c4616c0..476d6973f 100644
--- a/tests/flow/traces/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/traces/__snapshots__/jsfmt.spec.js.snap
@@ -96,11 +96,11 @@ function f(b): React.Element<*> {
 var React = require("react");
 
 var A = React.createClass({
-  propTypes: { foo: React.PropTypes.string.isRequired }
+  propTypes: { foo: React.PropTypes.string.isRequired },
 });
 
 var B = React.createClass({
-  propTypes: { bar: React.PropTypes.string.isRequired }
+  propTypes: { bar: React.PropTypes.string.isRequired },
 });
 
 function f(b): React.Element<*> {
diff --git a/tests/flow/type-at-pos/__snapshots__/jsfmt.spec.js.snap b/tests/flow/type-at-pos/__snapshots__/jsfmt.spec.js.snap
index 2928112dd..4b0b820ec 100644
--- a/tests/flow/type-at-pos/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/type-at-pos/__snapshots__/jsfmt.spec.js.snap
@@ -44,7 +44,7 @@ export const X = {
 
   test: function() {
     let [a, b] = this.returnsATuple();
-  }
+  },
 };
 
 ================================================================================
@@ -88,23 +88,23 @@ const d = {
 // }
 
 const a = {
-  bar(): void {}
+  bar(): void {},
 };
 
 const b = {
-  bar: function(): void {}
+  bar: function(): void {},
 };
 
 const c = {
   m<T>(x: T): T {
     return x;
-  }
+  },
 };
 
 const d = {
   m: function<T>(x: T): T {
     return x;
-  }
+  },
 };
 
 ================================================================================
@@ -220,7 +220,7 @@ let tests = [
   function() {
     let x = {};
     Object.defineProperty(x, "foo", { value: "" });
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/type-printer/__snapshots__/jsfmt.spec.js.snap b/tests/flow/type-printer/__snapshots__/jsfmt.spec.js.snap
index c58eb6ff0..1f80fa12a 100644
--- a/tests/flow/type-printer/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/type-printer/__snapshots__/jsfmt.spec.js.snap
@@ -5123,9 +5123,9 @@ export type Comment =
       end: number,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
-      start: number
+      start: number,
     }
   | {
       type: "CommentBlock",
@@ -5134,9 +5134,9 @@ export type Comment =
       end: number,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
-      start: number
+      start: number,
     };
 
 export type Declaration =
@@ -5149,10 +5149,10 @@ export type Declaration =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ClassDeclaration",
@@ -5168,10 +5168,10 @@ export type Declaration =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "FunctionDeclaration",
@@ -5183,7 +5183,7 @@ export type Declaration =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
       trailingComments: ?Array<Comment>,
@@ -5194,7 +5194,7 @@ export type Declaration =
       params: Array<Pattern>,
       rest: ?Identifier,
       returnType: ?TypeAnnotation,
-      typeParameters: ?TypeParameterDeclaration
+      typeParameters: ?TypeParameterDeclaration,
     }
   | {
       type: "MethodDefinition",
@@ -5210,10 +5210,10 @@ export type Declaration =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "VariableDeclaration",
@@ -5225,10 +5225,10 @@ export type Declaration =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ClassProperty",
@@ -5244,10 +5244,10 @@ export type Declaration =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     };
 
 export type Expression =
@@ -5260,10 +5260,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "AssignmentExpression",
@@ -5276,10 +5276,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "AwaitExpression",
@@ -5291,10 +5291,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BinaryExpression",
@@ -5307,10 +5307,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BindExpression",
@@ -5322,10 +5322,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "CallExpression",
@@ -5337,10 +5337,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ClassExpression",
@@ -5356,10 +5356,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ComprehensionExpression",
@@ -5372,10 +5372,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ConditionalExpression",
@@ -5388,10 +5388,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DoExpression",
@@ -5402,10 +5402,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "FunctionExpression",
@@ -5417,7 +5417,7 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
       trailingComments: ?Array<Comment>,
@@ -5428,7 +5428,7 @@ export type Expression =
       params: Array<Pattern>,
       rest: ?Identifier,
       returnType: ?TypeAnnotation,
-      typeParameters: ?TypeParameterDeclaration
+      typeParameters: ?TypeParameterDeclaration,
     }
   | {
       type: "Identifier",
@@ -5440,10 +5440,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "Literal",
@@ -5456,10 +5456,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "LogicalExpression",
@@ -5472,10 +5472,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "MemberExpression",
@@ -5488,10 +5488,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "NewExpression",
@@ -5503,10 +5503,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ObjectExpression",
@@ -5517,10 +5517,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "SequenceExpression",
@@ -5531,10 +5531,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TaggedTemplateExpression",
@@ -5546,10 +5546,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TemplateLiteral",
@@ -5561,10 +5561,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ThisExpression",
@@ -5574,10 +5574,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "UnaryExpression",
@@ -5590,10 +5590,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "UpdateExpression",
@@ -5606,10 +5606,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "YieldExpression",
@@ -5621,10 +5621,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TypeCastExpression",
@@ -5636,10 +5636,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXElement",
@@ -5652,10 +5652,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXEmptyExpression",
@@ -5665,10 +5665,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXExpressionContainer",
@@ -5679,10 +5679,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXMemberExpression",
@@ -5695,10 +5695,10 @@ export type Expression =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     };
 
 export type Function =
@@ -5712,7 +5712,7 @@ export type Function =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
       trailingComments: ?Array<Comment>,
@@ -5723,7 +5723,7 @@ export type Function =
       params: Array<Pattern>,
       rest: ?Identifier,
       returnType: ?TypeAnnotation,
-      typeParameters: ?TypeParameterDeclaration
+      typeParameters: ?TypeParameterDeclaration,
     }
   | {
       type: "FunctionDeclaration",
@@ -5735,7 +5735,7 @@ export type Function =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
       trailingComments: ?Array<Comment>,
@@ -5746,7 +5746,7 @@ export type Function =
       params: Array<Pattern>,
       rest: ?Identifier,
       returnType: ?TypeAnnotation,
-      typeParameters: ?TypeParameterDeclaration
+      typeParameters: ?TypeParameterDeclaration,
     }
   | {
       type: "FunctionExpression",
@@ -5758,7 +5758,7 @@ export type Function =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
       trailingComments: ?Array<Comment>,
@@ -5769,7 +5769,7 @@ export type Function =
       params: Array<Pattern>,
       rest: ?Identifier,
       returnType: ?TypeAnnotation,
-      typeParameters: ?TypeParameterDeclaration
+      typeParameters: ?TypeParameterDeclaration,
     };
 
 export type Node =
@@ -5782,10 +5782,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ArrayPattern",
@@ -5797,10 +5797,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ArrowFunctionExpression",
@@ -5812,7 +5812,7 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
       trailingComments: ?Array<Comment>,
@@ -5823,7 +5823,7 @@ export type Node =
       params: Array<Pattern>,
       rest: ?Identifier,
       returnType: ?TypeAnnotation,
-      typeParameters: ?TypeParameterDeclaration
+      typeParameters: ?TypeParameterDeclaration,
     }
   | {
       type: "AssignmentExpression",
@@ -5836,10 +5836,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "AssignmentPattern",
@@ -5851,10 +5851,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "AwaitExpression",
@@ -5866,10 +5866,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BinaryExpression",
@@ -5882,10 +5882,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BindExpression",
@@ -5897,10 +5897,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BlockStatement",
@@ -5911,10 +5911,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BreakStatement",
@@ -5925,10 +5925,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "CallExpression",
@@ -5940,10 +5940,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "CatchClause",
@@ -5955,10 +5955,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ClassBody",
@@ -5969,10 +5969,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ClassDeclaration",
@@ -5988,10 +5988,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ClassExpression",
@@ -6007,10 +6007,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ComprehensionBlock",
@@ -6023,10 +6023,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ComprehensionExpression",
@@ -6039,10 +6039,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ConditionalExpression",
@@ -6055,10 +6055,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ContinueStatement",
@@ -6069,10 +6069,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "Decorator",
@@ -6083,10 +6083,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DebuggerStatement",
@@ -6096,10 +6096,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DoWhileStatement",
@@ -6111,10 +6111,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DoExpression",
@@ -6125,10 +6125,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "EmptyStatement",
@@ -6138,10 +6138,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ExpressionStatement",
@@ -6152,10 +6152,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "File",
@@ -6166,10 +6166,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ForInStatement",
@@ -6182,10 +6182,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ForOfStatement",
@@ -6198,10 +6198,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ForStatement",
@@ -6215,10 +6215,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "FunctionDeclaration",
@@ -6230,7 +6230,7 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
       trailingComments: ?Array<Comment>,
@@ -6241,7 +6241,7 @@ export type Node =
       params: Array<Pattern>,
       rest: ?Identifier,
       returnType: ?TypeAnnotation,
-      typeParameters: ?TypeParameterDeclaration
+      typeParameters: ?TypeParameterDeclaration,
     }
   | {
       type: "FunctionExpression",
@@ -6253,7 +6253,7 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
       trailingComments: ?Array<Comment>,
@@ -6264,7 +6264,7 @@ export type Node =
       params: Array<Pattern>,
       rest: ?Identifier,
       returnType: ?TypeAnnotation,
-      typeParameters: ?TypeParameterDeclaration
+      typeParameters: ?TypeParameterDeclaration,
     }
   | {
       type: "Identifier",
@@ -6276,10 +6276,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "IfStatement",
@@ -6292,10 +6292,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ImportDefaultSpecifier",
@@ -6306,10 +6306,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ImportNamespaceSpecifier",
@@ -6320,10 +6320,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ImportDeclaration",
@@ -6335,10 +6335,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ImportSpecifier",
@@ -6350,10 +6350,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "LabeledStatement",
@@ -6365,10 +6365,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "Literal",
@@ -6381,10 +6381,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "LogicalExpression",
@@ -6397,10 +6397,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "MemberExpression",
@@ -6413,10 +6413,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "MetaProperty",
@@ -6428,10 +6428,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "MethodDefinition",
@@ -6447,10 +6447,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "NewExpression",
@@ -6462,10 +6462,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "Noop",
@@ -6475,10 +6475,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ObjectExpression",
@@ -6489,10 +6489,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ObjectPattern",
@@ -6504,10 +6504,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "Program",
@@ -6518,10 +6518,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "Property",
@@ -6538,10 +6538,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "RestElement",
@@ -6553,10 +6553,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ReturnStatement",
@@ -6567,10 +6567,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "SequenceExpression",
@@ -6581,10 +6581,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "SpreadElement",
@@ -6595,10 +6595,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "SpreadProperty",
@@ -6609,10 +6609,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "Super",
@@ -6622,10 +6622,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "SwitchCase",
@@ -6637,10 +6637,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "SwitchStatement",
@@ -6653,10 +6653,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TaggedTemplateExpression",
@@ -6668,10 +6668,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TemplateElement",
@@ -6683,10 +6683,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TemplateLiteral",
@@ -6698,10 +6698,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ThisExpression",
@@ -6711,10 +6711,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ThrowStatement",
@@ -6725,10 +6725,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TryStatement",
@@ -6743,10 +6743,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "UnaryExpression",
@@ -6759,10 +6759,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "UpdateExpression",
@@ -6775,10 +6775,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "VariableDeclaration",
@@ -6790,10 +6790,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "VariableDeclarator",
@@ -6805,10 +6805,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "WhileStatement",
@@ -6820,10 +6820,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "WithStatement",
@@ -6835,10 +6835,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "YieldExpression",
@@ -6850,10 +6850,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ExportAllDeclaration",
@@ -6865,10 +6865,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ExportDefaultDeclaration",
@@ -6879,10 +6879,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ExportNamedDeclaration",
@@ -6895,10 +6895,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ExportDefaultSpecifier",
@@ -6909,10 +6909,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ExportNamespaceSpecifier",
@@ -6923,10 +6923,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ExportSpecifier",
@@ -6938,10 +6938,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "AnyTypeAnnotation",
@@ -6951,10 +6951,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ArrayTypeAnnotation",
@@ -6965,10 +6965,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BooleanLiteralTypeAnnotation",
@@ -6980,10 +6980,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BooleanTypeAnnotation",
@@ -6993,10 +6993,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ClassImplements",
@@ -7009,10 +7009,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ClassProperty",
@@ -7028,10 +7028,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DeclareClass",
@@ -7045,10 +7045,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DeclareFunction",
@@ -7059,10 +7059,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DeclareModule",
@@ -7074,10 +7074,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DeclareVariable",
@@ -7088,10 +7088,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "FunctionTypeAnnotation",
@@ -7105,10 +7105,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "FunctionTypeParam",
@@ -7121,10 +7121,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "GenericTypeAnnotation",
@@ -7136,10 +7136,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "InterfaceExtends",
@@ -7151,10 +7151,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "InterfaceDeclaration",
@@ -7168,10 +7168,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "IntersectionTypeAnnotation",
@@ -7182,10 +7182,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "MixedTypeAnnotation",
@@ -7195,10 +7195,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "NullableTypeAnnotation",
@@ -7209,10 +7209,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "NumberLiteralTypeAnnotation",
@@ -7224,10 +7224,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "NumberTypeAnnotation",
@@ -7237,10 +7237,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "StringLiteralTypeAnnotation",
@@ -7252,10 +7252,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "StringTypeAnnotation",
@@ -7265,10 +7265,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TupleTypeAnnotation",
@@ -7279,10 +7279,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TypeofTypeAnnotation",
@@ -7293,10 +7293,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TypeAlias",
@@ -7309,10 +7309,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TypeAnnotation",
@@ -7323,10 +7323,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TypeCastExpression",
@@ -7338,10 +7338,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TypeParameterDeclaration",
@@ -7352,10 +7352,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TypeParameterInstantiation",
@@ -7366,10 +7366,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ObjectTypeAnnotation",
@@ -7382,10 +7382,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ObjectTypeCallProperty",
@@ -7397,10 +7397,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ObjectTypeIndexer",
@@ -7413,10 +7413,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ObjectTypeProperty",
@@ -7429,10 +7429,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "QualifiedTypeIdentifier",
@@ -7444,10 +7444,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "UnionTypeAnnotation",
@@ -7458,10 +7458,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "VoidTypeAnnotation",
@@ -7471,10 +7471,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXAttribute",
@@ -7486,10 +7486,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXClosingElement",
@@ -7500,10 +7500,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXElement",
@@ -7516,10 +7516,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXEmptyExpression",
@@ -7529,10 +7529,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXExpressionContainer",
@@ -7543,10 +7543,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXIdentifier",
@@ -7557,10 +7557,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXMemberExpression",
@@ -7573,10 +7573,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXNamespacedName",
@@ -7588,10 +7588,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXOpeningElement",
@@ -7604,10 +7604,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "JSXSpreadAttribute",
@@ -7618,10 +7618,10 @@ export type Node =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     };
 
 export type Pattern =
@@ -7635,10 +7635,10 @@ export type Pattern =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "AssignmentPattern",
@@ -7650,10 +7650,10 @@ export type Pattern =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "Identifier",
@@ -7665,10 +7665,10 @@ export type Pattern =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ObjectPattern",
@@ -7680,10 +7680,10 @@ export type Pattern =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "RestElement",
@@ -7695,10 +7695,10 @@ export type Pattern =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     };
 
 export type Statement =
@@ -7711,10 +7711,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BreakStatement",
@@ -7725,10 +7725,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ContinueStatement",
@@ -7739,10 +7739,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DoWhileStatement",
@@ -7754,10 +7754,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "EmptyStatement",
@@ -7767,10 +7767,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ExpressionStatement",
@@ -7781,10 +7781,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ForInStatement",
@@ -7797,10 +7797,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ForOfStatement",
@@ -7813,10 +7813,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ForStatement",
@@ -7830,10 +7830,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "IfStatement",
@@ -7846,10 +7846,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "LabeledStatement",
@@ -7861,10 +7861,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ReturnStatement",
@@ -7875,10 +7875,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "SwitchStatement",
@@ -7891,10 +7891,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ThrowStatement",
@@ -7905,10 +7905,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TryStatement",
@@ -7923,10 +7923,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "WhileStatement",
@@ -7938,10 +7938,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "WithStatement",
@@ -7953,10 +7953,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DeclareClass",
@@ -7970,10 +7970,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DeclareFunction",
@@ -7984,10 +7984,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DeclareModule",
@@ -7999,10 +7999,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "DeclareVariable",
@@ -8013,10 +8013,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "InterfaceDeclaration",
@@ -8030,10 +8030,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TypeAlias",
@@ -8046,10 +8046,10 @@ export type Statement =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     };
 
 export type Type =
@@ -8061,10 +8061,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ArrayTypeAnnotation",
@@ -8075,10 +8075,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BooleanLiteralTypeAnnotation",
@@ -8090,10 +8090,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "BooleanTypeAnnotation",
@@ -8103,10 +8103,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "FunctionTypeAnnotation",
@@ -8120,10 +8120,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "GenericTypeAnnotation",
@@ -8135,10 +8135,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "IntersectionTypeAnnotation",
@@ -8149,10 +8149,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "MixedTypeAnnotation",
@@ -8162,10 +8162,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "NullableTypeAnnotation",
@@ -8176,10 +8176,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "NumberLiteralTypeAnnotation",
@@ -8191,10 +8191,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "NumberTypeAnnotation",
@@ -8204,10 +8204,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "StringLiteralTypeAnnotation",
@@ -8219,10 +8219,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "StringTypeAnnotation",
@@ -8232,10 +8232,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "TupleTypeAnnotation",
@@ -8246,10 +8246,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "ObjectTypeAnnotation",
@@ -8262,10 +8262,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "UnionTypeAnnotation",
@@ -8276,10 +8276,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     }
   | {
       type: "VoidTypeAnnotation",
@@ -8289,10 +8289,10 @@ export type Type =
       leadingComments: ?Array<Comment>,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
       start: number,
-      trailingComments: ?Array<Comment>
+      trailingComments: ?Array<Comment>,
     };
 
 // Concrete Types. Nothing can extend these.
@@ -8304,9 +8304,9 @@ export type CommentLine = {
   end: number,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
-  start: number
+  start: number,
 };
 
 export type CommentBlock = {
@@ -8316,9 +8316,9 @@ export type CommentBlock = {
   end: number,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
-  start: number
+  start: number,
 };
 
 // Babel concrete types.
@@ -8332,10 +8332,10 @@ export type ArrayExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ArrayPattern = {
@@ -8348,10 +8348,10 @@ export type ArrayPattern = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ArrowFunctionExpression = {
@@ -8364,7 +8364,7 @@ export type ArrowFunctionExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
   trailingComments: ?Array<Comment>,
@@ -8375,7 +8375,7 @@ export type ArrowFunctionExpression = {
   params: Array<Pattern>,
   rest: ?Identifier,
   returnType: ?TypeAnnotation,
-  typeParameters: ?TypeParameterDeclaration
+  typeParameters: ?TypeParameterDeclaration,
 };
 
 type AssignmentOperator =
@@ -8403,10 +8403,10 @@ export type AssignmentExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type AssignmentPattern = {
@@ -8419,10 +8419,10 @@ export type AssignmentPattern = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type AwaitExpression = {
@@ -8435,10 +8435,10 @@ export type AwaitExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 type BinaryOperator =
@@ -8476,10 +8476,10 @@ export type BinaryExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: What is this?
@@ -8493,10 +8493,10 @@ export type BindExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type BlockStatement = {
@@ -8508,10 +8508,10 @@ export type BlockStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type BreakStatement = {
@@ -8523,10 +8523,10 @@ export type BreakStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type CallExpression = {
@@ -8539,10 +8539,10 @@ export type CallExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type CatchClause = {
@@ -8555,10 +8555,10 @@ export type CatchClause = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ClassBody = {
@@ -8570,10 +8570,10 @@ export type ClassBody = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ClassDeclaration = {
@@ -8590,10 +8590,10 @@ export type ClassDeclaration = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ClassExpression = {
@@ -8610,10 +8610,10 @@ export type ClassExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ComprehensionBlock = {
@@ -8627,10 +8627,10 @@ export type ComprehensionBlock = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ComprehensionExpression = {
@@ -8644,10 +8644,10 @@ export type ComprehensionExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ConditionalExpression = {
@@ -8661,10 +8661,10 @@ export type ConditionalExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ContinueStatement = {
@@ -8676,10 +8676,10 @@ export type ContinueStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -8692,10 +8692,10 @@ export type Decorator = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type DebuggerStatement = {
@@ -8706,10 +8706,10 @@ export type DebuggerStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type DoWhileStatement = {
@@ -8722,10 +8722,10 @@ export type DoWhileStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -8738,10 +8738,10 @@ export type DoExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type EmptyStatement = {
@@ -8752,10 +8752,10 @@ export type EmptyStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ExpressionStatement = {
@@ -8767,10 +8767,10 @@ export type ExpressionStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type File = {
@@ -8782,10 +8782,10 @@ export type File = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ForInStatement = {
@@ -8799,10 +8799,10 @@ export type ForInStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -8817,10 +8817,10 @@ export type ForOfStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ForStatement = {
@@ -8835,10 +8835,10 @@ export type ForStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type FunctionDeclaration = {
@@ -8851,7 +8851,7 @@ export type FunctionDeclaration = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
   trailingComments: ?Array<Comment>,
@@ -8862,7 +8862,7 @@ export type FunctionDeclaration = {
   params: Array<Pattern>,
   rest: ?Identifier,
   returnType: ?TypeAnnotation,
-  typeParameters: ?TypeParameterDeclaration
+  typeParameters: ?TypeParameterDeclaration,
 };
 
 export type FunctionExpression = {
@@ -8875,7 +8875,7 @@ export type FunctionExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
   trailingComments: ?Array<Comment>,
@@ -8886,7 +8886,7 @@ export type FunctionExpression = {
   params: Array<Pattern>,
   rest: ?Identifier,
   returnType: ?TypeAnnotation,
-  typeParameters: ?TypeParameterDeclaration
+  typeParameters: ?TypeParameterDeclaration,
 };
 
 export type Identifier = {
@@ -8899,10 +8899,10 @@ export type Identifier = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type IfStatement = {
@@ -8916,10 +8916,10 @@ export type IfStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -8932,10 +8932,10 @@ export type ImportDefaultSpecifier = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -8948,10 +8948,10 @@ export type ImportNamespaceSpecifier = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -8965,10 +8965,10 @@ export type ImportDeclaration = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -8982,10 +8982,10 @@ export type ImportSpecifier = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type LabeledStatement = {
@@ -8998,10 +8998,10 @@ export type LabeledStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type Literal = {
@@ -9015,10 +9015,10 @@ export type Literal = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 type LogicalOperator = "||" | "&&";
@@ -9034,10 +9034,10 @@ export type LogicalExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type MemberExpression = {
@@ -9051,10 +9051,10 @@ export type MemberExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -9068,10 +9068,10 @@ export type MetaProperty = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type MethodDefinition = {
@@ -9088,10 +9088,10 @@ export type MethodDefinition = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type NewExpression = {
@@ -9104,10 +9104,10 @@ export type NewExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type Noop = {
@@ -9118,10 +9118,10 @@ export type Noop = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ObjectExpression = {
@@ -9133,10 +9133,10 @@ export type ObjectExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ObjectPattern = {
@@ -9149,10 +9149,10 @@ export type ObjectPattern = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type Program = {
@@ -9164,10 +9164,10 @@ export type Program = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type Property = {
@@ -9185,10 +9185,10 @@ export type Property = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type RestElement = {
@@ -9201,10 +9201,10 @@ export type RestElement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ReturnStatement = {
@@ -9216,10 +9216,10 @@ export type ReturnStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type SequenceExpression = {
@@ -9231,10 +9231,10 @@ export type SequenceExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type SpreadElement = {
@@ -9246,10 +9246,10 @@ export type SpreadElement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type SpreadProperty = {
@@ -9261,10 +9261,10 @@ export type SpreadProperty = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type Super = {
@@ -9275,10 +9275,10 @@ export type Super = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type SwitchCase = {
@@ -9291,10 +9291,10 @@ export type SwitchCase = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type SwitchStatement = {
@@ -9308,10 +9308,10 @@ export type SwitchStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TaggedTemplateExpression = {
@@ -9324,10 +9324,10 @@ export type TaggedTemplateExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TemplateElement = {
@@ -9340,10 +9340,10 @@ export type TemplateElement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TemplateLiteral = {
@@ -9356,10 +9356,10 @@ export type TemplateLiteral = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ThisExpression = {
@@ -9370,10 +9370,10 @@ export type ThisExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ThrowStatement = {
@@ -9385,10 +9385,10 @@ export type ThrowStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TryStatement = {
@@ -9404,10 +9404,10 @@ export type TryStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 type UnaryOperator = "-" | "+" | "!" | "~" | "typeof" | "void" | "delete";
@@ -9423,10 +9423,10 @@ export type UnaryExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 type UpdateOperator = "++" | "--";
@@ -9442,10 +9442,10 @@ export type UpdateExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type VariableDeclaration = {
@@ -9458,10 +9458,10 @@ export type VariableDeclaration = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type VariableDeclarator = {
@@ -9474,10 +9474,10 @@ export type VariableDeclarator = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type WhileStatement = {
@@ -9490,10 +9490,10 @@ export type WhileStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type WithStatement = {
@@ -9506,10 +9506,10 @@ export type WithStatement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type YieldExpression = {
@@ -9522,10 +9522,10 @@ export type YieldExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -9539,10 +9539,10 @@ export type ExportAllDeclaration = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -9555,10 +9555,10 @@ export type ExportDefaultDeclaration = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -9573,10 +9573,10 @@ export type ExportNamedDeclaration = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -9589,10 +9589,10 @@ export type ExportDefaultSpecifier = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -9605,10 +9605,10 @@ export type ExportNamespaceSpecifier = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -9622,10 +9622,10 @@ export type ExportSpecifier = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type AnyTypeAnnotation = {
@@ -9636,10 +9636,10 @@ export type AnyTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ArrayTypeAnnotation = {
@@ -9651,10 +9651,10 @@ export type ArrayTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type BooleanLiteralTypeAnnotation = {
@@ -9667,10 +9667,10 @@ export type BooleanLiteralTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type BooleanTypeAnnotation = {
@@ -9681,10 +9681,10 @@ export type BooleanTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ClassImplements = {
@@ -9698,10 +9698,10 @@ export type ClassImplements = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ClassProperty = {
@@ -9718,10 +9718,10 @@ export type ClassProperty = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type DeclareClass = {
@@ -9736,10 +9736,10 @@ export type DeclareClass = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -9752,10 +9752,10 @@ export type DeclareFunction = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type DeclareModule = {
@@ -9768,10 +9768,10 @@ export type DeclareModule = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 // TODO: Make this correct.
@@ -9784,10 +9784,10 @@ export type DeclareVariable = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type FunctionTypeAnnotation = {
@@ -9802,10 +9802,10 @@ export type FunctionTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type FunctionTypeParam = {
@@ -9819,10 +9819,10 @@ export type FunctionTypeParam = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type GenericTypeAnnotation = {
@@ -9835,10 +9835,10 @@ export type GenericTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type InterfaceExtends = {
@@ -9851,10 +9851,10 @@ export type InterfaceExtends = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type InterfaceDeclaration = {
@@ -9869,10 +9869,10 @@ export type InterfaceDeclaration = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type IntersectionTypeAnnotation = {
@@ -9884,10 +9884,10 @@ export type IntersectionTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type MixedTypeAnnotation = {
@@ -9898,10 +9898,10 @@ export type MixedTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type NullableTypeAnnotation = {
@@ -9913,10 +9913,10 @@ export type NullableTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type NumberLiteralTypeAnnotation = {
@@ -9929,10 +9929,10 @@ export type NumberLiteralTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type NumberTypeAnnotation = {
@@ -9943,10 +9943,10 @@ export type NumberTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type StringLiteralTypeAnnotation = {
@@ -9959,10 +9959,10 @@ export type StringLiteralTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type StringTypeAnnotation = {
@@ -9973,10 +9973,10 @@ export type StringTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TupleTypeAnnotation = {
@@ -9988,10 +9988,10 @@ export type TupleTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TypeofTypeAnnotation = {
@@ -10003,10 +10003,10 @@ export type TypeofTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TypeAlias = {
@@ -10020,10 +10020,10 @@ export type TypeAlias = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TypeAnnotation = {
@@ -10035,10 +10035,10 @@ export type TypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TypeCastExpression = {
@@ -10051,10 +10051,10 @@ export type TypeCastExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TypeParameterDeclaration = {
@@ -10066,10 +10066,10 @@ export type TypeParameterDeclaration = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type TypeParameterInstantiation = {
@@ -10081,10 +10081,10 @@ export type TypeParameterInstantiation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ObjectTypeAnnotation = {
@@ -10098,10 +10098,10 @@ export type ObjectTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ObjectTypeCallProperty = {
@@ -10114,10 +10114,10 @@ export type ObjectTypeCallProperty = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ObjectTypeIndexer = {
@@ -10131,10 +10131,10 @@ export type ObjectTypeIndexer = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type ObjectTypeProperty = {
@@ -10148,10 +10148,10 @@ export type ObjectTypeProperty = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type QualifiedTypeIdentifier = {
@@ -10164,10 +10164,10 @@ export type QualifiedTypeIdentifier = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type UnionTypeAnnotation = {
@@ -10179,10 +10179,10 @@ export type UnionTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type VoidTypeAnnotation = {
@@ -10193,10 +10193,10 @@ export type VoidTypeAnnotation = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type JSXAttribute = {
@@ -10209,10 +10209,10 @@ export type JSXAttribute = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type JSXClosingElement = {
@@ -10224,10 +10224,10 @@ export type JSXClosingElement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type JSXElement = {
@@ -10241,10 +10241,10 @@ export type JSXElement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type JSXEmptyExpression = {
@@ -10255,10 +10255,10 @@ export type JSXEmptyExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type JSXExpressionContainer = {
@@ -10270,10 +10270,10 @@ export type JSXExpressionContainer = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type JSXIdentifier = {
@@ -10285,10 +10285,10 @@ export type JSXIdentifier = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type JSXMemberExpression = {
@@ -10302,10 +10302,10 @@ export type JSXMemberExpression = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type JSXNamespacedName = {
@@ -10318,10 +10318,10 @@ export type JSXNamespacedName = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type JSXOpeningElement = {
@@ -10335,10 +10335,10 @@ export type JSXOpeningElement = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 export type JSXSpreadAttribute = {
@@ -10350,10 +10350,10 @@ export type JSXSpreadAttribute = {
   leadingComments: ?Array<Comment>,
   loc: {
     end: { column: number, line: number },
-    start: { column: number, line: number }
+    start: { column: number, line: number },
   },
   start: number,
-  trailingComments: ?Array<Comment>
+  trailingComments: ?Array<Comment>,
 };
 
 ================================================================================
diff --git a/tests/flow/type_args_nonstrict/__snapshots__/jsfmt.spec.js.snap b/tests/flow/type_args_nonstrict/__snapshots__/jsfmt.spec.js.snap
index 436af02cb..9d9e4d228 100644
--- a/tests/flow/type_args_nonstrict/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/type_args_nonstrict/__snapshots__/jsfmt.spec.js.snap
@@ -119,7 +119,7 @@ var c2: MyClass2 = new MyClass2(0, ""); // no error
 // no arity error in type annotation using polymorphic type alias
 
 type MyObject<T> = {
-  x: T
+  x: T,
 };
 
 var o: MyObject = { x: 0 }; // no error
diff --git a/tests/flow/type_args_strict/__snapshots__/jsfmt.spec.js.snap b/tests/flow/type_args_strict/__snapshots__/jsfmt.spec.js.snap
index 0664b4d70..4b48c5b80 100644
--- a/tests/flow/type_args_strict/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/type_args_strict/__snapshots__/jsfmt.spec.js.snap
@@ -117,7 +117,7 @@ var c2: MyClass2 = new MyClass2(0, ""); // error, missing argument list (1-2)
 // arity error in type annotation using polymorphic type alias
 
 type MyObject<T> = {
-  x: T
+  x: T,
 };
 
 var o: MyObject = { x: 0 }; // error, missing argument list
diff --git a/tests/flow/type_only_vars/__snapshots__/jsfmt.spec.js.snap b/tests/flow/type_only_vars/__snapshots__/jsfmt.spec.js.snap
index adc88e86a..0910516c7 100644
--- a/tests/flow/type_only_vars/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/type_only_vars/__snapshots__/jsfmt.spec.js.snap
@@ -32,7 +32,7 @@ class Bar {}
 
 module.exports = {
   Foo: Foo,
-  Bar: Bar
+  Bar: Bar,
 };
 
 ================================================================================
@@ -72,7 +72,7 @@ import typeof A from "./A.js";
 import type { Foo, Bar as Baz } from "./A.js";
 
 type duck = {
-  quack: () => string
+  quack: () => string,
 };
 
 // These string types should confict with the imported types
diff --git a/tests/flow/typeapp_perf/__snapshots__/jsfmt.spec.js.snap b/tests/flow/typeapp_perf/__snapshots__/jsfmt.spec.js.snap
index c5914ef19..117d44a14 100644
--- a/tests/flow/typeapp_perf/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/typeapp_perf/__snapshots__/jsfmt.spec.js.snap
@@ -42,7 +42,7 @@ type B<T> = A & {
   +f: () => B<T>,
   +g: () => B<T>,
   +h: () => B<T>,
-  +i: () => B<T>
+  +i: () => B<T>,
 };
 
 declare var b: B<any>;
@@ -94,7 +94,7 @@ type B<T> = A & {
   +f: (x: B<T>) => void,
   +g: (x: B<T>) => void,
   +h: (x: B<T>) => void,
-  +i: (x: B<T>) => void
+  +i: (x: B<T>) => void,
 };
 
 declare var b: B<any>;
diff --git a/tests/flow/typecast/__snapshots__/jsfmt.spec.js.snap b/tests/flow/typecast/__snapshots__/jsfmt.spec.js.snap
index 5e0102969..a704b94c9 100644
--- a/tests/flow/typecast/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/typecast/__snapshots__/jsfmt.spec.js.snap
@@ -58,7 +58,7 @@ var tests = [
     // var a : Array<?number> = [0, 1, 2, 3, 4, 5, 6, 7, null];
     // typecast case:
     // var b = [(0 : ?number), 1, 2, 3, 4, 5, 6, 7, null];
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/unary/__snapshots__/jsfmt.spec.js.snap b/tests/flow/unary/__snapshots__/jsfmt.spec.js.snap
index fb56ee149..5e5cfd809 100644
--- a/tests/flow/unary/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/unary/__snapshots__/jsfmt.spec.js.snap
@@ -132,7 +132,7 @@ let tests = [
 
   function(y: any) {
     y++; // ok
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/undefined/__snapshots__/jsfmt.spec.js.snap b/tests/flow/undefined/__snapshots__/jsfmt.spec.js.snap
index 9ddc59226..5f4a0e0a2 100644
--- a/tests/flow/undefined/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/undefined/__snapshots__/jsfmt.spec.js.snap
@@ -132,7 +132,7 @@ let tests = [
 
     const bar = [undefined, "bar"];
     (bar[x]: boolean); // error, string only
-  }
+  },
 ];
 
 ================================================================================
diff --git a/tests/flow/union-intersection/__snapshots__/jsfmt.spec.js.snap b/tests/flow/union-intersection/__snapshots__/jsfmt.spec.js.snap
index afdc329d9..dc16ce22a 100644
--- a/tests/flow/union-intersection/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/union-intersection/__snapshots__/jsfmt.spec.js.snap
@@ -4015,4003 +4015,4003 @@ function foo(x: TAction): TAction { return x; }
 type TAction =
   | {
       type: "a1",
-      a1: number
+      a1: number,
     }
   | {
       type: "a2",
-      a1: number
+      a1: number,
     }
   | {
       type: "a3",
-      a1: number
+      a1: number,
     }
   | {
       type: "a4",
-      a1: number
+      a1: number,
     }
   | {
       type: "a5",
-      a1: number
+      a1: number,
     }
   | {
       type: "a6",
-      a1: number
+      a1: number,
     }
   | {
       type: "a7",
-      a1: number
+      a1: number,
     }
   | {
       type: "a8",
-      a1: number
+      a1: number,
     }
   | {
       type: "a9",
-      a1: number
+      a1: number,
     }
   | {
       type: "a10",
-      a1: number
+      a1: number,
     }
   | {
       type: "a11",
-      a2: number
+      a2: number,
     }
   | {
       type: "a12",
-      a2: number
+      a2: number,
     }
   | {
       type: "a13",
-      a2: number
+      a2: number,
     }
   | {
       type: "a14",
-      a2: number
+      a2: number,
     }
   | {
       type: "a15",
-      a2: number
+      a2: number,
     }
   | {
       type: "a16",
-      a2: number
+      a2: number,
     }
   | {
       type: "a17",
-      a2: number
+      a2: number,
     }
   | {
       type: "a18",
-      a2: number
+      a2: number,
     }
   | {
       type: "a19",
-      a2: number
+      a2: number,
     }
   | {
       type: "a20",
-      a2: number
+      a2: number,
     }
   | {
       type: "a21",
-      a3: number
+      a3: number,
     }
   | {
       type: "a22",
-      a3: number
+      a3: number,
     }
   | {
       type: "a23",
-      a3: number
+      a3: number,
     }
   | {
       type: "a24",
-      a3: number
+      a3: number,
     }
   | {
       type: "a25",
-      a3: number
+      a3: number,
     }
   | {
       type: "a26",
-      a3: number
+      a3: number,
     }
   | {
       type: "a27",
-      a3: number
+      a3: number,
     }
   | {
       type: "a28",
-      a3: number
+      a3: number,
     }
   | {
       type: "a29",
-      a3: number
+      a3: number,
     }
   | {
       type: "a30",
-      a3: number
+      a3: number,
     }
   | {
       type: "a31",
-      a4: number
+      a4: number,
     }
   | {
       type: "a32",
-      a4: number
+      a4: number,
     }
   | {
       type: "a33",
-      a4: number
+      a4: number,
     }
   | {
       type: "a34",
-      a4: number
+      a4: number,
     }
   | {
       type: "a35",
-      a4: number
+      a4: number,
     }
   | {
       type: "a36",
-      a4: number
+      a4: number,
     }
   | {
       type: "a37",
-      a4: number
+      a4: number,
     }
   | {
       type: "a38",
-      a4: number
+      a4: number,
     }
   | {
       type: "a39",
-      a4: number
+      a4: number,
     }
   | {
       type: "a40",
-      a4: number
+      a4: number,
     }
   | {
       type: "a41",
-      a5: number
+      a5: number,
     }
   | {
       type: "a42",
-      a5: number
+      a5: number,
     }
   | {
       type: "a43",
-      a5: number
+      a5: number,
     }
   | {
       type: "a44",
-      a5: number
+      a5: number,
     }
   | {
       type: "a45",
-      a5: number
+      a5: number,
     }
   | {
       type: "a46",
-      a5: number
+      a5: number,
     }
   | {
       type: "a47",
-      a5: number
+      a5: number,
     }
   | {
       type: "a48",
-      a5: number
+      a5: number,
     }
   | {
       type: "a49",
-      a5: number
+      a5: number,
     }
   | {
       type: "a50",
-      a5: number
+      a5: number,
     }
   | {
       type: "a51",
-      a6: number
+      a6: number,
     }
   | {
       type: "a52",
-      a6: number
+      a6: number,
     }
   | {
       type: "a53",
-      a6: number
+      a6: number,
     }
   | {
       type: "a54",
-      a6: number
+      a6: number,
     }
   | {
       type: "a55",
-      a6: number
+      a6: number,
     }
   | {
       type: "a56",
-      a6: number
+      a6: number,
     }
   | {
       type: "a57",
-      a6: number
+      a6: number,
     }
   | {
       type: "a58",
-      a6: number
+      a6: number,
     }
   | {
       type: "a59",
-      a6: number
+      a6: number,
     }
   | {
       type: "a60",
-      a6: number
+      a6: number,
     }
   | {
       type: "a61",
-      a7: number
+      a7: number,
     }
   | {
       type: "a62",
-      a7: number
+      a7: number,
     }
   | {
       type: "a63",
-      a7: number
+      a7: number,
     }
   | {
       type: "a64",
-      a7: number
+      a7: number,
     }
   | {
       type: "a65",
-      a7: number
+      a7: number,
     }
   | {
       type: "a66",
-      a7: number
+      a7: number,
     }
   | {
       type: "a67",
-      a7: number
+      a7: number,
     }
   | {
       type: "a68",
-      a7: number
+      a7: number,
     }
   | {
       type: "a69",
-      a7: number
+      a7: number,
     }
   | {
       type: "a70",
-      a7: number
+      a7: number,
     }
   | {
       type: "a71",
-      a8: number
+      a8: number,
     }
   | {
       type: "a72",
-      a8: number
+      a8: number,
     }
   | {
       type: "a73",
-      a8: number
+      a8: number,
     }
   | {
       type: "a74",
-      a8: number
+      a8: number,
     }
   | {
       type: "a75",
-      a8: number
+      a8: number,
     }
   | {
       type: "a76",
-      a8: number
+      a8: number,
     }
   | {
       type: "a77",
-      a8: number
+      a8: number,
     }
   | {
       type: "a78",
-      a8: number
+      a8: number,
     }
   | {
       type: "a79",
-      a8: number
+      a8: number,
     }
   | {
       type: "a80",
-      a8: number
+      a8: number,
     }
   | {
       type: "a81",
-      a9: number
+      a9: number,
     }
   | {
       type: "a82",
-      a9: number
+      a9: number,
     }
   | {
       type: "a83",
-      a9: number
+      a9: number,
     }
   | {
       type: "a84",
-      a9: number
+      a9: number,
     }
   | {
       type: "a85",
-      a9: number
+      a9: number,
     }
   | {
       type: "a86",
-      a9: number
+      a9: number,
     }
   | {
       type: "a87",
-      a9: number
+      a9: number,
     }
   | {
       type: "a88",
-      a9: number
+      a9: number,
     }
   | {
       type: "a89",
-      a9: number
+      a9: number,
     }
   | {
       type: "a90",
-      a9: number
+      a9: number,
     }
   | {
       type: "a91",
-      a10: number
+      a10: number,
     }
   | {
       type: "a92",
-      a10: number
+      a10: number,
     }
   | {
       type: "a93",
-      a10: number
+      a10: number,
     }
   | {
       type: "a94",
-      a10: number
+      a10: number,
     }
   | {
       type: "a95",
-      a10: number
+      a10: number,
     }
   | {
       type: "a96",
-      a10: number
+      a10: number,
     }
   | {
       type: "a97",
-      a10: number
+      a10: number,
     }
   | {
       type: "a98",
-      a10: number
+      a10: number,
     }
   | {
       type: "a99",
-      a10: number
+      a10: number,
     }
   | {
       type: "a100",
-      a10: number
+      a10: number,
     }
   | {
       type: "a101",
-      a11: number
+      a11: number,
     }
   | {
       type: "a102",
-      a11: number
+      a11: number,
     }
   | {
       type: "a103",
-      a11: number
+      a11: number,
     }
   | {
       type: "a104",
-      a11: number
+      a11: number,
     }
   | {
       type: "a105",
-      a11: number
+      a11: number,
     }
   | {
       type: "a106",
-      a11: number
+      a11: number,
     }
   | {
       type: "a107",
-      a11: number
+      a11: number,
     }
   | {
       type: "a108",
-      a11: number
+      a11: number,
     }
   | {
       type: "a109",
-      a11: number
+      a11: number,
     }
   | {
       type: "a110",
-      a11: number
+      a11: number,
     }
   | {
       type: "a111",
-      a12: number
+      a12: number,
     }
   | {
       type: "a112",
-      a12: number
+      a12: number,
     }
   | {
       type: "a113",
-      a12: number
+      a12: number,
     }
   | {
       type: "a114",
-      a12: number
+      a12: number,
     }
   | {
       type: "a115",
-      a12: number
+      a12: number,
     }
   | {
       type: "a116",
-      a12: number
+      a12: number,
     }
   | {
       type: "a117",
-      a12: number
+      a12: number,
     }
   | {
       type: "a118",
-      a12: number
+      a12: number,
     }
   | {
       type: "a119",
-      a12: number
+      a12: number,
     }
   | {
       type: "a120",
-      a12: number
+      a12: number,
     }
   | {
       type: "a121",
-      a13: number
+      a13: number,
     }
   | {
       type: "a122",
-      a13: number
+      a13: number,
     }
   | {
       type: "a123",
-      a13: number
+      a13: number,
     }
   | {
       type: "a124",
-      a13: number
+      a13: number,
     }
   | {
       type: "a125",
-      a13: number
+      a13: number,
     }
   | {
       type: "a126",
-      a13: number
+      a13: number,
     }
   | {
       type: "a127",
-      a13: number
+      a13: number,
     }
   | {
       type: "a128",
-      a13: number
+      a13: number,
     }
   | {
       type: "a129",
-      a13: number
+      a13: number,
     }
   | {
       type: "a130",
-      a13: number
+      a13: number,
     }
   | {
       type: "a131",
-      a14: number
+      a14: number,
     }
   | {
       type: "a132",
-      a14: number
+      a14: number,
     }
   | {
       type: "a133",
-      a14: number
+      a14: number,
     }
   | {
       type: "a134",
-      a14: number
+      a14: number,
     }
   | {
       type: "a135",
-      a14: number
+      a14: number,
     }
   | {
       type: "a136",
-      a14: number
+      a14: number,
     }
   | {
       type: "a137",
-      a14: number
+      a14: number,
     }
   | {
       type: "a138",
-      a14: number
+      a14: number,
     }
   | {
       type: "a139",
-      a14: number
+      a14: number,
     }
   | {
       type: "a140",
-      a14: number
+      a14: number,
     }
   | {
       type: "a141",
-      a15: number
+      a15: number,
     }
   | {
       type: "a142",
-      a15: number
+      a15: number,
     }
   | {
       type: "a143",
-      a15: number
+      a15: number,
     }
   | {
       type: "a144",
-      a15: number
+      a15: number,
     }
   | {
       type: "a145",
-      a15: number
+      a15: number,
     }
   | {
       type: "a146",
-      a15: number
+      a15: number,
     }
   | {
       type: "a147",
-      a15: number
+      a15: number,
     }
   | {
       type: "a148",
-      a15: number
+      a15: number,
     }
   | {
       type: "a149",
-      a15: number
+      a15: number,
     }
   | {
       type: "a150",
-      a15: number
+      a15: number,
     }
   | {
       type: "a151",
-      a16: number
+      a16: number,
     }
   | {
       type: "a152",
-      a16: number
+      a16: number,
     }
   | {
       type: "a153",
-      a16: number
+      a16: number,
     }
   | {
       type: "a154",
-      a16: number
+      a16: number,
     }
   | {
       type: "a155",
-      a16: number
+      a16: number,
     }
   | {
       type: "a156",
-      a16: number
+      a16: number,
     }
   | {
       type: "a157",
-      a16: number
+      a16: number,
     }
   | {
       type: "a158",
-      a16: number
+      a16: number,
     }
   | {
       type: "a159",
-      a16: number
+      a16: number,
     }
   | {
       type: "a160",
-      a16: number
+      a16: number,
     }
   | {
       type: "a161",
-      a17: number
+      a17: number,
     }
   | {
       type: "a162",
-      a17: number
+      a17: number,
     }
   | {
       type: "a163",
-      a17: number
+      a17: number,
     }
   | {
       type: "a164",
-      a17: number
+      a17: number,
     }
   | {
       type: "a165",
-      a17: number
+      a17: number,
     }
   | {
       type: "a166",
-      a17: number
+      a17: number,
     }
   | {
       type: "a167",
-      a17: number
+      a17: number,
     }
   | {
       type: "a168",
-      a17: number
+      a17: number,
     }
   | {
       type: "a169",
-      a17: number
+      a17: number,
     }
   | {
       type: "a170",
-      a17: number
+      a17: number,
     }
   | {
       type: "a171",
-      a18: number
+      a18: number,
     }
   | {
       type: "a172",
-      a18: number
+      a18: number,
     }
   | {
       type: "a173",
-      a18: number
+      a18: number,
     }
   | {
       type: "a174",
-      a18: number
+      a18: number,
     }
   | {
       type: "a175",
-      a18: number
+      a18: number,
     }
   | {
       type: "a176",
-      a18: number
+      a18: number,
     }
   | {
       type: "a177",
-      a18: number
+      a18: number,
     }
   | {
       type: "a178",
-      a18: number
+      a18: number,
     }
   | {
       type: "a179",
-      a18: number
+      a18: number,
     }
   | {
       type: "a180",
-      a18: number
+      a18: number,
     }
   | {
       type: "a181",
-      a19: number
+      a19: number,
     }
   | {
       type: "a182",
-      a19: number
+      a19: number,
     }
   | {
       type: "a183",
-      a19: number
+      a19: number,
     }
   | {
       type: "a184",
-      a19: number
+      a19: number,
     }
   | {
       type: "a185",
-      a19: number
+      a19: number,
     }
   | {
       type: "a186",
-      a19: number
+      a19: number,
     }
   | {
       type: "a187",
-      a19: number
+      a19: number,
     }
   | {
       type: "a188",
-      a19: number
+      a19: number,
     }
   | {
       type: "a189",
-      a19: number
+      a19: number,
     }
   | {
       type: "a190",
-      a19: number
+      a19: number,
     }
   | {
       type: "a191",
-      a20: number
+      a20: number,
     }
   | {
       type: "a192",
-      a20: number
+      a20: number,
     }
   | {
       type: "a193",
-      a20: number
+      a20: number,
     }
   | {
       type: "a194",
-      a20: number
+      a20: number,
     }
   | {
       type: "a195",
-      a20: number
+      a20: number,
     }
   | {
       type: "a196",
-      a20: number
+      a20: number,
     }
   | {
       type: "a197",
-      a20: number
+      a20: number,
     }
   | {
       type: "a198",
-      a20: number
+      a20: number,
     }
   | {
       type: "a199",
-      a20: number
+      a20: number,
     }
   | {
       type: "a200",
-      a20: number
+      a20: number,
     }
   | {
       type: "a201",
-      a21: number
+      a21: number,
     }
   | {
       type: "a202",
-      a21: number
+      a21: number,
     }
   | {
       type: "a203",
-      a21: number
+      a21: number,
     }
   | {
       type: "a204",
-      a21: number
+      a21: number,
     }
   | {
       type: "a205",
-      a21: number
+      a21: number,
     }
   | {
       type: "a206",
-      a21: number
+      a21: number,
     }
   | {
       type: "a207",
-      a21: number
+      a21: number,
     }
   | {
       type: "a208",
-      a21: number
+      a21: number,
     }
   | {
       type: "a209",
-      a21: number
+      a21: number,
     }
   | {
       type: "a210",
-      a21: number
+      a21: number,
     }
   | {
       type: "a211",
-      a22: number
+      a22: number,
     }
   | {
       type: "a212",
-      a22: number
+      a22: number,
     }
   | {
       type: "a213",
-      a22: number
+      a22: number,
     }
   | {
       type: "a214",
-      a22: number
+      a22: number,
     }
   | {
       type: "a215",
-      a22: number
+      a22: number,
     }
   | {
       type: "a216",
-      a22: number
+      a22: number,
     }
   | {
       type: "a217",
-      a22: number
+      a22: number,
     }
   | {
       type: "a218",
-      a22: number
+      a22: number,
     }
   | {
       type: "a219",
-      a22: number
+      a22: number,
     }
   | {
       type: "a220",
-      a22: number
+      a22: number,
     }
   | {
       type: "a221",
-      a23: number
+      a23: number,
     }
   | {
       type: "a222",
-      a23: number
+      a23: number,
     }
   | {
       type: "a223",
-      a23: number
+      a23: number,
     }
   | {
       type: "a224",
-      a23: number
+      a23: number,
     }
   | {
       type: "a225",
-      a23: number
+      a23: number,
     }
   | {
       type: "a226",
-      a23: number
+      a23: number,
     }
   | {
       type: "a227",
-      a23: number
+      a23: number,
     }
   | {
       type: "a228",
-      a23: number
+      a23: number,
     }
   | {
       type: "a229",
-      a23: number
+      a23: number,
     }
   | {
       type: "a230",
-      a23: number
+      a23: number,
     }
   | {
       type: "a231",
-      a24: number
+      a24: number,
     }
   | {
       type: "a232",
-      a24: number
+      a24: number,
     }
   | {
       type: "a233",
-      a24: number
+      a24: number,
     }
   | {
       type: "a234",
-      a24: number
+      a24: number,
     }
   | {
       type: "a235",
-      a24: number
+      a24: number,
     }
   | {
       type: "a236",
-      a24: number
+      a24: number,
     }
   | {
       type: "a237",
-      a24: number
+      a24: number,
     }
   | {
       type: "a238",
-      a24: number
+      a24: number,
     }
   | {
       type: "a239",
-      a24: number
+      a24: number,
     }
   | {
       type: "a240",
-      a24: number
+      a24: number,
     }
   | {
       type: "a241",
-      a25: number
+      a25: number,
     }
   | {
       type: "a242",
-      a25: number
+      a25: number,
     }
   | {
       type: "a243",
-      a25: number
+      a25: number,
     }
   | {
       type: "a244",
-      a25: number
+      a25: number,
     }
   | {
       type: "a245",
-      a25: number
+      a25: number,
     }
   | {
       type: "a246",
-      a25: number
+      a25: number,
     }
   | {
       type: "a247",
-      a25: number
+      a25: number,
     }
   | {
       type: "a248",
-      a25: number
+      a25: number,
     }
   | {
       type: "a249",
-      a25: number
+      a25: number,
     }
   | {
       type: "a250",
-      a25: number
+      a25: number,
     }
   | {
       type: "a251",
-      a26: number
+      a26: number,
     }
   | {
       type: "a252",
-      a26: number
+      a26: number,
     }
   | {
       type: "a253",
-      a26: number
+      a26: number,
     }
   | {
       type: "a254",
-      a26: number
+      a26: number,
     }
   | {
       type: "a255",
-      a26: number
+      a26: number,
     }
   | {
       type: "a256",
-      a26: number
+      a26: number,
     }
   | {
       type: "a257",
-      a26: number
+      a26: number,
     }
   | {
       type: "a258",
-      a26: number
+      a26: number,
     }
   | {
       type: "a259",
-      a26: number
+      a26: number,
     }
   | {
       type: "a260",
-      a26: number
+      a26: number,
     }
   | {
       type: "a261",
-      a27: number
+      a27: number,
     }
   | {
       type: "a262",
-      a27: number
+      a27: number,
     }
   | {
       type: "a263",
-      a27: number
+      a27: number,
     }
   | {
       type: "a264",
-      a27: number
+      a27: number,
     }
   | {
       type: "a265",
-      a27: number
+      a27: number,
     }
   | {
       type: "a266",
-      a27: number
+      a27: number,
     }
   | {
       type: "a267",
-      a27: number
+      a27: number,
     }
   | {
       type: "a268",
-      a27: number
+      a27: number,
     }
   | {
       type: "a269",
-      a27: number
+      a27: number,
     }
   | {
       type: "a270",
-      a27: number
+      a27: number,
     }
   | {
       type: "a271",
-      a28: number
+      a28: number,
     }
   | {
       type: "a272",
-      a28: number
+      a28: number,
     }
   | {
       type: "a273",
-      a28: number
+      a28: number,
     }
   | {
       type: "a274",
-      a28: number
+      a28: number,
     }
   | {
       type: "a275",
-      a28: number
+      a28: number,
     }
   | {
       type: "a276",
-      a28: number
+      a28: number,
     }
   | {
       type: "a277",
-      a28: number
+      a28: number,
     }
   | {
       type: "a278",
-      a28: number
+      a28: number,
     }
   | {
       type: "a279",
-      a28: number
+      a28: number,
     }
   | {
       type: "a280",
-      a28: number
+      a28: number,
     }
   | {
       type: "a281",
-      a29: number
+      a29: number,
     }
   | {
       type: "a282",
-      a29: number
+      a29: number,
     }
   | {
       type: "a283",
-      a29: number
+      a29: number,
     }
   | {
       type: "a284",
-      a29: number
+      a29: number,
     }
   | {
       type: "a285",
-      a29: number
+      a29: number,
     }
   | {
       type: "a286",
-      a29: number
+      a29: number,
     }
   | {
       type: "a287",
-      a29: number
+      a29: number,
     }
   | {
       type: "a288",
-      a29: number
+      a29: number,
     }
   | {
       type: "a289",
-      a29: number
+      a29: number,
     }
   | {
       type: "a290",
-      a29: number
+      a29: number,
     }
   | {
       type: "a291",
-      a30: number
+      a30: number,
     }
   | {
       type: "a292",
-      a30: number
+      a30: number,
     }
   | {
       type: "a293",
-      a30: number
+      a30: number,
     }
   | {
       type: "a294",
-      a30: number
+      a30: number,
     }
   | {
       type: "a295",
-      a30: number
+      a30: number,
     }
   | {
       type: "a296",
-      a30: number
+      a30: number,
     }
   | {
       type: "a297",
-      a30: number
+      a30: number,
     }
   | {
       type: "a298",
-      a30: number
+      a30: number,
     }
   | {
       type: "a299",
-      a30: number
+      a30: number,
     }
   | {
       type: "a300",
-      a30: number
+      a30: number,
     }
   | {
       type: "a301",
-      a31: number
+      a31: number,
     }
   | {
       type: "a302",
-      a31: number
+      a31: number,
     }
   | {
       type: "a303",
-      a31: number
+      a31: number,
     }
   | {
       type: "a304",
-      a31: number
+      a31: number,
     }
   | {
       type: "a305",
-      a31: number
+      a31: number,
     }
   | {
       type: "a306",
-      a31: number
+      a31: number,
     }
   | {
       type: "a307",
-      a31: number
+      a31: number,
     }
   | {
       type: "a308",
-      a31: number
+      a31: number,
     }
   | {
       type: "a309",
-      a31: number
+      a31: number,
     }
   | {
       type: "a310",
-      a31: number
+      a31: number,
     }
   | {
       type: "a311",
-      a32: number
+      a32: number,
     }
   | {
       type: "a312",
-      a32: number
+      a32: number,
     }
   | {
       type: "a313",
-      a32: number
+      a32: number,
     }
   | {
       type: "a314",
-      a32: number
+      a32: number,
     }
   | {
       type: "a315",
-      a32: number
+      a32: number,
     }
   | {
       type: "a316",
-      a32: number
+      a32: number,
     }
   | {
       type: "a317",
-      a32: number
+      a32: number,
     }
   | {
       type: "a318",
-      a32: number
+      a32: number,
     }
   | {
       type: "a319",
-      a32: number
+      a32: number,
     }
   | {
       type: "a320",
-      a32: number
+      a32: number,
     }
   | {
       type: "a321",
-      a33: number
+      a33: number,
     }
   | {
       type: "a322",
-      a33: number
+      a33: number,
     }
   | {
       type: "a323",
-      a33: number
+      a33: number,
     }
   | {
       type: "a324",
-      a33: number
+      a33: number,
     }
   | {
       type: "a325",
-      a33: number
+      a33: number,
     }
   | {
       type: "a326",
-      a33: number
+      a33: number,
     }
   | {
       type: "a327",
-      a33: number
+      a33: number,
     }
   | {
       type: "a328",
-      a33: number
+      a33: number,
     }
   | {
       type: "a329",
-      a33: number
+      a33: number,
     }
   | {
       type: "a330",
-      a33: number
+      a33: number,
     }
   | {
       type: "a331",
-      a34: number
+      a34: number,
     }
   | {
       type: "a332",
-      a34: number
+      a34: number,
     }
   | {
       type: "a333",
-      a34: number
+      a34: number,
     }
   | {
       type: "a334",
-      a34: number
+      a34: number,
     }
   | {
       type: "a335",
-      a34: number
+      a34: number,
     }
   | {
       type: "a336",
-      a34: number
+      a34: number,
     }
   | {
       type: "a337",
-      a34: number
+      a34: number,
     }
   | {
       type: "a338",
-      a34: number
+      a34: number,
     }
   | {
       type: "a339",
-      a34: number
+      a34: number,
     }
   | {
       type: "a340",
-      a34: number
+      a34: number,
     }
   | {
       type: "a341",
-      a35: number
+      a35: number,
     }
   | {
       type: "a342",
-      a35: number
+      a35: number,
     }
   | {
       type: "a343",
-      a35: number
+      a35: number,
     }
   | {
       type: "a344",
-      a35: number
+      a35: number,
     }
   | {
       type: "a345",
-      a35: number
+      a35: number,
     }
   | {
       type: "a346",
-      a35: number
+      a35: number,
     }
   | {
       type: "a347",
-      a35: number
+      a35: number,
     }
   | {
       type: "a348",
-      a35: number
+      a35: number,
     }
   | {
       type: "a349",
-      a35: number
+      a35: number,
     }
   | {
       type: "a350",
-      a35: number
+      a35: number,
     }
   | {
       type: "a351",
-      a36: number
+      a36: number,
     }
   | {
       type: "a352",
-      a36: number
+      a36: number,
     }
   | {
       type: "a353",
-      a36: number
+      a36: number,
     }
   | {
       type: "a354",
-      a36: number
+      a36: number,
     }
   | {
       type: "a355",
-      a36: number
+      a36: number,
     }
   | {
       type: "a356",
-      a36: number
+      a36: number,
     }
   | {
       type: "a357",
-      a36: number
+      a36: number,
     }
   | {
       type: "a358",
-      a36: number
+      a36: number,
     }
   | {
       type: "a359",
-      a36: number
+      a36: number,
     }
   | {
       type: "a360",
-      a36: number
+      a36: number,
     }
   | {
       type: "a361",
-      a37: number
+      a37: number,
     }
   | {
       type: "a362",
-      a37: number
+      a37: number,
     }
   | {
       type: "a363",
-      a37: number
+      a37: number,
     }
   | {
       type: "a364",
-      a37: number
+      a37: number,
     }
   | {
       type: "a365",
-      a37: number
+      a37: number,
     }
   | {
       type: "a366",
-      a37: number
+      a37: number,
     }
   | {
       type: "a367",
-      a37: number
+      a37: number,
     }
   | {
       type: "a368",
-      a37: number
+      a37: number,
     }
   | {
       type: "a369",
-      a37: number
+      a37: number,
     }
   | {
       type: "a370",
-      a37: number
+      a37: number,
     }
   | {
       type: "a371",
-      a38: number
+      a38: number,
     }
   | {
       type: "a372",
-      a38: number
+      a38: number,
     }
   | {
       type: "a373",
-      a38: number
+      a38: number,
     }
   | {
       type: "a374",
-      a38: number
+      a38: number,
     }
   | {
       type: "a375",
-      a38: number
+      a38: number,
     }
   | {
       type: "a376",
-      a38: number
+      a38: number,
     }
   | {
       type: "a377",
-      a38: number
+      a38: number,
     }
   | {
       type: "a378",
-      a38: number
+      a38: number,
     }
   | {
       type: "a379",
-      a38: number
+      a38: number,
     }
   | {
       type: "a380",
-      a38: number
+      a38: number,
     }
   | {
       type: "a381",
-      a39: number
+      a39: number,
     }
   | {
       type: "a382",
-      a39: number
+      a39: number,
     }
   | {
       type: "a383",
-      a39: number
+      a39: number,
     }
   | {
       type: "a384",
-      a39: number
+      a39: number,
     }
   | {
       type: "a385",
-      a39: number
+      a39: number,
     }
   | {
       type: "a386",
-      a39: number
+      a39: number,
     }
   | {
       type: "a387",
-      a39: number
+      a39: number,
     }
   | {
       type: "a388",
-      a39: number
+      a39: number,
     }
   | {
       type: "a389",
-      a39: number
+      a39: number,
     }
   | {
       type: "a390",
-      a39: number
+      a39: number,
     }
   | {
       type: "a391",
-      a40: number
+      a40: number,
     }
   | {
       type: "a392",
-      a40: number
+      a40: number,
     }
   | {
       type: "a393",
-      a40: number
+      a40: number,
     }
   | {
       type: "a394",
-      a40: number
+      a40: number,
     }
   | {
       type: "a395",
-      a40: number
+      a40: number,
     }
   | {
       type: "a396",
-      a40: number
+      a40: number,
     }
   | {
       type: "a397",
-      a40: number
+      a40: number,
     }
   | {
       type: "a398",
-      a40: number
+      a40: number,
     }
   | {
       type: "a399",
-      a40: number
+      a40: number,
     }
   | {
       type: "a400",
-      a40: number
+      a40: number,
     }
   | {
       type: "a401",
-      a41: number
+      a41: number,
     }
   | {
       type: "a402",
-      a41: number
+      a41: number,
     }
   | {
       type: "a403",
-      a41: number
+      a41: number,
     }
   | {
       type: "a404",
-      a41: number
+      a41: number,
     }
   | {
       type: "a405",
-      a41: number
+      a41: number,
     }
   | {
       type: "a406",
-      a41: number
+      a41: number,
     }
   | {
       type: "a407",
-      a41: number
+      a41: number,
     }
   | {
       type: "a408",
-      a41: number
+      a41: number,
     }
   | {
       type: "a409",
-      a41: number
+      a41: number,
     }
   | {
       type: "a410",
-      a41: number
+      a41: number,
     }
   | {
       type: "a411",
-      a42: number
+      a42: number,
     }
   | {
       type: "a412",
-      a42: number
+      a42: number,
     }
   | {
       type: "a413",
-      a42: number
+      a42: number,
     }
   | {
       type: "a414",
-      a42: number
+      a42: number,
     }
   | {
       type: "a415",
-      a42: number
+      a42: number,
     }
   | {
       type: "a416",
-      a42: number
+      a42: number,
     }
   | {
       type: "a417",
-      a42: number
+      a42: number,
     }
   | {
       type: "a418",
-      a42: number
+      a42: number,
     }
   | {
       type: "a419",
-      a42: number
+      a42: number,
     }
   | {
       type: "a420",
-      a42: number
+      a42: number,
     }
   | {
       type: "a421",
-      a43: number
+      a43: number,
     }
   | {
       type: "a422",
-      a43: number
+      a43: number,
     }
   | {
       type: "a423",
-      a43: number
+      a43: number,
     }
   | {
       type: "a424",
-      a43: number
+      a43: number,
     }
   | {
       type: "a425",
-      a43: number
+      a43: number,
     }
   | {
       type: "a426",
-      a43: number
+      a43: number,
     }
   | {
       type: "a427",
-      a43: number
+      a43: number,
     }
   | {
       type: "a428",
-      a43: number
+      a43: number,
     }
   | {
       type: "a429",
-      a43: number
+      a43: number,
     }
   | {
       type: "a430",
-      a43: number
+      a43: number,
     }
   | {
       type: "a431",
-      a44: number
+      a44: number,
     }
   | {
       type: "a432",
-      a44: number
+      a44: number,
     }
   | {
       type: "a433",
-      a44: number
+      a44: number,
     }
   | {
       type: "a434",
-      a44: number
+      a44: number,
     }
   | {
       type: "a435",
-      a44: number
+      a44: number,
     }
   | {
       type: "a436",
-      a44: number
+      a44: number,
     }
   | {
       type: "a437",
-      a44: number
+      a44: number,
     }
   | {
       type: "a438",
-      a44: number
+      a44: number,
     }
   | {
       type: "a439",
-      a44: number
+      a44: number,
     }
   | {
       type: "a440",
-      a44: number
+      a44: number,
     }
   | {
       type: "a441",
-      a45: number
+      a45: number,
     }
   | {
       type: "a442",
-      a45: number
+      a45: number,
     }
   | {
       type: "a443",
-      a45: number
+      a45: number,
     }
   | {
       type: "a444",
-      a45: number
+      a45: number,
     }
   | {
       type: "a445",
-      a45: number
+      a45: number,
     }
   | {
       type: "a446",
-      a45: number
+      a45: number,
     }
   | {
       type: "a447",
-      a45: number
+      a45: number,
     }
   | {
       type: "a448",
-      a45: number
+      a45: number,
     }
   | {
       type: "a449",
-      a45: number
+      a45: number,
     }
   | {
       type: "a450",
-      a45: number
+      a45: number,
     }
   | {
       type: "a451",
-      a46: number
+      a46: number,
     }
   | {
       type: "a452",
-      a46: number
+      a46: number,
     }
   | {
       type: "a453",
-      a46: number
+      a46: number,
     }
   | {
       type: "a454",
-      a46: number
+      a46: number,
     }
   | {
       type: "a455",
-      a46: number
+      a46: number,
     }
   | {
       type: "a456",
-      a46: number
+      a46: number,
     }
   | {
       type: "a457",
-      a46: number
+      a46: number,
     }
   | {
       type: "a458",
-      a46: number
+      a46: number,
     }
   | {
       type: "a459",
-      a46: number
+      a46: number,
     }
   | {
       type: "a460",
-      a46: number
+      a46: number,
     }
   | {
       type: "a461",
-      a47: number
+      a47: number,
     }
   | {
       type: "a462",
-      a47: number
+      a47: number,
     }
   | {
       type: "a463",
-      a47: number
+      a47: number,
     }
   | {
       type: "a464",
-      a47: number
+      a47: number,
     }
   | {
       type: "a465",
-      a47: number
+      a47: number,
     }
   | {
       type: "a466",
-      a47: number
+      a47: number,
     }
   | {
       type: "a467",
-      a47: number
+      a47: number,
     }
   | {
       type: "a468",
-      a47: number
+      a47: number,
     }
   | {
       type: "a469",
-      a47: number
+      a47: number,
     }
   | {
       type: "a470",
-      a47: number
+      a47: number,
     }
   | {
       type: "a471",
-      a48: number
+      a48: number,
     }
   | {
       type: "a472",
-      a48: number
+      a48: number,
     }
   | {
       type: "a473",
-      a48: number
+      a48: number,
     }
   | {
       type: "a474",
-      a48: number
+      a48: number,
     }
   | {
       type: "a475",
-      a48: number
+      a48: number,
     }
   | {
       type: "a476",
-      a48: number
+      a48: number,
     }
   | {
       type: "a477",
-      a48: number
+      a48: number,
     }
   | {
       type: "a478",
-      a48: number
+      a48: number,
     }
   | {
       type: "a479",
-      a48: number
+      a48: number,
     }
   | {
       type: "a480",
-      a48: number
+      a48: number,
     }
   | {
       type: "a481",
-      a49: number
+      a49: number,
     }
   | {
       type: "a482",
-      a49: number
+      a49: number,
     }
   | {
       type: "a483",
-      a49: number
+      a49: number,
     }
   | {
       type: "a484",
-      a49: number
+      a49: number,
     }
   | {
       type: "a485",
-      a49: number
+      a49: number,
     }
   | {
       type: "a486",
-      a49: number
+      a49: number,
     }
   | {
       type: "a487",
-      a49: number
+      a49: number,
     }
   | {
       type: "a488",
-      a49: number
+      a49: number,
     }
   | {
       type: "a489",
-      a49: number
+      a49: number,
     }
   | {
       type: "a490",
-      a49: number
+      a49: number,
     }
   | {
       type: "a491",
-      a50: number
+      a50: number,
     }
   | {
       type: "a492",
-      a50: number
+      a50: number,
     }
   | {
       type: "a493",
-      a50: number
+      a50: number,
     }
   | {
       type: "a494",
-      a50: number
+      a50: number,
     }
   | {
       type: "a495",
-      a50: number
+      a50: number,
     }
   | {
       type: "a496",
-      a50: number
+      a50: number,
     }
   | {
       type: "a497",
-      a50: number
+      a50: number,
     }
   | {
       type: "a498",
-      a50: number
+      a50: number,
     }
   | {
       type: "a499",
-      a50: number
+      a50: number,
     }
   | {
       type: "a500",
-      a50: number
+      a50: number,
     }
   | {
       type: "a501",
-      a51: number
+      a51: number,
     }
   | {
       type: "a502",
-      a51: number
+      a51: number,
     }
   | {
       type: "a503",
-      a51: number
+      a51: number,
     }
   | {
       type: "a504",
-      a51: number
+      a51: number,
     }
   | {
       type: "a505",
-      a51: number
+      a51: number,
     }
   | {
       type: "a506",
-      a51: number
+      a51: number,
     }
   | {
       type: "a507",
-      a51: number
+      a51: number,
     }
   | {
       type: "a508",
-      a51: number
+      a51: number,
     }
   | {
       type: "a509",
-      a51: number
+      a51: number,
     }
   | {
       type: "a510",
-      a51: number
+      a51: number,
     }
   | {
       type: "a511",
-      a52: number
+      a52: number,
     }
   | {
       type: "a512",
-      a52: number
+      a52: number,
     }
   | {
       type: "a513",
-      a52: number
+      a52: number,
     }
   | {
       type: "a514",
-      a52: number
+      a52: number,
     }
   | {
       type: "a515",
-      a52: number
+      a52: number,
     }
   | {
       type: "a516",
-      a52: number
+      a52: number,
     }
   | {
       type: "a517",
-      a52: number
+      a52: number,
     }
   | {
       type: "a518",
-      a52: number
+      a52: number,
     }
   | {
       type: "a519",
-      a52: number
+      a52: number,
     }
   | {
       type: "a520",
-      a52: number
+      a52: number,
     }
   | {
       type: "a521",
-      a53: number
+      a53: number,
     }
   | {
       type: "a522",
-      a53: number
+      a53: number,
     }
   | {
       type: "a523",
-      a53: number
+      a53: number,
     }
   | {
       type: "a524",
-      a53: number
+      a53: number,
     }
   | {
       type: "a525",
-      a53: number
+      a53: number,
     }
   | {
       type: "a526",
-      a53: number
+      a53: number,
     }
   | {
       type: "a527",
-      a53: number
+      a53: number,
     }
   | {
       type: "a528",
-      a53: number
+      a53: number,
     }
   | {
       type: "a529",
-      a53: number
+      a53: number,
     }
   | {
       type: "a530",
-      a53: number
+      a53: number,
     }
   | {
       type: "a531",
-      a54: number
+      a54: number,
     }
   | {
       type: "a532",
-      a54: number
+      a54: number,
     }
   | {
       type: "a533",
-      a54: number
+      a54: number,
     }
   | {
       type: "a534",
-      a54: number
+      a54: number,
     }
   | {
       type: "a535",
-      a54: number
+      a54: number,
     }
   | {
       type: "a536",
-      a54: number
+      a54: number,
     }
   | {
       type: "a537",
-      a54: number
+      a54: number,
     }
   | {
       type: "a538",
-      a54: number
+      a54: number,
     }
   | {
       type: "a539",
-      a54: number
+      a54: number,
     }
   | {
       type: "a540",
-      a54: number
+      a54: number,
     }
   | {
       type: "a541",
-      a55: number
+      a55: number,
     }
   | {
       type: "a542",
-      a55: number
+      a55: number,
     }
   | {
       type: "a543",
-      a55: number
+      a55: number,
     }
   | {
       type: "a544",
-      a55: number
+      a55: number,
     }
   | {
       type: "a545",
-      a55: number
+      a55: number,
     }
   | {
       type: "a546",
-      a55: number
+      a55: number,
     }
   | {
       type: "a547",
-      a55: number
+      a55: number,
     }
   | {
       type: "a548",
-      a55: number
+      a55: number,
     }
   | {
       type: "a549",
-      a55: number
+      a55: number,
     }
   | {
       type: "a550",
-      a55: number
+      a55: number,
     }
   | {
       type: "a551",
-      a56: number
+      a56: number,
     }
   | {
       type: "a552",
-      a56: number
+      a56: number,
     }
   | {
       type: "a553",
-      a56: number
+      a56: number,
     }
   | {
       type: "a554",
-      a56: number
+      a56: number,
     }
   | {
       type: "a555",
-      a56: number
+      a56: number,
     }
   | {
       type: "a556",
-      a56: number
+      a56: number,
     }
   | {
       type: "a557",
-      a56: number
+      a56: number,
     }
   | {
       type: "a558",
-      a56: number
+      a56: number,
     }
   | {
       type: "a559",
-      a56: number
+      a56: number,
     }
   | {
       type: "a560",
-      a56: number
+      a56: number,
     }
   | {
       type: "a561",
-      a57: number
+      a57: number,
     }
   | {
       type: "a562",
-      a57: number
+      a57: number,
     }
   | {
       type: "a563",
-      a57: number
+      a57: number,
     }
   | {
       type: "a564",
-      a57: number
+      a57: number,
     }
   | {
       type: "a565",
-      a57: number
+      a57: number,
     }
   | {
       type: "a566",
-      a57: number
+      a57: number,
     }
   | {
       type: "a567",
-      a57: number
+      a57: number,
     }
   | {
       type: "a568",
-      a57: number
+      a57: number,
     }
   | {
       type: "a569",
-      a57: number
+      a57: number,
     }
   | {
       type: "a570",
-      a57: number
+      a57: number,
     }
   | {
       type: "a571",
-      a58: number
+      a58: number,
     }
   | {
       type: "a572",
-      a58: number
+      a58: number,
     }
   | {
       type: "a573",
-      a58: number
+      a58: number,
     }
   | {
       type: "a574",
-      a58: number
+      a58: number,
     }
   | {
       type: "a575",
-      a58: number
+      a58: number,
     }
   | {
       type: "a576",
-      a58: number
+      a58: number,
     }
   | {
       type: "a577",
-      a58: number
+      a58: number,
     }
   | {
       type: "a578",
-      a58: number
+      a58: number,
     }
   | {
       type: "a579",
-      a58: number
+      a58: number,
     }
   | {
       type: "a580",
-      a58: number
+      a58: number,
     }
   | {
       type: "a581",
-      a59: number
+      a59: number,
     }
   | {
       type: "a582",
-      a59: number
+      a59: number,
     }
   | {
       type: "a583",
-      a59: number
+      a59: number,
     }
   | {
       type: "a584",
-      a59: number
+      a59: number,
     }
   | {
       type: "a585",
-      a59: number
+      a59: number,
     }
   | {
       type: "a586",
-      a59: number
+      a59: number,
     }
   | {
       type: "a587",
-      a59: number
+      a59: number,
     }
   | {
       type: "a588",
-      a59: number
+      a59: number,
     }
   | {
       type: "a589",
-      a59: number
+      a59: number,
     }
   | {
       type: "a590",
-      a59: number
+      a59: number,
     }
   | {
       type: "a591",
-      a60: number
+      a60: number,
     }
   | {
       type: "a592",
-      a60: number
+      a60: number,
     }
   | {
       type: "a593",
-      a60: number
+      a60: number,
     }
   | {
       type: "a594",
-      a60: number
+      a60: number,
     }
   | {
       type: "a595",
-      a60: number
+      a60: number,
     }
   | {
       type: "a596",
-      a60: number
+      a60: number,
     }
   | {
       type: "a597",
-      a60: number
+      a60: number,
     }
   | {
       type: "a598",
-      a60: number
+      a60: number,
     }
   | {
       type: "a599",
-      a60: number
+      a60: number,
     }
   | {
       type: "a600",
-      a60: number
+      a60: number,
     }
   | {
       type: "a601",
-      a61: number
+      a61: number,
     }
   | {
       type: "a602",
-      a61: number
+      a61: number,
     }
   | {
       type: "a603",
-      a61: number
+      a61: number,
     }
   | {
       type: "a604",
-      a61: number
+      a61: number,
     }
   | {
       type: "a605",
-      a61: number
+      a61: number,
     }
   | {
       type: "a606",
-      a61: number
+      a61: number,
     }
   | {
       type: "a607",
-      a61: number
+      a61: number,
     }
   | {
       type: "a608",
-      a61: number
+      a61: number,
     }
   | {
       type: "a609",
-      a61: number
+      a61: number,
     }
   | {
       type: "a610",
-      a61: number
+      a61: number,
     }
   | {
       type: "a611",
-      a62: number
+      a62: number,
     }
   | {
       type: "a612",
-      a62: number
+      a62: number,
     }
   | {
       type: "a613",
-      a62: number
+      a62: number,
     }
   | {
       type: "a614",
-      a62: number
+      a62: number,
     }
   | {
       type: "a615",
-      a62: number
+      a62: number,
     }
   | {
       type: "a616",
-      a62: number
+      a62: number,
     }
   | {
       type: "a617",
-      a62: number
+      a62: number,
     }
   | {
       type: "a618",
-      a62: number
+      a62: number,
     }
   | {
       type: "a619",
-      a62: number
+      a62: number,
     }
   | {
       type: "a620",
-      a62: number
+      a62: number,
     }
   | {
       type: "a621",
-      a63: number
+      a63: number,
     }
   | {
       type: "a622",
-      a63: number
+      a63: number,
     }
   | {
       type: "a623",
-      a63: number
+      a63: number,
     }
   | {
       type: "a624",
-      a63: number
+      a63: number,
     }
   | {
       type: "a625",
-      a63: number
+      a63: number,
     }
   | {
       type: "a626",
-      a63: number
+      a63: number,
     }
   | {
       type: "a627",
-      a63: number
+      a63: number,
     }
   | {
       type: "a628",
-      a63: number
+      a63: number,
     }
   | {
       type: "a629",
-      a63: number
+      a63: number,
     }
   | {
       type: "a630",
-      a63: number
+      a63: number,
     }
   | {
       type: "a631",
-      a64: number
+      a64: number,
     }
   | {
       type: "a632",
-      a64: number
+      a64: number,
     }
   | {
       type: "a633",
-      a64: number
+      a64: number,
     }
   | {
       type: "a634",
-      a64: number
+      a64: number,
     }
   | {
       type: "a635",
-      a64: number
+      a64: number,
     }
   | {
       type: "a636",
-      a64: number
+      a64: number,
     }
   | {
       type: "a637",
-      a64: number
+      a64: number,
     }
   | {
       type: "a638",
-      a64: number
+      a64: number,
     }
   | {
       type: "a639",
-      a64: number
+      a64: number,
     }
   | {
       type: "a640",
-      a64: number
+      a64: number,
     }
   | {
       type: "a641",
-      a65: number
+      a65: number,
     }
   | {
       type: "a642",
-      a65: number
+      a65: number,
     }
   | {
       type: "a643",
-      a65: number
+      a65: number,
     }
   | {
       type: "a644",
-      a65: number
+      a65: number,
     }
   | {
       type: "a645",
-      a65: number
+      a65: number,
     }
   | {
       type: "a646",
-      a65: number
+      a65: number,
     }
   | {
       type: "a647",
-      a65: number
+      a65: number,
     }
   | {
       type: "a648",
-      a65: number
+      a65: number,
     }
   | {
       type: "a649",
-      a65: number
+      a65: number,
     }
   | {
       type: "a650",
-      a65: number
+      a65: number,
     }
   | {
       type: "a651",
-      a66: number
+      a66: number,
     }
   | {
       type: "a652",
-      a66: number
+      a66: number,
     }
   | {
       type: "a653",
-      a66: number
+      a66: number,
     }
   | {
       type: "a654",
-      a66: number
+      a66: number,
     }
   | {
       type: "a655",
-      a66: number
+      a66: number,
     }
   | {
       type: "a656",
-      a66: number
+      a66: number,
     }
   | {
       type: "a657",
-      a66: number
+      a66: number,
     }
   | {
       type: "a658",
-      a66: number
+      a66: number,
     }
   | {
       type: "a659",
-      a66: number
+      a66: number,
     }
   | {
       type: "a660",
-      a66: number
+      a66: number,
     }
   | {
       type: "a661",
-      a67: number
+      a67: number,
     }
   | {
       type: "a662",
-      a67: number
+      a67: number,
     }
   | {
       type: "a663",
-      a67: number
+      a67: number,
     }
   | {
       type: "a664",
-      a67: number
+      a67: number,
     }
   | {
       type: "a665",
-      a67: number
+      a67: number,
     }
   | {
       type: "a666",
-      a67: number
+      a67: number,
     }
   | {
       type: "a667",
-      a67: number
+      a67: number,
     }
   | {
       type: "a668",
-      a67: number
+      a67: number,
     }
   | {
       type: "a669",
-      a67: number
+      a67: number,
     }
   | {
       type: "a670",
-      a67: number
+      a67: number,
     }
   | {
       type: "a671",
-      a68: number
+      a68: number,
     }
   | {
       type: "a672",
-      a68: number
+      a68: number,
     }
   | {
       type: "a673",
-      a68: number
+      a68: number,
     }
   | {
       type: "a674",
-      a68: number
+      a68: number,
     }
   | {
       type: "a675",
-      a68: number
+      a68: number,
     }
   | {
       type: "a676",
-      a68: number
+      a68: number,
     }
   | {
       type: "a677",
-      a68: number
+      a68: number,
     }
   | {
       type: "a678",
-      a68: number
+      a68: number,
     }
   | {
       type: "a679",
-      a68: number
+      a68: number,
     }
   | {
       type: "a680",
-      a68: number
+      a68: number,
     }
   | {
       type: "a681",
-      a69: number
+      a69: number,
     }
   | {
       type: "a682",
-      a69: number
+      a69: number,
     }
   | {
       type: "a683",
-      a69: number
+      a69: number,
     }
   | {
       type: "a684",
-      a69: number
+      a69: number,
     }
   | {
       type: "a685",
-      a69: number
+      a69: number,
     }
   | {
       type: "a686",
-      a69: number
+      a69: number,
     }
   | {
       type: "a687",
-      a69: number
+      a69: number,
     }
   | {
       type: "a688",
-      a69: number
+      a69: number,
     }
   | {
       type: "a689",
-      a69: number
+      a69: number,
     }
   | {
       type: "a690",
-      a69: number
+      a69: number,
     }
   | {
       type: "a691",
-      a70: number
+      a70: number,
     }
   | {
       type: "a692",
-      a70: number
+      a70: number,
     }
   | {
       type: "a693",
-      a70: number
+      a70: number,
     }
   | {
       type: "a694",
-      a70: number
+      a70: number,
     }
   | {
       type: "a695",
-      a70: number
+      a70: number,
     }
   | {
       type: "a696",
-      a70: number
+      a70: number,
     }
   | {
       type: "a697",
-      a70: number
+      a70: number,
     }
   | {
       type: "a698",
-      a70: number
+      a70: number,
     }
   | {
       type: "a699",
-      a70: number
+      a70: number,
     }
   | {
       type: "a700",
-      a70: number
+      a70: number,
     }
   | {
       type: "a701",
-      a71: number
+      a71: number,
     }
   | {
       type: "a702",
-      a71: number
+      a71: number,
     }
   | {
       type: "a703",
-      a71: number
+      a71: number,
     }
   | {
       type: "a704",
-      a71: number
+      a71: number,
     }
   | {
       type: "a705",
-      a71: number
+      a71: number,
     }
   | {
       type: "a706",
-      a71: number
+      a71: number,
     }
   | {
       type: "a707",
-      a71: number
+      a71: number,
     }
   | {
       type: "a708",
-      a71: number
+      a71: number,
     }
   | {
       type: "a709",
-      a71: number
+      a71: number,
     }
   | {
       type: "a710",
-      a71: number
+      a71: number,
     }
   | {
       type: "a711",
-      a72: number
+      a72: number,
     }
   | {
       type: "a712",
-      a72: number
+      a72: number,
     }
   | {
       type: "a713",
-      a72: number
+      a72: number,
     }
   | {
       type: "a714",
-      a72: number
+      a72: number,
     }
   | {
       type: "a715",
-      a72: number
+      a72: number,
     }
   | {
       type: "a716",
-      a72: number
+      a72: number,
     }
   | {
       type: "a717",
-      a72: number
+      a72: number,
     }
   | {
       type: "a718",
-      a72: number
+      a72: number,
     }
   | {
       type: "a719",
-      a72: number
+      a72: number,
     }
   | {
       type: "a720",
-      a72: number
+      a72: number,
     }
   | {
       type: "a721",
-      a73: number
+      a73: number,
     }
   | {
       type: "a722",
-      a73: number
+      a73: number,
     }
   | {
       type: "a723",
-      a73: number
+      a73: number,
     }
   | {
       type: "a724",
-      a73: number
+      a73: number,
     }
   | {
       type: "a725",
-      a73: number
+      a73: number,
     }
   | {
       type: "a726",
-      a73: number
+      a73: number,
     }
   | {
       type: "a727",
-      a73: number
+      a73: number,
     }
   | {
       type: "a728",
-      a73: number
+      a73: number,
     }
   | {
       type: "a729",
-      a73: number
+      a73: number,
     }
   | {
       type: "a730",
-      a73: number
+      a73: number,
     }
   | {
       type: "a731",
-      a74: number
+      a74: number,
     }
   | {
       type: "a732",
-      a74: number
+      a74: number,
     }
   | {
       type: "a733",
-      a74: number
+      a74: number,
     }
   | {
       type: "a734",
-      a74: number
+      a74: number,
     }
   | {
       type: "a735",
-      a74: number
+      a74: number,
     }
   | {
       type: "a736",
-      a74: number
+      a74: number,
     }
   | {
       type: "a737",
-      a74: number
+      a74: number,
     }
   | {
       type: "a738",
-      a74: number
+      a74: number,
     }
   | {
       type: "a739",
-      a74: number
+      a74: number,
     }
   | {
       type: "a740",
-      a74: number
+      a74: number,
     }
   | {
       type: "a741",
-      a75: number
+      a75: number,
     }
   | {
       type: "a742",
-      a75: number
+      a75: number,
     }
   | {
       type: "a743",
-      a75: number
+      a75: number,
     }
   | {
       type: "a744",
-      a75: number
+      a75: number,
     }
   | {
       type: "a745",
-      a75: number
+      a75: number,
     }
   | {
       type: "a746",
-      a75: number
+      a75: number,
     }
   | {
       type: "a747",
-      a75: number
+      a75: number,
     }
   | {
       type: "a748",
-      a75: number
+      a75: number,
     }
   | {
       type: "a749",
-      a75: number
+      a75: number,
     }
   | {
       type: "a750",
-      a75: number
+      a75: number,
     }
   | {
       type: "a751",
-      a76: number
+      a76: number,
     }
   | {
       type: "a752",
-      a76: number
+      a76: number,
     }
   | {
       type: "a753",
-      a76: number
+      a76: number,
     }
   | {
       type: "a754",
-      a76: number
+      a76: number,
     }
   | {
       type: "a755",
-      a76: number
+      a76: number,
     }
   | {
       type: "a756",
-      a76: number
+      a76: number,
     }
   | {
       type: "a757",
-      a76: number
+      a76: number,
     }
   | {
       type: "a758",
-      a76: number
+      a76: number,
     }
   | {
       type: "a759",
-      a76: number
+      a76: number,
     }
   | {
       type: "a760",
-      a76: number
+      a76: number,
     }
   | {
       type: "a761",
-      a77: number
+      a77: number,
     }
   | {
       type: "a762",
-      a77: number
+      a77: number,
     }
   | {
       type: "a763",
-      a77: number
+      a77: number,
     }
   | {
       type: "a764",
-      a77: number
+      a77: number,
     }
   | {
       type: "a765",
-      a77: number
+      a77: number,
     }
   | {
       type: "a766",
-      a77: number
+      a77: number,
     }
   | {
       type: "a767",
-      a77: number
+      a77: number,
     }
   | {
       type: "a768",
-      a77: number
+      a77: number,
     }
   | {
       type: "a769",
-      a77: number
+      a77: number,
     }
   | {
       type: "a770",
-      a77: number
+      a77: number,
     }
   | {
       type: "a771",
-      a78: number
+      a78: number,
     }
   | {
       type: "a772",
-      a78: number
+      a78: number,
     }
   | {
       type: "a773",
-      a78: number
+      a78: number,
     }
   | {
       type: "a774",
-      a78: number
+      a78: number,
     }
   | {
       type: "a775",
-      a78: number
+      a78: number,
     }
   | {
       type: "a776",
-      a78: number
+      a78: number,
     }
   | {
       type: "a777",
-      a78: number
+      a78: number,
     }
   | {
       type: "a778",
-      a78: number
+      a78: number,
     }
   | {
       type: "a779",
-      a78: number
+      a78: number,
     }
   | {
       type: "a780",
-      a78: number
+      a78: number,
     }
   | {
       type: "a781",
-      a79: number
+      a79: number,
     }
   | {
       type: "a782",
-      a79: number
+      a79: number,
     }
   | {
       type: "a783",
-      a79: number
+      a79: number,
     }
   | {
       type: "a784",
-      a79: number
+      a79: number,
     }
   | {
       type: "a785",
-      a79: number
+      a79: number,
     }
   | {
       type: "a786",
-      a79: number
+      a79: number,
     }
   | {
       type: "a787",
-      a79: number
+      a79: number,
     }
   | {
       type: "a788",
-      a79: number
+      a79: number,
     }
   | {
       type: "a789",
-      a79: number
+      a79: number,
     }
   | {
       type: "a790",
-      a79: number
+      a79: number,
     }
   | {
       type: "a791",
-      a80: number
+      a80: number,
     }
   | {
       type: "a792",
-      a80: number
+      a80: number,
     }
   | {
       type: "a793",
-      a80: number
+      a80: number,
     }
   | {
       type: "a794",
-      a80: number
+      a80: number,
     }
   | {
       type: "a795",
-      a80: number
+      a80: number,
     }
   | {
       type: "a796",
-      a80: number
+      a80: number,
     }
   | {
       type: "a797",
-      a80: number
+      a80: number,
     }
   | {
       type: "a798",
-      a80: number
+      a80: number,
     }
   | {
       type: "a799",
-      a80: number
+      a80: number,
     }
   | {
       type: "a800",
-      a80: number
+      a80: number,
     }
   | {
       type: "a801",
-      a81: number
+      a81: number,
     }
   | {
       type: "a802",
-      a81: number
+      a81: number,
     }
   | {
       type: "a803",
-      a81: number
+      a81: number,
     }
   | {
       type: "a804",
-      a81: number
+      a81: number,
     }
   | {
       type: "a805",
-      a81: number
+      a81: number,
     }
   | {
       type: "a806",
-      a81: number
+      a81: number,
     }
   | {
       type: "a807",
-      a81: number
+      a81: number,
     }
   | {
       type: "a808",
-      a81: number
+      a81: number,
     }
   | {
       type: "a809",
-      a81: number
+      a81: number,
     }
   | {
       type: "a810",
-      a81: number
+      a81: number,
     }
   | {
       type: "a811",
-      a82: number
+      a82: number,
     }
   | {
       type: "a812",
-      a82: number
+      a82: number,
     }
   | {
       type: "a813",
-      a82: number
+      a82: number,
     }
   | {
       type: "a814",
-      a82: number
+      a82: number,
     }
   | {
       type: "a815",
-      a82: number
+      a82: number,
     }
   | {
       type: "a816",
-      a82: number
+      a82: number,
     }
   | {
       type: "a817",
-      a82: number
+      a82: number,
     }
   | {
       type: "a818",
-      a82: number
+      a82: number,
     }
   | {
       type: "a819",
-      a82: number
+      a82: number,
     }
   | {
       type: "a820",
-      a82: number
+      a82: number,
     }
   | {
       type: "a821",
-      a83: number
+      a83: number,
     }
   | {
       type: "a822",
-      a83: number
+      a83: number,
     }
   | {
       type: "a823",
-      a83: number
+      a83: number,
     }
   | {
       type: "a824",
-      a83: number
+      a83: number,
     }
   | {
       type: "a825",
-      a83: number
+      a83: number,
     }
   | {
       type: "a826",
-      a83: number
+      a83: number,
     }
   | {
       type: "a827",
-      a83: number
+      a83: number,
     }
   | {
       type: "a828",
-      a83: number
+      a83: number,
     }
   | {
       type: "a829",
-      a83: number
+      a83: number,
     }
   | {
       type: "a830",
-      a83: number
+      a83: number,
     }
   | {
       type: "a831",
-      a84: number
+      a84: number,
     }
   | {
       type: "a832",
-      a84: number
+      a84: number,
     }
   | {
       type: "a833",
-      a84: number
+      a84: number,
     }
   | {
       type: "a834",
-      a84: number
+      a84: number,
     }
   | {
       type: "a835",
-      a84: number
+      a84: number,
     }
   | {
       type: "a836",
-      a84: number
+      a84: number,
     }
   | {
       type: "a837",
-      a84: number
+      a84: number,
     }
   | {
       type: "a838",
-      a84: number
+      a84: number,
     }
   | {
       type: "a839",
-      a84: number
+      a84: number,
     }
   | {
       type: "a840",
-      a84: number
+      a84: number,
     }
   | {
       type: "a841",
-      a85: number
+      a85: number,
     }
   | {
       type: "a842",
-      a85: number
+      a85: number,
     }
   | {
       type: "a843",
-      a85: number
+      a85: number,
     }
   | {
       type: "a844",
-      a85: number
+      a85: number,
     }
   | {
       type: "a845",
-      a85: number
+      a85: number,
     }
   | {
       type: "a846",
-      a85: number
+      a85: number,
     }
   | {
       type: "a847",
-      a85: number
+      a85: number,
     }
   | {
       type: "a848",
-      a85: number
+      a85: number,
     }
   | {
       type: "a849",
-      a85: number
+      a85: number,
     }
   | {
       type: "a850",
-      a85: number
+      a85: number,
     }
   | {
       type: "a851",
-      a86: number
+      a86: number,
     }
   | {
       type: "a852",
-      a86: number
+      a86: number,
     }
   | {
       type: "a853",
-      a86: number
+      a86: number,
     }
   | {
       type: "a854",
-      a86: number
+      a86: number,
     }
   | {
       type: "a855",
-      a86: number
+      a86: number,
     }
   | {
       type: "a856",
-      a86: number
+      a86: number,
     }
   | {
       type: "a857",
-      a86: number
+      a86: number,
     }
   | {
       type: "a858",
-      a86: number
+      a86: number,
     }
   | {
       type: "a859",
-      a86: number
+      a86: number,
     }
   | {
       type: "a860",
-      a86: number
+      a86: number,
     }
   | {
       type: "a861",
-      a87: number
+      a87: number,
     }
   | {
       type: "a862",
-      a87: number
+      a87: number,
     }
   | {
       type: "a863",
-      a87: number
+      a87: number,
     }
   | {
       type: "a864",
-      a87: number
+      a87: number,
     }
   | {
       type: "a865",
-      a87: number
+      a87: number,
     }
   | {
       type: "a866",
-      a87: number
+      a87: number,
     }
   | {
       type: "a867",
-      a87: number
+      a87: number,
     }
   | {
       type: "a868",
-      a87: number
+      a87: number,
     }
   | {
       type: "a869",
-      a87: number
+      a87: number,
     }
   | {
       type: "a870",
-      a87: number
+      a87: number,
     }
   | {
       type: "a871",
-      a88: number
+      a88: number,
     }
   | {
       type: "a872",
-      a88: number
+      a88: number,
     }
   | {
       type: "a873",
-      a88: number
+      a88: number,
     }
   | {
       type: "a874",
-      a88: number
+      a88: number,
     }
   | {
       type: "a875",
-      a88: number
+      a88: number,
     }
   | {
       type: "a876",
-      a88: number
+      a88: number,
     }
   | {
       type: "a877",
-      a88: number
+      a88: number,
     }
   | {
       type: "a878",
-      a88: number
+      a88: number,
     }
   | {
       type: "a879",
-      a88: number
+      a88: number,
     }
   | {
       type: "a880",
-      a88: number
+      a88: number,
     }
   | {
       type: "a881",
-      a89: number
+      a89: number,
     }
   | {
       type: "a882",
-      a89: number
+      a89: number,
     }
   | {
       type: "a883",
-      a89: number
+      a89: number,
     }
   | {
       type: "a884",
-      a89: number
+      a89: number,
     }
   | {
       type: "a885",
-      a89: number
+      a89: number,
     }
   | {
       type: "a886",
-      a89: number
+      a89: number,
     }
   | {
       type: "a887",
-      a89: number
+      a89: number,
     }
   | {
       type: "a888",
-      a89: number
+      a89: number,
     }
   | {
       type: "a889",
-      a89: number
+      a89: number,
     }
   | {
       type: "a890",
-      a89: number
+      a89: number,
     }
   | {
       type: "a891",
-      a90: number
+      a90: number,
     }
   | {
       type: "a892",
-      a90: number
+      a90: number,
     }
   | {
       type: "a893",
-      a90: number
+      a90: number,
     }
   | {
       type: "a894",
-      a90: number
+      a90: number,
     }
   | {
       type: "a895",
-      a90: number
+      a90: number,
     }
   | {
       type: "a896",
-      a90: number
+      a90: number,
     }
   | {
       type: "a897",
-      a90: number
+      a90: number,
     }
   | {
       type: "a898",
-      a90: number
+      a90: number,
     }
   | {
       type: "a899",
-      a90: number
+      a90: number,
     }
   | {
       type: "a900",
-      a90: number
+      a90: number,
     }
   | {
       type: "a901",
-      a91: number
+      a91: number,
     }
   | {
       type: "a902",
-      a91: number
+      a91: number,
     }
   | {
       type: "a903",
-      a91: number
+      a91: number,
     }
   | {
       type: "a904",
-      a91: number
+      a91: number,
     }
   | {
       type: "a905",
-      a91: number
+      a91: number,
     }
   | {
       type: "a906",
-      a91: number
+      a91: number,
     }
   | {
       type: "a907",
-      a91: number
+      a91: number,
     }
   | {
       type: "a908",
-      a91: number
+      a91: number,
     }
   | {
       type: "a909",
-      a91: number
+      a91: number,
     }
   | {
       type: "a910",
-      a91: number
+      a91: number,
     }
   | {
       type: "a911",
-      a92: number
+      a92: number,
     }
   | {
       type: "a912",
-      a92: number
+      a92: number,
     }
   | {
       type: "a913",
-      a92: number
+      a92: number,
     }
   | {
       type: "a914",
-      a92: number
+      a92: number,
     }
   | {
       type: "a915",
-      a92: number
+      a92: number,
     }
   | {
       type: "a916",
-      a92: number
+      a92: number,
     }
   | {
       type: "a917",
-      a92: number
+      a92: number,
     }
   | {
       type: "a918",
-      a92: number
+      a92: number,
     }
   | {
       type: "a919",
-      a92: number
+      a92: number,
     }
   | {
       type: "a920",
-      a92: number
+      a92: number,
     }
   | {
       type: "a921",
-      a93: number
+      a93: number,
     }
   | {
       type: "a922",
-      a93: number
+      a93: number,
     }
   | {
       type: "a923",
-      a93: number
+      a93: number,
     }
   | {
       type: "a924",
-      a93: number
+      a93: number,
     }
   | {
       type: "a925",
-      a93: number
+      a93: number,
     }
   | {
       type: "a926",
-      a93: number
+      a93: number,
     }
   | {
       type: "a927",
-      a93: number
+      a93: number,
     }
   | {
       type: "a928",
-      a93: number
+      a93: number,
     }
   | {
       type: "a929",
-      a93: number
+      a93: number,
     }
   | {
       type: "a930",
-      a93: number
+      a93: number,
     }
   | {
       type: "a931",
-      a94: number
+      a94: number,
     }
   | {
       type: "a932",
-      a94: number
+      a94: number,
     }
   | {
       type: "a933",
-      a94: number
+      a94: number,
     }
   | {
       type: "a934",
-      a94: number
+      a94: number,
     }
   | {
       type: "a935",
-      a94: number
+      a94: number,
     }
   | {
       type: "a936",
-      a94: number
+      a94: number,
     }
   | {
       type: "a937",
-      a94: number
+      a94: number,
     }
   | {
       type: "a938",
-      a94: number
+      a94: number,
     }
   | {
       type: "a939",
-      a94: number
+      a94: number,
     }
   | {
       type: "a940",
-      a94: number
+      a94: number,
     }
   | {
       type: "a941",
-      a95: number
+      a95: number,
     }
   | {
       type: "a942",
-      a95: number
+      a95: number,
     }
   | {
       type: "a943",
-      a95: number
+      a95: number,
     }
   | {
       type: "a944",
-      a95: number
+      a95: number,
     }
   | {
       type: "a945",
-      a95: number
+      a95: number,
     }
   | {
       type: "a946",
-      a95: number
+      a95: number,
     }
   | {
       type: "a947",
-      a95: number
+      a95: number,
     }
   | {
       type: "a948",
-      a95: number
+      a95: number,
     }
   | {
       type: "a949",
-      a95: number
+      a95: number,
     }
   | {
       type: "a950",
-      a95: number
+      a95: number,
     }
   | {
       type: "a951",
-      a96: number
+      a96: number,
     }
   | {
       type: "a952",
-      a96: number
+      a96: number,
     }
   | {
       type: "a953",
-      a96: number
+      a96: number,
     }
   | {
       type: "a954",
-      a96: number
+      a96: number,
     }
   | {
       type: "a955",
-      a96: number
+      a96: number,
     }
   | {
       type: "a956",
-      a96: number
+      a96: number,
     }
   | {
       type: "a957",
-      a96: number
+      a96: number,
     }
   | {
       type: "a958",
-      a96: number
+      a96: number,
     }
   | {
       type: "a959",
-      a96: number
+      a96: number,
     }
   | {
       type: "a960",
-      a96: number
+      a96: number,
     }
   | {
       type: "a961",
-      a97: number
+      a97: number,
     }
   | {
       type: "a962",
-      a97: number
+      a97: number,
     }
   | {
       type: "a963",
-      a97: number
+      a97: number,
     }
   | {
       type: "a964",
-      a97: number
+      a97: number,
     }
   | {
       type: "a965",
-      a97: number
+      a97: number,
     }
   | {
       type: "a966",
-      a97: number
+      a97: number,
     }
   | {
       type: "a967",
-      a97: number
+      a97: number,
     }
   | {
       type: "a968",
-      a97: number
+      a97: number,
     }
   | {
       type: "a969",
-      a97: number
+      a97: number,
     }
   | {
       type: "a970",
-      a97: number
+      a97: number,
     }
   | {
       type: "a971",
-      a98: number
+      a98: number,
     }
   | {
       type: "a972",
-      a98: number
+      a98: number,
     }
   | {
       type: "a973",
-      a98: number
+      a98: number,
     }
   | {
       type: "a974",
-      a98: number
+      a98: number,
     }
   | {
       type: "a975",
-      a98: number
+      a98: number,
     }
   | {
       type: "a976",
-      a98: number
+      a98: number,
     }
   | {
       type: "a977",
-      a98: number
+      a98: number,
     }
   | {
       type: "a978",
-      a98: number
+      a98: number,
     }
   | {
       type: "a979",
-      a98: number
+      a98: number,
     }
   | {
       type: "a980",
-      a98: number
+      a98: number,
     }
   | {
       type: "a981",
-      a99: number
+      a99: number,
     }
   | {
       type: "a982",
-      a99: number
+      a99: number,
     }
   | {
       type: "a983",
-      a99: number
+      a99: number,
     }
   | {
       type: "a984",
-      a99: number
+      a99: number,
     }
   | {
       type: "a985",
-      a99: number
+      a99: number,
     }
   | {
       type: "a986",
-      a99: number
+      a99: number,
     }
   | {
       type: "a987",
-      a99: number
+      a99: number,
     }
   | {
       type: "a988",
-      a99: number
+      a99: number,
     }
   | {
       type: "a989",
-      a99: number
+      a99: number,
     }
   | {
       type: "a990",
-      a99: number
+      a99: number,
     }
   | {
       type: "a991",
-      a100: number
+      a100: number,
     }
   | {
       type: "a992",
-      a100: number
+      a100: number,
     }
   | {
       type: "a993",
-      a100: number
+      a100: number,
     }
   | {
       type: "a994",
-      a100: number
+      a100: number,
     }
   | {
       type: "a995",
-      a100: number
+      a100: number,
     }
   | {
       type: "a996",
-      a100: number
+      a100: number,
     }
   | {
       type: "a997",
-      a100: number
+      a100: number,
     }
   | {
       type: "a998",
-      a100: number
+      a100: number,
     }
   | {
       type: "a999",
-      a100: number
+      a100: number,
     }
   | {
       type: "a1000",
-      a100: number
+      a100: number,
     };
 function foo(x: TAction): TAction {
   return x;
diff --git a/tests/flow/union/__snapshots__/jsfmt.spec.js.snap b/tests/flow/union/__snapshots__/jsfmt.spec.js.snap
index 90195813d..3880c4a40 100644
--- a/tests/flow/union/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/union/__snapshots__/jsfmt.spec.js.snap
@@ -55,7 +55,7 @@ export class ModOp extends BinaryExpression<ArithmeticExpression, ArithmeticExpr
 
 export type Select = {
   expression: ArithmeticExpression,
-  alias: ?string
+  alias: ?string,
 };
 
 export class Query {
@@ -64,7 +64,7 @@ export class Query {
   select(expr: ArithmeticExpression): this {
     this._select.push({
       expression: expr,
-      alias: ""
+      alias: "",
     });
     return this;
   }
@@ -203,7 +203,7 @@ var l: Array<T> = [
   { type: "b", b: "monkey" },
   { type: "b", b: "gorilla" },
   { type: "b", b: "giraffe" },
-  { type: "b", b: "penguin" }
+  { type: "b", b: "penguin" },
 ];
 
 ================================================================================
@@ -479,15 +479,15 @@ const u3 : union2 = {
  */
 
 type t1 = {
-  p1: number
+  p1: number,
 };
 
 type t2 = {
-  p2: number
+  p2: number,
 };
 
 type t3 = {
-  p3: number
+  p3: number,
 };
 
 type intersected = t1 & t2;
@@ -495,17 +495,17 @@ type union = intersected | t3;
 type union2 = t3 | intersected;
 
 const u1: union = {
-  p3: 3
+  p3: 3,
 };
 
 const u2: union = {
   p1: 1,
-  p2: 2
+  p2: 2,
 };
 
 const u3: union2 = {
   p1: 1,
-  p2: 2
+  p2: 2,
 };
 
 ================================================================================
@@ -10743,7 +10743,7 @@ type ErrorCode =
   | 4999;
 
 type Data = {
-  error?: ErrorCode
+  error?: ErrorCode,
 };
 
 ================================================================================
diff --git a/tests/flow/union_new/__snapshots__/jsfmt.spec.js.snap b/tests/flow/union_new/__snapshots__/jsfmt.spec.js.snap
index 493bc3491..cbcf9459a 100644
--- a/tests/flow/union_new/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow/union_new/__snapshots__/jsfmt.spec.js.snap
@@ -81,7 +81,7 @@ import { B, C } from "./issue-824-helper";
 type K = B | C;
 
 type I = {
-  which(): number
+  which(): number,
 };
 
 export default class A {
@@ -150,7 +150,7 @@ var bar: Array<{b: ?boolean, c: number} | {b: boolean}> = [
 
 var bar: Array<{ b: ?boolean, c: number } | { b: boolean }> = [
   { b: true, c: 123 },
-  { b: true }
+  { b: true },
 ];
 
 ================================================================================
@@ -176,7 +176,7 @@ function create(
 ): { type: "B", data: number } | { type: "A", data: string } {
   return {
     type: "A",
-    data: a
+    data: a,
   };
 }
 
@@ -264,12 +264,12 @@ type Common = {};
 
 type A = Common & {
   type: "A",
-  foo: number
+  foo: number,
 };
 
 type B = Common & {
   type: "B",
-  foo: Array<number>
+  foo: Array<number>,
 };
 
 type MyType = A | B;
@@ -324,12 +324,12 @@ type Common = {};
 
 type A = {
   type: "A",
-  foo: number
+  foo: number,
 } & Common;
 
 type B = {
   type: "B",
-  foo: Array<number>
+  foo: Array<number>,
 } & Common;
 
 type MyType = A | B;
@@ -387,15 +387,15 @@ if (data.kind === "system") {
 
 type DataBase = {
   id: string,
-  name: string
+  name: string,
 };
 
 type UserData = DataBase & {
-  kind: "user"
+  kind: "user",
 };
 
 type SystemData = DataBase & {
-  kind: "system"
+  kind: "system",
 };
 
 type Data = UserData | SystemData;
@@ -403,7 +403,7 @@ type Data = UserData | SystemData;
 const data: Data = {
   id: "",
   name: "",
-  kind: "system"
+  kind: "system",
 };
 
 if (data.kind === "system") {
@@ -478,18 +478,18 @@ function test(f: Foo| EmptyFoo) {
 
 declare type Entity<T> = {
   id: T,
-  name: string
+  name: string,
 };
 
 declare type StringEntity = Entity<string>;
 
 declare type Foo = StringEntity & {
   bars: Object,
-  kind: 1
+  kind: 1,
 };
 declare type EmptyFoo = StringEntity & {
   bars: null,
-  kind: 2
+  kind: 2,
 };
 
 function test(f: Foo | EmptyFoo) {
@@ -1530,11 +1530,11 @@ printWidth: 80
 ({ type: "B", id: "hi" }:
   | {
       type: "A",
-      id: ?string
+      id: ?string,
     }
   | {
       type: "B",
-      id: string
+      id: string,
     });
 
 ================================================================================
@@ -1914,11 +1914,11 @@ type Empty = {};
 
 type Success = {
   type: "SUCCESS",
-  result: string
+  result: string,
 };
 
 type Error = {
-  type: "ERROR"
+  type: "ERROR",
 } & Empty;
 
 export type T = Success | Error;
@@ -2307,7 +2307,7 @@ module.exports = {
 
 module.exports = {
   FOO: "foo",
-  BAR: "bar"
+  BAR: "bar",
 };
 
 ================================================================================
diff --git a/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap b/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap
index 9dff2c626..a40fb309b 100644
--- a/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_comments/__snapshots__/jsfmt.spec.js.snap
@@ -139,17 +139,17 @@ type Props3 = {
 =====================================output=====================================
 // (DispatchProps & StateProps); WHY DON'T YOU WORK FLOW!!!!!!!!!
 type Props1 = {
-  isPlaying: boolean
+  isPlaying: boolean,
 };
 
 type Props2 = {
   // (DispatchProps & StateProps); WHY DON'T YOU WORK FLOW!!!!!!!!!
-  isPlaying: boolean
+  isPlaying: boolean,
 };
 
 type Props3 = {
   // (DispatchProps & StateProps); WHY DON'T YOU WORK FLOW!!!!!!!!!
-  isPlaying: boolean
+  isPlaying: boolean,
 };
 
 ================================================================================
diff --git a/tests/flow_function_parentheses/__snapshots__/jsfmt.spec.js.snap b/tests/flow_function_parentheses/__snapshots__/jsfmt.spec.js.snap
index 98ca0a37b..d8b535f27 100644
--- a/tests/flow_function_parentheses/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_function_parentheses/__snapshots__/jsfmt.spec.js.snap
@@ -143,7 +143,7 @@ type T8 = ?(?() => A) | B;
 
 =====================================output=====================================
 type Banana = {
-  eat: string => boolean
+  eat: string => boolean,
 };
 
 type Hex = { n: 0x01 };
@@ -417,7 +417,7 @@ type T8 = ?(?() => A) | B;
 
 =====================================output=====================================
 type Banana = {
-  eat: (string) => boolean
+  eat: (string) => boolean,
 };
 
 type Hex = { n: 0x01 };
diff --git a/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap b/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap
index d228e0d12..3905e66af 100644
--- a/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_generic/__snapshots__/jsfmt.spec.js.snap
@@ -28,7 +28,7 @@ var X = {
     F,
     G,
     T: (a: A, b: B, c: C, d: D, e: E, f: F) => G // eslint-disable-line space-before-function-paren
-  >(method: T, scope: any, a: A, b: B, c: C, d: D, e: E, f: F): G {}
+  >(method: T, scope: any, a: A, b: B, c: C, d: D, e: E, f: F): G {},
 };
 
 ================================================================================
@@ -165,7 +165,7 @@ function formatEntireFile(
   range: atom$Range
 ): Promise<?{
   newCursor?: number,
-  formatted: string
+  formatted: string,
 }> {}
 
 function foo(): Promise<?boolean> {}
@@ -253,7 +253,7 @@ type State = {
     Ahohohhohohohohohohohohohohooh,
     Fbt | Immutable.Map<ErrorIndex, Fbt>
   >,
-  shouldValidate: boolean
+  shouldValidate: boolean,
 };
 
 ================================================================================
diff --git a/tests/flow_import_type_specifier/__snapshots__/jsfmt.spec.js.snap b/tests/flow_import_type_specifier/__snapshots__/jsfmt.spec.js.snap
index b41aa4658..1b71aff75 100644
--- a/tests/flow_import_type_specifier/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_import_type_specifier/__snapshots__/jsfmt.spec.js.snap
@@ -29,11 +29,11 @@ import type {} from "foo";
 import type { somethingSuperLongsomethingSuperLong } from "somethingSuperLongsomethingSuperLongsomethingSuperLong";
 import type {
   a,
-  somethingSuperLongsomethingSuperLong
+  somethingSuperLongsomethingSuperLong,
 } from "somethingSuperLongsomethingSuperLongsomethingSuperLong";
 
 import transformRouterContext, {
-  type TransformedContextRouter
+  type TransformedContextRouter,
 } from "../../helpers/transformRouterContext";
 
 ================================================================================
diff --git a/tests/flow_intersection/__snapshots__/jsfmt.spec.js.snap b/tests/flow_intersection/__snapshots__/jsfmt.spec.js.snap
index 64450ffac..d5c0525b8 100644
--- a/tests/flow_intersection/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_intersection/__snapshots__/jsfmt.spec.js.snap
@@ -16,7 +16,7 @@ type State = {
 
 =====================================output=====================================
 type State = {
-  sharedProperty: any
+  sharedProperty: any,
 } & (
   | { discriminant: "FOO", foo: any }
   | { discriminant: "BAR", bar: any }
diff --git a/tests/flow_method/__snapshots__/jsfmt.spec.js.snap b/tests/flow_method/__snapshots__/jsfmt.spec.js.snap
index 9b771a977..cc954b0b3 100644
--- a/tests/flow_method/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_method/__snapshots__/jsfmt.spec.js.snap
@@ -18,7 +18,7 @@ type Foo = {
   method(
     arg: number, // I belong with baz
     qux: string
-  ): void
+  ): void,
 };
 
 ================================================================================
diff --git a/tests/flow_object_comment/__snapshots__/jsfmt.spec.js.snap b/tests/flow_object_comment/__snapshots__/jsfmt.spec.js.snap
index f217df00f..95f34d8f5 100644
--- a/tests/flow_object_comment/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_object_comment/__snapshots__/jsfmt.spec.js.snap
@@ -21,12 +21,12 @@ export default (
 =====================================output=====================================
 export default ({
   foo,
-  bar
+  bar,
 }: {
   // comment
   foo?: Object,
   // comment 2
-  bar?: Object
+  bar?: Object,
 }) => {};
 
 ================================================================================
diff --git a/tests/flow_object_inexact/__snapshots__/jsfmt.spec.js.snap b/tests/flow_object_inexact/__snapshots__/jsfmt.spec.js.snap
index 78a9ad704..a5b6abe8a 100644
--- a/tests/flow_object_inexact/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_object_inexact/__snapshots__/jsfmt.spec.js.snap
@@ -4,7 +4,7 @@ exports[`test.js 1`] = `
 ====================================options=====================================
 parsers: ["flow", "babel"]
 printWidth: 80
-trailingComma: "es5"
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 //@flow
diff --git a/tests/flow_object_inexact/jsfmt.spec.js b/tests/flow_object_inexact/jsfmt.spec.js
index 797cbe54b..c242cec59 100644
--- a/tests/flow_object_inexact/jsfmt.spec.js
+++ b/tests/flow_object_inexact/jsfmt.spec.js
@@ -1 +1 @@
-run_spec(__dirname, ["flow", "babel"], { trailingComma: "es5" });
+run_spec(__dirname, ["flow", "babel"], { trailingComma: "none" });
diff --git a/tests/flow_object_order/__snapshots__/jsfmt.spec.js.snap b/tests/flow_object_order/__snapshots__/jsfmt.spec.js.snap
index 2a370163f..34c458b8d 100644
--- a/tests/flow_object_order/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_object_order/__snapshots__/jsfmt.spec.js.snap
@@ -28,7 +28,7 @@ type Foo = {
   [key: string]: void,
   // c
 
-  beta: 10
+  beta: 10,
 
   // d
 };
diff --git a/tests/flow_union/__snapshots__/jsfmt.spec.js.snap b/tests/flow_union/__snapshots__/jsfmt.spec.js.snap
index 6c042cae6..892377bbb 100644
--- a/tests/flow_union/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/flow_union/__snapshots__/jsfmt.spec.js.snap
@@ -59,7 +59,7 @@ export function aPrettyLongFunctionE(aRatherLongParameterName: Array<{
 interface RelayProps {
   articles:
     | Array<{
-        __id: string
+        __id: string,
       } | null>
     | null
     | void
@@ -68,7 +68,7 @@ interface RelayProps {
 
 interface RelayProps2 {
   articles: Array<{
-    __id: string
+    __id: string,
   } | null> | null | void;
 }
 
@@ -95,7 +95,7 @@ export function aShortFn(aShortParmName: MyType | null): string[] {}
 
 export function aPrettyLongFunctionE(
   aRatherLongParameterName: Array<{
-    __id: string
+    __id: string,
   } | null> | null | void
 ): string[] {}
 
diff --git a/tests/function/__snapshots__/jsfmt.spec.js.snap b/tests/function/__snapshots__/jsfmt.spec.js.snap
index 2ddbba07a..595b3312a 100644
--- a/tests/function/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/function/__snapshots__/jsfmt.spec.js.snap
@@ -58,14 +58,14 @@ class X {
 function onDidInsertSuggestion({
   editor,
   triggerPosition,
-  re
+  re,
 }): Promise<void> {}
 
 class X {
   async onDidInsertSuggestion({
     editor,
     triggerPosition,
-    suggestion
+    suggestion,
   }): Promise<void> {}
 }
 
diff --git a/tests/function_first_param/__snapshots__/jsfmt.spec.js.snap b/tests/function_first_param/__snapshots__/jsfmt.spec.js.snap
index 11cb59dc0..c59c66002 100644
--- a/tests/function_first_param/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/function_first_param/__snapshots__/jsfmt.spec.js.snap
@@ -38,9 +38,9 @@ beep.boop().baz(
   {
     some: {
       thing: {
-        nested: true
-      }
-    }
+        nested: true,
+      },
+    },
   },
   { another: { thing: true } },
   () => {}
@@ -52,7 +52,7 @@ db.collection("indexOptionDefault").createIndex(
   {
     indexOptionDefaults: true,
     w: 2,
-    wtimeout: 1000
+    wtimeout: 1000,
   },
   function(err) {
     test.equal(null, err);
diff --git a/tests/function_single_destructuring/__snapshots__/jsfmt.spec.js.snap b/tests/function_single_destructuring/__snapshots__/jsfmt.spec.js.snap
index 21138b250..3dbd8fb4a 100644
--- a/tests/function_single_destructuring/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/function_single_destructuring/__snapshots__/jsfmt.spec.js.snap
@@ -247,7 +247,7 @@ function StatelessFunctionalComponent({
   onCancel,
   searchFilters,
   title,
-  items
+  items,
 }) {
   return <div />;
 }
@@ -260,7 +260,7 @@ function StatelessFunctionalComponent({
   onCancel = () => null,
   searchFilters = null,
   title = "",
-  items = []
+  items = [],
 } = {}) {
   return <div />;
 }
@@ -274,9 +274,9 @@ function StatelessFunctionalComponent(
     onCancel = () => null,
     searchFilters = null,
     title = "",
-    items = []
+    items = [],
   } = {
-    isActive: true
+    isActive: true,
   }
 ) {
   return <div />;
@@ -290,7 +290,7 @@ function StatelessFunctionalComponent({
   onCancel,
   searchFilters,
   title,
-  items
+  items,
 }: MyType | null | void) {
   return <div />;
 }
@@ -303,7 +303,7 @@ const StatelessFunctionalComponent = ({
   onCancel,
   searchFilters,
   title,
-  items
+  items,
 }: {
   isActive: number,
   onFiltersUpdated: number,
@@ -312,7 +312,7 @@ const StatelessFunctionalComponent = ({
   onCancel: number,
   searchFilters: number,
   title: number,
-  items: number
+  items: number,
 }) => {
   return <div />;
 };
@@ -326,7 +326,7 @@ class C {
     onCancel,
     searchFilters,
     title,
-    items
+    items,
   }) {
     return <div />;
   }
@@ -340,7 +340,7 @@ type T = ({
   onCancel: number,
   searchFilters: number,
   title: number,
-  items: number
+  items: number,
 }) => void;
 
 const X = (props: { a: boolean }) => <A />;
diff --git a/tests/functional_composition/__snapshots__/jsfmt.spec.js.snap b/tests/functional_composition/__snapshots__/jsfmt.spec.js.snap
index 0f11bef6b..edfab2371 100644
--- a/tests/functional_composition/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/functional_composition/__snapshots__/jsfmt.spec.js.snap
@@ -333,9 +333,9 @@ var db = {
   users: {
     JOE: {
       name: "Joe",
-      followers: ["STEVE", "SUZY"]
-    }
-  }
+      followers: ["STEVE", "SUZY"],
+    },
+  },
 };
 
 // We'll pretend to do a db lookup which returns a promise
@@ -352,7 +352,7 @@ const mapStateToProps = state => ({
   users: R.compose(
     R.filter(R.propEq("status", "active")),
     R.values
-  )(state.users)
+  )(state.users),
 });
 
 ================================================================================
diff --git a/tests/graphql_trailing_comma/__snapshots__/jsfmt.spec.js.snap b/tests/graphql_trailing_comma/__snapshots__/jsfmt.spec.js.snap
index 52f42f773..0d8acdb99 100644
--- a/tests/graphql_trailing_comma/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/graphql_trailing_comma/__snapshots__/jsfmt.spec.js.snap
@@ -4,6 +4,7 @@ exports[`trailing.graphql 1`] = `
 ====================================options=====================================
 parsers: ["graphql"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 query Query(
@@ -123,7 +124,6 @@ exports[`trailing.graphql 3`] = `
 ====================================options=====================================
 parsers: ["graphql"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 query Query(
diff --git a/tests/graphql_trailing_comma/jsfmt.spec.js b/tests/graphql_trailing_comma/jsfmt.spec.js
index 97b45fe5c..636cbdf00 100644
--- a/tests/graphql_trailing_comma/jsfmt.spec.js
+++ b/tests/graphql_trailing_comma/jsfmt.spec.js
@@ -1,3 +1,3 @@
-run_spec(__dirname, ["graphql"]);
+run_spec(__dirname, ["graphql"], { trailingComma: "none" });
 run_spec(__dirname, ["graphql"], { trailingComma: "all" });
-run_spec(__dirname, ["graphql"], { trailingComma: "es5" });
+run_spec(__dirname, ["graphql"]);
diff --git a/tests/html_angular/__snapshots__/jsfmt.spec.js.snap b/tests/html_angular/__snapshots__/jsfmt.spec.js.snap
index c305f1f76..5a94004a3 100644
--- a/tests/html_angular/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_angular/__snapshots__/jsfmt.spec.js.snap
@@ -4,6 +4,7 @@ exports[`attr-name.component.html 1`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <div someDirective itemType="x"></div>
@@ -18,7 +19,6 @@ exports[`attr-name.component.html 2`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <div someDirective itemType="x"></div>
@@ -80,6 +80,7 @@ exports[`attributes.component.html 1`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <div
@@ -351,7 +352,6 @@ exports[`attributes.component.html 2`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <div
@@ -1770,6 +1770,7 @@ exports[`first-lf.component.html 1`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <textarea>{{ generatedDiscountCodes }}</textarea>
@@ -1862,7 +1863,6 @@ exports[`first-lf.component.html 2`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <textarea>{{ generatedDiscountCodes }}</textarea>
@@ -2313,6 +2313,7 @@ exports[`ignore-attribute.component.html 1`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <div
@@ -2371,7 +2372,6 @@ exports[`ignore-attribute.component.html 2`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <div
@@ -2630,6 +2630,7 @@ exports[`interpolation.component.html 1`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <div>{{ a | b : c }}</div>
@@ -2796,7 +2797,6 @@ exports[`interpolation.component.html 2`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <div>{{ a | b : c }}</div>
@@ -3674,6 +3674,7 @@ exports[`real-world.component.html 1`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <!-- copied from: https://stackblitz.com/angular/ymdjlgmlavo -->
@@ -5202,7 +5203,6 @@ exports[`real-world.component.html 2`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <!-- copied from: https://stackblitz.com/angular/ymdjlgmlavo -->
@@ -13330,6 +13330,7 @@ exports[`tag-name.component.html 1`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <Table></Table>
@@ -13344,7 +13345,6 @@ exports[`tag-name.component.html 2`] = `
 ====================================options=====================================
 parsers: ["angular"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <Table></Table>
diff --git a/tests/html_angular/jsfmt.spec.js b/tests/html_angular/jsfmt.spec.js
index a9de42141..1c52f201d 100644
--- a/tests/html_angular/jsfmt.spec.js
+++ b/tests/html_angular/jsfmt.spec.js
@@ -1,5 +1,5 @@
+run_spec(__dirname, ["angular"], { trailingComma: "none" });
 run_spec(__dirname, ["angular"]);
-run_spec(__dirname, ["angular"], { trailingComma: "es5" });
 run_spec(__dirname, ["angular"], { printWidth: 1 });
 run_spec(__dirname, ["angular"], { htmlWhitespaceSensitivity: "ignore" });
 run_spec(__dirname, ["angular"], { bracketSpacing: false });
diff --git a/tests/html_js/__snapshots__/jsfmt.spec.js.snap b/tests/html_js/__snapshots__/jsfmt.spec.js.snap
index 66ca2ccdf..db82a1fca 100644
--- a/tests/html_js/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_js/__snapshots__/jsfmt.spec.js.snap
@@ -356,7 +356,7 @@ printWidth: 80
         dataType: "json",
         cache: false,
         success: data => this.setState({ data: data }),
-        error: (xhr, status, err) => console.error(status, err)
+        error: (xhr, status, err) => console.error(status, err),
       });
     }
     componentDidMount() {
diff --git a/tests/html_lwc/__snapshots__/jsfmt.spec.js.snap b/tests/html_lwc/__snapshots__/jsfmt.spec.js.snap
index 63197acfb..61cbb372b 100644
--- a/tests/html_lwc/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_lwc/__snapshots__/jsfmt.spec.js.snap
@@ -5,6 +5,7 @@ exports[`attributes.html 1`] = `
 parser: "lwc"
 parsers: ["lwc"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -43,7 +44,6 @@ exports[`attributes.html 2`] = `
 parser: "lwc"
 parsers: ["lwc"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <template>
diff --git a/tests/html_lwc/jsfmt.spec.js b/tests/html_lwc/jsfmt.spec.js
index 8286bbff4..5e24225b1 100644
--- a/tests/html_lwc/jsfmt.spec.js
+++ b/tests/html_lwc/jsfmt.spec.js
@@ -1,3 +1,3 @@
+run_spec(__dirname, ["lwc"], { parser: "lwc", trailingComma: "none" });
 run_spec(__dirname, ["lwc"], { parser: "lwc" });
-run_spec(__dirname, ["lwc"], { parser: "lwc", trailingComma: "es5" });
 run_spec(__dirname, ["lwc"], { parser: "lwc", semi: false });
diff --git a/tests/html_vue/__snapshots__/jsfmt.spec.js.snap b/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
index 88dc26011..de64c32a4 100644
--- a/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/html_vue/__snapshots__/jsfmt.spec.js.snap
@@ -4,6 +4,7 @@ exports[`attributes.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -112,7 +113,6 @@ exports[`attributes.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -293,11 +293,11 @@ semi: false
     slot-scope="{ row }"
     slot-scope="{
       destructuring: {
-        a: { b }
-      }
+        a: { b },
+      },
     }"
     :class="{
-      longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true
+      longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong: true,
     }"
     :class="
       (() => {
@@ -330,6 +330,7 @@ exports[`board_card.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <script>
@@ -495,7 +496,6 @@ exports[`board_card.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <script>
@@ -748,7 +748,7 @@ const Store = gl.issueBoards.BoardsStore
 export default {
   name: "BoardsIssueCard",
   components: {
-    "issue-card-inner": gl.issueBoards.IssueCardInner
+    "issue-card-inner": gl.issueBoards.IssueCardInner,
   },
   props: {
     list: Object,
@@ -756,12 +756,12 @@ export default {
     issueLinkBase: String,
     disabled: Boolean,
     index: Number,
-    rootPath: String
+    rootPath: String,
   },
   data() {
     return {
       showDetail: false,
-      detailIssue: Store.detail
+      detailIssue: Store.detail,
     }
   },
   computed: {
@@ -769,7 +769,7 @@ export default {
       return (
         this.detailIssue.issue && this.detailIssue.issue.id === this.issue.id
       )
-    }
+    },
   },
   methods: {
     mouseDown() {
@@ -791,8 +791,8 @@ export default {
           Store.detail.list = this.list
         }
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
@@ -802,7 +802,7 @@ export default {
     :class="{
       'user-can-drag': !disabled && issue.id,
       'is-disabled': disabled || !issue.id,
-      'is-active': issueDetailVisible
+      'is-active': issueDetailVisible,
     }"
     :index="index"
     :data-issue-id="issue.id"
@@ -827,6 +827,7 @@ exports[`case-sensitive-tags.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -845,7 +846,6 @@ exports[`case-sensitive-tags.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -883,6 +883,7 @@ exports[`custom-block.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <i18n>
@@ -912,7 +913,6 @@ exports[`custom-block.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <i18n>
@@ -972,6 +972,7 @@ exports[`filter.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <!-- vue filters are only allowed in v-bind and interpolation -->
@@ -1029,7 +1030,6 @@ exports[`filter.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <!-- vue filters are only allowed in v-bind and interpolation -->
@@ -1145,6 +1145,7 @@ exports[`interpolations.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -1275,7 +1276,6 @@ exports[`interpolations.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -1537,6 +1537,7 @@ exports[`pre-child.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -1642,7 +1643,6 @@ exports[`pre-child.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -1854,6 +1854,7 @@ exports[`script_src.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <script src="https://www.gstatic.com/firebasejs/4.10.1/firebase.js"></script>
@@ -1870,7 +1871,6 @@ exports[`script_src.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <script src="https://www.gstatic.com/firebasejs/4.10.1/firebase.js"></script>
@@ -1904,6 +1904,7 @@ exports[`self_closing.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -1948,7 +1949,6 @@ exports[`self_closing.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -2038,6 +2038,7 @@ exports[`self_closing_style.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -2060,7 +2061,6 @@ exports[`self_closing_style.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -2106,6 +2106,7 @@ exports[`style.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <script>
@@ -2212,7 +2213,6 @@ exports[`style.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <script>
@@ -2426,6 +2426,7 @@ exports[`tag-name.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -2444,7 +2445,6 @@ exports[`tag-name.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <template>
@@ -2482,6 +2482,7 @@ exports[`template.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <!--copied from https://github.com/gitlabhq/gitlabhq/blob/master/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue-->
@@ -2547,7 +2548,6 @@ exports[`template.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <!--copied from https://github.com/gitlabhq/gitlabhq/blob/master/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue-->
@@ -2679,6 +2679,7 @@ exports[`template-lang.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <template lang="pug">
@@ -2717,7 +2718,6 @@ exports[`template-lang.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <template lang="pug">
@@ -2795,6 +2795,7 @@ exports[`test.vue 1`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <script>
@@ -2826,7 +2827,6 @@ exports[`test.vue 2`] = `
 ====================================options=====================================
 parsers: ["vue"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <script>
diff --git a/tests/html_vue/jsfmt.spec.js b/tests/html_vue/jsfmt.spec.js
index cb7655fcd..e916f769e 100644
--- a/tests/html_vue/jsfmt.spec.js
+++ b/tests/html_vue/jsfmt.spec.js
@@ -1,3 +1,3 @@
+run_spec(__dirname, ["vue"], { trailingComma: "none" });
 run_spec(__dirname, ["vue"]);
-run_spec(__dirname, ["vue"], { trailingComma: "es5" });
 run_spec(__dirname, ["vue"], { semi: false });
diff --git a/tests/if/__snapshots__/jsfmt.spec.js.snap b/tests/if/__snapshots__/jsfmt.spec.js.snap
index c69c01c20..a9885f619 100644
--- a/tests/if/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/if/__snapshots__/jsfmt.spec.js.snap
@@ -71,7 +71,7 @@ function f() {
   else
     return {
       name: pair.substring(0, position),
-      value: pair.substring(position + 1)
+      value: pair.substring(position + 1),
     };
 }
 
@@ -80,7 +80,7 @@ function f() {
   else
     return {
       name: pair.substring(0, position),
-      value: pair.substring(position + 1)
+      value: pair.substring(position + 1),
     };
 }
 
diff --git a/tests/ignore/__snapshots__/jsfmt.spec.js.snap b/tests/ignore/__snapshots__/jsfmt.spec.js.snap
index 8f5bf5c39..97e9b61e7 100644
--- a/tests/ignore/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/ignore/__snapshots__/jsfmt.spec.js.snap
@@ -143,7 +143,7 @@ function a() {
 const response = {
   // prettier-ignore
   '_text': 'Turn on the lights',
-  intent: "lights"
+  intent: "lights",
 };
 
 ================================================================================
diff --git a/tests/import/__snapshots__/jsfmt.spec.js.snap b/tests/import/__snapshots__/jsfmt.spec.js.snap
index 53473bdf0..7bc87f259 100644
--- a/tests/import/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/import/__snapshots__/jsfmt.spec.js.snap
@@ -27,7 +27,7 @@ import {
   itGo,
   multiLine,
   andMore,
-  soWeCanGetItTo80Columns
+  soWeCanGetItTo80Columns,
 } from ".";
 import { fitsIn, oneLine } from ".";
 
@@ -62,7 +62,7 @@ import {
   itGo,
   multiLine,
   andMore,
-  soWeCanGetItTo80Columns
+  soWeCanGetItTo80Columns,
 } from ".";
 import {fitsIn, oneLine} from ".";
 
@@ -126,25 +126,25 @@ import {
   //comment1
   //comment2
   //comment3
-  a as b
+  a as b,
 } from "";
 
 import {
   //comment1
   //comment2
   //comment3
-  a as b1
+  a as b1,
 } from "";
 
 import {
   //comment2 //comment1
   //comment3
-  a as b2
+  a as b2,
 } from "";
 
 import {
   //comment3 //comment2 //comment1
-  a as b3
+  a as b3,
 } from "";
 
 import {
@@ -152,7 +152,7 @@ import {
   FN1, // comment 2
   /* comment 3 */ FN2,
   // FN3,
-  FN4 /* comment 4 */
+  FN4 /* comment 4 */,
   // FN4,
   // FN5
 } from "./module";
@@ -161,13 +161,13 @@ import {
   ExecutionResult,
   DocumentNode,
   /* tslint:disable */
-  SelectionSetNode
+  SelectionSetNode,
   /* tslint:enable */
 } from "graphql";
 
 import x, {
   // comment
-  y
+  y,
 } from "z";
 
 ================================================================================
@@ -231,25 +231,25 @@ import {
   //comment1
   //comment2
   //comment3
-  a as b
+  a as b,
 } from "";
 
 import {
   //comment1
   //comment2
   //comment3
-  a as b1
+  a as b1,
 } from "";
 
 import {
   //comment2 //comment1
   //comment3
-  a as b2
+  a as b2,
 } from "";
 
 import {
   //comment3 //comment2 //comment1
-  a as b3
+  a as b3,
 } from "";
 
 import {
@@ -257,7 +257,7 @@ import {
   FN1, // comment 2
   /* comment 3 */ FN2,
   // FN3,
-  FN4 /* comment 4 */
+  FN4 /* comment 4 */,
   // FN4,
   // FN5
 } from "./module";
@@ -266,13 +266,13 @@ import {
   ExecutionResult,
   DocumentNode,
   /* tslint:disable */
-  SelectionSetNode
+  SelectionSetNode,
   /* tslint:enable */
 } from "graphql";
 
 import x, {
   // comment
-  y
+  y,
 } from "z";
 
 ================================================================================
@@ -322,11 +322,11 @@ import {a2, somethingSuperLongsomethingSuperLong3} from 'somethingSuperLongsomet
 import somethingSuperLongsomethingSuperLong from "somethingSuperLongsomethingSuperLongsomethingSuperLong";
 import { somethingSuperLongsomethingSuperLong1 } from "somethingSuperLongsomethingSuperLongsomethingSuperLong";
 import a, {
-  somethingSuperLongsomethingSuperLong2
+  somethingSuperLongsomethingSuperLong2,
 } from "somethingSuperLongsomethingSuperLongsomethingSuperLong";
 import {
   a2,
-  somethingSuperLongsomethingSuperLong3
+  somethingSuperLongsomethingSuperLong3,
 } from "somethingSuperLongsomethingSuperLongsomethingSuperLong";
 
 ================================================================================
@@ -348,11 +348,11 @@ import {a2, somethingSuperLongsomethingSuperLong3} from 'somethingSuperLongsomet
 import somethingSuperLongsomethingSuperLong from "somethingSuperLongsomethingSuperLongsomethingSuperLong";
 import {somethingSuperLongsomethingSuperLong1} from "somethingSuperLongsomethingSuperLongsomethingSuperLong";
 import a, {
-  somethingSuperLongsomethingSuperLong2
+  somethingSuperLongsomethingSuperLong2,
 } from "somethingSuperLongsomethingSuperLongsomethingSuperLong";
 import {
   a2,
-  somethingSuperLongsomethingSuperLong3
+  somethingSuperLongsomethingSuperLong3,
 } from "somethingSuperLongsomethingSuperLongsomethingSuperLong";
 
 ================================================================================
diff --git a/tests/intersection/__snapshots__/jsfmt.spec.js.snap b/tests/intersection/__snapshots__/jsfmt.spec.js.snap
index 9565e2091..6f0a4de9d 100644
--- a/tests/intersection/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/intersection/__snapshots__/jsfmt.spec.js.snap
@@ -59,13 +59,13 @@ export type ReallyBigSocketServer = ReallyBigSocketServerInterface &
   ReallyBigSocketServerStatics;
 
 type Props = {
-  propA: X
+  propA: X,
 } & {
-  propB: X
+  propB: X,
 } & {
-  propC: X
+  propC: X,
 } & {
-  propD: X
+  propD: X,
 };
 
 type Props = {
@@ -73,35 +73,35 @@ type Props = {
   onClick: () => void,
   overlayChildren?: React.Children,
   style?: Object,
-  thumbnail: ImageSource
+  thumbnail: ImageSource,
 } & FooterProps;
 
 type DuplexStreamOptions = ReadableStreamOptions & {
   allowHalfOpen?: boolean,
-  readableObjectMode?: boolean
+  readableObjectMode?: boolean,
 };
 
 type DuplexStreamOptions = {
   allowHalfOpen?: boolean,
-  readableObjectMode?: boolean
+  readableObjectMode?: boolean,
 } & {
   allowHalfOpen?: boolean,
-  readableObjectMode?: boolean
+  readableObjectMode?: boolean,
 };
 
 type DuplexStreamOptions = ReadableStreamOptions &
   WritableStreamOptions & {
     allowHalfOpen?: boolean,
-    readableObjectMode?: boolean
+    readableObjectMode?: boolean,
   };
 
 type DuplexStreamOptions = ReadableStreamOptions &
   WritableStreamOptions & {
     allowHalfOpen?: boolean,
-    readableObjectMode?: boolean
+    readableObjectMode?: boolean,
   } & {
     allowHalfOpen?: boolean,
-    readableObjectMode?: boolean
+    readableObjectMode?: boolean,
   };
 
 ================================================================================
diff --git a/tests/json/__snapshots__/jsfmt.spec.js.snap b/tests/json/__snapshots__/jsfmt.spec.js.snap
index adb407afc..80f8894ce 100644
--- a/tests/json/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/json/__snapshots__/jsfmt.spec.js.snap
@@ -133,7 +133,7 @@ printWidth: 80
 {
   string: "stringstringstringstringstringstringstringstringstringstringstringstringstringstringstring",
   stringstringstringstringstringstringstringstring: "stringstringstringstringstringstringstringstring",
-  stringstringstringstringstringstringstringstringstringstringstringstringstringstringstring: "string"
+  stringstringstringstringstringstringstringstringstringstringstringstringstringstringstring: "string",
 }
 
 ================================================================================
@@ -778,7 +778,7 @@ printWidth: 80
     compact: [1, 2, 3, 4, 5, 6, 7],
     jsontext: '{"object with 1 member":["array with 1 element"]}',
     quotes: "&#34; \\u0022 %22 0x22 034 &#x22;",
-    "/\\\\\\"\\uCAFE\\uBABE\\uAB98\\uFCDE\\ubcda\\uef4A\\b\\f\\n\\r\\t\`1~!@#$%^&*()_+-=[]{}|;:',./<>?": "A key can be any string"
+    "/\\\\\\"\\uCAFE\\uBABE\\uAB98\\uFCDE\\ubcda\\uef4A\\b\\f\\n\\r\\t\`1~!@#$%^&*()_+-=[]{}|;:',./<>?": "A key can be any string",
   },
   0.5,
   98.6,
@@ -790,7 +790,7 @@ printWidth: 80
   1,
   2,
   2,
-  "rosebud"
+  "rosebud",
 ]
 
 ================================================================================
@@ -1188,7 +1188,7 @@ printWidth: 80
 
 =====================================output=====================================
 {
-  a: 123
+  a: 123,
 }
 
 ================================================================================
@@ -1523,7 +1523,7 @@ printWidth: 80
 {
   k1: "v1",
   k2: "v2",
-  k3: "v3"
+  k3: "v3",
 }
 
 ================================================================================
diff --git a/tests/json/with-comment/__snapshots__/jsfmt.spec.js.snap b/tests/json/with-comment/__snapshots__/jsfmt.spec.js.snap
index 891e3322c..750bf764d 100644
--- a/tests/json/with-comment/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/json/with-comment/__snapshots__/jsfmt.spec.js.snap
@@ -229,7 +229,7 @@ printWidth: 80
 =====================================output=====================================
 {
   //comment
-  K: "V"
+  K: "V",
 }
 
 ================================================================================
@@ -305,7 +305,7 @@ printWidth: 80
 
 =====================================output=====================================
 /* comment */ {
-  foo: "bar"
+  foo: "bar",
 }
 
 ================================================================================
@@ -391,7 +391,7 @@ printWidth: 80
 // comment 1
 // comment 2
 {
-  foo: "bar"
+  foo: "bar",
 }
 
 ================================================================================
diff --git a/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap
index 73abdf66d..07b8f0ca0 100644
--- a/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx-split-attrs/__snapshots__/jsfmt.spec.js.snap
@@ -220,7 +220,7 @@ long_obj = (
       use: "bootstrap",
       and: "instead",
       use: "massive",
-      objects
+      objects,
     }}
   >
     hello world
diff --git a/tests/jsx/__snapshots__/jsfmt.spec.js.snap b/tests/jsx/__snapshots__/jsfmt.spec.js.snap
index 31cb9d86f..909d1ee16 100644
--- a/tests/jsx/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx/__snapshots__/jsfmt.spec.js.snap
@@ -368,7 +368,7 @@ singleQuote: false
     // comment
     arg =>
       fn({
-        makeItBreak
+        makeItBreak,
       })
   }
   propArray={
@@ -444,7 +444,7 @@ singleQuote: false
     // comment
     arg =>
       fn({
-        makeItBreak
+        makeItBreak,
       })
   }
   propArray={
@@ -520,7 +520,7 @@ singleQuote: true
     // comment
     arg =>
       fn({
-        makeItBreak
+        makeItBreak,
       })
   }
   propArray={
@@ -596,7 +596,7 @@ singleQuote: true
     // comment
     arg =>
       fn({
-        makeItBreak
+        makeItBreak,
       })
   }
   propArray={
@@ -1914,7 +1914,7 @@ singleQuote: false
     someVeryLongStyle1: "true",
     someVeryLongStyle2: "true",
     someVeryLongStyle3: "true",
-    someVeryLongStyle4: "true"
+    someVeryLongStyle4: "true",
   }}
 />;
 
@@ -1924,8 +1924,8 @@ singleQuote: false
       someVeryLongStyle1: "true",
       someVeryLongStyle2: "true",
       someVeryLongStyle3: "true",
-      someVeryLongStyle4: "true"
-    }
+      someVeryLongStyle4: "true",
+    },
   ]}
 />;
 
@@ -2003,7 +2003,7 @@ singleQuote: false
     value: string | Immutable.List<string>
   ) => {
     this.setState({
-      updatedTask: this.state.updatedTask.set(key, value)
+      updatedTask: this.state.updatedTask.set(key, value),
     });
   }}
 />;
@@ -2038,7 +2038,7 @@ singleQuote: false
     value: string | Immutable.List<string>
   ) => {
     this.setState({
-      updatedTask: this.state.updatedTask.set(key, value)
+      updatedTask: this.state.updatedTask.set(key, value),
     });
   }}
 </Component>;
@@ -2202,7 +2202,7 @@ singleQuote: false
     someVeryLongStyle1: "true",
     someVeryLongStyle2: "true",
     someVeryLongStyle3: "true",
-    someVeryLongStyle4: "true"
+    someVeryLongStyle4: "true",
   }}
 />;
 
@@ -2212,8 +2212,8 @@ singleQuote: false
       someVeryLongStyle1: "true",
       someVeryLongStyle2: "true",
       someVeryLongStyle3: "true",
-      someVeryLongStyle4: "true"
-    }
+      someVeryLongStyle4: "true",
+    },
   ]}
 />;
 
@@ -2291,7 +2291,7 @@ singleQuote: false
     value: string | Immutable.List<string>
   ) => {
     this.setState({
-      updatedTask: this.state.updatedTask.set(key, value)
+      updatedTask: this.state.updatedTask.set(key, value),
     });
   }}
 />;
@@ -2326,7 +2326,7 @@ singleQuote: false
     value: string | Immutable.List<string>
   ) => {
     this.setState({
-      updatedTask: this.state.updatedTask.set(key, value)
+      updatedTask: this.state.updatedTask.set(key, value),
     });
   }}
 </Component>;
@@ -2490,7 +2490,7 @@ singleQuote: true
     someVeryLongStyle1: 'true',
     someVeryLongStyle2: 'true',
     someVeryLongStyle3: 'true',
-    someVeryLongStyle4: 'true'
+    someVeryLongStyle4: 'true',
   }}
 />;
 
@@ -2500,8 +2500,8 @@ singleQuote: true
       someVeryLongStyle1: 'true',
       someVeryLongStyle2: 'true',
       someVeryLongStyle3: 'true',
-      someVeryLongStyle4: 'true'
-    }
+      someVeryLongStyle4: 'true',
+    },
   ]}
 />;
 
@@ -2579,7 +2579,7 @@ singleQuote: true
     value: string | Immutable.List<string>
   ) => {
     this.setState({
-      updatedTask: this.state.updatedTask.set(key, value)
+      updatedTask: this.state.updatedTask.set(key, value),
     });
   }}
 />;
@@ -2614,7 +2614,7 @@ singleQuote: true
     value: string | Immutable.List<string>
   ) => {
     this.setState({
-      updatedTask: this.state.updatedTask.set(key, value)
+      updatedTask: this.state.updatedTask.set(key, value),
     });
   }}
 </Component>;
@@ -2778,7 +2778,7 @@ singleQuote: true
     someVeryLongStyle1: 'true',
     someVeryLongStyle2: 'true',
     someVeryLongStyle3: 'true',
-    someVeryLongStyle4: 'true'
+    someVeryLongStyle4: 'true',
   }}
 />;
 
@@ -2788,8 +2788,8 @@ singleQuote: true
       someVeryLongStyle1: 'true',
       someVeryLongStyle2: 'true',
       someVeryLongStyle3: 'true',
-      someVeryLongStyle4: 'true'
-    }
+      someVeryLongStyle4: 'true',
+    },
   ]}
 />;
 
@@ -2867,7 +2867,7 @@ singleQuote: true
     value: string | Immutable.List<string>
   ) => {
     this.setState({
-      updatedTask: this.state.updatedTask.set(key, value)
+      updatedTask: this.state.updatedTask.set(key, value),
     });
   }}
 />;
@@ -2902,7 +2902,7 @@ singleQuote: true
     value: string | Immutable.List<string>
   ) => {
     this.setState({
-      updatedTask: this.state.updatedTask.set(key, value)
+      updatedTask: this.state.updatedTask.set(key, value),
     });
   }}
 </Component>;
@@ -3769,8 +3769,8 @@ const tabs = [
         onCancel={onCancel}
         countries={countries}
       />
-    )
-  }
+    ),
+  },
 ];
 
 ================================================================================
@@ -3809,8 +3809,8 @@ const tabs = [
         onCancel={onCancel}
         countries={countries}
       />
-    )
-  }
+    ),
+  },
 ];
 
 ================================================================================
@@ -3849,8 +3849,8 @@ const tabs = [
         onCancel={onCancel}
         countries={countries}
       />
-    )
-  }
+    ),
+  },
 ];
 
 ================================================================================
@@ -3889,8 +3889,8 @@ const tabs = [
         onCancel={onCancel}
         countries={countries}
       />
-    )
-  }
+    ),
+  },
 ];
 
 ================================================================================
@@ -4106,7 +4106,7 @@ a = [
   <path
     key="1"
     d="M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,"
-  />
+  />,
 ];
 
 <div {...(foo || foo === null ? { foo } : null)} />;
@@ -4152,7 +4152,7 @@ a = [
   <path
     key='1'
     d='M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,'
-  />
+  />,
 ];
 
 <div {...(foo || foo === null ? { foo } : null)} />;
@@ -4198,7 +4198,7 @@ a = [
   <path
     key="1"
     d="M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,"
-  />
+  />,
 ];
 
 <div {...(foo || foo === null ? { foo } : null)} />;
@@ -4244,7 +4244,7 @@ a = [
   <path
     key='1'
     d='M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,M13.6,10.6l,4-2.8L9.5,'
-  />
+  />,
 ];
 
 <div {...(foo || foo === null ? { foo } : null)} />;
@@ -5178,7 +5178,7 @@ const Labels = {
 
   label2: <fbt>Label 2</fbt>,
 
-  label3: <fbt>Label 3</fbt>
+  label3: <fbt>Label 3</fbt>,
 };
 
 ================================================================================
@@ -5218,7 +5218,7 @@ const Labels = {
 
   label2: <fbt>Label 2</fbt>,
 
-  label3: <fbt>Label 3</fbt>
+  label3: <fbt>Label 3</fbt>,
 };
 
 ================================================================================
@@ -5258,7 +5258,7 @@ const Labels = {
 
   label2: <fbt>Label 2</fbt>,
 
-  label3: <fbt>Label 3</fbt>
+  label3: <fbt>Label 3</fbt>,
 };
 
 ================================================================================
@@ -5298,7 +5298,7 @@ const Labels = {
 
   label2: <fbt>Label 2</fbt>,
 
-  label3: <fbt>Label 3</fbt>
+  label3: <fbt>Label 3</fbt>,
 };
 
 ================================================================================
diff --git a/tests/jsx_fragment/__snapshots__/jsfmt.spec.js.snap b/tests/jsx_fragment/__snapshots__/jsfmt.spec.js.snap
index d28daccb1..3a197bf55 100644
--- a/tests/jsx_fragment/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/jsx_fragment/__snapshots__/jsfmt.spec.js.snap
@@ -142,7 +142,7 @@ test ? <></> : x;
   <></>
 </a>;
 const obj = {
-  foo: <></>
+  foo: <></>,
 };
 const fragmentVar = <></>;
 function fun3() {
diff --git a/tests/last_argument_expansion/__snapshots__/jsfmt.spec.js.snap b/tests/last_argument_expansion/__snapshots__/jsfmt.spec.js.snap
index afe6c4a54..c0e8502c5 100644
--- a/tests/last_argument_expansion/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/last_argument_expansion/__snapshots__/jsfmt.spec.js.snap
@@ -120,18 +120,18 @@ true
 ({
   processors: [
     require("autoprefixer", {
-      browsers: ["> 1%", "last 2 versions", "ie >= 11", "Firefox ESR"]
+      browsers: ["> 1%", "last 2 versions", "ie >= 11", "Firefox ESR"],
     }),
     require("postcss-url")({
       url: url =>
-        url.startsWith("/") || /^[a-z]+:/.test(url) ? url : \`/static/\${url}\`
-    })
-  ]
+        url.startsWith("/") || /^[a-z]+:/.test(url) ? url : \`/static/\${url}\`,
+    }),
+  ],
 });
 
 true ? (
   test({
-    a: 1
+    a: 1,
   })
 ) : (
   <div
@@ -229,7 +229,7 @@ var listener = DOM.listen(
   (event: JavelinEvent): void =>
     BanzaiLogger.log(config, {
       ...logData,
-      ...DataStore.get(event.getNode(sigil))
+      ...DataStore.get(event.getNode(sigil)),
     })
 );
 
@@ -237,8 +237,8 @@ a(
   SomethingVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLong,
   [
     {
-      SomethingVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLong: 1
-    }
+      SomethingVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLong: 1,
+    },
   ]
 );
 
@@ -257,21 +257,21 @@ exports.examples = [
                 position: "absolute",
                 top: "0",
                 left: "0",
-                zIndex: "-1"
+                zIndex: "-1",
               }}
             />
           </InlineBlock>
         </div>
       );
-    })
-  }
+    }),
+  },
 ];
 
 someReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReally.a(
   [
     [],
     // comment
-    []
+    [],
   ]
 );
 
@@ -296,7 +296,7 @@ someReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReallyReal
       /* 2 */
       /***/ function(module, exports, __webpack_require__) {
         /***/
-      }
+      },
       /******/
     ]
   );
@@ -420,7 +420,7 @@ const formatData = pipe(
   zip,
   map(([ref, data]) => ({
     nodeId: ref.nodeId.toString(),
-    ...attributeFromDataValue(ref.attributeId, data)
+    ...attributeFromDataValue(ref.attributeId, data),
   })),
   groupBy(prop("nodeId")),
   map(mergeAll),
@@ -429,7 +429,7 @@ const formatData = pipe(
 
 export const setProp = y => ({
   ...y,
-  a: "very, very, very long very, very long text"
+  a: "very, very, very long very, very long text",
 });
 
 export const log = y => {
diff --git a/tests/markdown/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/__snapshots__/jsfmt.spec.js.snap
index 57d6ad8a0..42d583da7 100644
--- a/tests/markdown/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/markdown/__snapshots__/jsfmt.spec.js.snap
@@ -1512,7 +1512,7 @@ prettier.format("lodash ( )", {
     const ast = babylon(text);
     ast.program.body[0].expression.callee.name = "_";
     return ast;
-  }
+  },
 });
 // -> "_();\\n"
 \`\`\`
@@ -3492,7 +3492,7 @@ prettier.format('lodash ( )', {
     const ast = babylon(text);
     ast.program.body[0].expression.callee.name = '_';
     return ast;
-  }
+  },
 });
 // -> "_();\\n"
 \`\`\`
diff --git a/tests/mdx/__snapshots__/jsfmt.spec.js.snap b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
index f5dc83bc8..43ff727fd 100644
--- a/tests/mdx/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
@@ -46,7 +46,7 @@ import { A, B, C } from "hello-world";
 import {
   AAAAAAAAAAAAAAAAAAAAAAAA,
   BBBBBBBBBBBBBBBBBBBBBB,
-  CCCCCCCCCCCCCCCCCCCCCCC
+  CCCCCCCCCCCCCCCCCCCCCCC,
 } from "xyz";
 
 ---
@@ -58,14 +58,14 @@ import { A, B, C } from "hello-world";
 import {
   AAAAAAAAAAAAAAAAAAAAAAAA,
   BBBBBBBBBBBBBBBBBBBBBB,
-  CCCCCCCCCCCCCCCCCCCCCCC
+  CCCCCCCCCCCCCCCCCCCCCCC,
 } from "xyz";
 
 ---
 
 export const meta = {
   authors: [fred, sue],
-  layout: Layout
+  layout: Layout,
 };
 
 export default () => (
@@ -73,7 +73,7 @@ export default () => (
     components={{
       h1: ui.Heading,
       p: ui.Text,
-      code: ui.Code
+      code: ui.Code,
     }}
   />
 );
@@ -133,7 +133,7 @@ import { A, B, C } from "hello-world"
 import {
   AAAAAAAAAAAAAAAAAAAAAAAA,
   BBBBBBBBBBBBBBBBBBBBBB,
-  CCCCCCCCCCCCCCCCCCCCCCC
+  CCCCCCCCCCCCCCCCCCCCCCC,
 } from "xyz"
 
 ---
@@ -145,14 +145,14 @@ import { A, B, C } from "hello-world"
 import {
   AAAAAAAAAAAAAAAAAAAAAAAA,
   BBBBBBBBBBBBBBBBBBBBBB,
-  CCCCCCCCCCCCCCCCCCCCCCC
+  CCCCCCCCCCCCCCCCCCCCCCC,
 } from "xyz"
 
 ---
 
 export const meta = {
   authors: [fred, sue],
-  layout: Layout
+  layout: Layout,
 }
 
 export default () => (
@@ -160,7 +160,7 @@ export default () => (
     components={{
       h1: ui.Heading,
       p: ui.Text,
-      code: ui.Code
+      code: ui.Code,
     }}
   />
 )
@@ -605,7 +605,7 @@ import { Buz } from "./Fixture";
 
 export const foo = {
   hi: \`Fudge \${Baz.displayName || "Baz"}\`,
-  authors: ["fred", "sally"]
+  authors: ["fred", "sally"],
 };
 
 # Hello, world!
@@ -696,7 +696,7 @@ import { Buz } from "./Fixture"
 
 export const foo = {
   hi: \`Fudge \${Baz.displayName || "Baz"}\`,
-  authors: ["fred", "sally"]
+  authors: ["fred", "sally"],
 }
 
 # Hello, world!
diff --git a/tests/member/__snapshots__/jsfmt.spec.js.snap b/tests/member/__snapshots__/jsfmt.spec.js.snap
index faee486f7..d38b1a4ef 100644
--- a/tests/member/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/member/__snapshots__/jsfmt.spec.js.snap
@@ -76,7 +76,7 @@ const promises = [
       return null;
     }),
   redis.fetch(),
-  other.fetch()
+  other.fetch(),
 ];
 
 const promises2 = [
@@ -90,23 +90,23 @@ const promises2 = [
       return null;
     }),
   redis.fetch(),
-  other.fetch()
+  other.fetch(),
 ];
 
 window.FooClient.setVars({
   locale: getFooLocale({ page }),
-  authorizationToken: data.token
+  authorizationToken: data.token,
 }).initVerify("foo_container");
 
 window.something.FooClient.setVars({
   locale: getFooLocale({ page }),
-  authorizationToken: data.token
+  authorizationToken: data.token,
 }).initVerify("foo_container");
 
 window.FooClient.something
   .setVars({
     locale: getFooLocale({ page }),
-    authorizationToken: data.token
+    authorizationToken: data.token,
   })
   .initVerify("foo_container");
 
diff --git a/tests/method-chain/__snapshots__/jsfmt.spec.js.snap b/tests/method-chain/__snapshots__/jsfmt.spec.js.snap
index be8af3889..fa915e143 100644
--- a/tests/method-chain/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/method-chain/__snapshots__/jsfmt.spec.js.snap
@@ -80,14 +80,14 @@ export default store => {
       next(
         actionWith({
           response,
-          type: successType
+          type: successType,
         })
       ),
     error =>
       next(
         actionWith({
           type: failureType,
-          error: error.message || "Something bad happened"
+          error: error.message || "Something bad happened",
         })
       )
   );
@@ -100,57 +100,57 @@ it("should group messages with same created time", () => {
         message: "test",
         messageType: "SMS",
         status: "Unknown",
-        created: "11/01/2017 13:36"
+        created: "11/01/2017 13:36",
       },
       {
         message: "test",
         messageType: "Email",
         status: "Unknown",
-        created: "11/01/2017 13:36"
-      }
+        created: "11/01/2017 13:36",
+      },
     ],
     "09/01/2017 17:25": [
       {
         message: "te",
         messageType: "SMS",
         status: "Unknown",
-        created: "09/01/2017 17:25"
+        created: "09/01/2017 17:25",
       },
       {
         message: "te",
         messageType: "Email",
         status: "Unknown",
-        created: "09/01/2017 17:25"
-      }
+        created: "09/01/2017 17:25",
+      },
     ],
     "11/01/2017 13:33": [
       {
         message: "test",
         messageType: "SMS",
         status: "Unknown",
-        created: "11/01/2017 13:33"
+        created: "11/01/2017 13:33",
       },
       {
         message: "test",
         messageType: "Email",
         status: "Unknown",
-        created: "11/01/2017 13:33"
-      }
+        created: "11/01/2017 13:33",
+      },
     ],
     "11/01/2017 13:37": [
       {
         message: "test",
         messageType: "SMS",
         status: "Unknown",
-        created: "11/01/2017 13:37"
+        created: "11/01/2017 13:37",
       },
       {
         message: "test",
         messageType: "Email",
         status: "Unknown",
-        created: "11/01/2017 13:37"
-      }
-    ]
+        created: "11/01/2017 13:37",
+      },
+    ],
   });
 });
 
@@ -204,7 +204,7 @@ const {
   index,
   scheduleId,
   studentId,
-  something
+  something,
 } = a.this.props;
 
 const {
@@ -213,14 +213,14 @@ const {
   index,
   scheduleId,
   studentId,
-  something
+  something,
 } = this.props;
 
 const {
   updated,
   author: { identifier: ownerId },
   location,
-  category: categories
+  category: categories,
 } = rawAd.entry;
 
 ================================================================================
@@ -423,7 +423,7 @@ nock(/test/)
   .matchHeader("Accept", "application/json")
   [httpMethodNock(method)]("/foo")
   .reply(200, {
-    foo: "bar"
+    foo: "bar",
   });
 
 ================================================================================
@@ -639,8 +639,8 @@ export default function theFunction(action$, store) {
       evenMore: stuff({
         value1: true,
         value2: false,
-        value3: false
-      })
+        value3: false,
+      }),
     })
       .filter(data => theFilter(data))
       .map(({ theType, ...data }) => theMap(theType, data))
@@ -651,7 +651,7 @@ export default function theFunction(action$, store) {
 function f() {
   return this._getWorker(workerOptions)({
     filePath,
-    hasteImplModulePath: this._options.hasteImplModulePath
+    hasteImplModulePath: this._options.hasteImplModulePath,
   }).then(metadata => {
     // \`1\` for truthy values instead of \`true\` to save cache space.
     fileMetadata[H.VISITED] = 1;
@@ -696,7 +696,7 @@ var jqxhr = $.ajax("example.php")
 =====================================output=====================================
 Object.keys(
   availableLocales({
-    test: true
+    test: true,
   })
 ).forEach(locale => {
   // ...
@@ -821,7 +821,7 @@ if (testConfig.ENABLE_ONLINE_TESTS === "true") {
             PostalCode: "10999",
             Region: "Berlin",
             City: "Berlin",
-            Country: "DE"
+            Country: "DE",
           });
       }
     });
diff --git a/tests/multiparser_js_graphql/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_js_graphql/__snapshots__/jsfmt.spec.js.snap
index 59018321b..4446436af 100644
--- a/tests/multiparser_js_graphql/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/multiparser_js_graphql/__snapshots__/jsfmt.spec.js.snap
@@ -552,7 +552,7 @@ gql\`
 
   \${FRIENDS_FRAGMENT}
   \${generateFragment({
-    totally: "a good idea"
+    totally: "a good idea",
   })}
 
   \${fragment}
diff --git a/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap
index 8736fba1d..e6a7c382d 100644
--- a/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/multiparser_js_html/__snapshots__/jsfmt.spec.js.snap
@@ -85,7 +85,7 @@ import { LitElement, html } from "@polymer/lit-element";
 class MyElement extends LitElement {
   static get properties() {
     return {
-      mood: { type: String }
+      mood: { type: String },
     };
   }
 
diff --git a/tests/multiparser_text/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_text/__snapshots__/jsfmt.spec.js.snap
index f287ef99a..7ac37d7d0 100644
--- a/tests/multiparser_text/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/multiparser_text/__snapshots__/jsfmt.spec.js.snap
@@ -30,7 +30,7 @@ a = {
         name
       }
     }
-  \`
+  \`,
 };
 
 ================================================================================
diff --git a/tests/multiparser_vue/__snapshots__/jsfmt.spec.js.snap b/tests/multiparser_vue/__snapshots__/jsfmt.spec.js.snap
index 45ff254a4..03ec6a744 100644
--- a/tests/multiparser_vue/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/multiparser_vue/__snapshots__/jsfmt.spec.js.snap
@@ -27,8 +27,8 @@ export default {
   computed: {
     foo(): string {
       return "foo";
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -56,11 +56,11 @@ export default {
   computed: {
     foo(): string {
       return "foo";
-    }
+    },
   },
   render(h): VNode {
     return <div>{this.foo}</div>;
-  }
+  },
 };
 </script>
 
@@ -120,7 +120,7 @@ printWidth: 80
     class="title"
     :class="{
       'issue-realtime-pre-pulse': preAnimation,
-      'issue-realtime-trigger-pulse': pulseAnimation
+      'issue-realtime-trigger-pulse': pulseAnimation,
     }"
     v-html="titleHtml"
   ></h2>
@@ -170,9 +170,9 @@ p { font-size : 2em ; text-align : center ; }
 module.exports = {
   data: function() {
     return {
-      greeting: "Hello"
+      greeting: "Hello",
     };
-  }
+  },
 };
 </script>
 
diff --git a/tests/object-prop-break-in/__snapshots__/jsfmt.spec.js.snap b/tests/object-prop-break-in/__snapshots__/jsfmt.spec.js.snap
index a3a99407d..565980034 100644
--- a/tests/object-prop-break-in/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/object-prop-break-in/__snapshots__/jsfmt.spec.js.snap
@@ -17,7 +17,7 @@ function foo() {
 function foo() {
   return {
     // this comment causes the problem
-    bar: baz() + 1
+    bar: baz() + 1,
   };
 }
 
@@ -37,7 +37,7 @@ const x = {
 =====================================output=====================================
 const x = {
   ABC:
-    "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+    "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
 };
 
 ================================================================================
@@ -82,39 +82,39 @@ ipsum\` }
 
 =====================================output=====================================
 const a = classnames({
-  "some-prop": this.state.longLongLongLongLongLongLongLongLongTooLongProp
+  "some-prop": this.state.longLongLongLongLongLongLongLongLongTooLongProp,
 });
 
 const b = classnames({
   "some-prop":
-    this.state.longLongLongLongLongLongLongLongLongTooLongProp === true
+    this.state.longLongLongLongLongLongLongLongLongTooLongProp === true,
 });
 
 const c = classnames({
-  "some-prop": ["foo", "bar", "foo", "bar", "foo", "bar", "foo", "bar", "foo"]
+  "some-prop": ["foo", "bar", "foo", "bar", "foo", "bar", "foo", "bar", "foo"],
 });
 
 const d = classnames({
-  "some-prop": () => {}
+  "some-prop": () => {},
 });
 
 const e = classnames({
-  "some-prop": function bar() {}
+  "some-prop": function bar() {},
 });
 
 const f = classnames({
-  "some-prop": { foo: "bar", bar: "foo", foo: "bar", bar: "foo", foo: "bar" }
+  "some-prop": { foo: "bar", bar: "foo", foo: "bar", bar: "foo", foo: "bar" },
 });
 
 const g = classnames({
   "some-prop":
-    longLongLongLongLongLongLongLongLongLongLongLongLongTooLongVar || 1337
+    longLongLongLongLongLongLongLongLongLongLongLongLongTooLongVar || 1337,
 });
 
 const h = {
   foo: "bar",
   baz: \`Lorem
-ipsum\`
+ipsum\`,
 };
 
 ================================================================================
diff --git a/tests/object_colon_bug/__snapshots__/jsfmt.spec.js.snap b/tests/object_colon_bug/__snapshots__/jsfmt.spec.js.snap
index b7a0db71f..ea0d48dd9 100644
--- a/tests/object_colon_bug/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/object_colon_bug/__snapshots__/jsfmt.spec.js.snap
@@ -16,7 +16,7 @@ const foo = {
   bar: props.bar
     ? props.bar
     : noop,
-  baz: props.baz
+  baz: props.baz,
 };
 
 ================================================================================
diff --git a/tests/object_property_comment/__snapshots__/jsfmt.spec.js.snap b/tests/object_property_comment/__snapshots__/jsfmt.spec.js.snap
index e59748f13..06ae07769 100644
--- a/tests/object_property_comment/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/object_property_comment/__snapshots__/jsfmt.spec.js.snap
@@ -16,11 +16,11 @@ let b = {
 
 =====================================output=====================================
 let a = {
-  a /* comment */: () => 1
+  a /* comment */: () => 1,
 };
 
 let b = {
-  a /* comment */: () => 1
+  a /* comment */: () => 1,
 };
 
 ================================================================================
@@ -55,19 +55,19 @@ o = {
   name:
     // Comment A
     // Comment B
-    (({ id: type }: any): CreativeConcept)
+    (({ id: type }: any): CreativeConcept),
 };
 
 o = {
   // Comment A
   name:
     // Comment B
-    (({ id: type }: any): CreativeConcept)
+    (({ id: type }: any): CreativeConcept),
 };
 
 o = {
   // Comment B // Comment A
-  name: (({ id: type }: any): CreativeConcept)
+  name: (({ id: type }: any): CreativeConcept),
 };
 
 ================================================================================
diff --git a/tests/objects/__snapshots__/jsfmt.spec.js.snap b/tests/objects/__snapshots__/jsfmt.spec.js.snap
index 74537c035..680f7eb6c 100644
--- a/tests/objects/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/objects/__snapshots__/jsfmt.spec.js.snap
@@ -67,19 +67,19 @@ a = () => ({}.x);
 ({} = 0), 1;
 
 const a1 = {
-  someKey: (shortName, shortName)
+  someKey: (shortName, shortName),
 };
 
 const a2 = {
   someKey:
-    (longLongLongLongLongLongLongLongLongLongLongLongLongLongName, shortName)
+    (longLongLongLongLongLongLongLongLongLongLongLongLongLongName, shortName),
 };
 
 const a3 = {
   someKey:
     (longLongLongLongLongLongLongLongLongLongLongLongLongLongName,
     longLongLongLongLongLongLongLongLongLongLongLongLongLongName,
-    longLongLongLongLongLongLongLongLongLongLongLongLongLongName)
+    longLongLongLongLongLongLongLongLongLongLongLongLongLongName),
 };
 
 ================================================================================
@@ -129,7 +129,7 @@ group(
     ),
     options.trailingComma ? "," : "",
     line,
-    ")"
+    ")",
   ]),
   { shouldBreak: true }
 );
@@ -172,7 +172,7 @@ const k = {
   blablah:
     "aldkfkladfskladklsfkladklfkaldfadfkdaf" +
     "adlfasdklfkldsklfakldsfkladsfkadsfladsfa" +
-    "dflkadfkladsfklkadlfkladlfkadklfjadlfdfdaf"
+    "dflkadfkladsfklkadlfkladlfkadklfjadlfdfdaf",
 };
 
 somethingThatsAReallyLongPropName =
@@ -180,7 +180,7 @@ somethingThatsAReallyLongPropName =
 
 const o = {
   somethingThatsAReallyLongPropName:
-    this.props.cardType === AwesomizerCardEnum.SEEFIRST
+    this.props.cardType === AwesomizerCardEnum.SEEFIRST,
 };
 
 ================================================================================
diff --git a/tests/preserve_line/__snapshots__/jsfmt.spec.js.snap b/tests/preserve_line/__snapshots__/jsfmt.spec.js.snap
index 950cc4d7f..7432d88b2 100644
--- a/tests/preserve_line/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/preserve_line/__snapshots__/jsfmt.spec.js.snap
@@ -267,7 +267,7 @@ moreArgTypes(
 
   {
     name: "Hello World",
-    age: 29
+    age: 29,
   },
 
   doSomething(
@@ -333,7 +333,7 @@ doAnotherThing(
 
   {
     solution_type,
-    time_frame
+    time_frame,
   }
 );
 
@@ -342,7 +342,7 @@ stuff.doThing(
 
   -1,
   {
-    accept: node => doSomething(node)
+    accept: node => doSomething(node),
   }
 );
 
@@ -352,7 +352,7 @@ doThing(
   // This is important
   true,
   {
-    decline: creditCard => takeMoney(creditCard)
+    decline: creditCard => takeMoney(creditCard),
   }
 );
 
@@ -808,7 +808,7 @@ function test({
   nine,
   ten,
 
-  eleven
+  eleven,
 }) {}
 
 function test({ one, two, three, four }) {}
@@ -818,7 +818,7 @@ function test({
 
   two,
   three,
-  four
+  four,
 }) {}
 
 function test({ one, two, three, four }, $a) {}
diff --git a/tests/quote_props/__snapshots__/jsfmt.spec.js.snap b/tests/quote_props/__snapshots__/jsfmt.spec.js.snap
index e9a95fd62..6a193acbd 100644
--- a/tests/quote_props/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/quote_props/__snapshots__/jsfmt.spec.js.snap
@@ -216,21 +216,21 @@ const d = {
 
 =====================================output=====================================
 const a = {
-  a: "a"
+  a: "a",
 };
 
 const b = {
-  b: "b"
+  b: "b",
 };
 
 const c = {
   c1: "c1",
-  c2: "c2"
+  c2: "c2",
 };
 
 const d = {
   d1: "d1",
-  "d-2": "d2"
+  "d-2": "d2",
 };
 
 ================================================================================
@@ -263,21 +263,21 @@ const d = {
 
 =====================================output=====================================
 const a = {
-  a: "a"
+  a: "a",
 };
 
 const b = {
-  "b": "b"
+  "b": "b",
 };
 
 const c = {
   c1: "c1",
-  "c2": "c2"
+  "c2": "c2",
 };
 
 const d = {
   d1: "d1",
-  "d-2": "d2"
+  "d-2": "d2",
 };
 
 ================================================================================
@@ -310,21 +310,21 @@ const d = {
 
 =====================================output=====================================
 const a = {
-  a: "a"
+  a: "a",
 };
 
 const b = {
-  b: "b"
+  b: "b",
 };
 
 const c = {
   c1: "c1",
-  c2: "c2"
+  c2: "c2",
 };
 
 const d = {
   "d1": "d1",
-  "d-2": "d2"
+  "d-2": "d2",
 };
 
 ================================================================================
@@ -358,21 +358,21 @@ const d = {
 
 =====================================output=====================================
 const a = {
-  a: 'a'
+  a: 'a',
 };
 
 const b = {
-  b: 'b'
+  b: 'b',
 };
 
 const c = {
   c1: 'c1',
-  c2: 'c2'
+  c2: 'c2',
 };
 
 const d = {
   'd1': 'd1',
-  'd-2': 'd2'
+  'd-2': 'd2',
 };
 
 ================================================================================
@@ -398,7 +398,7 @@ class Foo {
 =====================================output=====================================
 const obj = {
   foo: "",
-  [foo.bar]: ""
+  [foo.bar]: "",
 };
 
 class Foo {
@@ -429,7 +429,7 @@ class Foo {
 =====================================output=====================================
 const obj = {
   foo: "",
-  [foo.bar]: ""
+  [foo.bar]: "",
 };
 
 class Foo {
@@ -460,7 +460,7 @@ class Foo {
 =====================================output=====================================
 const obj = {
   foo: "",
-  [foo.bar]: ""
+  [foo.bar]: "",
 };
 
 class Foo {
@@ -492,7 +492,7 @@ class Foo {
 =====================================output=====================================
 const obj = {
   foo: '',
-  [foo.bar]: ''
+  [foo.bar]: '',
 };
 
 class Foo {
@@ -528,17 +528,17 @@ obj = {
 =====================================output=====================================
 obj = {
   foo: "",
-  1: ""
+  1: "",
 };
 
 obj = {
   bar: "",
-  1: ""
+  1: "",
 };
 
 obj = {
   "foo-bar": "",
-  1: ""
+  1: "",
 };
 
 ================================================================================
@@ -569,17 +569,17 @@ obj = {
 =====================================output=====================================
 obj = {
   foo: "",
-  1: ""
+  1: "",
 };
 
 obj = {
   "bar": "",
-  1: ""
+  1: "",
 };
 
 obj = {
   "foo-bar": "",
-  1: ""
+  1: "",
 };
 
 ================================================================================
@@ -610,17 +610,17 @@ obj = {
 =====================================output=====================================
 obj = {
   foo: "",
-  1: ""
+  1: "",
 };
 
 obj = {
   bar: "",
-  1: ""
+  1: "",
 };
 
 obj = {
   "foo-bar": "",
-  1: ""
+  1: "",
 };
 
 ================================================================================
@@ -652,17 +652,17 @@ obj = {
 =====================================output=====================================
 obj = {
   foo: '',
-  1: ''
+  1: '',
 };
 
 obj = {
   bar: '',
-  1: ''
+  1: '',
 };
 
 obj = {
   'foo-bar': '',
-  1: ''
+  1: '',
 };
 
 ================================================================================
diff --git a/tests/quotes/__snapshots__/jsfmt.spec.js.snap b/tests/quotes/__snapshots__/jsfmt.spec.js.snap
index 7733658ea..eb5273b47 100644
--- a/tests/quotes/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/quotes/__snapshots__/jsfmt.spec.js.snap
@@ -61,7 +61,7 @@ const obj = {
 const obj = {
   a: true,
   b: true,
-  "𐊧": true
+  "𐊧": true,
 };
 
 ================================================================================
@@ -84,7 +84,7 @@ const obj = {
 const obj = {
   a: true,
   b: true,
-  '𐊧': true
+  '𐊧': true,
 };
 
 ================================================================================
diff --git a/tests/range/__snapshots__/jsfmt.spec.js.snap b/tests/range/__snapshots__/jsfmt.spec.js.snap
index b1932a1f1..1e0db0ea9 100644
--- a/tests/range/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/range/__snapshots__/jsfmt.spec.js.snap
@@ -109,7 +109,7 @@ function ugly() {
     key: "value",
     anotherKey: "another value",
     firstNumber: 1,
-    secondNumber: 2
+    secondNumber: 2,
   };
 }
 
@@ -439,12 +439,12 @@ const y =       [
 
 const y = [
   {
-    a: 1
+    a: 1,
   },
   {
     a: 1,
-    b: 2
-  }
+    b: 2,
+  },
 ];
 
 ================================================================================
diff --git a/tests/require-amd/__snapshots__/jsfmt.spec.js.snap b/tests/require-amd/__snapshots__/jsfmt.spec.js.snap
index 0eaf96025..6c96cdd5e 100644
--- a/tests/require-amd/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/require-amd/__snapshots__/jsfmt.spec.js.snap
@@ -49,7 +49,7 @@ require([
   "some_project/rectangle",
   "some_project/triangle",
   "some_project/circle",
-  "some_project/star"
+  "some_project/star",
 ], function(
   $,
   Context,
@@ -71,7 +71,7 @@ define([
   "some_project/rectangle",
   "some_project/triangle",
   "some_project/circle",
-  "some_project/star"
+  "some_project/star",
 ], function(
   $,
   Context,
diff --git a/tests/require/__snapshots__/jsfmt.spec.js.snap b/tests/require/__snapshots__/jsfmt.spec.js.snap
index 71fa674bb..f329db2f8 100644
--- a/tests/require/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/require/__snapshots__/jsfmt.spec.js.snap
@@ -22,7 +22,7 @@ const {
   seven,
   eight,
   nine,
-  ten
+  ten,
 } = require("./my-utils");
 const {
   one1,
@@ -35,7 +35,7 @@ const {
   eight1,
   nine1,
   ten1,
-  eleven1
+  eleven1,
 } = require("./my-utils");
 
 const MyReallyExtrememlyLongModuleName = require("MyReallyExtrememlyLongModuleName");
diff --git a/tests/strings/__snapshots__/jsfmt.spec.js.snap b/tests/strings/__snapshots__/jsfmt.spec.js.snap
index ff176f2b3..1b8c93879 100644
--- a/tests/strings/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/strings/__snapshots__/jsfmt.spec.js.snap
@@ -56,7 +56,7 @@ printWidth: 80
   "\\0",
   "🐶",
 
-  "\\uD801\\uDC28"
+  "\\uD801\\uDC28",
 ];
 
 ================================================================================
@@ -271,7 +271,7 @@ const env = \${JSON.stringify(
     role: "client",
     adsfafa: "sdfsdff",
     asdfasff: "wefwefw",
-    fefef: "sf sdfs fdsfdsf s dfsfds"
+    fefef: "sf sdfs fdsfdsf s dfsfds",
   },
   null,
   "\\t"
@@ -282,7 +282,7 @@ const env = \${JSON.stringify(
 f(
   \`\${{
     a: 4,
-    b: 9
+    b: 9,
   }}\`
 );
 
@@ -299,10 +299,10 @@ const makeBody = (store, assets, html) =>
           store.getState(),
           null,
           2
-        )};\`
+        )};\`,
       ]}
       content={[
-        { id: "app-container", dangerouslySetInnerHTML: { __html: html } }
+        { id: "app-container", dangerouslySetInnerHTML: { __html: html } },
       ]}
     />
   )}\`;
diff --git a/tests/template/__snapshots__/jsfmt.spec.js.snap b/tests/template/__snapshots__/jsfmt.spec.js.snap
index d62faad06..465ab7eb1 100644
--- a/tests/template/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/template/__snapshots__/jsfmt.spec.js.snap
@@ -126,7 +126,7 @@ var x = {
 var o = {
   [\`key\`]: () => {
     // Comment
-  }
+  },
 };
 
 var x = {
@@ -135,7 +135,7 @@ var x = {
       \${foo},
       field,
     }
-  \`
+  \`,
 };
 
 ================================================================================
@@ -176,11 +176,11 @@ module.exports = Relay.createContainer(
           __typename
           \${OptimalSolutionsSection.getFragment("node", {
             solution_type,
-            time_frame
+            time_frame,
           })}
         }
-      \`
-    }
+      \`,
+    },
   }
 );
 
@@ -226,7 +226,7 @@ line 2
 line n
 \${foo({
   many: keys,
-  many: keys
+  many: keys,
 })}
 line n + 1
 line n + 2
@@ -336,14 +336,14 @@ this._pipe.write(\`
 
 (): {
   someLong: boolean,
-  t: boolean
+  t: boolean,
 } => \`
   a
 \`;
 
 (): {
   someLong: boolean,
-  t: boolean
+  t: boolean,
 } =>
   \`
     a
diff --git a/tests/ternaries/__snapshots__/jsfmt.spec.js.snap b/tests/ternaries/__snapshots__/jsfmt.spec.js.snap
index 1a5fcf27a..a033b64bc 100644
--- a/tests/ternaries/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/ternaries/__snapshots__/jsfmt.spec.js.snap
@@ -477,26 +477,26 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 a
   ? {
-      a: 0
+      a: 0,
     }
   : {
       a: {
-        a: 0
+        a: 0,
       }
         ? {
-            a: 0
+            a: 0,
           }
         : {
             y: {
-              a: 0
+              a: 0,
             }
               ? {
-                  a: 0
+                  a: 0,
                 }
               : {
-                  a: 0
-                }
-          }
+                  a: 0,
+                },
+          },
     };
 
 a
@@ -508,30 +508,30 @@ a
                 a
                   ? {
                       a: 0,
-                      b: [a ? [0, 1] : []]
+                      b: [a ? [0, 1] : []],
                     }
                   : [
                       [
                         0,
                         {
-                          a: 0
+                          a: 0,
                         },
-                        a ? 0 : 1
+                        a ? 0 : 1,
                       ],
                       function() {
                         return a
                           ? {
-                              a: 0
+                              a: 0,
                             }
                           : [
                               {
-                                a: 0
+                                a: 0,
                               },
-                              {}
+                              {},
                             ];
-                      }
-                    ]
-              ]
+                      },
+                    ],
+              ],
             }
           : [
               a
@@ -541,8 +541,8 @@ a
                           a
                             ? {
                                 a: a({
-                                  a: 0
-                                })
+                                  a: 0,
+                                }),
                               }
                             : [
                                 0,
@@ -550,44 +550,44 @@ a
                                 a(
                                   a(),
                                   {
-                                    a: 0
+                                    a: 0,
                                   },
                                   a
                                     ? a()
                                     : a({
-                                        a: 0
+                                        a: 0,
                                       })
                                 ),
                                 a()
                                   ? {
                                       a: a(),
-                                      b: []
+                                      b: [],
                                     }
-                                  : {}
+                                  : {},
                               ]
                         )
                       : a(
                           a()
                             ? {
-                                a: 0
+                                a: 0,
                               }
                             : (function(a) {
                                 return a()
                                   ? [
                                       {
                                         a: 0,
-                                        b: a()
-                                      }
+                                        b: a(),
+                                      },
                                     ]
                                   : a([
                                       a
                                         ? {
-                                            a: 0
+                                            a: 0,
                                           }
                                         : {},
                                       {
-                                        a: 0
-                                      }
+                                        a: 0,
+                                      },
                                     ]);
                               })(
                                 a
@@ -604,9 +604,9 @@ a
                               )
                         );
                   }
-                : function() {}
+                : function() {},
             ];
-      }
+      },
     }
   : a;
 
@@ -807,26 +807,26 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 a
     ? {
-          a: 0
+          a: 0,
       }
     : {
           a: {
-              a: 0
+              a: 0,
           }
               ? {
-                    a: 0
+                    a: 0,
                 }
               : {
                     y: {
-                        a: 0
+                        a: 0,
                     }
                         ? {
-                              a: 0
+                              a: 0,
                           }
                         : {
-                              a: 0
-                          }
-                }
+                              a: 0,
+                          },
+                },
       };
 
 a
@@ -838,30 +838,30 @@ a
                             a
                                 ? {
                                       a: 0,
-                                      b: [a ? [0, 1] : []]
+                                      b: [a ? [0, 1] : []],
                                   }
                                 : [
                                       [
                                           0,
                                           {
-                                              a: 0
+                                              a: 0,
                                           },
-                                          a ? 0 : 1
+                                          a ? 0 : 1,
                                       ],
                                       function() {
                                           return a
                                               ? {
-                                                    a: 0
+                                                    a: 0,
                                                 }
                                               : [
                                                     {
-                                                        a: 0
+                                                        a: 0,
                                                     },
-                                                    {}
+                                                    {},
                                                 ];
-                                      }
-                                  ]
-                        ]
+                                      },
+                                  ],
+                        ],
                     }
                   : [
                         a
@@ -871,8 +871,8 @@ a
                                             a
                                                 ? {
                                                       a: a({
-                                                          a: 0
-                                                      })
+                                                          a: 0,
+                                                      }),
                                                   }
                                                 : [
                                                       0,
@@ -880,44 +880,44 @@ a
                                                       a(
                                                           a(),
                                                           {
-                                                              a: 0
+                                                              a: 0,
                                                           },
                                                           a
                                                               ? a()
                                                               : a({
-                                                                    a: 0
+                                                                    a: 0,
                                                                 })
                                                       ),
                                                       a()
                                                           ? {
                                                                 a: a(),
-                                                                b: []
+                                                                b: [],
                                                             }
-                                                          : {}
+                                                          : {},
                                                   ]
                                         )
                                       : a(
                                             a()
                                                 ? {
-                                                      a: 0
+                                                      a: 0,
                                                   }
                                                 : (function(a) {
                                                       return a()
                                                           ? [
                                                                 {
                                                                     a: 0,
-                                                                    b: a()
-                                                                }
+                                                                    b: a(),
+                                                                },
                                                             ]
                                                           : a([
                                                                 a
                                                                     ? {
-                                                                          a: 0
+                                                                          a: 0,
                                                                       }
                                                                     : {},
                                                                 {
-                                                                    a: 0
-                                                                }
+                                                                    a: 0,
+                                                                },
                                                             ]);
                                                   })(
                                                       a
@@ -934,9 +934,9 @@ a
                                                   )
                                         );
                               }
-                            : function() {}
+                            : function() {},
                     ];
-          }
+          },
       }
     : a;
 
@@ -1137,26 +1137,26 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 a
 	? {
-			a: 0
+			a: 0,
 	  }
 	: {
 			a: {
-				a: 0
+				a: 0,
 			}
 				? {
-						a: 0
+						a: 0,
 				  }
 				: {
 						y: {
-							a: 0
+							a: 0,
 						}
 							? {
-									a: 0
+									a: 0,
 							  }
 							: {
-									a: 0
-							  }
-				  }
+									a: 0,
+							  },
+				  },
 	  };
 
 a
@@ -1168,30 +1168,30 @@ a
 								a
 									? {
 											a: 0,
-											b: [a ? [0, 1] : []]
+											b: [a ? [0, 1] : []],
 									  }
 									: [
 											[
 												0,
 												{
-													a: 0
+													a: 0,
 												},
-												a ? 0 : 1
+												a ? 0 : 1,
 											],
 											function() {
 												return a
 													? {
-															a: 0
+															a: 0,
 													  }
 													: [
 															{
-																a: 0
+																a: 0,
 															},
-															{}
+															{},
 													  ];
-											}
-									  ]
-							]
+											},
+									  ],
+							],
 					  }
 					: [
 							a
@@ -1201,8 +1201,8 @@ a
 													a
 														? {
 																a: a({
-																	a: 0
-																})
+																	a: 0,
+																}),
 														  }
 														: [
 																0,
@@ -1210,44 +1210,44 @@ a
 																a(
 																	a(),
 																	{
-																		a: 0
+																		a: 0,
 																	},
 																	a
 																		? a()
 																		: a({
-																				a: 0
+																				a: 0,
 																		  })
 																),
 																a()
 																	? {
 																			a: a(),
-																			b: []
+																			b: [],
 																	  }
-																	: {}
+																	: {},
 														  ]
 											  )
 											: a(
 													a()
 														? {
-																a: 0
+																a: 0,
 														  }
 														: (function(a) {
 																return a()
 																	? [
 																			{
 																				a: 0,
-																				b: a()
-																			}
+																				b: a(),
+																			},
 																	  ]
 																	: a([
 																			a
 																				? {
-																						a: 0
+																						a: 0,
 																				  }
 																				: {},
 																			{
-																				a: 0
-																			}
+																				a: 0,
+																			},
 																	  ]);
 														  })(
 																a
@@ -1264,9 +1264,9 @@ a
 														  )
 											  );
 								  }
-								: function() {}
+								: function() {},
 					  ];
-			}
+			},
 	  }
 	: a;
 
@@ -1468,26 +1468,26 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 a
 	? {
-			a: 0
+			a: 0,
 	  }
 	: {
 			a: {
-				a: 0
+				a: 0,
 			}
 				? {
-						a: 0
+						a: 0,
 				  }
 				: {
 						y: {
-							a: 0
+							a: 0,
 						}
 							? {
-									a: 0
+									a: 0,
 							  }
 							: {
-									a: 0
-							  }
-				  }
+									a: 0,
+							  },
+				  },
 	  };
 
 a
@@ -1499,30 +1499,30 @@ a
 								a
 									? {
 											a: 0,
-											b: [a ? [0, 1] : []]
+											b: [a ? [0, 1] : []],
 									  }
 									: [
 											[
 												0,
 												{
-													a: 0
+													a: 0,
 												},
-												a ? 0 : 1
+												a ? 0 : 1,
 											],
 											function() {
 												return a
 													? {
-															a: 0
+															a: 0,
 													  }
 													: [
 															{
-																a: 0
+																a: 0,
 															},
-															{}
+															{},
 													  ];
-											}
-									  ]
-							]
+											},
+									  ],
+							],
 					  }
 					: [
 							a
@@ -1532,8 +1532,8 @@ a
 													a
 														? {
 																a: a({
-																	a: 0
-																})
+																	a: 0,
+																}),
 														  }
 														: [
 																0,
@@ -1541,44 +1541,44 @@ a
 																a(
 																	a(),
 																	{
-																		a: 0
+																		a: 0,
 																	},
 																	a
 																		? a()
 																		: a({
-																				a: 0
+																				a: 0,
 																		  })
 																),
 																a()
 																	? {
 																			a: a(),
-																			b: []
+																			b: [],
 																	  }
-																	: {}
+																	: {},
 														  ]
 											  )
 											: a(
 													a()
 														? {
-																a: 0
+																a: 0,
 														  }
 														: (function(a) {
 																return a()
 																	? [
 																			{
 																				a: 0,
-																				b: a()
-																			}
+																				b: a(),
+																			},
 																	  ]
 																	: a([
 																			a
 																				? {
-																						a: 0
+																						a: 0,
 																				  }
 																				: {},
 																			{
-																				a: 0
-																			}
+																				a: 0,
+																			},
 																	  ]);
 														  })(
 																a
@@ -1599,9 +1599,9 @@ a
 														  )
 											  );
 								  }
-								: function() {}
+								: function() {},
 					  ];
-			}
+			},
 	  }
 	: a;
 
@@ -1803,7 +1803,7 @@ const foo = (
 a
   ? literalline
   : {
-      123: 12
+      123: 12,
     }
   ? line
   : softline;
@@ -2007,7 +2007,7 @@ const foo = (
 a
     ? literalline
     : {
-          123: 12
+          123: 12,
       }
     ? line
     : softline;
@@ -2211,7 +2211,7 @@ const foo = (
 a
 	? literalline
 	: {
-			123: 12
+			123: 12,
 	  }
 	? line
 	: softline;
@@ -2416,7 +2416,7 @@ const foo = (
 a
 	? literalline
 	: {
-			123: 12
+			123: 12,
 	  }
 	? line
 	: softline;
@@ -2606,7 +2606,7 @@ const obj3 = conditionIsTruthy
       some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
       object: "with",
       lots: "of",
-      stuff
+      stuff,
     }
   : shortThing;
 
@@ -2616,7 +2616,7 @@ const obj4 = conditionIsTruthy
       some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
       object: "with",
       lots: "of",
-      stuff
+      stuff,
     };
 
 const obj5 = conditionIsTruthy
@@ -2625,7 +2625,7 @@ const obj5 = conditionIsTruthy
       some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
       object: "with",
       lots: "of",
-      stuff
+      stuff,
     };
 
 ================================================================================
@@ -2666,7 +2666,7 @@ const obj3 = conditionIsTruthy
           some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
           object: "with",
           lots: "of",
-          stuff
+          stuff,
       }
     : shortThing;
 
@@ -2676,7 +2676,7 @@ const obj4 = conditionIsTruthy
           some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
           object: "with",
           lots: "of",
-          stuff
+          stuff,
       };
 
 const obj5 = conditionIsTruthy
@@ -2685,7 +2685,7 @@ const obj5 = conditionIsTruthy
           some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
           object: "with",
           lots: "of",
-          stuff
+          stuff,
       };
 
 ================================================================================
@@ -2726,7 +2726,7 @@ const obj3 = conditionIsTruthy
 			some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
 			object: "with",
 			lots: "of",
-			stuff
+			stuff,
 	  }
 	: shortThing;
 
@@ -2736,7 +2736,7 @@ const obj4 = conditionIsTruthy
 			some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
 			object: "with",
 			lots: "of",
-			stuff
+			stuff,
 	  };
 
 const obj5 = conditionIsTruthy
@@ -2745,7 +2745,7 @@ const obj5 = conditionIsTruthy
 			some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
 			object: "with",
 			lots: "of",
-			stuff
+			stuff,
 	  };
 
 ================================================================================
@@ -2787,7 +2787,7 @@ const obj3 = conditionIsTruthy
 			some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
 			object: "with",
 			lots: "of",
-			stuff
+			stuff,
 	  }
 	: shortThing;
 
@@ -2797,7 +2797,7 @@ const obj4 = conditionIsTruthy
 			some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
 			object: "with",
 			lots: "of",
-			stuff
+			stuff,
 	  };
 
 const obj5 = conditionIsTruthy
@@ -2806,7 +2806,7 @@ const obj5 = conditionIsTruthy
 			some: "eeeeeeeeeeeeven looooooooooooooooooooooooooooooonger",
 			object: "with",
 			lots: "of",
-			stuff
+			stuff,
 	  };
 
 ================================================================================
diff --git a/tests/test_declarations/__snapshots__/jsfmt.spec.js.snap b/tests/test_declarations/__snapshots__/jsfmt.spec.js.snap
index 2c99cc497..5fc1e5621 100644
--- a/tests/test_declarations/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/test_declarations/__snapshots__/jsfmt.spec.js.snap
@@ -559,7 +559,7 @@ describe.each([1, 2, 3])("test", a => {
 test.only.each([
   [1, 1, 2],
   [1, 2, 3],
-  [2, 1, 3]
+  [2, 1, 3],
 ])(".add(%i, %i)", (a, b, expected) => {
   expect(a + b).toBe(expected);
 });
@@ -567,7 +567,7 @@ test.only.each([
 test.each([
   { a: "1", b: 1 },
   { a: "2", b: 2 },
-  { a: "3", b: 3 }
+  { a: "3", b: 3 },
 ])("test", ({ a, b }) => {
   expect(Number(a)).toBe(b);
 });
@@ -704,7 +704,7 @@ describe.each([1, 2, 3])("test", (a) => {
 test.only.each([
   [1, 1, 2],
   [1, 2, 3],
-  [2, 1, 3]
+  [2, 1, 3],
 ])(".add(%i, %i)", (a, b, expected) => {
   expect(a + b).toBe(expected);
 });
@@ -712,7 +712,7 @@ test.only.each([
 test.each([
   { a: "1", b: 1 },
   { a: "2", b: 2 },
-  { a: "3", b: 3 }
+  { a: "3", b: 3 },
 ])("test", ({ a, b }) => {
   expect(Number(a)).toBe(b);
 });
diff --git a/tests/throw_expressions/__snapshots__/jsfmt.spec.js.snap b/tests/throw_expressions/__snapshots__/jsfmt.spec.js.snap
index ba99382a9..54f293928 100644
--- a/tests/throw_expressions/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/throw_expressions/__snapshots__/jsfmt.spec.js.snap
@@ -28,7 +28,7 @@ class Product {
 function save(filename = throw new TypeError("Argument required")) {}
 
 lint(ast, {
-  with: () => throw new Error("avoid using 'with' statements.")
+  with: () => throw new Error("avoid using 'with' statements."),
 });
 
 function getEncoder(encoding) {
diff --git a/tests/trailing_comma/__snapshots__/jsfmt.spec.js.snap b/tests/trailing_comma/__snapshots__/jsfmt.spec.js.snap
index 006fbe059..aca1daaa6 100644
--- a/tests/trailing_comma/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/trailing_comma/__snapshots__/jsfmt.spec.js.snap
@@ -4,6 +4,7 @@ exports[`dynamic-import.js 1`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 import(
@@ -41,7 +42,6 @@ exports[`dynamic-import.js 3`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 import(
@@ -60,6 +60,7 @@ exports[`es5.js 1`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 function send_single_email(
@@ -153,7 +154,6 @@ exports[`es5.js 3`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 function send_single_email(
@@ -200,6 +200,7 @@ exports[`function-calls.js 1`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 const a = (param1, param2, param3) => {}
@@ -305,7 +306,6 @@ exports[`function-calls.js 3`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 const a = (param1, param2, param3) => {}
@@ -358,6 +358,7 @@ exports[`jsx.js 1`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 <div
@@ -411,7 +412,6 @@ exports[`jsx.js 3`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 <div
@@ -438,6 +438,7 @@ exports[`object.js 1`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 const a = {
@@ -547,7 +548,6 @@ exports[`object.js 3`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 const a = {
@@ -602,6 +602,7 @@ exports[`trailing_whitespace.js 1`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 let example = [
@@ -799,7 +800,6 @@ exports[`trailing_whitespace.js 3`] = `
 ====================================options=====================================
 parsers: ["flow", "typescript"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 let example = [
diff --git a/tests/trailing_comma/jsfmt.spec.js b/tests/trailing_comma/jsfmt.spec.js
index 705b89d8b..86a647dc4 100644
--- a/tests/trailing_comma/jsfmt.spec.js
+++ b/tests/trailing_comma/jsfmt.spec.js
@@ -1,3 +1,3 @@
-run_spec(__dirname, ["flow", "typescript"]);
+run_spec(__dirname, ["flow", "typescript"], { trailingComma: "none" });
 run_spec(__dirname, ["flow", "typescript"], { trailingComma: "all" });
-run_spec(__dirname, ["flow", "typescript"], { trailingComma: "es5" });
+run_spec(__dirname, ["flow", "typescript"]);
diff --git a/tests/typescript/compiler/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/compiler/__snapshots__/jsfmt.spec.js.snap
index 0a4115065..c42257389 100644
--- a/tests/typescript/compiler/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/compiler/__snapshots__/jsfmt.spec.js.snap
@@ -175,7 +175,7 @@ var p_cast = <Point>{
   },
   mult: function(p) {
     return p;
-  }
+  },
 };
 
 ================================================================================
@@ -551,7 +551,7 @@ namespace global {}
 function foo(global: number) {}
 
 let obj = {
-  global: "123"
+  global: "123",
 };
 
 ================================================================================
diff --git a/tests/typescript/conformance/classes/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/conformance/classes/__snapshots__/jsfmt.spec.js.snap
index 83791f5ca..f5de635ad 100644
--- a/tests/typescript/conformance/classes/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/conformance/classes/__snapshots__/jsfmt.spec.js.snap
@@ -39,7 +39,7 @@ var z = class C4 {
 var x = class C {};
 
 var y = {
-  foo: class C2 {}
+  foo: class C2 {},
 };
 
 var z = class C4 {};
diff --git a/tests/typescript/conformance/internalModules/importDeclarations/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/conformance/internalModules/importDeclarations/__snapshots__/jsfmt.spec.js.snap
index 9f1f3f6d1..01368761b 100644
--- a/tests/typescript/conformance/internalModules/importDeclarations/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/conformance/internalModules/importDeclarations/__snapshots__/jsfmt.spec.js.snap
@@ -355,7 +355,7 @@ import c = C;
 
 enum E {
   Red,
-  Blue
+  Blue,
 }
 
 import e = E;
diff --git a/tests/typescript/conformance/types/constKeyword/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/conformance/types/constKeyword/__snapshots__/jsfmt.spec.js.snap
index b5fdb9f51..239babeeb 100644
--- a/tests/typescript/conformance/types/constKeyword/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/conformance/types/constKeyword/__snapshots__/jsfmt.spec.js.snap
@@ -12,7 +12,7 @@ const enum E { A, B, C }
 const enum E {
   A,
   B,
-  C
+  C,
 }
 
 ================================================================================
diff --git a/tests/typescript/conformance/types/enumDeclaration/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/conformance/types/enumDeclaration/__snapshots__/jsfmt.spec.js.snap
index f54de037b..5ba65c3f4 100644
--- a/tests/typescript/conformance/types/enumDeclaration/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/conformance/types/enumDeclaration/__snapshots__/jsfmt.spec.js.snap
@@ -12,7 +12,7 @@ enum E { A, B, C }
 enum E {
   A,
   B,
-  C
+  C,
 }
 
 ================================================================================
diff --git a/tests/typescript/conformance/types/indexedAccesType/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/conformance/types/indexedAccesType/__snapshots__/jsfmt.spec.js.snap
index c60f91e5e..cacb5b9cf 100644
--- a/tests/typescript/conformance/types/indexedAccesType/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/conformance/types/indexedAccesType/__snapshots__/jsfmt.spec.js.snap
@@ -12,7 +12,7 @@ const a: Foo['bar'] = {
 
 =====================================output=====================================
 const a: Foo["bar"] = {
-  baz: "yawp"
+  baz: "yawp",
 };
 
 ================================================================================
diff --git a/tests/typescript/webhost/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/webhost/__snapshots__/jsfmt.spec.js.snap
index 094a85853..ca6748573 100644
--- a/tests/typescript/webhost/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript/webhost/__snapshots__/jsfmt.spec.js.snap
@@ -200,7 +200,7 @@ namespace TypeScript.WebTsc {
       exit(exitCode?: number): void {
         WScript.Quit(exitCode);
       },
-      useCaseSensitiveFileNames: false
+      useCaseSensitiveFileNames: false,
     };
   }
 
diff --git a/tests/typescript_as/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_as/__snapshots__/jsfmt.spec.js.snap
index 0dbd537e4..a90a79d45 100644
--- a/tests/typescript_as/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_as/__snapshots__/jsfmt.spec.js.snap
@@ -64,7 +64,7 @@ async function g1() {
 () => ({} as X);
 const state = JSON.stringify({
   next: window.location.href,
-  nonce
+  nonce,
 } as State);
 
 (foo.bar as Baz) = [bar];
diff --git a/tests/typescript_cast/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_cast/__snapshots__/jsfmt.spec.js.snap
index 3e8e28a16..3ee3ac2f2 100644
--- a/tests/typescript_cast/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_cast/__snapshots__/jsfmt.spec.js.snap
@@ -139,7 +139,7 @@ function y() {
   );
 
   const testObjLiteral = <Immutable.Map<string, any>>{
-    property1: "myPropertyVal"
+    property1: "myPropertyVal",
   };
 
   const testObjLiteral2 = <
@@ -159,7 +159,7 @@ function y() {
   const testArrayLiteral = <Immutable.Map<string, any>>[
     "first",
     "second",
-    "third"
+    "third",
   ];
 
   const testArrayLiteral2 = <
@@ -226,7 +226,7 @@ function x() {
   ];
 
   const testObjLiteral = <PermissionsChecker<any> | undefined>{
-    prop1: "myPropVal"
+    prop1: "myPropVal",
   };
 
   const testObjLiteral2 = <
@@ -243,7 +243,7 @@ function x() {
   const testArrayLiteral = <PermissionsChecker<any> | undefined>[
     "first",
     "second",
-    "third"
+    "third",
   ];
 
   const testArrayLiteral2 = <
@@ -299,19 +299,19 @@ postMessages(
 =====================================output=====================================
 postMessage(<IActionMessage>{
   context: item.context,
-  topic: item.topic
+  topic: item.topic,
 });
 
 window.postMessage({
   context: item.context,
-  topic: item.topic
+  topic: item.topic,
 } as IActionMessage);
 
 postMessages(<IActionMessage[]>[
   {
     context: item.context,
-    topic: item.topic
-  }
+    topic: item.topic,
+  },
 ]);
 
 ================================================================================
diff --git a/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap
index 48f6cd136..74e2783a8 100644
--- a/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_comments/__snapshots__/jsfmt.spec.js.snap
@@ -157,7 +157,7 @@ export type WrappedFormUtils = {
 =====================================output=====================================
 function x({
   x,
-  y
+  y,
 }: {
   // Hello world.
   x: string;
diff --git a/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap
index 79e152c1e..3288ceaff 100644
--- a/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_decorators/__snapshots__/jsfmt.spec.js.snap
@@ -139,7 +139,7 @@ export class TestTextFileService {
 export class TabCompletionController {}
 
 @Component({
-  selector: "angular-component"
+  selector: "angular-component",
 })
 class AngularComponent {
   @Input() myInput: string;
@@ -375,7 +375,7 @@ class Class3 {
     @d2(foo) private y: number,
     @d3("foo") private z: number,
     @d4({
-      x: string
+      x: string,
     })
     private a: string
   ) {}
diff --git a/tests/typescript_enum/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_enum/__snapshots__/jsfmt.spec.js.snap
index 99d52e6f5..4ac4b06f6 100644
--- a/tests/typescript_enum/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_enum/__snapshots__/jsfmt.spec.js.snap
@@ -36,7 +36,7 @@ enum Direction {
   Up = 1,
   Down,
   Left,
-  Right
+  Right,
 }
 
 enum FileAccess {
@@ -46,14 +46,14 @@ enum FileAccess {
   Write = 1 << 2,
   ReadWrite = Read | Write,
   // computed member
-  G = "123".length
+  G = "123".length,
 }
 
 enum Empty {}
 
 const enum Enum {
   A = 1,
-  B = A * 2
+  B = A * 2,
 }
 
 ================================================================================
diff --git a/tests/typescript_generic/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_generic/__snapshots__/jsfmt.spec.js.snap
index 57f30fe88..b52f50db9 100644
--- a/tests/typescript_generic/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_generic/__snapshots__/jsfmt.spec.js.snap
@@ -146,7 +146,7 @@ export default {
 export default {
   load<K, T>(k: K, t: T) {
     return { k, t };
-  }
+  },
 };
 
 ================================================================================
diff --git a/tests/typescript_import_type/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_import_type/__snapshots__/jsfmt.spec.js.snap
index f15f5b12f..38611e378 100644
--- a/tests/typescript_import_type/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_import_type/__snapshots__/jsfmt.spec.js.snap
@@ -30,7 +30,7 @@ export const x: import("./foo") = { x: 0, y: 0 };
 export let y: import("./foo2").Bar.I = { a: "", b: 0 };
 
 export let shim: typeof import("./foo2") = {
-  Bar: Bar2
+  Bar: Bar2,
 };
 
 export interface Foo {
@@ -73,7 +73,7 @@ export const x: import('./foo') = { x: 0, y: 0 };
 export let y: import('./foo2').Bar.I = { a: '', b: 0 };
 
 export let shim: typeof import('./foo2') = {
-  Bar: Bar2
+  Bar: Bar2,
 };
 
 export interface Foo {
diff --git a/tests/typescript_keywords/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_keywords/__snapshots__/jsfmt.spec.js.snap
index 9587a45b1..8da1d0311 100644
--- a/tests/typescript_keywords/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_keywords/__snapshots__/jsfmt.spec.js.snap
@@ -66,7 +66,7 @@ module Y3 {
 module Y4 {
   public enum Color {
     Blue,
-    Red
+    Red,
   }
 }
 
@@ -81,7 +81,7 @@ module YY3 {
 module YY4 {
   private enum Color {
     Blue,
-    Red
+    Red,
   }
 }
 
@@ -96,7 +96,7 @@ module YYY3 {
 module YYY4 {
   static enum Color {
     Blue,
-    Red
+    Red,
   }
 }
 
diff --git a/tests/typescript_non_null/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_non_null/__snapshots__/jsfmt.spec.js.snap
index ba39f4800..b0fc7499a 100644
--- a/tests/typescript_non_null/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_non_null/__snapshots__/jsfmt.spec.js.snap
@@ -17,12 +17,12 @@ foo!.bar().baz().what();
 =====================================output=====================================
 const {
   somePropThatHasAReallyLongName,
-  anotherPropThatHasALongName
+  anotherPropThatHasALongName,
 } = this.props.imReallySureAboutThis!;
 
 const {
   somePropThatHasAReallyLongName2,
-  anotherPropThatHasALongName2
+  anotherPropThatHasALongName2,
 } = this.props.imReallySureAboutThis!.anotherObject;
 
 this.foo
diff --git a/tests/typescript_tuple/__snapshots__/jsfmt.spec.js.snap b/tests/typescript_tuple/__snapshots__/jsfmt.spec.js.snap
index 4a7cbef55..87135b961 100644
--- a/tests/typescript_tuple/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/typescript_tuple/__snapshots__/jsfmt.spec.js.snap
@@ -4,6 +4,7 @@ exports[`trailing-comma.ts 1`] = `
 ====================================options=====================================
 parsers: ["typescript"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 export interface ShopQueryResult {
@@ -44,7 +45,6 @@ exports[`trailing-comma.ts 2`] = `
 ====================================options=====================================
 parsers: ["typescript"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 export interface ShopQueryResult {
@@ -126,6 +126,7 @@ exports[`tuple.ts 1`] = `
 ====================================options=====================================
 parsers: ["typescript"]
 printWidth: 80
+trailingComma: "none"
                                                                                 | printWidth
 =====================================input======================================
 
@@ -155,7 +156,6 @@ exports[`tuple.ts 2`] = `
 ====================================options=====================================
 parsers: ["typescript"]
 printWidth: 80
-trailingComma: "es5"
                                                                                 | printWidth
 =====================================input======================================
 
diff --git a/tests/typescript_tuple/jsfmt.spec.js b/tests/typescript_tuple/jsfmt.spec.js
index 9ae5dd616..31c3b0a4f 100644
--- a/tests/typescript_tuple/jsfmt.spec.js
+++ b/tests/typescript_tuple/jsfmt.spec.js
@@ -1,3 +1,3 @@
+run_spec(__dirname, ["typescript"], { trailingComma: "none" });
 run_spec(__dirname, ["typescript"]);
-run_spec(__dirname, ["typescript"], { trailingComma: "es5" });
 run_spec(__dirname, ["typescript"], { trailingComma: "all" });
diff --git a/tests/unary/__snapshots__/jsfmt.spec.js.snap b/tests/unary/__snapshots__/jsfmt.spec.js.snap
index a969c8c8a..9307d2152 100644
--- a/tests/unary/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/unary/__snapshots__/jsfmt.spec.js.snap
@@ -14,7 +14,7 @@ state = {
 =====================================output=====================================
 state = {
   // students
-  hoverColumn: -1
+  hoverColumn: -1,
 };
 
 ================================================================================
diff --git a/tests/union_intersection/__snapshots__/jsfmt.spec.js.snap b/tests/union_intersection/__snapshots__/jsfmt.spec.js.snap
index 5d2a29899..5cd28ed52 100644
--- a/tests/union_intersection/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/union_intersection/__snapshots__/jsfmt.spec.js.snap
@@ -105,9 +105,9 @@ type Comment =
       end: number,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
-      start: number
+      start: number,
     }
   | {
       type: "CommentBlock",
@@ -116,23 +116,23 @@ type Comment =
       end: number,
       loc: {
         end: { column: number, line: number },
-        start: { column: number, line: number }
+        start: { column: number, line: number },
       },
-      start: number
+      start: number,
     };
 
 type Props = {
   onChange: (
     | {
-        name: string
+        name: string,
       }
     | {
-        title: string
+        title: string,
       }
     | {
-        year: year
+        year: year,
       }
-  ) => void
+  ) => void,
 };
 
 declare class FormData {
@@ -141,7 +141,7 @@ declare class FormData {
       | string
       | {
           filepath?: string,
-          filename?: string
+          filename?: string,
         }
   ): void;
 }
diff --git a/tests/variable_declarator/__snapshots__/jsfmt.spec.js.snap b/tests/variable_declarator/__snapshots__/jsfmt.spec.js.snap
index 280225a26..69970ff96 100644
--- a/tests/variable_declarator/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/variable_declarator/__snapshots__/jsfmt.spec.js.snap
@@ -48,7 +48,7 @@ for (var i = 0, len = arr.length; i < len; i++) {}
 
 var templateTagsMapping = {
     "%{itemIndex}": "index",
-    "%{itemContentMetaTextViews}": "views"
+    "%{itemContentMetaTextViews}": "views",
   },
   separator = '<span class="item__content__meta__separator">•</span>',
   templateTagsList = $.map(templateTagsMapping, function(value, key) {
diff --git a/tests_integration/__tests__/__snapshots__/config-resolution.js.snap b/tests_integration/__tests__/__snapshots__/config-resolution.js.snap
index 65dc08f3f..47180fffc 100644
--- a/tests_integration/__tests__/__snapshots__/config-resolution.js.snap
+++ b/tests_integration/__tests__/__snapshots__/config-resolution.js.snap
@@ -45,7 +45,7 @@ function js() {
 module.exports = {
         endOfLine:
                 \\"lf\\",
-        tabWidth: 8
+        tabWidth: 8,
 };
 function noConfigJs() {
   console.log(
@@ -144,7 +144,7 @@ function js() {
 
 module.exports = {
         endOfLine: \\"lf\\",
-        tabWidth: 8
+        tabWidth: 8,
 };
 function noConfigJs() {
   console.log(\\"no-config/file.js should have no semicolons\\")
diff --git a/tests_integration/__tests__/__snapshots__/cursor-offset.js.snap b/tests_integration/__tests__/__snapshots__/cursor-offset.js.snap
index 8a305b514..ec16c601c 100644
--- a/tests_integration/__tests__/__snapshots__/cursor-offset.js.snap
+++ b/tests_integration/__tests__/__snapshots__/cursor-offset.js.snap
@@ -12,7 +12,7 @@ exports[`cursorOffset should not be affected by full-width character (stdout) 1`
   \\"中文\\",
   \\"中文\\",
   \\"中文\\",
-  \\"中文\\"
+  \\"中文\\",
 ];
 "
 `;
diff --git a/tests_integration/__tests__/__snapshots__/early-exit.js.snap b/tests_integration/__tests__/__snapshots__/early-exit.js.snap
index 95af8c1c2..3749692c3 100644
--- a/tests_integration/__tests__/__snapshots__/early-exit.js.snap
+++ b/tests_integration/__tests__/__snapshots__/early-exit.js.snap
@@ -87,9 +87,9 @@ Format options:
                            Defaults to false.
   --tab-width <int>        Number of spaces per indentation level.
                            Defaults to 2.
-  --trailing-comma <none|es5|all>
+  --trailing-comma <es5|none|all>
                            Print trailing commas wherever possible when multi-line.
-                           Defaults to none.
+                           Defaults to es5.
   --use-tabs               Indent with tabs instead of spaces.
                            Defaults to false.
   --vue-indent-script-and-style
@@ -243,9 +243,9 @@ Format options:
                            Defaults to false.
   --tab-width <int>        Number of spaces per indentation level.
                            Defaults to 2.
-  --trailing-comma <none|es5|all>
+  --trailing-comma <es5|none|all>
                            Print trailing commas wherever possible when multi-line.
-                           Defaults to none.
+                           Defaults to es5.
   --use-tabs               Indent with tabs instead of spaces.
                            Defaults to false.
   --vue-indent-script-and-style
diff --git a/tests_integration/__tests__/__snapshots__/help-options.js.snap b/tests_integration/__tests__/__snapshots__/help-options.js.snap
index 4e4d216b1..fe588d066 100644
--- a/tests_integration/__tests__/__snapshots__/help-options.js.snap
+++ b/tests_integration/__tests__/__snapshots__/help-options.js.snap
@@ -559,17 +559,17 @@ exports[`show detailed usage with --help tab-width (write) 1`] = `Array []`;
 exports[`show detailed usage with --help trailing-comma (stderr) 1`] = `""`;
 
 exports[`show detailed usage with --help trailing-comma (stdout) 1`] = `
-"--trailing-comma <none|es5|all>
+"--trailing-comma <es5|none|all>
 
   Print trailing commas wherever possible when multi-line.
 
 Valid options:
 
-  none   No trailing commas.
   es5    Trailing commas where valid in ES5 (objects, arrays, etc.)
+  none   No trailing commas.
   all    Trailing commas wherever possible (including function arguments).
 
-Default: none
+Default: es5
 "
 `;
 
diff --git a/tests_integration/__tests__/__snapshots__/schema.js.snap b/tests_integration/__tests__/__snapshots__/schema.js.snap
index 02cebc5fd..0b3bcd659 100644
--- a/tests_integration/__tests__/__snapshots__/schema.js.snap
+++ b/tests_integration/__tests__/__snapshots__/schema.js.snap
@@ -334,18 +334,18 @@ in order for it to be formatted.",
           "default": "none",
           "description": "Print trailing commas wherever possible when multi-line.",
           "oneOf": Array [
-            Object {
-              "description": "No trailing commas.",
-              "enum": Array [
-                "none",
-              ],
-            },
             Object {
               "description": "Trailing commas where valid in ES5 (objects, arrays, etc.)",
               "enum": Array [
                 "es5",
               ],
             },
+            Object {
+              "description": "No trailing commas.",
+              "enum": Array [
+                "none",
+              ],
+            },
             Object {
               "description": "Trailing commas wherever possible (including function arguments).",
               "enum": Array [
diff --git a/tests_integration/__tests__/__snapshots__/support-info.js.snap b/tests_integration/__tests__/__snapshots__/support-info.js.snap
index 67656b4ec..e1a9f35f6 100644
--- a/tests_integration/__tests__/__snapshots__/support-info.js.snap
+++ b/tests_integration/__tests__/__snapshots__/support-info.js.snap
@@ -44,8 +44,8 @@ exports[`API getSupportInfo() with version 0.0.0 -> 1.0.0 1`] = `
 @@ -43,17 +59,15 @@
       \\"trailingComma\\": Object {
         \\"choices\\": Array [
-          \\"none\\",
           \\"es5\\",
+          \\"none\\",
           \\"all\\",
 -         true,
 -         false,
@@ -108,8 +108,8 @@ Object {
     },
     "trailingComma": Object {
       "choices": Array [
-        "none",
         "es5",
+        "none",
         "all",
         true,
         false,
@@ -1385,11 +1385,11 @@ exports[`CLI --support-info (stdout) 1`] = `
     {
       \\"category\\": \\"JavaScript\\",
       \\"choices\\": [
-        { \\"description\\": \\"No trailing commas.\\", \\"value\\": \\"none\\" },
         {
           \\"description\\": \\"Trailing commas where valid in ES5 (objects, arrays, etc.)\\",
           \\"value\\": \\"es5\\"
         },
+        { \\"description\\": \\"No trailing commas.\\", \\"value\\": \\"none\\" },
         {
           \\"description\\": \\"Trailing commas wherever possible (including function arguments).\\",
           \\"value\\": \\"all\\"
diff --git a/tests_integration/__tests__/__snapshots__/with-config-precedence.js.snap b/tests_integration/__tests__/__snapshots__/with-config-precedence.js.snap
index e7a2371cf..db14ab935 100644
--- a/tests_integration/__tests__/__snapshots__/with-config-precedence.js.snap
+++ b/tests_integration/__tests__/__snapshots__/with-config-precedence.js.snap
@@ -55,7 +55,7 @@ exports[`CLI overrides gets ignored when config exists with --config-precedence
 
 module.exports = {
         endOfLine: \\"lf\\",
-        tabWidth: 8
+        tabWidth: 8,
 };
 "
 `;
@@ -72,7 +72,7 @@ exports[`CLI overrides take lower precedence with --config-precedence file-overr
 
 module.exports = {
         endOfLine: \\"lf\\",
-        tabWidth: 8
+        tabWidth: 8,
 };
 "
 `;
@@ -124,7 +124,7 @@ function js() {
 module.exports = {
         endOfLine:
                 \\"lf\\",
-        tabWidth: 8
+        tabWidth: 8,
 };
 function noConfigJs() {
   console.log(
@@ -216,7 +216,7 @@ function js() {
 module.exports = {
         endOfLine:
                 \\"lf\\",
-        tabWidth: 8
+        tabWidth: 8,
 };
 function noConfigJs() {
   console.log(

From 596f55e324c1dd144a182fddcda7066e198409a7 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 19 Nov 2019 04:22:24 +0800
Subject: [PATCH 11/13] Replace `trim{Left,Right}` with `trim{Start,End}`
 (#6994)

---
 src/language-graphql/printer-graphql.js   |  2 +-
 src/language-js/printer-estree.js         | 12 ++++++------
 src/language-markdown/pragma.js           |  3 ++-
 src/language-markdown/preprocess.js       |  4 ++--
 src/language-markdown/printer-markdown.js |  2 +-
 src/language-yaml/utils.js                |  4 ++--
 src/main/core.js                          |  4 ++--
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/language-graphql/printer-graphql.js b/src/language-graphql/printer-graphql.js
index 70f0df48a..8b7948804 100644
--- a/src/language-graphql/printer-graphql.js
+++ b/src/language-graphql/printer-graphql.js
@@ -653,7 +653,7 @@ function canAttachComment(node) {
 function printComment(commentPath) {
   const comment = commentPath.getValue();
   if (comment.kind === "Comment") {
-    return "#" + comment.value.trimRight();
+    return "#" + comment.value.trimEnd();
   }
 
   throw new Error("Not a comment: " + JSON.stringify(comment));
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index bc61c4a51..c6c48e660 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -241,7 +241,7 @@ function genericPrint(path, options, printPath, args) {
     const node = path.getValue();
     if (hasFlowShorthandAnnotationComment(node)) {
       parts.push(" /*");
-      parts.push(node.trailingComments[0].value.trimLeft());
+      parts.push(node.trailingComments[0].value.trimStart());
       parts.push("*/");
       node.trailingComments[0].printed = true;
     }
@@ -3560,7 +3560,7 @@ function printPathNoParens(path, options, print, args) {
           path.call(print, "node"),
           !n.node.comments || n.node.comments.length === 0
             ? []
-            : concat([" //", n.node.comments[0].value.trimRight()])
+            : concat([" //", n.node.comments[0].value.trimEnd()])
         )
       );
     case "NGChainedExpression":
@@ -6005,9 +6005,9 @@ function printComment(commentPath, options) {
       if (
         options.originalText.slice(options.locStart(comment)).startsWith("#!")
       ) {
-        return "#!" + comment.value.trimRight();
+        return "#!" + comment.value.trimEnd();
       }
-      return "//" + comment.value.trimRight();
+      return "//" + comment.value.trimEnd();
     default:
       throw new Error("Not a comment: " + JSON.stringify(comment));
   }
@@ -6031,8 +6031,8 @@ function printIndentableBlockComment(comment) {
       hardline,
       lines.map((line, index) =>
         index === 0
-          ? line.trimRight()
-          : " " + (index < lines.length - 1 ? line.trim() : line.trimLeft())
+          ? line.trimEnd()
+          : " " + (index < lines.length - 1 ? line.trim() : line.trimStart())
       )
     ),
     "*/"
diff --git a/src/language-markdown/pragma.js b/src/language-markdown/pragma.js
index 070fb50db..4ca546c0f 100644
--- a/src/language-markdown/pragma.js
+++ b/src/language-markdown/pragma.js
@@ -19,7 +19,8 @@ function startWithPragma(text) {
 
 module.exports = {
   startWithPragma,
-  hasPragma: text => startWithPragma(parseFrontMatter(text).content.trimLeft()),
+  hasPragma: text =>
+    startWithPragma(parseFrontMatter(text).content.trimStart()),
   insertPragma: text => {
     const extracted = parseFrontMatter(text);
     const pragma = `<!-- @${pragmas[0]} -->`;
diff --git a/src/language-markdown/preprocess.js b/src/language-markdown/preprocess.js
index 08caf1e91..edeaa09fd 100644
--- a/src/language-markdown/preprocess.js
+++ b/src/language-markdown/preprocess.js
@@ -120,10 +120,10 @@ function splitTextIntoSentences(ast, options) {
 
     if (parentNode.type === "paragraph") {
       if (index === 0) {
-        value = value.trimLeft();
+        value = value.trimStart();
       }
       if (index === parentNode.children.length - 1) {
-        value = value.trimRight();
+        value = value.trimEnd();
       }
     }
 
diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index d00487ed4..6ab4fb4cb 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -230,7 +230,7 @@ function genericPrint(path, options, print) {
       const value =
         parentNode.type === "root" &&
         privateUtil.getLast(parentNode.children) === node
-          ? node.value.trimRight()
+          ? node.value.trimEnd()
           : node.value;
       const isHtmlComment = /^<!--[\s\S]*-->$/.test(value);
       return concat(
diff --git a/src/language-yaml/utils.js b/src/language-yaml/utils.js
index 8990f05c2..7a562f0bd 100644
--- a/src/language-yaml/utils.js
+++ b/src/language-yaml/utils.js
@@ -198,8 +198,8 @@ function getFlowScalarLineContents(nodeType, content, options) {
         : index !== 0 && index !== lineContents.length - 1
         ? lineContent.trim()
         : index === 0
-        ? lineContent.trimRight()
-        : lineContent.trimLeft()
+        ? lineContent.trimEnd()
+        : lineContent.trimStart()
     );
 
   if (options.proseWrap === "preserve") {
diff --git a/src/main/core.js b/src/main/core.js
index 4d6e98a61..7c2cc6e63 100644
--- a/src/main/core.js
+++ b/src/main/core.js
@@ -60,7 +60,7 @@ function attachComments(text, ast, opts) {
     comments.attach(astComments, ast, text, opts);
   }
   ast.tokens = [];
-  opts.originalText = opts.parser === "yaml" ? text : text.trimRight();
+  opts.originalText = opts.parser === "yaml" ? text : text.trimEnd();
   return astComments;
 }
 
@@ -221,7 +221,7 @@ function formatRange(text, opts) {
 
   // Since the range contracts to avoid trailing whitespace,
   // we need to remove the newline that was inserted by the `format` call.
-  const rangeTrimmed = rangeResult.formatted.trimRight();
+  const rangeTrimmed = rangeResult.formatted.trimEnd();
   const rangeLeft = text.slice(0, rangeStart);
   const rangeRight = text.slice(rangeEnd);
 

From 320c5cca641afe1481853adc04527fedbfba60fe Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Tue, 19 Nov 2019 16:54:57 +0800
Subject: [PATCH 12/13] Update `jest` to v24 (#6954)

* Update `jest` to v24

* run test on linux and windows

* fix regexp for macOS

* fix color problem

* restore asserts

* update yarn.lock

* fix status assert
---
 package.json                                  |    2 +-
 .../__tests__/__snapshots__/load-toml.js.snap |    6 -
 tests_integration/__tests__/loglevel.js       |    9 +-
 yarn.lock                                     | 1549 +++++++----------
 4 files changed, 617 insertions(+), 949 deletions(-)

diff --git a/package.json b/package.json
index 12603ebaf..d7a289602 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "eslint-plugin-react": "7.16.0",
     "eslint-plugin-unicorn": "13.0.0",
     "execa": "3.2.0",
-    "jest": "23.3.0",
+    "jest": "24.9.0",
     "jest-junit": "9.0.0",
     "jest-snapshot-serializer-ansi": "1.0.0",
     "jest-snapshot-serializer-raw": "1.1.0",
diff --git a/tests_integration/__tests__/__snapshots__/load-toml.js.snap b/tests_integration/__tests__/__snapshots__/load-toml.js.snap
index 175f48849..8b0ab33d3 100644
--- a/tests_integration/__tests__/__snapshots__/load-toml.js.snap
+++ b/tests_integration/__tests__/__snapshots__/load-toml.js.snap
@@ -11,18 +11,12 @@ Object {
       8002,
     ],
     "server": "192.168.1.1",
-    Symbol(type): Symbol(table),
-    Symbol(declared): true,
   },
   "owner": Object {
     "dob": 1979-05-27T15:32:00.000Z,
     "name": "Tom Preston-Werner",
-    Symbol(type): Symbol(table),
-    Symbol(declared): true,
   },
   "title": "TOML Example",
-  Symbol(type): Symbol(table),
-  Symbol(declared): false,
 }
 `;
 
diff --git a/tests_integration/__tests__/loglevel.js b/tests_integration/__tests__/loglevel.js
index 03804e377..50e0e5850 100644
--- a/tests_integration/__tests__/loglevel.js
+++ b/tests_integration/__tests__/loglevel.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const runPrettier = require("../runPrettier");
+const stripAnsi = require("strip-ansi");
 
 test("do not show logs with --loglevel silent", () => {
   runPrettierWithLogLevel("silent", null);
@@ -38,13 +39,15 @@ function runPrettierWithLogLevel(logLevel, patterns) {
     "not-found.js"
   ]);
 
-  expect(result).not.toEqual(0);
+  expect(result.status).toEqual(2);
+
+  const stderr = stripAnsi(result.stderr);
 
   if (patterns) {
     patterns.forEach(pattern => {
-      expect(result.stderr).toMatch(pattern);
+      expect(stderr).toMatch(pattern);
     });
   } else {
-    expect(result.stderr).toMatch(/^\s*$/);
+    expect(stderr).toMatch(/^\s*$/);
   }
 }
diff --git a/yarn.lock b/yarn.lock
index b3ff0d44a..12c7f8fa6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22,13 +22,7 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/code-frame@^7.0.0-beta.35":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz#e0d002100805daab1461c0fcb32a07e304f3a4f4"
-  dependencies:
-    "@babel/highlight" "7.0.0-beta.46"
-
-"@babel/core@7.7.2":
+"@babel/core@7.7.2", "@babel/core@^7.1.0":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.2.tgz#ea5b99693bcfc058116f42fa1dd54da412b29d91"
   integrity sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==
@@ -48,7 +42,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.7.2":
+"@babel/generator@^7.4.0", "@babel/generator@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af"
   integrity sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==
@@ -227,15 +221,6 @@
     "@babel/traverse" "^7.7.0"
     "@babel/types" "^7.7.0"
 
-"@babel/highlight@7.0.0-beta.46":
-  version "7.0.0-beta.46"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.46.tgz#c553c51e65f572bdedd6eff66fc0bb563016645e"
-  integrity sha512-r4snW6Q8ICL3Y8hGzYJRvyG/+sc+kvkewXNedG9tQjoHmUFMwMSv/o45GWQUQswevGnWghiGkpRPivFfOuMsOA==
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
@@ -244,7 +229,7 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.7.3", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
+"@babel/parser@7.7.3", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
   version "7.7.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.3.tgz#5fad457c2529de476a248f75b0f090b3060af043"
   integrity sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==
@@ -315,7 +300,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-object-rest-spread@^7.2.0":
+"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
   dependencies:
@@ -634,7 +619,7 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/template@^7.7.0":
+"@babel/template@^7.4.0", "@babel/template@^7.7.0":
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.0.tgz#4fadc1b8e734d97f56de39c77de76f2562e597d0"
   integrity sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==
@@ -643,7 +628,7 @@
     "@babel/parser" "^7.7.0"
     "@babel/types" "^7.7.0"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09"
   integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==
@@ -658,7 +643,7 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.1", "@babel/types@^7.7.2":
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.1", "@babel/types@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.2.tgz#550b82e5571dcd174af576e23f0adba7ffc683f7"
   integrity sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==
@@ -667,6 +652,14 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
+  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
 "@glimmer/interfaces@^0.41.0":
   version "0.41.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.41.0.tgz#3f571a181025406f29faed9006d0a914afb577b1"
@@ -691,7 +684,7 @@
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.3.tgz#f060bf6eaafae4d56a7dac618980838b0696e2ab"
 
-"@jest/console@^24.9.0":
+"@jest/console@^24.7.1", "@jest/console@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
   integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
@@ -700,6 +693,50 @@
     chalk "^2.0.1"
     slash "^2.0.0"
 
+"@jest/core@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.9.0.tgz#2ceccd0b93181f9c4850e74f2a9ad43d351369c4"
+  integrity sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==
+  dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/reporters" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    graceful-fs "^4.1.15"
+    jest-changed-files "^24.9.0"
+    jest-config "^24.9.0"
+    jest-haste-map "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.9.0"
+    jest-resolve-dependencies "^24.9.0"
+    jest-runner "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-snapshot "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
+    jest-watcher "^24.9.0"
+    micromatch "^3.1.10"
+    p-each-series "^1.0.0"
+    realpath-native "^1.1.0"
+    rimraf "^2.5.4"
+    slash "^2.0.0"
+    strip-ansi "^5.0.0"
+
+"@jest/environment@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.9.0.tgz#21e3afa2d65c0586cbd6cbefe208bafade44ab18"
+  integrity sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==
+  dependencies:
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    jest-mock "^24.9.0"
+
 "@jest/fake-timers@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93"
@@ -709,7 +746,34 @@
     jest-message-util "^24.9.0"
     jest-mock "^24.9.0"
 
-"@jest/source-map@^24.9.0":
+"@jest/reporters@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.9.0.tgz#86660eff8e2b9661d042a8e98a028b8d631a5b43"
+  integrity sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==
+  dependencies:
+    "@jest/environment" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    chalk "^2.0.1"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    istanbul-lib-coverage "^2.0.2"
+    istanbul-lib-instrument "^3.0.1"
+    istanbul-lib-report "^2.0.4"
+    istanbul-lib-source-maps "^3.0.1"
+    istanbul-reports "^2.2.6"
+    jest-haste-map "^24.9.0"
+    jest-resolve "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-util "^24.9.0"
+    jest-worker "^24.6.0"
+    node-notifier "^5.4.2"
+    slash "^2.0.0"
+    source-map "^0.6.0"
+    string-length "^2.0.0"
+
+"@jest/source-map@^24.3.0", "@jest/source-map@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
   integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
@@ -727,6 +791,38 @@
     "@jest/types" "^24.9.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
 
+"@jest/test-sequencer@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz#f8f334f35b625a4f2f355f2fe7e6036dad2e6b31"
+  integrity sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==
+  dependencies:
+    "@jest/test-result" "^24.9.0"
+    jest-haste-map "^24.9.0"
+    jest-runner "^24.9.0"
+    jest-runtime "^24.9.0"
+
+"@jest/transform@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.9.0.tgz#4ae2768b296553fadab09e9ec119543c90b16c56"
+  integrity sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^24.9.0"
+    babel-plugin-istanbul "^5.1.0"
+    chalk "^2.0.1"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.1.15"
+    jest-haste-map "^24.9.0"
+    jest-regex-util "^24.9.0"
+    jest-util "^24.9.0"
+    micromatch "^3.1.10"
+    pirates "^4.0.1"
+    realpath-native "^1.1.0"
+    slash "^2.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "2.4.1"
+
 "@jest/types@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
@@ -751,6 +847,39 @@
     magic-string "^0.25.2"
     rollup-pluginutils "^2.6.0"
 
+"@types/babel__core@^7.1.0":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
+  integrity sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
+"@types/babel__generator@*":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.0.tgz#f1ec1c104d1bb463556ecb724018ab788d0c172a"
+  integrity sha512-c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@types/babel__template@*":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
+  integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.7.tgz#2496e9ff56196cc1429c72034e07eab6121b6f3f"
+  integrity sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
 "@types/estree@*", "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
@@ -1119,12 +1248,6 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-append-transform@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  dependencies:
-    default-require-extensions "^2.0.0"
-
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -1147,17 +1270,11 @@ argv@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/argv/-/argv-0.0.2.tgz#ecbd16f8949b157183711b1bda334f37840185ab"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  dependencies:
-    arr-flatten "^1.0.1"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
 
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
@@ -1190,18 +1307,10 @@ array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
 
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
-arrify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-
 asn1.js@^4.0.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
@@ -1243,12 +1352,6 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@^2.1.4:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
-  dependencies:
-    lodash "^4.14.0"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1265,64 +1368,18 @@ aws4@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
 
-babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+babel-jest@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.9.0.tgz#3fc327cb8467b89d14d7bc70e315104a783ccd54"
+  integrity sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==
   dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-core@^6.0.0, babel-core@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-generator "^6.26.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    convert-source-map "^1.5.0"
-    debug "^2.6.8"
-    json5 "^0.5.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    path-is-absolute "^1.0.1"
-    private "^0.1.7"
-    slash "^1.0.0"
-    source-map "^0.5.6"
-
-babel-generator@^6.18.0, babel-generator@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.6"
-    trim-right "^1.0.1"
-
-babel-helpers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-jest@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.4.2.tgz#f276de67798a5d68f2d6e87ff518c2f6e1609877"
-  dependencies:
-    babel-plugin-istanbul "^4.1.6"
-    babel-preset-jest "^23.2.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/babel__core" "^7.1.0"
+    babel-plugin-istanbul "^5.1.0"
+    babel-preset-jest "^24.9.0"
+    chalk "^2.4.2"
+    slash "^2.0.0"
 
 babel-loader@8.0.6:
   version "8.0.6"
@@ -1334,12 +1391,6 @@ babel-loader@8.0.6:
     mkdirp "^0.5.1"
     pify "^4.0.1"
 
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-dynamic-import-node@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
@@ -1347,85 +1398,30 @@ babel-plugin-dynamic-import-node@^2.3.0:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-istanbul@^4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+babel-plugin-istanbul@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854"
+  integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==
   dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
-    find-up "^2.1.0"
-    istanbul-lib-instrument "^1.10.1"
-    test-exclude "^4.2.1"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    find-up "^3.0.0"
+    istanbul-lib-instrument "^3.3.0"
+    test-exclude "^5.2.3"
 
-babel-plugin-jest-hoist@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
-
-babel-plugin-syntax-object-rest-spread@^6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
-
-babel-preset-jest@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
+babel-plugin-jest-hoist@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz#4f837091eb407e01447c8843cbec546d0002d756"
+  integrity sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==
   dependencies:
-    babel-plugin-jest-hoist "^23.2.0"
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
+    "@types/babel__traverse" "^7.0.6"
 
-babel-register@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+babel-preset-jest@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz#192b521e2217fb1d1f67cf73f70c336650ad3cdc"
+  integrity sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==
   dependencies:
-    babel-core "^6.26.0"
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.17.4"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.15"
-
-babel-runtime@^6.22.0, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
-babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    lodash "^4.17.4"
-
-babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    debug "^2.6.8"
-    globals "^9.18.0"
-    invariant "^2.2.2"
-    lodash "^4.17.4"
-
-babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  dependencies:
-    babel-runtime "^6.26.0"
-    esutils "^2.0.2"
-    lodash "^4.17.4"
-    to-fast-properties "^1.0.3"
-
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    babel-plugin-jest-hoist "^24.9.0"
 
 bail@^1.0.0:
   version "1.0.2"
@@ -1489,14 +1485,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
 braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -1713,7 +1701,7 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
-camelcase@5.3.1, camelcase@^5.3.1:
+camelcase@5.3.1, camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -1722,21 +1710,17 @@ camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
-camelcase@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-
 caniuse-lite@^1.0.30001004:
   version "1.0.30001008"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001008.tgz#b8841b1df78a9f5ed9702537ef592f1f8772c0d9"
   integrity sha512-b8DJyb+VVXZGRgJUa30cbk8gKHZ3LOZTBLaUEEVr2P4xpmFigOCc62CO4uzquW641Ouq1Rm9N+rWLWdSYDaDIw==
 
-capture-exit@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
-  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
   dependencies:
-    rsvp "^3.3.3"
+    rsvp "^4.8.4"
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -1809,10 +1793,6 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-ci-info@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
-
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -1862,17 +1842,14 @@ cli-width@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
 
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
   dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
-clorox@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clorox/-/clorox-1.0.3.tgz#6fa63653f280c33d69f548fb14d239ddcfa1590d"
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
 
 co@^4.6.0:
   version "4.6.0"
@@ -1928,10 +1905,6 @@ commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
-compare-versions@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.3.0.tgz#af93ea705a96943f622ab309578b9b90586f39c3"
-
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -1968,7 +1941,7 @@ contains-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
 
-convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -2005,10 +1978,6 @@ core-js-pure@3.1.3:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.3.tgz#4c90752d5b9471f641514f3728f51c1e0783d0b5"
   integrity sha512-k3JWTrcQBKqjkjI0bkfXS0lbpWPxYuHWfMMjC1VDmzU4Q58IwSbuXSo99YO/hUHlw/EB4AlfA2PVxOGkrIq6dA==
 
-core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
-
 core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -2057,15 +2026,7 @@ cross-env@6.0.3:
   dependencies:
     cross-spawn "^7.0.0"
 
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^6.0.5:
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -2175,9 +2136,10 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
@@ -2196,12 +2158,6 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
-default-require-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  dependencies:
-    strip-bom "^3.0.0"
-
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -2243,12 +2199,6 @@ des.js@^1.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-detect-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  dependencies:
-    repeating "^2.0.0"
-
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
@@ -2267,11 +2217,6 @@ diff@4.0.1:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
   integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
 
-diff@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
 diffie-hellman@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
@@ -2711,11 +2656,10 @@ evp_bytestokey@^1.0.0:
   dependencies:
     create-hash "^1.1.1"
 
-exec-sh@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.0.tgz#14f75de3f20d286ef933099b2ce50a90359cef10"
-  dependencies:
-    merge "^1.1.3"
+exec-sh@^0.3.2:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
 
 execa@3.2.0:
   version "3.2.0"
@@ -2733,12 +2677,13 @@ execa@3.2.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
   dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
     is-stream "^1.1.0"
     npm-run-path "^2.0.0"
     p-finally "^1.0.0"
@@ -2749,12 +2694,6 @@ exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -2767,23 +2706,6 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  dependencies:
-    fill-range "^2.1.0"
-
-expect@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-23.4.0.tgz#6da4ecc99c1471253e7288338983ad1ebadb60c3"
-  dependencies:
-    ansi-styles "^3.2.0"
-    jest-diff "^23.2.0"
-    jest-get-type "^22.1.0"
-    jest-matcher-utils "^23.2.0"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
-
 expect@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
@@ -2823,12 +2745,6 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  dependencies:
-    is-extglob "^1.0.0"
-
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -2892,27 +2808,6 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-
-fileset@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  dependencies:
-    glob "^7.0.3"
-    minimatch "^3.0.3"
-
-fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^1.1.3"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -3007,16 +2902,10 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-for-in@^1.0.1, for-in@^1.0.2:
+for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  dependencies:
-    for-in "^1.0.1"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -3070,7 +2959,7 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@^1.2.3, fsevents@^1.2.7:
+fsevents@^1.2.7:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
   integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
@@ -3099,9 +2988,10 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-stdin@^4.0.1:
   version "4.0.1"
@@ -3112,17 +3002,13 @@ get-stdin@^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.1.0:
+get-stream@4.1.0, get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
     pump "^3.0.0"
 
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-
 get-stream@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
@@ -3140,19 +3026,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -3184,10 +3057,6 @@ globals@^11.1.0, globals@^11.7.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^9.18.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-
 globby@6.1.0, globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -3214,7 +3083,7 @@ growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
 
-handlebars@^4.0.13, handlebars@^4.0.3:
+handlebars@^4.0.13:
   version "4.4.5"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.4.5.tgz#1b1f94f9bfe7379adda86a8b73fb570265a0dddd"
   integrity sha512-0Ce31oWVB7YidkaTq33ZxEbN+UDxMMgThvCe8ptgQViymL5DPis9uLdTA13MiRPhgvqyxIegugrP97iK3JeBHg==
@@ -3225,6 +3094,17 @@ handlebars@^4.0.13, handlebars@^4.0.3:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+handlebars@^4.1.2:
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
+  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -3319,13 +3199,6 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-home-or-tmp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.1"
-
 hosted-git-info@^2.1.4:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
@@ -3424,11 +3297,12 @@ import-fresh@^3.0.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-local@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
   dependencies:
-    pkg-dir "^2.0.0"
+    pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
 
 import-modules@^2.0.0:
@@ -3513,9 +3387,12 @@ invariant@^2.2.2:
   dependencies:
     loose-envify "^1.0.0"
 
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+invariant@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
 
 irregular-plurals@^1.0.0:
   version "1.4.0"
@@ -3580,12 +3457,6 @@ is-ci@2.0.0, is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-ci@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
-  dependencies:
-    ci-info "^1.0.0"
-
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -3626,16 +3497,6 @@ is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
 
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  dependencies:
-    is-primitive "^2.0.0"
-
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -3647,10 +3508,6 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -3676,15 +3533,10 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-generator-fn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  dependencies:
-    is-extglob "^1.0.0"
+is-generator-fn@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-glob@^3.1.0:
   version "3.1.0"
@@ -3708,12 +3560,6 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -3742,14 +3588,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
@@ -3831,147 +3669,105 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-api@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
-  dependencies:
-    async "^2.1.4"
-    compare-versions "^3.1.0"
-    fileset "^2.0.2"
-    istanbul-lib-coverage "^1.2.0"
-    istanbul-lib-hook "^1.2.0"
-    istanbul-lib-instrument "^1.10.1"
-    istanbul-lib-report "^1.1.4"
-    istanbul-lib-source-maps "^1.2.4"
-    istanbul-reports "^1.3.0"
-    js-yaml "^3.7.0"
-    mkdirp "^0.5.1"
-    once "^1.4.0"
+istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
 
-istanbul-lib-coverage@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
-
-istanbul-lib-hook@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz#f614ec45287b2a8fc4f07f5660af787575601805"
+istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
+  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
   dependencies:
-    append-transform "^1.0.0"
+    "@babel/generator" "^7.4.0"
+    "@babel/parser" "^7.4.3"
+    "@babel/template" "^7.4.0"
+    "@babel/traverse" "^7.4.3"
+    "@babel/types" "^7.4.0"
+    istanbul-lib-coverage "^2.0.5"
+    semver "^6.0.0"
 
-istanbul-lib-instrument@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
+istanbul-lib-report@^2.0.4:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
+  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
   dependencies:
-    babel-generator "^6.18.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-    babylon "^6.18.0"
-    istanbul-lib-coverage "^1.2.0"
-    semver "^5.3.0"
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    supports-color "^6.1.0"
 
-istanbul-lib-report@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
+istanbul-lib-source-maps@^3.0.1:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
+  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
   dependencies:
-    istanbul-lib-coverage "^1.2.0"
-    mkdirp "^0.5.1"
-    path-parse "^1.0.5"
-    supports-color "^3.1.2"
+    debug "^4.1.1"
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    rimraf "^2.6.3"
+    source-map "^0.6.1"
 
-istanbul-lib-source-maps@^1.2.4:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz#ffe6be4e7ab86d3603e4290d54990b14506fc9b1"
+istanbul-reports@^2.2.6:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
+  integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
   dependencies:
-    debug "^3.1.0"
-    istanbul-lib-coverage "^1.2.0"
-    mkdirp "^0.5.1"
-    rimraf "^2.6.1"
-    source-map "^0.5.3"
-
-istanbul-reports@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
-  dependencies:
-    handlebars "^4.0.3"
+    handlebars "^4.1.2"
 
 iterall@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
 
-jest-changed-files@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
+jest-changed-files@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
+  integrity sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==
   dependencies:
+    "@jest/types" "^24.9.0"
+    execa "^1.0.0"
     throat "^4.0.0"
 
-jest-cli@^23.3.0:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.4.2.tgz#49d56bcfe6cf01871bfcc4a0494e08edaf2b61d0"
+jest-cli@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.9.0.tgz#ad2de62d07472d419c6abc301fc432b98b10d2af"
+  integrity sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==
   dependencies:
-    ansi-escapes "^3.0.0"
+    "@jest/core" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
     exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    import-local "^1.0.0"
-    is-ci "^1.0.10"
-    istanbul-api "^1.3.1"
-    istanbul-lib-coverage "^1.2.0"
-    istanbul-lib-instrument "^1.10.1"
-    istanbul-lib-source-maps "^1.2.4"
-    jest-changed-files "^23.4.2"
-    jest-config "^23.4.2"
-    jest-environment-jsdom "^23.4.0"
-    jest-get-type "^22.1.0"
-    jest-haste-map "^23.4.1"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
-    jest-resolve-dependencies "^23.4.2"
-    jest-runner "^23.4.2"
-    jest-runtime "^23.4.2"
-    jest-snapshot "^23.4.2"
-    jest-util "^23.4.0"
-    jest-validate "^23.4.0"
-    jest-watcher "^23.4.0"
-    jest-worker "^23.2.0"
-    micromatch "^2.3.11"
-    node-notifier "^5.2.1"
-    prompts "^0.1.9"
-    realpath-native "^1.0.0"
-    rimraf "^2.5.4"
-    slash "^1.0.0"
-    string-length "^2.0.0"
-    strip-ansi "^4.0.0"
-    which "^1.2.12"
-    yargs "^11.0.0"
+    import-local "^2.0.0"
+    is-ci "^2.0.0"
+    jest-config "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
+    prompts "^2.0.1"
+    realpath-native "^1.1.0"
+    yargs "^13.3.0"
 
-jest-config@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.4.2.tgz#62a105e14b8266458f2bf4d32403b2c44418fa77"
+jest-config@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.9.0.tgz#fb1bbc60c73a46af03590719efa4825e6e4dd1b5"
+  integrity sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==
   dependencies:
-    babel-core "^6.0.0"
-    babel-jest "^23.4.2"
+    "@babel/core" "^7.1.0"
+    "@jest/test-sequencer" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    babel-jest "^24.9.0"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^23.4.0"
-    jest-environment-node "^23.4.0"
-    jest-get-type "^22.1.0"
-    jest-jasmine2 "^23.4.2"
-    jest-regex-util "^23.3.0"
-    jest-resolve "^23.4.1"
-    jest-util "^23.4.0"
-    jest-validate "^23.4.0"
-    pretty-format "^23.2.0"
-
-jest-diff@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.2.0.tgz#9f2cf4b51e12c791550200abc16b47130af1062a"
-  dependencies:
-    chalk "^2.0.1"
-    diff "^3.2.0"
-    jest-get-type "^22.1.0"
-    pretty-format "^23.2.0"
+    jest-environment-jsdom "^24.9.0"
+    jest-environment-node "^24.9.0"
+    jest-get-type "^24.9.0"
+    jest-jasmine2 "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
+    micromatch "^3.1.10"
+    pretty-format "^24.9.0"
+    realpath-native "^1.1.0"
 
 jest-diff@^24.0.0, jest-diff@^24.9.0:
   version "24.9.0"
@@ -3983,7 +3779,7 @@ jest-diff@^24.0.0, jest-diff@^24.9.0:
     jest-get-type "^24.9.0"
     pretty-format "^24.9.0"
 
-jest-docblock@24.9.0:
+jest-docblock@24.9.0, jest-docblock@^24.3.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.9.0.tgz#7970201802ba560e1c4092cc25cbedf5af5a8ce2"
   integrity sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==
@@ -3994,71 +3790,85 @@ jest-docblock@^21.0.0:
   version "21.2.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
 
-jest-docblock@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
-  dependencies:
-    detect-newline "^2.1.0"
-
-jest-each@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.4.0.tgz#2fa9edd89daa1a4edc9ff9bf6062a36b71345143"
+jest-each@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.9.0.tgz#eb2da602e2a610898dbc5f1f6df3ba86b55f8b05"
+  integrity sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==
   dependencies:
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
-    pretty-format "^23.2.0"
+    jest-get-type "^24.9.0"
+    jest-util "^24.9.0"
+    pretty-format "^24.9.0"
 
-jest-environment-jsdom@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
+jest-environment-jsdom@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz#4b0806c7fc94f95edb369a69cc2778eec2b7375b"
+  integrity sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==
   dependencies:
-    jest-mock "^23.2.0"
-    jest-util "^23.4.0"
+    "@jest/environment" "^24.9.0"
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    jest-mock "^24.9.0"
+    jest-util "^24.9.0"
     jsdom "^11.5.1"
 
-jest-environment-node@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
+jest-environment-node@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.9.0.tgz#333d2d2796f9687f2aeebf0742b519f33c1cbfd3"
+  integrity sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==
   dependencies:
-    jest-mock "^23.2.0"
-    jest-util "^23.4.0"
-
-jest-get-type@^22.1.0:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
+    "@jest/environment" "^24.9.0"
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    jest-mock "^24.9.0"
+    jest-util "^24.9.0"
 
 jest-get-type@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
   integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
 
-jest-haste-map@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.4.1.tgz#43a174ba7ac079ae1dd74eaf5a5fe78989474dd2"
+jest-haste-map@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.9.0.tgz#b38a5d64274934e21fa417ae9a9fbeb77ceaac7d"
+  integrity sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==
   dependencies:
+    "@jest/types" "^24.9.0"
+    anymatch "^2.0.0"
     fb-watchman "^2.0.0"
-    graceful-fs "^4.1.11"
-    jest-docblock "^23.2.0"
-    jest-serializer "^23.0.1"
-    jest-worker "^23.2.0"
-    micromatch "^2.3.11"
-    sane "^2.0.0"
+    graceful-fs "^4.1.15"
+    invariant "^2.2.4"
+    jest-serializer "^24.9.0"
+    jest-util "^24.9.0"
+    jest-worker "^24.9.0"
+    micromatch "^3.1.10"
+    sane "^4.0.3"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^1.2.7"
 
-jest-jasmine2@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.4.2.tgz#2fbf52f93e43ed4c5e7326a90bb1d785be4321ac"
+jest-jasmine2@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz#1f7b1bd3242c1774e62acabb3646d96afc3be6a0"
+  integrity sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==
   dependencies:
-    babel-traverse "^6.0.0"
+    "@babel/traverse" "^7.1.0"
+    "@jest/environment" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^23.4.0"
-    is-generator-fn "^1.0.0"
-    jest-diff "^23.2.0"
-    jest-each "^23.4.0"
-    jest-matcher-utils "^23.2.0"
-    jest-message-util "^23.4.0"
-    jest-snapshot "^23.4.2"
-    jest-util "^23.4.0"
-    pretty-format "^23.2.0"
+    expect "^24.9.0"
+    is-generator-fn "^2.0.0"
+    jest-each "^24.9.0"
+    jest-matcher-utils "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-snapshot "^24.9.0"
+    jest-util "^24.9.0"
+    pretty-format "^24.9.0"
+    throat "^4.0.0"
 
 jest-junit@9.0.0:
   version "9.0.0"
@@ -4071,19 +3881,13 @@ jest-junit@9.0.0:
     uuid "^3.3.3"
     xml "^1.0.1"
 
-jest-leak-detector@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.2.0.tgz#c289d961dc638f14357d4ef96e0431ecc1aa377d"
+jest-leak-detector@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz#b665dea7c77100c5c4f7dfcb153b65cf07dcf96a"
+  integrity sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==
   dependencies:
-    pretty-format "^23.2.0"
-
-jest-matcher-utils@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz#4d4981f23213e939e3cedf23dc34c747b5ae1913"
-  dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^22.1.0"
-    pretty-format "^23.2.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
 
 jest-matcher-utils@^24.9.0:
   version "24.9.0"
@@ -4095,16 +3899,6 @@ jest-matcher-utils@^24.9.0:
     jest-get-type "^24.9.0"
     pretty-format "^24.9.0"
 
-jest-message-util@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
-  dependencies:
-    "@babel/code-frame" "^7.0.0-beta.35"
-    chalk "^2.0.1"
-    micromatch "^2.3.11"
-    slash "^1.0.0"
-    stack-utils "^1.0.1"
-
 jest-message-util@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
@@ -4119,10 +3913,6 @@ jest-message-util@^24.9.0:
     slash "^2.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
-
 jest-mock@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6"
@@ -4135,29 +3925,19 @@ jest-pnp-resolver@^1.2.1:
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
   integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
 
-jest-regex-util@^23.3.0:
-  version "23.3.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
-
-jest-regex-util@^24.9.0:
+jest-regex-util@^24.3.0, jest-regex-util@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
   integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
 
-jest-resolve-dependencies@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.4.2.tgz#0675ba876a5b819deffc449ad72e9985c2592048"
+jest-resolve-dependencies@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz#ad055198959c4cfba8a4f066c673a3f0786507ab"
+  integrity sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==
   dependencies:
-    jest-regex-util "^23.3.0"
-    jest-snapshot "^23.4.2"
-
-jest-resolve@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.4.1.tgz#7f3c17104732a2c0c940a01256025ed745814982"
-  dependencies:
-    browser-resolve "^1.11.3"
-    chalk "^2.0.1"
-    realpath-native "^1.0.0"
+    "@jest/types" "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-snapshot "^24.9.0"
 
 jest-resolve@^24.9.0:
   version "24.9.0"
@@ -4170,53 +3950,64 @@ jest-resolve@^24.9.0:
     jest-pnp-resolver "^1.2.1"
     realpath-native "^1.1.0"
 
-jest-runner@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.4.2.tgz#579a88524ac52c846075b0129a21c7b483e75a7e"
+jest-runner@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.9.0.tgz#574fafdbd54455c2b34b4bdf4365a23857fcdf42"
+  integrity sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==
   dependencies:
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    chalk "^2.4.2"
     exit "^0.1.2"
-    graceful-fs "^4.1.11"
-    jest-config "^23.4.2"
-    jest-docblock "^23.2.0"
-    jest-haste-map "^23.4.1"
-    jest-jasmine2 "^23.4.2"
-    jest-leak-detector "^23.2.0"
-    jest-message-util "^23.4.0"
-    jest-runtime "^23.4.2"
-    jest-util "^23.4.0"
-    jest-worker "^23.2.0"
+    graceful-fs "^4.1.15"
+    jest-config "^24.9.0"
+    jest-docblock "^24.3.0"
+    jest-haste-map "^24.9.0"
+    jest-jasmine2 "^24.9.0"
+    jest-leak-detector "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-resolve "^24.9.0"
+    jest-runtime "^24.9.0"
+    jest-util "^24.9.0"
+    jest-worker "^24.6.0"
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.4.2.tgz#00c3bb8385253d401a394a27d1112d3615e5a65c"
+jest-runtime@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.9.0.tgz#9f14583af6a4f7314a6a9d9f0226e1a781c8e4ac"
+  integrity sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==
   dependencies:
-    babel-core "^6.0.0"
-    babel-plugin-istanbul "^4.1.6"
+    "@jest/console" "^24.7.1"
+    "@jest/environment" "^24.9.0"
+    "@jest/source-map" "^24.3.0"
+    "@jest/transform" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/yargs" "^13.0.0"
     chalk "^2.0.1"
-    convert-source-map "^1.4.0"
     exit "^0.1.2"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.1.11"
-    jest-config "^23.4.2"
-    jest-haste-map "^23.4.1"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
-    jest-resolve "^23.4.1"
-    jest-snapshot "^23.4.2"
-    jest-util "^23.4.0"
-    jest-validate "^23.4.0"
-    micromatch "^2.3.11"
-    realpath-native "^1.0.0"
-    slash "^1.0.0"
-    strip-bom "3.0.0"
-    write-file-atomic "^2.1.0"
-    yargs "^11.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    jest-config "^24.9.0"
+    jest-haste-map "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-mock "^24.9.0"
+    jest-regex-util "^24.3.0"
+    jest-resolve "^24.9.0"
+    jest-snapshot "^24.9.0"
+    jest-util "^24.9.0"
+    jest-validate "^24.9.0"
+    realpath-native "^1.1.0"
+    slash "^2.0.0"
+    strip-bom "^3.0.0"
+    yargs "^13.3.0"
 
-jest-serializer@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
+jest-serializer@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73"
+  integrity sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==
 
 jest-snapshot-serializer-ansi@1.0.0:
   version "1.0.0"
@@ -4229,22 +4020,7 @@ jest-snapshot-serializer-raw@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot-serializer-raw/-/jest-snapshot-serializer-raw-1.1.0.tgz#1d7f09c02f3dbbc3ae70b5b7598fb2f45e37d6c8"
 
-jest-snapshot@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.4.2.tgz#8fa6130feb5a527dac73e5fa80d86f29f7c42ab6"
-  dependencies:
-    babel-types "^6.0.0"
-    chalk "^2.0.1"
-    jest-diff "^23.2.0"
-    jest-matcher-utils "^23.2.0"
-    jest-message-util "^23.4.0"
-    jest-resolve "^23.4.1"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    pretty-format "^23.2.0"
-    semver "^5.5.0"
-
-jest-snapshot@^24.0.0:
+jest-snapshot@^24.0.0, jest-snapshot@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.9.0.tgz#ec8e9ca4f2ec0c5c87ae8f925cf97497b0e951ba"
   integrity sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==
@@ -4263,19 +4039,6 @@ jest-snapshot@^24.0.0:
     pretty-format "^24.9.0"
     semver "^6.2.0"
 
-jest-util@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
-  dependencies:
-    callsites "^2.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.11"
-    is-ci "^1.0.10"
-    jest-message-util "^23.4.0"
-    mkdirp "^0.5.1"
-    slash "^1.0.0"
-    source-map "^0.6.0"
-
 jest-util@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162"
@@ -4294,15 +4057,6 @@ jest-util@^24.9.0:
     slash "^2.0.0"
     source-map "^0.6.0"
 
-jest-validate@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.4.0.tgz#d96eede01ef03ac909c009e9c8e455197d48c201"
-  dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^22.1.0"
-    leven "^2.1.0"
-    pretty-format "^23.2.0"
-
 jest-validate@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
@@ -4328,15 +4082,7 @@ jest-watch-typeahead@0.4.2:
     string-length "^3.1.0"
     strip-ansi "^5.0.0"
 
-jest-watcher@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
-    string-length "^2.0.0"
-
-jest-watcher@^24.3.0:
+jest-watcher@^24.3.0, jest-watcher@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.9.0.tgz#4b56e5d1ceff005f5b88e528dc9afc8dd4ed2b3b"
   integrity sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==
@@ -4349,12 +4095,6 @@ jest-watcher@^24.3.0:
     jest-util "^24.9.0"
     string-length "^2.0.0"
 
-jest-worker@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
-  dependencies:
-    merge-stream "^1.0.1"
-
 jest-worker@^24.6.0, jest-worker@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
@@ -4363,12 +4103,13 @@ jest-worker@^24.6.0, jest-worker@^24.9.0:
     merge-stream "^2.0.0"
     supports-color "^6.1.0"
 
-jest@23.3.0:
-  version "23.3.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-23.3.0.tgz#1355cd792f38cf20fba4da02dddb7ca14d9484b5"
+jest@24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz#987d290c05a08b52c56188c1002e368edb007171"
+  integrity sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==
   dependencies:
-    import-local "^1.0.0"
-    jest-cli "^23.3.0"
+    import-local "^2.0.0"
+    jest-cli "^24.9.0"
 
 js-base64@^2.1.9:
   version "2.3.2"
@@ -4378,15 +4119,11 @@ js-levenshtein@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.3.tgz#3ef627df48ec8cf24bacf05c0f184ff30ef413c5"
 
-js-tokens@^3.0.0, js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
-js-yaml@^3.13.1, js-yaml@^3.7.0:
+js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   dependencies:
@@ -4428,10 +4165,6 @@ jsdom@^11.5.1:
     ws "^4.0.0"
     xml-name-validator "^3.0.0"
 
-jsesc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-
 jsesc@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
@@ -4470,10 +4203,6 @@ json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -4528,11 +4257,10 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
 
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  dependencies:
-    invert-kv "^1.0.0"
+kleur@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 left-pad@^1.2.0:
   version "1.3.0"
@@ -4582,6 +4310,16 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
 loader-runner@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
@@ -4670,7 +4408,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.13.1, lodash@^4.14.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4:
+lodash@^4.13.1, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -4695,7 +4433,7 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lru-cache@^4.0.1, lru-cache@^4.1.5:
+lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -4724,7 +4462,7 @@ magic-string@^0.25.2:
   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==
@@ -4784,12 +4522,6 @@ mem@5.1.1:
     mimic-fn "^2.1.0"
     p-is-promise "^2.1.0"
 
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  dependencies:
-    mimic-fn "^1.0.0"
-
 memory-fs@^0.4.0, memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -4813,41 +4545,12 @@ meow@^3.7.0:
     redent "^1.0.0"
     trim-newlines "^1.0.0"
 
-merge-stream@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  dependencies:
-    readable-stream "^2.0.1"
-
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge@^1.1.3:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
-
-micromatch@^2.3.11:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
+micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   dependencies:
@@ -4882,10 +4585,6 @@ mime-types@^2.1.12, mime-types@~2.1.17:
   dependencies:
     mime-db "~1.33.0"
 
-mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -4899,7 +4598,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@3.0.4, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -5102,12 +4801,19 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-notifier@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
+node-modules-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
+
+node-notifier@^5.4.2:
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz#cb72daf94c93904098e28b9c590fd866e464bd50"
+  integrity sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==
   dependencies:
     growly "^1.3.0"
-    semver "^5.4.1"
+    is-wsl "^1.1.0"
+    semver "^5.5.0"
     shellwords "^0.1.1"
     which "^1.3.0"
 
@@ -5165,7 +4871,7 @@ normalize-path@3.0.0, normalize-path@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
@@ -5276,13 +4982,6 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -5339,15 +5038,7 @@ os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
-
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
@@ -5364,6 +5055,13 @@ p-defer@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
   integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
+p-each-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+  integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=
+  dependencies:
+    p-reduce "^1.0.0"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -5416,6 +5114,11 @@ p-map@^3.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
+p-reduce@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+  integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
+
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -5463,15 +5166,6 @@ parse-entities@^1.1.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -5531,7 +5225,7 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
@@ -5544,7 +5238,7 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
   integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==
 
-path-parse@^1.0.5, path-parse@^1.0.6:
+path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -5563,6 +5257,13 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
+  dependencies:
+    pify "^3.0.0"
+
 pbkdf2@^3.0.3:
   version "3.0.12"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.12.tgz#be36785c5067ea48d806ff923288c5f750b6b8a2"
@@ -5581,6 +5282,11 @@ pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
+pify@^3.0.0:
+  version "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"
@@ -5596,6 +5302,13 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
+pirates@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
+  dependencies:
+    node-modules-regexp "^1.0.0"
+
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -5688,10 +5401,6 @@ prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
 
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -5704,13 +5413,6 @@ prettier@1.19.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-pretty-format@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.2.0.tgz#3b0aaa63c018a53583373c1cb3a5d96cc5e83017"
-  dependencies:
-    ansi-regex "^3.0.0"
-    ansi-styles "^3.2.0"
-
 pretty-format@^24.0.0, pretty-format@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
@@ -5733,7 +5435,7 @@ prettylint@1.0.0:
     meow "^3.7.0"
     tslib "^1.8.0"
 
-private@^0.1.6, private@^0.1.7:
+private@^0.1.6:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
@@ -5760,12 +5462,13 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
-prompts@^0.1.9:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.10.tgz#832cbf6116ecb121d6884e84643bb2cf92b3ed2c"
+prompts@^2.0.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.0.tgz#a444e968fa4cc7e86689a74050685ac8006c4cc4"
+  integrity sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==
   dependencies:
-    clorox "^1.0.3"
-    sisteransi "^0.1.1"
+    kleur "^3.0.3"
+    sisteransi "^1.0.3"
 
 prop-types@^15.7.2:
   version "15.7.2"
@@ -5844,13 +5547,6 @@ querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
 randombytes@^2.0.0, randombytes@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
@@ -5886,6 +5582,14 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
+read-pkg-up@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
+  dependencies:
+    find-up "^3.0.0"
+    read-pkg "^3.0.0"
+
 read-pkg-up@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.0.tgz#3f3e53858ec5ae5e6fe14bc479da0a7c98f85ff3"
@@ -5911,6 +5615,15 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
+  dependencies:
+    load-json-file "^4.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^3.0.0"
+
 read-pkg@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
@@ -5943,12 +5656,6 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-realpath-native@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.1.tgz#07f40a0cce8f8261e2e8b7ebebf5c95965d7b633"
-  dependencies:
-    util.promisify "^1.0.0"
-
 realpath-native@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
@@ -5980,10 +5687,6 @@ regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
 
-regenerator-runtime@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
-
 regenerator-runtime@^0.13.2:
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
@@ -5996,13 +5699,6 @@ regenerator-transform@^0.14.0:
   dependencies:
     private "^0.1.6"
 
-regex-cache@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
-  dependencies:
-    is-equal-shallow "^0.1.3"
-    is-primitive "^2.0.0"
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -6090,7 +5786,7 @@ repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
 
-repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1:
+repeat-string@^1.5.4, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
@@ -6147,9 +5843,10 @@ require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
 reserved-words@^0.1.2:
   version "0.1.2"
@@ -6302,10 +5999,10 @@ rollup@1.26.3:
     "@types/node" "*"
     acorn "^7.1.0"
 
-rsvp@^3.3.3:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
-  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+rsvp@^4.8.4:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
 
 run-async@^2.2.0:
   version "2.3.0"
@@ -6354,21 +6051,20 @@ safe-regex@^2.1.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sane@^2.0.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
-  integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
+sane@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
   dependencies:
+    "@cnakazawa/watch" "^1.0.3"
     anymatch "^2.0.0"
-    capture-exit "^1.2.0"
-    exec-sh "^0.2.0"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
     fb-watchman "^2.0.0"
     micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
-    watch "~0.18.0"
-  optionalDependencies:
-    fsevents "^1.2.3"
 
 sax@^1.2.4:
   version "1.2.4"
@@ -6490,13 +6186,10 @@ simple-html-tokenizer@^0.5.7:
   resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.7.tgz#8eca336ecfbe2b3c6166cbb31b2682088de79f40"
   integrity sha512-APW9iYbkJ5cijjX4Ljhf3VG8SwYPUJT5gZrwci/wieMabQxWFiV5VwsrP5c6GMRvXKEQMGkAB1d9dvW66dTqpg==
 
-sisteransi@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
-
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+sisteransi@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3"
+  integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==
 
 slash@^2.0.0:
   version "2.0.0"
@@ -6568,12 +6261,6 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.4.15:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  dependencies:
-    source-map "^0.5.6"
-
 source-map-support@^0.5.6, source-map-support@~0.5.12:
   version "0.5.13"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
@@ -6586,7 +6273,7 @@ source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6:
+source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
@@ -6734,7 +6421,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.1:
+string-width@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -6742,7 +6429,7 @@ string-width@^2.0.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0:
+string-width@^3.0.0, string-width@^3.1.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==
@@ -6784,16 +6471,16 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-bom@3.0.0, strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
   dependencies:
     is-utf8 "^0.2.0"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -6823,7 +6510,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.2, supports-color@^3.2.3:
+supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -6936,15 +6623,15 @@ terser@^4.1.0, terser@^4.1.2, terser@^4.3.9:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-test-exclude@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
+test-exclude@^5.2.3:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
+  integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
   dependencies:
-    arrify "^1.0.1"
-    micromatch "^3.1.8"
-    object-assign "^4.1.0"
-    read-pkg-up "^1.0.1"
-    require-main-filename "^1.0.1"
+    glob "^7.1.3"
+    minimatch "^3.0.4"
+    read-pkg-up "^4.0.0"
+    require-main-filename "^2.0.0"
 
 text-table@0.2.0, text-table@^0.2.0:
   version "0.2.0"
@@ -6988,10 +6675,6 @@ to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
-to-fast-properties@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -7034,10 +6717,6 @@ trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
 
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-
 trim-trailing-lines@^1.0.0, trim-trailing-lines@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz#d2f1e153161152e9f02fabc670fb40bec2ea2e3a"
@@ -7349,19 +7028,12 @@ w3c-hr-time@^1.0.1:
   dependencies:
     browser-process-hrtime "^0.1.2"
 
-walker@~1.0.5:
+walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
   dependencies:
     makeerror "1.0.x"
 
-watch@~0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
-  dependencies:
-    exec-sh "^0.2.0"
-    minimist "^1.2.0"
-
 watchpack@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
@@ -7434,7 +7106,7 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.2.12, which@^1.2.9, which@^1.3.0:
+which@^1.2.9, which@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:
@@ -7468,21 +7140,23 @@ worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
   dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
 
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-write-file-atomic@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
+write-file-atomic@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
+  integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -7515,10 +7189,6 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-
 y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -7553,25 +7223,26 @@ yaml@^1.7.1:
   dependencies:
     "@babel/runtime" "^7.5.5"
 
-yargs-parser@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+yargs-parser@^13.1.1:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
+  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
   dependencies:
-    camelcase "^4.1.0"
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
 
-yargs@^11.0.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+yargs@^13.3.0:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
+  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
   dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.1.1"
-    find-up "^2.1.0"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^9.0.2"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.1"

From ac82262abc173a89188d1e4f49d886f4447881e9 Mon Sep 17 00:00:00 2001
From: fisker Cheung <lionkay@gmail.com>
Date: Thu, 19 Dec 2019 18:06:45 +0800
Subject: [PATCH 13/13] Optimize some usage of `Array#filter` (#6996)

---
 src/cli/util.js                   | 13 ++++++-------
 src/language-js/printer-estree.js |  9 ++++-----
 src/main/massage-ast.js           |  2 +-
 src/main/support.js               |  6 ++----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/cli/util.js b/src/cli/util.js
index e5134a675..86da87ac0 100644
--- a/src/cli/util.js
+++ b/src/cli/util.js
@@ -658,8 +658,7 @@ function createOptionUsageType(option) {
       return null;
     case "choice":
       return `<${option.choices
-        .filter(choice => choice.since !== null)
-        .filter(choice => !choice.deprecated)
+        .filter(choice => !choice.deprecated && choice.since !== null)
         .map(choice => choice.value)
         .join("|")}>`;
     default:
@@ -852,14 +851,14 @@ function createMinimistOptions(detailedOptions) {
       .map(option => [option.name].concat(option.alias || []))
       .reduce((a, b) => a.concat(b)),
     default: detailedOptions
-      .filter(option => !option.deprecated)
       .filter(
         option =>
-          !option.forwardToApi ||
-          option.name === "plugin" ||
-          option.name === "plugin-search-dir"
+          !option.deprecated &&
+          (!option.forwardToApi ||
+            option.name === "plugin" ||
+            option.name === "plugin-search-dir") &&
+          option.default !== undefined
       )
-      .filter(option => option.default !== undefined)
       .reduce(
         (current, option) =>
           Object.assign({ [option.name]: option.default }, current),
diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index c6c48e660..0725c2dae 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -5418,8 +5418,7 @@ function printJSXElement(path, options, print) {
     isFacebookTranslationTag
   );
 
-  const containsText =
-    n.children.filter(child => isMeaningfulJSXText(child)).length > 0;
+  const containsText = n.children.some(child => isMeaningfulJSXText(child));
 
   // We can end up we multiple whitespace elements with empty string
   // content between them.
@@ -5870,16 +5869,16 @@ function shouldHugType(node) {
         n.type === "TSNullKeyword"
     ).length;
 
-    const objectCount = node.types.filter(
+    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"
-    ).length;
+    );
 
-    if (node.types.length - 1 === voidCount && objectCount > 0) {
+    if (node.types.length - 1 === voidCount && hasObject) {
       return true;
     }
   }
diff --git a/src/main/massage-ast.js b/src/main/massage-ast.js
index 4d06c81aa..3bfeb2828 100644
--- a/src/main/massage-ast.js
+++ b/src/main/massage-ast.js
@@ -2,7 +2,7 @@
 
 function massageAST(ast, options, parent) {
   if (Array.isArray(ast)) {
-    return ast.map(e => massageAST(e, options, parent)).filter(e => e);
+    return ast.map(e => massageAST(e, options, parent)).filter(Boolean);
   }
 
   if (!ast || typeof ast !== "object") {
diff --git a/src/main/support.js b/src/main/support.js
index 2674fea32..a8cfaf3f4 100644
--- a/src/main/support.js
+++ b/src/main/support.js
@@ -36,8 +36,7 @@ function getSupportInfo(version, opts) {
     "name"
   )
     .sort((a, b) => (a.name === b.name ? 0 : a.name < b.name ? -1 : 1))
-    .filter(filterSince)
-    .filter(filterDeprecated)
+    .filter(option => filterSince(option) && filterDeprecated(option))
     .map(mapDeprecated)
     .map(mapInternal)
     .map(option => {
@@ -56,8 +55,7 @@ function getSupportInfo(version, opts) {
 
       if (Array.isArray(newOption.choices)) {
         newOption.choices = newOption.choices
-          .filter(filterSince)
-          .filter(filterDeprecated)
+          .filter(option => filterSince(option) && filterDeprecated(option))
           .map(mapDeprecated);
       }