diff --git a/package.json b/package.json index be0ce54..d21b8ef 100644 --- a/package.json +++ b/package.json @@ -35,23 +35,20 @@ "eslint-loader": "^3.0.3", "eslint-config-semistandard": "^15.0.0", "eslint-config-standard": "^14.1.1", - "eslint-config-standard-jsx": "^8.1.0", + "eslint-plugin-babel": "^5.3.0", "eslint-plugin-import": "^2.18.2", + "eslint-plugin-jest": "^23.13.1", "eslint-plugin-jsdoc": "^21.0.0", - "eslint-plugin-jsx-a11y": "^6.2.3", - "eslint-plugin-monorepo": "^0.2.1", "eslint-plugin-node": "^11.1.0", + "eslint-plugin-standard": "^4.0.1", "lint-staged": "^9.5.0", - "pre-commit": "^1.2.2", - "semistandard": "^14.2.0" + "pre-commit": "^1.2.2" }, "eslintConfig": { "parser": "babel-eslint", "extends": [ "plugin:jest/recommended", - "plugin:monorepo/recommended", - "semistandard", - "standard-jsx" + "semistandard" ], "plugins": [ "babel" diff --git a/packages/console-client/package.json b/packages/console-client/package.json index 8e0ccb7..b9720d8 100644 --- a/packages/console-client/package.json +++ b/packages/console-client/package.json @@ -51,10 +51,16 @@ "babel-plugin-add-module-exports": "^1.0.2", "babel-plugin-inline-import": "^3.0.0", "dotenv-webpack": "^1.8.0", + "eslint": "^6.7.2", + "eslint-loader": "^3.0.3", + "eslint-config-semistandard": "^15.0.0", + "eslint-config-standard": "^14.1.1", "eslint-plugin-babel": "^5.3.0", + "eslint-plugin-import": "^2.18.2", "eslint-plugin-jest": "^23.13.1", + "eslint-plugin-jsdoc": "^21.0.0", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-react": "^7.17.0", + "eslint-plugin-standard": "^4.0.1", "html-webpack-plugin": "^4.3.0", "jest": "^24.8.0", "react-scripts": "^3.4.1", @@ -73,8 +79,7 @@ "parser": "babel-eslint", "extends": [ "plugin:jest/recommended", - "semistandard", - "standard-jsx" + "semistandard" ], "plugins": [ "babel" diff --git a/packages/console-client/src/containers/Main.js b/packages/console-client/src/containers/Main.js index fb07ac1..120cf9f 100644 --- a/packages/console-client/src/containers/Main.js +++ b/packages/console-client/src/containers/Main.js @@ -14,10 +14,11 @@ import ConsoleContextProvider from './ConsoleContextProvider'; const { server, port = 80, path } = config; -// TODO(burdon): Error handling for server errors. // TODO(burdon): Authentication: // https://www.apollographql.com/docs/react/networking/authentication/ +// TODO(burdon): Configure from server. +// TODO(burdon): Configure error handling for server errors. const client = new ApolloClient({ uri: `${server}:${port}${path}` }); diff --git a/packages/console-server/package.json b/packages/console-server/package.json index 6ca92dc..65d8407 100644 --- a/packages/console-server/package.json +++ b/packages/console-server/package.json @@ -36,12 +36,20 @@ "@babel/plugin-proposal-class-properties": "^7.5.5", "@babel/plugin-proposal-export-default-from": "^7.5.2", "@babel/preset-env": "^7.4.5", - "babel-eslint": "^10.0.2", + "babel-eslint": "^10.0.3", "babel-jest": "^24.8.0", "babel-plugin-add-module-exports": "^1.0.2", "babel-plugin-inline-import": "^3.0.0", + "eslint": "^6.7.2", + "eslint-loader": "^3.0.3", + "eslint-config-semistandard": "^15.0.0", + "eslint-config-standard": "^14.1.1", "eslint-plugin-babel": "^5.3.0", + "eslint-plugin-import": "^2.18.2", "eslint-plugin-jest": "^23.13.1", + "eslint-plugin-jsdoc": "^21.0.0", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-standard": "^4.0.1", "jest": "^24.8.0", "nodemon": "^2.0.4", "semistandard": "^14.2.0" @@ -53,12 +61,10 @@ "parser": "babel-eslint", "extends": [ "plugin:jest/recommended", - "semistandard", - "standard-jsx" + "semistandard" ], "plugins": [ - "babel", - "node" + "babel" ], "rules": { "babel/semi": 1 diff --git a/yarn.lock b/yarn.lock index e344ca8..b271855 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5818,7 +5818,7 @@ dir-glob@2.0.0: arrify "^1.0.1" path-type "^3.0.0" -dir-glob@^2.0.0, dir-glob@^2.2.2: +dir-glob@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== @@ -6262,7 +6262,7 @@ eslint-config-semistandard@15.0.0, eslint-config-semistandard@^15.0.0: resolved "https://registry.yarnpkg.com/eslint-config-semistandard/-/eslint-config-semistandard-15.0.0.tgz#d8eefccfac4ca9cbc508d38de6cb8fd5e7a72fa9" integrity sha512-volIMnosUvzyxGkYUA5QvwkahZZLeUx7wcS0+7QumPn+MMEBbV6P7BY1yukamMst0w3Et3QZlCjQEwQ8tQ6nug== -eslint-config-standard-jsx@8.1.0, eslint-config-standard-jsx@^8.1.0: +eslint-config-standard-jsx@8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-8.1.0.tgz#314c62a0e6f51f75547f89aade059bec140edfc7" integrity sha512-ULVC8qH8qCqbU792ZOO6DaiaZyHNS/5CZt3hKqHkEhVlhPEPN3nfBqqxJCyp59XrjIBZPu1chMYe9T2DXZ7TMw== @@ -6307,7 +6307,7 @@ eslint-loader@^3.0.3: object-hash "^2.0.3" schema-utils "^2.6.5" -eslint-module-utils@^2.1.1, eslint-module-utils@^2.4.0, eslint-module-utils@^2.4.1: +eslint-module-utils@^2.4.0, eslint-module-utils@^2.4.1: version "2.6.0" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== @@ -6418,7 +6418,7 @@ eslint-plugin-jsdoc@^21.0.0: semver "^6.3.0" spdx-expression-parse "^3.0.0" -eslint-plugin-jsx-a11y@6.2.3, eslint-plugin-jsx-a11y@^6.2.3: +eslint-plugin-jsx-a11y@6.2.3: version "6.2.3" resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz#b872a09d5de51af70a97db1eea7dc933043708aa" integrity sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg== @@ -6433,19 +6433,6 @@ eslint-plugin-jsx-a11y@6.2.3, eslint-plugin-jsx-a11y@^6.2.3: has "^1.0.3" jsx-ast-utils "^2.2.1" -eslint-plugin-monorepo@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-monorepo/-/eslint-plugin-monorepo-0.2.1.tgz#96cfc4af241077675f40d7017377897fb8ea537b" - integrity sha512-82JaAjuajVAsDT+pMvdt275H6F55H3MEofaMZbJurGqfXpPDT4eayTgYyyjfd1XR8VD1S+ORbuHCULnSqNyD9g== - dependencies: - eslint-module-utils "^2.1.1" - get-monorepo-packages "^1.1.0" - globby "^7.1.1" - load-json-file "^4.0.0" - minimatch "^3.0.4" - parse-package-name "^0.1.0" - path-is-inside "^1.0.2" - eslint-plugin-node@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d" @@ -6498,23 +6485,6 @@ eslint-plugin-react@7.19.0: string.prototype.matchall "^4.0.2" xregexp "^4.3.0" -eslint-plugin-react@^7.17.0: - version "7.20.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3" - integrity sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA== - dependencies: - array-includes "^3.1.1" - doctrine "^2.1.0" - has "^1.0.3" - jsx-ast-utils "^2.2.3" - object.entries "^1.1.1" - object.fromentries "^2.0.2" - object.values "^1.1.1" - prop-types "^15.7.2" - resolve "^1.15.1" - string.prototype.matchall "^4.0.2" - xregexp "^4.3.0" - eslint-plugin-react@~7.14.2: version "7.14.3" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz#911030dd7e98ba49e1b2208599571846a66bdf13" @@ -6530,7 +6500,7 @@ eslint-plugin-react@~7.14.2: prop-types "^15.7.2" resolve "^1.10.1" -eslint-plugin-standard@~4.0.0: +eslint-plugin-standard@^4.0.1, eslint-plugin-standard@~4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== @@ -7387,14 +7357,6 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-monorepo-packages@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-monorepo-packages/-/get-monorepo-packages-1.2.0.tgz#3eee88d30b11a5f65955dec6ae331958b2a168e4" - integrity sha512-aDP6tH+eM3EuVSp3YyCutOcFS4Y9AhRRH9FAd+cjtR/g63Hx+DCXdKoP1ViRPUJz5wm+BOEXB4FhoffGHxJ7jQ== - dependencies: - globby "^7.1.1" - load-json-file "^4.0.0" - get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" @@ -7626,18 +7588,6 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" -globby@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680" - integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA= - dependencies: - array-union "^1.0.1" - dir-glob "^2.0.0" - glob "^7.1.2" - ignore "^3.3.5" - pify "^3.0.0" - slash "^1.0.0" - globby@^9.2.0: version "9.2.0" resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" @@ -11183,11 +11133,6 @@ parse-json@^5.0.0: json-parse-better-errors "^1.0.1" lines-and-columns "^1.1.6" -parse-package-name@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/parse-package-name/-/parse-package-name-0.1.0.tgz#3f44dd838feb4c2be4bf318bae4477d7706bade4" - integrity sha1-P0Tdg4/rTCvkvzGLrkR313BrreQ= - parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"