From 56fe9e3999fd9ea1d28430d4124e35b8773f25b7 Mon Sep 17 00:00:00 2001 From: Misha Moroshko Date: Fri, 16 Sep 2016 22:13:26 -0400 Subject: [PATCH] Upgrade deps --- .eslintrc | 96 ------------------------------------------------ .eslintrc.js | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 16 ++++---- 3 files changed, 109 insertions(+), 104 deletions(-) delete mode 100644 .eslintrc create mode 100644 .eslintrc.js diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index deafc96b..00000000 --- a/.eslintrc +++ /dev/null @@ -1,96 +0,0 @@ -{ - "env": { - "es6": true, - "node": true, - "browser": true, - "mocha": true - }, - "parser": "babel-eslint", - "plugins": [ - "react", "mocha" - ], - "extends": ["eslint:recommended"], - "rules": { - "array-callback-return": 2, - "brace-style": [2, "1tbs"], - "camelcase": [2, { "properties": "always" }], - "comma-dangle": [2, "never"], - "comma-style": [2, "last"], - "eol-last": 2, - "func-call-spacing": 2, - "indent": [2, 2, { "SwitchCase": 1 }], - "key-spacing": [2, { "beforeColon": false, "afterColon": true }], - "keyword-spacing": 2, - "linebreak-style": [2, "unix"], - "no-cond-assign": [2, "always"], - "no-console": 2, - "no-global-assign": 2, - "no-multiple-empty-lines": [2, { "max": 1 }], - "no-template-curly-in-string": 2, - "no-trailing-spaces": 2, - "no-unused-vars": 2, - "no-whitespace-before-property": 2, - "newline-after-var": [2, "always"], - "object-curly-spacing": [2, "always"], - "prefer-rest-params": 2, - "quote-props": [2, "as-needed"], - "quotes": [2, "single"], - "semi": [2, "always"], - "space-before-blocks": [2, "always"], - "space-before-function-paren": [2, "never"], - "space-in-parens": [2, "never"], - "template-curly-spacing": [2, "never"], - - "react/display-name": 0, - "react/forbid-prop-types": 0, - "react/no-comment-textnodes": 0, - "react/no-danger": 2, - "react/no-danger-with-children": 2, - "react/no-deprecated": 2, - "react/no-did-mount-set-state": 2, - "react/no-did-update-set-state": 2, - "react/no-direct-mutation-state": 2, - "react/no-find-dom-node": 2, - "react/no-is-mounted": 2, - "react/no-multi-comp": [2, { "ignoreStateless": true }], - "react/no-render-return-value": 2, - "react/no-set-state": 0, - "react/no-string-refs": 2, - "react/no-unknown-property": 2, - "react/prefer-es6-class": [2, "always"], - "react/prefer-stateless-function": 2, - "react/prop-types": 2, - "react/react-in-jsx-scope": 2, - "react/require-optimization": 0, - "react/require-render-return": 2, - "react/self-closing-comp": 2, - "react/sort-comp": 2, - "react/sort-prop-types": 0, - - "react/jsx-boolean-value": [2, "always"], - "react/jsx-closing-bracket-location": [2, { "selfClosing": "after-props", "nonEmpty": "after-props" }], - "react/jsx-curly-spacing": [2, "never", { "allowMultiline": true }], - "react/jsx-equals-spacing": [2, "never"], - "react/jsx-filename-extension": [2, { "extensions": [".js"] }], - "react/jsx-first-prop-new-line": [2, "multiline"], - "react/jsx-handler-names": 0, - "react/jsx-indent": [2, 2], - "react/jsx-indent-props": [2, 2], - "react/jsx-key": 2, - "react/jsx-max-props-per-line": 0, - "react/jsx-no-bind": 2, - "react/jsx-no-duplicate-props": 2, - "react/jsx-no-literals": 0, - "react/jsx-no-target-blank": 2, - "react/jsx-no-undef": 2, - "react/jsx-pascal-case": 2, - "react/jsx-sort-props": 0, - "react/jsx-space-before-closing": [2, "always"], - "react/jsx-uses-react": 2, - "react/jsx-uses-vars": 2, - "react/jsx-wrap-multilines": 2, - - "mocha/no-exclusive-tests": "error", - "mocha/no-skipped-tests": "error" - } -} diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 00000000..5c68625a --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,101 @@ +module.exports = { + env: { + es6: true, + node: true, + browser: true, + mocha: true + }, + parser: 'babel-eslint', + plugins: [ + 'react', + 'mocha' + ], + extends: [ + 'eslint:recommended' + ], + rules: { + 'array-callback-return': 2, + 'brace-style': [2, '1tbs'], + 'camelcase': [2, { 'properties': 'always' }], + 'comma-dangle': [2, 'never'], + 'comma-style': [2, 'last'], + 'eol-last': 2, + 'func-call-spacing': 2, + 'indent': [2, 2, { 'SwitchCase': 1 }], + 'key-spacing': [2, { 'beforeColon': false, 'afterColon': true }], + 'keyword-spacing': 2, + 'linebreak-style': [2, 'unix'], + 'no-cond-assign': [2, 'always'], + 'no-console': 2, + 'no-global-assign': 2, + 'no-multiple-empty-lines': [2, { 'max': 1 }], + 'no-template-curly-in-string': 2, + 'no-trailing-spaces': 2, + 'no-unused-vars': 2, + 'no-whitespace-before-property': 2, + 'newline-after-var': [2, 'always'], + 'object-curly-spacing': [2, 'always'], + 'prefer-rest-params': 2, + 'quote-props': [2, 'as-needed'], + 'quotes': [2, 'single'], + 'semi': [2, 'always'], + 'space-before-blocks': [2, 'always'], + 'space-before-function-paren': [2, 'never'], + 'space-in-parens': [2, 'never'], + 'template-curly-spacing': [2, 'never'], + + 'react/display-name': 0, + 'react/forbid-prop-types': 0, + 'react/no-comment-textnodes': 0, + 'react/no-danger': 2, + 'react/no-danger-with-children': 2, + 'react/no-deprecated': 2, + 'react/no-did-mount-set-state': 2, + 'react/no-did-update-set-state': 2, + 'react/no-direct-mutation-state': 2, + 'react/no-find-dom-node': 2, + 'react/no-is-mounted': 2, + 'react/no-multi-comp': [2, { 'ignoreStateless': true }], + 'react/no-render-return-value': 2, + 'react/no-set-state': 0, + 'react/no-string-refs': 2, + 'react/no-unknown-property': 2, + 'react/no-unused-prop-types': 0, // https://github.com/yannickcr/eslint-plugin-react/pull/835 + 'react/prefer-es6-class': [2, 'always'], + 'react/prefer-stateless-function': 2, + 'react/prop-types': 2, + 'react/react-in-jsx-scope': 2, + 'react/require-optimization': 0, + 'react/require-render-return': 2, + 'react/self-closing-comp': 2, + 'react/sort-comp': 2, + 'react/sort-prop-types': 0, + 'react/style-prop-object': 2, + + 'react/jsx-boolean-value': [2, 'always'], + 'react/jsx-closing-bracket-location': [2, { 'selfClosing': 'after-props', 'nonEmpty': 'after-props' }], + 'react/jsx-curly-spacing': [2, 'never', { 'allowMultiline': true }], + 'react/jsx-equals-spacing': [2, 'never'], + 'react/jsx-filename-extension': [2, { 'extensions': ['.js'] }], + 'react/jsx-first-prop-new-line': [2, 'multiline'], + 'react/jsx-handler-names': 0, + 'react/jsx-indent': [2, 2], + 'react/jsx-indent-props': [2, 2], + 'react/jsx-key': 2, + 'react/jsx-max-props-per-line': 0, + 'react/jsx-no-bind': 2, + 'react/jsx-no-duplicate-props': 2, + 'react/jsx-no-literals': 0, + 'react/jsx-no-target-blank': 2, + 'react/jsx-no-undef': 2, + 'react/jsx-pascal-case': 2, + 'react/jsx-sort-props': 0, + 'react/jsx-space-before-closing': [2, 'always'], + 'react/jsx-uses-react': 2, + 'react/jsx-uses-vars': 2, + 'react/jsx-wrap-multilines': 2, + + 'mocha/no-exclusive-tests': 'error', + 'mocha/no-skipped-tests': 'error' + } +}; diff --git a/package.json b/package.json index f4e7f812..77f40387 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "prepublish": "npm run dist && npm run standalone" }, "dependencies": { - "react-autowhatever": "^5.1.2", + "react-autowhatever": "^5.3.0", "react-redux": "^4.4.5", "redux": "^3.5.1", "shallow-equal": "^1.0.0" @@ -45,11 +45,11 @@ "babel-register": "^6.7.2", "bithound": "^1.7.0", "chai": "^3.5.0", - "css-loader": "^0.24.0", - "es6-promise": "^3.1.2", - "eslint": "^3.3.1", + "css-loader": "^0.25.0", + "es6-promise": "^3.3.1", + "eslint": "^3.5.0", "eslint-plugin-mocha": "^4.3.0", - "eslint-plugin-react": "^6.1.2", + "eslint-plugin-react": "^6.2.2", "extract-text-webpack-plugin": "^1.0.1", "file-loader": "^0.9.0", "happypack": "^2.0.4", @@ -59,9 +59,9 @@ "less": "^2.6.1", "less-loader": "^2.2.3", "mocha": "^3.0.2", - "nyc": "^8.1.0", + "nyc": "^8.3.0", "openurl": "^1.1.1", - "postcss-loader": "^0.10.1", + "postcss-loader": "^0.13.0", "react": "^15.3.1", "react-addons-test-utils": "^15.3.1", "react-dom": "^15.3.1", @@ -75,7 +75,7 @@ "svgo-loader": "^1.1.0", "url-loader": "^0.5.7", "webpack": "^1.13.2", - "webpack-dev-server": "^1.14.1" + "webpack-dev-server": "^1.15.2" }, "files": [ "dist"