[new] support es2016

README.md

@@ -11,13 +11,22 @@
 $ npm install --save-dev eslint eslint-plugin-import @namics/eslint-config
 ```
 
-## Usage
-- `@namics/eslint-config/configurations/es6-browser` - ES6 + browser
-- `@namics/eslint-config/configurations/es6-react` - ES6 + react
+## Usage ES7 (ES2016)
+- `@namics/eslint-config/configurations/es7-browser` - ES7 + browser
+- `@namics/eslint-config/configurations/es7-react` - ES7 + react
+- `@namics/eslint-config/configurations/es7-node` - ES7 + node
+
+## Usage ES6 (ES2015) - deprecated
+- `@namics/eslint-config/configurations/es6-browser` - ES6 + browser (deprecated)
+- `@namics/eslint-config/configurations/es6-react` - ES6 + react (deprecated)
 - `@namics/eslint-config/configurations/es6-node` - ES6 + node
-- `@namics/eslint-config/configurations/flow` - flow
-- `@namics/eslint-config/configurations/es5-browser` - ES5 + browser (deprecated)
-- `@namics/eslint-config/configurations/es5-node` - ES5 + node (deprecated)
+
+## Usage with Flow
+- [configuration with flowtype](./documentation/with-flow.md)
+
+## Usage with Prettier
+- [configuration with prettier](./documentation/with-prettier.md)
+
 
 ### .eslintrc.js (add globals here if needed)
 ```
@@ -26,10 +35,6 @@ module.exports = {
 };
 ```
 
-####
-- [configuration with flowtype](./documentation/with-flow.md)
-- [configuration with prettier](./documentation/with-prettier.md)
-
 ### .eslintignore
 ```
 /.idea/
@@ -46,28 +51,28 @@ module.exports = {
 then run `npm run lint`
 
 ### Example usage in project tree
-- .eslintrc.js (es6-react)
+- .eslintrc.js (es7-react)
 - .eslintignore
 - src
     - app.jsx
 - test
-    - .eslintrc.js (es6-node)
+    - .eslintrc.js (es7-node)
     - index.js
 - scripts
-    - .eslintrc.js (es5-node)
+    - .eslintrc.js (es6-node)
     - index.js
 
 ## Documentation
-- [Best practices](./documentation/best-practices.md) (ES5 + ES6)
-- [Style](./documentation/style.md) (ES5 + ES6)
-- [Variables](./documentation/variables.md) (ES5 + ES6)
-- [Errors](./documentation/errors.md) (ES5 + ES6)
-- [Node](./documentation/node.md) (ES5 + ES6)
-- [ES6](./documentation/es6.md) (ES6)
-- [Imports](./documentation/imports.md) (ES6)
-- [React](./documentation/react.md) (ES6)
-- [React A11y](./documentation/react-a11y.md) (ES6)
-- [Flow](./documentation/flow.md) (ES6)
+- [Best practices](./documentation/best-practices.md) (ES5/6/7)
+- [Style](./documentation/style.md) (ES5/6/7)
+- [Variables](./documentation/variables.md) (ES5/6/7)
+- [Errors](./documentation/errors.md) (ES5/6/7)
+- [Node](./documentation/node.md) (ES5/6/7)
+- [ES6](./documentation/es6.md) (ES6/7)
+- [Imports](./documentation/imports.md) (ES6/7)
+- [React](./documentation/react.md) (ES6/7)
+- [React A11y](./documentation/react-a11y.md) (ES6/7)
+- [Flow](./documentation/flow.md) (ES6/7)
 
 ## Thanks to
 * [Namics.](https://www.namics.com/en/)

configurations/es6-browser.js

@@ -7,8 +7,12 @@ module.exports = {
 		browser: true,
 		node: false,
 		amd: false,
-		mocha: false,
-		jasmine: false,
+		mocha: true,
+		jasmine: true,
+		jest: true,
+		jquery: true,
+		serviceworker: true,
+		worker: true,
 	},
 
 };

configurations/es6-node.js

@@ -8,8 +8,12 @@ module.exports = {
 		browser: false,
 		node: true,
 		amd: false,
-		mocha: false,
-		jasmine: false,
+		mocha: true,
+		jasmine: true,
+		jest: true,
+		jquery: true,
+		serviceworker: true,
+		worker: true,
 	},
 
 };

configurations/es6-react.js

@@ -32,7 +32,7 @@ module.exports = {
 		},
 		'react': {
 			'pragma': 'React',
-			'version': '0.15',
+			'version': '16',
 		},
 	},
 

configurations/es7-browser-disable-styles.js

@@ -0,0 +1,7 @@
+module.exports = {
+
+	extends: [
+		'./es7-disable-styles.js',
+	].map(require.resolve),
+
+};

configurations/es7-browser.js

@@ -0,0 +1,17 @@
+module.exports = {
+
+	extends: [
+		'./es7.js',
+	].map(require.resolve),
+	env: {
+		browser: true,
+		node: false,
+		amd: false,
+		mocha: true,
+		jasmine: true,
+		jest: true,
+		jquery: true,
+		serviceworker: true,
+		worker: true,
+	},
+};

configurations/es7-disable-styles.js

@@ -0,0 +1,12 @@
+module.exports = {
+
+	extends: [
+		'../rules/best-practices-disable-styles.js',
+		'../rules/errors-disable-styles.js',
+		'../rules/style-disable-styles.js',
+		'../rules/variables-disable-styles.js',
+		'../rules/imports-disable-styles.js',
+		'../rules/es6-disable-styles.js',
+	].map(require.resolve),
+
+};

configurations/es7-node-disable-styles.js

@@ -0,0 +1,8 @@
+module.exports = {
+
+	extends: [
+		'./es7-disable-styles.js',
+		'../rules/node-disable-styles.js',
+	].map(require.resolve),
+
+};

configurations/es7-node.js

@@ -0,0 +1,19 @@
+module.exports = {
+
+	extends: [
+		'./es7.js',
+		'../rules/node.js',
+	].map(require.resolve),
+	env: {
+		browser: false,
+		node: true,
+		amd: false,
+		mocha: true,
+		jasmine: true,
+		jest: true,
+		jquery: true,
+		serviceworker: true,
+		worker: true,
+	},
+
+};

configurations/es7-react-disable-styles.js

@@ -0,0 +1,8 @@
+module.exports = {
+	'extends': [
+		'./es7-disable-styles.js',
+		'../rules/react-disable-styles.js',
+		'../rules/react-a11y-disable-styles.js',
+	].map(require.resolve),
+
+};

configurations/es7-react.js

@@ -0,0 +1,37 @@
+module.exports = {
+	'plugins': [
+		'jsx-a11y',
+		'react',
+	],
+	'extends': [
+		'./es7.js',
+		'../rules/react.js',
+		'../rules/react-a11y.js',
+	].map(require.resolve),
+	'env': {
+		'browser': true,
+		'node': false,
+		'amd': false,
+		'mocha': true,
+		'jasmine': true,
+		'jest': true,
+		'jquery': true,
+		'serviceworker': true,
+		'worker': true,
+	},
+	'parserOptions': {
+		'ecmaVersion': 7,
+		'sourceType': 'module',
+		'ecmaFeatures': {
+			'jsx': true,
+		},
+	},
+	'settings': {
+		'import/resolver': {
+			'node': {
+				'extensions': ['.js', '.jsx', '.json'],
+			},
+		},
+	},
+
+};

configurations/es7.js

@@ -0,0 +1,32 @@
+module.exports = {
+
+	env: {
+		es6: true,
+	},
+	plugins: [
+		'import',
+	],
+
+	settings: {
+		'import/resolver': {
+			node: {
+				extensions: ['.js', '.json'],
+			},
+		},
+	},
+	extends: [
+		'../rules/node-disable.js',
+		'../rules/best-practices.js',
+		'../rules/errors.js',
+		'../rules/style.js',
+		'../rules/variables.js',
+		'../rules/imports.js',
+		'../rules/es6.js',
+	].map(require.resolve),
+
+	parserOptions: {
+		ecmaVersion: 7,
+		sourceType: 'module',
+	},
+
+};

documentation/with-flow.md

@@ -3,7 +3,7 @@ Flowtype rules will be accepted if the flow annotation was defined in first line
 ```
 module.exports = {
   "extends": [
-    "@namics/eslint-config/configurations/es6-react.js",
+    "@namics/eslint-config/configurations/es7-react.js",
     "@namics/eslint-config/configurations/flow.js"
   ]
 };

documentation/with-prettier.md

@@ -1,31 +1,31 @@
 ## with prettier
 
-### ES6 + Prettier
+### ES7 (ES2016) + Prettier
 ```
 module.exports = {
   "extends": [
-    "@namics/eslint-config/configurations/es6-browser.js",
-    "@namics/eslint-config/configurations/es6-browser-disable-styles.js"
+    "@namics/eslint-config/configurations/es7-browser.js",
+    "@namics/eslint-config/configurations/es7-browser-disable-styles.js"
   ]
 };
 ```
 
-### ES6 + React + Prettier
+### ES7 (ES2016) + React + Prettier
 ```
 module.exports = {
   "extends": [
-    "@namics/eslint-config/configurations/es6-react.js",
-    "@namics/eslint-config/configurations/es6-react-disable-styles.js"
+    "@namics/eslint-config/configurations/es7-react.js",
+    "@namics/eslint-config/configurations/es7-react-disable-styles.js"
   ]
 };
 ```
 
-### ES6 + React + Flow + Prettier
+### ES7 (ES2016) + React + Flow + Prettier
 ```
 module.exports = {
   "extends": [
-    "@namics/eslint-config/configurations/es6-react.js",
-    "@namics/eslint-config/configurations/es6-react-disable-styles.js",
+    "@namics/eslint-config/configurations/es7-react.js",
+    "@namics/eslint-config/configurations/es7-react-disable-styles.js",
     "@namics/eslint-config/configurations/flow.js",
     "@namics/eslint-config/configurations/flow-disable-styles.js"
   ]

test/es6-react-disable-styles/rules/react/no-did-mount-set-state.js

@@ -21,32 +21,37 @@
 // <!START
 // Bad
 /*
-const Hello = React.createClass({
+class Hello extends Component {
 	componentDidMount() {
 		this.setState({
- 			isLoading: true
+			isLoading: true
 		});
 	},
 	render() {
-		return <div>Hello {this.state.name}</div>;
+		return (
+			<div>
+				Hello {this.state.name}
+		</div>
+		);
 	}
-});
+}
 */
 
 // Good
-const Hello = React.createClass({
-  constructor() {
-    // initialState
-    this.state = {
-      isLoading: true
-    };
-  },
-  render() {
-    return (
-      <div>
-        Hello {this.state.name}
-      </div>
-    );
-  }
-});
+class Hello extends Component {
+	constructor() {
+      // initialState
+      this.state = {
+        isLoading: true
+      };
+    }
+
+	render() {
+      return (
+        <div>
+          Hello {this.state.name}
+        </div>
+      );
+    }
+}
 // END!>

test/es6-react-disable-styles/rules/react/no-did-update-set-state.js

@@ -20,15 +20,15 @@
 // <!START
 // Bad
 /*
-const Hello = React.createClass({
+class Hello extends Component {
 	componentDidUpdate() {
 		this.setState({
 			name: this.props.name.toUpperCase()
 		});
-	},
+	}
 	render() {
 		return <div>Hello {this.state.name}</div>;
 	}
-});
+}
 */
 // END!>