Merge pull request #11 from namics/develop

v4.0.0
merkle-open · Jul 14, 2017 · 0756323 · 0756323
2 parents 475bf85 + df400a7
commit 0756323
Show file tree

Hide file tree

Showing 12 changed files with 459 additions and 375 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 ## Installation
 ```bash
-$ npm install --save-dev eslint eslint-plugin-import @namics/eslint-config
+$ npm install --save-dev @namics/eslint-config
 ```
 
 ## Usage
@@ -26,16 +26,8 @@ module.exports = {
 };
 ```
 
-### with flow
-Flowtype rules will be accepted if the flow annotation was defined in first line of each file.
-```
-module.exports = {
-  "extends": [
-    "@namics/eslint-config/configurations/es6-react.js",
-    "@namics/eslint-config/configurations/flow.js"
-  ]
-};
-```
+####
+- [configuration with flowtype](./documentation/with-flow.md)
 
 ### .eslintignore
 ```
@@ -83,9 +75,6 @@ then run `npm run lint`
 * [AirBnB](https://github.com/airbnb) for sharing their eslint config in [JavaScript Style Guide](https://github.com/airbnb/javascript)
 * [Gajus Kuizinas](https://github.com/gajus) for eslint-plugin-flowtype [eslint-plugin-flowtype](https://github.com/gajus/eslint-plugin-flowtype)
 
-## Roadmap
-- Support for ES2016 (ES7)
-
 ## License
 [MIT License](./LICENSE)
 

diff --git a/configurations/es6-react.js b/configurations/es6-react.js
@@ -19,14 +19,11 @@ module.exports = {
 		'ecmaVersion': 6,
 		'sourceType': 'module',
 		'ecmaFeatures': {
-			'generators': false,
+			'generators': true,
 			'objectLiteralDuplicateProperties': false,
 			'jsx': true,
 		},
 	},
-	'ecmaFeatures': {
-		'jsx': true,
-	},
 	'settings': {
 		'import/resolver': {
 			'node': {

diff --git a/documentation/react-a11y.md b/documentation/react-a11y.md
@@ -101,16 +101,14 @@
 > disallow href "#"
 
 
-&#10003; Enabled (error)
+&#10003; Disabled
 
 ```javascript
 
 // Bad
-/*
 <a href="#" />;
 <a href={"#"} />;
 <a href={`#`} />;
-*/
 
 // Good
 <a href="https://github.com" />;
@@ -184,16 +182,14 @@ function Foo({ alt, src }) {
 > require that JSX labels use "htmlFor"
 
 
-&#10003; Enabled (error)
+&#10003; Disabled
 
 ```javascript
 
 // Bad
-/*
 function Foo(props) {
 	return <label {...props} />;
 }
-*/
 
 // Good
 function Foo({ htmlFor, props }) {

diff --git a/documentation/with-flow.md b/documentation/with-flow.md
@@ -0,0 +1,10 @@
+### with flow
+Flowtype rules will be accepted if the flow annotation was defined in first line of each file.
+```
+module.exports = {
+  "extends": [
+    "@namics/eslint-config/configurations/es6-react.js",
+    "@namics/eslint-config/configurations/flow.js"
+  ]
+};
+```
diff --git a/package.json b/package.json
@@ -1,12 +1,13 @@
 {
 	"name": "@namics/eslint-config",
-	"version": "3.0.0",
+	"version": "4.0.0",
 	"description": "Default configurations for eslint",
 	"author": "Simon Mollweide <simon.mollweide@namics.com>",
 	"license": "MIT",
 	"private": false,
 	"engines": {
-		"node": ">= 4.4.0"
+		"node": ">=4 <9",
+		"npm": ">=3 <6"
 	},
 	"repository": {
 		"type": "git",
@@ -34,17 +35,14 @@
 		"react",
 		"jsx"
 	],
-	"peerDependencies": {
-		"eslint": "^3.0.0",
-		"eslint-plugin-import": "^2.0.0"
-	},
 	"dependencies": {
 		"babel-eslint": "7.2.3",
-		"eslint": "3.19.0",
-		"eslint-find-rules": "1.14.3",
-		"eslint-plugin-flowtype": "2.34.0",
-		"eslint-plugin-jsx-a11y": "5.0.3",
-		"eslint-plugin-react": "7.0.1",
-		"flow-bin": "0.47.0"
+		"eslint": "4.2.0",
+		"eslint-find-rules": "3.1.1",
+		"eslint-plugin-flowtype": "2.35.0",
+		"eslint-plugin-import": "2.7.0",
+		"eslint-plugin-jsx-a11y": "6.0.2",
+		"eslint-plugin-react": "7.1.0",
+		"flow-bin": "0.50.0"
 	}
 }
diff --git a/rules/react-a11y.js b/rules/react-a11y.js
@@ -19,7 +19,7 @@ module.exports = {
 
 		// disallow href "#"
 		// https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/href-no-hash.md
-		'jsx-a11y/href-no-hash': 2,
+		'jsx-a11y/href-no-hash': 0,
 
 		// Require <img> to have a non-empty `alt` prop, or role="presentation"
 		// https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/img-has-alt.md
@@ -31,7 +31,7 @@ module.exports = {
 
 		// require that JSX labels use "htmlFor"
 		// https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/label-has-for.md
-		'jsx-a11y/label-has-for': 2,
+		'jsx-a11y/label-has-for': 0,
 
 		// require that mouseover/out come with focus/blur, for keyboard-only users
 		// https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/mouse-events-have-key-events.md

diff --git a/test/es5/rules/best-practices/no-unused-labels.js b/test/es5/rules/best-practices/no-unused-labels.js
@@ -6,6 +6,7 @@
 /* eslint no-labels: 0*/
 /* eslint no-extra-label: 0*/
 /* eslint no-restricted-syntax: 0*/
+/* eslint indent: 0*/
 // <!START
 // Bad
 /*

diff --git a/test/es5/rules/errors/no-unexpected-multiline.js b/test/es5/rules/errors/no-unexpected-multiline.js
@@ -14,6 +14,7 @@
 /* eslint no-unused-expressions: 0*/
 /* eslint semi: 0*/
 /* eslint quotes: 0*/
+/* eslint indent: 0*/
 // <!START
 // Bad
 let a = function () {}

diff --git a/test/es6-react/rules/react-a11y/href-no-hash.js b/test/es6-react/rules/react-a11y/href-no-hash.js
@@ -20,16 +20,13 @@
 /* eslint react/jsx-indent: 0*/
 // <!START
 // Bad
-/*
 <a href="#" />;
-<a href={"#"} />;
-<a href={`#`} />;
-*/
+<a href={'#'} />;
+<a href={'#'} />;
 
 // Good
 <a href="https://github.com" />;
 <a href="#section" />;
 <a href="foo" />;
 <a href={undefined} />;
 // END!>
-
diff --git a/test/es6-react/rules/react/jsx-curly-spacing.js b/test/es6-react/rules/react/jsx-curly-spacing.js
@@ -32,8 +32,7 @@
 <Hello name={firstname} />;
 <Hello name={{ firstname: 'John', lastname: 'Doe' }} />;
 <Hello name={
-  firstname
+	firstname
 }
 />;
 // END!>
-
diff --git a/test/flow/rules/flow/object-type-delimiter.js b/test/flow/rules/flow/object-type-delimiter.js
@@ -29,7 +29,7 @@ type Foo2Type = {
 // GOOD
 type FooType = { a: string, b: string };
 type Foo2Type = {
-    a: string,
-    b: string,
+	a: string,
+	b: string,
 };
 // END!>