From 2698ca3a90208ad67fa5bcd0e3e717fa5db06445 Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Wed, 10 Apr 2024 15:42:31 +0200 Subject: [PATCH] chore(plugins): use workspace protocol for decoupled plugin grafana dependencies --- .../datasource/azuremonitor/package.json | 12 ++-- .../datasource/cloud-monitoring/package.json | 12 ++-- .../grafana-pyroscope-datasource/package.json | 10 ++-- .../grafana-testdata-datasource/package.json | 12 ++-- .../app/plugins/datasource/parca/package.json | 10 ++-- .../app/plugins/datasource/tempo/package.json | 2 +- yarn.lock | 58 +++++++++---------- 7 files changed, 58 insertions(+), 58 deletions(-) diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json index 854abbb71e0..f7779ee6a56 100644 --- a/public/app/plugins/datasource/azuremonitor/package.json +++ b/public/app/plugins/datasource/azuremonitor/package.json @@ -5,11 +5,11 @@ "version": "11.6.0-pre", "dependencies": { "@emotion/css": "11.13.5", - "@grafana/data": "11.6.0-pre", + "@grafana/data": "workspace:*", "@grafana/plugin-ui": "0.10.1", - "@grafana/runtime": "11.6.0-pre", - "@grafana/schema": "11.6.0-pre", - "@grafana/ui": "11.6.0-pre", + "@grafana/runtime": "workspace:*", + "@grafana/schema": "workspace:*", + "@grafana/ui": "workspace:*", "@kusto/monaco-kusto": "^10.0.0", "fast-deep-equal": "^3.1.3", "i18next": "^24.0.0", @@ -25,8 +25,8 @@ "tslib": "2.8.1" }, "devDependencies": { - "@grafana/e2e-selectors": "11.6.0-pre", - "@grafana/plugin-configs": "11.6.0-pre", + "@grafana/e2e-selectors": "workspace:*", + "@grafana/plugin-configs": "workspace:*", "@testing-library/dom": "10.4.0", "@testing-library/jest-dom": "6.6.3", "@testing-library/react": "16.2.0", diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json index 4b12136a513..da7696ac15b 100644 --- a/public/app/plugins/datasource/cloud-monitoring/package.json +++ b/public/app/plugins/datasource/cloud-monitoring/package.json @@ -5,12 +5,12 @@ "version": "11.6.0-pre", "dependencies": { "@emotion/css": "11.13.5", - "@grafana/data": "11.6.0-pre", + "@grafana/data": "workspace:*", "@grafana/google-sdk": "0.1.2", "@grafana/plugin-ui": "0.10.1", - "@grafana/runtime": "11.6.0-pre", - "@grafana/schema": "11.6.0-pre", - "@grafana/ui": "11.6.0-pre", + "@grafana/runtime": "workspace:*", + "@grafana/schema": "workspace:*", + "@grafana/ui": "workspace:*", "debounce-promise": "3.1.2", "fast-deep-equal": "^3.1.3", "i18next": "^24.0.0", @@ -26,8 +26,8 @@ "tslib": "2.8.1" }, "devDependencies": { - "@grafana/e2e-selectors": "11.6.0-pre", - "@grafana/plugin-configs": "11.6.0-pre", + "@grafana/e2e-selectors": "workspace:*", + "@grafana/plugin-configs": "workspace:*", "@testing-library/dom": "10.4.0", "@testing-library/jest-dom": "6.6.3", "@testing-library/react": "16.2.0", diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json index d75bed9c7ca..72a4a32e0ee 100644 --- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json +++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json @@ -5,10 +5,10 @@ "version": "11.6.0-pre", "dependencies": { "@emotion/css": "11.13.5", - "@grafana/data": "11.6.0-pre", - "@grafana/runtime": "11.6.0-pre", - "@grafana/schema": "11.6.0-pre", - "@grafana/ui": "11.6.0-pre", + "@grafana/data": "workspace:*", + "@grafana/runtime": "workspace:*", + "@grafana/schema": "workspace:*", + "@grafana/ui": "workspace:*", "fast-deep-equal": "^3.1.3", "lodash": "4.17.21", "monaco-editor": "0.34.1", @@ -20,7 +20,7 @@ "tslib": "2.8.1" }, "devDependencies": { - "@grafana/plugin-configs": "11.6.0-pre", + "@grafana/plugin-configs": "workspace:*", "@testing-library/dom": "10.4.0", "@testing-library/jest-dom": "6.6.3", "@testing-library/react": "16.2.0", diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json index 1c283aa6baa..418c993c79c 100644 --- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json +++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json @@ -5,10 +5,10 @@ "version": "11.6.0-pre", "dependencies": { "@emotion/css": "11.13.5", - "@grafana/data": "11.6.0-pre", - "@grafana/runtime": "11.6.0-pre", - "@grafana/schema": "11.6.0-pre", - "@grafana/ui": "11.6.0-pre", + "@grafana/data": "workspace:*", + "@grafana/runtime": "workspace:*", + "@grafana/schema": "workspace:*", + "@grafana/ui": "workspace:*", "d3-random": "^3.0.1", "lodash": "4.17.21", "micro-memoize": "^4.1.2", @@ -21,8 +21,8 @@ "uuid": "11.0.5" }, "devDependencies": { - "@grafana/e2e-selectors": "11.6.0-pre", - "@grafana/plugin-configs": "11.6.0-pre", + "@grafana/e2e-selectors": "workspace:*", + "@grafana/plugin-configs": "workspace:*", "@testing-library/dom": "10.4.0", "@testing-library/react": "16.2.0", "@testing-library/user-event": "14.6.1", diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json index 13394f1de77..488a1a3da03 100644 --- a/public/app/plugins/datasource/parca/package.json +++ b/public/app/plugins/datasource/parca/package.json @@ -5,10 +5,10 @@ "version": "11.6.0-pre", "dependencies": { "@emotion/css": "11.13.5", - "@grafana/data": "11.6.0-pre", - "@grafana/runtime": "11.6.0-pre", - "@grafana/schema": "11.6.0-pre", - "@grafana/ui": "11.6.0-pre", + "@grafana/data": "workspace:*", + "@grafana/runtime": "workspace:*", + "@grafana/schema": "workspace:*", + "@grafana/ui": "workspace:*", "lodash": "4.17.21", "monaco-editor": "0.34.1", "react": "18.3.1", @@ -18,7 +18,7 @@ "tslib": "2.8.1" }, "devDependencies": { - "@grafana/plugin-configs": "11.6.0-pre", + "@grafana/plugin-configs": "workspace:*", "@testing-library/dom": "10.4.0", "@testing-library/react": "16.2.0", "@testing-library/user-event": "14.6.1", diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json index 1cf120ff959..6e57e8d120d 100644 --- a/public/app/plugins/datasource/tempo/package.json +++ b/public/app/plugins/datasource/tempo/package.json @@ -39,7 +39,7 @@ "uuid": "11.0.5" }, "devDependencies": { - "@grafana/plugin-configs": "11.6.0-pre", + "@grafana/plugin-configs": "workspace:*", "@testing-library/dom": "10.4.0", "@testing-library/jest-dom": "6.6.3", "@testing-library/react": "16.2.0", diff --git a/yarn.lock b/yarn.lock index 385a901353b..5be4ddd06ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4120,13 +4120,13 @@ __metadata: resolution: "@grafana-plugins/grafana-azure-monitor-datasource@workspace:public/app/plugins/datasource/azuremonitor" dependencies: "@emotion/css": "npm:11.13.5" - "@grafana/data": "npm:11.6.0-pre" - "@grafana/e2e-selectors": "npm:11.6.0-pre" - "@grafana/plugin-configs": "npm:11.6.0-pre" + "@grafana/data": "workspace:*" + "@grafana/e2e-selectors": "workspace:*" + "@grafana/plugin-configs": "workspace:*" "@grafana/plugin-ui": "npm:0.10.1" - "@grafana/runtime": "npm:11.6.0-pre" - "@grafana/schema": "npm:11.6.0-pre" - "@grafana/ui": "npm:11.6.0-pre" + "@grafana/runtime": "workspace:*" + "@grafana/schema": "workspace:*" + "@grafana/ui": "workspace:*" "@kusto/monaco-kusto": "npm:^10.0.0" "@testing-library/dom": "npm:10.4.0" "@testing-library/jest-dom": "npm:6.6.3" @@ -4195,11 +4195,11 @@ __metadata: resolution: "@grafana-plugins/grafana-pyroscope-datasource@workspace:public/app/plugins/datasource/grafana-pyroscope-datasource" dependencies: "@emotion/css": "npm:11.13.5" - "@grafana/data": "npm:11.6.0-pre" - "@grafana/plugin-configs": "npm:11.6.0-pre" - "@grafana/runtime": "npm:11.6.0-pre" - "@grafana/schema": "npm:11.6.0-pre" - "@grafana/ui": "npm:11.6.0-pre" + "@grafana/data": "workspace:*" + "@grafana/plugin-configs": "workspace:*" + "@grafana/runtime": "workspace:*" + "@grafana/schema": "workspace:*" + "@grafana/ui": "workspace:*" "@testing-library/dom": "npm:10.4.0" "@testing-library/jest-dom": "npm:6.6.3" "@testing-library/react": "npm:16.2.0" @@ -4235,12 +4235,12 @@ __metadata: resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource" dependencies: "@emotion/css": "npm:11.13.5" - "@grafana/data": "npm:11.6.0-pre" - "@grafana/e2e-selectors": "npm:11.6.0-pre" - "@grafana/plugin-configs": "npm:11.6.0-pre" - "@grafana/runtime": "npm:11.6.0-pre" - "@grafana/schema": "npm:11.6.0-pre" - "@grafana/ui": "npm:11.6.0-pre" + "@grafana/data": "workspace:*" + "@grafana/e2e-selectors": "workspace:*" + "@grafana/plugin-configs": "workspace:*" + "@grafana/runtime": "workspace:*" + "@grafana/schema": "workspace:*" + "@grafana/ui": "workspace:*" "@testing-library/dom": "npm:10.4.0" "@testing-library/react": "npm:16.2.0" "@testing-library/user-event": "npm:14.6.1" @@ -4378,11 +4378,11 @@ __metadata: resolution: "@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca" dependencies: "@emotion/css": "npm:11.13.5" - "@grafana/data": "npm:11.6.0-pre" - "@grafana/plugin-configs": "npm:11.6.0-pre" - "@grafana/runtime": "npm:11.6.0-pre" - "@grafana/schema": "npm:11.6.0-pre" - "@grafana/ui": "npm:11.6.0-pre" + "@grafana/data": "workspace:*" + "@grafana/plugin-configs": "workspace:*" + "@grafana/runtime": "workspace:*" + "@grafana/schema": "workspace:*" + "@grafana/ui": "workspace:*" "@testing-library/dom": "npm:10.4.0" "@testing-library/react": "npm:16.2.0" "@testing-library/user-event": "npm:14.6.1" @@ -4410,14 +4410,14 @@ __metadata: resolution: "@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring" dependencies: "@emotion/css": "npm:11.13.5" - "@grafana/data": "npm:11.6.0-pre" - "@grafana/e2e-selectors": "npm:11.6.0-pre" + "@grafana/data": "workspace:*" + "@grafana/e2e-selectors": "workspace:*" "@grafana/google-sdk": "npm:0.1.2" - "@grafana/plugin-configs": "npm:11.6.0-pre" + "@grafana/plugin-configs": "workspace:*" "@grafana/plugin-ui": "npm:0.10.1" - "@grafana/runtime": "npm:11.6.0-pre" - "@grafana/schema": "npm:11.6.0-pre" - "@grafana/ui": "npm:11.6.0-pre" + "@grafana/runtime": "workspace:*" + "@grafana/schema": "workspace:*" + "@grafana/ui": "workspace:*" "@testing-library/dom": "npm:10.4.0" "@testing-library/jest-dom": "npm:6.6.3" "@testing-library/react": "npm:16.2.0" @@ -4462,7 +4462,7 @@ __metadata: "@grafana/lezer-traceql": "npm:0.0.20" "@grafana/monaco-logql": "npm:^0.0.8" "@grafana/o11y-ds-frontend": "workspace:*" - "@grafana/plugin-configs": "npm:11.6.0-pre" + "@grafana/plugin-configs": "workspace:*" "@grafana/plugin-ui": "npm:0.10.1" "@grafana/runtime": "workspace:*" "@grafana/schema": "workspace:*"