Merge pull request #45 from dabapps/fix-eslint-prettier-config

Extend eslint rules with prettier
dabapps · Sep 7, 2018 · 79e9330 · 79e9330
2 parents c248507 + bd45646
commit 79e9330
Show file tree

Hide file tree

Showing 14 changed files with 1,447 additions and 29 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-6.10.2
+10.5.0
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "es5"
+}
diff --git a/base/.eslintrc.json b/base/.eslintrc.json
@@ -1,9 +1,6 @@
 {
   "extends": [
-    "prettier"
-  ],
-  "plugins": [
-    "prettier"
+    "plugin:prettier/recommended"
   ],
   "rules": {
     "strict": [2, "global"],

diff --git a/browser/.eslintrc.json b/browser/.eslintrc.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../base/.eslintrc.json",
+  "extends": [
+    "../base/.eslintrc.json",
+    "plugin:prettier/recommended"
+  ],
   "globals": {
     "window": false,
     "performance": false,

diff --git a/commonjs/.eslintrc.json b/commonjs/.eslintrc.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../base/.eslintrc.json",
+  "extends": [
+    "../base/.eslintrc.json",
+    "plugin:prettier/recommended"
+  ],
   "env": {
     "commonjs": true
   }

diff --git a/es6/.eslintrc.json b/es6/.eslintrc.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../base/.eslintrc.json",
+  "extends": [
+    "../base/.eslintrc.json",
+    "plugin:prettier/recommended"
+  ],
   "env": {
     "es6": true
   },

diff --git a/jest/.eslintrc.json b/jest/.eslintrc.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../base/.eslintrc.json",
+  "extends": [
+    "../base/.eslintrc.json",
+    "plugin:prettier/recommended"
+  ],
   "env": {
     "jasmine": true,
     "jest": true

diff --git a/mocha/.eslintrc.json b/mocha/.eslintrc.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../base/.eslintrc.json",
+  "extends": [
+    "../base/.eslintrc.json",
+    "plugin:prettier/recommended"
+  ],
   "env": {
     "mocha": true
   }

diff --git a/node/.eslintrc.json b/node/.eslintrc.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../base/.eslintrc.json",
+  "extends": [
+    "../base/.eslintrc.json",
+    "plugin:prettier/recommended"
+  ],
   "env": {
     "node": true
   }