Merge 42a5e9a into 626fbd7

unexpectedjs · Jan 12, 2019 · c90206a · c90206a
2 parents 626fbd7 + 42a5e9a
commit c90206a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,5 +1,5 @@
 const config = {
-  extends: ['pretty-standard'],
+  extends: ['prettier'],
   plugins: ['import', 'mocha'],
   rules: {
     'import/no-extraneous-dependencies': [
@@ -16,6 +16,14 @@ const config = {
     'mocha/no-exclusive-tests': 'error',
     'mocha/no-nested-tests': 'error',
     'mocha/no-identical-title': 'error'
+  },
+  parserOptions: {
+    ecmaVersion: 9,
+    ecmaFeatures: {
+      globalReturn: true,
+      jsx: true
+    },
+    sourceType: 'module'
   }
 };
 

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "coveralls": "^3.0.0",
     "es5-shim": "^4.5.9",
     "eslint": "^5.11.1",
-    "eslint-config-pretty-standard": "^2.0.0",
+    "eslint-config-prettier": "^3.3.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-mocha": "^5.2.0",
     "eslint-plugin-prettier": "^3.0.1",