diff --git a/.eslintignore b/.eslintignore index 6a87a8a8..c90c8347 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,8 +1,5 @@ -. -gulpfile.js -node_modules +build/* +dist/* +node_modules/* -js/**/__tests__ - -server.js -js/components/ascribe_uploader/vendor \ No newline at end of file +js/components/ascribe_uploader/vendor/* diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 5751f3ad..00000000 --- a/.eslintrc +++ /dev/null @@ -1,61 +0,0 @@ -{ - "parser": "babel-eslint", - "env": { - "browser": true, - "es6": true, - }, - "rules": { - "new-cap": [2, {newIsCap: true, capIsNew: false}], - "quotes": [2, "single"], - "eol-last": [0], - "no-mixed-requires": [0], - "no-underscore-dangle": [0], - "global-strict": [2, "always"], - "no-trailing-spaces": [2, { skipBlankLines: true }], - "no-console": 0, - "camelcase": [2, {"properties": "never"}], - "react/display-name": 0, - "react/jsx-boolean-value": 1, - "react/jsx-no-undef": 1, - "react/jsx-quotes": 1, - "react/jsx-sort-prop-types": 0, - "react/jsx-sort-props": 0, - "react/jsx-uses-react": 1, - "react/jsx-uses-vars": 1, - "react/no-did-mount-set-state": [1, "allow-in-func"], - "react/no-did-update-set-state": 1, - "react/no-multi-comp": 0, - "react/no-unknown-property": 1, - "react/prop-types": 1, - "react/react-in-jsx-scope": 1, - "react/self-closing-comp": 1, - "react/sort-comp": 1, - "react/wrap-multilines": 1 - }, - "globals": { - "Intercom": true, - "fetch": true, - "require": true, - "File": true - }, - "plugins": [ - "react" - ], - "ecmaFeatures": { - "jsx": 1, - "modules": 1, - "arrowFunctions", - "classes": 1, - "blockBindings": 1, - "defaultParams": 1, - "destructuring": 1, - "objectLiteralComputedProperties": 1, - "objectLiteralDuplicateProperties": 0, - "objectLiteralShorthandMethods": 1, - "objectLiteralShorthandProperties": 1, - "restParams": 1, - "spread": 1, - "superInFunctions": 1, - "templateStrings": 1 - } -} diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 00000000..ac8a49db --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,6 @@ +{ + "extends": "ascribe", + "rules": { + "no-console": [1, { "allow": ["error", "logGlobal"] }] + } +} diff --git a/package.json b/package.json index c60b246f..3a4db648 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "vi-test:23vivi": "npm run -s vi-test:base -- --browser 23viviDesktop --browser 23viviMobile" }, "devDependencies": { - "babel-eslint": "^3.1.11", "babel-jest": "^5.2.0", "chai": "^3.4.1", "chai-as-promised": "^5.1.0", @@ -58,6 +57,7 @@ "audiojs": "vrde/audiojs", "autoprefixer": "^6.3.6", "babel-cli": "^6.9.0", + "babel-eslint": "^6.0.4", "babel-loader": "^6.2.4", "babel-plugin-react-transform": "^2.0.2", "babel-plugin-transform-object-assign": "^6.8.0", @@ -78,8 +78,11 @@ "css-loader": "^0.23.1", "decamelize": "^1.1.1", "dotenv": "^1.2.0", - "eslint": "^0.22.1", - "eslint-plugin-react": "^2.5.0", + "eslint": "^2.11.1", + "eslint-config-ascribe": "^1.0.1", + "eslint-plugin-import": "^1.8.1", + "eslint-plugin-jsx-a11y": "^1.2.2", + "eslint-plugin-react": "^5.1.1", "exports-loader": "^0.6.3", "express": "^4.13.4", "extract-text-webpack-plugin": "^1.0.1",