Merge pull request SpareBank1#7 in FFE/ffe-spinner-react from feature…

…/FFE-130-eslint to master

* commit 'ad40dc0369dcb96dcb78a69c8c069372ca59409f':
  FFE-130 Upgrade eslint to use latest ffe config

.eslintrc

@@ -1,75 +1,3 @@
 {
-    "env": {
-        "es6": true,
-        "browser": true,
-        "node": true,
-        "mocha": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaVersion": 6,
-        "ecmaFeatures": {
-            "arrowFunctions": true,
-            "experimentalObjectRestSpread": true,
-            "jsx": true
-        },
-        "sourceType": "module"
-    },
-    "plugins": [
-        "react"
-    ],
-    "rules": {
-        "arrow-spacing": 2,
-        "brace-style": [2, "1tbs", { "allowSingleLine": true }],
-        "block-scoped-var": 2,
-        "camelcase": 2,
-        "comma-style": [2, "last"],
-        "curly": [2, "multi-line"],
-        "jsx-quotes": [2, "prefer-double"],
-        "linebreak-style": [2,"unix"],
-        "no-caller": 2,
-        "no-cond-assign": [2, "except-parens"],
-        "no-console": 1,
-        "no-constant-condition": 1,
-        "no-debugger": 2,
-        "no-empty": 2,
-        "no-eval": 2,
-        "no-extend-native": 2,
-        "no-irregular-whitespace": 2,
-        "no-iterator": 2,
-        "no-loop-func": 2,
-        "no-multi-str": 2,
-        "no-multiple-empty-lines": [2, {"max": 3, "maxEOF": 1}],
-        "no-new": 2,
-        "no-proto": 2,
-        "no-script-url": 2,
-        "no-sequences": 2,
-        "no-undef": 2,
-        "no-unused-vars": [2, { "vars": "all", "args": "none" }],
-        "no-with": 2,
-        "object-curly-spacing": [2, "always"],
-        "semi": [2, "always"],
-        "keyword-spacing": [2, {"before": true, "after": true}],
-        "space-before-function-paren": [2, "never"],
-        "space-before-blocks": [2, "always"],
-        "strict": 2,
-        "valid-typeof": 2,
-        "react/jsx-curly-spacing": [2, "always"],
-        "react/jsx-boolean-value": 0,
-        "react/jsx-no-duplicate-props": 2,
-        "react/jsx-no-undef": 2,
-        "react/jsx-uses-react": 2,
-        "react/jsx-uses-vars": 2,
-        "react/no-danger": 2,
-        "react/no-did-update-set-state": 1,
-        "react/no-direct-mutation-state": 2,
-        "react/no-multi-comp": 1,
-        "react/no-unknown-property": 2,
-        "react/react-in-jsx-scope": 2,
-        "react/self-closing-comp": 2,
-
-        // new
-        "dot-notation": [2, { "allowKeywords": true }],
-        "quotes": [2, "single"]
-    }
+    "extends": "ffe",
 }

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v.2.0.1
+* Upgrade eslint to use latest ffe config
+
 ## v.2.0.0
 * peerDependency on `ffe-core` bumped to `^8.0.2`
 * Added explicit dependency on `ffe-core` and `ffe-spinner`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffe-spinner-react",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Sparebank 1",
   "main": "lib/index.js",
   "scripts": {
@@ -15,25 +15,28 @@
     "postpublish": "git tag ${npm_package_version} && git push --tags"
   },
   "devDependencies": {
-    "budo": "^8.3.0",
-    "eslint-plugin-react": "^4.2.2",
-    "react": "^15.2.0",
-    "react-addons-test-utils": "^15.0.0",
-    "enzyme": "^2.0.0",
-    "react-dom": "^15.0.0",
+    "babel-cli": "^6.4.5",
     "babel-core": "^6.5.2",
     "babel-plugin-transform-object-rest-spread": "^6.5.0",
-    "babel-cli": "^6.4.5",
     "babel-preset-es2015": "^6.3.13",
     "babel-preset-react": "^6.5.0",
     "babel-register": "^6.4.3",
     "babelify": "^7.3.0",
+    "budo": "^8.3.0",
     "chai": "^3.5.0",
-    "eslint": "^2.4.0",
+    "enzyme": "^2.0.0",
+    "eslint": "^3.12.2",
+    "eslint-config-ffe": "^6.0.0",
+    "eslint-plugin-import": "^2.2.0",
+    "eslint-plugin-jsx-a11y": "^3.0.2",
+    "eslint-plugin-react": "^6.8.0",
     "mocha": "^2.4.5",
     "mocha-tap13": "0.0.3",
     "node-lessify": "^0.1.4",
-    "nsp": "^2.2.0"
+    "nsp": "^2.2.0",
+    "react": "^15.2.0",
+    "react-addons-test-utils": "^15.0.0",
+    "react-dom": "^15.0.0"
   },
   "peerDependencies": {
     "ffe-core": "^8.0.2",

src/index.test.js

@@ -1,3 +1,5 @@
+/*eslint-env mocha*/
+/*eslint no-unused-expressions:0*/
 import { expect } from 'chai';
 import DefaultSpinner, { Spinner, InlineSpinner, LargeSpinner } from './index';
 

src/inline-spinner.test.js

@@ -1,3 +1,5 @@
+/*eslint-env mocha*/
+/*eslint no-unused-expressions:0*/
 import React from 'react';
 import { expect } from 'chai';
 import { shallow } from 'enzyme';

src/large-spinner.test.js

@@ -1,3 +1,5 @@
+/*eslint-env mocha*/
+/*eslint no-unused-expressions:0*/
 import React from 'react';
 import { expect } from 'chai';
 import { shallow } from 'enzyme';

src/spinner.test.js

@@ -1,3 +1,5 @@
+/*eslint-env mocha*/
+/*eslint no-unused-expressions:0*/
 import React from 'react';
 import { expect } from 'chai';
 import { shallow } from 'enzyme';