diff --git a/.eslintrc b/.eslintrc index 281b143..c920316 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,9 +5,6 @@ "node": true, "es6": true }, - "plugins": [ - "react" - ], "ecmaFeatures": { "modules": true, "jsx": true @@ -21,18 +18,6 @@ "strict": [2, "global"], "no-underscore-dangle": 0, "quotes": [2, "single"], - "comma-dangle": 2, - "react/jsx-boolean-value": 1, - "react/jsx-quotes": 1, - "react/jsx-no-undef": 1, - "react/jsx-uses-react": 1, - "react/jsx-uses-vars": 1, - "react/no-did-mount-set-state": 1, - "react/no-did-update-set-state": 1, - "react/no-multi-comp": 1, - "react/no-unknown-property": 1, - "react/react-in-jsx-scope": 1, - "react/self-closing-comp": 1, - "react/wrap-multilines": 1 + "comma-dangle": 2 } } diff --git a/karma.conf.js b/karma.conf.js index d6ea1eb..f091a3f 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -17,6 +17,8 @@ module.exports = function (config) { singleRun: true, + plugins: [ 'karma-mocha', 'karma-webpack', 'karma-chrome-launcher' ], + frameworks: [ 'mocha' ], files: [ @@ -24,21 +26,19 @@ module.exports = function (config) { ], preprocessors: { - 'karma.js': [ 'webpack' ], + 'karma.js': [ 'webpack' ] }, - reporters: process.env.CONTINUOUS_INTEGRATION ? [ 'bamboo', 'coverage' ] : [ 'dots', 'coverage' ], + reporters: [ 'dots' ], bambooReporter: { - filename: 'mocha.json', + filename: 'mocha.json' }, coverageReporter: { reporters: [ - process.env.CONTINUOUS_INTEGRATION ? - { type: 'lcov', subdir: 'lcov-report' } : { type: 'html', subdir: 'html-report' } - ], + ] }, webpack: { diff --git a/package.json b/package.json index e42b438..2e72547 100644 --- a/package.json +++ b/package.json @@ -17,22 +17,19 @@ "author": "Giovanni Gonzaga ", "license": "MIT", "devDependencies": { - "babel": "^5.4.7", - "babel-eslint": "^3.1.11", - "babel-loader": "^5.1.3", - "eslint": "^0.23.0", - "eslint-loader": "^0.14.0", - "eslint-plugin-react": "^2.5.2", + "babel": "^5.8.38", + "babel-eslint": "^6.1.2", + "babel-loader": "^5.4.2", + "eslint": "^3.10.2", + "eslint-loader": "^1.6.1", "expect": "^1.6.0", "isparta-loader": "^0.2.0", - "karma": "^0.12.36", - "karma-bamboo-reporter": "^0.1.0", - "karma-chrome-launcher": "^0.1.12", - "karma-coverage": "^0.3.1", - "karma-mocha": "^0.1.10", - "karma-webpack": "^1.5.1", + "karma": "^1.3.0", + "karma-chrome-launcher": "^2.0.0", + "karma-mocha": "^1.3.0", + "karma-webpack": "^1.8.0", "mocha": "^2.2.5", "require-dir": "^0.3.0", - "webpack": "^1.9.10" + "webpack": "^1.13.3" } }