Merge additional changes from adalinesimonian/merge-prettier-2.3.1

.editorconfig

@@ -10,6 +10,7 @@ insert_final_newline = true
 
 [cspell.json]
 indent_size = 4
+insert_final_newline = false
 
-[website/blog/*.md]
+[extra/website/blog/*.md]
 trim_trailing_whitespace = false

.eslintignore

@@ -1,14 +1,17 @@
 !/*.js
-/tests/**/*.js
-!/tests/**/jsfmt.spec.js
+/tests/format/**/*.js
+# prettierx
+/tests/x-format/**/*.js
+/tests/integration/cli/
+!/tests/format/**/jsfmt.spec.js
+# prettierx
+!/tests/x-format/**/jsfmt.spec.js
 !/**/.eslintrc.js
-/test*.js
-/scripts/build/shims
+/test*.*
 /scripts/release/node_modules
 /coverage/
 /dist/
 **/node_modules/**
-/website/build/
-/website/static/playground.js
-/website/static/lib/
-/tests_integration/cli/
+/extra/website/build/
+/extra/website/static/playground.js
+/extra/website/static/lib/

.eslintrc.js

@@ -0,0 +1,231 @@
+"use strict";
+const { isCI } = require("ci-info");
+
+module.exports = {
+  root: true,
+  env: {
+    es2020: true,
+    node: true,
+  },
+  extends: ["eslint:recommended", "prettier"],
+  plugins: ["prettier-internal-rules", "import", "regexp", "unicorn"],
+  settings: {
+    "import/internal-regex": "^linguist-languages/",
+  },
+  rules: {
+    "arrow-body-style": ["error", "as-needed"],
+    curly: "error",
+    "dot-notation": "error",
+    eqeqeq: "error",
+    "import/no-extraneous-dependencies": [
+      "error",
+      {
+        devDependencies: ["tests*/**", "scripts/**"],
+      },
+    ],
+    "import/order": "error",
+    "no-console": isCI ? "error" : "off",
+    "no-else-return": [
+      "error",
+      {
+        allowElseIf: false,
+      },
+    ],
+    "no-implicit-coercion": "error",
+    "no-inner-declarations": "error",
+    "no-restricted-syntax": [
+      "error",
+      // `!foo === bar` and `!foo !== bar`
+      'BinaryExpression[operator=/^[!=]==$/] > UnaryExpression.left[operator="!"]',
+    ],
+    "no-unneeded-ternary": "error",
+    "no-useless-return": "error",
+    "no-unused-vars": [
+      "error",
+      {
+        ignoreRestSiblings: true,
+      },
+    ],
+    "no-var": "error",
+    "object-shorthand": "error",
+    "one-var": ["error", "never"],
+    "prefer-arrow-callback": "error",
+    "prefer-const": [
+      "error",
+      {
+        destructuring: "all",
+      },
+    ],
+    "prefer-destructuring": [
+      "error",
+      {
+        VariableDeclarator: {
+          array: false,
+          object: true,
+        },
+        AssignmentExpression: {
+          array: false,
+          object: false,
+        },
+      },
+      {
+        enforceForRenamedProperties: false,
+      },
+    ],
+    "prefer-object-spread": "error",
+    "prefer-rest-params": "error",
+    "prefer-spread": "error",
+    "prettier-internal-rules/jsx-identifier-case": "error",
+    "prettier-internal-rules/require-json-extensions": "error",
+    "prettier-internal-rules/no-identifier-n": "error",
+    quotes: [
+      "error",
+      "double",
+      {
+        avoidEscape: true,
+      },
+    ],
+    strict: "error",
+    "symbol-description": "error",
+    yoda: [
+      "error",
+      "never",
+      {
+        exceptRange: true,
+      },
+    ],
+    "regexp/match-any": [
+      "error",
+      {
+        allows: ["dotAll"],
+      },
+    ],
+    "regexp/no-useless-flag": "error",
+    "unicorn/better-regex": "error",
+    "unicorn/explicit-length-check": "error",
+    "unicorn/new-for-builtins": "error",
+    "unicorn/no-array-for-each": "error",
+    "unicorn/no-array-push-push": "error",
+    "unicorn/no-useless-undefined": "error",
+    "unicorn/prefer-array-flat": [
+      "error",
+      {
+        functions: ["flat", "flatten"],
+      },
+    ],
+    "unicorn/prefer-array-flat-map": "error",
+    "unicorn/prefer-includes": "error",
+    "unicorn/prefer-number-properties": "error",
+    "unicorn/prefer-optional-catch-binding": "error",
+    "unicorn/prefer-regexp-test": "error",
+    "unicorn/prefer-spread": "error",
+    "unicorn/prefer-string-slice": "error",
+  },
+  overrides: [
+    {
+      files: ["scripts/**/*.js", "scripts/**/*.mjs"],
+      rules: {
+        "no-console": "off",
+      },
+    },
+    {
+      files: ["**/*.mjs"],
+      parserOptions: {
+        sourceType: "module",
+      },
+      rules: {
+        "unicorn/prefer-module": "error",
+        "unicorn/prefer-node-protocol": "error",
+      },
+    },
+    {
+      files: [
+        "tests/format/**/jsfmt.spec.js",
+        // [prettierx]
+        "tests/x-format/**/jsfmt.spec.js",
+        "tests/config/**/*.js",
+        "tests/integration/**/*.js",
+      ],
+      env: {
+        jest: true,
+      },
+      plugins: ["jest"],
+      rules: {
+        "jest/valid-expect": [
+          "error",
+          {
+            alwaysAwait: true,
+          },
+        ],
+      },
+    },
+    {
+      files: ["tests/**/*.js"],
+      rules: {
+        strict: "off",
+        "unicorn/prefer-array-flat": "off",
+        "unicorn/prefer-array-flat-map": "off",
+      },
+      globals: {
+        // [prettierx]
+        formatRoot: false,
+        run_spec: false,
+      },
+    },
+    {
+      files: ["src/cli/**/*.js"],
+      rules: {
+        "no-restricted-modules": [
+          "error",
+          {
+            patterns: [".."],
+          },
+        ],
+      },
+    },
+    {
+      files: "src/language-js/needs-parens.js",
+      rules: {
+        "prettier-internal-rules/better-parent-property-check-in-needs-parens":
+          "error",
+      },
+    },
+    {
+      files: "src/**/*.js",
+      rules: {
+        "prettier-internal-rules/consistent-negative-index-access": "error",
+        "prettier-internal-rules/flat-ast-path-call": "error",
+        "prettier-internal-rules/no-conflicting-comment-check-flags": "error",
+        "prettier-internal-rules/no-doc-builder-concat": "error",
+        "prettier-internal-rules/no-empty-flat-contents-for-if-break": "error",
+        "prettier-internal-rules/no-unnecessary-ast-path-call": "error",
+        "prettier-internal-rules/prefer-ast-path-each": "error",
+        "prettier-internal-rules/prefer-indent-if-break": "error",
+        "prettier-internal-rules/prefer-is-non-empty-array": "error",
+      },
+    },
+    {
+      files: ["src/language-*/**/*.js"],
+      rules: {
+        "prettier-internal-rules/directly-loc-start-end": "error",
+      },
+    },
+    {
+      files: ["src/language-js/**/*.js"],
+      rules: {
+        "prettier-internal-rules/no-node-comments": [
+          "error",
+          {
+            file: "src/language-js/utils.js",
+            functions: ["hasComment", "getComments"],
+          },
+          "src/language-js/parse-postprocess.js",
+          "src/language-js/parser-babel.js",
+          "src/language-js/parser-meriyah.js",
+          "src/language-js/pragma.js",
+          "src/language-js/parser/json.js",
+        ],
+      },
+    },
+  ],
+};

.git-blame-ignore-revs

@@ -0,0 +1,42 @@
+# git-blame ignored revisions
+# To configure, run
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+# Requires Git > 2.23
+# See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
+
+# Prettier bump after release
+# 2.3.1
+a34b4a711ed9928f8809bed3f4c8572dc3a40efb
+# 2.3.0
+3d8dc612b54cef741a1c31da1011a2d48748a1dd
+# 2.2.1
+80961835a68e3de1b14819a7b77583a54d2b63d7
+# 2.2.0
+cf354c205de9841a2d306387473dac369359ca2b
+# 2.1.2
+c4d3014b95122f4ad19c319a9b3f5f9625d6003f
+# 2.1.1
+a8363197118e530d948978da6e5c414a765ba9c0
+# 2.1.0
+cef4bcafc7867050582d3107632bde7e722575d1
+# 2.0.5
+d33f8a3e2c0a59cb9f383ddec5bbf8d296bb1a23
+# 2.0.4
+592149791e4fea656d8c5fa34c25d4d19076a07a
+# 2.0.3
+64b3ac9e8e933a09f049b7cace540ee526f4d5a4
+# 2.0.2
+c1dd17cf383b78fd8fd43442bb5db59b51900410
+# 2.0.1
+f56d620be529b60c13032681446c1eb76e0fb088
+# 2.0.0
+9dad95b35f935edce4c3d6cfa45c79a0b9c82b9f
+
+# Restructure test files (#10415)
+ece93681f1010796e7d8eb4394196ccaef0cbc9c
+
+# Categorize tests (#8239 #8248 #8249 #8251)
+b585bd6fa4d750a98e277303c428edfc48fea3f4
+f8c5b1fd1da4d67bc09d12bc3411b70d0fa4f4a1
+b6225788966a4a6b49e652044337436642dcd627
+7ad515111e79a3f304d5480d6586314222052333