eslint-config-prettier 7.2.0 → 8.3.0

package/@typescript-eslint.js

@@ -1,22 +1,3 @@
-"use strict";
-
-module.exports = {
-  rules: {
-    "@typescript-eslint/quotes": 0,
-
-    "@typescript-eslint/brace-style": "off",
-    "@typescript-eslint/comma-dangle": "off",
-    "@typescript-eslint/comma-spacing": "off",
-    "@typescript-eslint/func-call-spacing": "off",
-    "@typescript-eslint/indent": "off",
-    "@typescript-eslint/keyword-spacing": "off",
-    "@typescript-eslint/member-delimiter-style": "off",
-    "@typescript-eslint/no-extra-parens": "off",
-    "@typescript-eslint/no-extra-semi": "off",
-    "@typescript-eslint/object-curly-spacing": "off",
-    "@typescript-eslint/semi": "off",
-    "@typescript-eslint/space-before-function-paren": "off",
-    "@typescript-eslint/space-infix-ops": "off",
-    "@typescript-eslint/type-annotation-spacing": "off",
-  },
-};
+throw new Error(
+  '"prettier/@typescript-eslint" has been merged into "prettier" in eslint-config-prettier 8.0.0. See: https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md#version-800-2021-02-21'
+);

package/babel.js

@@ -1,10 +1,3 @@
-"use strict";
-
-module.exports = {
-  rules: {
-    "babel/quotes": 0,
-
-    "babel/object-curly-spacing": "off",
-    "babel/semi": "off",
-  },
-};
+throw new Error(
+  '"prettier/babel" has been merged into "prettier" in eslint-config-prettier 8.0.0. See: https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md#version-800-2021-02-21'
+);

package/bin/cli.js

@@ -2,9 +2,9 @@
 
 "use strict";
 
-const fs = require("fs");
-const path = require("path");
 const validators = require("./validators");
+const config = require("..");
+const prettier = require("../prettier");
 
 // Require locally installed eslint, for `npx eslint-config-prettier` support
 // with no local eslint-config-prettier installation.
@@ -15,6 +15,9 @@ const { ESLint } = require(require.resolve("eslint", {
 const SPECIAL_RULES_URL =
   "https://github.com/prettier/eslint-config-prettier#special-rules";
 
+const PRETTIER_RULES_URL =
+  "https://github.com/prettier/eslint-config-prettier#arrow-body-style-and-prefer-arrow-callback";
+
 if (module === require.main) {
   const args = process.argv.slice(2);
 
@@ -28,8 +31,8 @@ if (module === require.main) {
   Promise.all(args.map((file) => eslint.calculateConfigForFile(file)))
     .then((configs) => {
       const rules = [].concat(
-        ...configs.map((config, index) =>
-          Object.entries(config.rules).map((entry) => [...entry, args[index]])
+        ...configs.map(({ rules }, index) =>
+          Object.entries(rules).map((entry) => [...entry, args[index]])
         )
       );
       const result = processRules(rules);
@@ -68,24 +71,13 @@ https://github.com/prettier/eslint-config-prettier#cli-helper-tool
 }
 
 function processRules(configRules) {
-  // This used to look at "files" in package.json, but that is not reliable due
-  // to an npm bug. See:
-  // https://github.com/prettier/eslint-config-prettier/issues/57
-  const allRules = Object.assign(
-    Object.create(null),
-    ...fs
-      .readdirSync(path.join(__dirname, ".."))
-      .filter((name) => !name.startsWith(".") && name.endsWith(".js"))
-      .map((ruleFileName) => require(`../${ruleFileName}`).rules)
-  );
-
-  const regularRules = filterRules(allRules, (_, value) => value === "off");
+  const regularRules = filterRules(config.rules, (_, value) => value === "off");
   const optionsRules = filterRules(
-    allRules,
+    config.rules,
     (ruleName, value) => value === 0 && ruleName in validators
   );
   const specialRules = filterRules(
-    allRules,
+    config.rules,
     (ruleName, value) => value === 0 && !(ruleName in validators)
   );
 
@@ -99,7 +91,7 @@ function processRules(configRules) {
     .filter(Boolean);
 
   const flaggedRules = enabledRules.filter(
-    ({ ruleName }) => ruleName in allRules
+    ({ ruleName }) => ruleName in config.rules
   );
 
   const regularFlaggedRuleNames = filterRuleNames(
@@ -109,37 +101,21 @@ function processRules(configRules) {
   const optionsFlaggedRuleNames = filterRuleNames(
     flaggedRules,
     ({ ruleName, ...rule }) =>
-      ruleName in optionsRules && !validators[ruleName](rule, enabledRules)
+      ruleName in optionsRules && !validators[ruleName](rule)
   );
   const specialFlaggedRuleNames = filterRuleNames(
     flaggedRules,
     ({ ruleName }) => ruleName in specialRules
   );
-
-  if (
-    regularFlaggedRuleNames.length === 0 &&
-    optionsFlaggedRuleNames.length === 0
-  ) {
-    const baseMessage =
-      "No rules that are unnecessary or conflict with Prettier were found.";
-
-    const message =
-      specialFlaggedRuleNames.length === 0
-        ? baseMessage
-        : [
-            baseMessage,
-            "",
-            "However, the following rules are enabled but cannot be automatically checked. See:",
-            SPECIAL_RULES_URL,
-            "",
-            printRuleNames(specialFlaggedRuleNames),
-          ].join("\n");
-
-    return {
-      stdout: message,
-      code: 0,
-    };
-  }
+  const prettierFlaggedRuleNames = filterRuleNames(
+    enabledRules,
+    ({ ruleName, source }) =>
+      ruleName in prettier.rules &&
+      enabledRules.some(
+        (rule) =>
+          rule.ruleName === "prettier/prettier" && rule.source === source
+      )
+  );
 
   const regularMessage = [
     "The following rules are unnecessary or might conflict with Prettier:",
@@ -161,10 +137,41 @@ function processRules(configRules) {
     printRuleNames(specialFlaggedRuleNames),
   ].join("\n");
 
+  const prettierMessage = [
+    "The following rules can cause issues when using eslint-plugin-prettier at the same time.",
+    "Only enable them if you know what you are doing! See:",
+    PRETTIER_RULES_URL,
+    "",
+    printRuleNames(prettierFlaggedRuleNames),
+  ].join("\n");
+
+  if (
+    regularFlaggedRuleNames.length === 0 &&
+    optionsFlaggedRuleNames.length === 0
+  ) {
+    const message =
+      specialFlaggedRuleNames.length === 0 &&
+      prettierFlaggedRuleNames.length === 0
+        ? "No rules that are unnecessary or conflict with Prettier were found."
+        : [
+            specialFlaggedRuleNames.length === 0 ? null : specialMessage,
+            prettierFlaggedRuleNames.length === 0 ? null : prettierMessage,
+            "Other than that, no rules that are unnecessary or conflict with Prettier were found.",
+          ]
+            .filter(Boolean)
+            .join("\n\n");
+
+    return {
+      stdout: message,
+      code: 0,
+    };
+  }
+
   const message = [
     regularFlaggedRuleNames.length === 0 ? null : regularMessage,
     optionsFlaggedRuleNames.length === 0 ? null : optionsMessage,
     specialFlaggedRuleNames.length === 0 ? null : specialMessage,
+    prettierFlaggedRuleNames.length === 0 ? null : prettierMessage,
   ]
     .filter(Boolean)
     .join("\n\n");

package/bin/validators.js

@@ -4,9 +4,7 @@
 // `false` if the options DO conflict with Prettier, and `true` if they don’t.
 
 module.exports = {
-  "arrow-body-style": checkEslintPluginPrettier,
-
-  curly({ options }) {
+  "curly"({ options }) {
     if (options.length === 0) {
       return true;
     }
@@ -50,8 +48,6 @@ module.exports = {
     return Boolean(firstOption && firstOption.allowIndentationTabs);
   },
 
-  "prefer-arrow-callback": checkEslintPluginPrettier,
-
   "vue/html-self-closing"({ options }) {
     if (options.length === 0) {
       return false;
@@ -65,10 +61,3 @@ module.exports = {
     );
   },
 };
-
-function checkEslintPluginPrettier({ source: currentSource }, enabledRules) {
-  return !enabledRules.some(
-    ({ ruleName, source }) =>
-      ruleName === "prettier/prettier" && currentSource === source
-  );
-}

package/flowtype.js

@@ -1,15 +1,3 @@
-"use strict";
-
-module.exports = {
-  rules: {
-    "flowtype/boolean-style": "off",
-    "flowtype/delimiter-dangle": "off",
-    "flowtype/generic-spacing": "off",
-    "flowtype/object-type-delimiter": "off",
-    "flowtype/semi": "off",
-    "flowtype/space-after-type-colon": "off",
-    "flowtype/space-before-generic-bracket": "off",
-    "flowtype/space-before-type-colon": "off",
-    "flowtype/union-intersection-spacing": "off",
-  },
-};
+throw new Error(
+  '"prettier/flowtype" has been merged into "prettier" in eslint-config-prettier 8.0.0. See: https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md#version-800-2021-02-21'
+);

package/index.js

@@ -7,14 +7,19 @@ module.exports = {
     // The following rules can be used in some cases. See the README for more
     // information. (These are marked with `0` instead of `"off"` so that a
     // script can distinguish them.)
-    curly: 0,
+    "curly": 0,
     "lines-around-comment": 0,
     "max-len": 0,
     "no-confusing-arrow": 0,
     "no-mixed-operators": 0,
     "no-tabs": 0,
     "no-unexpected-multiline": 0,
-    quotes: 0,
+    "quotes": 0,
+    "@typescript-eslint/quotes": 0,
+    "babel/quotes": 0,
+    "vue/html-self-closing": 0,
+    "vue/max-len": 0,
+
     // The rest are rules that you never need to enable when using Prettier.
     "array-bracket-newline": "off",
     "array-bracket-spacing": "off",
@@ -35,7 +40,7 @@ module.exports = {
     "generator-star": "off",
     "generator-star-spacing": "off",
     "implicit-arrow-linebreak": "off",
-    indent: "off",
+    "indent": "off",
     "jsx-quotes": "off",
     "key-spacing": "off",
     "keyword-spacing": "off",
@@ -65,7 +70,7 @@ module.exports = {
     "padded-blocks": "off",
     "quote-props": "off",
     "rest-spread-spacing": "off",
-    semi: "off",
+    "semi": "off",
     "semi-spacing": "off",
     "semi-style": "off",
     "space-after-function-name": "off",
@@ -87,6 +92,91 @@ module.exports = {
     "wrap-iife": "off",
     "wrap-regex": "off",
     "yield-star-spacing": "off",
+    "@babel/object-curly-spacing": "off",
+    "@babel/semi": "off",
+    "@typescript-eslint/brace-style": "off",
+    "@typescript-eslint/comma-dangle": "off",
+    "@typescript-eslint/comma-spacing": "off",
+    "@typescript-eslint/func-call-spacing": "off",
+    "@typescript-eslint/indent": "off",
+    "@typescript-eslint/keyword-spacing": "off",
+    "@typescript-eslint/member-delimiter-style": "off",
+    "@typescript-eslint/no-extra-parens": "off",
+    "@typescript-eslint/no-extra-semi": "off",
+    "@typescript-eslint/object-curly-spacing": "off",
+    "@typescript-eslint/semi": "off",
+    "@typescript-eslint/space-before-function-paren": "off",
+    "@typescript-eslint/space-infix-ops": "off",
+    "@typescript-eslint/type-annotation-spacing": "off",
+    "babel/object-curly-spacing": "off",
+    "babel/semi": "off",
+    "flowtype/boolean-style": "off",
+    "flowtype/delimiter-dangle": "off",
+    "flowtype/generic-spacing": "off",
+    "flowtype/object-type-curly-spacing": "off",
+    "flowtype/object-type-delimiter": "off",
+    "flowtype/quotes": "off",
+    "flowtype/semi": "off",
+    "flowtype/space-after-type-colon": "off",
+    "flowtype/space-before-generic-bracket": "off",
+    "flowtype/space-before-type-colon": "off",
+    "flowtype/union-intersection-spacing": "off",
+    "react/jsx-child-element-spacing": "off",
+    "react/jsx-closing-bracket-location": "off",
+    "react/jsx-closing-tag-location": "off",
+    "react/jsx-curly-newline": "off",
+    "react/jsx-curly-spacing": "off",
+    "react/jsx-equals-spacing": "off",
+    "react/jsx-first-prop-new-line": "off",
+    "react/jsx-indent": "off",
+    "react/jsx-indent-props": "off",
+    "react/jsx-max-props-per-line": "off",
+    "react/jsx-newline": "off",
+    "react/jsx-one-expression-per-line": "off",
+    "react/jsx-props-no-multi-spaces": "off",
+    "react/jsx-tag-spacing": "off",
+    "react/jsx-wrap-multilines": "off",
+    "standard/array-bracket-even-spacing": "off",
+    "standard/computed-property-even-spacing": "off",
+    "standard/object-curly-even-spacing": "off",
+    "unicorn/empty-brace-spaces": "off",
+    "unicorn/no-nested-ternary": "off",
+    "unicorn/number-literal-case": "off",
+    "vue/array-bracket-newline": "off",
+    "vue/array-bracket-spacing": "off",
+    "vue/arrow-spacing": "off",
+    "vue/block-spacing": "off",
+    "vue/block-tag-newline": "off",
+    "vue/brace-style": "off",
+    "vue/comma-dangle": "off",
+    "vue/comma-spacing": "off",
+    "vue/comma-style": "off",
+    "vue/dot-location": "off",
+    "vue/func-call-spacing": "off",
+    "vue/html-closing-bracket-newline": "off",
+    "vue/html-closing-bracket-spacing": "off",
+    "vue/html-end-tags": "off",
+    "vue/html-indent": "off",
+    "vue/html-quotes": "off",
+    "vue/key-spacing": "off",
+    "vue/keyword-spacing": "off",
+    "vue/max-attributes-per-line": "off",
+    "vue/multiline-html-element-content-newline": "off",
+    "vue/mustache-interpolation-spacing": "off",
+    "vue/no-extra-parens": "off",
+    "vue/no-multi-spaces": "off",
+    "vue/no-spaces-around-equal-signs-in-attribute": "off",
+    "vue/object-curly-newline": "off",
+    "vue/object-curly-spacing": "off",
+    "vue/object-property-newline": "off",
+    "vue/operator-linebreak": "off",
+    "vue/script-indent": "off",
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/space-in-parens": "off",
+    "vue/space-infix-ops": "off",
+    "vue/space-unary-ops": "off",
+    "vue/template-curly-spacing": "off",
+
     ...(includeDeprecated && {
       // Deprecated since version 4.0.0.
       // https://github.com/eslint/eslint/pull/8286
@@ -94,6 +184,9 @@ module.exports = {
       // Deprecated since version 3.3.0.
       // https://eslint.org/docs/rules/no-spaced-func
       "no-spaced-func": "off",
+      // Deprecated since version 7.0.0.
+      // https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md#700---2017-05-06
+      "react/jsx-space-before-closing": "off",
     }),
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-prettier",
-  "version": "7.2.0",
+  "version": "8.3.0",
   "license": "MIT",
   "author": "Simon Lydell",
   "description": "Turns off all rules that are unnecessary or might conflict with Prettier.",

package/react.js

@@ -1,28 +1,3 @@
-"use strict";
-
-const includeDeprecated = !process.env.ESLINT_CONFIG_PRETTIER_NO_DEPRECATED;
-
-module.exports = {
-  rules: {
-    "react/jsx-child-element-spacing": "off",
-    "react/jsx-closing-bracket-location": "off",
-    "react/jsx-closing-tag-location": "off",
-    "react/jsx-curly-newline": "off",
-    "react/jsx-curly-spacing": "off",
-    "react/jsx-equals-spacing": "off",
-    "react/jsx-first-prop-new-line": "off",
-    "react/jsx-indent": "off",
-    "react/jsx-indent-props": "off",
-    "react/jsx-max-props-per-line": "off",
-    "react/jsx-newline": "off",
-    "react/jsx-one-expression-per-line": "off",
-    "react/jsx-props-no-multi-spaces": "off",
-    "react/jsx-tag-spacing": "off",
-    "react/jsx-wrap-multilines": "off",
-    ...(includeDeprecated && {
-      // Deprecated since version 7.0.0.
-      // https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md#700---2017-05-06
-      "react/jsx-space-before-closing": "off",
-    }),
-  },
-};
+throw new Error(
+  '"prettier/react" has been merged into "prettier" in eslint-config-prettier 8.0.0. See: https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md#version-800-2021-02-21'
+);

package/standard.js

@@ -1,9 +1,3 @@
-"use strict";
-
-module.exports = {
-  rules: {
-    "standard/array-bracket-even-spacing": "off",
-    "standard/computed-property-even-spacing": "off",
-    "standard/object-curly-even-spacing": "off",
-  },
-};
+throw new Error(
+  '"prettier/standard" has been merged into "prettier" in eslint-config-prettier 8.0.0. See: https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md#version-800-2021-02-21'
+);

package/unicorn.js

@@ -1,9 +1,3 @@
-"use strict";
-
-module.exports = {
-  rules: {
-    "unicorn/empty-brace-spaces": "off",
-    "unicorn/no-nested-ternary": "off",
-    "unicorn/number-literal-case": "off",
-  },
-};
+throw new Error(
+  '"prettier/unicorn" has been merged into "prettier" in eslint-config-prettier 8.0.0. See: https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md#version-800-2021-02-21'
+);

package/vue.js

@@ -1,43 +1,3 @@
-"use strict";
-
-module.exports = {
-  rules: {
-    "vue/html-self-closing": 0,
-    "vue/max-len": 0,
-
-    "vue/array-bracket-newline": "off",
-    "vue/array-bracket-spacing": "off",
-    "vue/arrow-spacing": "off",
-    "vue/block-spacing": "off",
-    "vue/block-tag-newline": "off",
-    "vue/brace-style": "off",
-    "vue/comma-dangle": "off",
-    "vue/comma-spacing": "off",
-    "vue/comma-style": "off",
-    "vue/dot-location": "off",
-    "vue/func-call-spacing": "off",
-    "vue/html-closing-bracket-newline": "off",
-    "vue/html-closing-bracket-spacing": "off",
-    "vue/html-end-tags": "off",
-    "vue/html-indent": "off",
-    "vue/html-quotes": "off",
-    "vue/key-spacing": "off",
-    "vue/keyword-spacing": "off",
-    "vue/max-attributes-per-line": "off",
-    "vue/multiline-html-element-content-newline": "off",
-    "vue/mustache-interpolation-spacing": "off",
-    "vue/no-extra-parens": "off",
-    "vue/no-multi-spaces": "off",
-    "vue/no-spaces-around-equal-signs-in-attribute": "off",
-    "vue/object-curly-newline": "off",
-    "vue/object-curly-spacing": "off",
-    "vue/object-property-newline": "off",
-    "vue/operator-linebreak": "off",
-    "vue/script-indent": "off",
-    "vue/singleline-html-element-content-newline": "off",
-    "vue/space-in-parens": "off",
-    "vue/space-infix-ops": "off",
-    "vue/space-unary-ops": "off",
-    "vue/template-curly-spacing": "off",
-  },
-};
+throw new Error(
+  '"prettier/vue" has been merged into "prettier" in eslint-config-prettier 8.0.0. See: https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md#version-800-2021-02-21'
+);