From 778d80f922aa3a36d8dc45649a2061ad294288b0 Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Wed, 21 Feb 2024 11:02:16 +0100 Subject: [PATCH] Chore: Remove React from o11y dependencies and align zipkin and tempo dependencies (#83143) chore(zipkin): remove react from o11y dependencies, tidy tempo and zipkin dependencies --- .../grafana-o11y-ds-frontend/package.json | 3 +- .../app/plugins/datasource/tempo/package.json | 1 - .../plugins/datasource/zipkin/package.json | 12 +- yarn.lock | 145 +----------------- 4 files changed, 14 insertions(+), 147 deletions(-) diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json index 725f961dd7d..2ffab0e1a74 100644 --- a/packages/grafana-o11y-ds-frontend/package.json +++ b/packages/grafana-o11y-ds-frontend/package.json @@ -24,13 +24,12 @@ "@grafana/runtime": "11.0.0-pre", "@grafana/schema": "11.0.0-pre", "@grafana/ui": "11.0.0-pre", - "react": "18.2.0", "react-use": "17.5.0", "rxjs": "7.8.1", "tslib": "2.6.2" }, "devDependencies": { - "@grafana/tsconfig": "^1.2.0-rc1", + "@grafana/tsconfig": "^1.3.0-rc1", "@testing-library/jest-dom": "^6.1.2", "@testing-library/react": "14.2.1", "@testing-library/user-event": "14.5.2", diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json index 710f04e0dca..80adea389e4 100644 --- a/public/app/plugins/datasource/tempo/package.json +++ b/public/app/plugins/datasource/tempo/package.json @@ -30,7 +30,6 @@ "prismjs": "1.29.0", "react": "18.2.0", "react-dom": "18.2.0", - "react-router": "6.21.3", "react-use": "17.5.0", "redux": "4.2.1", "rxjs": "7.8.1", diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json index 921b897604c..65f01284a58 100644 --- a/public/app/plugins/datasource/zipkin/package.json +++ b/public/app/plugins/datasource/zipkin/package.json @@ -6,7 +6,7 @@ "dependencies": { "@emotion/css": "11.11.2", "@grafana/data": "workspace:*", - "@grafana/experimental": "1.7.8", + "@grafana/experimental": "1.7.10", "@grafana/o11y-ds-frontend": "workspace:*", "@grafana/runtime": "workspace:*", "@grafana/ui": "workspace:*", @@ -18,13 +18,13 @@ }, "devDependencies": { "@grafana/plugin-configs": "workspace:*", - "@testing-library/jest-dom": "6.3.0", - "@testing-library/react": "14.1.2", - "@types/jest": "29.5.11", + "@testing-library/jest-dom": "6.4.2", + "@testing-library/react": "14.2.1", + "@types/jest": "29.5.12", "@types/lodash": "4.14.202", - "@types/react": "18.2.48", + "@types/react": "18.2.55", "ts-node": "10.9.2", - "webpack": "5.90.0" + "webpack": "5.90.2" }, "peerDependencies": { "@grafana/runtime": "*" diff --git a/yarn.lock b/yarn.lock index 80a0878313a..8eb8ac73714 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3467,7 +3467,6 @@ __metadata: prismjs: "npm:1.29.0" react: "npm:18.2.0" react-dom: "npm:18.2.0" - react-router: "npm:6.21.3" react-select-event: "npm:5.5.1" react-use: "npm:17.5.0" redux: "npm:4.2.1" @@ -3491,23 +3490,23 @@ __metadata: dependencies: "@emotion/css": "npm:11.11.2" "@grafana/data": "workspace:*" - "@grafana/experimental": "npm:1.7.8" + "@grafana/experimental": "npm:1.7.10" "@grafana/o11y-ds-frontend": "workspace:*" "@grafana/plugin-configs": "workspace:*" "@grafana/runtime": "workspace:*" "@grafana/ui": "workspace:*" - "@testing-library/jest-dom": "npm:6.3.0" - "@testing-library/react": "npm:14.1.2" - "@types/jest": "npm:29.5.11" + "@testing-library/jest-dom": "npm:6.4.2" + "@testing-library/react": "npm:14.2.1" + "@types/jest": "npm:29.5.12" "@types/lodash": "npm:4.14.202" - "@types/react": "npm:18.2.48" + "@types/react": "npm:18.2.55" lodash: "npm:4.17.21" react: "npm:18.2.0" react-use: "npm:17.5.0" rxjs: "npm:7.8.1" ts-node: "npm:10.9.2" tslib: "npm:2.6.2" - webpack: "npm:5.90.0" + webpack: "npm:5.90.2" peerDependencies: "@grafana/runtime": "*" languageName: unknown @@ -3750,31 +3749,6 @@ __metadata: languageName: node linkType: hard -"@grafana/experimental@npm:1.7.8": - version: 1.7.8 - resolution: "@grafana/experimental@npm:1.7.8" - dependencies: - "@types/uuid": "npm:^8.3.3" - lodash: "npm:^4.17.21" - prismjs: "npm:^1.29.0" - react-beautiful-dnd: "npm:^13.1.1" - react-popper-tooltip: "npm:^4.4.2" - react-use: "npm:^17.4.2" - semver: "npm:^7.5.4" - uuid: "npm:^8.3.2" - peerDependencies: - "@emotion/css": 11.11.2 - "@grafana/data": ^10.0.0 - "@grafana/runtime": ^10.0.0 - "@grafana/ui": ^10.0.0 - react: 17.0.2 - react-dom: 17.0.2 - react-select: ^5.2.1 - rxjs: 7.8.0 - checksum: 10/6bcf4a04b07fb1a34f7fa5332c0ab10760675e153d6d855b49f3cfe9fdc1b63223162aa82bac569b30f10ad4b2c434058bc03d50c650f50f86ddad01de1f4cce - languageName: node - linkType: hard - "@grafana/faro-core@npm:^1.3.6, @grafana/faro-core@npm:^1.3.7": version: 1.3.7 resolution: "@grafana/faro-core@npm:1.3.7" @@ -3911,7 +3885,7 @@ __metadata: "@grafana/experimental": "npm:1.7.10" "@grafana/runtime": "npm:11.0.0-pre" "@grafana/schema": "npm:11.0.0-pre" - "@grafana/tsconfig": "npm:^1.2.0-rc1" + "@grafana/tsconfig": "npm:^1.3.0-rc1" "@grafana/ui": "npm:11.0.0-pre" "@testing-library/jest-dom": "npm:^6.1.2" "@testing-library/react": "npm:14.2.1" @@ -8707,39 +8681,6 @@ __metadata: languageName: node linkType: hard -"@testing-library/jest-dom@npm:6.3.0": - version: 6.3.0 - resolution: "@testing-library/jest-dom@npm:6.3.0" - dependencies: - "@adobe/css-tools": "npm:^4.3.2" - "@babel/runtime": "npm:^7.9.2" - aria-query: "npm:^5.0.0" - chalk: "npm:^3.0.0" - css.escape: "npm:^1.5.1" - dom-accessibility-api: "npm:^0.6.3" - lodash: "npm:^4.17.15" - redent: "npm:^3.0.0" - peerDependencies: - "@jest/globals": ">= 28" - "@types/bun": "*" - "@types/jest": ">= 28" - jest: ">= 28" - vitest: ">= 0.32" - peerDependenciesMeta: - "@jest/globals": - optional: true - "@types/bun": - optional: true - "@types/jest": - optional: true - jest: - optional: true - vitest: - optional: true - checksum: 10/d96e552cfe5a72fa0a4c21655a9fabe6ffce6a066323c8a0f5847f39ff88229cd2455c9af41d3381b672d65469e74752d29e35dd04c15d8241a9f6a1e7cb78c6 - languageName: node - linkType: hard - "@testing-library/jest-dom@npm:6.4.2, @testing-library/jest-dom@npm:^6.1.2": version: 6.4.2 resolution: "@testing-library/jest-dom@npm:6.4.2" @@ -8795,20 +8736,6 @@ __metadata: languageName: node linkType: hard -"@testing-library/react@npm:14.1.2": - version: 14.1.2 - resolution: "@testing-library/react@npm:14.1.2" - dependencies: - "@babel/runtime": "npm:^7.12.5" - "@testing-library/dom": "npm:^9.0.0" - "@types/react-dom": "npm:^18.0.0" - peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 - checksum: 10/1664990ad9673403ee1d74c1c1b60ec30591d42a3fe1e2175c28cb935cd49bc9a4ba398707f702acc3278c3b0cb492ee57fe66f41ceb040c5da57de98cba5414 - languageName: node - linkType: hard - "@testing-library/react@npm:14.2.1": version: 14.2.1 resolution: "@testing-library/react@npm:14.2.1" @@ -9648,16 +9575,6 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:29.5.11": - version: 29.5.11 - resolution: "@types/jest@npm:29.5.11" - dependencies: - expect: "npm:^29.0.0" - pretty-format: "npm:^29.0.0" - checksum: 10/798f4c89407d9457bea1256de74c26f2b279f6c789c0e3311cd604cc75cdab333b9a29b00c51b0090d31abdf11cc788b4103282851a653bef6daf72edf97eef2 - languageName: node - linkType: hard - "@types/jquery@npm:3.5.29": version: 3.5.29 resolution: "@types/jquery@npm:3.5.29" @@ -10158,17 +10075,6 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:18.2.48": - version: 18.2.48 - resolution: "@types/react@npm:18.2.48" - dependencies: - "@types/prop-types": "npm:*" - "@types/scheduler": "npm:*" - csstype: "npm:^3.0.2" - checksum: 10/2e56ea6bd821ae96bd943f727a59d85384eaf5f8a3e6fce4fa1d34453e32d8eedda742432b3857fa0de7a4214bf84ce4239757eb52918e76452c00384731e585 - languageName: node - linkType: hard - "@types/reactcss@npm:*": version: 1.2.6 resolution: "@types/reactcss@npm:1.2.6" @@ -31635,43 +31541,6 @@ __metadata: languageName: node linkType: hard -"webpack@npm:5.90.0": - version: 5.90.0 - resolution: "webpack@npm:5.90.0" - dependencies: - "@types/eslint-scope": "npm:^3.7.3" - "@types/estree": "npm:^1.0.5" - "@webassemblyjs/ast": "npm:^1.11.5" - "@webassemblyjs/wasm-edit": "npm:^1.11.5" - "@webassemblyjs/wasm-parser": "npm:^1.11.5" - acorn: "npm:^8.7.1" - acorn-import-assertions: "npm:^1.9.0" - browserslist: "npm:^4.21.10" - chrome-trace-event: "npm:^1.0.2" - enhanced-resolve: "npm:^5.15.0" - es-module-lexer: "npm:^1.2.1" - eslint-scope: "npm:5.1.1" - events: "npm:^3.2.0" - glob-to-regexp: "npm:^0.4.1" - graceful-fs: "npm:^4.2.9" - json-parse-even-better-errors: "npm:^2.3.1" - loader-runner: "npm:^4.2.0" - mime-types: "npm:^2.1.27" - neo-async: "npm:^2.6.2" - schema-utils: "npm:^3.2.0" - tapable: "npm:^2.1.1" - terser-webpack-plugin: "npm:^5.3.10" - watchpack: "npm:^2.4.0" - webpack-sources: "npm:^3.2.3" - peerDependenciesMeta: - webpack-cli: - optional: true - bin: - webpack: bin/webpack.js - checksum: 10/7ff6286be54e00b2580274d8009b014fd03c6d8ade898434376c739e460da1f3a63a51006966024710061f440d6723813365b8a54ae6bcb93b94867c42cf017e - languageName: node - linkType: hard - "webpack@npm:5.90.2": version: 5.90.2 resolution: "webpack@npm:5.90.2"