Merge pull request #45 from htmlacademy/feature/update-source

Release 1.0.0

README.md

@@ -61,5 +61,25 @@ For validating **ECMAScript 2015 (ES6)** in **Node.js** environment project use
   }
 }
 ```
+
+For validating **ECMAScript 2018 (ES9)** project use `es9` version:
+
+```json
+{
+  "parserOptions": {
+    "ecmaVersion": 9,
+    "sourceType": "module"
+  },
+  "env": {
+    "es2017": true,
+    "browser": true,
+    "commonjs": true,
+  },
+  "extends": "htmlacademy/basic",
+  "rules": {
+    // Additional rules...
+  }
+}
+```
 [travis-image]: https://travis-ci.org/htmlacademy/eslint-config-htmlacademy.svg?branch=master
 [travis-url]: https://travis-ci.org/htmlacademy/eslint-config-htmlacademy

basic.js

@@ -0,0 +1,25 @@
+module.exports = {
+  extends: 'eslint:recommended',
+  rules: {
+    // Possible Errors
+    // https://eslint.org/docs/rules/#possible-errors
+    // ---------------------------------------------
+    'no-console': 'error',
+    // Stylistic Issues
+    // https://eslint.org/docs/rules/#stylistic-issues
+    // ---------------------------------------------
+    'comma-dangle': ['error', {
+      'arrays': 'always-multiline',
+      'objects': 'always-multiline',
+      'functions': 'always-multiline',
+    }],
+    'indent': ['error', 2, {
+      SwitchCase: 1,
+    }],
+    'quotes': ['error', 'single'],
+    // ECMAScript 6
+    // https://eslint.org/docs/rules/#ecmascript-6
+    // ---------------------------------------------
+    'no-var': ['error'],
+  },
+};

changelog.md

@@ -1,3 +1,13 @@
+1.0.0 / 2021-01-08
+==================
+
+  * 1.0.0
+  * update eslint to 7.16.0
+  * adds ES9 configuration extending eslint:recommended rules
+  * adds tests for es9 configuration
+  * updates README.md according to new configuration
+  * fixes tests for es5 and es6 configurations
+
 0.6.0 / 2020-09-09
 ==================
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-htmlacademy",
-  "version": "0.6.0",
+  "version": "1.0.0",
   "description": "ESLint shareable config for the HTML Academy style",
   "files": [
     "es5.js",
@@ -45,9 +45,9 @@
   },
   "homepage": "https://github.com/htmlacademy/eslint-config-htmlacademy#readme",
   "peerDependencies": {
-    "eslint": ">=4.2.0"
+    "eslint": ">=7.16.0"
   },
   "devDependencies": {
-    "eslint": "4.2.0"
+    "eslint": "7.16.0"
   }
 }

test/basic/.eslintrc.js

@@ -0,0 +1,13 @@
+const config = require('../../basic');
+
+config.parserOptions = {
+  ecmaVersion: 9,
+  sourceType: 'module',
+};
+config.env = {
+  'es2017': true,
+  'browser': true,
+  'commonjs': true,
+};
+
+module.exports = config;

test/basic/comma-dangles.js

@@ -0,0 +1,29 @@
+const arr0 = ['a', 'b', 'c'];
+const arr1 = [
+  'a',
+  'b',
+  'c',
+];
+
+const obj0 = {q: 'q', w: 'w'};
+const obj1 = {
+  q: 'q',
+  w: 'w',
+};
+
+const func0 = (a, b) => {
+  return a + b;
+};
+const func1 = (
+  a,
+  b,
+) => {
+  return a + b;
+};
+
+func0(
+  obj0.a,
+  obj0.b,
+);
+
+throw new Error(arr0, arr1, obj0, obj1, func0, func1);

test/basic/eslint.js

@@ -0,0 +1,25 @@
+module.exports = {
+  extends: 'eslint:recommended',
+  rules: {
+    // Possible Errors
+    // https://eslint.org/docs/rules/#possible-errors
+    // ---------------------------------------------
+    'no-console': 'error',
+    // Stylistic Issues
+    // https://eslint.org/docs/rules/#stylistic-issues
+    // ---------------------------------------------
+    'comma-dangle': ['error', {
+      'arrays': 'always-multiline',
+      'objects': 'always-multiline',
+      'functions': 'always-multiline',
+    }],
+    'indent': ['error', 2, {
+      SwitchCase: 1,
+    }],
+    'quotes': ['error', 'single'],
+    // ECMAScript 6
+    // https://eslint.org/docs/rules/#ecmascript-6
+    // ---------------------------------------------
+    'no-var': ['error'],
+  },
+};

test/basic/indent.js

@@ -0,0 +1,50 @@
+'use strict';
+
+// Continuation, aka MemberExpression
+const promise = window.Promise.resolve(true);
+promise.
+  then(function (data) {
+    return data;
+  }).
+  then(function (truthy) {
+    return !truthy;
+  }).
+  catch(function () {
+    return false;
+  });
+
+// Function expression
+const fun = function (first, second) {
+  return first + second;
+};
+
+// Function declaration
+function Constructor(first, second) {
+  this.data = {
+    first: first,
+    second: second,
+  };
+}
+
+// Calling site arguments
+const myObject = new Constructor(
+  'Petya',
+  'Vasya',
+);
+myObject.toString();
+
+const result = fun(
+  'one',
+  'two',
+);
+result.toString();
+
+// Switch
+const a = 'a';
+
+switch(a) {
+  case 'a':
+    break;
+  case 'b':
+    break;
+}

test/basic/no-var.js

@@ -0,0 +1,4 @@
+let a = 0;
+const B = 'B';
+
+throw new Error (a, B);

test/basic/quotes.js

@@ -0,0 +1,6 @@
+const a = 'Anything string';
+const b = `Anything
+string`;
+const c = `This's a ${a}`;
+
+throw new Error(a, b, c);

test/es5/.eslintrc.js

@@ -1,8 +1,11 @@
-let config = require('../../es5');
+'use strict';
+
+var config = require('../../es5');
+
 config.env = {
   'es6': false,
   'browser': true,
   'commonjs': true
 };
 
-module.exports = config;
+module.exports = config;

test/es6/.eslintrc.js

@@ -1,21 +1,21 @@
-const config = require('../../es6');
-const es5config = require('../../es5');
+const config = require(`../../es6`);
+const es5config = require(`../../es5`);
 
 const es5Rules = es5config.rules;
 
 config.rules = {
-  ...config.rules,
-  ...es5Rules
+  ...es5Rules,
+  ...config.rules
 };
 
 config.parserOptions = {
-  ecmaVersion: 6,
-  sourceType: 'module'
+  ecmaVersion: 9,
+  sourceType: `module`
 };
 config.env = {
   'es6': true,
   'browser': true,
   'commonjs': true
 };
 
-module.exports = config;
+module.exports = config;

test/node/.eslintrc.js

@@ -1,7 +1,7 @@
-const config = require('../../node');
+const config = require(`../../node`);
 config.parserOptions = {
   ecmaVersion: 6,
-  sourceType: 'module'
+  sourceType: `module`
 };
 config.env = {
   'es6': true,
@@ -10,4 +10,4 @@ config.env = {
   'commonjs': true
 };
 
-module.exports = config;
+module.exports = config;