eslint-plugin-prettier 2.4.0 → 2.6.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## v2.6.2 (2018-07-06)
+
+* Fix: Add representation for \r to showInvisibles ([#100](https://github.com/prettier/eslint-plugin-prettier/issues/100)) ([731bbb5](https://github.com/prettier/eslint-plugin-prettier/commit/731bbb576ce422a5c73a1fa9750aa3466c7da928))
+* Docs: Add clarification about Flow/React support to readme ([#96](https://github.com/prettier/eslint-plugin-prettier/issues/96)) ([977aa77](https://github.com/prettier/eslint-plugin-prettier/commit/977aa77a119f22af3f8ca8d6f47e5bcfcc9e23fb))
+
+## v2.6.1 (2018-06-23)
+
+* Fix: respect editorconfig ([#92](https://github.com/prettier/eslint-plugin-prettier/issues/92)) ([0b04dd3](https://github.com/prettier/eslint-plugin-prettier/commit/0b04dd362d0d92534a7cf11eaebbab8eb59fc96d))
+
+## v2.6.0 (2018-02-02)
+
+* Update: Add option to skip loading prettierrc ([#83](https://github.com/prettier/eslint-plugin-prettier/issues/83)) ([9e0fb48](https://github.com/prettier/eslint-plugin-prettier/commit/9e0fb48d077214a81ac549731308ab11512c37cd))
+* Build: add Node 8 and 9 to Travis ([e5b5fa7](https://github.com/prettier/eslint-plugin-prettier/commit/e5b5fa74d06a06a53d04c4748b31e24fcd7a41b9))
+* Chore: add test for vue parsing ([1ab43fd](https://github.com/prettier/eslint-plugin-prettier/commit/1ab43fd601a67100cb03bbfe614203fd399d40bb))
+
+## v2.5.0 (2018-01-16)
+
+* Fix: pass filepath to prettier ([#76](https://github.com/prettier/eslint-plugin-prettier/issues/76)) ([0b6ab55](https://github.com/prettier/eslint-plugin-prettier/commit/0b6ab55e0a48e9c31cfa1d7f3b891100e0580493))
+* Update: Add URL to rule documentation to the metadata ([#75](https://github.com/prettier/eslint-plugin-prettier/issues/75)) ([804ead7](https://github.com/prettier/eslint-plugin-prettier/commit/804ead7406e12024a1f9c28628024e5d63b75854))
+
 ## v2.4.0 (2017-12-17)
 
 * New: Add 'recommended' configuration ([#73](https://github.com/prettier/eslint-plugin-prettier/issues/73)) ([e529b60](https://github.com/prettier/eslint-plugin-prettier/commit/e529b6004b278fb8de660c75d69381ea071b2114))

package/README.md

@@ -66,7 +66,7 @@ To integrate this plugin with `eslint-config-prettier`, you can use the `"recomm
   npm install --save-dev eslint-config-prettier
   ```
 
-2. Then all you need in your `.eslintrc.json` is:
+2. Then you need to add `plugin:prettier/recommended` as the last extension in your `.eslintrc.json`:
 
   ```json
   {
@@ -78,12 +78,27 @@ To integrate this plugin with `eslint-config-prettier`, you can use the `"recomm
 
 This does three things:
 
-1. Enables `eslint-plugin-prettier`.
-2. Sets the `prettier/prettier` rule to `"error"`.
-3. Extends the `eslint-config-prettier` configuration.
+* Enables `eslint-plugin-prettier`.
+* Sets the `prettier/prettier` rule to `"error"`.
+* Extends the `eslint-config-prettier` configuration.
 
 You can then set Prettier's own options inside a `.prettierrc` file.
 
+3. In order to support special ESLint plugins (e.g. [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react)), add extra exclusions for the plugins you use like so:
+
+```json
+{
+  "extends": [
+    "plugin:prettier/recommended",
+    "prettier/flowtype",
+    "prettier/react",
+    "prettier/standard"
+  ]
+}
+```
+
+For the list of every available exclusion rule set, please see the [readme of eslint-config-prettier](https://github.com/prettier/eslint-config-prettier/blob/master/README.md).
+
 ## Options
 
 > Note: While it is possible to pass options to Prettier via your ESLint configuration file, it is not recommended because editor extensions such as `prettier-atom` and `prettier-vscode` **will** read [`.prettierrc`](https://prettier.io/docs/en/configuration.html), but **won't** read settings from ESLint, which can lead to an inconsistent experience.
@@ -141,6 +156,24 @@ You can then set Prettier's own options inside a `.prettierrc` file.
     ```
 
     _This option is useful if you're migrating a large codebase and already use pragmas like `@flow`._
+  
+  - An object with the following options
+  
+    - `pragma`: Also sets the aforementioned `pragma`: a string with a pragma that triggers this rule. By default, this rule applies to all files. However, if you set a pragma (this option), only files with that pragma in the heading docblock will be checked. All pragmas must start with `@`.
+    
+      ```json
+      "prettier/prettier": ["error", null, {
+        "pragma": "@prettier"
+      }]
+      ```
+      
+    - `usePrettierrc`: Enables loading of the Prettier configuration file, (default: `true`). May be useful if you are using multiple tools that conflict with each other, or do not wish to mix your ESLint settings with your Prettier configuration.
+    
+      ```json
+      "prettier/prettier": ["error", null, {
+        "usePrettierrc": false
+      }]
+      ```
 
 * The rule is autofixable -- if you run `eslint` with the `--fix` flag, your code will be formatted according to `prettier` style.
 

package/eslint-plugin-prettier.js

@@ -100,6 +100,9 @@ function showInvisibles(str) {
       case '\t':
         ret += '↹'; // Left Arrow To Bar Over Right Arrow To Bar, \u21b9
         break;
+      case '\r':
+        ret += '␍'; // Carriage Return Symbol, \u240D
+        break;
       default:
         ret += str[i];
         break;
@@ -282,6 +285,25 @@ function reportReplace(context, offset, deleteText, insertText) {
   });
 }
 
+/**
+ * Get the pragma from the ESLint rule context.
+ * @param {RuleContext} context - The ESLint rule context.
+ * @returns {string|null}
+ */
+function getPragma(context) {
+  const pluginOptions = context.options[1];
+
+  if (!pluginOptions) {
+    return null;
+  }
+
+  const pragmaRef =
+    typeof pluginOptions === 'string' ? pluginOptions : pluginOptions.pragma;
+
+  // Remove leading @
+  return pragmaRef ? pragmaRef.slice(1) : null;
+}
+
 // ------------------------------------------------------------------------------
 //  Module Definition
 // ------------------------------------------------------------------------------
@@ -301,6 +323,9 @@ module.exports = {
   rules: {
     prettier: {
       meta: {
+        docs: {
+          url: 'https://github.com/prettier/eslint-plugin-prettier#options'
+        },
         fixable: 'code',
         schema: [
           // Prettier options:
@@ -310,15 +335,26 @@ module.exports = {
               { type: 'object', properties: {}, additionalProperties: true }
             ]
           },
-          // Pragma:
-          { type: 'string', pattern: '^@\\w+$' }
+          {
+            anyOf: [
+              // Pragma:
+              { type: 'string', pattern: '^@\\w+$' },
+              {
+                type: 'object',
+                properties: {
+                  pragma: { type: 'string', pattern: '^@\\w+$' },
+                  usePrettierrc: { type: 'boolean' }
+                },
+                additionalProperties: true
+              }
+            ]
+          }
         ]
       },
       create(context) {
-        const pragma = context.options[1]
-          ? context.options[1].slice(1) // Remove leading @
-          : null;
-
+        const pragma = getPragma(context);
+        const usePrettierrc =
+          !context.options[1] || context.options[1].usePrettierrc !== false;
         const sourceCode = context.getSourceCode();
         const source = sourceCode.text;
 
@@ -362,13 +398,18 @@ module.exports = {
                 ? FB_PRETTIER_OPTIONS
                 : context.options[0];
             const prettierRcOptions =
-              prettier.resolveConfig && prettier.resolveConfig.sync
-                ? prettier.resolveConfig.sync(context.getFilename())
+              usePrettierrc &&
+              prettier.resolveConfig &&
+              prettier.resolveConfig.sync
+                ? prettier.resolveConfig.sync(context.getFilename(), {
+                    editorconfig: true
+                  })
                 : null;
             const prettierOptions = Object.assign(
               {},
               prettierRcOptions,
-              eslintPrettierOptions
+              eslintPrettierOptions,
+              { filepath: context.getFilename() }
             );
 
             const prettierSource = prettier.format(source, prettierOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-prettier",
-  "version": "2.4.0",
+  "version": "2.6.2",
   "description": "Runs prettier as an eslint rule",
   "keywords": [
     "eslint",
@@ -41,8 +41,9 @@
     "eslint-plugin-self": "^1.0.1",
     "mocha": "^3.1.2",
     "moment": "^2.18.1",
-    "prettier": "^1.6.1",
-    "semver": "^5.3.0"
+    "prettier": "^1.10.2",
+    "semver": "^5.3.0",
+    "vue-eslint-parser": "^2.0.2"
   },
   "engines": {
     "node": ">=4.0.0"