Merge pull request #70 from peopledoc/refactor/v3

Define an ember-core, update configuration to follow recent ember changes

Author: GreatWizard

README.md

@@ -58,12 +58,6 @@ extends: ['peopledoc/ember']
 extends: ['peopledoc/ember-addon']
 ```
 
-**Ember Test:**
-
-```js
-extends: ['peopledoc/ember-test']
-```
-
 **ES5 only**
 
 ```js
@@ -78,19 +72,7 @@ extends: ['peopledoc/prettier']
 
 ### Formatting Code
 
-We recommend to use prettier-eslint in order to format it with `prettier` ([why?](https://prettier.io/docs/en/why-prettier.html)) then fix issue with `eslint --fix`:
-
-```shell
-./node_modules/.bin/prettier-eslint --list-different --single-quote {app,config,mirage,server,tests}/{**/,}*.js
-```
-
-Once you have review change you can write them with
-
-```shell
-./node_modules/.bin/prettier-eslint --write --single-quote {app,config,mirage,server,tests}/{**/,}*.js
-```
-
-:bulb: We recommend to add a custom `format` script to your _package.json_ so you can run `npm format`.
+We recommend to use `eslint . --fix`.
 
 ## License
 

core.js

@@ -6,10 +6,10 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: "module"
   },
-  extends: [],
   rules: {
     // ES6
     "arrow-parens": ["error", "always"],
+    "comma-dangle": ["error", "never"],
     "eol-last": ["error", "always"],
     "generator-star-spacing": ["error", { before: false, after: true }],
     "no-var": "error",
@@ -35,7 +35,8 @@ module.exports = {
       }
     ],
     "arrow-spacing": [
-      "error", {
+      "error",
+      {
         before: true,
         after: true
       }

ember-addon.js

@@ -1,47 +1,18 @@
 module.exports = {
-  parser: "babel-eslint",
-  parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: "module",
-    ecmaFeatures: {
-      legacyDecorators: true
-    }
-  },
-  plugins: [
-    "ember",
-    "ember-suave"
-  ],
-  extends: [
-    "eslint:recommended",
-    "plugin:ember/recommended",
-    "plugin:ember-suave/recommended",
-    "./core.js"
-  ],
-  env: {
-    browser: true
-  },
-  rules: {
-    "ember/no-jquery": "warn",
-    "ember-suave/require-access-in-comments": "off"
-  },
+  extends: ["./ember-core.js"],
   overrides: [
     // node files
     {
       files: [
-        ".eslintrc.js",
-        ".template-lintrc.js",
-        "ember-cli-build.js",
-        "index.js",
-        "testem.js",
-        "blueprints/*/index.js",
-        "config/**/*.js",
-        "tests/dummy/config/**/*.js"
-      ],
-      excludedFiles: [
-        "addon/**",
-        "addon-test-support/**",
-        "app/**",
-        "tests/dummy/app/**"
+        "./.eslintrc.js",
+        "./.prettierrc.js",
+        "./.template-lintrc.js",
+        "./ember-cli-build.js",
+        "./index.js",
+        "./testem.js",
+        "./blueprints/*/index.js",
+        "./config/**/*.js",
+        "./tests/dummy/config/**/*.js"
       ],
       parserOptions: {
         sourceType: "script"
@@ -51,19 +22,10 @@ module.exports = {
         node: true
       },
       plugins: ["node"],
-      extends: ['plugin:node/recommended'],
-      rules: {
-        // this can be removed once the following is fixed
-        // https://github.com/mysticatea/eslint-plugin-node/issues/77
-        'node/no-unpublished-require': 'off'
-      }
-    },
-    // testem config file
-    {
-      files: ["testem.js"],
-      rules: {
-        camelcase: "off"
-      }
+      rules: Object.assign(
+        {},
+        require("eslint-plugin-node").configs.recommended.rules
+      )
     }
   ]
 }

ember-core.js

@@ -0,0 +1,38 @@
+module.exports = {
+  parser: "babel-eslint",
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: "module",
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
+  },
+  plugins: ["ember", "ember-suave"],
+  extends: [
+    "eslint:recommended",
+    "plugin:ember/recommended",
+    "plugin:ember-suave/recommended",
+    "plugin:prettier/recommended",
+    "./core.js"
+  ],
+  env: {
+    browser: true
+  },
+  rules: {
+    "prettier/prettier": ["error", { semi: false, singleQuote: true, trailingComma: "none" }]
+  },
+  overrides: [
+    // testem config file
+    {
+      files: ["./testem.js"],
+      rules: {
+        camelcase: "off"
+      }
+    },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended']
+    }
+  ]
+}

ember-test.js

@@ -1,40 +1,18 @@
 module.exports = {
-  parser: "babel-eslint",
-  parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: "module",
-    ecmaFeatures: {
-      legacyDecorators: true
-    }
-  },
-  plugins: [
-    "ember",
-    "ember-suave"
-  ],
-  extends: [
-    "eslint:recommended",
-    "plugin:ember/recommended",
-    "plugin:ember-suave/recommended",
-    "./core.js"
-  ],
-  env: {
-    browser: true
-  },
-  rules: {
-    "ember/no-jquery": "warn",
-    "ember-suave/require-access-in-comments": "off"
-  },
+  extends: ["./ember-core.js"],
   overrides: [
     // node files
     {
       files: [
-        ".eslintrc.js",
-        ".template-lintrc.js",
-        "ember-cli-build.js",
-        "testem.js",
-        "config/**/*.js",
-        "lib/*/index.js",
-        "server/**/*.js"
+        "./.eslintrc.js",
+        "./.prettierrc.js",
+        "./.template-lintrc.js",
+        "./ember-cli-build.js",
+        "./testem.js",
+        "./blueprints/*/index.js",
+        "./config/**/*.js",
+        "./lib/*/index.js",
+        "./server/**/*.js"
       ],
       parserOptions: {
         sourceType: "script"
@@ -44,19 +22,15 @@ module.exports = {
         node: true
       },
       plugins: ["node"],
-      extends: ['plugin:node/recommended'],
-      rules: {
-        // this can be removed once the following is fixed
-        // https://github.com/mysticatea/eslint-plugin-node/issues/77
-        'node/no-unpublished-require': 'off'
-      }
-    },
-    // testem config file
-    {
-      files: ["testem.js"],
-      rules: {
-        camelcase: "off"
-      }
+      rules: Object.assign(
+        {},
+        require("eslint-plugin-node").configs.recommended.rules,
+        {
+          // this can be removed once the following is fixed
+          // https://github.com/mysticatea/eslint-plugin-node/issues/77
+          "node/no-unpublished-require": "off"
+        }
+      )
     }
   ]
 }

ember.js

@@ -4,17 +4,16 @@
   "version": "2.0.2",
   "main": "index.js",
   "dependencies": {
-    "eslint-plugin-ember": "9.x.x",
-    "eslint-plugin-ember-suave": "2.x.x",
-    "eslint-plugin-es5": "1.x.x",
-    "eslint-plugin-node": "11.x.x",
-    "eslint-plugin-prettier": "3.x.x",
-    "prettier-eslint-cli": "5.x.x"
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-ember": "^10.4.2",
+    "eslint-plugin-ember-suave": "^2.0.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-qunit": "^6.1.1",
+    "prettier": "^2.3.0"
   },
   "files": [
-    "core.js",
     "ember-addon.js",
-    "ember-test.js",
     "ember.js",
     "es5.js",
     "index.js",
@@ -31,7 +30,6 @@
     "url": "https://github.com/peopledoc/eslint-config-peopledoc.git"
   },
   "engines": {
-    "node": ">= 8",
-    "npm": ">= 5.1"
+    "node": "12.* || 14.* || >= 16"
   }
 }