From e22b5559d7b6e22ff48bfdfd3e1e7dd1a6993f76 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Mon, 30 Dec 2019 19:30:20 +0100 Subject: [PATCH] eslint --- api/.eslintrc.js | 42 +++++++++---------------- api/package.json | 5 ++- web/.eslintrc.js | 26 +++++++++++++++ web/package.json | 9 ++---- web/src/FilesTabsPanel.js | 2 +- web/yarn.lock | 27 ++++++++++++++-- yarn.lock | 66 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 137 insertions(+), 40 deletions(-) create mode 100644 web/.eslintrc.js create mode 100644 yarn.lock diff --git a/api/.eslintrc.js b/api/.eslintrc.js index f8f3ce202..9c17d0e70 100644 --- a/api/.eslintrc.js +++ b/api/.eslintrc.js @@ -1,29 +1,17 @@ module.exports = { - root: true, - env: { - node: true, - commonjs: true, - es6: true, - jquery: false, - jest: true, - jasmine: true, - }, - extends: 'eslint:recommended', - parserOptions: { - sourceType: 'module', - ecmaVersion: 8, - ecmaFeatures: { - experimentalObjectRestSpread: true, + "env": { + "browser": true, + "commonjs": true, + "es6": true }, - }, - rules: { - indent: ['error', 2], - quotes: ['warn', 'single'], - semi: ['error', 'always'], - 'no-var': ['error'], - 'no-console': ['off'], - 'no-unused-vars': ['warn'], - 'no-mixed-spaces-and-tabs': ['warn'], - indent: ["error", 2, { "SwitchCase": 1 }] - }, -}; + "extends": "eslint:recommended", + "globals": { + "Atomics": "readonly", + "SharedArrayBuffer": "readonly" + }, + "parserOptions": { + "ecmaVersion": 2018 + }, + "rules": { + } +}; \ No newline at end of file diff --git a/api/package.json b/api/package.json index f3ee28fb4..77d2c3442 100644 --- a/api/package.json +++ b/api/package.json @@ -6,12 +6,11 @@ "axios": "^0.19.0", "cors": "^2.8.5", "cross-env": "^6.0.3", + "eslint": "^6.8.0", "express": "^4.17.1" }, "scripts": { "start": "node src/index.js" }, - "devDependencies": { - "eslint": "^6.8.0" - } + "devDependencies": {} } diff --git a/web/.eslintrc.js b/web/.eslintrc.js new file mode 100644 index 000000000..5df669247 --- /dev/null +++ b/web/.eslintrc.js @@ -0,0 +1,26 @@ +module.exports = { + "env": { + "browser": true, + "es6": true + }, + "extends": [ + "eslint:recommended", + "plugin:react/recommended" + ], + "globals": { + "Atomics": "readonly", + "SharedArrayBuffer": "readonly" + }, + "parserOptions": { + "ecmaFeatures": { + "jsx": true + }, + "ecmaVersion": 2018, + "sourceType": "module" + }, + "plugins": [ + "react" + ], + "rules": { + } +}; \ No newline at end of file diff --git a/web/package.json b/web/package.json index 07e780fbe..7bdfa8c68 100644 --- a/web/package.json +++ b/web/package.json @@ -11,6 +11,8 @@ "@testing-library/user-event": "^7.1.2", "axios": "^0.19.0", "cross-env": "^6.0.3", + "eslint": "^6.8.0", + "eslint-plugin-react": "^7.17.0", "react": "^16.12.0", "react-dom": "^16.12.0", "react-scripts": "3.3.0", @@ -23,9 +25,6 @@ "test": "react-scripts test", "eject": "react-scripts eject" }, - "eslintConfig": { - "extends": "react-app" - }, "browserslist": { "production": [ ">0.2%", @@ -38,7 +37,5 @@ "last 1 safari version" ] }, - "devDependencies": { - "eslint": "^6.8.0" - } + "devDependencies": {} } diff --git a/web/src/FilesTabsPanel.js b/web/src/FilesTabsPanel.js index 6ed2c9239..accc66e88 100644 --- a/web/src/FilesTabsPanel.js +++ b/web/src/FilesTabsPanel.js @@ -30,7 +30,7 @@ const FileNameWrapper = styled.span` export default function FilesTabsPanel() { return files.map(file => ( - + {file.name} diff --git a/web/yarn.lock b/web/yarn.lock index 0ac9d408b..fde470a4a 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -3899,6 +3899,11 @@ eslint-module-utils@^2.4.0: debug "^2.6.9" pkg-dir "^2.0.0" +eslint-plugin-eslint-plugin@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5" + integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg== + eslint-plugin-flowtype@3.13.0: version "3.13.0" resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz#e241ebd39c0ce519345a3f074ec1ebde4cf80f2c" @@ -3958,6 +3963,22 @@ eslint-plugin-react@7.16.0: prop-types "^15.7.2" resolve "^1.12.0" +eslint-plugin-react@^7.17.0: + version "7.17.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7" + integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A== + dependencies: + array-includes "^3.0.3" + doctrine "^2.1.0" + eslint-plugin-eslint-plugin "^2.1.0" + has "^1.0.3" + jsx-ast-utils "^2.2.3" + object.entries "^1.1.0" + object.fromentries "^2.0.1" + object.values "^1.1.0" + prop-types "^15.7.2" + resolve "^1.13.1" + eslint-scope@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" @@ -6142,7 +6163,7 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jsx-ast-utils@^2.2.1: +jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f" integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA== @@ -6990,7 +7011,7 @@ object.entries@^1.1.0: function-bind "^1.1.1" has "^1.0.3" -object.fromentries@^2.0.0: +object.fromentries@^2.0.0, object.fromentries@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ== @@ -8828,7 +8849,7 @@ resolve@1.12.2: dependencies: path-parse "^1.0.6" -resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1: +resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.1.tgz#9e018c540fcf0c427d678b9931cbf45e984bcaff" integrity sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg== diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 000000000..3b3b2acbd --- /dev/null +++ b/yarn.lock @@ -0,0 +1,66 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +commander@^2.15.1: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +debug@^3.0.0: + version "3.2.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== + dependencies: + ms "^2.1.1" + +eventemitter3@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" + integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== + +follow-redirects@^1.0.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz#8d5bcdc65b7108fe1508649c79c12d732dcedb4f" + integrity sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A== + dependencies: + debug "^3.0.0" + +foreman@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/foreman/-/foreman-3.0.1.tgz#805f28afc5a4bbaf08dbb1f5018c557dcbb8a410" + integrity sha512-ek/qoM0vVKpxzkBUQN9k4Fs7l0XsHv4bqxuEW6oqIS4s0ouYKsQ19YjBzUJKTFRumFiSpUv7jySkrI6lfbhjlw== + dependencies: + commander "^2.15.1" + http-proxy "^1.17.0" + mustache "^2.2.1" + shell-quote "^1.6.1" + +http-proxy@^1.17.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a" + integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ== + dependencies: + eventemitter3 "^4.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" + +ms@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +mustache@^2.2.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" + integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + +shell-quote@^1.6.1: + version "1.7.2" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" + integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==