Merge pull request #17 from htmlacademy/feature/move-to-4

Feature/move to 4

Author: zeckson

README.md

@@ -14,9 +14,9 @@ $ npm install --save-dev eslint eslint-config-htmlacademy
 
 Once the `eslint-config-htmlacademy` package is installed, you can use it by specifying `htmlacademy` in the [`extends`](http://eslint.org/docs/user-guide/configuring#extending-configuration-files) section of your [ESLint configuration](http://eslint.org/docs/user-guide/configuring).
 
-For validating ECMAScript 5 project use `es5` version:
+For validating **ECMAScript 5** project use `es5` version:
 
-```js
+```json
 {
   "extends": "htmlacademy/es5",
   "rules": {
@@ -25,10 +25,17 @@ For validating ECMAScript 5 project use `es5` version:
 }
 ```
 
-For validating ECMAScript 6 project use `es6` version:
+For validating **ECMAScript 2015 (ES6)** project use `es6` version:
 
-```js
+```json
 {
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "env": {
+    "es6": true
+  },
   "extends": "htmlacademy/es6",
   "rules": {
     // Additional rules...

es5.js

@@ -105,7 +105,7 @@ module.exports = {
       SwitchCase: 1,
       // continuation indent
       VariableDeclarator: 1, // indent is multiplier * indent = 1 * 2
-      MemberExpression: 2,   // indent is multiplier * indent = 1 * 2
+      MemberExpression: 2, // indent is multiplier * indent = 1 * 2
       FunctionDeclaration: {parameters: 2},
       FunctionExpression: {parameters: 2},
       CallExpression: {arguments: 2}

es6.js

@@ -11,7 +11,7 @@ module.exports = {
     'constructor-super': `error`, // eslint:recommended
     'generator-star-spacing': [`error`, `after`],
     'no-new-symbol': `error`, // eslint:recommended
-    'no-this-before-super': `error`,  // eslint:recommended
+    'no-this-before-super': `error`, // eslint:recommended
     'no-var': `error`,
     'prefer-rest-params': `error`,
     'prefer-spread': `error`,

package.json

@@ -43,10 +43,9 @@
   },
   "homepage": "https://github.com/htmlacademy/eslint-config-htmlacademy#readme",
   "peerDependencies": {
-    "eslint": ">=3.9.0"
+    "eslint": ">=4.2.0"
   },
   "devDependencies": {
-    "babel-eslint": "7.1.1",
-    "eslint": "3.10.2"
+    "eslint": "4.2.0"
   }
 }

test/es5/eslint.js

@@ -104,7 +104,7 @@ module.exports = {
       SwitchCase: 1,
       // continuation indent
       VariableDeclarator: 1, // indent is multiplier * indent = 1 * 2
-      MemberExpression: 1,   // indent is multiplier * indent = 1 * 2
+      MemberExpression: 1, // indent is multiplier * indent = 1 * 2
       FunctionDeclaration: {parameters: 2},
       FunctionExpression: {parameters: 2},
       CallExpression: {arguments: 2}

test/es6/.eslintrc.js

@@ -1,5 +1,8 @@
-let config = require('../../es6');
-config.parser = 'babel-eslint';
+const config = require('../../es6');
+config.parserOptions = {
+  ecmaVersion: 6,
+  sourceType: 'module'
+};
 config.env = {
   'es6': true,
   'browser': true,

test/es6/eslint.js

@@ -11,7 +11,7 @@ module.exports = {
     'constructor-super': `error`, // eslint:recommended
     'generator-star-spacing': [`error`, `after`],
     'no-new-symbol': `error`, // eslint:recommended
-    'no-this-before-super': `error`,  // eslint:recommended
+    'no-this-before-super': `error`, // eslint:recommended
     'no-var': `error`,
     'prefer-rest-params': `error`,
     'prefer-spread': `error`,