From d1c5e491acb25ac3b1dba5eef7fa3a31edf2b0d2 Mon Sep 17 00:00:00 2001 From: Fabrizio <135109076+fabrizio-grafana@users.noreply.github.com> Date: Tue, 20 Feb 2024 17:24:40 +0100 Subject: [PATCH] Zipkin: Decouple Zipkin plugin (#81354) --- .eslintrc | 4 +- .../core-plugins-build-and-release.yml | 1 + package.json | 1 + .../api/plugins/data/expectedListResp.json | 2 +- .../app/features/plugins/built_in_plugins.ts | 3 +- .../plugins/datasource/zipkin/CHANGELOG.md | 1 + .../datasource/zipkin/QueryField.test.tsx | 4 +- .../plugins/datasource/zipkin/QueryField.tsx | 26 +- .../app/plugins/datasource/zipkin/README.md | 8 +- .../datasource/zipkin/datasource.test.ts | 5 +- .../plugins/datasource/zipkin/package.json | 38 ++ .../app/plugins/datasource/zipkin/plugin.json | 6 +- .../plugins/datasource/zipkin/tsconfig.json | 7 + .../datasource/zipkin/webpack.config.ts | 3 + yarn.lock | 512 +++++++++++++++--- 15 files changed, 523 insertions(+), 98 deletions(-) create mode 100644 public/app/plugins/datasource/zipkin/CHANGELOG.md create mode 100644 public/app/plugins/datasource/zipkin/package.json create mode 100644 public/app/plugins/datasource/zipkin/tsconfig.json create mode 100644 public/app/plugins/datasource/zipkin/webpack.config.ts diff --git a/.eslintrc b/.eslintrc index 76248968872..07e7cfc4064 100644 --- a/.eslintrc +++ b/.eslintrc @@ -117,7 +117,9 @@ "public/app/plugins/datasource/elasticsearch/*.{ts,tsx}", "public/app/plugins/datasource/elasticsearch/**/*.{ts,tsx}", "public/app/plugins/datasource/cloudwatch/*.{ts,tsx}", - "public/app/plugins/datasource/cloudwatch/**/*.{ts,tsx}" + "public/app/plugins/datasource/cloudwatch/**/*.{ts,tsx}", + "public/app/plugins/datasource/zipkin/*.{ts,tsx}", + "public/app/plugins/datasource/zipkin/**/*.{ts,tsx}" ], "settings": { "import/resolver": { diff --git a/.github/workflows/core-plugins-build-and-release.yml b/.github/workflows/core-plugins-build-and-release.yml index 7fa97defd3e..108ac0db337 100644 --- a/.github/workflows/core-plugins-build-and-release.yml +++ b/.github/workflows/core-plugins-build-and-release.yml @@ -14,6 +14,7 @@ on: - parca - stackdriver - tempo + # - zipkin concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ inputs.plugin_id }} diff --git a/package.json b/package.json index 64f064cbcfc..72b281e7f80 100644 --- a/package.json +++ b/package.json @@ -234,6 +234,7 @@ "@grafana-plugins/parca": "workspace:*", "@grafana-plugins/stackdriver": "workspace:*", "@grafana-plugins/tempo": "workspace:*", + "@grafana-plugins/zipkin": "workspace:*", "@grafana/aws-sdk": "0.3.1", "@grafana/data": "workspace:*", "@grafana/e2e-selectors": "workspace:*", diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json index 23702ab914f..fbbe082603c 100644 --- a/pkg/tests/api/plugins/data/expectedListResp.json +++ b/pkg/tests/api/plugins/data/expectedListResp.json @@ -1952,7 +1952,7 @@ "keywords": null }, "dependencies": { - "grafanaDependency": "", + "grafanaDependency": "\u003e=10.3.0-0", "grafanaVersion": "*", "plugins": [] }, diff --git a/public/app/features/plugins/built_in_plugins.ts b/public/app/features/plugins/built_in_plugins.ts index d28c68ed1e7..c5172cfea52 100644 --- a/public/app/features/plugins/built_in_plugins.ts +++ b/public/app/features/plugins/built_in_plugins.ts @@ -15,8 +15,7 @@ const influxdbPlugin = async () => const lokiPlugin = async () => await import(/* webpackChunkName: "lokiPlugin" */ 'app/plugins/datasource/loki/module'); const jaegerPlugin = async () => await import(/* webpackChunkName: "jaegerPlugin" */ 'app/plugins/datasource/jaeger/module'); -const zipkinPlugin = async () => - await import(/* webpackChunkName: "zipkinPlugin" */ 'app/plugins/datasource/zipkin/module'); +const zipkinPlugin = async () => await import(/* webpackChunkName: "zipkinPlugin" */ '@grafana-plugins/zipkin/module'); const mixedPlugin = async () => await import(/* webpackChunkName: "mixedPlugin" */ 'app/plugins/datasource/mixed/module'); const mysqlPlugin = async () => diff --git a/public/app/plugins/datasource/zipkin/CHANGELOG.md b/public/app/plugins/datasource/zipkin/CHANGELOG.md new file mode 100644 index 00000000000..825c32f0d03 --- /dev/null +++ b/public/app/plugins/datasource/zipkin/CHANGELOG.md @@ -0,0 +1 @@ +# Changelog diff --git a/public/app/plugins/datasource/zipkin/QueryField.test.tsx b/public/app/plugins/datasource/zipkin/QueryField.test.tsx index 059c013d746..ee8c90b6a56 100644 --- a/public/app/plugins/datasource/zipkin/QueryField.test.tsx +++ b/public/app/plugins/datasource/zipkin/QueryField.test.tsx @@ -37,7 +37,7 @@ describe('useServices', () => { }, } as ZipkinDatasource; - const { result } = renderHook(() => useServices(ds)); + const { result } = renderHook(() => useServices(ds, () => {})); await waitFor(() => { expect(result.current.value).toEqual([ { label: 'service1', value: 'service1', isLeaf: false }, @@ -62,7 +62,7 @@ describe('useLoadOptions', () => { }, } as ZipkinDatasource; - const { result } = renderHook(() => useLoadOptions(ds)); + const { result } = renderHook(() => useLoadOptions(ds, () => {})); expect(result.current.allOptions).toEqual({}); act(() => { diff --git a/public/app/plugins/datasource/zipkin/QueryField.tsx b/public/app/plugins/datasource/zipkin/QueryField.tsx index 3a809b72453..40e04968c60 100644 --- a/public/app/plugins/datasource/zipkin/QueryField.tsx +++ b/public/app/plugins/datasource/zipkin/QueryField.tsx @@ -5,6 +5,7 @@ import { useAsyncFn, useMount, useMountedState } from 'react-use'; import { AsyncState } from 'react-use/lib/useAsyncFn'; import { GrafanaTheme2, QueryEditorProps } from '@grafana/data'; +import { TemporaryAlert } from '@grafana/o11y-ds-frontend'; import { ButtonCascader, CascaderOption, @@ -19,9 +20,6 @@ import { HorizontalGroup, Button, } from '@grafana/ui'; -import { notifyApp } from 'app/core/actions'; -import { createErrorNotification } from 'app/core/copy/appNotification'; -import { dispatch } from 'app/store/store'; import { apiPrefix } from './constants'; import { ZipkinDatasource } from './datasource'; @@ -40,10 +38,11 @@ const getStyles = (theme: GrafanaTheme2) => { export const ZipkinQueryField = ({ query, onChange, onRunQuery, datasource }: Props) => { const [uploadModalOpen, setUploadModalOpen] = useState(false); - const serviceOptions = useServices(datasource); + const [alertText, setAlertText] = useState(''); + const serviceOptions = useServices(datasource, setAlertText); const theme = useTheme2(); const styles = useStyles2(getStyles); - const { onLoadOptions, allOptions } = useLoadOptions(datasource); + const { onLoadOptions, allOptions } = useLoadOptions(datasource, setAlertText); const onSelectTrace = useCallback( (values: string[], selectedOptions: CascaderOption[]) => { @@ -138,12 +137,16 @@ export const ZipkinQueryField = ({ query, onChange, onRunQuery, datasource }: Pr )} + {alertText && } ); }; // Exported for tests -export function useServices(datasource: ZipkinDatasource): AsyncState { +export function useServices( + datasource: ZipkinDatasource, + setErrorText: (text: string) => void +): AsyncState { const url = `${apiPrefix}/services`; const [servicesOptions, fetch] = useAsyncFn(async (): Promise => { @@ -159,7 +162,8 @@ export function useServices(datasource: ZipkinDatasource): AsyncState void) { const isMounted = useMountedState(); const [allOptions, setAllOptions] = useState({}); @@ -204,7 +208,8 @@ export function useLoadOptions(datasource: ZipkinDatasource) { } } catch (error) { const errorToShow = error instanceof Error ? error : 'An unknown error occurred'; - dispatch(notifyApp(createErrorNotification('Failed to load spans from Zipkin', errorToShow))); + const errorText = `Failed to load spans from Zipkin: ${errorToShow.toString()}`; + setErrorText(errorText); throw error; } }, @@ -246,7 +251,8 @@ export function useLoadOptions(datasource: ZipkinDatasource) { } } catch (error) { const errorToShow = error instanceof Error ? error : 'An unknown error occurred'; - dispatch(notifyApp(createErrorNotification('Failed to load spans from Zipkin', errorToShow))); + const errorText = `Failed to load spans from Zipkin: ${errorToShow.toString()}`; + setErrorText(errorText); throw error; } }, diff --git a/public/app/plugins/datasource/zipkin/README.md b/public/app/plugins/datasource/zipkin/README.md index a4d81d38b1d..8a14e3051be 100644 --- a/public/app/plugins/datasource/zipkin/README.md +++ b/public/app/plugins/datasource/zipkin/README.md @@ -1,7 +1,3 @@ -# Zipkin Data Source - Native Plugin +# Grafana Zipkin Data Source - Native Plugin -Grafana ships with **built in** support for Zipkin, an open source, distributed tracing system. - -Read more about it here: - -[https://docs.grafana.org/datasources/zipkin/](https://docs.grafana.org/datasources/zipkin/) +Grafana plugin for the Zipkin data source. [https://docs.grafana.org/datasources/zipkin/](Read more about it here). diff --git a/public/app/plugins/datasource/zipkin/datasource.test.ts b/public/app/plugins/datasource/zipkin/datasource.test.ts index 99cb2ff5a1c..10bafa53ad6 100644 --- a/public/app/plugins/datasource/zipkin/datasource.test.ts +++ b/public/app/plugins/datasource/zipkin/datasource.test.ts @@ -2,14 +2,15 @@ import { lastValueFrom, of } from 'rxjs'; import { createFetchResponse } from 'test/helpers/createFetchResponse'; import { DataQueryRequest, DataSourceInstanceSettings, DataSourcePluginMeta, FieldType } from '@grafana/data'; -import { TemplateSrv } from '@grafana/runtime'; -import { backendSrv } from 'app/core/services/backend_srv'; +import { BackendSrv, TemplateSrv } from '@grafana/runtime'; import { ZipkinDatasource } from './datasource'; import mockJson from './mockJsonResponse.json'; import { ZipkinQuery, ZipkinSpan } from './types'; import { traceFrameFields, zipkinResponse } from './utils/testData'; +export const backendSrv = { fetch: jest.fn() } as unknown as BackendSrv; + jest.mock('@grafana/runtime', () => ({ ...jest.requireActual('@grafana/runtime'), getBackendSrv: () => backendSrv, diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json new file mode 100644 index 00000000000..fd184c7ebda --- /dev/null +++ b/public/app/plugins/datasource/zipkin/package.json @@ -0,0 +1,38 @@ +{ + "name": "@grafana-plugins/zipkin", + "description": "Zipkin plugin for Grafana", + "private": true, + "version": "10.4.0-pre", + "dependencies": { + "@emotion/css": "11.11.2", + "@grafana/data": "workspace:*", + "@grafana/experimental": "1.7.8", + "@grafana/o11y-ds-frontend": "workspace:*", + "@grafana/runtime": "workspace:*", + "@grafana/ui": "workspace:*", + "lodash": "4.17.21", + "react": "18.2.0", + "react-use": "17.5.0", + "rxjs": "7.8.1", + "tslib": "2.6.2" + }, + "devDependencies": { + "@grafana/plugin-configs": "workspace:*", + "@testing-library/jest-dom": "6.3.0", + "@testing-library/react": "14.1.2", + "@types/jest": "29.5.11", + "@types/lodash": "4.14.202", + "@types/react": "18.2.48", + "ts-node": "10.9.2", + "webpack": "5.90.0" + }, + "peerDependencies": { + "@grafana/runtime": "*" + }, + "scripts": { + "build": "webpack -c ./webpack.config.ts --env production", + "build:commit": "webpack -c ./webpack.config.ts --env production --env commit=$(git rev-parse --short HEAD)", + "dev": "webpack -w -c ./webpack.config.ts --env development" + }, + "packageManager": "yarn@3.6.0" +} diff --git a/public/app/plugins/datasource/zipkin/plugin.json b/public/app/plugins/datasource/zipkin/plugin.json index 74bb006ff8d..9437ecd76d9 100644 --- a/public/app/plugins/datasource/zipkin/plugin.json +++ b/public/app/plugins/datasource/zipkin/plugin.json @@ -26,6 +26,10 @@ "name": "Learn more", "url": "https://zipkin.io" } - ] + ], + "version": "%VERSION%" + }, + "dependencies": { + "grafanaDependency": ">=10.3.0-0" } } diff --git a/public/app/plugins/datasource/zipkin/tsconfig.json b/public/app/plugins/datasource/zipkin/tsconfig.json new file mode 100644 index 00000000000..6dc8a770cba --- /dev/null +++ b/public/app/plugins/datasource/zipkin/tsconfig.json @@ -0,0 +1,7 @@ +{ + "compilerOptions": { + "types": ["node", "jest", "@testing-library/jest-dom"] + }, + "extends": "@grafana/plugin-configs/tsconfig.json", + "include": ["."] +} diff --git a/public/app/plugins/datasource/zipkin/webpack.config.ts b/public/app/plugins/datasource/zipkin/webpack.config.ts new file mode 100644 index 00000000000..4da5a990cfa --- /dev/null +++ b/public/app/plugins/datasource/zipkin/webpack.config.ts @@ -0,0 +1,3 @@ +import config from '@grafana/plugin-configs/webpack.config'; + +export default config; diff --git a/yarn.lock b/yarn.lock index 3dc292d7aa5..7807b1bab95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3485,6 +3485,34 @@ __metadata: languageName: unknown linkType: soft +"@grafana-plugins/zipkin@workspace:*, @grafana-plugins/zipkin@workspace:public/app/plugins/datasource/zipkin": + version: 0.0.0-use.local + resolution: "@grafana-plugins/zipkin@workspace:public/app/plugins/datasource/zipkin" + dependencies: + "@emotion/css": "npm:11.11.2" + "@grafana/data": "workspace:*" + "@grafana/experimental": "npm:1.7.8" + "@grafana/o11y-ds-frontend": "workspace:*" + "@grafana/plugin-configs": "workspace:*" + "@grafana/runtime": "workspace:*" + "@grafana/ui": "workspace:*" + "@testing-library/jest-dom": "npm:6.3.0" + "@testing-library/react": "npm:14.1.2" + "@types/jest": "npm:29.5.11" + "@types/lodash": "npm:4.14.202" + "@types/react": "npm:18.2.48" + lodash: "npm:4.17.21" + react: "npm:18.2.0" + react-use: "npm:17.5.0" + rxjs: "npm:7.8.1" + ts-node: "npm:10.9.2" + tslib: "npm:2.6.2" + webpack: "npm:5.90.0" + peerDependencies: + "@grafana/runtime": "*" + languageName: unknown + linkType: soft + "@grafana/async-query-data@npm:0.1.4": version: 0.1.4 resolution: "@grafana/async-query-data@npm:0.1.4" @@ -3569,14 +3597,14 @@ __metadata: languageName: unknown linkType: soft -"@grafana/e2e-selectors@npm:10.0.2": - version: 10.0.2 - resolution: "@grafana/e2e-selectors@npm:10.0.2" +"@grafana/e2e-selectors@npm:10.3.3": + version: 10.3.3 + resolution: "@grafana/e2e-selectors@npm:10.3.3" dependencies: "@grafana/tsconfig": "npm:^1.2.0-rc1" - tslib: "npm:2.5.0" - typescript: "npm:4.8.4" - checksum: 10/8f2ea80ed8408801243b0ea10d504af39f361b6daab98fdc1f1461fc41593e5a026cb055e65a2437bf2f8e8e71150884c5f1173c302c01854e82b8ee17918500 + tslib: "npm:2.6.0" + typescript: "npm:5.2.2" + checksum: 10/11fcbf80d61d30a1ab5a99a6c24c5044c187bf6bb52c5d0a1c99b46ed6b28ea5865ff0b9fdfc66c22a744ba5fe9ea2f5030256d952f3b76302cc8cb8ffc01a73 languageName: node linkType: hard @@ -3722,7 +3750,42 @@ __metadata: languageName: node linkType: hard -"@grafana/faro-core@npm:^1.3.6, @grafana/faro-core@npm:^1.3.8": +"@grafana/experimental@npm:1.7.8": + version: 1.7.8 + resolution: "@grafana/experimental@npm:1.7.8" + dependencies: + "@types/uuid": "npm:^8.3.3" + lodash: "npm:^4.17.21" + prismjs: "npm:^1.29.0" + react-beautiful-dnd: "npm:^13.1.1" + react-popper-tooltip: "npm:^4.4.2" + react-use: "npm:^17.4.2" + semver: "npm:^7.5.4" + uuid: "npm:^8.3.2" + peerDependencies: + "@emotion/css": 11.11.2 + "@grafana/data": ^10.0.0 + "@grafana/runtime": ^10.0.0 + "@grafana/ui": ^10.0.0 + react: 17.0.2 + react-dom: 17.0.2 + react-select: ^5.2.1 + rxjs: 7.8.0 + checksum: 10/6bcf4a04b07fb1a34f7fa5332c0ab10760675e153d6d855b49f3cfe9fdc1b63223162aa82bac569b30f10ad4b2c434058bc03d50c650f50f86ddad01de1f4cce + languageName: node + linkType: hard + +"@grafana/faro-core@npm:^1.3.6, @grafana/faro-core@npm:^1.3.7": + version: 1.3.7 + resolution: "@grafana/faro-core@npm:1.3.7" + dependencies: + "@opentelemetry/api": "npm:^1.7.0" + "@opentelemetry/otlp-transformer": "npm:^0.45.1" + checksum: 10/fa3ff8dce1e6fe5ad91a4d42bb9bdb13f36d594074566a100645ffb4bc509265d18c78c5cda1ef8f39a3f043c1901baee620d3e044b3a0a6e9d1c516bf71f74f + languageName: node + linkType: hard + +"@grafana/faro-core@npm:^1.3.8": version: 1.3.8 resolution: "@grafana/faro-core@npm:1.3.8" dependencies: @@ -3732,7 +3795,7 @@ __metadata: languageName: node linkType: hard -"@grafana/faro-web-sdk@npm:1.3.8, @grafana/faro-web-sdk@npm:^1.3.6": +"@grafana/faro-web-sdk@npm:1.3.8": version: 1.3.8 resolution: "@grafana/faro-web-sdk@npm:1.3.8" dependencies: @@ -3743,6 +3806,17 @@ __metadata: languageName: node linkType: hard +"@grafana/faro-web-sdk@npm:^1.3.6": + version: 1.3.7 + resolution: "@grafana/faro-web-sdk@npm:1.3.7" + dependencies: + "@grafana/faro-core": "npm:^1.3.7" + ua-parser-js: "npm:^1.0.32" + web-vitals: "npm:^3.1.1" + checksum: 10/5dc5f38a4bcd31f5ee9ece7e2dd4253020ecc872b23c8294e2b84639d8f82c8a895b15743f24092c5b6ea99438e98b1c396ab9368df4ffc472109e005c7451d6 + languageName: node + linkType: hard + "@grafana/flamegraph@workspace:*, @grafana/flamegraph@workspace:packages/grafana-flamegraph": version: 0.0.0-use.local resolution: "@grafana/flamegraph@workspace:packages/grafana-flamegraph" @@ -3860,7 +3934,7 @@ __metadata: languageName: unknown linkType: soft -"@grafana/plugin-configs@npm:10.4.0-pre, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs": +"@grafana/plugin-configs@npm:10.4.0-pre, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs": version: 0.0.0-use.local resolution: "@grafana/plugin-configs@workspace:packages/grafana-plugin-configs" dependencies: @@ -4036,20 +4110,22 @@ __metadata: linkType: soft "@grafana/scenes@npm:^3.5.0": - version: 3.5.0 - resolution: "@grafana/scenes@npm:3.5.0" + version: 3.6.1 + resolution: "@grafana/scenes@npm:3.6.1" dependencies: - "@grafana/e2e-selectors": "npm:10.0.2" + "@grafana/e2e-selectors": "npm:10.3.3" react-grid-layout: "npm:1.3.4" react-use: "npm:17.4.0" react-virtualized-auto-sizer: "npm:1.0.7" uuid: "npm:^9.0.0" peerDependencies: - "@grafana/data": 10.0.3 - "@grafana/runtime": 10.0.3 - "@grafana/schema": 10.0.3 - "@grafana/ui": 10.0.3 - checksum: 10/eac51e8bc4327fea39242e1580e4bc174aff984268dcf7b022dfeab5cd53eed63b72d92048e42e24c467ddf55130dbe555f4d4b0bb0a743ace5294ec90978ca5 + "@grafana/data": ^10.0.3 + "@grafana/runtime": ^10.0.3 + "@grafana/schema": ^10.0.3 + "@grafana/ui": ^10.0.3 + react: ^18.0.0 + react-dom: ^18.0.0 + checksum: 10/b993f8ad23217fcbadbacc68455c94f7e149cad5d683731f7e7aad531f9d1e81f4399514732ddb607c6e70ce3ec8aeb0a9a070778b4c1d6912fa954df2f308fd languageName: node linkType: hard @@ -5694,6 +5770,15 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/api-logs@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/api-logs@npm:0.45.1" + dependencies: + "@opentelemetry/api": "npm:^1.0.0" + checksum: 10/0f78a131d640a09f2a4c837014378f6b5f6db1e32d90a70a7f4c5191dc2f767330887fc16126d7ae788b122e828e4f3b1aec09be284f633a151d6a319e03e2a4 + languageName: node + linkType: hard + "@opentelemetry/api-logs@npm:0.48.0": version: 0.48.0 resolution: "@opentelemetry/api-logs@npm:0.48.0" @@ -5731,6 +5816,17 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/core@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/core@npm:1.18.1" + dependencies: + "@opentelemetry/semantic-conventions": "npm:1.18.1" + peerDependencies: + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 10/b8c08c40d07d8b2afefc3c97ea83d8e8dc2e5e5a139007ba7fc4cc25fc38b6fe0d1380d4bdaf390381f114dbfbed5b3c45a395972cf25a1a174c8e5b0bd830fb + languageName: node + linkType: hard + "@opentelemetry/core@npm:1.21.0": version: 1.21.0 resolution: "@opentelemetry/core@npm:1.21.0" @@ -5757,6 +5853,22 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/otlp-transformer@npm:^0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/otlp-transformer@npm:0.45.1" + dependencies: + "@opentelemetry/api-logs": "npm:0.45.1" + "@opentelemetry/core": "npm:1.18.1" + "@opentelemetry/resources": "npm:1.18.1" + "@opentelemetry/sdk-logs": "npm:0.45.1" + "@opentelemetry/sdk-metrics": "npm:1.18.1" + "@opentelemetry/sdk-trace-base": "npm:1.18.1" + peerDependencies: + "@opentelemetry/api": ">=1.3.0 <1.8.0" + checksum: 10/fadc67d1f4ff613d6b737a4400a286afe34a460f47374b16b34d9344d4ff89ce308ba79e22774c2dd8e00cb5fc76d034cb9369fe09e0e4af6ba49588a5647816 + languageName: node + linkType: hard + "@opentelemetry/otlp-transformer@npm:^0.48.0": version: 0.48.0 resolution: "@opentelemetry/otlp-transformer@npm:0.48.0" @@ -5785,6 +5897,18 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/resources@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/resources@npm:1.18.1" + dependencies: + "@opentelemetry/core": "npm:1.18.1" + "@opentelemetry/semantic-conventions": "npm:1.18.1" + peerDependencies: + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 10/f7d168a82c2fc602364a54977f41ce9f873b5156d5e36bf0f078b289f6bb1c41eaae700bcdddb7f32d15cb7e937d81239eb0301c7d0aa9b2a6c85a4cb0ff5ded + languageName: node + linkType: hard + "@opentelemetry/resources@npm:1.21.0": version: 1.21.0 resolution: "@opentelemetry/resources@npm:1.21.0" @@ -5797,6 +5921,19 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/sdk-logs@npm:0.45.1": + version: 0.45.1 + resolution: "@opentelemetry/sdk-logs@npm:0.45.1" + dependencies: + "@opentelemetry/core": "npm:1.18.1" + "@opentelemetry/resources": "npm:1.18.1" + peerDependencies: + "@opentelemetry/api": ">=1.4.0 <1.8.0" + "@opentelemetry/api-logs": ">=0.39.1" + checksum: 10/47cc1aa1d867bf6b0fe5120fa5e7839620a5843a93b1725ae7f35bdf10f6998fe89376c9524eff438f92b74733a751e1c6e7c0e90ec13aa6a1bfa8ca28d1f2e4 + languageName: node + linkType: hard + "@opentelemetry/sdk-logs@npm:0.48.0": version: 0.48.0 resolution: "@opentelemetry/sdk-logs@npm:0.48.0" @@ -5824,6 +5961,19 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/sdk-metrics@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/sdk-metrics@npm:1.18.1" + dependencies: + "@opentelemetry/core": "npm:1.18.1" + "@opentelemetry/resources": "npm:1.18.1" + lodash.merge: "npm:^4.6.2" + peerDependencies: + "@opentelemetry/api": ">=1.3.0 <1.8.0" + checksum: 10/fe728c7383b5c7e7647bf7ea9881c41f4e11f48a57cf9e81efeda5eaaf784b092e1df3684e1101b34410a9401ba36e63e81bed1da5da048da5ad91acbaf51606 + languageName: node + linkType: hard + "@opentelemetry/sdk-metrics@npm:1.21.0": version: 1.21.0 resolution: "@opentelemetry/sdk-metrics@npm:1.21.0" @@ -5851,6 +6001,19 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/sdk-trace-base@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/sdk-trace-base@npm:1.18.1" + dependencies: + "@opentelemetry/core": "npm:1.18.1" + "@opentelemetry/resources": "npm:1.18.1" + "@opentelemetry/semantic-conventions": "npm:1.18.1" + peerDependencies: + "@opentelemetry/api": ">=1.0.0 <1.8.0" + checksum: 10/99e576f538a06feff11e1a7c63224864ef4875e36bd0b7284087307f6dd87554aa2089f0a51f8a4cdc55c44f298befedf94b40987af9a0875e931bd3fe2e77c5 + languageName: node + linkType: hard + "@opentelemetry/sdk-trace-base@npm:1.21.0": version: 1.21.0 resolution: "@opentelemetry/sdk-trace-base@npm:1.21.0" @@ -5871,6 +6034,13 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/semantic-conventions@npm:1.18.1": + version: 1.18.1 + resolution: "@opentelemetry/semantic-conventions@npm:1.18.1" + checksum: 10/00d46e3b61eeac8a6752d50a0fb55ddf32f6f716a7fe4bf35b6d001da89398b4d8a5623a17044b24ab159acb892b2ac2586731b375176b94806cb0013f629dd5 + languageName: node + linkType: hard + "@opentelemetry/semantic-conventions@npm:1.21.0": version: 1.21.0 resolution: "@opentelemetry/semantic-conventions@npm:1.21.0" @@ -8406,7 +8576,7 @@ __metadata: languageName: node linkType: hard -"@swc/core@npm:1.4.0": +"@swc/core@npm:1.4.0, @swc/core@npm:^1.3.49": version: 1.4.0 resolution: "@swc/core@npm:1.4.0" dependencies: @@ -8452,7 +8622,7 @@ __metadata: languageName: node linkType: hard -"@swc/core@npm:1.4.1, @swc/core@npm:^1.3.49": +"@swc/core@npm:1.4.1": version: 1.4.1 resolution: "@swc/core@npm:1.4.1" dependencies: @@ -8537,6 +8707,39 @@ __metadata: languageName: node linkType: hard +"@testing-library/jest-dom@npm:6.3.0": + version: 6.3.0 + resolution: "@testing-library/jest-dom@npm:6.3.0" + dependencies: + "@adobe/css-tools": "npm:^4.3.2" + "@babel/runtime": "npm:^7.9.2" + aria-query: "npm:^5.0.0" + chalk: "npm:^3.0.0" + css.escape: "npm:^1.5.1" + dom-accessibility-api: "npm:^0.6.3" + lodash: "npm:^4.17.15" + redent: "npm:^3.0.0" + peerDependencies: + "@jest/globals": ">= 28" + "@types/bun": "*" + "@types/jest": ">= 28" + jest: ">= 28" + vitest: ">= 0.32" + peerDependenciesMeta: + "@jest/globals": + optional: true + "@types/bun": + optional: true + "@types/jest": + optional: true + jest: + optional: true + vitest: + optional: true + checksum: 10/d96e552cfe5a72fa0a4c21655a9fabe6ffce6a066323c8a0f5847f39ff88229cd2455c9af41d3381b672d65469e74752d29e35dd04c15d8241a9f6a1e7cb78c6 + languageName: node + linkType: hard + "@testing-library/jest-dom@npm:6.4.2, @testing-library/jest-dom@npm:^6.1.2": version: 6.4.2 resolution: "@testing-library/jest-dom@npm:6.4.2" @@ -8592,6 +8795,20 @@ __metadata: languageName: node linkType: hard +"@testing-library/react@npm:14.1.2": + version: 14.1.2 + resolution: "@testing-library/react@npm:14.1.2" + dependencies: + "@babel/runtime": "npm:^7.12.5" + "@testing-library/dom": "npm:^9.0.0" + "@types/react-dom": "npm:^18.0.0" + peerDependencies: + react: ^18.0.0 + react-dom: ^18.0.0 + checksum: 10/1664990ad9673403ee1d74c1c1b60ec30591d42a3fe1e2175c28cb935cd49bc9a4ba398707f702acc3278c3b0cb492ee57fe66f41ceb040c5da57de98cba5414 + languageName: node + linkType: hard + "@testing-library/react@npm:14.2.1": version: 14.2.1 resolution: "@testing-library/react@npm:14.2.1" @@ -9431,6 +9648,16 @@ __metadata: languageName: node linkType: hard +"@types/jest@npm:29.5.11": + version: 29.5.11 + resolution: "@types/jest@npm:29.5.11" + dependencies: + expect: "npm:^29.0.0" + pretty-format: "npm:^29.0.0" + checksum: 10/798f4c89407d9457bea1256de74c26f2b279f6c789c0e3311cd604cc75cdab333b9a29b00c51b0090d31abdf11cc788b4103282851a653bef6daf72edf97eef2 + languageName: node + linkType: hard + "@types/jquery@npm:3.5.29": version: 3.5.29 resolution: "@types/jquery@npm:3.5.29" @@ -9630,12 +9857,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:20.11.19, @types/node@npm:>=13.7.0, @types/node@npm:^20.11.16": - version: 20.11.19 - resolution: "@types/node@npm:20.11.19" +"@types/node@npm:*, @types/node@npm:>=13.7.0": + version: 20.11.17 + resolution: "@types/node@npm:20.11.17" dependencies: undici-types: "npm:~5.26.4" - checksum: 10/c7f4705d6c84aa21679ad180c33c13ca9567f650e66e14bcee77c7c43d14619c7cd3b4d7b2458947143030b7b1930180efa6d12d999b45366abff9fed7a17472 + checksum: 10/3342df87258d1c56154bcd4b85180f48675427b235971e6e6e2e037353f5a2ae9aaa05ba5df0fe1e2d2f1022c8d856fd39056b9d7f50ea30c0ca3214137cae1d languageName: node linkType: hard @@ -9646,6 +9873,15 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:20.11.19, @types/node@npm:^20.11.16": + version: 20.11.19 + resolution: "@types/node@npm:20.11.19" + dependencies: + undici-types: "npm:~5.26.4" + checksum: 10/c7f4705d6c84aa21679ad180c33c13ca9567f650e66e14bcee77c7c43d14619c7cd3b4d7b2458947143030b7b1930180efa6d12d999b45366abff9fed7a17472 + languageName: node + linkType: hard + "@types/node@npm:^14.14.31": version: 14.18.36 resolution: "@types/node@npm:14.18.36" @@ -9922,6 +10158,17 @@ __metadata: languageName: node linkType: hard +"@types/react@npm:18.2.48": + version: 18.2.48 + resolution: "@types/react@npm:18.2.48" + dependencies: + "@types/prop-types": "npm:*" + "@types/scheduler": "npm:*" + csstype: "npm:^3.0.2" + checksum: 10/2e56ea6bd821ae96bd943f727a59d85384eaf5f8a3e6fce4fa1d34453e32d8eedda742432b3857fa0de7a4214bf84ce4239757eb52918e76452c00384731e585 + languageName: node + linkType: hard + "@types/reactcss@npm:*": version: 1.2.6 resolution: "@types/reactcss@npm:1.2.6" @@ -9961,13 +10208,20 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:7.5.7, @types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.5.0": +"@types/semver@npm:7.5.7": version: 7.5.7 resolution: "@types/semver@npm:7.5.7" checksum: 10/535d88ec577fe59e38211881f79a1e2ba391e9e1516f8fff74e7196a5ba54315bace9c67a4616c334c830c89027d70a9f473a4ceb634526086a9da39180f2f9a languageName: node linkType: hard +"@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4, @types/semver@npm:^7.5.0": + version: 7.5.6 + resolution: "@types/semver@npm:7.5.6" + checksum: 10/e77282b17f74354e17e771c0035cccb54b94cc53d0433fa7e9ba9d23fd5d7edcd14b6c8b7327d58bbd89e83b1c5eda71dfe408e06b929007e2b89586e9b63459 + languageName: node + linkType: hard + "@types/serve-index@npm:^1.9.1": version: 1.9.1 resolution: "@types/serve-index@npm:1.9.1" @@ -11454,7 +11708,17 @@ __metadata: languageName: node linkType: hard -"anymatch@npm:^3.0.3, anymatch@npm:^3.1.3, anymatch@npm:~3.1.2": +"anymatch@npm:^3.0.3, anymatch@npm:~3.1.2": + version: 3.1.2 + resolution: "anymatch@npm:3.1.2" + dependencies: + normalize-path: "npm:^3.0.0" + picomatch: "npm:^2.0.4" + checksum: 10/985163db2292fac9e5a1e072bf99f1b5baccf196e4de25a0b0b81865ebddeb3b3eb4480734ef0a2ac8c002845396b91aa89121f5b84f93981a4658164a9ec6e9 + languageName: node + linkType: hard + +"anymatch@npm:^3.1.3": version: 3.1.3 resolution: "anymatch@npm:3.1.3" dependencies: @@ -12472,16 +12736,16 @@ __metadata: linkType: hard "browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.22.2": - version: 4.23.0 - resolution: "browserslist@npm:4.23.0" + version: 4.22.3 + resolution: "browserslist@npm:4.22.3" dependencies: - caniuse-lite: "npm:^1.0.30001587" - electron-to-chromium: "npm:^1.4.668" + caniuse-lite: "npm:^1.0.30001580" + electron-to-chromium: "npm:^1.4.648" node-releases: "npm:^2.0.14" update-browserslist-db: "npm:^1.0.13" bin: browserslist: cli.js - checksum: 10/496c3862df74565dd942b4ae65f502c575cbeba1fa4a3894dad7aa3b16130dc3033bc502d8848147f7b625154a284708253d9598bcdbef5a1e34cf11dc7bad8e + checksum: 10/d46a906c79dfe95d9702c020afbe5b7b4dbe2019b85432e7a020326adff27e63e3c0a52dc8d4e73247060bbe2c13f000714741903cf96a16baae9c216dc74c75 languageName: node linkType: hard @@ -12781,10 +13045,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001587": - version: 1.0.30001587 - resolution: "caniuse-lite@npm:1.0.30001587" - checksum: 10/960e26927ad876971021186337df1df2d37d7ed4fc7907098c060f56ae8de737d471791e51387ca55bea07f56b0a76553a90125f88a2f958ca1f4f715013cf71 +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001580": + version: 1.0.30001581 + resolution: "caniuse-lite@npm:1.0.30001581" + checksum: 10/c2d049514e6af5e9a9b23646b7828191f4c2d3ef1ad999d3efe02683d56d0067d616e2eadb055fe5477f870b22e7252dc09834f95007c95f310d8eca30cfa912 languageName: node linkType: hard @@ -13059,14 +13323,14 @@ __metadata: languageName: node linkType: hard -"cli-spinners@npm:2.6.1": +"cli-spinners@npm:2.6.1, cli-spinners@npm:^2.5.0": version: 2.6.1 resolution: "cli-spinners@npm:2.6.1" checksum: 10/3e2dc5df72cf02120bebe256881fc8e3ec49867e5023d39f1e7340d7da57964f5236f4c75e568aa9dea6460b56f7a6d5870b89453c743c6c15e213cb52be2122 languageName: node linkType: hard -"cli-spinners@npm:^2.5.0, cli-spinners@npm:^2.9.2": +"cli-spinners@npm:^2.9.2": version: 2.9.2 resolution: "cli-spinners@npm:2.9.2" checksum: 10/a0a863f442df35ed7294424f5491fa1756bd8d2e4ff0c8736531d886cec0ece4d85e8663b77a5afaf1d296e3cbbebff92e2e99f52bbea89b667cbe789b994794 @@ -13751,7 +14015,7 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.36.0, core-js@npm:^3.6.0, core-js@npm:^3.8.3": +"core-js@npm:3.36.0": version: 3.36.0 resolution: "core-js@npm:3.36.0" checksum: 10/896326c6391c1607dc645293c214cd31c6c535d4a77a88b15fc29e787199f9b06dc15986ddfbc798335bf7a7afd1e92152c94aa5a974790a7f97a98121774302 @@ -13765,6 +14029,13 @@ __metadata: languageName: node linkType: hard +"core-js@npm:^3.6.0, core-js@npm:^3.8.3": + version: 3.35.1 + resolution: "core-js@npm:3.35.1" + checksum: 10/5d31f22eb05cf66bd1a2088a04b7106faa5d0b91c1ffa5d72c5203e4974c31bd7e11969297f540a806c00c74c23991eaad5639592df8b5dbe4412fff3c075cd5 + languageName: node + linkType: hard + "core-util-is@npm:1.0.2": version: 1.0.2 resolution: "core-util-is@npm:1.0.2" @@ -15200,9 +15471,9 @@ __metadata: linkType: hard "diff@npm:^5.1.0": - version: 5.2.0 - resolution: "diff@npm:5.2.0" - checksum: 10/01b7b440f83a997350a988e9d2f558366c0f90f15be19f4aa7f1bb3109a4e153dfc3b9fbf78e14ea725717017407eeaa2271e3896374a0181e8f52445740846d + version: 5.1.0 + resolution: "diff@npm:5.1.0" + checksum: 10/f4557032a98b2967fe27b1a91dfcf8ebb6b9a24b1afe616b5c2312465100b861e9b8d4da374be535f2d6b967ce2f53826d7f6edc2a0d32b2ab55abc96acc2f9d languageName: node linkType: hard @@ -15509,10 +15780,10 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.668": - version: 1.4.670 - resolution: "electron-to-chromium@npm:1.4.670" - checksum: 10/4fbbb1e64ec1a60ac9dcfb85efa948937facc5e6e659a2aa2691d915ee8c58793d92c3817d099026da00d2a36266c2bec1ffabb64bbdf19da232aec0297d35fa +"electron-to-chromium@npm:^1.4.648": + version: 1.4.648 + resolution: "electron-to-chromium@npm:1.4.648" + checksum: 10/a18f06bafce9017ac7b587f76dac77063a0beb7dfcdf9d5971f72b322f56af6315e4fc3c59154a260a9188c168ac7632538797d57a8c53ab57025ace0c9441f2 languageName: node linkType: hard @@ -16970,6 +17241,13 @@ __metadata: languageName: node linkType: hard +"fast-fifo@npm:^1.0.0": + version: 1.1.0 + resolution: "fast-fifo@npm:1.1.0" + checksum: 10/895f4c9873a4d5059dfa244aa0dde2b22ee563fd673d85b638869715f92244f9d6469bc0873bcb40554d28c51cbc7590045718462cfda1da503b1c6985815209 + languageName: node + linkType: hard + "fast-fifo@npm:^1.1.0": version: 1.3.2 resolution: "fast-fifo@npm:1.3.2" @@ -17060,7 +17338,7 @@ __metadata: languageName: node linkType: hard -"fastq@npm:^1.13.0, fastq@npm:^1.6.0": +"fastq@npm:^1.13.0": version: 1.17.1 resolution: "fastq@npm:1.17.1" dependencies: @@ -17069,6 +17347,15 @@ __metadata: languageName: node linkType: hard +"fastq@npm:^1.6.0": + version: 1.13.0 + resolution: "fastq@npm:1.13.0" + dependencies: + reusify: "npm:^1.0.4" + checksum: 10/0902cb9b81accf34e5542612c8a1df6c6ea47674f85bcc9cdc38795a28b53e4a096f751cfcf4fb25d2ea42fee5447499ba6cf5af5d0209297e1d1fd4dd551bb6 + languageName: node + linkType: hard + "fault@npm:^1.0.0": version: 1.0.4 resolution: "fault@npm:1.0.4" @@ -18268,6 +18555,7 @@ __metadata: "@grafana-plugins/parca": "workspace:*" "@grafana-plugins/stackdriver": "workspace:*" "@grafana-plugins/tempo": "workspace:*" + "@grafana-plugins/zipkin": "workspace:*" "@grafana/aws-sdk": "npm:0.3.1" "@grafana/data": "workspace:*" "@grafana/e2e-selectors": "workspace:*" @@ -23912,7 +24200,14 @@ __metadata: languageName: node linkType: hard -"outvariant@npm:^1.2.1, outvariant@npm:^1.4.0, outvariant@npm:^1.4.2": +"outvariant@npm:^1.2.1, outvariant@npm:^1.4.0": + version: 1.4.0 + resolution: "outvariant@npm:1.4.0" + checksum: 10/07b9bcb9b3a2ff1b3db02af6b07d70e663082b30ddc08ff475d7c85fc623fdcc4433a4ab5b88f6902b62dbb284eef1be386aa537e14cef0519fad887ec483054 + languageName: node + linkType: hard + +"outvariant@npm:^1.4.2": version: 1.4.2 resolution: "outvariant@npm:1.4.2" checksum: 10/f16ba035fb65d1cbe7d2e06693dd42183c46bc8456713d9ddb5182d067defa7d78217edab0a2d3e173d3bacd627b2bd692195c7087c225b82548fbf52c677b38 @@ -25413,7 +25708,7 @@ __metadata: languageName: node linkType: hard -"queue-tick@npm:^1.0.1": +"queue-tick@npm:^1.0.0, queue-tick@npm:^1.0.1": version: 1.0.1 resolution: "queue-tick@npm:1.0.1" checksum: 10/f447926c513b64a857906f017a3b350f7d11277e3c8d2a21a42b7998fa1a613d7a829091e12d142bb668905c8f68d8103416c7197856efb0c72fa835b8e254b5 @@ -28037,7 +28332,14 @@ __metadata: languageName: node linkType: hard -"signal-exit@npm:^4.0.1, signal-exit@npm:^4.1.0": +"signal-exit@npm:^4.0.1": + version: 4.0.2 + resolution: "signal-exit@npm:4.0.2" + checksum: 10/99d49eab7f24aeed79e44999500d5ff4b9fbb560b0e1f8d47096c54d625b995aeaec3032cce44527adf2de0c303731a8356e234a348d6801214a8a3385a1ff8e + languageName: node + linkType: hard + +"signal-exit@npm:^4.1.0": version: 4.1.0 resolution: "signal-exit@npm:4.1.0" checksum: 10/c9fa63bbbd7431066174a48ba2dd9986dfd930c3a8b59de9c29d7b6854ec1c12a80d15310869ea5166d413b99f041bfa3dd80a7947bcd44ea8e6eb3ffeabfa1f @@ -28801,7 +29103,7 @@ __metadata: languageName: node linkType: hard -"streamx@npm:^2.12.0, streamx@npm:^2.12.5, streamx@npm:^2.13.2, streamx@npm:^2.14.0": +"streamx@npm:^2.12.0, streamx@npm:^2.13.2, streamx@npm:^2.14.0": version: 2.15.7 resolution: "streamx@npm:2.15.7" dependencies: @@ -28811,6 +29113,16 @@ __metadata: languageName: node linkType: hard +"streamx@npm:^2.12.5": + version: 2.12.5 + resolution: "streamx@npm:2.12.5" + dependencies: + fast-fifo: "npm:^1.0.0" + queue-tick: "npm:^1.0.0" + checksum: 10/daa5789ca31101684d9266f7ea77294908bd3e55607805ac1657f0cef1ee0a1966bc3988d2ec12c5f68a718d481147fa3ace2525486a1e39ca7155c598917cd1 + languageName: node + linkType: hard + "strict-event-emitter@npm:^0.2.4": version: 0.2.8 resolution: "strict-event-emitter@npm:0.2.8" @@ -30220,16 +30532,6 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4.8.4": - version: 4.8.4 - resolution: "typescript@npm:4.8.4" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10/f985d8dd6ae815753d61cb81e434f3a4a5796ac52e423370fca6ad11bcd188df4013d82e3ba3b88c9746745b9341390ba68f862dc9d30bac6465e0699f2a795b - languageName: node - linkType: hard - "typescript@npm:5.2.2": version: 5.2.2 resolution: "typescript@npm:5.2.2" @@ -30250,16 +30552,6 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A4.8.4#optional!builtin": - version: 4.8.4 - resolution: "typescript@patch:typescript@npm%3A4.8.4#optional!builtin::version=4.8.4&hash=1a91c8" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10/5d81fd8cf5152091a0c0b84ebc868de8433583072a340c4899e0fc7ad6a80314b880a1466868c9a6a1f640c3d1f2fe7f41f8c541b99d78c8b414263dfa27eba3 - languageName: node - linkType: hard - "typescript@patch:typescript@npm%3A5.2.2#optional!builtin": version: 5.2.2 resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin::version=5.2.2&hash=f3b441" @@ -31232,9 +31524,9 @@ __metadata: languageName: node linkType: hard -"webpack@npm:5, webpack@npm:5.90.2, webpack@npm:^5": - version: 5.90.2 - resolution: "webpack@npm:5.90.2" +"webpack@npm:5, webpack@npm:^5": + version: 5.90.1 + resolution: "webpack@npm:5.90.1" dependencies: "@types/eslint-scope": "npm:^3.7.3" "@types/estree": "npm:^1.0.5" @@ -31265,7 +31557,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: 10/4eaeed1255c9c7738921c4ce4facdb3b78dbfcb3441496942f6d160a41fbcebd24fb2c6dbb64739b357c5ff78e5a298f6c82eca482438b95130a3ba4e16d084a + checksum: 10/6ad23518123f1742238177920cefa61152d981f986adac5901236845c86ba9bb375a3ba75e188925c856c3d2a76a2ba119e95b8a608a51424968389041089075 languageName: node linkType: hard @@ -31343,6 +31635,80 @@ __metadata: languageName: node linkType: hard +"webpack@npm:5.90.0": + version: 5.90.0 + resolution: "webpack@npm:5.90.0" + dependencies: + "@types/eslint-scope": "npm:^3.7.3" + "@types/estree": "npm:^1.0.5" + "@webassemblyjs/ast": "npm:^1.11.5" + "@webassemblyjs/wasm-edit": "npm:^1.11.5" + "@webassemblyjs/wasm-parser": "npm:^1.11.5" + acorn: "npm:^8.7.1" + acorn-import-assertions: "npm:^1.9.0" + browserslist: "npm:^4.21.10" + chrome-trace-event: "npm:^1.0.2" + enhanced-resolve: "npm:^5.15.0" + es-module-lexer: "npm:^1.2.1" + eslint-scope: "npm:5.1.1" + events: "npm:^3.2.0" + glob-to-regexp: "npm:^0.4.1" + graceful-fs: "npm:^4.2.9" + json-parse-even-better-errors: "npm:^2.3.1" + loader-runner: "npm:^4.2.0" + mime-types: "npm:^2.1.27" + neo-async: "npm:^2.6.2" + schema-utils: "npm:^3.2.0" + tapable: "npm:^2.1.1" + terser-webpack-plugin: "npm:^5.3.10" + watchpack: "npm:^2.4.0" + webpack-sources: "npm:^3.2.3" + peerDependenciesMeta: + webpack-cli: + optional: true + bin: + webpack: bin/webpack.js + checksum: 10/7ff6286be54e00b2580274d8009b014fd03c6d8ade898434376c739e460da1f3a63a51006966024710061f440d6723813365b8a54ae6bcb93b94867c42cf017e + languageName: node + linkType: hard + +"webpack@npm:5.90.2": + version: 5.90.2 + resolution: "webpack@npm:5.90.2" + 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/4eaeed1255c9c7738921c4ce4facdb3b78dbfcb3441496942f6d160a41fbcebd24fb2c6dbb64739b357c5ff78e5a298f6c82eca482438b95130a3ba4e16d084a + languageName: node + linkType: hard + "websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4": version: 0.7.4 resolution: "websocket-driver@npm:0.7.4"