From 9c0edab22434ae2ffea62a6415fcce9c6c8d4aaf Mon Sep 17 00:00:00 2001 From: Ivan Ortega Alba Date: Wed, 3 Apr 2024 15:39:45 +0200 Subject: [PATCH] [v11.0.x] Implement autofit panels in Dashboards (#85524) DashboardScene: Implement autofit panels (#85221) (cherry picked from commit eb3d088645202b993fe7471ab9d2390817445ba6) --- package.json | 2 +- .../src/components/Portal/Portal.tsx | 2 +- .../uPlot/plugins/TooltipPlugin2.tsx | 2 +- .../embedding/EmbeddedDashboardTestPage.tsx | 2 + .../scene/DashboardSceneUrlSync.test.ts | 14 + .../scene/DashboardSceneUrlSync.ts | 12 +- yarn.lock | 372 ++++++++++++++---- 7 files changed, 327 insertions(+), 79 deletions(-) diff --git a/package.json b/package.json index 8bdf4de7a80..78873b2d6b8 100644 --- a/package.json +++ b/package.json @@ -252,7 +252,7 @@ "@grafana/prometheus": "workspace:*", "@grafana/runtime": "workspace:*", "@grafana/saga-icons": "workspace:*", - "@grafana/scenes": "4.1.2", + "@grafana/scenes": "4.2.0", "@grafana/schema": "workspace:*", "@grafana/sql": "workspace:*", "@grafana/ui": "workspace:*", diff --git a/packages/grafana-ui/src/components/Portal/Portal.tsx b/packages/grafana-ui/src/components/Portal/Portal.tsx index 0e00c7b2025..aa6f309bb07 100644 --- a/packages/grafana-ui/src/components/Portal/Portal.tsx +++ b/packages/grafana-ui/src/components/Portal/Portal.tsx @@ -9,7 +9,7 @@ interface Props { forwardedRef?: React.ForwardedRef; } -export function Portal(props: PropsWithChildren) { +export function Portal(props: PropsWithChildren): JSX.Element { const { children, className, root, forwardedRef } = props; const theme = useTheme2(); const node = useRef(null); diff --git a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx index 0a54874a5d0..c93e7081ea3 100644 --- a/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx +++ b/packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin2.tsx @@ -101,7 +101,7 @@ const maybeZoomAction = (e?: MouseEvent | null) => e != null && !e.ctrlKey && !e /** * @alpha */ -export const TooltipPlugin2 = ({ +export const TooltipPlugin2: React.FC = ({ config, hoverMode, render, diff --git a/public/app/features/dashboard-scene/embedding/EmbeddedDashboardTestPage.tsx b/public/app/features/dashboard-scene/embedding/EmbeddedDashboardTestPage.tsx index 065469b08c6..747979ea6e3 100644 --- a/public/app/features/dashboard-scene/embedding/EmbeddedDashboardTestPage.tsx +++ b/public/app/features/dashboard-scene/embedding/EmbeddedDashboardTestPage.tsx @@ -1,5 +1,6 @@ import React, { useState } from 'react'; +import { PageLayoutType } from '@grafana/data'; import { Box } from '@grafana/ui'; import { Page } from 'app/core/components/Page/Page'; @@ -12,6 +13,7 @@ export function EmbeddedDashboardTestPage() { Internal url state: {state} diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts index dc0ecacfd7c..72843c523fd 100644 --- a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts +++ b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.test.ts @@ -25,6 +25,20 @@ describe('DashboardSceneUrlSync', () => { scene.urlSync?.updateFromUrl({ viewPanel: '2' }); expect(scene.state.viewPanelScene!.getUrlKey()).toBe('panel-2'); }); + + it('Should set UNSAFE_fitPanels when url has autofitpanels', () => { + const scene = buildTestScene(); + scene.urlSync?.updateFromUrl({ autofitpanels: '' }); + expect((scene.state.body as SceneGridLayout).state.UNSAFE_fitPanels).toBe(true); + }); + + it('Should get the autofitpanels from the scene state', () => { + const scene = buildTestScene(); + + expect(scene.urlSync?.getUrlState().autofitpanels).toBeUndefined(); + (scene.state.body as SceneGridLayout).setState({ UNSAFE_fitPanels: true }); + expect(scene.urlSync?.getUrlState().autofitpanels).toBe('true'); + }); }); describe('Given a viewPanelKey with clone that is not found', () => { diff --git a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts index d46bf382f61..99acc84e760 100644 --- a/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts +++ b/public/app/features/dashboard-scene/scene/DashboardSceneUrlSync.ts @@ -3,6 +3,7 @@ import { Unsubscribable } from 'rxjs'; import { AppEvents } from '@grafana/data'; import { locationService } from '@grafana/runtime'; import { + SceneGridLayout, SceneObjectBase, SceneObjectState, SceneObjectUrlSyncHandler, @@ -27,13 +28,14 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler { constructor(private _scene: DashboardScene) {} getKeys(): string[] { - return ['inspect', 'viewPanel', 'editPanel', 'editview']; + return ['inspect', 'viewPanel', 'editPanel', 'editview', 'autofitpanels']; } getUrlState(): SceneObjectUrlValues { const state = this._scene.state; return { inspect: state.inspectPanelKey, + autofitpanels: state.body instanceof SceneGridLayout && !!state.body.state.UNSAFE_fitPanels ? 'true' : undefined, viewPanel: state.viewPanelScene?.getUrlKey(), editview: state.editview?.getUrlKey(), editPanel: state.editPanel?.getUrlKey() || undefined, @@ -138,6 +140,14 @@ export class DashboardSceneUrlSync implements SceneObjectUrlSyncHandler { update.editPanel = undefined; } + if (this._scene.state.body instanceof SceneGridLayout) { + const UNSAFE_fitPanels = typeof values.autofitpanels === 'string'; + + if (!!this._scene.state.body.state.UNSAFE_fitPanels !== UNSAFE_fitPanels) { + this._scene.state.body.setState({ UNSAFE_fitPanels }); + } + } + if (Object.keys(update).length > 0) { this._scene.setState(update); } diff --git a/yarn.lock b/yarn.lock index 2afb43ea360..2d9f47311ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4126,9 +4126,9 @@ __metadata: languageName: unknown linkType: soft -"@grafana/scenes@npm:4.1.2": - version: 4.1.2 - resolution: "@grafana/scenes@npm:4.1.2" +"@grafana/scenes@npm:4.2.0": + version: 4.2.0 + resolution: "@grafana/scenes@npm:4.2.0" dependencies: "@grafana/e2e-selectors": "npm:10.3.3" react-grid-layout: "npm:1.3.4" @@ -4142,7 +4142,7 @@ __metadata: "@grafana/ui": ^10.0.3 react: ^18.0.0 react-dom: ^18.0.0 - checksum: 10/3627d1f200b30872615d9427af3bdac534f8a39a5dd1ba1b3a55b9e6664cf5f0e9750fd9c0d36d1e54d7dd20f7e74a8f5e56f3e145e02f315bd9f104cdb448bd + checksum: 10/546bc27da9bde69dce23da4907014b8e0ff630a1dd43c87152f6537cebfeb31c4b3c475d05db7a93d241f7c9865cc0b1a16cc068c48dac2f4d589ecca11362de languageName: node linkType: hard @@ -5514,6 +5514,18 @@ __metadata: languageName: node linkType: hard +"@nrwl/tao@npm:18.1.3": + version: 18.1.3 + resolution: "@nrwl/tao@npm:18.1.3" + dependencies: + nx: "npm:18.1.3" + tslib: "npm:^2.3.0" + bin: + tao: index.js + checksum: 10/338bf2cf323dc1accf252ce6650f182b8550948cf647005178679ed36ef8e5ec49ef11f20f249b83e1be671fac9f1b6c186662a4412a0c086068209de0afdd58 + languageName: node + linkType: hard + "@nx/devkit@npm:18.0.4, @nx/devkit@npm:>=17.1.2 < 19": version: 18.0.4 resolution: "@nx/devkit@npm:18.0.4" @@ -5539,6 +5551,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-darwin-arm64@npm:18.1.3": + version: 18.1.3 + resolution: "@nx/nx-darwin-arm64@npm:18.1.3" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@nx/nx-darwin-x64@npm:18.0.8": version: 18.0.8 resolution: "@nx/nx-darwin-x64@npm:18.0.8" @@ -5546,6 +5565,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-darwin-x64@npm:18.1.3": + version: 18.1.3 + resolution: "@nx/nx-darwin-x64@npm:18.1.3" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@nx/nx-freebsd-x64@npm:18.0.8": version: 18.0.8 resolution: "@nx/nx-freebsd-x64@npm:18.0.8" @@ -5553,6 +5579,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-freebsd-x64@npm:18.1.3": + version: 18.1.3 + resolution: "@nx/nx-freebsd-x64@npm:18.1.3" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + "@nx/nx-linux-arm-gnueabihf@npm:18.0.8": version: 18.0.8 resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.0.8" @@ -5560,6 +5593,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-linux-arm-gnueabihf@npm:18.1.3": + version: 18.1.3 + resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.1.3" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@nx/nx-linux-arm64-gnu@npm:18.0.8": version: 18.0.8 resolution: "@nx/nx-linux-arm64-gnu@npm:18.0.8" @@ -5567,6 +5607,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-linux-arm64-gnu@npm:18.1.3": + version: 18.1.3 + resolution: "@nx/nx-linux-arm64-gnu@npm:18.1.3" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + "@nx/nx-linux-arm64-musl@npm:18.0.8": version: 18.0.8 resolution: "@nx/nx-linux-arm64-musl@npm:18.0.8" @@ -5574,6 +5621,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-linux-arm64-musl@npm:18.1.3": + version: 18.1.3 + resolution: "@nx/nx-linux-arm64-musl@npm:18.1.3" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + "@nx/nx-linux-x64-gnu@npm:18.0.8": version: 18.0.8 resolution: "@nx/nx-linux-x64-gnu@npm:18.0.8" @@ -5581,6 +5635,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-linux-x64-gnu@npm:18.1.3": + version: 18.1.3 + resolution: "@nx/nx-linux-x64-gnu@npm:18.1.3" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + "@nx/nx-linux-x64-musl@npm:18.0.8": version: 18.0.8 resolution: "@nx/nx-linux-x64-musl@npm:18.0.8" @@ -5588,6 +5649,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-linux-x64-musl@npm:18.1.3": + version: 18.1.3 + resolution: "@nx/nx-linux-x64-musl@npm:18.1.3" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + "@nx/nx-win32-arm64-msvc@npm:18.0.8": version: 18.0.8 resolution: "@nx/nx-win32-arm64-msvc@npm:18.0.8" @@ -5595,6 +5663,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-win32-arm64-msvc@npm:18.1.3": + version: 18.1.3 + resolution: "@nx/nx-win32-arm64-msvc@npm:18.1.3" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@nx/nx-win32-x64-msvc@npm:18.0.8": version: 18.0.8 resolution: "@nx/nx-win32-x64-msvc@npm:18.0.8" @@ -5602,6 +5677,13 @@ __metadata: languageName: node linkType: hard +"@nx/nx-win32-x64-msvc@npm:18.1.3": + version: 18.1.3 + resolution: "@nx/nx-win32-x64-msvc@npm:18.1.3" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@octokit/auth-token@npm:^3.0.0": version: 3.0.0 resolution: "@octokit/auth-token@npm:3.0.0" @@ -8838,7 +8920,7 @@ __metadata: languageName: node linkType: hard -"@swc/helpers@npm:0.5.7, @swc/helpers@npm:^0.5.0": +"@swc/helpers@npm:0.5.7": version: 0.5.7 resolution: "@swc/helpers@npm:0.5.7" dependencies: @@ -8847,6 +8929,15 @@ __metadata: languageName: node linkType: hard +"@swc/helpers@npm:^0.5.0": + version: 0.5.8 + resolution: "@swc/helpers@npm:0.5.8" + dependencies: + tslib: "npm:^2.4.0" + checksum: 10/3f4caa7bd4411c134caf833ff13bfeee62bd86654e2122a4f3ed8dfd1247651d3b81e64c0fd7dbb605089e6c68bb7416062341c097c155298bd3c0f7de58dc45 + languageName: node + linkType: hard + "@swc/types@npm:^0.1.5": version: 0.1.5 resolution: "@swc/types@npm:0.1.5" @@ -10217,7 +10308,17 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:18.2.67, @types/react@npm:>=16": +"@types/react@npm:*, @types/react@npm:>=16": + version: 18.2.73 + resolution: "@types/react@npm:18.2.73" + dependencies: + "@types/prop-types": "npm:*" + csstype: "npm:^3.0.2" + checksum: 10/799e30e73464dff40e04f4eb7499ebc31f99b1711a69263b9af340af738e35c9cdf53084e3dacc3b21c031aaa0cba1b51f4ba60490204b7abb75f115b841583f + languageName: node + linkType: hard + +"@types/react@npm:18.2.67": version: 18.2.67 resolution: "@types/react@npm:18.2.67" dependencies: @@ -10962,13 +11063,13 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5": - version: 1.11.6 - resolution: "@webassemblyjs/ast@npm:1.11.6" +"@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.11.5, @webassemblyjs/ast@npm:^1.12.1": + version: 1.12.1 + resolution: "@webassemblyjs/ast@npm:1.12.1" dependencies: "@webassemblyjs/helper-numbers": "npm:1.11.6" "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" - checksum: 10/4c1303971ccd5188731c9b01073d9738333f37b946a48c4e049f7b788706cdc66f473cd6f3e791423a94c52a3b2230d070007930d29bccbce238b23835839f3c + checksum: 10/a775b0559437ae122d14fec0cfe59fdcaf5ca2d8ff48254014fd05d6797e20401e0f1518e628f9b06819aa085834a2534234977f9608b3f2e51f94b6e8b0bc43 languageName: node linkType: hard @@ -10986,10 +11087,10 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/helper-buffer@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/helper-buffer@npm:1.11.6" - checksum: 10/b14d0573bf680d22b2522e8a341ec451fddd645d1f9c6bd9012ccb7e587a2973b86ab7b89fe91e1c79939ba96095f503af04369a3b356c8023c13a5893221644 +"@webassemblyjs/helper-buffer@npm:1.12.1": + version: 1.12.1 + resolution: "@webassemblyjs/helper-buffer@npm:1.12.1" + checksum: 10/1d8705daa41f4d22ef7c6d422af4c530b84d69d0c253c6db5adec44d511d7caa66837803db5b1addcea611a1498fd5a67d2cf318b057a916283ae41ffb85ba8a languageName: node linkType: hard @@ -11011,15 +11112,15 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/helper-wasm-section@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.6" +"@webassemblyjs/helper-wasm-section@npm:1.12.1": + version: 1.12.1 + resolution: "@webassemblyjs/helper-wasm-section@npm:1.12.1" dependencies: - "@webassemblyjs/ast": "npm:1.11.6" - "@webassemblyjs/helper-buffer": "npm:1.11.6" + "@webassemblyjs/ast": "npm:1.12.1" + "@webassemblyjs/helper-buffer": "npm:1.12.1" "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" - "@webassemblyjs/wasm-gen": "npm:1.11.6" - checksum: 10/38a615ab3d55f953daaf78b69f145e2cc1ff5288ab71715d1a164408b735c643a87acd7e7ba3e9633c5dd965439a45bb580266b05a06b22ff678d6c013514108 + "@webassemblyjs/wasm-gen": "npm:1.12.1" + checksum: 10/e91e6b28114e35321934070a2db8973a08a5cd9c30500b817214c683bbf5269ed4324366dd93ad83bf2fba0d671ac8f39df1c142bf58f70c57a827eeba4a3d2f languageName: node linkType: hard @@ -11048,68 +11149,68 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/wasm-edit@npm:^1.11.5": - version: 1.11.6 - resolution: "@webassemblyjs/wasm-edit@npm:1.11.6" +"@webassemblyjs/wasm-edit@npm:^1.11.5, @webassemblyjs/wasm-edit@npm:^1.12.1": + version: 1.12.1 + resolution: "@webassemblyjs/wasm-edit@npm:1.12.1" dependencies: - "@webassemblyjs/ast": "npm:1.11.6" - "@webassemblyjs/helper-buffer": "npm:1.11.6" + "@webassemblyjs/ast": "npm:1.12.1" + "@webassemblyjs/helper-buffer": "npm:1.12.1" "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" - "@webassemblyjs/helper-wasm-section": "npm:1.11.6" - "@webassemblyjs/wasm-gen": "npm:1.11.6" - "@webassemblyjs/wasm-opt": "npm:1.11.6" - "@webassemblyjs/wasm-parser": "npm:1.11.6" - "@webassemblyjs/wast-printer": "npm:1.11.6" - checksum: 10/c168bfc6d0cdd371345f36f95a4766d098a96ccc1257e6a6e3a74d987a5c4f2ddd2244a6aecfa5d032a47d74ed2c3b579e00a314d31e4a0b76ad35b31cdfa162 + "@webassemblyjs/helper-wasm-section": "npm:1.12.1" + "@webassemblyjs/wasm-gen": "npm:1.12.1" + "@webassemblyjs/wasm-opt": "npm:1.12.1" + "@webassemblyjs/wasm-parser": "npm:1.12.1" + "@webassemblyjs/wast-printer": "npm:1.12.1" + checksum: 10/5678ae02dbebba2f3a344e25928ea5a26a0df777166c9be77a467bfde7aca7f4b57ef95587e4bd768a402cdf2fddc4c56f0a599d164cdd9fe313520e39e18137 languageName: node linkType: hard -"@webassemblyjs/wasm-gen@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/wasm-gen@npm:1.11.6" +"@webassemblyjs/wasm-gen@npm:1.12.1": + version: 1.12.1 + resolution: "@webassemblyjs/wasm-gen@npm:1.12.1" dependencies: - "@webassemblyjs/ast": "npm:1.11.6" + "@webassemblyjs/ast": "npm:1.12.1" "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" "@webassemblyjs/ieee754": "npm:1.11.6" "@webassemblyjs/leb128": "npm:1.11.6" "@webassemblyjs/utf8": "npm:1.11.6" - checksum: 10/f91903506ce50763592863df5d80ffee80f71a1994a882a64cdb83b5e44002c715f1ef1727d8ccb0692d066af34d3d4f5e59e8f7a4e2eeb2b7c32692ac44e363 + checksum: 10/ec45bd50e86bc9856f80fe9af4bc1ae5c98fb85f57023d11dff2b670da240c47a7b1b9b6c89755890314212bd167cf3adae7f1157216ddffb739a4ce589fc338 languageName: node linkType: hard -"@webassemblyjs/wasm-opt@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/wasm-opt@npm:1.11.6" +"@webassemblyjs/wasm-opt@npm:1.12.1": + version: 1.12.1 + resolution: "@webassemblyjs/wasm-opt@npm:1.12.1" dependencies: - "@webassemblyjs/ast": "npm:1.11.6" - "@webassemblyjs/helper-buffer": "npm:1.11.6" - "@webassemblyjs/wasm-gen": "npm:1.11.6" - "@webassemblyjs/wasm-parser": "npm:1.11.6" - checksum: 10/e0cfeea381ecbbd0ca1616e9a08974acfe7fc81f8a16f9f2d39f565dc51784dd7043710b6e972f9968692d273e32486b9a8a82ca178d4bd520b2d5e2cf28234d + "@webassemblyjs/ast": "npm:1.12.1" + "@webassemblyjs/helper-buffer": "npm:1.12.1" + "@webassemblyjs/wasm-gen": "npm:1.12.1" + "@webassemblyjs/wasm-parser": "npm:1.12.1" + checksum: 10/21f25ae109012c49bb084e09f3b67679510429adc3e2408ad3621b2b505379d9cce337799a7919ef44db64e0d136833216914aea16b0d4856f353b9778e0cdb7 languageName: node linkType: hard -"@webassemblyjs/wasm-parser@npm:1.11.6, @webassemblyjs/wasm-parser@npm:^1.11.5": - version: 1.11.6 - resolution: "@webassemblyjs/wasm-parser@npm:1.11.6" +"@webassemblyjs/wasm-parser@npm:1.12.1, @webassemblyjs/wasm-parser@npm:^1.11.5, @webassemblyjs/wasm-parser@npm:^1.12.1": + version: 1.12.1 + resolution: "@webassemblyjs/wasm-parser@npm:1.12.1" dependencies: - "@webassemblyjs/ast": "npm:1.11.6" + "@webassemblyjs/ast": "npm:1.12.1" "@webassemblyjs/helper-api-error": "npm:1.11.6" "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" "@webassemblyjs/ieee754": "npm:1.11.6" "@webassemblyjs/leb128": "npm:1.11.6" "@webassemblyjs/utf8": "npm:1.11.6" - checksum: 10/6995e0b7b8ebc52b381459c6a555f87763dcd3975c4a112407682551e1c73308db7af23385972a253dceb5af94e76f9c97cb861e8239b5ed1c3e79b95d8e2097 + checksum: 10/f7311685b76c3e1def2abea3488be1e77f06ecd8633143a6c5c943ca289660952b73785231bb76a010055ca64645227a4bc79705c26ab7536216891b6bb36320 languageName: node linkType: hard -"@webassemblyjs/wast-printer@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/wast-printer@npm:1.11.6" +"@webassemblyjs/wast-printer@npm:1.12.1": + version: 1.12.1 + resolution: "@webassemblyjs/wast-printer@npm:1.12.1" dependencies: - "@webassemblyjs/ast": "npm:1.11.6" + "@webassemblyjs/ast": "npm:1.12.1" "@xtuc/long": "npm:4.2.2" - checksum: 10/fd45fd0d693141d678cc2f6ff2d3a0d7a8884acb1c92fb0c63cf43b7978e9560be04118b12792638a39dd185640453510229e736f3049037d0c361f6435f2d5f + checksum: 10/1a6a4b6bc4234f2b5adbab0cb11a24911b03380eb1cab6fb27a2250174a279fdc6aa2f5a9cf62dd1f6d4eb39f778f488e8ff15b9deb0670dee5c5077d46cf572 languageName: node linkType: hard @@ -15856,13 +15957,13 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.15.0": - version: 5.15.0 - resolution: "enhanced-resolve@npm:5.15.0" +"enhanced-resolve@npm:^5.15.0, enhanced-resolve@npm:^5.16.0": + version: 5.16.0 + resolution: "enhanced-resolve@npm:5.16.0" dependencies: graceful-fs: "npm:^4.2.4" tapable: "npm:^2.2.0" - checksum: 10/180c3f2706f9117bf4dc7982e1df811dad83a8db075723f299245ef4488e0cad7e96859c5f0e410682d28a4ecd4da021ec7d06265f7e4eb6eed30c69ca5f7d3e + checksum: 10/47f123676b9b179b35195769b9d9523f314f6fc3a13d4461a4d95d5beaec9adc26aaa3b60b61f93e21ed1290dff0e9d9e67df343ec47f4480669a8e26ffe52a3 languageName: node linkType: hard @@ -18565,7 +18666,7 @@ __metadata: "@grafana/prometheus": "workspace:*" "@grafana/runtime": "workspace:*" "@grafana/saga-icons": "workspace:*" - "@grafana/scenes": "npm:4.1.2" + "@grafana/scenes": "npm:4.2.0" "@grafana/schema": "workspace:*" "@grafana/sql": "workspace:*" "@grafana/tsconfig": "npm:^1.3.0-rc1" @@ -23851,7 +23952,7 @@ __metadata: languageName: node linkType: hard -"nx@npm:18.0.8, nx@npm:>=17.1.2 < 19": +"nx@npm:18.0.8": version: 18.0.8 resolution: "nx@npm:18.0.8" dependencies: @@ -23935,6 +24036,90 @@ __metadata: languageName: node linkType: hard +"nx@npm:18.1.3, nx@npm:>=17.1.2 < 19": + version: 18.1.3 + resolution: "nx@npm:18.1.3" + dependencies: + "@nrwl/tao": "npm:18.1.3" + "@nx/nx-darwin-arm64": "npm:18.1.3" + "@nx/nx-darwin-x64": "npm:18.1.3" + "@nx/nx-freebsd-x64": "npm:18.1.3" + "@nx/nx-linux-arm-gnueabihf": "npm:18.1.3" + "@nx/nx-linux-arm64-gnu": "npm:18.1.3" + "@nx/nx-linux-arm64-musl": "npm:18.1.3" + "@nx/nx-linux-x64-gnu": "npm:18.1.3" + "@nx/nx-linux-x64-musl": "npm:18.1.3" + "@nx/nx-win32-arm64-msvc": "npm:18.1.3" + "@nx/nx-win32-x64-msvc": "npm:18.1.3" + "@yarnpkg/lockfile": "npm:^1.1.0" + "@yarnpkg/parsers": "npm:3.0.0-rc.46" + "@zkochan/js-yaml": "npm:0.0.6" + axios: "npm:^1.6.0" + chalk: "npm:^4.1.0" + cli-cursor: "npm:3.1.0" + cli-spinners: "npm:2.6.1" + cliui: "npm:^8.0.1" + dotenv: "npm:~16.3.1" + dotenv-expand: "npm:~10.0.0" + enquirer: "npm:~2.3.6" + figures: "npm:3.2.0" + flat: "npm:^5.0.2" + fs-extra: "npm:^11.1.0" + ignore: "npm:^5.0.4" + jest-diff: "npm:^29.4.1" + js-yaml: "npm:4.1.0" + jsonc-parser: "npm:3.2.0" + lines-and-columns: "npm:~2.0.3" + minimatch: "npm:9.0.3" + node-machine-id: "npm:1.1.12" + npm-run-path: "npm:^4.0.1" + open: "npm:^8.4.0" + ora: "npm:5.3.0" + semver: "npm:^7.5.3" + string-width: "npm:^4.2.3" + strong-log-transformer: "npm:^2.1.0" + tar-stream: "npm:~2.2.0" + tmp: "npm:~0.2.1" + tsconfig-paths: "npm:^4.1.2" + tslib: "npm:^2.3.0" + yargs: "npm:^17.6.2" + yargs-parser: "npm:21.1.1" + peerDependencies: + "@swc-node/register": ^1.8.0 + "@swc/core": ^1.3.85 + dependenciesMeta: + "@nx/nx-darwin-arm64": + optional: true + "@nx/nx-darwin-x64": + optional: true + "@nx/nx-freebsd-x64": + optional: true + "@nx/nx-linux-arm-gnueabihf": + optional: true + "@nx/nx-linux-arm64-gnu": + optional: true + "@nx/nx-linux-arm64-musl": + optional: true + "@nx/nx-linux-x64-gnu": + optional: true + "@nx/nx-linux-x64-musl": + optional: true + "@nx/nx-win32-arm64-msvc": + optional: true + "@nx/nx-win32-x64-msvc": + optional: true + peerDependenciesMeta: + "@swc-node/register": + optional: true + "@swc/core": + optional: true + bin: + nx: bin/nx.js + nx-cloud: bin/nx-cloud.js + checksum: 10/216b91cda546c949fb4cc64ee036d1510482ceb6668f6f157d5c25c47dae179e26792867b163a68ca735f90559dfb04f7c811c791ef4d26cdd8799c498fec880 + languageName: node + linkType: hard + "oauth-sign@npm:~0.9.0": version: 0.9.0 resolution: "oauth-sign@npm:0.9.0" @@ -31244,13 +31429,13 @@ __metadata: languageName: node linkType: hard -"watchpack@npm:^2.2.0, watchpack@npm:^2.4.0": - version: 2.4.0 - resolution: "watchpack@npm:2.4.0" +"watchpack@npm:^2.2.0, watchpack@npm:^2.4.0, watchpack@npm:^2.4.1": + version: 2.4.1 + resolution: "watchpack@npm:2.4.1" dependencies: glob-to-regexp: "npm:^0.4.1" graceful-fs: "npm:^4.1.2" - checksum: 10/4280b45bc4b5d45d5579113f2a4af93b67ae1b9607cc3d86ae41cdd53ead10db5d9dc3237f24256d05ef88b28c69a02712f78e434cb7ecc8edaca134a56e8cab + checksum: 10/0736ebd20b75d3931f9b6175c819a66dee29297c1b389b2e178bc53396a6f867ecc2fd5d87a713ae92dcb73e487daec4905beee20ca00a9e27f1184a7c2bca5e languageName: node linkType: hard @@ -31524,25 +31709,25 @@ __metadata: languageName: node linkType: hard -"webpack@npm:5, webpack@npm:5.90.3, webpack@npm:^5": - version: 5.90.3 - resolution: "webpack@npm:5.90.3" +"webpack@npm:5, webpack@npm:^5": + version: 5.91.0 + resolution: "webpack@npm:5.91.0" dependencies: "@types/eslint-scope": "npm:^3.7.3" "@types/estree": "npm:^1.0.5" - "@webassemblyjs/ast": "npm:^1.11.5" - "@webassemblyjs/wasm-edit": "npm:^1.11.5" - "@webassemblyjs/wasm-parser": "npm:^1.11.5" + "@webassemblyjs/ast": "npm:^1.12.1" + "@webassemblyjs/wasm-edit": "npm:^1.12.1" + "@webassemblyjs/wasm-parser": "npm:^1.12.1" acorn: "npm:^8.7.1" acorn-import-assertions: "npm:^1.9.0" browserslist: "npm:^4.21.10" chrome-trace-event: "npm:^1.0.2" - enhanced-resolve: "npm:^5.15.0" + enhanced-resolve: "npm:^5.16.0" es-module-lexer: "npm:^1.2.1" eslint-scope: "npm:5.1.1" events: "npm:^3.2.0" glob-to-regexp: "npm:^0.4.1" - graceful-fs: "npm:^4.2.9" + graceful-fs: "npm:^4.2.11" json-parse-even-better-errors: "npm:^2.3.1" loader-runner: "npm:^4.2.0" mime-types: "npm:^2.1.27" @@ -31550,14 +31735,14 @@ __metadata: schema-utils: "npm:^3.2.0" tapable: "npm:^2.1.1" terser-webpack-plugin: "npm:^5.3.10" - watchpack: "npm:^2.4.0" + watchpack: "npm:^2.4.1" webpack-sources: "npm:^3.2.3" peerDependenciesMeta: webpack-cli: optional: true bin: webpack: bin/webpack.js - checksum: 10/48c9696eca950bfa7c943a24b8235fdf0575acd73a8eb1661f8189d3d1f431362f3a0e158e2941a7e4f0852ea6e32d7d4e89283149247e4389a8aad0fe6c247e + checksum: 10/647ca53c15fe0fa1af4396a7257d7a93cbea648d2685e565a11cc822a9e3ea9316345250987d75f02c0b45dae118814f094ec81908d1032e77a33cd6470b289e languageName: node linkType: hard @@ -31598,6 +31783,43 @@ __metadata: languageName: node linkType: hard +"webpack@npm:5.90.3": + version: 5.90.3 + resolution: "webpack@npm:5.90.3" + dependencies: + "@types/eslint-scope": "npm:^3.7.3" + "@types/estree": "npm:^1.0.5" + "@webassemblyjs/ast": "npm:^1.11.5" + "@webassemblyjs/wasm-edit": "npm:^1.11.5" + "@webassemblyjs/wasm-parser": "npm:^1.11.5" + acorn: "npm:^8.7.1" + acorn-import-assertions: "npm:^1.9.0" + browserslist: "npm:^4.21.10" + chrome-trace-event: "npm:^1.0.2" + enhanced-resolve: "npm:^5.15.0" + es-module-lexer: "npm:^1.2.1" + eslint-scope: "npm:5.1.1" + events: "npm:^3.2.0" + glob-to-regexp: "npm:^0.4.1" + graceful-fs: "npm:^4.2.9" + json-parse-even-better-errors: "npm:^2.3.1" + loader-runner: "npm:^4.2.0" + mime-types: "npm:^2.1.27" + neo-async: "npm:^2.6.2" + schema-utils: "npm:^3.2.0" + tapable: "npm:^2.1.1" + terser-webpack-plugin: "npm:^5.3.10" + watchpack: "npm:^2.4.0" + webpack-sources: "npm:^3.2.3" + peerDependenciesMeta: + webpack-cli: + optional: true + bin: + webpack: bin/webpack.js + checksum: 10/48c9696eca950bfa7c943a24b8235fdf0575acd73a8eb1661f8189d3d1f431362f3a0e158e2941a7e4f0852ea6e32d7d4e89283149247e4389a8aad0fe6c247e + languageName: node + linkType: hard + "webpackbar@npm:^6.0.0": version: 6.0.1 resolution: "webpackbar@npm:6.0.1"