From b755cb3e966a17b90bafbb81ea10868c4d20e778 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 08:15:21 +0000 Subject: [PATCH] chore: update configuration to latest version --- examples/app-basic/.config/.cprc.json | 2 +- examples/app-basic/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/app-basic/package-lock.json | 162 ++++----- examples/app-basic/package.json | 12 +- examples/app-with-backend/.config/.cprc.json | 2 +- examples/app-with-backend/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/app-with-backend/go.mod | 27 +- examples/app-with-backend/go.sum | 56 ++-- examples/app-with-backend/package-lock.json | 162 ++++----- examples/app-with-backend/package.json | 12 +- .../app-with-dashboards/.config/.cprc.json | 2 +- .../app-with-dashboards/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- .../app-with-dashboards/package-lock.json | 162 ++++----- examples/app-with-dashboards/package.json | 12 +- .../.config/.cprc.json | 2 +- .../.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- .../package-lock.json | 162 ++++----- .../app-with-extension-point/package.json | 12 +- .../app-with-extensions/.config/.cprc.json | 2 +- .../app-with-extensions/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- .../app-with-extensions/package-lock.json | 162 ++++----- examples/app-with-extensions/package.json | 12 +- examples/app-with-rbac/.config/.cprc.json | 2 +- examples/app-with-rbac/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/app-with-rbac/go.mod | 29 +- examples/app-with-rbac/go.sum | 60 ++-- examples/app-with-rbac/package-lock.json | 162 ++++----- examples/app-with-rbac/package.json | 12 +- examples/app-with-scenes/.config/.cprc.json | 2 +- examples/app-with-scenes/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/app-with-scenes/package-lock.json | 80 ++--- examples/app-with-scenes/package.json | 12 +- .../.config/.cprc.json | 2 +- .../.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/app-with-service-account/go.mod | 27 +- examples/app-with-service-account/go.sum | 56 ++-- .../package-lock.json | 314 +++++++++--------- .../app-with-service-account/package.json | 12 +- examples/datasource-basic/.config/.cprc.json | 2 +- examples/datasource-basic/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/datasource-basic/go.mod | 27 +- examples/datasource-basic/go.sum | 56 ++-- examples/datasource-basic/package-lock.json | 162 ++++----- examples/datasource-basic/package.json | 12 +- .../.config/.cprc.json | 2 +- .../datasource-http-backend/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/datasource-http-backend/go.mod | 27 +- examples/datasource-http-backend/go.sum | 56 ++-- .../datasource-http-backend/package-lock.json | 161 ++++----- examples/datasource-http-backend/package.json | 12 +- examples/datasource-http/.config/.cprc.json | 2 +- examples/datasource-http/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/datasource-http/package-lock.json | 162 ++++----- examples/datasource-http/package.json | 12 +- examples/datasource-logs/.config/.cprc.json | 2 +- examples/datasource-logs/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/datasource-logs/package-lock.json | 162 ++++----- examples/datasource-logs/package.json | 12 +- .../.config/.cprc.json | 2 +- .../.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- .../streaming-backend-websocket-plugin/go.mod | 27 +- .../streaming-backend-websocket-plugin/go.sum | 56 ++-- .../package-lock.json | 162 ++++----- .../package.json | 12 +- .../.config/.cprc.json | 2 +- .../.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- .../package-lock.json | 162 ++++----- .../streaming-websocket-plugin/package.json | 12 +- examples/panel-basic/.config/.cprc.json | 2 +- examples/panel-basic/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/panel-basic/package-lock.json | 162 ++++----- examples/panel-basic/package.json | 12 +- examples/panel-datalinks/.config/.cprc.json | 2 +- examples/panel-datalinks/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/panel-datalinks/package-lock.json | 162 ++++----- examples/panel-datalinks/package.json | 12 +- .../panel-frame-select/.config/.cprc.json | 2 +- examples/panel-frame-select/.config/README.md | 2 +- .../.config/webpack/webpack.config.ts | 23 +- examples/panel-frame-select/package-lock.json | 162 ++++----- examples/panel-frame-select/package.json | 12 +- 97 files changed, 2070 insertions(+), 1920 deletions(-) diff --git a/examples/app-basic/.config/.cprc.json b/examples/app-basic/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/app-basic/.config/.cprc.json +++ b/examples/app-basic/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/app-basic/.config/README.md b/examples/app-basic/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/app-basic/.config/README.md +++ b/examples/app-basic/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/app-basic/.config/webpack/webpack.config.ts b/examples/app-basic/.config/webpack/webpack.config.ts index 47bc46120..1a7f713da 100644 --- a/examples/app-basic/.config/webpack/webpack.config.ts +++ b/examples/app-basic/.config/webpack/webpack.config.ts @@ -95,6 +95,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -115,17 +127,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/app-basic/package-lock.json b/examples/app-basic/package-lock.json index 3f700ff01..c28ce7efe 100644 --- a/examples/app-basic/package-lock.json +++ b/examples/app-basic/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", @@ -24,9 +24,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.41.2", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -1004,12 +1004,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -1039,9 +1039,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1052,15 +1052,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1127,9 +1132,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1170,15 +1175,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1190,9 +1195,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1216,22 +1221,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1304,9 +1310,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2301,16 +2307,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2319,12 +2325,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2334,12 +2340,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2348,12 +2354,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2414,12 +2420,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2428,12 +2434,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2443,11 +2449,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2456,9 +2462,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -6797,9 +6803,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -9508,9 +9514,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/app-basic/package.json b/examples/app-basic/package.json index 8b3feca6f..09e8f5d91 100644 --- a/examples/app-basic/package.json +++ b/examples/app-basic/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -19,9 +19,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.41.2", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -61,10 +61,10 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/examples/app-with-backend/.config/.cprc.json b/examples/app-with-backend/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/app-with-backend/.config/.cprc.json +++ b/examples/app-with-backend/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/app-with-backend/.config/README.md b/examples/app-with-backend/.config/README.md index a23b6d175..4de64b522 100755 --- a/examples/app-with-backend/.config/README.md +++ b/examples/app-with-backend/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/app-with-backend/.config/webpack/webpack.config.ts b/examples/app-with-backend/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100755 --- a/examples/app-with-backend/.config/webpack/webpack.config.ts +++ b/examples/app-with-backend/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/app-with-backend/go.mod b/examples/app-with-backend/go.mod index f08a5de4d..c108c621e 100755 --- a/examples/app-with-backend/go.mod +++ b/examples/app-with-backend/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.1 -require github.com/grafana/grafana-plugin-sdk-go v0.242.0 +require github.com/grafana/grafana-plugin-sdk-go v0.244.0 require ( github.com/BurntSushi/toml v1.3.2 // indirect @@ -30,7 +30,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/grafana/otel-profiling-go v0.5.1 // indirect - github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect @@ -40,7 +40,7 @@ require ( github.com/invopop/yaml v0.2.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/magefile/mage v1.15.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -52,24 +52,25 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oklog/run v1.1.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.20.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.14.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect github.com/unknwon/com v1.0.1 // indirect github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect github.com/urfave/cli v1.22.15 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 // indirect go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 // indirect - go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 // indirect + go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect @@ -79,15 +80,15 @@ require ( go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.27.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/grpc v1.64.1 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/examples/app-with-backend/go.sum b/examples/app-with-backend/go.sum index 75b1d8dda..4de92e116 100755 --- a/examples/app-with-backend/go.sum +++ b/examples/app-with-backend/go.sum @@ -65,12 +65,12 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= -github.com/grafana/grafana-plugin-sdk-go v0.242.0 h1:MUI/6aPLofRHInrdU0+XgVhB7SunJ5oIuOU9Bsz6KJc= -github.com/grafana/grafana-plugin-sdk-go v0.242.0/go.mod h1:2HjNwzGCfaFAyR2HGoECTwAmq8vSIn2L1/1yOt4XRS4= +github.com/grafana/grafana-plugin-sdk-go v0.244.0 h1:ZZxHbiiF6QcsnlbPFyZGmzNDoTC1pLeHXUQYoskWt5c= +github.com/grafana/grafana-plugin-sdk-go v0.244.0/go.mod h1:H3FXrJMUlwocQ6UYj8Ds5I9EzRAVOcdRcgaRE3mXQqk= github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= @@ -95,14 +95,16 @@ github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpR github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -131,6 +133,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -141,14 +145,14 @@ github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s= -github.com/prometheus/procfs v0.14.0/go.mod h1:XL+Iwz8k8ZabyZfMFHPiilCniixqQarAy5Mu67pHlNQ= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= @@ -188,16 +192,16 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0/go.mod h1:27iA5uvhuRNmalO+iEUdVn5ZMj2qy10Mm+XRIpRmyuU= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 h1:IVtyPth4Rs5P8wIf0mP2KVKFNTJ4paX9qQ4Hkh5gFdc= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0/go.mod h1:ImRBLMJv177/pwiLZ7tU7HDGNdBv7rS0HQ99eN/zBl8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 h1:xQ3ktSVS128JWIaN1DiPGIjcH+GsvkibIAVRWFjS9eM= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0/go.mod h1:O9HIyI2kVBrFoEwQZ0IN6PHXykGoit4mZV2aEjkTRH4= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 h1:ja+d7Aea/9PgGxB63+E0jtRFpma717wubS0KFkZpmYw= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0/go.mod h1:Yc1eg51SJy7xZdOTyg1xyFcwE+ghcWh3/0hKeLo6Wlo= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 h1:OYxqumWcd1yaV/qvCt1B7Sru9OeUNGjeXq/oldx3AGk= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0/go.mod h1:2tZTRqCbvx7nG57wUwd5NQpNVujOWnR84iPLllIH0Ok= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= @@ -231,13 +235,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -251,12 +255,12 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -275,8 +279,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= -google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/examples/app-with-backend/package-lock.json b/examples/app-with-backend/package-lock.json index 743c6e09b..7a67067bf 100644 --- a/examples/app-with-backend/package-lock.json +++ b/examples/app-with-backend/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "^5.2.0", @@ -24,9 +24,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.42.1", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -1039,12 +1039,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -1074,9 +1074,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1087,15 +1087,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1367,9 +1372,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1410,15 +1415,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1430,9 +1435,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1456,22 +1461,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1544,9 +1550,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2836,16 +2842,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2854,12 +2860,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2869,12 +2875,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2883,12 +2889,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2949,12 +2955,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2963,12 +2969,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2978,11 +2984,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2991,9 +2997,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -7961,9 +7967,9 @@ "integrity": "sha512-fedL7PRwmeVkgyhu9hLeTBaI6wcGk7JGJswdaRsa5aUbkXI1kr1xZwTPBtaYPpwf56878iDek6VbVnuWMebJmw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -11753,9 +11759,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/app-with-backend/package.json b/examples/app-with-backend/package.json index af4d4db90..247b5d769 100755 --- a/examples/app-with-backend/package.json +++ b/examples/app-with-backend/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -19,9 +19,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.42.1", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -65,10 +65,10 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "^5.2.0", diff --git a/examples/app-with-dashboards/.config/.cprc.json b/examples/app-with-dashboards/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/app-with-dashboards/.config/.cprc.json +++ b/examples/app-with-dashboards/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/app-with-dashboards/.config/README.md b/examples/app-with-dashboards/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/app-with-dashboards/.config/README.md +++ b/examples/app-with-dashboards/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/app-with-dashboards/.config/webpack/webpack.config.ts b/examples/app-with-dashboards/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/app-with-dashboards/.config/webpack/webpack.config.ts +++ b/examples/app-with-dashboards/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/app-with-dashboards/package-lock.json b/examples/app-with-dashboards/package-lock.json index 92ea5dfdb..ce244eca5 100644 --- a/examples/app-with-dashboards/package-lock.json +++ b/examples/app-with-dashboards/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "^5.2.0", @@ -23,9 +23,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -1037,12 +1037,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -1072,9 +1072,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1085,15 +1085,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1160,9 +1165,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1203,15 +1208,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1223,9 +1228,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1249,22 +1254,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1337,9 +1343,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2595,16 +2601,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2613,12 +2619,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2628,12 +2634,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2642,12 +2648,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2708,12 +2714,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2722,12 +2728,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2737,11 +2743,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2750,9 +2756,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -7487,9 +7493,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -11224,9 +11230,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/app-with-dashboards/package.json b/examples/app-with-dashboards/package.json index 8b3cfe0f3..a8383ab78 100644 --- a/examples/app-with-dashboards/package.json +++ b/examples/app-with-dashboards/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -19,9 +19,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -63,10 +63,10 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "^5.2.0", diff --git a/examples/app-with-extension-point/.config/.cprc.json b/examples/app-with-extension-point/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/app-with-extension-point/.config/.cprc.json +++ b/examples/app-with-extension-point/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/app-with-extension-point/.config/README.md b/examples/app-with-extension-point/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/app-with-extension-point/.config/README.md +++ b/examples/app-with-extension-point/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/app-with-extension-point/.config/webpack/webpack.config.ts b/examples/app-with-extension-point/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/app-with-extension-point/.config/webpack/webpack.config.ts +++ b/examples/app-with-extension-point/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/app-with-extension-point/package-lock.json b/examples/app-with-extension-point/package-lock.json index 583410138..dcf58dfe3 100644 --- a/examples/app-with-extension-point/package-lock.json +++ b/examples/app-with-extension-point/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "^5.2.0", @@ -23,9 +23,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -958,12 +958,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -993,9 +993,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1006,15 +1006,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1081,9 +1086,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1157,15 +1162,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1177,9 +1182,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1203,22 +1208,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1291,9 +1297,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -3240,16 +3246,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3258,12 +3264,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3273,12 +3279,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3287,12 +3293,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3353,12 +3359,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3367,12 +3373,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3382,11 +3388,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -3395,9 +3401,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -8657,9 +8663,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -13650,9 +13656,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/app-with-extension-point/package.json b/examples/app-with-extension-point/package.json index 7281948f4..12474d0eb 100644 --- a/examples/app-with-extension-point/package.json +++ b/examples/app-with-extension-point/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -19,9 +19,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -63,10 +63,10 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "^5.2.0", diff --git a/examples/app-with-extensions/.config/.cprc.json b/examples/app-with-extensions/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/app-with-extensions/.config/.cprc.json +++ b/examples/app-with-extensions/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/app-with-extensions/.config/README.md b/examples/app-with-extensions/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/app-with-extensions/.config/README.md +++ b/examples/app-with-extensions/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/app-with-extensions/.config/webpack/webpack.config.ts b/examples/app-with-extensions/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/app-with-extensions/.config/webpack/webpack.config.ts +++ b/examples/app-with-extensions/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/app-with-extensions/package-lock.json b/examples/app-with-extensions/package-lock.json index 3e5533823..ece5e38b1 100644 --- a/examples/app-with-extensions/package-lock.json +++ b/examples/app-with-extensions/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "^5.2.0", @@ -23,9 +23,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -1030,12 +1030,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -1065,9 +1065,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1078,15 +1078,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1153,9 +1158,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1229,15 +1234,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1249,9 +1254,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1275,22 +1280,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1363,9 +1369,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2461,16 +2467,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2479,12 +2485,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2494,12 +2500,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2508,12 +2514,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2574,12 +2580,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2588,12 +2594,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2603,11 +2609,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2616,9 +2622,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -7601,9 +7607,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -10709,9 +10715,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/app-with-extensions/package.json b/examples/app-with-extensions/package.json index 826a66b2d..339f5885a 100644 --- a/examples/app-with-extensions/package.json +++ b/examples/app-with-extensions/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -19,9 +19,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -63,10 +63,10 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "^5.2.0", diff --git a/examples/app-with-rbac/.config/.cprc.json b/examples/app-with-rbac/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/app-with-rbac/.config/.cprc.json +++ b/examples/app-with-rbac/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/app-with-rbac/.config/README.md b/examples/app-with-rbac/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/app-with-rbac/.config/README.md +++ b/examples/app-with-rbac/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/app-with-rbac/.config/webpack/webpack.config.ts b/examples/app-with-rbac/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/app-with-rbac/.config/webpack/webpack.config.ts +++ b/examples/app-with-rbac/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/app-with-rbac/go.mod b/examples/app-with-rbac/go.mod index 452cd1c99..704459982 100644 --- a/examples/app-with-rbac/go.mod +++ b/examples/app-with-rbac/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.1 require ( github.com/grafana/authlib v0.0.0-20240318132843-56180bacf0d3 - github.com/grafana/grafana-plugin-sdk-go v0.242.0 + github.com/grafana/grafana-plugin-sdk-go v0.244.0 github.com/stretchr/testify v1.9.0 ) @@ -37,7 +37,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/grafana/otel-profiling-go v0.5.1 // indirect - github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect @@ -47,7 +47,7 @@ require ( github.com/invopop/yaml v0.2.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/magefile/mage v1.15.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -59,16 +59,17 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oklog/run v1.1.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.20.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.14.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect @@ -76,10 +77,10 @@ require ( github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect github.com/urfave/cli v1.22.15 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 // indirect go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 // indirect - go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 // indirect + go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect @@ -87,18 +88,18 @@ require ( go.opentelemetry.io/otel/sdk v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect - golang.org/x/crypto v0.25.0 // indirect + golang.org/x/crypto v0.26.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.27.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/grpc v1.64.1 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/examples/app-with-rbac/go.sum b/examples/app-with-rbac/go.sum index 8225c4547..71cb1a120 100644 --- a/examples/app-with-rbac/go.sum +++ b/examples/app-with-rbac/go.sum @@ -73,12 +73,12 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/grafana/authlib v0.0.0-20240318132843-56180bacf0d3 h1:nsB8RLq69+x1dE7vbUKxFHNOvJNkL/QvqOW6HJhtz9U= github.com/grafana/authlib v0.0.0-20240318132843-56180bacf0d3/go.mod h1:86rRD5P6u2JPWtNWTMOlqlU+YMv2fUvVz/DomA6L7w4= -github.com/grafana/grafana-plugin-sdk-go v0.242.0 h1:MUI/6aPLofRHInrdU0+XgVhB7SunJ5oIuOU9Bsz6KJc= -github.com/grafana/grafana-plugin-sdk-go v0.242.0/go.mod h1:2HjNwzGCfaFAyR2HGoECTwAmq8vSIn2L1/1yOt4XRS4= +github.com/grafana/grafana-plugin-sdk-go v0.244.0 h1:ZZxHbiiF6QcsnlbPFyZGmzNDoTC1pLeHXUQYoskWt5c= +github.com/grafana/grafana-plugin-sdk-go v0.244.0/go.mod h1:H3FXrJMUlwocQ6UYj8Ds5I9EzRAVOcdRcgaRE3mXQqk= github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= @@ -103,14 +103,16 @@ github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpR github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -139,6 +141,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -151,14 +155,14 @@ github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s= -github.com/prometheus/procfs v0.14.0/go.mod h1:XL+Iwz8k8ZabyZfMFHPiilCniixqQarAy5Mu67pHlNQ= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= @@ -201,16 +205,16 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0/go.mod h1:27iA5uvhuRNmalO+iEUdVn5ZMj2qy10Mm+XRIpRmyuU= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 h1:IVtyPth4Rs5P8wIf0mP2KVKFNTJ4paX9qQ4Hkh5gFdc= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0/go.mod h1:ImRBLMJv177/pwiLZ7tU7HDGNdBv7rS0HQ99eN/zBl8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 h1:xQ3ktSVS128JWIaN1DiPGIjcH+GsvkibIAVRWFjS9eM= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0/go.mod h1:O9HIyI2kVBrFoEwQZ0IN6PHXykGoit4mZV2aEjkTRH4= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 h1:ja+d7Aea/9PgGxB63+E0jtRFpma717wubS0KFkZpmYw= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0/go.mod h1:Yc1eg51SJy7xZdOTyg1xyFcwE+ghcWh3/0hKeLo6Wlo= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 h1:OYxqumWcd1yaV/qvCt1B7Sru9OeUNGjeXq/oldx3AGk= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0/go.mod h1:2tZTRqCbvx7nG57wUwd5NQpNVujOWnR84iPLllIH0Ok= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= @@ -236,8 +240,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -254,15 +258,15 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -282,8 +286,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -295,8 +299,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -317,8 +321,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= -google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/examples/app-with-rbac/package-lock.json b/examples/app-with-rbac/package-lock.json index ab682c14e..70af6c8db 100644 --- a/examples/app-with-rbac/package-lock.json +++ b/examples/app-with-rbac/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "5.3.3", @@ -23,8 +23,8 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/plugin-e2e": "^1.7.1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.41.2", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -937,12 +937,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -972,9 +972,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -985,15 +985,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1243,9 +1248,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1272,15 +1277,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1292,9 +1297,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1318,22 +1323,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1406,9 +1412,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2820,16 +2826,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2838,12 +2844,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2853,12 +2859,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2867,12 +2873,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2933,12 +2939,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2947,12 +2953,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2962,11 +2968,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2975,9 +2981,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -8211,9 +8217,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -12454,9 +12460,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/app-with-rbac/package.json b/examples/app-with-rbac/package.json index 66dc756d2..c5ba42acc 100644 --- a/examples/app-with-rbac/package.json +++ b/examples/app-with-rbac/package.json @@ -11,7 +11,7 @@ "typecheck": "tsc --noEmit", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", "lint:fix": "npm run lint -- --fix", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest" }, "author": "Your name", @@ -19,8 +19,8 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/plugin-e2e": "^1.7.1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.41.2", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -61,10 +61,10 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "5.3.3", diff --git a/examples/app-with-scenes/.config/.cprc.json b/examples/app-with-scenes/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/app-with-scenes/.config/.cprc.json +++ b/examples/app-with-scenes/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/app-with-scenes/.config/README.md b/examples/app-with-scenes/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/app-with-scenes/.config/README.md +++ b/examples/app-with-scenes/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/app-with-scenes/.config/webpack/webpack.config.ts b/examples/app-with-scenes/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/app-with-scenes/.config/webpack/webpack.config.ts +++ b/examples/app-with-scenes/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/app-with-scenes/package-lock.json b/examples/app-with-scenes/package-lock.json index 8059509bb..ee4dd73dc 100644 --- a/examples/app-with-scenes/package-lock.json +++ b/examples/app-with-scenes/package-lock.json @@ -10,11 +10,11 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/scenes": "^5.7.3", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", @@ -25,9 +25,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "^1.2.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.41.2", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -940,12 +940,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -975,9 +975,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -988,9 +988,9 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", @@ -1251,9 +1251,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1306,15 +1306,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1326,9 +1326,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1373,23 +1373,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.2.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.2.0-rc1.tgz", - "integrity": "sha512-+SgQeBQ1pT6D/E3/dEdADqTrlgdIGuexUZ8EU+8KxQFKUeFeU7/3z/ayI2q/wpJ/Kr6WxBBNlrST6aOKia19Ag==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1462,9 +1462,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } diff --git a/examples/app-with-scenes/package.json b/examples/app-with-scenes/package.json index 678eb8374..cd119f64d 100644 --- a/examples/app-with-scenes/package.json +++ b/examples/app-with-scenes/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -19,8 +19,8 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/tsconfig": "^1.2.0-rc1", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/tsconfig": "^2.0.0", + "@grafana/plugin-e2e": "^1.7.1", "@playwright/test": "^1.41.2", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -62,11 +62,11 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/scenes": "^5.7.3", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/examples/app-with-service-account/.config/.cprc.json b/examples/app-with-service-account/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/app-with-service-account/.config/.cprc.json +++ b/examples/app-with-service-account/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/app-with-service-account/.config/README.md b/examples/app-with-service-account/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/app-with-service-account/.config/README.md +++ b/examples/app-with-service-account/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/app-with-service-account/.config/webpack/webpack.config.ts b/examples/app-with-service-account/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/app-with-service-account/.config/webpack/webpack.config.ts +++ b/examples/app-with-service-account/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/app-with-service-account/go.mod b/examples/app-with-service-account/go.mod index 95098da89..8759b924b 100644 --- a/examples/app-with-service-account/go.mod +++ b/examples/app-with-service-account/go.mod @@ -2,7 +2,7 @@ module github.com/grafana/app-with-service-account go 1.21 -require github.com/grafana/grafana-plugin-sdk-go v0.242.0 +require github.com/grafana/grafana-plugin-sdk-go v0.244.0 require ( github.com/BurntSushi/toml v1.3.2 // indirect @@ -28,7 +28,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/grafana/otel-profiling-go v0.5.1 // indirect - github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect @@ -38,7 +38,7 @@ require ( github.com/invopop/yaml v0.2.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/magefile/mage v1.15.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -50,24 +50,25 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oklog/run v1.1.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.20.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.14.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect github.com/unknwon/com v1.0.1 // indirect github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect github.com/urfave/cli v1.22.15 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 // indirect go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 // indirect - go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 // indirect + go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect @@ -77,15 +78,15 @@ require ( go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.27.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/grpc v1.64.1 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/examples/app-with-service-account/go.sum b/examples/app-with-service-account/go.sum index 75b1d8dda..4de92e116 100644 --- a/examples/app-with-service-account/go.sum +++ b/examples/app-with-service-account/go.sum @@ -65,12 +65,12 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= -github.com/grafana/grafana-plugin-sdk-go v0.242.0 h1:MUI/6aPLofRHInrdU0+XgVhB7SunJ5oIuOU9Bsz6KJc= -github.com/grafana/grafana-plugin-sdk-go v0.242.0/go.mod h1:2HjNwzGCfaFAyR2HGoECTwAmq8vSIn2L1/1yOt4XRS4= +github.com/grafana/grafana-plugin-sdk-go v0.244.0 h1:ZZxHbiiF6QcsnlbPFyZGmzNDoTC1pLeHXUQYoskWt5c= +github.com/grafana/grafana-plugin-sdk-go v0.244.0/go.mod h1:H3FXrJMUlwocQ6UYj8Ds5I9EzRAVOcdRcgaRE3mXQqk= github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= @@ -95,14 +95,16 @@ github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpR github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -131,6 +133,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -141,14 +145,14 @@ github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s= -github.com/prometheus/procfs v0.14.0/go.mod h1:XL+Iwz8k8ZabyZfMFHPiilCniixqQarAy5Mu67pHlNQ= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= @@ -188,16 +192,16 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0/go.mod h1:27iA5uvhuRNmalO+iEUdVn5ZMj2qy10Mm+XRIpRmyuU= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 h1:IVtyPth4Rs5P8wIf0mP2KVKFNTJ4paX9qQ4Hkh5gFdc= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0/go.mod h1:ImRBLMJv177/pwiLZ7tU7HDGNdBv7rS0HQ99eN/zBl8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 h1:xQ3ktSVS128JWIaN1DiPGIjcH+GsvkibIAVRWFjS9eM= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0/go.mod h1:O9HIyI2kVBrFoEwQZ0IN6PHXykGoit4mZV2aEjkTRH4= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 h1:ja+d7Aea/9PgGxB63+E0jtRFpma717wubS0KFkZpmYw= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0/go.mod h1:Yc1eg51SJy7xZdOTyg1xyFcwE+ghcWh3/0hKeLo6Wlo= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 h1:OYxqumWcd1yaV/qvCt1B7Sru9OeUNGjeXq/oldx3AGk= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0/go.mod h1:2tZTRqCbvx7nG57wUwd5NQpNVujOWnR84iPLllIH0Ok= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= @@ -231,13 +235,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -251,12 +255,12 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -275,8 +279,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= -google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/examples/app-with-service-account/package-lock.json b/examples/app-with-service-account/package-lock.json index d68f73654..c9239da7d 100644 --- a/examples/app-with-service-account/package-lock.json +++ b/examples/app-with-service-account/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "^5.2.0", @@ -23,9 +23,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.41.2", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -926,12 +926,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -961,9 +961,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -974,15 +974,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1049,9 +1054,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1104,15 +1109,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1124,9 +1129,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1150,22 +1155,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1238,9 +1244,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -3174,16 +3180,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3192,12 +3198,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3207,12 +3213,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3221,12 +3227,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3287,12 +3293,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3301,12 +3307,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3316,11 +3322,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -3329,9 +3335,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -8562,9 +8568,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -13536,9 +13542,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -17616,12 +17622,12 @@ } }, "@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "requires": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -17647,9 +17653,9 @@ }, "dependencies": { "@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "requires": { "tslib": "2.6.3" } @@ -17662,15 +17668,20 @@ } }, "@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "requires": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" }, "dependencies": { + "@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -17727,9 +17738,9 @@ } }, "@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "requires": { "semver": "^7.5.4", @@ -17764,15 +17775,15 @@ } }, "@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "requires": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -17780,9 +17791,9 @@ }, "dependencies": { "@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "requires": { "tslib": "2.6.3" } @@ -17810,22 +17821,23 @@ } }, "@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "requires": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -17894,9 +17906,9 @@ } }, "@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "requires": { "tslib": "2.6.3" } @@ -19386,27 +19398,27 @@ } }, "@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "requires": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, "dependencies": { "@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "requires": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -19415,23 +19427,23 @@ } }, "@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "requires": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, "dependencies": { "@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "requires": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -19478,23 +19490,23 @@ } }, "@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "requires": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, "dependencies": { "@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "requires": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -19503,19 +19515,19 @@ } }, "@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "requires": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" } }, "@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "requires": { "@swc/helpers": "^0.5.0" } @@ -23449,9 +23461,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "requires": { "@babel/runtime": "^7.23.2" } @@ -27132,9 +27144,9 @@ } }, "protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "requires": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", diff --git a/examples/app-with-service-account/package.json b/examples/app-with-service-account/package.json index 9931b2599..3fed683d5 100644 --- a/examples/app-with-service-account/package.json +++ b/examples/app-with-service-account/package.json @@ -11,7 +11,7 @@ "typecheck": "tsc --noEmit", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", "lint:fix": "npm run lint -- --fix", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest" }, "author": "Grafana", @@ -19,8 +19,8 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/tsconfig": "1.3.0-rc1", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/tsconfig": "^2.0.0", + "@grafana/plugin-e2e": "^1.7.1", "@playwright/test": "^1.41.2", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -62,9 +62,9 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", - "@grafana/ui": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "react-router-dom": "^5.2.0", diff --git a/examples/datasource-basic/.config/.cprc.json b/examples/datasource-basic/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/datasource-basic/.config/.cprc.json +++ b/examples/datasource-basic/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/datasource-basic/.config/README.md b/examples/datasource-basic/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/datasource-basic/.config/README.md +++ b/examples/datasource-basic/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/datasource-basic/.config/webpack/webpack.config.ts b/examples/datasource-basic/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/datasource-basic/.config/webpack/webpack.config.ts +++ b/examples/datasource-basic/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/datasource-basic/go.mod b/examples/datasource-basic/go.mod index f9e8c955b..83bb408e8 100644 --- a/examples/datasource-basic/go.mod +++ b/examples/datasource-basic/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.1 -require github.com/grafana/grafana-plugin-sdk-go v0.242.0 +require github.com/grafana/grafana-plugin-sdk-go v0.244.0 require ( github.com/BurntSushi/toml v1.3.2 // indirect @@ -30,7 +30,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/grafana/otel-profiling-go v0.5.1 // indirect - github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect @@ -40,7 +40,7 @@ require ( github.com/invopop/yaml v0.2.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/magefile/mage v1.15.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -52,24 +52,25 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oklog/run v1.1.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.20.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.14.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect github.com/unknwon/com v1.0.1 // indirect github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect github.com/urfave/cli v1.22.15 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 // indirect go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 // indirect - go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 // indirect + go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect @@ -79,15 +80,15 @@ require ( go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.27.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/grpc v1.64.1 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/examples/datasource-basic/go.sum b/examples/datasource-basic/go.sum index 75b1d8dda..4de92e116 100644 --- a/examples/datasource-basic/go.sum +++ b/examples/datasource-basic/go.sum @@ -65,12 +65,12 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= -github.com/grafana/grafana-plugin-sdk-go v0.242.0 h1:MUI/6aPLofRHInrdU0+XgVhB7SunJ5oIuOU9Bsz6KJc= -github.com/grafana/grafana-plugin-sdk-go v0.242.0/go.mod h1:2HjNwzGCfaFAyR2HGoECTwAmq8vSIn2L1/1yOt4XRS4= +github.com/grafana/grafana-plugin-sdk-go v0.244.0 h1:ZZxHbiiF6QcsnlbPFyZGmzNDoTC1pLeHXUQYoskWt5c= +github.com/grafana/grafana-plugin-sdk-go v0.244.0/go.mod h1:H3FXrJMUlwocQ6UYj8Ds5I9EzRAVOcdRcgaRE3mXQqk= github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= @@ -95,14 +95,16 @@ github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpR github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -131,6 +133,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -141,14 +145,14 @@ github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s= -github.com/prometheus/procfs v0.14.0/go.mod h1:XL+Iwz8k8ZabyZfMFHPiilCniixqQarAy5Mu67pHlNQ= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= @@ -188,16 +192,16 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0/go.mod h1:27iA5uvhuRNmalO+iEUdVn5ZMj2qy10Mm+XRIpRmyuU= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 h1:IVtyPth4Rs5P8wIf0mP2KVKFNTJ4paX9qQ4Hkh5gFdc= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0/go.mod h1:ImRBLMJv177/pwiLZ7tU7HDGNdBv7rS0HQ99eN/zBl8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 h1:xQ3ktSVS128JWIaN1DiPGIjcH+GsvkibIAVRWFjS9eM= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0/go.mod h1:O9HIyI2kVBrFoEwQZ0IN6PHXykGoit4mZV2aEjkTRH4= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 h1:ja+d7Aea/9PgGxB63+E0jtRFpma717wubS0KFkZpmYw= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0/go.mod h1:Yc1eg51SJy7xZdOTyg1xyFcwE+ghcWh3/0hKeLo6Wlo= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 h1:OYxqumWcd1yaV/qvCt1B7Sru9OeUNGjeXq/oldx3AGk= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0/go.mod h1:2tZTRqCbvx7nG57wUwd5NQpNVujOWnR84iPLllIH0Ok= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= @@ -231,13 +235,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -251,12 +255,12 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -275,8 +279,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= -google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/examples/datasource-basic/package-lock.json b/examples/datasource-basic/package-lock.json index 0aefb6c70..494f1d7f1 100644 --- a/examples/datasource-basic/package-lock.json +++ b/examples/datasource-basic/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", @@ -23,9 +23,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -1032,12 +1032,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -1067,9 +1067,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1080,15 +1080,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1155,9 +1160,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1225,15 +1230,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1245,9 +1250,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1271,22 +1276,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1359,9 +1365,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2566,16 +2572,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2584,12 +2590,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2599,12 +2605,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2613,12 +2619,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2679,12 +2685,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2693,12 +2699,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2708,11 +2714,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2721,9 +2727,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -7627,9 +7633,9 @@ "integrity": "sha512-fedL7PRwmeVkgyhu9hLeTBaI6wcGk7JGJswdaRsa5aUbkXI1kr1xZwTPBtaYPpwf56878iDek6VbVnuWMebJmw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -11366,9 +11372,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/datasource-basic/package.json b/examples/datasource-basic/package.json index c73d44bbe..c36d2244b 100644 --- a/examples/datasource-basic/package.json +++ b/examples/datasource-basic/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -19,9 +19,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -65,10 +65,10 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/examples/datasource-http-backend/.config/.cprc.json b/examples/datasource-http-backend/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/datasource-http-backend/.config/.cprc.json +++ b/examples/datasource-http-backend/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/datasource-http-backend/.config/README.md b/examples/datasource-http-backend/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/datasource-http-backend/.config/README.md +++ b/examples/datasource-http-backend/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/datasource-http-backend/.config/webpack/webpack.config.ts b/examples/datasource-http-backend/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/datasource-http-backend/.config/webpack/webpack.config.ts +++ b/examples/datasource-http-backend/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/datasource-http-backend/go.mod b/examples/datasource-http-backend/go.mod index 37c17b2b3..a5d6174c2 100644 --- a/examples/datasource-http-backend/go.mod +++ b/examples/datasource-http-backend/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.22.1 require ( - github.com/grafana/grafana-plugin-sdk-go v0.242.0 + github.com/grafana/grafana-plugin-sdk-go v0.244.0 github.com/magefile/mage v1.15.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/otel v1.28.0 @@ -37,7 +37,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/grafana/otel-profiling-go v0.5.1 // indirect - github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect @@ -47,7 +47,7 @@ require ( github.com/invopop/yaml v0.2.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattetti/filebuffer v1.0.1 // indirect @@ -58,25 +58,26 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oklog/run v1.1.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.20.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.14.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect github.com/unknwon/com v1.0.1 // indirect github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect github.com/urfave/cli v1.22.15 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 // indirect go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 // indirect - go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 // indirect + go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -84,15 +85,15 @@ require ( go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.27.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/grpc v1.64.1 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/examples/datasource-http-backend/go.sum b/examples/datasource-http-backend/go.sum index 75b1d8dda..4de92e116 100644 --- a/examples/datasource-http-backend/go.sum +++ b/examples/datasource-http-backend/go.sum @@ -65,12 +65,12 @@ github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= -github.com/grafana/grafana-plugin-sdk-go v0.242.0 h1:MUI/6aPLofRHInrdU0+XgVhB7SunJ5oIuOU9Bsz6KJc= -github.com/grafana/grafana-plugin-sdk-go v0.242.0/go.mod h1:2HjNwzGCfaFAyR2HGoECTwAmq8vSIn2L1/1yOt4XRS4= +github.com/grafana/grafana-plugin-sdk-go v0.244.0 h1:ZZxHbiiF6QcsnlbPFyZGmzNDoTC1pLeHXUQYoskWt5c= +github.com/grafana/grafana-plugin-sdk-go v0.244.0/go.mod h1:H3FXrJMUlwocQ6UYj8Ds5I9EzRAVOcdRcgaRE3mXQqk= github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= @@ -95,14 +95,16 @@ github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpR github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -131,6 +133,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -141,14 +145,14 @@ github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s= -github.com/prometheus/procfs v0.14.0/go.mod h1:XL+Iwz8k8ZabyZfMFHPiilCniixqQarAy5Mu67pHlNQ= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= @@ -188,16 +192,16 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0/go.mod h1:27iA5uvhuRNmalO+iEUdVn5ZMj2qy10Mm+XRIpRmyuU= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 h1:IVtyPth4Rs5P8wIf0mP2KVKFNTJ4paX9qQ4Hkh5gFdc= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0/go.mod h1:ImRBLMJv177/pwiLZ7tU7HDGNdBv7rS0HQ99eN/zBl8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 h1:xQ3ktSVS128JWIaN1DiPGIjcH+GsvkibIAVRWFjS9eM= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0/go.mod h1:O9HIyI2kVBrFoEwQZ0IN6PHXykGoit4mZV2aEjkTRH4= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 h1:ja+d7Aea/9PgGxB63+E0jtRFpma717wubS0KFkZpmYw= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0/go.mod h1:Yc1eg51SJy7xZdOTyg1xyFcwE+ghcWh3/0hKeLo6Wlo= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 h1:OYxqumWcd1yaV/qvCt1B7Sru9OeUNGjeXq/oldx3AGk= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0/go.mod h1:2tZTRqCbvx7nG57wUwd5NQpNVujOWnR84iPLllIH0Ok= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= @@ -231,13 +235,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -251,12 +255,12 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -275,8 +279,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= -google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/examples/datasource-http-backend/package-lock.json b/examples/datasource-http-backend/package-lock.json index f0896bd1e..32f37073c 100644 --- a/examples/datasource-http-backend/package-lock.json +++ b/examples/datasource-http-backend/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "tslib": "2.5.3" @@ -21,9 +21,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -866,12 +866,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -901,9 +901,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -914,15 +914,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1158,9 +1163,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1210,15 +1215,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1230,9 +1235,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1256,21 +1261,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "license": "Apache-2.0" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1343,9 +1350,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2663,16 +2670,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2681,12 +2688,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2696,12 +2703,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2710,12 +2717,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2776,12 +2783,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2790,12 +2797,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2805,11 +2812,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2818,9 +2825,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -7509,9 +7516,9 @@ "integrity": "sha512-fedL7PRwmeVkgyhu9hLeTBaI6wcGk7JGJswdaRsa5aUbkXI1kr1xZwTPBtaYPpwf56878iDek6VbVnuWMebJmw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -11368,9 +11375,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/datasource-http-backend/package.json b/examples/datasource-http-backend/package.json index 5266f5b7d..7a3b5ea20 100644 --- a/examples/datasource-http-backend/package.json +++ b/examples/datasource-http-backend/package.json @@ -7,7 +7,7 @@ "dev": "webpack -w -c ./.config/webpack/webpack.config.ts --env development", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -19,8 +19,8 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/tsconfig": "1.3.0-rc1", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/tsconfig": "^2.0.0", + "@grafana/plugin-e2e": "^1.7.1", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -63,9 +63,9 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", - "@grafana/ui": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "tslib": "2.5.3", diff --git a/examples/datasource-http/.config/.cprc.json b/examples/datasource-http/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/datasource-http/.config/.cprc.json +++ b/examples/datasource-http/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/datasource-http/.config/README.md b/examples/datasource-http/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/datasource-http/.config/README.md +++ b/examples/datasource-http/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/datasource-http/.config/webpack/webpack.config.ts b/examples/datasource-http/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/datasource-http/.config/webpack/webpack.config.ts +++ b/examples/datasource-http/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/datasource-http/package-lock.json b/examples/datasource-http/package-lock.json index b0bc16ade..e614078d7 100644 --- a/examples/datasource-http/package-lock.json +++ b/examples/datasource-http/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "tslib": "2.5.3" @@ -21,9 +21,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -1078,12 +1078,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -1113,9 +1113,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1126,15 +1126,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1201,9 +1206,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1271,15 +1276,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1291,9 +1296,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1317,22 +1322,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1405,9 +1411,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2436,16 +2442,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2454,12 +2460,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2469,12 +2475,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2483,12 +2489,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2549,12 +2555,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2563,12 +2569,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2578,11 +2584,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2591,9 +2597,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -7721,9 +7727,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -10667,9 +10673,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/datasource-http/package.json b/examples/datasource-http/package.json index 114a50414..cf24026c4 100644 --- a/examples/datasource-http/package.json +++ b/examples/datasource-http/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -24,9 +24,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -68,10 +68,10 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "tslib": "2.5.3" diff --git a/examples/datasource-logs/.config/.cprc.json b/examples/datasource-logs/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/datasource-logs/.config/.cprc.json +++ b/examples/datasource-logs/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/datasource-logs/.config/README.md b/examples/datasource-logs/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/datasource-logs/.config/README.md +++ b/examples/datasource-logs/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/datasource-logs/.config/webpack/webpack.config.ts b/examples/datasource-logs/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/datasource-logs/.config/webpack/webpack.config.ts +++ b/examples/datasource-logs/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/datasource-logs/package-lock.json b/examples/datasource-logs/package-lock.json index f04294f07..b0eeca49f 100644 --- a/examples/datasource-logs/package-lock.json +++ b/examples/datasource-logs/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "loadash": "^1.0.0", "react": "18.2.0", "react-dom": "18.2.0", @@ -23,9 +23,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -926,12 +926,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -961,9 +961,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -982,15 +982,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1057,9 +1062,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1112,15 +1117,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1132,9 +1137,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1166,22 +1171,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1254,9 +1260,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -3147,16 +3153,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3165,12 +3171,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3180,12 +3186,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3194,12 +3200,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3260,12 +3266,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3274,12 +3280,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3289,11 +3295,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -3302,9 +3308,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -8477,9 +8483,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -13476,9 +13482,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/datasource-logs/package.json b/examples/datasource-logs/package.json index c03452662..371cd3696 100644 --- a/examples/datasource-logs/package.json +++ b/examples/datasource-logs/package.json @@ -11,7 +11,7 @@ "typecheck": "tsc --noEmit", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", "lint:fix": "npm run lint -- --fix", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest" }, "author": "Grafana Labs", @@ -19,8 +19,8 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/tsconfig": "1.3.0-rc1", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/tsconfig": "^2.0.0", + "@grafana/plugin-e2e": "^1.7.1", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -62,9 +62,9 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", - "@grafana/ui": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", + "@grafana/ui": "^11.1.4", "loadash": "^1.0.0", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/.cprc.json b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/.cprc.json +++ b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/README.md b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/README.md +++ b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/webpack/webpack.config.ts b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/webpack/webpack.config.ts +++ b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/go.mod b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/go.mod index be07f9d19..728f77013 100644 --- a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/go.mod +++ b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.1 require ( github.com/gorilla/websocket v1.5.0 - github.com/grafana/grafana-plugin-sdk-go v0.242.0 + github.com/grafana/grafana-plugin-sdk-go v0.244.0 ) require ( @@ -33,7 +33,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/grafana/otel-profiling-go v0.5.1 // indirect - github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect @@ -43,7 +43,7 @@ require ( github.com/invopop/yaml v0.2.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/magefile/mage v1.15.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -55,24 +55,25 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oklog/run v1.1.0 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.20.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.54.0 // indirect - github.com/prometheus/procfs v0.14.0 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect github.com/unknwon/com v1.0.1 // indirect github.com/unknwon/log v0.0.0-20150304194804-e617c87089d3 // indirect github.com/urfave/cli v1.22.15 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 // indirect go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 // indirect - go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 // indirect + go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect @@ -82,15 +83,15 @@ require ( go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.27.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/grpc v1.64.1 // indirect + google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/go.sum b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/go.sum index 944290962..e68941a9e 100644 --- a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/go.sum +++ b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/go.sum @@ -67,12 +67,12 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grafana/grafana-plugin-sdk-go v0.242.0 h1:MUI/6aPLofRHInrdU0+XgVhB7SunJ5oIuOU9Bsz6KJc= -github.com/grafana/grafana-plugin-sdk-go v0.242.0/go.mod h1:2HjNwzGCfaFAyR2HGoECTwAmq8vSIn2L1/1yOt4XRS4= +github.com/grafana/grafana-plugin-sdk-go v0.244.0 h1:ZZxHbiiF6QcsnlbPFyZGmzNDoTC1pLeHXUQYoskWt5c= +github.com/grafana/grafana-plugin-sdk-go v0.244.0/go.mod h1:H3FXrJMUlwocQ6UYj8Ds5I9EzRAVOcdRcgaRE3mXQqk= github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8= github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY= -github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk= @@ -97,14 +97,16 @@ github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpR github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -133,6 +135,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -143,14 +147,14 @@ github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8= -github.com/prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ= -github.com/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s= -github.com/prometheus/procfs v0.14.0/go.mod h1:XL+Iwz8k8ZabyZfMFHPiilCniixqQarAy5Mu67pHlNQ= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= @@ -190,16 +194,16 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0/go.mod h1:27iA5uvhuRNmalO+iEUdVn5ZMj2qy10Mm+XRIpRmyuU= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0 h1:IVtyPth4Rs5P8wIf0mP2KVKFNTJ4paX9qQ4Hkh5gFdc= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0/go.mod h1:ImRBLMJv177/pwiLZ7tU7HDGNdBv7rS0HQ99eN/zBl8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0 h1:xQ3ktSVS128JWIaN1DiPGIjcH+GsvkibIAVRWFjS9eM= go.opentelemetry.io/contrib/propagators/jaeger v1.28.0/go.mod h1:O9HIyI2kVBrFoEwQZ0IN6PHXykGoit4mZV2aEjkTRH4= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0 h1:ja+d7Aea/9PgGxB63+E0jtRFpma717wubS0KFkZpmYw= -go.opentelemetry.io/contrib/samplers/jaegerremote v0.20.0/go.mod h1:Yc1eg51SJy7xZdOTyg1xyFcwE+ghcWh3/0hKeLo6Wlo= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0 h1:OYxqumWcd1yaV/qvCt1B7Sru9OeUNGjeXq/oldx3AGk= +go.opentelemetry.io/contrib/samplers/jaegerremote v0.22.0/go.mod h1:2tZTRqCbvx7nG57wUwd5NQpNVujOWnR84iPLllIH0Ok= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= @@ -233,13 +237,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191020152052-9984515f0562/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -253,12 +257,12 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -277,8 +281,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= -google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/package-lock.json b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/package-lock.json index b7a455899..1d27b00d9 100644 --- a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/package-lock.json +++ b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "tslib": "2.5.3" @@ -21,9 +21,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -924,12 +924,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -959,9 +959,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -972,15 +972,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1047,9 +1052,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1102,15 +1107,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1122,9 +1127,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1148,22 +1153,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1236,9 +1242,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -3121,16 +3127,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3139,12 +3145,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3154,12 +3160,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3168,12 +3174,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3234,12 +3240,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3248,12 +3254,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3263,11 +3269,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -3276,9 +3282,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -8452,9 +8458,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -13412,9 +13418,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/package.json b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/package.json index 98e4e20f4..fdf34a75e 100644 --- a/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/package.json +++ b/examples/datasource-streaming-backend-websocket/streaming-backend-websocket-plugin/package.json @@ -11,7 +11,7 @@ "typecheck": "tsc --noEmit", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", "lint:fix": "npm run lint -- --fix", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest" }, "author": "Grafana", @@ -19,8 +19,8 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/tsconfig": "1.3.0-rc1", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/tsconfig": "^2.0.0", + "@grafana/plugin-e2e": "^1.7.1", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -62,9 +62,9 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", - "@grafana/ui": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "tslib": "2.5.3", diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/.cprc.json b/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/.cprc.json +++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/README.md b/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/README.md +++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/webpack/webpack.config.ts b/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/webpack/webpack.config.ts +++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/package-lock.json b/examples/datasource-streaming-websocket/streaming-websocket-plugin/package-lock.json index 0fb075965..bbe79c23f 100644 --- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/package-lock.json +++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", @@ -22,9 +22,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -916,12 +916,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -951,9 +951,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -964,15 +964,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1039,9 +1044,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1094,15 +1099,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1114,9 +1119,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1140,22 +1145,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1228,9 +1234,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2940,16 +2946,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2958,12 +2964,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2973,12 +2979,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2987,12 +2993,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3053,12 +3059,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -3067,12 +3073,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -3082,11 +3088,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -3095,9 +3101,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -8191,9 +8197,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -12799,9 +12805,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/package.json b/examples/datasource-streaming-websocket/streaming-websocket-plugin/package.json index f41b6d120..b3544852e 100644 --- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/package.json +++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -24,8 +24,8 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/tsconfig": "1.3.0-rc1", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/tsconfig": "^2.0.0", + "@grafana/plugin-e2e": "^1.7.1", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -68,9 +68,9 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", - "@grafana/ui": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/examples/panel-basic/.config/.cprc.json b/examples/panel-basic/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/panel-basic/.config/.cprc.json +++ b/examples/panel-basic/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/panel-basic/.config/README.md b/examples/panel-basic/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/panel-basic/.config/README.md +++ b/examples/panel-basic/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/panel-basic/.config/webpack/webpack.config.ts b/examples/panel-basic/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/panel-basic/.config/webpack/webpack.config.ts +++ b/examples/panel-basic/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/panel-basic/package-lock.json b/examples/panel-basic/package-lock.json index 2d71de3d7..b78119c40 100644 --- a/examples/panel-basic/package-lock.json +++ b/examples/panel-basic/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "tslib": "2.5.3" @@ -21,9 +21,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -1022,12 +1022,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -1057,9 +1057,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1070,15 +1070,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1145,9 +1150,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1215,15 +1220,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1235,9 +1240,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1261,22 +1266,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1349,9 +1355,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2555,16 +2561,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2573,12 +2579,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2588,12 +2594,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2602,12 +2608,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2668,12 +2674,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2682,12 +2688,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2697,11 +2703,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2710,9 +2716,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -7629,9 +7635,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -11371,9 +11377,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/panel-basic/package.json b/examples/panel-basic/package.json index cbc8ce23f..b20742acb 100644 --- a/examples/panel-basic/package.json +++ b/examples/panel-basic/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -19,9 +19,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.43.0", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -62,10 +62,10 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "react": "18.2.0", "react-dom": "18.2.0", "tslib": "2.5.3" diff --git a/examples/panel-datalinks/.config/.cprc.json b/examples/panel-datalinks/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/panel-datalinks/.config/.cprc.json +++ b/examples/panel-datalinks/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/panel-datalinks/.config/README.md b/examples/panel-datalinks/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/panel-datalinks/.config/README.md +++ b/examples/panel-datalinks/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/panel-datalinks/.config/webpack/webpack.config.ts b/examples/panel-datalinks/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/panel-datalinks/.config/webpack/webpack.config.ts +++ b/examples/panel-datalinks/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/panel-datalinks/package-lock.json b/examples/panel-datalinks/package-lock.json index 176e707dd..84dd8bfa5 100644 --- a/examples/panel-datalinks/package-lock.json +++ b/examples/panel-datalinks/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", @@ -22,9 +22,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.42.1", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -1064,12 +1064,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -1099,9 +1099,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1112,15 +1112,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1187,9 +1192,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1230,15 +1235,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1250,9 +1255,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1276,22 +1281,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1364,9 +1370,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2571,16 +2577,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2589,12 +2595,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2604,12 +2610,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2618,12 +2624,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2684,12 +2690,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2698,12 +2704,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2713,11 +2719,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2726,9 +2732,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -7426,9 +7432,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -11150,9 +11156,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/panel-datalinks/package.json b/examples/panel-datalinks/package.json index 58258cf59..c8d118d9d 100644 --- a/examples/panel-datalinks/package.json +++ b/examples/panel-datalinks/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -19,9 +19,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.42.1", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -63,10 +63,10 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/examples/panel-frame-select/.config/.cprc.json b/examples/panel-frame-select/.config/.cprc.json index c672c953a..949e88d81 100644 --- a/examples/panel-frame-select/.config/.cprc.json +++ b/examples/panel-frame-select/.config/.cprc.json @@ -1,3 +1,3 @@ { - "version": "5.2.2" + "version": "5.3.2" } diff --git a/examples/panel-frame-select/.config/README.md b/examples/panel-frame-select/.config/README.md index a23b6d175..4de64b522 100644 --- a/examples/panel-frame-select/.config/README.md +++ b/examples/panel-frame-select/.config/README.md @@ -159,6 +159,6 @@ services: grafana_image: ${GRAFANA_IMAGE:-grafana} ``` -In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker-compose commands, which might be convenient in some scenarios. +In this example, we assign the environment variable `GRAFANA_IMAGE` to the build arg `grafana_image` with a default value of `grafana`. This will allow you to set the value while running the docker compose commands, which might be convenient in some scenarios. --- diff --git a/examples/panel-frame-select/.config/webpack/webpack.config.ts b/examples/panel-frame-select/.config/webpack/webpack.config.ts index 4e9934fd4..566d57d69 100644 --- a/examples/panel-frame-select/.config/webpack/webpack.config.ts +++ b/examples/panel-frame-select/.config/webpack/webpack.config.ts @@ -96,6 +96,18 @@ const config = async (env): Promise => { module: { rules: [ + // This must come first in the rules array otherwise it breaks sourcemaps. + { + test: /src\/(?:.*\/)?module\.tsx?$/, + use: [ + { + loader: 'imports-loader', + options: { + imports: `side-effects grafana-public-path`, + }, + }, + ], + }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/, @@ -116,17 +128,6 @@ const config = async (env): Promise => { }, }, }, - { - test: /src\/(?:.*\/)?module\.tsx?$/, - use: [ - { - loader: 'imports-loader', - options: { - imports: `side-effects grafana-public-path`, - }, - }, - ], - }, { test: /\.css$/, use: ['style-loader', 'css-loader'], diff --git a/examples/panel-frame-select/package-lock.json b/examples/panel-frame-select/package-lock.json index 8bf8afdd4..da7296f6d 100644 --- a/examples/panel-frame-select/package-lock.json +++ b/examples/panel-frame-select/package-lock.json @@ -10,10 +10,10 @@ "license": "Apache-2.0", "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", "@grafana/schema": "^10.4.0", - "@grafana/ui": "^11.1.3", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0", @@ -22,9 +22,9 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/plugin-e2e": "^1.7.1", "@grafana/plugin-meta-extractor": "^0.0.2", - "@grafana/tsconfig": "1.3.0-rc1", + "@grafana/tsconfig": "^2.0.0", "@playwright/test": "^1.42.1", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -1082,12 +1082,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.3.tgz", - "integrity": "sha512-7ldWX6mCGYemRBNmipyuUDpf7XfZvganne5wZvOSG5OuBkkk/aaD/g1rZUxaI9/6/bWTXzFj4AFEa01ixCfO1w==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.4.tgz", + "integrity": "sha512-JvVtk3DheRA8MwS9+kUYfIeRq4snr9WO8WEM15hoohQRLesYN8DrIySgW8Pwo5FpVOQL8yEL0pbKH3U7PPbtvA==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -1117,9 +1117,9 @@ } }, "node_modules/@grafana/data/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1130,15 +1130,20 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.3.tgz", - "integrity": "sha512-b9TGYyqb7OlCho8OwzVjShCDdool05OiWN44y+wLbqwhlb90LbZWvyEUQJGUJkg4ChI2HDL+j3UCEMi+bRsocQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.4.tgz", + "integrity": "sha512-nbZ34X0Exk5B2cxfFKQLb5cael9XV8f3CGna8YHgxxqrmTL3qctj9v8TLEiG+8foVNChPJVAzB0i97mUnsGfbA==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", "typescript": "5.4.5" } }, + "node_modules/@grafana/e2e-selectors/node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, "node_modules/@grafana/e2e-selectors/node_modules/tslib": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", @@ -1205,9 +1210,9 @@ } }, "node_modules/@grafana/plugin-e2e": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.6.1.tgz", - "integrity": "sha512-1Ww1luGFKeytiAhbg321+z8n0yZ5ARTkUgSN4YdRkupHThwi+pysqGmmiy9tJyewyqkZMt8maawL6gK2qyTKHA==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@grafana/plugin-e2e/-/plugin-e2e-1.7.1.tgz", + "integrity": "sha512-wuZMWAjEcmkhiuKGzBTIU8TiiDtidwPULxZh7eDGVlAdQfafDnYkaPSkF18jz/AdXliS/XNSxMHhDnIb7Icj4A==", "dev": true, "dependencies": { "semver": "^7.5.4", @@ -1272,15 +1277,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.3.tgz", - "integrity": "sha512-XtzqlFMC3GAChvQVHwQcZ52r6mxaDP8ZMao1HqTPvSO8w2lpfRMZ55CmU4vKS+x0Ww9RI4FibPr8x3+x1G7VaQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.4.tgz", + "integrity": "sha512-iaIfjGdEFEo0YLs6be5SlVRH6SJDSxybaqM3w1LR9gQGLJd7XUU2Q0s+FFVU5WbohUemWWzKSln6wSGIYG5IGQ==", "dependencies": { - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", - "@grafana/ui": "11.1.3", + "@grafana/schema": "11.1.4", + "@grafana/ui": "11.1.4", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1292,9 +1297,9 @@ } }, "node_modules/@grafana/runtime/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -1318,22 +1323,23 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-2.0.0.tgz", + "integrity": "sha512-cxC3Htv/GidI5FeVGAzj/lYZTMMz/Cfsc8VOQFO3Ichjx3hUjyjeoBUIpVSVMnIjKUdA5ycdxtMYPHIuIrk8+A==", + "dev": true }, "node_modules/@grafana/ui": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.3.tgz", - "integrity": "sha512-+a4e28HJq9DeG+Y84SwLQby4iHqE5ZLnoiGWgIHM2+kDX0dhmCVtE+6xrNp/isu008W1II5eIErY3MvBWsJcmw==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.4.tgz", + "integrity": "sha512-aUCRmgjkKKjHz9nIr8gOjIImjMW1vUZOWG8b2tmSWvmZKwm+nKWmfgFOA1EtPDPENwWc9NzRBaQ8fJ6yFuk91g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.3", - "@grafana/e2e-selectors": "11.1.3", + "@grafana/data": "11.1.4", + "@grafana/e2e-selectors": "11.1.4", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.3", + "@grafana/schema": "11.1.4", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1406,9 +1412,9 @@ } }, "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.3.tgz", - "integrity": "sha512-1vpFYFEKO4ifMIvpXkEBxorbXD3wyq48mqYqw8g22dtIvJPY8EMOKPY1WUwG0m4g8szAZFsqpr/KR6+pWJESpQ==", + "version": "11.1.4", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.4.tgz", + "integrity": "sha512-U4GxHJe1jUSxBJktlwmy4egLsemmy+cfOc3R+pFASprTvUqsFE5l9MpZDAKF3pPY6EeBQWIemGg4ig8ydwbuOQ==", "dependencies": { "tslib": "2.6.3" } @@ -2437,16 +2443,16 @@ } }, "node_modules/@react-aria/i18n": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.1.tgz", - "integrity": "sha512-0q3gyogF9Ekah+9LOo6tcfshxsk2Ope+KdbtFHJVhznedMxn6RpHGcVur5ImbQ1dYafA5CmjBUGJW70b56+BGA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2455,12 +2461,12 @@ } }, "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2470,12 +2476,12 @@ } }, "node_modules/@react-aria/interactions": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.1.tgz", - "integrity": "sha512-5TLzQaDAQQ5C70yG8GInbO4wIylKY67RfTIIwQPGR/4n5OIjbUD8BOj3NuSsuZ/frUPaBXo1VEBBmSO23fxkjw==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-aria/utils": "^3.25.1", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2484,12 +2490,12 @@ } }, "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2550,12 +2556,12 @@ } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.14", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.14.tgz", - "integrity": "sha512-DV3yagbAgO4ywQTq6D/AxcIaTC8c77r/SxlIMhQBMQ6vScJWTCh6zFG55wmLe3NKqvRrowv1OstlmYfZQ4v/XA==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.22.1", - "@react-aria/utils": "^3.25.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, @@ -2564,12 +2570,12 @@ } }, "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", - "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { "@react-aria/ssr": "^3.9.5", - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" @@ -2579,11 +2585,11 @@ } }, "node_modules/@react-stately/overlays": { - "version": "3.6.9", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.9.tgz", - "integrity": "sha512-4chfyzKw7P2UEainm0yzjUgYwG1ovBejN88eTrn+O62x5huuMCwe0cbMxmYh4y7IhRFSee3jIJd0SP0u/+i39w==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.2", + "@react-stately/utils": "^3.10.3", "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, @@ -2592,9 +2598,9 @@ } }, "node_modules/@react-stately/utils": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.2.tgz", - "integrity": "sha512-fh6OTQtbeQC0ywp6LJuuKs6tKIgFvt/DlIZEcIpGho6/oZG229UnIk6TUekwxnDbumuYyan6D9EgUtEMmT8UIg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -7773,9 +7779,9 @@ "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==" }, "node_modules/i18next": { - "version": "23.12.3", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.12.3.tgz", - "integrity": "sha512-DyigQmrR10V9U2N6pjhbfahW13GY7n8BQD9swN09JuRRropgsksWVi4vRLeex0Qf7zCPnBfIqQfhcBzdZBQBYw==", + "version": "23.14.0", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.14.0.tgz", + "integrity": "sha512-Y5GL4OdA8IU2geRrt2+Uc1iIhsjICdHZzT9tNwQ3TVqdNzgxHToGCKf/TPRP80vTCAP6svg2WbbJL+Gx5MFQVA==", "funding": [ { "type": "individual", @@ -10745,9 +10751,9 @@ } }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", diff --git a/examples/panel-frame-select/package.json b/examples/panel-frame-select/package.json index a864d722e..49b467735 100644 --- a/examples/panel-frame-select/package.json +++ b/examples/panel-frame-select/package.json @@ -8,7 +8,7 @@ "e2e": "playwright test", "lint:fix": "npm run lint -- --fix", "lint": "eslint --cache --ignore-path ./.gitignore --ext .js,.jsx,.ts,.tsx .", - "server": "docker-compose up --build", + "server": "docker compose up --build", "sign": "npx --yes @grafana/sign-plugin@latest", "test:ci": "jest --passWithNoTests --maxWorkers 4", "test": "jest --watch --onlyChanged", @@ -24,8 +24,8 @@ "devDependencies": { "@babel/core": "^7.21.4", "@grafana/eslint-config": "^7.0.0", - "@grafana/tsconfig": "1.3.0-rc1", - "@grafana/plugin-e2e": "^1.6.1", + "@grafana/tsconfig": "^2.0.0", + "@grafana/plugin-e2e": "^1.7.1", "@playwright/test": "^1.42.1", "@swc/core": "^1.3.90", "@swc/helpers": "^0.5.0", @@ -68,9 +68,9 @@ }, "dependencies": { "@emotion/css": "11.10.6", - "@grafana/data": "^11.1.3", - "@grafana/runtime": "^11.1.3", - "@grafana/ui": "^11.1.3", + "@grafana/data": "^11.1.4", + "@grafana/runtime": "^11.1.4", + "@grafana/ui": "^11.1.4", "@types/lodash": "latest", "react": "18.2.0", "react-dom": "18.2.0",