Merge pull request #48 from phanect/noconflict-typescript

phanect · web-flow · commit c4dd362cdfd5 · 2021-10-17T17:00:23.000+09:00
Add @typescript-eslint rules to noconflict config
diff --git a/README.md b/README.md
@@ -54,11 +54,16 @@ Or you can extend `plugin:editorconfig/all` instead of adding rules.
 Following rules may conflict `editorconfig/*` rule.
 It is recommended to disable them.
 
-- eol-last
-- indent
-- linebreak-style
-- no-trailing-spaces
-- unicode-bom
+- `eol-last`
+- `indent`
+- `linebreak-style`
+- `no-trailing-spaces`
+- `unicode-bom`
+- `@typescript-eslint/eol-last`
+- `@typescript-eslint/indent`
+- `@typescript-eslint/linebreak-style`
+- `@typescript-eslint/no-trailing-spaces`
+- `@typescript-eslint/unicode-bom`
 
 If above rules are specified in your .eslintrc, just remove them.
 If they are specified in the extended config, consider adding `plugin:editorconfig/noconflict` to your `extends`.
diff --git a/main.js b/main.js
@@ -16,6 +16,11 @@ module.exports = {
         "linebreak-style": "off",
         "no-trailing-spaces": "off",
         "unicode-bom": "off",
+        "@typescript-eslint/eol-last": "off",
+        "@typescript-eslint/indent": "off",
+        "@typescript-eslint/linebreak-style": "off",
+        "@typescript-eslint/no-trailing-spaces": "off",
+        "@typescript-eslint/unicode-bom": "off",
       },
     },
     all: {
@@ -25,6 +30,11 @@ module.exports = {
         "linebreak-style": "off",
         "no-trailing-spaces": "off",
         "unicode-bom": "off",
+        "@typescript-eslint/eol-last": "off",
+        "@typescript-eslint/indent": "off",
+        "@typescript-eslint/linebreak-style": "off",
+        "@typescript-eslint/no-trailing-spaces": "off",
+        "@typescript-eslint/unicode-bom": "off",
 
         "editorconfig/charset": "error",
         "editorconfig/eol-last": "error",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-editorconfig",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "An ESLint plugin to enforce EditorConfig rules",
   "main": "main.js",
   "scripts": {
diff --git a/test-packages/base-rules-conflict/.eslintrc.js b/test-packages/base-rules-conflict/.eslintrc.js
@@ -2,6 +2,7 @@
 
 module.exports = {
   root: true,
+  extends: "plugin:editorconfig/noconflict",
 
   env: {
     es6: true,
diff --git a/test-packages/js/.eslintrc.js b/test-packages/js/.eslintrc.js
@@ -2,6 +2,7 @@
 
 module.exports = {
   root: true,
+  extends: "plugin:editorconfig/noconflict",
 
   env: {
     es6: true,
diff --git a/test-packages/ts/.eslintrc.js b/test-packages/ts/.eslintrc.js
@@ -2,6 +2,7 @@
 
 module.exports = {
   root: true,
+  extends: "plugin:editorconfig/noconflict",
 
   env: {
     es6: true,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "eslint-plugin-editorconfig",`
`3`		`- "version": "3.1.0",`
	`3`	`+ "version": "3.2.0",`
`4`	`4`	`"description": "An ESLint plugin to enforce EditorConfig rules",`
`5`	`5`	`"main": "main.js",`
`6`	`6`	`"scripts": {`