diff --git a/.github/renovate.json5 b/.github/renovate.json5 index ffd81f5e49b..29271b76d72 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -15,7 +15,6 @@ "d3-force", // we should bump this once we move to esm modules "d3-interpolate", // we should bump this once we move to esm modules "d3-scale-chromatic", // we should bump this once we move to esm modules - "eslint", // wait until `eslint-plugin-react-hooks>4.2.0` is released "execa", // we should bump this once we move to esm modules "history", // we should bump this together with react-router-dom "react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead diff --git a/package.json b/package.json index 9903aba97d3..fb350f1e638 100644 --- a/package.json +++ b/package.json @@ -111,6 +111,7 @@ "@types/debounce-promise": "3.1.4", "@types/enzyme": "3.10.11", "@types/enzyme-adapter-react-16": "1.0.6", + "@types/eslint": "8.4.1", "@types/file-saver": "2.0.5", "@types/google.analytics": "^0.0.42", "@types/grafana__slate-react": "npm:@types/slate-react@0.22.5", @@ -165,7 +166,7 @@ "cypress": "9.3.1", "enzyme": "3.11.0", "enzyme-to-json": "3.6.2", - "eslint": "7.28.0", + "eslint": "8.8.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-jsdoc": "37.7.1", "eslint-plugin-lodash": "^7.2.0", diff --git a/yarn.lock b/yarn.lock index 48504fb9813..27f18cae4fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3685,6 +3685,23 @@ __metadata: languageName: node linkType: hard +"@eslint/eslintrc@npm:^1.0.5": + version: 1.0.5 + resolution: "@eslint/eslintrc@npm:1.0.5" + dependencies: + ajv: ^6.12.4 + debug: ^4.3.2 + espree: ^9.2.0 + globals: ^13.9.0 + ignore: ^4.0.6 + import-fresh: ^3.2.1 + js-yaml: ^4.1.0 + minimatch: ^3.0.4 + strip-json-comments: ^3.1.1 + checksum: b35b50d7b65bd8acd92a05b6fb15ac62c0cefa40dfef0324ca5bf8632bf3679bab6e173c53b3ad1e1d837701cecdbd9c144b35f46588cdf4e046a9caa272488d + languageName: node + linkType: hard + "@formatjs/ecma402-abstract@npm:1.10.0": version: 1.10.0 resolution: "@formatjs/ecma402-abstract@npm:1.10.0" @@ -4295,6 +4312,24 @@ __metadata: languageName: node linkType: hard +"@humanwhocodes/config-array@npm:^0.9.2": + version: 0.9.3 + resolution: "@humanwhocodes/config-array@npm:0.9.3" + dependencies: + "@humanwhocodes/object-schema": ^1.2.1 + debug: ^4.1.1 + minimatch: ^3.0.4 + checksum: 6e5d7d274941c459bab0a14a87e372206d89fad3e4879d982edc942e8cc34da6510ea3644b8535a2a9edaa6527e91dccceabc6837ffa8ee506d66bca5d269ebc + languageName: node + linkType: hard + +"@humanwhocodes/object-schema@npm:^1.2.1": + version: 1.2.1 + resolution: "@humanwhocodes/object-schema@npm:1.2.1" + checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1 + languageName: node + linkType: hard + "@hutson/parse-repository-url@npm:^3.0.0": version: 3.0.2 resolution: "@hutson/parse-repository-url@npm:3.0.2" @@ -9565,6 +9600,16 @@ __metadata: languageName: node linkType: hard +"@types/eslint@npm:8.4.1": + version: 8.4.1 + resolution: "@types/eslint@npm:8.4.1" + dependencies: + "@types/estree": "*" + "@types/json-schema": "*" + checksum: b5790997ee9d3820d16350192d41849b0e2448c9e93650acac672ddf502e35c0a5a25547172a9eec840a96687cd94ba1cee672cbd86640f8f4ff1b65960d2ab9 + languageName: node + linkType: hard + "@types/estree@npm:*, @types/estree@npm:^0.0.50": version: 0.0.50 resolution: "@types/estree@npm:0.0.50" @@ -11997,6 +12042,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.7.0": + version: 8.7.0 + resolution: "acorn@npm:8.7.0" + bin: + acorn: bin/acorn + checksum: e0f79409d68923fbf1aa6d4166f3eedc47955320d25c89a20cc822e6ba7c48c5963d5bc657bc242d68f7a4ac9faf96eef033e8f73656da6c640d4219935fdfd0 + languageName: node + linkType: hard + "add-dom-event-listener@npm:^1.1.0": version: 1.1.0 resolution: "add-dom-event-listener@npm:1.1.0" @@ -18004,6 +18058,16 @@ __metadata: languageName: node linkType: hard +"eslint-scope@npm:^7.1.0": + version: 7.1.0 + resolution: "eslint-scope@npm:7.1.0" + dependencies: + esrecurse: ^4.3.0 + estraverse: ^5.2.0 + checksum: 2070470a0725438ed47075b2574a4c03cf59aa32648da8cff9e3548c84f6b0079cfdb9ee1dd7ab0bfe97011f64b2af5bfd4b69cf14a1292130dec661eec7914a + languageName: node + linkType: hard + "eslint-utils@npm:^2.1.0": version: 2.1.0 resolution: "eslint-utils@npm:2.1.0" @@ -18045,6 +18109,13 @@ __metadata: languageName: node linkType: hard +"eslint-visitor-keys@npm:^3.1.0, eslint-visitor-keys@npm:^3.2.0": + version: 3.2.0 + resolution: "eslint-visitor-keys@npm:3.2.0" + checksum: fdadbb26f9e6417d3db7ad4f00bb0d573b6031c32fa72e8cdae32d038223faaeddff2ee443c90cb489bf774e75bff765c00912b8f9106d65e4f202ccd78c1b18 + languageName: node + linkType: hard + "eslint-webpack-plugin@npm:3.1.1": version: 3.1.1 resolution: "eslint-webpack-plugin@npm:3.1.1" @@ -18110,6 +18181,51 @@ __metadata: languageName: node linkType: hard +"eslint@npm:8.8.0": + version: 8.8.0 + resolution: "eslint@npm:8.8.0" + dependencies: + "@eslint/eslintrc": ^1.0.5 + "@humanwhocodes/config-array": ^0.9.2 + ajv: ^6.10.0 + chalk: ^4.0.0 + cross-spawn: ^7.0.2 + debug: ^4.3.2 + doctrine: ^3.0.0 + escape-string-regexp: ^4.0.0 + eslint-scope: ^7.1.0 + eslint-utils: ^3.0.0 + eslint-visitor-keys: ^3.2.0 + espree: ^9.3.0 + esquery: ^1.4.0 + esutils: ^2.0.2 + fast-deep-equal: ^3.1.3 + file-entry-cache: ^6.0.1 + functional-red-black-tree: ^1.0.1 + glob-parent: ^6.0.1 + globals: ^13.6.0 + ignore: ^5.2.0 + import-fresh: ^3.0.0 + imurmurhash: ^0.1.4 + is-glob: ^4.0.0 + js-yaml: ^4.1.0 + json-stable-stringify-without-jsonify: ^1.0.1 + levn: ^0.4.1 + lodash.merge: ^4.6.2 + minimatch: ^3.0.4 + natural-compare: ^1.4.0 + optionator: ^0.9.1 + regexpp: ^3.2.0 + strip-ansi: ^6.0.1 + strip-json-comments: ^3.1.0 + text-table: ^0.2.0 + v8-compile-cache: ^2.0.3 + bin: + eslint: bin/eslint.js + checksum: 41a7e85bf84cf9f2d758ef3e8d08020a39a2836703728b59535684681349bd021c2c6e24174462b844a914870d707d2151e0371198899d957b444de91adaa435 + languageName: node + linkType: hard + "esm@npm:^3.2.25": version: 3.2.25 resolution: "esm@npm:3.2.25" @@ -18128,6 +18244,17 @@ __metadata: languageName: node linkType: hard +"espree@npm:^9.2.0, espree@npm:^9.3.0": + version: 9.3.0 + resolution: "espree@npm:9.3.0" + dependencies: + acorn: ^8.7.0 + acorn-jsx: ^5.3.1 + eslint-visitor-keys: ^3.1.0 + checksum: c0f1885c4eab652f9be08eb9228cea0df046b559b29d4aed8d6590ea9bd60177d4cb245d204a6f737a79a096861bb4ab8e480aeb8c1dbafef5beec1157353ce4 + languageName: node + linkType: hard + "esprima@npm:^4.0.0, esprima@npm:^4.0.1": version: 4.0.1 resolution: "esprima@npm:4.0.1" @@ -19654,7 +19781,7 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:^6.0.0": +"glob-parent@npm:^6.0.0, glob-parent@npm:^6.0.1": version: 6.0.2 resolution: "glob-parent@npm:6.0.2" dependencies: @@ -19999,6 +20126,7 @@ __metadata: "@types/debounce-promise": 3.1.4 "@types/enzyme": 3.10.11 "@types/enzyme-adapter-react-16": 1.0.6 + "@types/eslint": 8.4.1 "@types/file-saver": 2.0.5 "@types/google.analytics": ^0.0.42 "@types/grafana__slate-react": "npm:@types/slate-react@0.22.5" @@ -20080,7 +20208,7 @@ __metadata: emotion: 11.0.0 enzyme: 3.11.0 enzyme-to-json: 3.6.2 - eslint: 7.28.0 + eslint: 8.8.0 eslint-config-prettier: 8.3.0 eslint-plugin-jsdoc: 37.7.1 eslint-plugin-lodash: ^7.2.0 @@ -23594,7 +23722,7 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:4.1.0": +"js-yaml@npm:4.1.0, js-yaml@npm:^4.1.0": version: 4.1.0 resolution: "js-yaml@npm:4.1.0" dependencies: