diff --git a/.betterer.results b/.betterer.results index ecfdfcd3111..43127440a4e 100644 --- a/.betterer.results +++ b/.betterer.results @@ -1689,97 +1689,6 @@ exports[`better eslint`] = { "packages/grafana-ui/src/utils/useAsyncDependency.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], - "packages/jaeger-ui-components/src/ScrollManager.tsx:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "Unexpected any. Specify a different type.", "2"] - ], - "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/Scrubber.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"], - [0, 0, 0, "Unexpected any. Specify a different type.", "2"] - ], - "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/render-into-canvas.tsx:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"] - ], - "packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/index.tsx:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"], - [0, 0, 0, "Do not use any type assertions.", "2"], - [0, 0, 0, "Unexpected any. Specify a different type.", "3"], - [0, 0, 0, "Do not use any type assertions.", "4"] - ], - "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], - "packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], - "packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"] - ], - "packages/jaeger-ui-components/src/TraceTimelineViewer/utils.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], - "packages/jaeger-ui-components/src/common/BreakableText.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], - "packages/jaeger-ui-components/src/common/UiFindInput.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"] - ], - "packages/jaeger-ui-components/src/constants/index.tsx:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "Do not use any type assertions.", "2"], - [0, 0, 0, "Do not use any type assertions.", "3"], - [0, 0, 0, "Do not use any type assertions.", "4"] - ], - "packages/jaeger-ui-components/src/constants/tag-keys.tsx:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "Do not use any type assertions.", "2"] - ], - "packages/jaeger-ui-components/src/keyboard-shortcuts.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"] - ], - "packages/jaeger-ui-components/src/model/link-patterns.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"], - [0, 0, 0, "Unexpected any. Specify a different type.", "2"], - [0, 0, 0, "Unexpected any. Specify a different type.", "3"], - [0, 0, 0, "Unexpected any. Specify a different type.", "4"], - [0, 0, 0, "Unexpected any. Specify a different type.", "5"], - [0, 0, 0, "Unexpected any. Specify a different type.", "6"], - [0, 0, 0, "Unexpected any. Specify a different type.", "7"], - [0, 0, 0, "Unexpected any. Specify a different type.", "8"], - [0, 0, 0, "Unexpected any. Specify a different type.", "9"], - [0, 0, 0, "Do not use any type assertions.", "10"], - [0, 0, 0, "Unexpected any. Specify a different type.", "11"], - [0, 0, 0, "Do not use any type assertions.", "12"], - [0, 0, 0, "Unexpected any. Specify a different type.", "13"] - ], - "packages/jaeger-ui-components/src/model/transform-trace-data.tsx:5381": [ - [0, 0, 0, "Do not use any type assertions.", "0"], - [0, 0, 0, "Do not use any type assertions.", "1"], - [0, 0, 0, "Do not use any type assertions.", "2"] - ], - "packages/jaeger-ui-components/src/types/api-error.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], - "packages/jaeger-ui-components/src/types/links.ts:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], - "packages/jaeger-ui-components/src/types/trace.ts:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], - "packages/jaeger-ui-components/src/utils/DraggableManager/types.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], - "packages/jaeger-ui-components/src/utils/date.tsx:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"] - ], "plugins-bundled/internal/input-datasource/src/InputDatasource.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"] @@ -3883,6 +3792,63 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "4"], [0, 0, 0, "Do not use any type assertions.", "5"] ], + "public/app/features/explore/TraceView/components/ScrollManager.tsx:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "Unexpected any. Specify a different type.", "2"] + ], + "public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/Scrubber.tsx:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"], + [0, 0, 0, "Unexpected any. Specify a different type.", "1"], + [0, 0, 0, "Unexpected any. Specify a different type.", "2"] + ], + "public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/render-into-canvas.tsx:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/features/explore/TraceView/components/TraceTimelineViewer/ListView/index.tsx:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.tsx:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"] + ], + "public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.tsx:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"] + ], + "public/app/features/explore/TraceView/components/common/BreakableText.tsx:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"] + ], + "public/app/features/explore/TraceView/components/constants/index.tsx:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/features/explore/TraceView/components/demo/trace-generators.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/features/explore/TraceView/components/model/link-patterns.test.ts:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"], + [0, 0, 0, "Unexpected any. Specify a different type.", "1"] + ], + "public/app/features/explore/TraceView/components/model/link-patterns.tsx:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"], + [0, 0, 0, "Unexpected any. Specify a different type.", "1"], + [0, 0, 0, "Unexpected any. Specify a different type.", "2"], + [0, 0, 0, "Unexpected any. Specify a different type.", "3"], + [0, 0, 0, "Unexpected any. Specify a different type.", "4"], + [0, 0, 0, "Unexpected any. Specify a different type.", "5"], + [0, 0, 0, "Unexpected any. Specify a different type.", "6"], + [0, 0, 0, "Unexpected any. Specify a different type.", "7"], + [0, 0, 0, "Unexpected any. Specify a different type.", "8"], + [0, 0, 0, "Unexpected any. Specify a different type.", "9"], + [0, 0, 0, "Do not use any type assertions.", "10"], + [0, 0, 0, "Unexpected any. Specify a different type.", "11"], + [0, 0, 0, "Do not use any type assertions.", "12"], + [0, 0, 0, "Unexpected any. Specify a different type.", "13"] + ], + "public/app/features/explore/TraceView/components/model/transform-trace-data.tsx:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/features/explore/TraceView/components/types/trace.ts:5381": [ + [0, 0, 0, "Unexpected any. Specify a different type.", "0"] + ], "public/app/features/explore/TraceView/createSpanLink.tsx:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"] diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8a118e42a87..fd06ecb38d9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -306,7 +306,6 @@ WORKFLOW.md @torkelo /packages/grafana-ui/src/components/TimeSeries/ @grafana/grafana-bi-squad /packages/grafana-ui/src/components/uPlot/ @grafana/grafana-bi-squad /packages/grafana-ui/src/utils/storybook/ @grafana/plugins-platform-frontend -/packages/jaeger-ui-components// @grafana/observability-traces-and-profiling /packages/grafana-data/src/**/*logs* @grafana/observability-logs /plugins-bundled/ @grafana/plugins-platform-frontend @@ -436,6 +435,8 @@ lerna.json @grafana/frontend-ops /public/app/features/explore/Logs.tsx @grafana/observability-logs /public/app/features/explore/LogsContainer.tsx @grafana/observability-logs +/public/app/features/explore/TraceView/ @grafana/observability-traces-and-profiling + /public/api-merged.json @grafana/backend-platform /public/api-spec.json @grafana/backend-platform /public/openapi3.json @grafana/backend-platform diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 1ed4455944f..a828336afbd 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -5,7 +5,6 @@ "enabledManagers": ["npm"], "ignoreDeps": [ "@types/systemjs", - "@types/react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead "commander", // we are planning to remove this, so no need to update it "execa", // we should bump this once we move to esm modules "history", // we should bump this together with react-router-dom @@ -13,7 +12,6 @@ "monaco-editor", // due to us exposing this via @grafana/ui/CodeEditor's props bumping can break plugins "node-fetch", // we should bump this once we move to esm modules "react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins - "react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead "react-redux", // react-beautiful-dnd depends on react-redux 7.x, we need to update that one first "react-router-dom", // we should bump this together with history "systemjs", diff --git a/LICENSING.md b/LICENSING.md index 7b64973e012..696cf188f9b 100644 --- a/LICENSING.md +++ b/LICENSING.md @@ -15,7 +15,6 @@ packages/grafana-e2e-selectors/ packages/grafana-runtime/ packages/grafana-toolkit/ packages/grafana-ui/ -packages/jaeger-ui-components/ packaging/ kinds/ pkg/kinds/ @@ -23,6 +22,7 @@ pkg/kindsys/ pkg/registry/corekind/ grafana-mixin/ public/app/plugins/datasource/tempo +public/app/features/explore/TraceView/components public/img/icons/solid/ public/img/icons/unicons/ ``` diff --git a/package.json b/package.json index 1b21000680c..49d08cba814 100644 --- a/package.json +++ b/package.json @@ -178,6 +178,7 @@ "babel-plugin-macros": "3.1.0", "blob-polyfill": "7.0.20220408", "browserslist": "^4.21.4", + "chance": "^1.0.10", "codeowners": "^5.1.1", "copy-webpack-plugin": "9.0.1", "css-loader": "6.7.1", @@ -270,7 +271,6 @@ "@grafana/scenes": "latest", "@grafana/schema": "workspace:*", "@grafana/ui": "workspace:*", - "@jaegertracing/jaeger-ui-components": "workspace:*", "@kusto/monaco-kusto": "5.3.6", "@leeoniya/ufuzzy": "0.9.1", "@lezer/common": "1.0.1", @@ -315,6 +315,7 @@ "calculate-size": "1.1.1", "centrifuge": "3.1.0", "classnames": "2.3.2", + "combokeys": "^3.0.0", "comlink": "4.3.1", "common-tags": "1.8.2", "core-js": "3.27.1", @@ -338,12 +339,14 @@ "immutable": "4.2.2", "jquery": "3.6.1", "js-yaml": "^4.1.0", + "json-markup": "^1.1.0", "json-source-map": "0.6.1", "jsurl": "^0.1.5", "kbar": "0.1.0-beta.36", "lodash": "4.17.21", "logfmt": "^1.3.2", "lru-cache": "7.14.0", + "lru-memoize": "^1.1.0", "memoize-one": "6.0.0", "moment": "2.29.4", "moment-timezone": "0.5.38", @@ -409,6 +412,7 @@ "tether-drop": "https://github.com/torkelo/drop", "tinycolor2": "1.4.2", "tslib": "2.4.1", + "tween-functions": "^1.2.0", "uplot": "1.6.24", "uuid": "9.0.0", "vendor": "link:./public/vendor", diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json deleted file mode 100644 index 8984f23da5d..00000000000 --- a/packages/jaeger-ui-components/package.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "name": "@jaegertracing/jaeger-ui-components", - "version": "9.4.0-pre", - "main": "src/index.ts", - "types": "src/index.ts", - "license": "Apache-2.0", - "private": true, - "scripts": { - "typecheck": "tsc --noEmit" - }, - "devDependencies": { - "@grafana/tsconfig": "^1.2.0-rc1", - "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "12.1.4", - "@testing-library/user-event": "14.4.3", - "@types/deep-freeze": "^0.1.1", - "@types/hoist-non-react-statics": "^3.3.1", - "@types/jest": "29.2.3", - "@types/lodash": "4.14.187", - "@types/prop-types": "15.7.5", - "@types/react": "17.0.42", - "@types/react-icons": "2.2.7", - "@types/sinon": "^10.0.13", - "@types/slate-react": "0.22.9", - "@types/testing-library__jest-dom": "5.14.5", - "@types/tinycolor2": "1.4.3", - "sinon": "14.0.1", - "typescript": "4.8.4" - }, - "dependencies": { - "@emotion/css": "11.10.5", - "@grafana/data": "9.4.0-pre", - "@grafana/e2e-selectors": "9.4.0-pre", - "@grafana/runtime": "9.4.0-pre", - "@grafana/ui": "9.4.0-pre", - "chance": "^1.0.10", - "classnames": "^2.2.5", - "combokeys": "^3.0.0", - "copy-to-clipboard": "^3.1.0", - "deep-freeze": "^0.0.1", - "fuzzy": "^0.1.3", - "hoist-non-react-statics": "^3.3.2", - "json-markup": "^1.1.0", - "lodash": "4.17.21", - "lru-memoize": "^1.1.0", - "memoize-one": "6.0.0", - "moment": "2.29.4", - "moment-timezone": "0.5.38", - "prop-types": "15.8.1", - "react": "17.0.2", - "react-dom": "17.0.2", - "react-icons": "2.2.7", - "reselect": "4.1.6", - "tinycolor2": "1.4.2", - "tslib": "2.4.1", - "tween-functions": "^1.2.0" - } -} diff --git a/packages/jaeger-ui-components/src/common/NewWindowIcon.test.tsx b/packages/jaeger-ui-components/src/common/NewWindowIcon.test.tsx deleted file mode 100644 index bde47016e78..00000000000 --- a/packages/jaeger-ui-components/src/common/NewWindowIcon.test.tsx +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2019 Uber Technologies, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import { render } from '@testing-library/react'; -import React from 'react'; - -import NewWindowIcon, { getStyles } from './NewWindowIcon'; - -describe('NewWindowIcon', () => { - it('adds is-large className when props.isLarge is true', () => { - const { container } = render(); - const styles = getStyles(); - expect(container.firstChild).toHaveClass(styles.NewWindowIconLarge); - }); -}); diff --git a/packages/jaeger-ui-components/src/constants/default-config.tsx b/packages/jaeger-ui-components/src/constants/default-config.tsx deleted file mode 100644 index 5dfe3420920..00000000000 --- a/packages/jaeger-ui-components/src/constants/default-config.tsx +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import deepFreeze from 'deep-freeze'; - -import { FALLBACK_DAG_MAX_NUM_SERVICES } from './index'; - -export default deepFreeze( - Object.defineProperty( - { - archiveEnabled: false, - dependencies: { - dagMaxNumServices: FALLBACK_DAG_MAX_NUM_SERVICES, - menuEnabled: true, - }, - linkPatterns: [], - menu: [ - { - label: 'About Jaeger', - items: [ - { - label: 'GitHub', - url: 'https://github.com/uber/jaeger', - }, - { - label: 'Docs', - url: 'http://jaeger.readthedocs.io/en/latest/', - }, - { - label: 'Twitter', - url: 'https://twitter.com/JaegerTracing', - }, - { - label: 'Discussion Group', - url: 'https://groups.google.com/forum/#!forum/jaeger-tracing', - }, - { - label: 'Gitter.im', - url: 'https://gitter.im/jaegertracing/Lobby', - }, - { - label: 'Blog', - url: 'https://medium.com/jaegertracing/', - }, - ], - }, - ], - search: { - maxLookback: { - label: '2 Days', - value: '2d', - }, - maxLimit: 1500, - }, - tracking: { - gaID: null, - trackErrors: true, - }, - }, - // fields that should be individually merged vs wholesale replaced - '__mergeFields', - { value: ['dependencies', 'search', 'tracking'] } - ) -); - -export const deprecations = [ - { - formerKey: 'dependenciesMenuEnabled', - currentKey: 'dependencies.menuEnabled', - }, - { - formerKey: 'gaTrackingID', - currentKey: 'tracking.gaID', - }, -]; diff --git a/packages/jaeger-ui-components/src/types/TDdgState.tsx b/packages/jaeger-ui-components/src/types/TDdgState.tsx deleted file mode 100644 index f1aba58ac7c..00000000000 --- a/packages/jaeger-ui-components/src/types/TDdgState.tsx +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2019 Uber Technologies, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import { fetchedState } from '../constants'; -import { TDdgModel } from '../model/ddg/types'; - -import { ApiError } from './api-error'; - -export type TDdgStateEntry = - | { - state: typeof fetchedState.LOADING; - } - | { - error: ApiError; - state: typeof fetchedState.ERROR; - } - | { - model: TDdgModel; - state: typeof fetchedState.DONE; - viewModifiers: Map; - }; - -type TDdgState = Record; - -// eslint-disable-next-line no-undef -export default TDdgState; diff --git a/packages/jaeger-ui-components/src/types/embedded.tsx b/packages/jaeger-ui-components/src/types/embedded.tsx deleted file mode 100644 index e7f87776df5..00000000000 --- a/packages/jaeger-ui-components/src/types/embedded.tsx +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2018 Uber Technologies, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -type EmbeddedStateV0 = { - version: 'v0'; - searchHideGraph: boolean; - timeline: { - collapseTitle: boolean; - hideMinimap: boolean; - hideSummary: boolean; - }; -}; - -export type EmbeddedState = EmbeddedStateV0; diff --git a/packages/jaeger-ui-components/src/types/search.tsx b/packages/jaeger-ui-components/src/types/search.tsx deleted file mode 100644 index 380d4316ddc..00000000000 --- a/packages/jaeger-ui-components/src/types/search.tsx +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) 2017 Uber Technologies, Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import { TNil } from '.'; - -export type SearchQuery = { - end: number | string; - limit: number | string; - lookback: string; - maxDuration: null | string; - minDuration: null | string; - operation: string | TNil; - service: string; - start: number | string; - tags: string | TNil; -}; - -/** - * Type used to summarize traces for the search page. - */ -export type TraceSummary = { - /** - * Duration of trace in milliseconds. - */ - duration: number; - /** - * Start time of trace in milliseconds. - */ - timestamp: number; - traceName: string; - traceID: string; - numberOfErredSpans: number; - numberOfSpans: number; - services: Array<{ name: string; numberOfSpans: number }>; -}; - -export type TraceSummaries = { - /** - * Duration of longest trace in `traces` in milliseconds. - */ - maxDuration: number; - traces: TraceSummary[]; -}; diff --git a/packages/jaeger-ui-components/tsconfig.json b/packages/jaeger-ui-components/tsconfig.json deleted file mode 100644 index 83f4d88d032..00000000000 --- a/packages/jaeger-ui-components/tsconfig.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": ".", - "allowJs": true, - "jsx": "react" - }, - "exclude": ["dist", "node_modules"], - "extends": "@grafana/tsconfig", - "include": [ - "src/**/*.ts*", - "typings", - "../../public/app/types/jquery/*.ts", - "../../public/app/types/*.d.ts", - "../grafana-ui/src/types/*.d.ts" - ] -} diff --git a/public/app/features/dashboard/containers/DashboardPage.test.tsx b/public/app/features/dashboard/containers/DashboardPage.test.tsx index 32a0e5f9bc5..f34e450863c 100644 --- a/public/app/features/dashboard/containers/DashboardPage.test.tsx +++ b/public/app/features/dashboard/containers/DashboardPage.test.tsx @@ -63,10 +63,6 @@ jest.mock('react-virtualized-auto-sizer', () => { return ({ children }: AutoSizerProps) => children({ height: 1, width: 1 }); }); -// the mock below gets rid of this warning from recompose: -// Warning: React.createFactory() is deprecated and will be removed in a future major release. Consider using JSX or use React.createElement() directly instead. -jest.mock('@jaegertracing/jaeger-ui-components', () => ({})); - interface ScenarioContext { dashboard?: DashboardModel | null; container?: HTMLElement; diff --git a/public/app/features/explore/TraceView/TraceView.test.tsx b/public/app/features/explore/TraceView/TraceView.test.tsx index 89e1b7adc82..da19941910e 100644 --- a/public/app/features/explore/TraceView/TraceView.test.tsx +++ b/public/app/features/explore/TraceView/TraceView.test.tsx @@ -1,5 +1,3 @@ -import { TopOfViewRefType } from '@jaegertracing/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView'; -import { TraceData, TraceSpanData } from '@jaegertracing/jaeger-ui-components/src/types/trace'; import { render, prettyDOM, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React, { createRef } from 'react'; @@ -12,6 +10,8 @@ import { ExploreId } from 'app/types'; import { configureStore } from '../../../store/configureStore'; import { TraceView } from './TraceView'; +import { TopOfViewRefType } from './components/TraceTimelineViewer/VirtualizedTraceView'; +import { TraceData, TraceSpanData } from './components/types/trace'; import { transformDataFrames } from './utils/transform'; function getTraceView(frames: DataFrame[]) { @@ -23,7 +23,7 @@ function getTraceView(frames: DataFrame[]) { }; const topOfViewRef = createRef(); - const traceView = ( + return ( ); - return traceView; } function renderTraceView(frames = [frameOld]) { diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx index b89588bd0e4..11badf9eca6 100644 --- a/public/app/features/explore/TraceView/TraceView.tsx +++ b/public/app/features/explore/TraceView/TraceView.tsx @@ -1,5 +1,4 @@ import { css } from '@emotion/css'; -import { TopOfViewRefType } from '@jaegertracing/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView'; import React, { RefObject, useCallback, useMemo, useState } from 'react'; import { @@ -17,13 +16,6 @@ import { import { getTemplateSrv } from '@grafana/runtime'; import { DataQuery } from '@grafana/schema'; import { useStyles2 } from '@grafana/ui'; -import { - SpanBarOptionsData, - Trace, - TracePageHeader, - TraceTimelineViewer, - TTraceTimeline, -} from '@jaegertracing/jaeger-ui-components'; import { getTraceToLogsOptions, TraceToLogsData } from 'app/core/components/TraceToLogs/TraceToLogsSettings'; import { TraceToMetricsData } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; @@ -34,6 +26,8 @@ import { ExploreId } from 'app/types/explore'; import { changePanelState } from '../state/explorePane'; +import { SpanBarOptionsData, Trace, TracePageHeader, TraceTimelineViewer, TTraceTimeline } from './components'; +import { TopOfViewRefType } from './components/TraceTimelineViewer/VirtualizedTraceView'; import { createSpanLinkFactory } from './createSpanLink'; import { useChildrenState } from './useChildrenState'; import { useDetailState } from './useDetailState'; diff --git a/public/app/features/explore/TraceView/TraceViewContainer.tsx b/public/app/features/explore/TraceView/TraceViewContainer.tsx index 1d908a0ed64..d0fad09498e 100644 --- a/public/app/features/explore/TraceView/TraceViewContainer.tsx +++ b/public/app/features/explore/TraceView/TraceViewContainer.tsx @@ -1,5 +1,3 @@ -import TracePageSearchBar from '@jaegertracing/jaeger-ui-components/src/TracePageHeader/TracePageSearchBar'; -import { TopOfViewRefType } from '@jaegertracing/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView'; import React, { RefObject, useMemo, useState } from 'react'; import { DataFrame, SplitOpen, PanelData } from '@grafana/data'; @@ -8,6 +6,8 @@ import { StoreState, useSelector } from 'app/types'; import { ExploreId } from 'app/types/explore'; import { TraceView } from './TraceView'; +import TracePageSearchBar from './components/TracePageHeader/TracePageSearchBar'; +import { TopOfViewRefType } from './components/TraceTimelineViewer/VirtualizedTraceView'; import { useSearch } from './useSearch'; import { transformDataFrames } from './utils/transform'; interface Props { diff --git a/packages/jaeger-ui-components/LICENSE_APACHE2 b/public/app/features/explore/TraceView/components/LICENSE_APACHE2 similarity index 100% rename from packages/jaeger-ui-components/LICENSE_APACHE2 rename to public/app/features/explore/TraceView/components/LICENSE_APACHE2 diff --git a/packages/jaeger-ui-components/src/ScrollManager.test.ts b/public/app/features/explore/TraceView/components/ScrollManager.test.ts similarity index 99% rename from packages/jaeger-ui-components/src/ScrollManager.test.ts rename to public/app/features/explore/TraceView/components/ScrollManager.test.ts index 7f7e1368279..3be8a64327e 100644 --- a/packages/jaeger-ui-components/src/ScrollManager.test.ts +++ b/public/app/features/explore/TraceView/components/ScrollManager.test.ts @@ -14,9 +14,8 @@ jest.mock('./scroll-page'); -import traceGenerator from '../src/demo/trace-generators'; - import ScrollManager, { Accessors } from './ScrollManager'; +import traceGenerator from './demo/trace-generators'; import { scrollBy, scrollTo } from './scroll-page'; import { Trace, TraceSpanData, TraceSpanReference } from './types/trace'; diff --git a/packages/jaeger-ui-components/src/ScrollManager.tsx b/public/app/features/explore/TraceView/components/ScrollManager.tsx similarity index 100% rename from packages/jaeger-ui-components/src/ScrollManager.tsx rename to public/app/features/explore/TraceView/components/ScrollManager.tsx diff --git a/packages/jaeger-ui-components/src/Theme.tsx b/public/app/features/explore/TraceView/components/Theme.tsx similarity index 100% rename from packages/jaeger-ui-components/src/Theme.tsx rename to public/app/features/explore/TraceView/components/Theme.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/CanvasSpanGraph.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/CanvasSpanGraph.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/CanvasSpanGraph.test.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/CanvasSpanGraph.test.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/CanvasSpanGraph.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/CanvasSpanGraph.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/CanvasSpanGraph.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/CanvasSpanGraph.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/GraphTicks.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/GraphTicks.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/GraphTicks.test.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/GraphTicks.test.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/GraphTicks.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/GraphTicks.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/GraphTicks.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/GraphTicks.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/Scrubber.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/Scrubber.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/Scrubber.test.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/Scrubber.test.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/Scrubber.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/Scrubber.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/Scrubber.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/Scrubber.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/TickLabels.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/TickLabels.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/TickLabels.test.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/TickLabels.test.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/TickLabels.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/TickLabels.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/TickLabels.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/TickLabels.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/ViewingLayer.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/ViewingLayer.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/ViewingLayer.test.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/ViewingLayer.test.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/ViewingLayer.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/ViewingLayer.tsx similarity index 99% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/ViewingLayer.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/ViewingLayer.tsx index eb2277c1b3d..a8a12ac1e64 100644 --- a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/ViewingLayer.tsx +++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/ViewingLayer.tsx @@ -19,8 +19,8 @@ import * as React from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { withTheme2, stylesFactory, Button } from '@grafana/ui'; -import { TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate, TNil } from '../..'; import { autoColor } from '../../Theme'; +import { TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate, TNil } from '../../index'; import DraggableManager, { DraggableBounds, DraggingUpdate, EUpdateTypes } from '../../utils/DraggableManager'; import GraphTicks from './GraphTicks'; diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/index.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.test.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/index.test.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/index.tsx similarity index 97% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/index.tsx index 3a1a0275e72..f7c05fa723a 100644 --- a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.tsx +++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/index.tsx @@ -16,8 +16,8 @@ import cx from 'classnames'; import memoizeOne from 'memoize-one'; import * as React from 'react'; -import { TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate } from '../..'; -import { TraceSpan, Trace } from '../../types/trace'; +import { TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate } from '../../index'; +import { TraceSpan, Trace } from '../../types'; import { ubPb2, ubPx2, ubRelative } from '../../uberUtilityStyles'; import CanvasSpanGraph from './CanvasSpanGraph'; diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/render-into-canvas.test.ts b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/render-into-canvas.test.ts similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/render-into-canvas.test.ts rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/render-into-canvas.test.ts diff --git a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/render-into-canvas.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/render-into-canvas.tsx similarity index 98% rename from packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/render-into-canvas.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/render-into-canvas.tsx index 32f1ac8afba..a6fe5f0cebb 100644 --- a/packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/render-into-canvas.tsx +++ b/public/app/features/explore/TraceView/components/TracePageHeader/SpanGraph/render-into-canvas.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TNil } from '../..'; +import { TNil } from '../../index'; // exported for tests export const ITEM_ALPHA = 0.8; diff --git a/packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.test.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.test.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.test.tsx diff --git a/packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.tsx b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx similarity index 97% rename from packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.tsx rename to public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx index a18fb38e213..1a7af88ca81 100644 --- a/packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.tsx +++ b/public/app/features/explore/TraceView/components/TracePageHeader/TracePageHeader.tsx @@ -16,18 +16,17 @@ import { css } from '@emotion/css'; import cx from 'classnames'; import { get as _get, maxBy as _maxBy, values as _values } from 'lodash'; import * as React from 'react'; -import MdKeyboardArrowRight from 'react-icons/lib/md/keyboard-arrow-right'; import { dateTimeFormat, GrafanaTheme2, TimeZone } from '@grafana/data'; -import { useStyles2 } from '@grafana/ui'; +import { Icon, useStyles2 } from '@grafana/ui'; -import { autoColor, TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate } from '..'; import ExternalLinks from '../common/ExternalLinks'; import LabeledList from '../common/LabeledList'; import TraceName from '../common/TraceName'; +import { autoColor, TUpdateViewRangeTimeFunction, ViewRange, ViewRangeTimeUpdate } from '../index'; import { getTraceLinks } from '../model/link-patterns'; import { getTraceName } from '../model/trace-viewer'; -import { Trace } from '../types/trace'; +import { Trace } from '../types'; import { uTxMuted } from '../uberUtilityStyles'; import { formatDuration } from '../utils/date'; @@ -247,7 +246,8 @@ export default function TracePageHeader(props: TracePageHeaderEmbedProps) { role="switch" aria-checked={!slimView} > - { this._htmlTopOffset = -1; this._windowScrollListenerAdded = false; // _htmlElm is only relevant if props.windowScroller is true + // eslint-disable-next-line this._htmlElm = document.documentElement as any; this._wrapperElm = undefined; this._itemHolderElm = undefined; @@ -378,6 +379,7 @@ export default class ListView extends React.Component { const nodes = this._itemHolderElm.childNodes; const max = nodes.length; for (let i = 0; i < max; i++) { + // eslint-disable-next-line const node: HTMLElement = nodes[i] as any; // use `.getAttribute(...)` instead of `.dataset` for jest / JSDOM const itemKey = node.getAttribute('data-item-key'); diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.tsx similarity index 98% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.tsx index aca8cee5b5f..ebf46d12f1b 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBar.tsx @@ -23,8 +23,7 @@ import { useStyles2 } from '@grafana/ui'; import { autoColor } from '../Theme'; import { Popover } from '../common/Popover'; -import { TNil } from '../types'; -import { TraceSpan } from '../types/trace'; +import { TraceSpan, TNil } from '../types'; import AccordianLogs from './SpanDetail/AccordianLogs'; import { ViewedBoundsFunctionType } from './utils'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.test.tsx similarity index 98% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.test.tsx index 23d684fdcd7..a1ef4b8296d 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.test.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.test.tsx @@ -15,10 +15,10 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { SpanLinks } from 'src/types/links'; -import { TraceSpan } from 'src/types/trace'; import { NONE, DURATION, TAG } from '../settings/SpanBarSettings'; +import { TraceSpan } from '../types'; +import { SpanLinks } from '../types/links'; import SpanBarRow, { SpanBarRowProps } from './SpanBarRow'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx similarity index 97% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx index ca2e19992bd..29ad671870e 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanBarRow.tsx @@ -15,17 +15,14 @@ import { css, keyframes } from '@emotion/css'; import cx from 'classnames'; import * as React from 'react'; -import IoAlert from 'react-icons/lib/io/alert'; -import IoArrowRightA from 'react-icons/lib/io/arrow-right-a'; import { GrafanaTheme2, TraceKeyValuePair } from '@grafana/data'; -import { stylesFactory, withTheme2 } from '@grafana/ui'; +import { Icon, stylesFactory, withTheme2 } from '@grafana/ui'; import { autoColor } from '../Theme'; import { DURATION, NONE, TAG } from '../settings/SpanBarSettings'; -import { SpanBarOptions, SpanLinkFunc, TNil } from '../types'; +import { SpanBarOptions, SpanLinkFunc, TraceSpan, TNil } from '../types'; import { SpanLinks } from '../types/links'; -import { TraceSpan } from '../types/trace'; import SpanBar from './SpanBar'; import { SpanLinksMenu } from './SpanLinks'; @@ -43,13 +40,13 @@ const nameColumnClassName = 'nameColumn'; const getStyles = stylesFactory((theme: GrafanaTheme2) => { const animations = { + label: 'flash', flash: keyframes` - label: flash; from { background-color: ${autoColor(theme, '#68b9ff')}; } to { - background-color: default; + background-color: 'default'; } `, }; @@ -458,7 +455,8 @@ export class UnthemedSpanBarRow extends React.PureComponent { })} > {showErrorIcon && ( - { {serviceName}{' '} {rpc && ( - + {' '} + {rpc.serviceName} )} {noInstrumentedServer && ( - {' '} + {' '} {noInstrumentedServer.serviceName} diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.markers.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.markers.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.markers.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.markers.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx similarity index 92% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx index 66db2f97d76..dfc31d55f8d 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx @@ -15,15 +15,12 @@ import { css } from '@emotion/css'; import cx from 'classnames'; import * as React from 'react'; -import IoIosArrowDown from 'react-icons/lib/io/ios-arrow-down'; -import IoIosArrowRight from 'react-icons/lib/io/ios-arrow-right'; import { GrafanaTheme2 } from '@grafana/data'; -import { useStyles2 } from '@grafana/ui'; +import { Icon, useStyles2 } from '@grafana/ui'; import { autoColor } from '../../Theme'; -import { TNil } from '../../types'; -import { TraceKeyValuePair, TraceLink } from '../../types/trace'; +import { TraceKeyValuePair, TraceLink, TNil } from '../../types'; import { uAlignIcon, uTxEllipsis } from '../../uberUtilityStyles'; import * as markers from './AccordianKeyValues.markers'; @@ -132,7 +129,11 @@ export default function AccordianKeyValues(props: AccordianKeyValuesProps) { let arrow: React.ReactNode | null = null; let headerProps: {} | null = null; if (interactive) { - arrow = isOpen ? : ; + arrow = isOpen ? ( + + ) : ( + + ); headerProps = { 'aria-checked': isOpen, onClick: isEmpty ? null : onToggle, diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx similarity index 93% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx index 72409092a1f..2eb8abefad3 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx @@ -15,11 +15,9 @@ import { css } from '@emotion/css'; import { sortBy as _sortBy } from 'lodash'; import * as React from 'react'; -import IoIosArrowDown from 'react-icons/lib/io/ios-arrow-down'; -import IoIosArrowRight from 'react-icons/lib/io/ios-arrow-right'; import { GrafanaTheme2 } from '@grafana/data'; -import { useStyles2 } from '@grafana/ui'; +import { Icon, useStyles2 } from '@grafana/ui'; import { autoColor } from '../../Theme'; import { TNil } from '../../types'; @@ -77,7 +75,11 @@ export default function AccordianLogs(props: AccordianLogsProps) { let HeaderComponent: 'span' | 'a' = 'span'; let headerProps: {} | null = null; if (interactive) { - arrow = isOpen ? : ; + arrow = isOpen ? ( + + ) : ( + + ); HeaderComponent = 'a'; headerProps = { 'aria-checked': isOpen, diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianReferences.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianReferences.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx similarity index 96% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx index 3d4defe5cf6..24bf571ba9a 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianReferences.tsx @@ -14,8 +14,6 @@ import { css, cx } from '@emotion/css'; import * as React from 'react'; -import IoIosArrowDown from 'react-icons/lib/io/ios-arrow-down'; -import IoIosArrowRight from 'react-icons/lib/io/ios-arrow-right'; import { Field, GrafanaTheme2, LinkModel } from '@grafana/data'; import { Icon, useStyles2 } from '@grafana/ui'; @@ -199,7 +197,11 @@ const AccordianReferences: React.FC = ({ let HeaderComponent: 'span' | 'a' = 'span'; let headerProps: {} | null = null; if (interactive) { - arrow = isOpen ? : ; + arrow = isOpen ? ( + + ) : ( + + ); HeaderComponent = 'a'; headerProps = { 'aria-checked': isOpen, diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianText.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianText.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianText.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianText.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianText.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianText.tsx similarity index 91% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianText.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianText.tsx index c7bbb516562..bcc2d6fa886 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianText.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/AccordianText.tsx @@ -15,11 +15,9 @@ import { css } from '@emotion/css'; import cx from 'classnames'; import * as React from 'react'; -import IoIosArrowDown from 'react-icons/lib/io/ios-arrow-down'; -import IoIosArrowRight from 'react-icons/lib/io/ios-arrow-right'; import { GrafanaTheme2 } from '@grafana/data'; -import { useStyles2 } from '@grafana/ui'; +import { Icon, useStyles2 } from '@grafana/ui'; import { autoColor } from '../../Theme'; import { TNil } from '../../types'; @@ -76,7 +74,11 @@ export default function AccordianText(props: AccordianTextProps) { let arrow: React.ReactNode | null = null; let headerProps: {} | null = null; if (interactive) { - arrow = isOpen ? : ; + arrow = isOpen ? ( + + ) : ( + + ); headerProps = { 'aria-checked': isOpen, onClick: isEmpty ? null : onToggle, diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/DetailState.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/DetailState.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/DetailState.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/DetailState.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx similarity index 97% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx index ec5ad19b68e..df3675a3d2c 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx @@ -22,8 +22,7 @@ import { Icon, useStyles2 } from '@grafana/ui'; import { autoColor } from '../../Theme'; import CopyIcon from '../../common/CopyIcon'; -import { TNil } from '../../types'; -import { TraceKeyValuePair, TraceLink } from '../../types/trace'; +import { TraceKeyValuePair, TraceLink, TNil } from '../../types'; import { ubInlineBlock, uWidth100 } from '../../uberUtilityStyles'; const copyIconClassName = 'copyIcon'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/TextList.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/TextList.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/TextList.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/TextList.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/TextList.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/TextList.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/TextList.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/TextList.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx similarity index 99% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx index 081ec6bab28..260ec358c33 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.test.tsx @@ -17,10 +17,10 @@ jest.mock('../utils'); import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { TraceSpanReference } from 'src/types/trace'; import traceGenerator from '../../demo/trace-generators'; import transformTraceData from '../../model/transform-trace-data'; +import { TraceSpanReference } from '../../types/trace'; import { formatDuration } from '../utils'; import DetailState from './DetailState'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx similarity index 98% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx index 7842adf0929..f11a77dc230 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetail/index.tsx @@ -15,11 +15,10 @@ import { css } from '@emotion/css'; import cx from 'classnames'; import React from 'react'; -import IoLink from 'react-icons/lib/io/link'; import { dateTimeFormat, GrafanaTheme2, LinkModel, TimeZone } from '@grafana/data'; import { config, reportInteraction } from '@grafana/runtime'; -import { Button, DataLinkButton, TextArea, useStyles2 } from '@grafana/ui'; +import { Button, DataLinkButton, Icon, TextArea, useStyles2 } from '@grafana/ui'; import { autoColor } from '../../Theme'; import { Divider } from '../../common/Divider'; @@ -344,7 +343,7 @@ export default function SpanDetail(props: SpanDetailProps) { } }} > - + {spanID} diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanDetailRow.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanLinks.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanLinks.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanLinks.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanLinks.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanTreeOffset.test.tsx similarity index 99% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanTreeOffset.test.tsx index f9b91ef0899..a20f35688c6 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.test.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanTreeOffset.test.tsx @@ -15,10 +15,10 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { TraceSpan } from 'src/types/trace'; import { createTheme } from '@grafana/data'; +import { TraceSpan } from '../types'; import spanAncestorIdsSpy from '../utils/span-ancestor-ids'; import SpanTreeOffset, { getStyles, TProps } from './SpanTreeOffset'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanTreeOffset.tsx similarity index 94% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanTreeOffset.tsx index 149252a2f77..452389a5572 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/SpanTreeOffset.tsx @@ -16,14 +16,12 @@ import { css } from '@emotion/css'; import cx from 'classnames'; import { get as _get } from 'lodash'; import React from 'react'; -import IoChevronRight from 'react-icons/lib/io/chevron-right'; -import IoIosArrowDown from 'react-icons/lib/io/ios-arrow-down'; import { GrafanaTheme2 } from '@grafana/data'; -import { stylesFactory, withTheme2 } from '@grafana/ui'; +import { Icon, stylesFactory, withTheme2 } from '@grafana/ui'; import { autoColor } from '../Theme'; -import { TraceSpan } from '../types/trace'; +import { TraceSpan } from '../types'; import spanAncestorIds from '../utils/span-ancestor-ids'; export const getStyles = stylesFactory((theme: GrafanaTheme2) => { @@ -142,9 +140,9 @@ export class UnthemedSpanTreeOffset extends React.PureComponent { showChildrenIcon && hasChildren && (childrenVisible ? ( - + ) : ( - + )); const styles = getStyles(theme); return ( diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/Ticks.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/Ticks.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/Ticks.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/Ticks.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/Ticks.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/Ticks.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/Ticks.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/Ticks.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx similarity index 99% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx index d8be774af0f..6e58221feb4 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.tsx @@ -178,7 +178,6 @@ export default class TimelineColumnResizer extends React.PureComponent< if (this._dragManager.isDragging() && this._rootElm && dragPosition != null) { isDraggingLeft = dragPosition < position; isDraggingRight = dragPosition > position; - left = `${dragPosition * 100}%`; // Draw a highlight from the current dragged position back to the original // position, e.g. highlight the change. Draw the highlight via `left` and // `right` css styles (simpler than using `width`). diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.tsx similarity index 99% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.tsx index adfb8624894..273c1123ecf 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.tsx @@ -85,7 +85,7 @@ export type TimelineViewingLayerProps = { * bounds for dragging need to be recalculated. In practice, the name column * width serves fine for this. */ - boundsInvalidator: any | null | undefined; + boundsInvalidator: number | null | undefined; updateNextViewRangeTime: (update: ViewRangeTimeUpdate) => void; updateViewRangeTime: TUpdateViewRangeTimeFunction; viewRangeTime: ViewRangeTime; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/index.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/index.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineHeaderRow/index.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineRow.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineRow.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineRow.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/TimelineRow.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx similarity index 99% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx index f3dab2e1334..e387616ce86 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.test.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.test.tsx @@ -13,10 +13,10 @@ // limitations under the License. import { render, screen } from '@testing-library/react'; import React from 'react'; -import { Trace } from 'src/types/trace'; import traceGenerator from '../demo/trace-generators'; import transformTraceData from '../model/transform-trace-data'; +import { Trace } from '../types'; import SpanTreeOffset from './SpanTreeOffset'; import VirtualizedTraceView, { VirtualizedTraceViewProps } from './VirtualizedTraceView'; diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx similarity index 97% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx index e98caf6460a..994bc9270e0 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView.tsx @@ -16,7 +16,7 @@ import { css } from '@emotion/css'; import { isEqual } from 'lodash'; import memoizeOne from 'memoize-one'; import * as React from 'react'; -import { createRef, RefObject } from 'react'; +import { RefObject } from 'react'; import { GrafanaTheme2, LinkModel, TimeZone } from '@grafana/data'; import { config, reportInteraction } from '@grafana/runtime'; @@ -196,7 +196,6 @@ const memoizedGetClipping = memoizeOne(getClipping, isEqual); // export from tests export class UnthemedVirtualizedTraceView extends React.Component { listView: ListView | TNil; - topTraceViewRef = createRef(); constructor(props: VirtualizedTraceViewProps) { super(props); @@ -210,12 +209,12 @@ export class UnthemedVirtualizedTraceView extends React.Component; - for (let i = 0; i < nextPropKeys.length; i += 1) { - if (nextProps[nextPropKeys[i]] !== this.props[nextPropKeys[i]]) { + let key: keyof VirtualizedTraceViewProps; + for (key in nextProps) { + if (nextProps[key] !== this.props[key]) { // Unless the only change was props.shouldScrollToFirstUiFindMatch changing to false. - if (nextPropKeys[i] === 'shouldScrollToFirstUiFindMatch') { - if (nextProps[nextPropKeys[i]]) { + if (key === 'shouldScrollToFirstUiFindMatch') { + if (nextProps[key]) { return true; } } else { diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/index.test.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/index.test.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/index.test.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/index.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/index.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/index.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/types.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/types.tsx similarity index 100% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/types.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/types.tsx diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/utils.test.ts b/public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.test.ts similarity index 99% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/utils.test.ts rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.test.ts index cbb51960592..50d87b73bc8 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/utils.test.ts +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.test.ts @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TraceSpan } from 'src/types/trace'; - import traceGenerator from '../demo/trace-generators'; +import { TraceSpan } from '../types'; import { findServerChildSpan, diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/utils.tsx b/public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.tsx similarity index 99% rename from packages/jaeger-ui-components/src/TraceTimelineViewer/utils.tsx rename to public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.tsx index caf79e46cd3..bdd9a5887e8 100644 --- a/packages/jaeger-ui-components/src/TraceTimelineViewer/utils.tsx +++ b/public/app/features/explore/TraceView/components/TraceTimelineViewer/utils.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TraceSpan } from '../types/trace'; +import { TraceSpan } from '../types'; export type ViewedBoundsFunctionType = (start: number, end: number) => { start: number; end: number }; /** diff --git a/packages/jaeger-ui-components/src/Tween.test.ts b/public/app/features/explore/TraceView/components/Tween.test.ts similarity index 100% rename from packages/jaeger-ui-components/src/Tween.test.ts rename to public/app/features/explore/TraceView/components/Tween.test.ts diff --git a/packages/jaeger-ui-components/src/Tween.tsx b/public/app/features/explore/TraceView/components/Tween.tsx similarity index 100% rename from packages/jaeger-ui-components/src/Tween.tsx rename to public/app/features/explore/TraceView/components/Tween.tsx diff --git a/packages/jaeger-ui-components/src/common/BreakableText.tsx b/public/app/features/explore/TraceView/components/common/BreakableText.tsx similarity index 97% rename from packages/jaeger-ui-components/src/common/BreakableText.tsx rename to public/app/features/explore/TraceView/components/common/BreakableText.tsx index ad8c4cecb6d..26ad069eb40 100644 --- a/packages/jaeger-ui-components/src/common/BreakableText.tsx +++ b/public/app/features/explore/TraceView/components/common/BreakableText.tsx @@ -43,7 +43,7 @@ export default function BreakableText( const { className, text, wordRegexp = WORD_RX } = props; const styles = useStyles2(getStyles); if (!text) { - return typeof text === 'string' ? text : null; + return null; } const spans = []; wordRegexp.exec(''); diff --git a/packages/jaeger-ui-components/src/common/CopyIcon.test.tsx b/public/app/features/explore/TraceView/components/common/CopyIcon.test.tsx similarity index 90% rename from packages/jaeger-ui-components/src/common/CopyIcon.test.tsx rename to public/app/features/explore/TraceView/components/common/CopyIcon.test.tsx index 9f0101501f1..9e00636459d 100644 --- a/packages/jaeger-ui-components/src/common/CopyIcon.test.tsx +++ b/public/app/features/explore/TraceView/components/common/CopyIcon.test.tsx @@ -13,12 +13,15 @@ // limitations under the License. import { render, screen } from '@testing-library/react'; -import * as copy from 'copy-to-clipboard'; import React from 'react'; import CopyIcon from './CopyIcon'; -jest.mock('copy-to-clipboard'); +Object.assign(navigator, { + clipboard: { + writeText: () => {}, + }, +}); describe('', () => { const props = { @@ -29,7 +32,7 @@ describe('', () => { let copySpy: jest.SpyInstance; beforeAll(() => { - copySpy = jest.spyOn(copy, 'default'); + copySpy = jest.spyOn(navigator.clipboard, 'writeText'); }); beforeEach(() => { diff --git a/packages/jaeger-ui-components/src/common/CopyIcon.tsx b/public/app/features/explore/TraceView/components/common/CopyIcon.tsx similarity index 96% rename from packages/jaeger-ui-components/src/common/CopyIcon.tsx rename to public/app/features/explore/TraceView/components/common/CopyIcon.tsx index 5fb166a7ada..f2d01c21c00 100644 --- a/packages/jaeger-ui-components/src/common/CopyIcon.tsx +++ b/public/app/features/explore/TraceView/components/common/CopyIcon.tsx @@ -14,7 +14,6 @@ import { css } from '@emotion/css'; import cx from 'classnames'; -import copy from 'copy-to-clipboard'; import React, { useState } from 'react'; import { Button, IconName, Tooltip, useStyles2 } from '@grafana/ui'; @@ -48,7 +47,7 @@ export default function CopyIcon(props: PropsType) { const [hasCopied, setHasCopied] = useState(false); const handleClick = () => { - copy(props.copyText); + navigator.clipboard.writeText(props.copyText); setHasCopied(true); }; diff --git a/packages/jaeger-ui-components/src/common/Divider.tsx b/public/app/features/explore/TraceView/components/common/Divider.tsx similarity index 100% rename from packages/jaeger-ui-components/src/common/Divider.tsx rename to public/app/features/explore/TraceView/components/common/Divider.tsx diff --git a/packages/jaeger-ui-components/src/common/ExternalLinks.tsx b/public/app/features/explore/TraceView/components/common/ExternalLinks.tsx similarity index 100% rename from packages/jaeger-ui-components/src/common/ExternalLinks.tsx rename to public/app/features/explore/TraceView/components/common/ExternalLinks.tsx diff --git a/packages/jaeger-ui-components/src/common/LabeledList.tsx b/public/app/features/explore/TraceView/components/common/LabeledList.tsx similarity index 97% rename from packages/jaeger-ui-components/src/common/LabeledList.tsx rename to public/app/features/explore/TraceView/components/common/LabeledList.tsx index 7ce89630e02..58df134c695 100644 --- a/packages/jaeger-ui-components/src/common/LabeledList.tsx +++ b/public/app/features/explore/TraceView/components/common/LabeledList.tsx @@ -28,7 +28,7 @@ const getStyles = (divider: boolean) => (theme: GrafanaTheme2) => { list-style: none; margin: 0; padding: 0; - ${divider === true && + ${divider && ` margin-right: -8px; display: flex; @@ -39,7 +39,7 @@ const getStyles = (divider: boolean) => (theme: GrafanaTheme2) => { LabeledListItem: css` label: LabeledListItem; display: inline-block; - ${divider === true && + ${divider && ` border-right: 1px solid ${autoColor(theme, '#ddd')}; padding: 0 8px; diff --git a/packages/jaeger-ui-components/src/common/NewWindowIcon.tsx b/public/app/features/explore/TraceView/components/common/NewWindowIcon.tsx similarity index 88% rename from packages/jaeger-ui-components/src/common/NewWindowIcon.tsx rename to public/app/features/explore/TraceView/components/common/NewWindowIcon.tsx index 1f5185d5df5..804d10fa03f 100644 --- a/packages/jaeger-ui-components/src/common/NewWindowIcon.tsx +++ b/public/app/features/explore/TraceView/components/common/NewWindowIcon.tsx @@ -15,9 +15,8 @@ import { css } from '@emotion/css'; import cx from 'classnames'; import React from 'react'; -import IoAndroidOpen from 'react-icons/lib/io/android-open'; -import { useStyles2 } from '@grafana/ui'; +import { Icon, useStyles2 } from '@grafana/ui'; export const getStyles = () => { return { @@ -37,7 +36,7 @@ export default function NewWindowIcon(props: Props) { const { isLarge, className, ...rest } = props; const styles = useStyles2(getStyles); const cls = cx({ [styles.NewWindowIconLarge]: isLarge }, className); - return ; + return ; } NewWindowIcon.defaultProps = { diff --git a/packages/jaeger-ui-components/src/common/Popover.tsx b/public/app/features/explore/TraceView/components/common/Popover.tsx similarity index 100% rename from packages/jaeger-ui-components/src/common/Popover.tsx rename to public/app/features/explore/TraceView/components/common/Popover.tsx diff --git a/packages/jaeger-ui-components/src/common/TraceName.tsx b/public/app/features/explore/TraceView/components/common/TraceName.tsx similarity index 100% rename from packages/jaeger-ui-components/src/common/TraceName.tsx rename to public/app/features/explore/TraceView/components/common/TraceName.tsx diff --git a/packages/jaeger-ui-components/src/common/UiFindInput.test.tsx b/public/app/features/explore/TraceView/components/common/UiFindInput.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/common/UiFindInput.test.tsx rename to public/app/features/explore/TraceView/components/common/UiFindInput.test.tsx diff --git a/packages/jaeger-ui-components/src/common/UiFindInput.tsx b/public/app/features/explore/TraceView/components/common/UiFindInput.tsx similarity index 94% rename from packages/jaeger-ui-components/src/common/UiFindInput.tsx rename to public/app/features/explore/TraceView/components/common/UiFindInput.tsx index b6ca9fff3fe..c98db541ae4 100644 --- a/packages/jaeger-ui-components/src/common/UiFindInput.tsx +++ b/public/app/features/explore/TraceView/components/common/UiFindInput.tsx @@ -16,13 +16,12 @@ import * as React from 'react'; import { IconButton, Input } from '@grafana/ui'; -import { TNil } from '../types/index'; +import { TNil } from '../types'; type Props = { allowClear?: boolean; - inputProps: Record; + inputProps: Record; location: Location; - match: any; trackFindFunction?: (str: string | TNil) => void; value: string | undefined; onChange: (value: string) => void; diff --git a/packages/jaeger-ui-components/src/constants/index.tsx b/public/app/features/explore/TraceView/components/constants/default-config.ts similarity index 50% rename from packages/jaeger-ui-components/src/constants/index.tsx rename to public/app/features/explore/TraceView/components/constants/default-config.ts index 3d2483e6344..7fddc8d938a 100644 --- a/packages/jaeger-ui-components/src/constants/index.tsx +++ b/public/app/features/explore/TraceView/components/constants/default-config.ts @@ -12,15 +12,29 @@ // See the License for the specific language governing permissions and // limitations under the License. -export const FALLBACK_DAG_MAX_NUM_SERVICES = 100 as 100; -export const FALLBACK_TRACE_NAME = '' as ''; +import { FALLBACK_DAG_MAX_NUM_SERVICES } from './index'; -export const FETCH_DONE = 'FETCH_DONE' as 'FETCH_DONE'; -export const FETCH_ERROR = 'FETCH_ERROR' as 'FETCH_ERROR'; -export const FETCH_LOADING = 'FETCH_LOADING' as 'FETCH_LOADING'; - -export const fetchedState = { - DONE: FETCH_DONE, - ERROR: FETCH_ERROR, - LOADING: FETCH_LOADING, -}; +export default Object.defineProperty( + { + archiveEnabled: false, + dependencies: { + dagMaxNumServices: FALLBACK_DAG_MAX_NUM_SERVICES, + menuEnabled: true, + }, + linkPatterns: [], + search: { + maxLookback: { + label: '2 Days', + value: '2d', + }, + maxLimit: 1500, + }, + tracking: { + gaID: null, + trackErrors: true, + }, + }, + // fields that should be individually merged vs wholesale replaced + '__mergeFields', + { value: ['dependencies', 'search', 'tracking'] } +); diff --git a/packages/jaeger-ui-components/src/types/api-error.tsx b/public/app/features/explore/TraceView/components/constants/index.tsx similarity index 75% rename from packages/jaeger-ui-components/src/types/api-error.tsx rename to public/app/features/explore/TraceView/components/constants/index.tsx index fd72371e34f..15726a21be1 100644 --- a/packages/jaeger-ui-components/src/types/api-error.tsx +++ b/public/app/features/explore/TraceView/components/constants/index.tsx @@ -12,13 +12,5 @@ // See the License for the specific language governing permissions and // limitations under the License. -export type ApiError = - | string - | { - message: string; - httpStatus?: any; - httpStatusText?: string; - httpUrl?: string; - httpQuery?: string; - httpBody?: string; - }; +export const FALLBACK_DAG_MAX_NUM_SERVICES = 100 as 100; +export const FALLBACK_TRACE_NAME = ''; diff --git a/packages/jaeger-ui-components/src/constants/tag-keys.tsx b/public/app/features/explore/TraceView/components/constants/tag-keys.tsx similarity index 77% rename from packages/jaeger-ui-components/src/constants/tag-keys.tsx rename to public/app/features/explore/TraceView/components/constants/tag-keys.tsx index fb4587a547d..0aec89c75a5 100644 --- a/packages/jaeger-ui-components/src/constants/tag-keys.tsx +++ b/public/app/features/explore/TraceView/components/constants/tag-keys.tsx @@ -12,6 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -export const HTTP_METHOD = 'http.method' as 'http.method'; -export const PEER_SERVICE = 'peer.service' as 'peer.service'; -export const SPAN_KIND = 'span.kind' as 'span.kind'; +export const PEER_SERVICE = 'peer.service'; diff --git a/packages/jaeger-ui-components/src/demo/.eslintrc b/public/app/features/explore/TraceView/components/demo/.eslintrc similarity index 100% rename from packages/jaeger-ui-components/src/demo/.eslintrc rename to public/app/features/explore/TraceView/components/demo/.eslintrc diff --git a/packages/jaeger-ui-components/src/demo/chance.d.ts b/public/app/features/explore/TraceView/components/demo/chance.d.ts similarity index 100% rename from packages/jaeger-ui-components/src/demo/chance.d.ts rename to public/app/features/explore/TraceView/components/demo/chance.d.ts diff --git a/packages/jaeger-ui-components/src/demo/trace-generators.ts b/public/app/features/explore/TraceView/components/demo/trace-generators.ts similarity index 97% rename from packages/jaeger-ui-components/src/demo/trace-generators.ts rename to public/app/features/explore/TraceView/components/demo/trace-generators.ts index 4cdd08a4609..a87889233f4 100644 --- a/packages/jaeger-ui-components/src/demo/trace-generators.ts +++ b/public/app/features/explore/TraceView/components/demo/trace-generators.ts @@ -13,7 +13,8 @@ // limitations under the License. import Chance from 'chance'; -import { TraceSpanData, TraceProcess } from 'src/types/trace'; + +import { TraceSpanData, TraceProcess } from 'app/features/explore/TraceView/components/types/trace'; import { getSpanId } from '../selectors/span'; @@ -119,7 +120,6 @@ export default chance.mixin({ }); spans = attachReferences(spans, maxDepth, spansPerLevel); if (spans.length > 1) { - // eslint-disable-next-line @typescript-eslint/consistent-type-assertions spans = setupParentSpan(spans, { startTime: timestamp, duration } as TraceSpanData); } diff --git a/packages/jaeger-ui-components/src/index.ts b/public/app/features/explore/TraceView/components/index.ts similarity index 100% rename from packages/jaeger-ui-components/src/index.ts rename to public/app/features/explore/TraceView/components/index.ts diff --git a/packages/jaeger-ui-components/src/keyboard-mappings.tsx b/public/app/features/explore/TraceView/components/keyboard-mappings.tsx similarity index 100% rename from packages/jaeger-ui-components/src/keyboard-mappings.tsx rename to public/app/features/explore/TraceView/components/keyboard-mappings.tsx diff --git a/packages/jaeger-ui-components/src/keyboard-shortcuts.tsx b/public/app/features/explore/TraceView/components/keyboard-shortcuts.tsx similarity index 92% rename from packages/jaeger-ui-components/src/keyboard-shortcuts.tsx rename to public/app/features/explore/TraceView/components/keyboard-shortcuts.tsx index 692935f7940..d038611b5d2 100644 --- a/packages/jaeger-ui-components/src/keyboard-shortcuts.tsx +++ b/public/app/features/explore/TraceView/components/keyboard-shortcuts.tsx @@ -19,8 +19,8 @@ import keyboardMappings from './keyboard-mappings'; export type CombokeysHandler = | (() => void) - | ((event: React.KeyboardEvent) => void) - | ((event: React.KeyboardEvent, s: string) => void); + | ((event: React.KeyboardEvent) => void) + | ((event: React.KeyboardEvent, s: string) => void); export type ShortcutCallbacks = { [name: string]: CombokeysHandler; diff --git a/packages/jaeger-ui-components/src/model/ddg/PathElem.test.ts b/public/app/features/explore/TraceView/components/model/ddg/PathElem.test.ts similarity index 100% rename from packages/jaeger-ui-components/src/model/ddg/PathElem.test.ts rename to public/app/features/explore/TraceView/components/model/ddg/PathElem.test.ts diff --git a/packages/jaeger-ui-components/src/model/ddg/PathElem.tsx b/public/app/features/explore/TraceView/components/model/ddg/PathElem.tsx similarity index 100% rename from packages/jaeger-ui-components/src/model/ddg/PathElem.tsx rename to public/app/features/explore/TraceView/components/model/ddg/PathElem.tsx diff --git a/packages/jaeger-ui-components/src/model/ddg/__snapshots__/PathElem.test.ts.snap b/public/app/features/explore/TraceView/components/model/ddg/__snapshots__/PathElem.test.ts.snap similarity index 100% rename from packages/jaeger-ui-components/src/model/ddg/__snapshots__/PathElem.test.ts.snap rename to public/app/features/explore/TraceView/components/model/ddg/__snapshots__/PathElem.test.ts.snap diff --git a/packages/jaeger-ui-components/src/model/ddg/sample-paths.test.resources.ts b/public/app/features/explore/TraceView/components/model/ddg/sample-paths.test.resources.ts similarity index 100% rename from packages/jaeger-ui-components/src/model/ddg/sample-paths.test.resources.ts rename to public/app/features/explore/TraceView/components/model/ddg/sample-paths.test.resources.ts diff --git a/packages/jaeger-ui-components/src/model/ddg/types.tsx b/public/app/features/explore/TraceView/components/model/ddg/types.tsx similarity index 76% rename from packages/jaeger-ui-components/src/model/ddg/types.tsx rename to public/app/features/explore/TraceView/components/model/ddg/types.tsx index f6d4f0f965a..6705c4ea0c3 100644 --- a/packages/jaeger-ui-components/src/model/ddg/types.tsx +++ b/public/app/features/explore/TraceView/components/model/ddg/types.tsx @@ -27,20 +27,8 @@ export type TDdgOperation = { service: TDdgService; }; -export type TDdgServiceMap = Map; - export type TDdgPath = { focalIdx: number; members: PathElem[]; traceIDs: string[]; }; - -export type TDdgDistanceToPathElems = Map; - -export type TDdgModel = { - distanceToPathElems: TDdgDistanceToPathElems; - hash: string; - paths: TDdgPath[]; - services: TDdgServiceMap; - visIdxToPathElem: PathElem[]; -}; diff --git a/packages/jaeger-ui-components/src/model/find-trace-name.test.ts b/public/app/features/explore/TraceView/components/model/find-trace-name.test.ts similarity index 99% rename from packages/jaeger-ui-components/src/model/find-trace-name.test.ts rename to public/app/features/explore/TraceView/components/model/find-trace-name.test.ts index bec8fefd8c3..d27cc98bdc4 100644 --- a/packages/jaeger-ui-components/src/model/find-trace-name.test.ts +++ b/public/app/features/explore/TraceView/components/model/find-trace-name.test.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TraceSpan } from '../types/trace'; +import { TraceSpan } from '../types'; import { _getTraceNameImpl as getTraceName } from './trace-viewer'; diff --git a/packages/jaeger-ui-components/src/model/link-patterns.test.ts b/public/app/features/explore/TraceView/components/model/link-patterns.test.ts similarity index 98% rename from packages/jaeger-ui-components/src/model/link-patterns.test.ts rename to public/app/features/explore/TraceView/components/model/link-patterns.test.ts index 0a6768febd9..d31063ffc7c 100644 --- a/packages/jaeger-ui-components/src/model/link-patterns.test.ts +++ b/public/app/features/explore/TraceView/components/model/link-patterns.test.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Trace, TraceLink, TraceSpan } from '../types/trace'; +import { Trace, TraceLink, TraceSpan } from '../types'; import { processTemplate, @@ -67,7 +67,6 @@ describe('processTemplate()', () => { expect(() => processTemplate( { - /* eslint-disable @typescript-eslint/no-explicit-any */ template: (data: { [key: string]: any }) => `a${data.b}c`, }, (a) => a @@ -417,7 +416,6 @@ describe('getLinks()', () => { const span = { depth: 0, process: {}, tags: [{ key: 'mySpecialKey', value: 'valueOfMyKey' }] } as TraceSpan; - /* eslint-disable @typescript-eslint/no-explicit-any */ let cache: WeakMap; beforeEach(() => { diff --git a/packages/jaeger-ui-components/src/model/link-patterns.tsx b/public/app/features/explore/TraceView/components/model/link-patterns.tsx similarity index 98% rename from packages/jaeger-ui-components/src/model/link-patterns.tsx rename to public/app/features/explore/TraceView/components/model/link-patterns.tsx index 9f74ccb532f..696c13c690c 100644 --- a/packages/jaeger-ui-components/src/model/link-patterns.tsx +++ b/public/app/features/explore/TraceView/components/model/link-patterns.tsx @@ -15,8 +15,7 @@ import { uniq as _uniq } from 'lodash'; import memoize from 'lru-memoize'; -import { TNil } from '../types'; -import { TraceSpan, TraceLink, TraceKeyValuePair, Trace } from '../types/trace'; +import { TraceSpan, TraceLink, TraceKeyValuePair, Trace, TNil } from '../types'; import { getConfigValue } from '../utils/config/get-config'; import { getParent } from './span'; diff --git a/packages/jaeger-ui-components/src/model/span.tsx b/public/app/features/explore/TraceView/components/model/span.tsx similarity index 95% rename from packages/jaeger-ui-components/src/model/span.tsx rename to public/app/features/explore/TraceView/components/model/span.tsx index 1450c357faf..07764898a24 100644 --- a/packages/jaeger-ui-components/src/model/span.tsx +++ b/public/app/features/explore/TraceView/components/model/span.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TraceSpan } from '../types/trace'; +import { TraceSpan } from '../types'; /** * Searches the span.references to find 'CHILD_OF' reference type or returns null. diff --git a/packages/jaeger-ui-components/src/model/trace-viewer.ts b/public/app/features/explore/TraceView/components/model/trace-viewer.ts similarity index 97% rename from packages/jaeger-ui-components/src/model/trace-viewer.ts rename to public/app/features/explore/TraceView/components/model/trace-viewer.ts index 105821920e6..857c4750587 100644 --- a/packages/jaeger-ui-components/src/model/trace-viewer.ts +++ b/public/app/features/explore/TraceView/components/model/trace-viewer.ts @@ -14,7 +14,7 @@ import { memoize } from 'lodash'; -import { TraceSpan } from '../types/trace'; +import { TraceSpan } from '../types'; export function _getTraceNameImpl(spans: TraceSpan[]) { // Use a span with no references to another span in given array diff --git a/packages/jaeger-ui-components/src/model/transform-trace-data.test.ts b/public/app/features/explore/TraceView/components/model/transform-trace-data.test.ts similarity index 98% rename from packages/jaeger-ui-components/src/model/transform-trace-data.test.ts rename to public/app/features/explore/TraceView/components/model/transform-trace-data.test.ts index 980b0bfabb9..8c3270ca88c 100644 --- a/packages/jaeger-ui-components/src/model/transform-trace-data.test.ts +++ b/public/app/features/explore/TraceView/components/model/transform-trace-data.test.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TraceResponse } from '../types/trace'; +import { TraceResponse } from '../types'; import transformTraceData, { orderTags, deduplicateTags } from './transform-trace-data'; diff --git a/packages/jaeger-ui-components/src/model/transform-trace-data.tsx b/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx similarity index 97% rename from packages/jaeger-ui-components/src/model/transform-trace-data.tsx rename to public/app/features/explore/TraceView/components/model/transform-trace-data.tsx index 49c10fac0aa..d116874f1cb 100644 --- a/packages/jaeger-ui-components/src/model/transform-trace-data.tsx +++ b/public/app/features/explore/TraceView/components/model/transform-trace-data.tsx @@ -16,7 +16,7 @@ import { isEqual as _isEqual } from 'lodash'; // @ts-ignore import { getTraceSpanIdsAsTree } from '../selectors/trace'; -import { TraceKeyValuePair, TraceSpan, Trace, TraceResponse, TraceProcess } from '../types/trace'; +import { TraceKeyValuePair, TraceSpan, Trace, TraceResponse, TraceProcess } from '../types'; // @ts-ignore import TreeNode from '../utils/TreeNode'; import { getConfigValue } from '../utils/config/get-config'; @@ -142,7 +142,7 @@ export default function transformTraceData(data: TraceResponse | undefined): Tra if (typeof spanID !== 'string') { return; } - const span = spanMap.get(spanID) as TraceSpan; + const span = spanMap.get(spanID); if (!span) { return; } @@ -159,7 +159,7 @@ export default function transformTraceData(data: TraceResponse | undefined): Tra span.tags = orderTags(tagsInfo.tags, getConfigValue('topTagPrefixes')); span.warnings = span.warnings.concat(tagsInfo.warnings); span.references.forEach((ref, index) => { - const refSpan = spanMap.get(ref.spanID) as TraceSpan; + const refSpan = spanMap.get(ref.spanID); if (refSpan) { // eslint-disable-next-line no-param-reassign ref.span = refSpan; diff --git a/packages/jaeger-ui-components/src/scroll-page.test.ts b/public/app/features/explore/TraceView/components/scroll-page.test.ts similarity index 99% rename from packages/jaeger-ui-components/src/scroll-page.test.ts rename to public/app/features/explore/TraceView/components/scroll-page.test.ts index 5c4a3e7f0c9..cff5b4084ba 100644 --- a/packages/jaeger-ui-components/src/scroll-page.test.ts +++ b/public/app/features/explore/TraceView/components/scroll-page.test.ts @@ -23,7 +23,6 @@ const tweenInstances: Tween[] = []; describe('scroll-by', () => { beforeEach(() => { - window.scrollY = 100; tweenInstances.length = 0; jest.mocked(Tween).mockClear(); jest.mocked(Tween).mockImplementation((opts) => { diff --git a/packages/jaeger-ui-components/src/scroll-page.tsx b/public/app/features/explore/TraceView/components/scroll-page.tsx similarity index 100% rename from packages/jaeger-ui-components/src/scroll-page.tsx rename to public/app/features/explore/TraceView/components/scroll-page.tsx diff --git a/packages/jaeger-ui-components/src/selectors/process.test.ts b/public/app/features/explore/TraceView/components/selectors/process.test.ts similarity index 96% rename from packages/jaeger-ui-components/src/selectors/process.test.ts rename to public/app/features/explore/TraceView/components/selectors/process.test.ts index d3928edfe43..cf6ad8caa7f 100644 --- a/packages/jaeger-ui-components/src/selectors/process.test.ts +++ b/public/app/features/explore/TraceView/components/selectors/process.test.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. import traceGenerator from '../demo/trace-generators'; -import { TraceProcess } from '../types/trace'; +import { TraceProcess } from '../types'; import * as processSelectors from './process'; diff --git a/packages/jaeger-ui-components/src/selectors/process.ts b/public/app/features/explore/TraceView/components/selectors/process.ts similarity index 94% rename from packages/jaeger-ui-components/src/selectors/process.ts rename to public/app/features/explore/TraceView/components/selectors/process.ts index d8d1a021630..91c2bcaa605 100644 --- a/packages/jaeger-ui-components/src/selectors/process.ts +++ b/public/app/features/explore/TraceView/components/selectors/process.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TraceProcess } from '../types/trace'; +import { TraceProcess } from '../types'; export const getProcessServiceName = (proc: TraceProcess) => proc.serviceName; export const getProcessTags = (proc: TraceProcess) => proc.tags; diff --git a/packages/jaeger-ui-components/src/selectors/span.test.ts b/public/app/features/explore/TraceView/components/selectors/span.test.ts similarity index 96% rename from packages/jaeger-ui-components/src/selectors/span.test.ts rename to public/app/features/explore/TraceView/components/selectors/span.test.ts index 0771b01283a..9186366a0f1 100644 --- a/packages/jaeger-ui-components/src/selectors/span.test.ts +++ b/public/app/features/explore/TraceView/components/selectors/span.test.ts @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TraceResponse } from 'src/types'; -import { TraceSpan, TraceSpanData } from 'src/types/trace'; +import { TraceResponse } from 'app/features/explore/TraceView/components/types'; +import { TraceSpan, TraceSpanData } from 'app/features/explore/TraceView/components/types/trace'; import traceGenerator from '../demo/trace-generators'; diff --git a/packages/jaeger-ui-components/src/selectors/span.ts b/public/app/features/explore/TraceView/components/selectors/span.ts similarity index 76% rename from packages/jaeger-ui-components/src/selectors/span.ts rename to public/app/features/explore/TraceView/components/selectors/span.ts index 179dd1b8483..9f7d10eeb26 100644 --- a/packages/jaeger-ui-components/src/selectors/span.ts +++ b/public/app/features/explore/TraceView/components/selectors/span.ts @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -import fuzzy from 'fuzzy'; import { createSelector } from 'reselect'; +import { fuzzyMatch } from '@grafana/ui'; + import { TraceSpan, TraceSpanData, TraceSpanReference } from '../types/trace'; import { getProcessServiceName } from './process'; @@ -61,30 +62,5 @@ export const filterSpansForText = createSelector( ({ spans }: { spans: TraceSpan[] }) => spans, ({ text }: { text: string }) => text, (spans, text) => - fuzzy - .filter(text, spans, { - extract: (span) => `${getSpanServiceName(span)} ${getSpanName(span)}`, - }) - .map(({ original }) => original) -); - -const getTextFilteredSpansAsMap = createSelector(filterSpansForText, (matchingSpans) => - matchingSpans.reduce( - (obj, span) => ({ - ...obj, - [getSpanId(span)]: span, - }), - {} - ) -); - -// TODO: delete this function as it is not used? -export const highlightSpansForTextFilter = createSelector( - ({ spans }: { spans: TraceSpanData[] }) => spans, - getTextFilteredSpansAsMap, - (spans, textFilteredSpansMap: { [key: string]: TraceSpanData }) => - spans.map((span: TraceSpanData) => ({ - ...span, - muted: !textFilteredSpansMap[getSpanId(span)], - })) + spans.filter((span) => (span ? fuzzyMatch(`${getSpanServiceName(span)} ${getSpanName(span)}`, text).found : false)) ); diff --git a/packages/jaeger-ui-components/src/selectors/trace.fixture.ts b/public/app/features/explore/TraceView/components/selectors/trace.fixture.ts similarity index 100% rename from packages/jaeger-ui-components/src/selectors/trace.fixture.ts rename to public/app/features/explore/TraceView/components/selectors/trace.fixture.ts diff --git a/packages/jaeger-ui-components/src/selectors/trace.test.ts b/public/app/features/explore/TraceView/components/selectors/trace.test.ts similarity index 99% rename from packages/jaeger-ui-components/src/selectors/trace.test.ts rename to public/app/features/explore/TraceView/components/selectors/trace.test.ts index dfaa9d28b93..1aec2d75aa8 100644 --- a/packages/jaeger-ui-components/src/selectors/trace.test.ts +++ b/public/app/features/explore/TraceView/components/selectors/trace.test.ts @@ -13,7 +13,8 @@ // limitations under the License. import { values as _values } from 'lodash'; -import TreeNode from 'src/utils/TreeNode'; + +import TreeNode from 'app/features/explore/TraceView/components/utils/TreeNode'; import traceGenerator from '../demo/trace-generators'; import { TraceResponse, TraceSpan, TraceSpanData } from '../types/trace'; diff --git a/packages/jaeger-ui-components/src/selectors/trace.ts b/public/app/features/explore/TraceView/components/selectors/trace.ts similarity index 81% rename from packages/jaeger-ui-components/src/selectors/trace.ts rename to public/app/features/explore/TraceView/components/selectors/trace.ts index f9c0ebb85ca..288910b07e6 100644 --- a/packages/jaeger-ui-components/src/selectors/trace.ts +++ b/public/app/features/explore/TraceView/components/selectors/trace.ts @@ -14,7 +14,7 @@ import { createSelector, createStructuredSelector } from 'reselect'; -import { Trace, TraceData, TraceProcess, TraceResponse, TraceSpan, TraceSpanData } from '../types/trace'; +import { Trace, TraceData, TraceProcess, TraceResponse, TraceSpanData } from '../types/trace'; import TreeNode from '../utils/TreeNode'; import { formatMillisecondTime, formatSecondTime, ONE_SECOND } from '../utils/date'; import { numberSortComparator } from '../utils/sort'; @@ -126,12 +126,6 @@ export const getTraceDuration = createSelector(getTraceSpans, getTraceTimestamp, ) ); -export const getTraceEndTimestamp = createSelector( - getTraceTimestamp, - getTraceDuration, - (timestamp: number, duration: number) => timestamp! + duration -); - export const getParentSpan = createSelector( getTraceSpanIdsAsTree, getTraceSpansAsMap, @@ -199,13 +193,6 @@ export const getSortedSpans = createSelector( [...spans].sort((spanA, spanB) => dir * comparator(selector(spanA, trace), selector(spanB, trace))) ); -const getTraceSpansByHierarchyPosition = createSelector(getTraceSpanIdsAsTree, (tree) => { - const hierarchyPositionMap = new Map(); - let i = 0; - tree.walk((spanID: string | number | undefined) => hierarchyPositionMap.set(spanID, i++)); - return hierarchyPositionMap; -}); - export const getTreeSizeForTraceSpan = createSelector( createSelector((state: { trace: TraceResponse }) => state.trace, getTraceSpanIdsAsTree), createSelector((state: { span: TraceSpanData }) => state.span, getSpanId), @@ -218,12 +205,6 @@ export const getTreeSizeForTraceSpan = createSelector( } ); -export const getSpanHierarchySortPositionForTrace = createSelector( - createSelector(({ trace }: { trace: Trace }) => trace, getTraceSpansByHierarchyPosition), - ({ span }: { span: TraceSpan }) => span, - (hierarchyPositionMap, span) => hierarchyPositionMap.get(getSpanId(span)) -); - export const getTraceName = createSelector( createSelector( createSelector(hydrateSpansWithProcesses, getParentSpan), @@ -266,43 +247,3 @@ export const getTicksForTrace = createSelector( width, })) ); - -// TODO: delete this when the backend can ensure uniqueness -/* istanbul ignore next */ -export const enforceUniqueSpanIds = createSelector( - /* istanbul ignore next */ (trace: Trace) => trace, - getTraceSpans, - /* istanbul ignore next */ (trace, spans) => { - const map = new Map(); - - const spanArray: TraceSpanData[] = []; - - return { - ...trace, - spans: spans.reduce((result: TraceSpanData[], span: TraceSpanData) => { - const spanID = map.has(getSpanId(span)) ? `${getSpanId(span)}_${map.get(getSpanId(span))}` : getSpanId(span); - const updatedSpan = { ...span, spanID }; - - if (spanID !== getSpanId(span)) { - // eslint-disable-next-line no-console - console.warn('duplicate spanID in trace replaced', getSpanId(span), 'new:', spanID); - } - - // set the presence of the span in the map or increment the number - map.set(getSpanId(span), (map.get(getSpanId(span)) || 0) + 1); - - return result.concat([updatedSpan]); - }, spanArray), - }; - } -); - -// TODO: delete this when the backend can ensure uniqueness -export const dropEmptyStartTimeSpans = createSelector( - /* istanbul ignore next */ (trace: Trace) => trace, - getTraceSpans, - /* istanbul ignore next */ (trace, spans) => ({ - ...trace, - spans: spans.filter((span: TraceSpanData) => !!getSpanTimestamp(span)), - }) -); diff --git a/packages/jaeger-ui-components/src/settings/SpanBarSettings.tsx b/public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx similarity index 100% rename from packages/jaeger-ui-components/src/settings/SpanBarSettings.tsx rename to public/app/features/explore/TraceView/components/settings/SpanBarSettings.tsx diff --git a/packages/jaeger-ui-components/src/types/TNil.tsx b/public/app/features/explore/TraceView/components/types/TNil.tsx similarity index 100% rename from packages/jaeger-ui-components/src/types/TNil.tsx rename to public/app/features/explore/TraceView/components/types/TNil.tsx diff --git a/packages/jaeger-ui-components/src/types/TTraceDiffState.tsx b/public/app/features/explore/TraceView/components/types/TTraceDiffState.tsx similarity index 100% rename from packages/jaeger-ui-components/src/types/TTraceDiffState.tsx rename to public/app/features/explore/TraceView/components/types/TTraceDiffState.tsx diff --git a/packages/jaeger-ui-components/src/types/TTraceTimeline.tsx b/public/app/features/explore/TraceView/components/types/TTraceTimeline.tsx similarity index 100% rename from packages/jaeger-ui-components/src/types/TTraceTimeline.tsx rename to public/app/features/explore/TraceView/components/types/TTraceTimeline.tsx diff --git a/packages/jaeger-ui-components/src/types/config.tsx b/public/app/features/explore/TraceView/components/types/config.tsx similarity index 97% rename from packages/jaeger-ui-components/src/types/config.tsx rename to public/app/features/explore/TraceView/components/types/config.tsx index 6bd91da7c99..944a2a278de 100644 --- a/packages/jaeger-ui-components/src/types/config.tsx +++ b/public/app/features/explore/TraceView/components/types/config.tsx @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TNil } from '.'; +import { TNil } from './index'; export type ConfigMenuItem = { label: string; diff --git a/packages/jaeger-ui-components/src/types/index.tsx b/public/app/features/explore/TraceView/components/types/index.tsx similarity index 100% rename from packages/jaeger-ui-components/src/types/index.tsx rename to public/app/features/explore/TraceView/components/types/index.tsx diff --git a/packages/jaeger-ui-components/src/types/links.ts b/public/app/features/explore/TraceView/components/types/links.ts similarity index 91% rename from packages/jaeger-ui-components/src/types/links.ts rename to public/app/features/explore/TraceView/components/types/links.ts index 0afb22985c4..8e375b2f0d3 100644 --- a/packages/jaeger-ui-components/src/types/links.ts +++ b/public/app/features/explore/TraceView/components/types/links.ts @@ -6,7 +6,7 @@ import { TraceSpan } from './trace'; export type SpanLinkDef = { href: string; - onClick?: (event: any) => void; + onClick?: (event: unknown) => void; content: React.ReactNode; title?: string; field: Field; diff --git a/packages/jaeger-ui-components/src/types/archive.tsx b/public/app/features/explore/TraceView/components/types/search.tsx similarity index 67% rename from packages/jaeger-ui-components/src/types/archive.tsx rename to public/app/features/explore/TraceView/components/types/search.tsx index 1006800d203..a2ce3710a93 100644 --- a/packages/jaeger-ui-components/src/types/archive.tsx +++ b/public/app/features/explore/TraceView/components/types/search.tsx @@ -12,14 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { ApiError } from './api-error'; +import { TNil } from './index'; -export type TraceArchive = { - isLoading?: boolean; - isArchived?: boolean; - isError?: boolean; - error?: ApiError; - isAcknowledged?: boolean; +export type SearchQuery = { + end: number | string; + limit: number | string; + lookback: string; + maxDuration: null | string; + minDuration: null | string; + operation: string | TNil; + service: string; + start: number | string; + tags: string | TNil; }; - -export type TracesArchive = Record; diff --git a/packages/jaeger-ui-components/src/types/trace.ts b/public/app/features/explore/TraceView/components/types/trace.ts similarity index 100% rename from packages/jaeger-ui-components/src/types/trace.ts rename to public/app/features/explore/TraceView/components/types/trace.ts diff --git a/packages/jaeger-ui-components/src/uberUtilityStyles.ts b/public/app/features/explore/TraceView/components/uberUtilityStyles.ts similarity index 100% rename from packages/jaeger-ui-components/src/uberUtilityStyles.ts rename to public/app/features/explore/TraceView/components/uberUtilityStyles.ts diff --git a/packages/jaeger-ui-components/src/url/ReferenceLink.test.tsx b/public/app/features/explore/TraceView/components/url/ReferenceLink.test.tsx similarity index 100% rename from packages/jaeger-ui-components/src/url/ReferenceLink.test.tsx rename to public/app/features/explore/TraceView/components/url/ReferenceLink.test.tsx diff --git a/packages/jaeger-ui-components/src/url/ReferenceLink.tsx b/public/app/features/explore/TraceView/components/url/ReferenceLink.tsx similarity index 100% rename from packages/jaeger-ui-components/src/url/ReferenceLink.tsx rename to public/app/features/explore/TraceView/components/url/ReferenceLink.tsx diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/DraggableManager.test.ts b/public/app/features/explore/TraceView/components/utils/DraggableManager/DraggableManager.test.ts similarity index 100% rename from packages/jaeger-ui-components/src/utils/DraggableManager/DraggableManager.test.ts rename to public/app/features/explore/TraceView/components/utils/DraggableManager/DraggableManager.test.ts diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/DraggableManager.tsx b/public/app/features/explore/TraceView/components/utils/DraggableManager/DraggableManager.tsx similarity index 100% rename from packages/jaeger-ui-components/src/utils/DraggableManager/DraggableManager.tsx rename to public/app/features/explore/TraceView/components/utils/DraggableManager/DraggableManager.tsx diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/EUpdateTypes.tsx b/public/app/features/explore/TraceView/components/utils/DraggableManager/EUpdateTypes.tsx similarity index 100% rename from packages/jaeger-ui-components/src/utils/DraggableManager/EUpdateTypes.tsx rename to public/app/features/explore/TraceView/components/utils/DraggableManager/EUpdateTypes.tsx diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/README.md b/public/app/features/explore/TraceView/components/utils/DraggableManager/README.md similarity index 99% rename from packages/jaeger-ui-components/src/utils/DraggableManager/README.md rename to public/app/features/explore/TraceView/components/utils/DraggableManager/README.md index 6f20f3126e8..ff98846477f 100644 --- a/packages/jaeger-ui-components/src/utils/DraggableManager/README.md +++ b/public/app/features/explore/TraceView/components/utils/DraggableManager/README.md @@ -142,7 +142,7 @@ This generally amounts to calling [`Element#getBoundingClientRect()`](https://de For instance, in the `DividerDemo`, the function used is `DivideDemo#_getDraggingBounds()`: -```js +```ts _getDraggingBounds = (): DraggableBounds => { if (!this._realmElm) { throw new Error('invalid state'); diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/demo/DividerDemo.css b/public/app/features/explore/TraceView/components/utils/DraggableManager/demo/DividerDemo.css similarity index 100% rename from packages/jaeger-ui-components/src/utils/DraggableManager/demo/DividerDemo.css rename to public/app/features/explore/TraceView/components/utils/DraggableManager/demo/DividerDemo.css diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/demo/DividerDemo.tsx b/public/app/features/explore/TraceView/components/utils/DraggableManager/demo/DividerDemo.tsx similarity index 97% rename from packages/jaeger-ui-components/src/utils/DraggableManager/demo/DividerDemo.tsx rename to public/app/features/explore/TraceView/components/utils/DraggableManager/demo/DividerDemo.tsx index ca8ce693956..26ac8b73b56 100644 --- a/packages/jaeger-ui-components/src/utils/DraggableManager/demo/DividerDemo.tsx +++ b/public/app/features/explore/TraceView/components/utils/DraggableManager/demo/DividerDemo.tsx @@ -14,9 +14,9 @@ import React from 'react'; -import { DraggableBounds, DraggingUpdate } from '..'; import TNil from '../../../types/TNil'; import DraggableManager from '../DraggableManager'; +import { DraggableBounds, DraggingUpdate } from '../index'; import './DividerDemo.css'; diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/demo/DraggableManagerDemo.css b/public/app/features/explore/TraceView/components/utils/DraggableManager/demo/DraggableManagerDemo.css similarity index 100% rename from packages/jaeger-ui-components/src/utils/DraggableManager/demo/DraggableManagerDemo.css rename to public/app/features/explore/TraceView/components/utils/DraggableManager/demo/DraggableManagerDemo.css diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/demo/DraggableManagerDemo.tsx b/public/app/features/explore/TraceView/components/utils/DraggableManager/demo/DraggableManagerDemo.tsx similarity index 100% rename from packages/jaeger-ui-components/src/utils/DraggableManager/demo/DraggableManagerDemo.tsx rename to public/app/features/explore/TraceView/components/utils/DraggableManager/demo/DraggableManagerDemo.tsx diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/demo/RegionDemo.css b/public/app/features/explore/TraceView/components/utils/DraggableManager/demo/RegionDemo.css similarity index 100% rename from packages/jaeger-ui-components/src/utils/DraggableManager/demo/RegionDemo.css rename to public/app/features/explore/TraceView/components/utils/DraggableManager/demo/RegionDemo.css diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/demo/RegionDemo.tsx b/public/app/features/explore/TraceView/components/utils/DraggableManager/demo/RegionDemo.tsx similarity index 99% rename from packages/jaeger-ui-components/src/utils/DraggableManager/demo/RegionDemo.tsx rename to public/app/features/explore/TraceView/components/utils/DraggableManager/demo/RegionDemo.tsx index 5338d7f7c4d..f25f9f05320 100644 --- a/packages/jaeger-ui-components/src/utils/DraggableManager/demo/RegionDemo.tsx +++ b/public/app/features/explore/TraceView/components/utils/DraggableManager/demo/RegionDemo.tsx @@ -14,8 +14,8 @@ import React from 'react'; -import DraggableManager, { DraggableBounds, DraggingUpdate } from '..'; import { TNil } from '../../../types'; +import DraggableManager, { DraggableBounds, DraggingUpdate } from '../index'; import './RegionDemo.css'; diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/demo/demo-ux.gif b/public/app/features/explore/TraceView/components/utils/DraggableManager/demo/demo-ux.gif similarity index 100% rename from packages/jaeger-ui-components/src/utils/DraggableManager/demo/demo-ux.gif rename to public/app/features/explore/TraceView/components/utils/DraggableManager/demo/demo-ux.gif diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/demo/index.tsx b/public/app/features/explore/TraceView/components/utils/DraggableManager/demo/index.tsx similarity index 100% rename from packages/jaeger-ui-components/src/utils/DraggableManager/demo/index.tsx rename to public/app/features/explore/TraceView/components/utils/DraggableManager/demo/index.tsx diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/index.tsx b/public/app/features/explore/TraceView/components/utils/DraggableManager/index.tsx similarity index 100% rename from packages/jaeger-ui-components/src/utils/DraggableManager/index.tsx rename to public/app/features/explore/TraceView/components/utils/DraggableManager/index.tsx diff --git a/packages/jaeger-ui-components/src/utils/DraggableManager/types.tsx b/public/app/features/explore/TraceView/components/utils/DraggableManager/types.tsx similarity index 95% rename from packages/jaeger-ui-components/src/utils/DraggableManager/types.tsx rename to public/app/features/explore/TraceView/components/utils/DraggableManager/types.tsx index b10c4581199..79e213f8d7e 100644 --- a/packages/jaeger-ui-components/src/utils/DraggableManager/types.tsx +++ b/public/app/features/explore/TraceView/components/utils/DraggableManager/types.tsx @@ -27,7 +27,7 @@ export type DraggableBounds = { }; export type DraggingUpdate = { - event: React.MouseEvent | MouseEvent; + event: React.MouseEvent | MouseEvent; manager: DraggableManager; tag: string | TNil; type: EUpdateTypes; diff --git a/packages/jaeger-ui-components/src/utils/TreeNode.test.ts b/public/app/features/explore/TraceView/components/utils/TreeNode.test.ts similarity index 100% rename from packages/jaeger-ui-components/src/utils/TreeNode.test.ts rename to public/app/features/explore/TraceView/components/utils/TreeNode.test.ts diff --git a/packages/jaeger-ui-components/src/utils/TreeNode.ts b/public/app/features/explore/TraceView/components/utils/TreeNode.ts similarity index 100% rename from packages/jaeger-ui-components/src/utils/TreeNode.ts rename to public/app/features/explore/TraceView/components/utils/TreeNode.ts diff --git a/packages/jaeger-ui-components/src/utils/color-generator.test.ts b/public/app/features/explore/TraceView/components/utils/color-generator.test.ts similarity index 100% rename from packages/jaeger-ui-components/src/utils/color-generator.test.ts rename to public/app/features/explore/TraceView/components/utils/color-generator.test.ts diff --git a/packages/jaeger-ui-components/src/utils/color-generator.tsx b/public/app/features/explore/TraceView/components/utils/color-generator.tsx similarity index 100% rename from packages/jaeger-ui-components/src/utils/color-generator.tsx rename to public/app/features/explore/TraceView/components/utils/color-generator.tsx diff --git a/packages/jaeger-ui-components/src/utils/config/get-config.tsx b/public/app/features/explore/TraceView/components/utils/config/get-config.tsx similarity index 100% rename from packages/jaeger-ui-components/src/utils/config/get-config.tsx rename to public/app/features/explore/TraceView/components/utils/config/get-config.tsx diff --git a/packages/jaeger-ui-components/src/utils/date.test.ts b/public/app/features/explore/TraceView/components/utils/date.test.ts similarity index 100% rename from packages/jaeger-ui-components/src/utils/date.test.ts rename to public/app/features/explore/TraceView/components/utils/date.test.ts diff --git a/packages/jaeger-ui-components/src/utils/date.tsx b/public/app/features/explore/TraceView/components/utils/date.tsx similarity index 76% rename from packages/jaeger-ui-components/src/utils/date.tsx rename to public/app/features/explore/TraceView/components/utils/date.tsx index 1a0277f189f..3c358885359 100644 --- a/packages/jaeger-ui-components/src/utils/date.tsx +++ b/public/app/features/explore/TraceView/components/utils/date.tsx @@ -17,12 +17,8 @@ import moment from 'moment-timezone'; import { toFloatPrecision } from './number'; -const TODAY = 'Today'; -const YESTERDAY = 'Yesterday'; - export const STANDARD_DATE_FORMAT = 'YYYY-MM-DD'; export const STANDARD_TIME_FORMAT = 'HH:mm'; -export const STANDARD_DATETIME_FORMAT = 'MMMM D YYYY, HH:mm:ss.SSS'; export const ONE_MILLISECOND = 1000; export const ONE_SECOND = 1000 * ONE_MILLISECOND; export const ONE_MINUTE = 60 * ONE_SECOND; @@ -39,16 +35,6 @@ const UNIT_STEPS: Array<{ unit: string; microseconds: number; ofPrevious: number { unit: 'μs', microseconds: 1, ofPrevious: 1000 }, ]; -/** - * @param {number} timestamp - * @param {number} initialTimestamp - * @param {number} totalDuration - * @returns {number} 0-100 percentage - */ -export function getPercentageOfDuration(duration: number, totalDuration: number) { - return (duration / totalDuration) * 100; -} - const quantizeDuration = (duration: number, floatPrecision: number, conversionFactor: number) => toFloatPrecision(duration / conversionFactor, floatPrecision) * conversionFactor; @@ -68,14 +54,6 @@ export function formatTime(duration: number) { return moment(duration / ONE_MILLISECOND).format(STANDARD_TIME_FORMAT); } -/** - * @param {number} duration (in microseconds) - * @returns {string} formatted, unit-labelled string with time in milliseconds - */ -export function formatDatetime(duration: number) { - return moment(duration / ONE_MILLISECOND).format(STANDARD_DATETIME_FORMAT); -} - /** * @param {number} duration (in microseconds) * @returns {string} formatted, unit-labelled string with time in milliseconds @@ -123,23 +101,3 @@ export function formatDuration(duration: number): string { const secondaryUnitString = `${secondaryValue}${secondaryUnit.unit}`; return secondaryValue === 0 ? primaryUnitString : `${primaryUnitString} ${secondaryUnitString}`; } - -export function formatRelativeDate(value: any, fullMonthName = false) { - const m = moment.isMoment(value) ? value : moment(value); - const monthFormat = fullMonthName ? 'MMMM' : 'MMM'; - const dt = new Date(); - if (dt.getFullYear() !== m.year()) { - return m.format(`${monthFormat} D, YYYY`); - } - const mMonth = m.month(); - const mDate = m.date(); - const date = dt.getDate(); - if (mMonth === dt.getMonth() && mDate === date) { - return TODAY; - } - dt.setDate(date - 1); - if (mMonth === dt.getMonth() && mDate === dt.getDate()) { - return YESTERDAY; - } - return m.format(`${monthFormat} D`); -} diff --git a/packages/jaeger-ui-components/src/utils/filter-spans.test.ts b/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts similarity index 99% rename from packages/jaeger-ui-components/src/utils/filter-spans.test.ts rename to public/app/features/explore/TraceView/components/utils/filter-spans.test.ts index 48f704e4cc4..9123cd2106a 100644 --- a/packages/jaeger-ui-components/src/utils/filter-spans.test.ts +++ b/public/app/features/explore/TraceView/components/utils/filter-spans.test.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TraceSpan } from 'src/types/trace'; +import { TraceSpan } from '../types'; import filterSpans from './filter-spans'; diff --git a/packages/jaeger-ui-components/src/utils/filter-spans.tsx b/public/app/features/explore/TraceView/components/utils/filter-spans.tsx similarity index 96% rename from packages/jaeger-ui-components/src/utils/filter-spans.tsx rename to public/app/features/explore/TraceView/components/utils/filter-spans.tsx index 699d8996487..4f93a6b42c1 100644 --- a/packages/jaeger-ui-components/src/utils/filter-spans.tsx +++ b/public/app/features/explore/TraceView/components/utils/filter-spans.tsx @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TNil } from '../types'; -import { TraceKeyValuePair, TraceSpan } from '../types/trace'; +import { TNil, TraceKeyValuePair, TraceSpan } from '../types'; export default function filterSpans(textFilter: string, spans: TraceSpan[] | TNil) { if (!spans) { diff --git a/packages/jaeger-ui-components/src/utils/number.tsx b/public/app/features/explore/TraceView/components/utils/number.tsx similarity index 100% rename from packages/jaeger-ui-components/src/utils/number.tsx rename to public/app/features/explore/TraceView/components/utils/number.tsx diff --git a/packages/jaeger-ui-components/src/utils/sort.test.ts b/public/app/features/explore/TraceView/components/utils/sort.test.ts similarity index 73% rename from packages/jaeger-ui-components/src/utils/sort.test.ts rename to public/app/features/explore/TraceView/components/utils/sort.test.ts index 43bede4d91c..1f427425072 100644 --- a/packages/jaeger-ui-components/src/utils/sort.test.ts +++ b/public/app/features/explore/TraceView/components/utils/sort.test.ts @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import sinon from 'sinon'; - import * as sortUtils from './sort'; it('localeStringComparator() provides a case-insensitive sort', () => { @@ -77,31 +75,3 @@ it('getNewSortForClick() should toggle direction if same column', () => { dir: 1, }); }); - -it('createSortClickHandler() should return a function', () => { - const column = { name: 'alpha' }; - const currentSortKey = 'alpha'; - const currentSortDir = 1; - const updateSort = sinon.spy(); - - expect(typeof sortUtils.createSortClickHandler(column, currentSortKey, currentSortDir, updateSort)).toBe('function'); -}); - -it('createSortClickHandler() should call updateSort with the new sort vals', () => { - const column = { name: 'alpha' }; - const prevSort = { key: 'alpha', dir: 1 }; - const currentSortKey = prevSort.key; - const currentSortDir = prevSort.dir; - const updateSort = sinon.spy(); - - const clickHandler = sortUtils.createSortClickHandler(column, currentSortKey, currentSortDir, updateSort); - - clickHandler(); - - expect( - updateSort.calledWith( - sortUtils.getNewSortForClick(prevSort, column).key, - sortUtils.getNewSortForClick(prevSort, column).dir - ) - ).toBeTruthy(); -}); diff --git a/packages/jaeger-ui-components/src/utils/sort.ts b/public/app/features/explore/TraceView/components/utils/sort.ts similarity index 77% rename from packages/jaeger-ui-components/src/utils/sort.ts rename to public/app/features/explore/TraceView/components/utils/sort.ts index 5d3c85872cc..5636fdc977f 100644 --- a/packages/jaeger-ui-components/src/utils/sort.ts +++ b/public/app/features/explore/TraceView/components/utils/sort.ts @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import sinon from 'sinon'; - export function localeStringComparator(itemA: string, itemB: string) { return itemA.localeCompare(itemB); } @@ -37,15 +35,3 @@ export function getNewSortForClick( dir: prevSort.key === column.name ? -1 * prevSort.dir : defaultDir, }; } - -export function createSortClickHandler( - column: { name: string }, - currentSortKey: string, - currentSortDir: number, - updateSort: sinon.SinonSpy -) { - return function onClickSortingElement() { - const { key, dir } = getNewSortForClick({ key: currentSortKey, dir: currentSortDir }, column); - updateSort(key, dir); - }; -} diff --git a/packages/jaeger-ui-components/src/utils/span-ancestor-ids.test.ts b/public/app/features/explore/TraceView/components/utils/span-ancestor-ids.test.ts similarity index 98% rename from packages/jaeger-ui-components/src/utils/span-ancestor-ids.test.ts rename to public/app/features/explore/TraceView/components/utils/span-ancestor-ids.test.ts index 76d6fc3d7b5..d8532b74151 100644 --- a/packages/jaeger-ui-components/src/utils/span-ancestor-ids.test.ts +++ b/public/app/features/explore/TraceView/components/utils/span-ancestor-ids.test.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { TraceSpan } from 'src/types/trace'; +import { TraceSpan } from '../types'; import spanAncestorIdsSpy from './span-ancestor-ids'; diff --git a/packages/jaeger-ui-components/src/utils/span-ancestor-ids.tsx b/public/app/features/explore/TraceView/components/utils/span-ancestor-ids.tsx similarity index 93% rename from packages/jaeger-ui-components/src/utils/span-ancestor-ids.tsx rename to public/app/features/explore/TraceView/components/utils/span-ancestor-ids.tsx index cb4677353d3..5ddb037aa2a 100644 --- a/packages/jaeger-ui-components/src/utils/span-ancestor-ids.tsx +++ b/public/app/features/explore/TraceView/components/utils/span-ancestor-ids.tsx @@ -14,8 +14,7 @@ import { find as _find, get as _get } from 'lodash'; -import { TNil } from '../types'; -import { TraceSpan } from '../types/trace'; +import { TNil, TraceSpan } from '../types'; function getFirstAncestor(span: TraceSpan): TraceSpan | TNil { return _get( diff --git a/packages/jaeger-ui-components/src/utils/test/requestAnimationFrame.ts b/public/app/features/explore/TraceView/components/utils/test/requestAnimationFrame.ts similarity index 100% rename from packages/jaeger-ui-components/src/utils/test/requestAnimationFrame.ts rename to public/app/features/explore/TraceView/components/utils/test/requestAnimationFrame.ts diff --git a/public/app/features/explore/TraceView/createSpanLink.test.ts b/public/app/features/explore/TraceView/createSpanLink.test.ts index ba208be0afc..f1ad205615a 100644 --- a/public/app/features/explore/TraceView/createSpanLink.test.ts +++ b/public/app/features/explore/TraceView/createSpanLink.test.ts @@ -1,6 +1,5 @@ import { DataSourceInstanceSettings, LinkModel, MutableDataFrame } from '@grafana/data'; import { DataSourceSrv, setDataSourceSrv, setTemplateSrv } from '@grafana/runtime'; -import { Trace, TraceSpan } from '@jaegertracing/jaeger-ui-components'; import { TraceToMetricsOptions } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings'; import { DatasourceSrv } from 'app/features/plugins/datasource_srv'; @@ -8,6 +7,7 @@ import { TraceToLogsOptionsV2 } from '../../../core/components/TraceToLogs/Trace import { LinkSrv, setLinkSrv } from '../../panel/panellinks/link_srv'; import { TemplateSrv } from '../../templating/template_srv'; +import { Trace, TraceSpan } from './components'; import { createSpanLinkFactory } from './createSpanLink'; const dummyTraceData = { duration: 10, traceID: 'trace1', traceName: 'test trace' } as unknown as Trace; diff --git a/public/app/features/explore/TraceView/createSpanLink.tsx b/public/app/features/explore/TraceView/createSpanLink.tsx index 95184af081f..3edbdf50e31 100644 --- a/public/app/features/explore/TraceView/createSpanLink.tsx +++ b/public/app/features/explore/TraceView/createSpanLink.tsx @@ -1,4 +1,3 @@ -import { SpanLinks } from '@jaegertracing/jaeger-ui-components/src/types/links'; import { property } from 'lodash'; import React from 'react'; @@ -19,7 +18,6 @@ import { import { getTemplateSrv } from '@grafana/runtime'; import { DataQuery } from '@grafana/schema'; import { Icon } from '@grafana/ui'; -import { SpanLinkFunc, Trace, TraceSpan } from '@jaegertracing/jaeger-ui-components'; import { TraceToLogsOptionsV2 } from 'app/core/components/TraceToLogs/TraceToLogsSettings'; import { TraceToMetricQuery, TraceToMetricsOptions } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; @@ -29,6 +27,9 @@ import { LokiQuery } from '../../../plugins/datasource/loki/types'; import { variableRegex } from '../../variables/utils'; import { getFieldLinksForExplore } from '../utils/links'; +import { SpanLinkFunc, Trace, TraceSpan } from './components'; +import { SpanLinks } from './components/types/links'; + /** * This is a factory for the link creator. It returns the function mainly so it can return undefined in which case * the trace view won't create any links and to capture the datasource and split function making it easier to memoize diff --git a/packages/jaeger-ui-components/typings/custom.d.ts b/public/app/features/explore/TraceView/custom.d.ts similarity index 85% rename from packages/jaeger-ui-components/typings/custom.d.ts rename to public/app/features/explore/TraceView/custom.d.ts index dd70a67124d..9695782217f 100644 --- a/packages/jaeger-ui-components/typings/custom.d.ts +++ b/public/app/features/explore/TraceView/custom.d.ts @@ -12,15 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// For inlined envvars -declare const process: { - env: { - NODE_ENV: string; - REACT_APP_GA_DEBUG?: string; - REACT_APP_VSN_STATE?: string; - }; -}; - declare module 'combokeys' { export default class Combokeys { constructor(element: HTMLElement); diff --git a/public/app/features/explore/TraceView/useChildrenState.test.ts b/public/app/features/explore/TraceView/useChildrenState.test.ts index 1d6dca9c200..ab462c1ec48 100644 --- a/public/app/features/explore/TraceView/useChildrenState.test.ts +++ b/public/app/features/explore/TraceView/useChildrenState.test.ts @@ -1,7 +1,6 @@ import { renderHook, act } from '@testing-library/react-hooks'; -import { TraceSpan } from '@jaegertracing/jaeger-ui-components'; - +import { TraceSpan } from './components'; import { useChildrenState } from './useChildrenState'; describe('useChildrenState', () => { diff --git a/public/app/features/explore/TraceView/useChildrenState.ts b/public/app/features/explore/TraceView/useChildrenState.ts index ef8607bf9ef..1bfca3611d6 100644 --- a/public/app/features/explore/TraceView/useChildrenState.ts +++ b/public/app/features/explore/TraceView/useChildrenState.ts @@ -1,6 +1,6 @@ import { useCallback, useState } from 'react'; -import { TraceSpan } from '@jaegertracing/jaeger-ui-components'; +import { TraceSpan } from './components'; /** * Children state means whether spans are collapsed or not. Also provides some functions to manipulate that state. diff --git a/public/app/features/explore/TraceView/useDetailState.test.ts b/public/app/features/explore/TraceView/useDetailState.test.ts index ae941f924f5..e9454bd1091 100644 --- a/public/app/features/explore/TraceView/useDetailState.test.ts +++ b/public/app/features/explore/TraceView/useDetailState.test.ts @@ -1,8 +1,8 @@ -import { TraceLog } from '@jaegertracing/jaeger-ui-components/src/types/trace'; import { act, renderHook } from '@testing-library/react-hooks'; import { DataFrame } from '@grafana/data'; +import { TraceLog } from './components/types/trace'; import { useDetailState } from './useDetailState'; const sampleFrame: DataFrame = { diff --git a/public/app/features/explore/TraceView/useDetailState.ts b/public/app/features/explore/TraceView/useDetailState.ts index 63400a6f2f7..e3e4df4c75a 100644 --- a/public/app/features/explore/TraceView/useDetailState.ts +++ b/public/app/features/explore/TraceView/useDetailState.ts @@ -1,9 +1,9 @@ -import { TraceLog, TraceSpanReference } from '@jaegertracing/jaeger-ui-components/src/types/trace'; import { useCallback, useState, useEffect } from 'react'; import { DataFrame } from '@grafana/data'; -import { DetailState } from '@jaegertracing/jaeger-ui-components'; +import { DetailState } from './components'; +import { TraceLog, TraceSpanReference } from './components/types/trace'; /** * Keeps state of the span detail. This means whether span details are open but also state of each detail subitem * like logs or tags. diff --git a/public/app/features/explore/TraceView/useSearch.test.ts b/public/app/features/explore/TraceView/useSearch.test.ts index ce5ceddbeb7..a4a0f537172 100644 --- a/public/app/features/explore/TraceView/useSearch.test.ts +++ b/public/app/features/explore/TraceView/useSearch.test.ts @@ -1,7 +1,6 @@ import { act, renderHook } from '@testing-library/react-hooks'; -import { TraceSpan } from '@jaegertracing/jaeger-ui-components'; - +import { TraceSpan } from './components'; import { useSearch } from './useSearch'; describe('useSearch', () => { diff --git a/public/app/features/explore/TraceView/useSearch.ts b/public/app/features/explore/TraceView/useSearch.ts index 6574ac5659b..38550370c17 100644 --- a/public/app/features/explore/TraceView/useSearch.ts +++ b/public/app/features/explore/TraceView/useSearch.ts @@ -1,6 +1,6 @@ import { useMemo, useState } from 'react'; -import { filterSpans, TraceSpan } from '@jaegertracing/jaeger-ui-components'; +import { filterSpans, TraceSpan } from './components'; /** * Controls the state of search input that highlights spans if they match the search string. diff --git a/public/app/features/explore/TraceView/useViewRange.ts b/public/app/features/explore/TraceView/useViewRange.ts index e617f488ebe..f577beb0b38 100644 --- a/public/app/features/explore/TraceView/useViewRange.ts +++ b/public/app/features/explore/TraceView/useViewRange.ts @@ -1,6 +1,6 @@ import { useCallback, useState } from 'react'; -import { ViewRangeTimeUpdate, ViewRange } from '@jaegertracing/jaeger-ui-components'; +import { ViewRangeTimeUpdate, ViewRange } from './components'; /** * Controls state of the zoom function that can be used through minimap in header or on the timeline. ViewRange contains diff --git a/public/app/features/explore/TraceView/utils/transform.ts b/public/app/features/explore/TraceView/utils/transform.ts index 7300566121f..e7f1582af83 100644 --- a/public/app/features/explore/TraceView/utils/transform.ts +++ b/public/app/features/explore/TraceView/utils/transform.ts @@ -1,5 +1,6 @@ import { DataFrame, DataFrameView, TraceSpanRow } from '@grafana/data'; -import { Trace, TraceProcess, TraceResponse, transformTraceData } from '@jaegertracing/jaeger-ui-components'; + +import { Trace, TraceProcess, TraceResponse, transformTraceData } from '../components'; export function transformDataFrames(frame?: DataFrame): Trace | null { if (!frame) { diff --git a/public/app/features/inspector/InspectDataTab.test.tsx b/public/app/features/inspector/InspectDataTab.test.tsx index 3355a8b8cef..0dc821cb758 100644 --- a/public/app/features/inspector/InspectDataTab.test.tsx +++ b/public/app/features/inspector/InspectDataTab.test.tsx @@ -6,10 +6,6 @@ import { DataFrame, FieldType } from '@grafana/data'; import { InspectDataTab } from './InspectDataTab'; -// the mock below gets rid of this warning from recompose: -// Warning: React.createFactory() is deprecated and will be removed in a future major release. Consider using JSX or use React.createElement() directly instead. -jest.mock('@jaegertracing/jaeger-ui-components', () => ({})); - const createProps = (propsOverride?: Partial>) => { const defaultProps = { isLoading: false, diff --git a/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx b/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx index 6b20122169d..aa2df3773ed 100644 --- a/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx +++ b/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx @@ -3,10 +3,10 @@ import React from 'react'; import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; import { config } from '@grafana/runtime'; import { DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui'; -import { SpanBarSettings } from '@jaegertracing/jaeger-ui-components'; import { NodeGraphSettings } from 'app/core/components/NodeGraphSettings'; import { TraceToLogsSettings } from 'app/core/components/TraceToLogs/TraceToLogsSettings'; import { TraceToMetricsSettings } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings'; +import { SpanBarSettings } from 'app/features/explore/TraceView/components'; export type Props = DataSourcePluginOptionsEditorProps; diff --git a/public/app/plugins/datasource/jaeger/datasource.ts b/public/app/plugins/datasource/jaeger/datasource.ts index 85e3ae1badd..f8288806604 100644 --- a/public/app/plugins/datasource/jaeger/datasource.ts +++ b/public/app/plugins/datasource/jaeger/datasource.ts @@ -15,10 +15,10 @@ import { ScopedVars, } from '@grafana/data'; import { BackendSrvRequest, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime'; -import { SpanBarOptions } from '@jaegertracing/jaeger-ui-components'; import { NodeGraphOptions } from 'app/core/components/NodeGraphSettings'; import { serializeParams } from 'app/core/utils/fetch'; import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv'; +import { SpanBarOptions } from 'app/features/explore/TraceView/components'; import { ALL_OPERATIONS_KEY } from './components/SearchForm'; import { createGraphFrames } from './graphTransform'; diff --git a/public/app/plugins/datasource/jaeger/responseTransform.ts b/public/app/plugins/datasource/jaeger/responseTransform.ts index 07123123422..507e5646cfb 100644 --- a/public/app/plugins/datasource/jaeger/responseTransform.ts +++ b/public/app/plugins/datasource/jaeger/responseTransform.ts @@ -6,7 +6,7 @@ import { TraceLog, TraceSpanRow, } from '@grafana/data'; -import { transformTraceData } from '@jaegertracing/jaeger-ui-components'; +import { transformTraceData } from 'app/features/explore/TraceView/components'; import { JaegerResponse, Span, TraceProcess, TraceResponse } from './types'; diff --git a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx index b883cc8e611..7f792be4527 100644 --- a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx +++ b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx @@ -3,10 +3,10 @@ import React from 'react'; import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; import { config } from '@grafana/runtime'; import { DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui'; -import { SpanBarSettings } from '@jaegertracing/jaeger-ui-components'; import { NodeGraphSettings } from 'app/core/components/NodeGraphSettings'; import { TraceToLogsSettings } from 'app/core/components/TraceToLogs/TraceToLogsSettings'; import { TraceToMetricsSettings } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings'; +import { SpanBarSettings } from 'app/features/explore/TraceView/components'; import { LokiSearchSettings } from './LokiSearchSettings'; import { QuerySettings } from './QuerySettings'; diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts index f79c9ed3fa1..3e8c2111aa6 100644 --- a/public/app/plugins/datasource/tempo/datasource.ts +++ b/public/app/plugins/datasource/tempo/datasource.ts @@ -24,10 +24,10 @@ import { TemplateSrv, getTemplateSrv, } from '@grafana/runtime'; -import { SpanBarOptions } from '@jaegertracing/jaeger-ui-components'; import { NodeGraphOptions } from 'app/core/components/NodeGraphSettings'; import { TraceToLogsOptions } from 'app/core/components/TraceToLogs/TraceToLogsSettings'; import { serializeParams } from 'app/core/utils/fetch'; +import { SpanBarOptions } from 'app/features/explore/TraceView/components'; import { getDatasourceSrv } from 'app/features/plugins/datasource_srv'; import { LokiOptions } from '../loki/types'; diff --git a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx index f3621bfef59..81c3dd193fc 100644 --- a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx +++ b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx @@ -3,10 +3,10 @@ import React from 'react'; import { DataSourcePluginOptionsEditorProps } from '@grafana/data'; import { config } from '@grafana/runtime'; import { DataSourceHttpSettings, SecureSocksProxySettings } from '@grafana/ui'; -import { SpanBarSettings } from '@jaegertracing/jaeger-ui-components'; import { NodeGraphSettings } from 'app/core/components/NodeGraphSettings'; import { TraceToLogsSettings } from 'app/core/components/TraceToLogs/TraceToLogsSettings'; import { TraceToMetricsSettings } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings'; +import { SpanBarSettings } from 'app/features/explore/TraceView/components'; export type Props = DataSourcePluginOptionsEditorProps; diff --git a/public/app/plugins/datasource/zipkin/datasource.ts b/public/app/plugins/datasource/zipkin/datasource.ts index cf9ed51c03f..0ea00fe33f0 100644 --- a/public/app/plugins/datasource/zipkin/datasource.ts +++ b/public/app/plugins/datasource/zipkin/datasource.ts @@ -12,8 +12,8 @@ import { ScopedVars, } from '@grafana/data'; import { BackendSrvRequest, FetchResponse, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime'; -import { SpanBarOptions } from '@jaegertracing/jaeger-ui-components'; import { NodeGraphOptions } from 'app/core/components/NodeGraphSettings'; +import { SpanBarOptions } from 'app/features/explore/TraceView/components'; import { serializeParams } from '../../../core/utils/fetch'; diff --git a/public/app/plugins/panel/traces/TracesPanel.tsx b/public/app/plugins/panel/traces/TracesPanel.tsx index b39b8b1aee1..4bcfe68a295 100644 --- a/public/app/plugins/panel/traces/TracesPanel.tsx +++ b/public/app/plugins/panel/traces/TracesPanel.tsx @@ -1,12 +1,12 @@ import { css } from '@emotion/css'; -import TracePageSearchBar from '@jaegertracing/jaeger-ui-components/src/TracePageHeader/TracePageSearchBar'; -import { TopOfViewRefType } from '@jaegertracing/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView'; import React, { useMemo, useState, createRef } from 'react'; import { useAsync } from 'react-use'; import { PanelProps } from '@grafana/data'; import { getDataSourceSrv } from '@grafana/runtime'; import { TraceView } from 'app/features/explore/TraceView/TraceView'; +import TracePageSearchBar from 'app/features/explore/TraceView/components/TracePageHeader/TracePageSearchBar'; +import { TopOfViewRefType } from 'app/features/explore/TraceView/components/TraceTimelineViewer/VirtualizedTraceView'; import { useSearch } from 'app/features/explore/TraceView/useSearch'; import { transformDataFrames } from 'app/features/explore/TraceView/utils/transform'; diff --git a/scripts/check-breaking-changes.sh b/scripts/check-breaking-changes.sh index 28e1ec57c1f..fd6ca45de20 100755 --- a/scripts/check-breaking-changes.sh +++ b/scripts/check-breaking-changes.sh @@ -16,7 +16,7 @@ while IFS=" " read -r -a package; do CURRENT="./pr/$PACKAGE_PATH" # Temporarily skipping these packages as they don't have any exposed static typing - if [[ "$PACKAGE_PATH" == 'grafana-toolkit' || "$PACKAGE_PATH" == 'jaeger-ui-components' || "$PACKAGE_PATH" == 'grafana-eslint-rules' ]]; then + if [[ "$PACKAGE_PATH" == 'grafana-toolkit' || "$PACKAGE_PATH" == 'grafana-eslint-rules' ]]; then continue fi @@ -38,11 +38,11 @@ while IFS=" " read -r -a package; do STATUS=$? # Final exit code - # (non-zero if any of the packages failed the checks) + # (non-zero if any of the packages failed the checks) if [ $STATUS -gt 0 ] then EXIT_CODE=1 - GITHUB_MESSAGE="${GITHUB_MESSAGE}**\\\`${PACKAGE_PATH}\\\`** has possible breaking changes ([more info](${GITHUB_JOB_LINK}#step:${GITHUB_STEP_NUMBER}:1))
" + GITHUB_MESSAGE="${GITHUB_MESSAGE}**\\\`${PACKAGE_PATH}\\\`** has possible breaking changes ([more info](${GITHUB_JOB_LINK}#step:${GITHUB_STEP_NUMBER}:1))
" fi done <<< "$PACKAGES" diff --git a/tsconfig.json b/tsconfig.json index 8e94aad40cb..72b9d2e6402 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,7 +18,6 @@ "public/e2e-test/**/*.ts", "public/test/**/*.ts", "public/vendor/**/*.ts", - "packages/jaeger-ui-components/typings", "packages/grafana-data/typings", "packages/grafana-ui/src/types" ] diff --git a/yarn.lock b/yarn.lock index f6790269727..c7b07867ad5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -92,6 +92,13 @@ __metadata: languageName: node linkType: hard +"@babel/compat-data@npm:^7.19.3, @babel/compat-data@npm:^7.19.4": + version: 7.19.4 + resolution: "@babel/compat-data@npm:7.19.4" + checksum: 757fdaeb6756c2d323ff56f60fb8e670292108cda6abf762a56c0d40910ecc4d2c7e283dbdfbcee6bc28c74ad659144352609e1cb49d31e101ab13ea5ce90072 + languageName: node + linkType: hard + "@babel/compat-data@npm:^7.20.0, @babel/compat-data@npm:^7.20.1": version: 7.20.5 resolution: "@babel/compat-data@npm:7.20.5" @@ -146,7 +153,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.20.5, @babel/core@npm:^7.0.1, @babel/core@npm:^7.12.10, @babel/core@npm:^7.7.5": +"@babel/core@npm:7.20.5, @babel/core@npm:^7.0.1": version: 7.20.5 resolution: "@babel/core@npm:7.20.5" dependencies: @@ -215,6 +222,29 @@ __metadata: languageName: node linkType: hard +"@babel/core@npm:^7.12.10, @babel/core@npm:^7.7.5": + version: 7.19.6 + resolution: "@babel/core@npm:7.19.6" + dependencies: + "@ampproject/remapping": ^2.1.0 + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.19.6 + "@babel/helper-compilation-targets": ^7.19.3 + "@babel/helper-module-transforms": ^7.19.6 + "@babel/helpers": ^7.19.4 + "@babel/parser": ^7.19.6 + "@babel/template": ^7.18.10 + "@babel/traverse": ^7.19.6 + "@babel/types": ^7.19.4 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.1 + semver: ^6.3.0 + checksum: 85c0bd38d0ef180aa2d23c3db6840a0baec88d2e05c30e7ffc3dfeb6b2b89d6e4864922f04997a1f4ce55f9dd469bf2e76518d5c7ae744b98516709d32769b73 + languageName: node + linkType: hard + "@babel/core@npm:^7.7.2": version: 7.16.0 resolution: "@babel/core@npm:7.16.0" @@ -261,7 +291,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.19.6": +"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.12.5, @babel/generator@npm:^7.19.6": version: 7.19.6 resolution: "@babel/generator@npm:7.19.6" dependencies: @@ -272,17 +302,6 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.17.9, @babel/generator@npm:^7.20.5": - version: 7.20.5 - resolution: "@babel/generator@npm:7.20.5" - dependencies: - "@babel/types": ^7.20.5 - "@jridgewell/gen-mapping": ^0.3.2 - jsesc: ^2.5.1 - checksum: 31c10d1e122f08cf755a24bd6f5d197f47eceba03f1133759687d00ab72d210e60ba4011da42f368b6e9fa85cbfda7dc4adb9889c2c20cc5c34bb2d57c1deab7 - languageName: node - linkType: hard - "@babel/generator@npm:^7.15.4, @babel/generator@npm:^7.15.8": version: 7.15.8 resolution: "@babel/generator@npm:7.15.8" @@ -327,6 +346,17 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.17.9, @babel/generator@npm:^7.20.5": + version: 7.20.5 + resolution: "@babel/generator@npm:7.20.5" + dependencies: + "@babel/types": ^7.20.5 + "@jridgewell/gen-mapping": ^0.3.2 + jsesc: ^2.5.1 + checksum: 31c10d1e122f08cf755a24bd6f5d197f47eceba03f1133759687d00ab72d210e60ba4011da42f368b6e9fa85cbfda7dc4adb9889c2c20cc5c34bb2d57c1deab7 + languageName: node + linkType: hard + "@babel/generator@npm:^7.18.2": version: 7.18.2 resolution: "@babel/generator@npm:7.18.2" @@ -360,6 +390,17 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.19.0": + version: 7.19.0 + resolution: "@babel/generator@npm:7.19.0" + dependencies: + "@babel/types": ^7.19.0 + "@jridgewell/gen-mapping": ^0.3.2 + jsesc: ^2.5.1 + checksum: aa3d5785cf8f8e81672dcc61aef351188efeadb20d9f66d79113d82cbcf3bbbdeb829989fa14582108572ddbc4e4027bdceb06ccaf5ec40fa93c2dda8fbcd4aa + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.14.5": version: 7.15.4 resolution: "@babel/helper-annotate-as-pure@npm:7.15.4" @@ -430,7 +471,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.17.7": +"@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.19.0": version: 7.19.0 resolution: "@babel/helper-compilation-targets@npm:7.19.0" dependencies: @@ -472,6 +513,20 @@ __metadata: languageName: node linkType: hard +"@babel/helper-compilation-targets@npm:^7.19.3": + version: 7.19.3 + resolution: "@babel/helper-compilation-targets@npm:7.19.3" + dependencies: + "@babel/compat-data": ^7.19.3 + "@babel/helper-validator-option": ^7.18.6 + browserslist: ^4.21.3 + semver: ^6.3.0 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: aafcb4490c98cddb3255fff98bfbdb881b4def85a1935fd9b1f9b1f0f8b502696839f6b387fb508ca991ea72ba82ce6913bab99f21df4ce80bda2b79e91a09f5 + languageName: node + linkType: hard + "@babel/helper-compilation-targets@npm:^7.20.0": version: 7.20.0 resolution: "@babel/helper-compilation-targets@npm:7.20.0" @@ -520,23 +575,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.20.5": - version: 7.20.5 - resolution: "@babel/helper-create-class-features-plugin@npm:7.20.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-function-name": ^7.19.0 - "@babel/helper-member-expression-to-functions": ^7.18.9 - "@babel/helper-optimise-call-expression": ^7.18.6 - "@babel/helper-replace-supers": ^7.19.1 - "@babel/helper-split-export-declaration": ^7.18.6 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 51b0662cc44ae5fe3691ed552f97312006709ec3f5321a5e5b5a139a5743eaaf65987f30ee7c171af80ab77460fb57c1970b0b1583dd70d90b58e4433b117a1b - languageName: node - linkType: hard - "@babel/helper-create-regexp-features-plugin@npm:^7.14.5": version: 7.14.5 resolution: "@babel/helper-create-regexp-features-plugin@npm:7.14.5" @@ -888,19 +926,19 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/helper-module-transforms@npm:7.20.2" +"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.19.6": + version: 7.19.6 + resolution: "@babel/helper-module-transforms@npm:7.19.6" dependencies: "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-simple-access": ^7.20.2 + "@babel/helper-simple-access": ^7.19.4 "@babel/helper-split-export-declaration": ^7.18.6 "@babel/helper-validator-identifier": ^7.19.1 "@babel/template": ^7.18.10 - "@babel/traverse": ^7.20.1 - "@babel/types": ^7.20.2 - checksum: 33a60ca115f6fce2c9d98e2a2e5649498aa7b23e2ae3c18745d7a021487708fc311458c33542f299387a0da168afccba94116e077f2cce49ae9e5ab83399e8a2 + "@babel/traverse": ^7.19.6 + "@babel/types": ^7.19.4 + checksum: c28692b37d4b5abacc775bcab52a74f44a493f38c58cb72b56a6c6d67a97485dd8aff6f26905abd1a924d3261a171d0214a9fb76f48d8598f1e35b8b29284792 languageName: node linkType: hard @@ -984,19 +1022,35 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.19.6": - version: 7.19.6 - resolution: "@babel/helper-module-transforms@npm:7.19.6" +"@babel/helper-module-transforms@npm:^7.19.0": + version: 7.19.0 + resolution: "@babel/helper-module-transforms@npm:7.19.0" dependencies: "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-simple-access": ^7.19.4 + "@babel/helper-simple-access": ^7.18.6 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/helper-validator-identifier": ^7.18.6 + "@babel/template": ^7.18.10 + "@babel/traverse": ^7.19.0 + "@babel/types": ^7.19.0 + checksum: 4483276c66f56cf3b5b063634092ad9438c2593725de5c143ba277dda82f1501e6d73b311c1b28036f181dbe36eaeff29f24726cde37a599d4e735af294e5359 + languageName: node + linkType: hard + +"@babel/helper-module-transforms@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/helper-module-transforms@npm:7.20.2" + dependencies: + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-module-imports": ^7.18.6 + "@babel/helper-simple-access": ^7.20.2 "@babel/helper-split-export-declaration": ^7.18.6 "@babel/helper-validator-identifier": ^7.19.1 "@babel/template": ^7.18.10 - "@babel/traverse": ^7.19.6 - "@babel/types": ^7.19.4 - checksum: c28692b37d4b5abacc775bcab52a74f44a493f38c58cb72b56a6c6d67a97485dd8aff6f26905abd1a924d3261a171d0214a9fb76f48d8598f1e35b8b29284792 + "@babel/traverse": ^7.20.1 + "@babel/types": ^7.20.2 + checksum: 33a60ca115f6fce2c9d98e2a2e5649498aa7b23e2ae3c18745d7a021487708fc311458c33542f299387a0da168afccba94116e077f2cce49ae9e5ab83399e8a2 languageName: node linkType: hard @@ -1324,14 +1378,14 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.20.5": - version: 7.20.6 - resolution: "@babel/helpers@npm:7.20.6" +"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.19.4": + version: 7.19.4 + resolution: "@babel/helpers@npm:7.19.4" dependencies: "@babel/template": ^7.18.10 - "@babel/traverse": ^7.20.5 - "@babel/types": ^7.20.5 - checksum: f03ec6eb2bf8dc7cdfe2569ee421fd9ba6c7bac6c862d90b608ccdd80281ebe858bc56ca175fc92b3ac50f63126b66bbd5ec86f9f361729289a20054518f1ac5 + "@babel/traverse": ^7.19.4 + "@babel/types": ^7.19.4 + checksum: e2684e9a79d45b95db05c7e14628e8dd1d91ad59433a3afd715bdf19d4683d9e9f84382bcc82316b678aa609ecfc41b07be0b9c49eed07c444f82a6b9e501186 languageName: node linkType: hard @@ -1390,6 +1444,17 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.20.5": + version: 7.20.6 + resolution: "@babel/helpers@npm:7.20.6" + dependencies: + "@babel/template": ^7.18.10 + "@babel/traverse": ^7.20.5 + "@babel/types": ^7.20.5 + checksum: f03ec6eb2bf8dc7cdfe2569ee421fd9ba6c7bac6c862d90b608ccdd80281ebe858bc56ca175fc92b3ac50f63126b66bbd5ec86f9f361729289a20054518f1ac5 + languageName: node + linkType: hard + "@babel/highlight@npm:^7.14.5": version: 7.14.5 resolution: "@babel/highlight@npm:7.14.5" @@ -1443,7 +1508,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.12.11, @babel/parser@npm:^7.19.6": +"@babel/parser@npm:^7.12.11, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.19.6": version: 7.19.6 resolution: "@babel/parser@npm:7.19.6" bin: @@ -1452,7 +1517,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.12.7, @babel/parser@npm:^7.13.0, @babel/parser@npm:^7.20.5": +"@babel/parser@npm:^7.13.0, @babel/parser@npm:^7.20.5": version: 7.20.5 resolution: "@babel/parser@npm:7.20.5" bin: @@ -1497,7 +1562,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.18.10": +"@babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.0": version: 7.19.0 resolution: "@babel/parser@npm:7.19.0" bin: @@ -1562,6 +1627,20 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-proposal-async-generator-functions@npm:^7.19.1": + version: 7.19.1 + resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.19.1" + dependencies: + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-plugin-utils": ^7.19.0 + "@babel/helper-remap-async-to-generator": ^7.18.9 + "@babel/plugin-syntax-async-generators": ^7.8.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: f101555b00aee6ee0107c9e40d872ad646bbd3094abdbeda56d17b107df69a0cb49e5d02dcf5f9d8753e25564e798d08429f12d811aaa1b307b6a725c0b8159c + languageName: node + linkType: hard + "@babel/plugin-proposal-async-generator-functions@npm:^7.20.1": version: 7.20.1 resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.20.1" @@ -1602,17 +1681,17 @@ __metadata: linkType: hard "@babel/plugin-proposal-decorators@npm:^7.12.12": - version: 7.20.5 - resolution: "@babel/plugin-proposal-decorators@npm:7.20.5" + version: 7.19.6 + resolution: "@babel/plugin-proposal-decorators@npm:7.19.6" dependencies: - "@babel/helper-create-class-features-plugin": ^7.20.5 - "@babel/helper-plugin-utils": ^7.20.2 + "@babel/helper-create-class-features-plugin": ^7.19.0 + "@babel/helper-plugin-utils": ^7.19.0 "@babel/helper-replace-supers": ^7.19.1 "@babel/helper-split-export-declaration": ^7.18.6 "@babel/plugin-syntax-decorators": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 780696710dcd5f292a235dcc9dbb1fd6600a1b91c75b5c6efaf6d596520d54c750dabca5ebdb4592534f1572bdca3d424145741815554660335a10a4168ca19a + checksum: 69162475282507e1579232fdaae26330cfcfa7843f4a943383d76c61a5e225ea1fe08edd7c700c400694ab9b57e8b3928b757da985ac613ddfc78be5a9b61c47 languageName: node linkType: hard @@ -1728,7 +1807,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-object-rest-spread@npm:7.20.2, @babel/plugin-proposal-object-rest-spread@npm:^7.12.1, @babel/plugin-proposal-object-rest-spread@npm:^7.20.2": +"@babel/plugin-proposal-object-rest-spread@npm:7.20.2, @babel/plugin-proposal-object-rest-spread@npm:^7.20.2": version: 7.20.2 resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.20.2" dependencies: @@ -1743,6 +1822,21 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-proposal-object-rest-spread@npm:^7.12.1, @babel/plugin-proposal-object-rest-spread@npm:^7.19.4": + version: 7.19.4 + resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.19.4" + dependencies: + "@babel/compat-data": ^7.19.4 + "@babel/helper-compilation-targets": ^7.19.3 + "@babel/helper-plugin-utils": ^7.19.0 + "@babel/plugin-syntax-object-rest-spread": ^7.8.3 + "@babel/plugin-transform-parameters": ^7.18.8 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 90a2a59da305e6c8c83831e16079193df33d727a77a90972e286af2c8c0295fddb91b0978b88f16f63080d08a82b08ce3ee82a88b0488b3c51decc73c1d35786 + languageName: node + linkType: hard + "@babel/plugin-proposal-optional-catch-binding@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.18.6" @@ -1793,21 +1887,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-private-property-in-object@npm:^7.12.1": - version: 7.20.5 - resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.20.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-create-class-features-plugin": ^7.20.5 - "@babel/helper-plugin-utils": ^7.20.2 - "@babel/plugin-syntax-private-property-in-object": ^7.14.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 513b5e0e2c1b2846be5336cf680e932ae17924ef885aa1429e1a4f7924724bdd99b15f28d67187d0a006d5f18a0c4b61d96c3ecb4902fed3c8fe2f0abfc9753a - languageName: node - linkType: hard - -"@babel/plugin-proposal-private-property-in-object@npm:^7.18.6": +"@babel/plugin-proposal-private-property-in-object@npm:^7.12.1, @babel/plugin-proposal-private-property-in-object@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.18.6" dependencies: @@ -2177,14 +2257,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.12.12, @babel/plugin-transform-block-scoping@npm:^7.20.2": - version: 7.20.5 - resolution: "@babel/plugin-transform-block-scoping@npm:7.20.5" +"@babel/plugin-transform-block-scoping@npm:^7.12.12, @babel/plugin-transform-block-scoping@npm:^7.19.4": + version: 7.19.4 + resolution: "@babel/plugin-transform-block-scoping@npm:7.19.4" dependencies: - "@babel/helper-plugin-utils": ^7.20.2 + "@babel/helper-plugin-utils": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 03606bc6710c15cd4e4d1163e1cbab08799f852a5dd55a1f7e115032e9406ac9430ddc0cb6d09a51a4095446985640411f60683c6fcea9bc1a7b202462022e1c + checksum: 86353ccbb57b4a0513ac2b1209271858f9c3f2c56b15a6225ff5f1c97ffb1c48f8984046a718a9835ecdae100cbe80ed0b9ca15a5554e33386671b56a8cd887c languageName: node linkType: hard @@ -2199,22 +2279,33 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.12.1, @babel/plugin-transform-classes@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/plugin-transform-classes@npm:7.20.2" +"@babel/plugin-transform-block-scoping@npm:^7.20.2": + version: 7.20.5 + resolution: "@babel/plugin-transform-block-scoping@npm:7.20.5" + dependencies: + "@babel/helper-plugin-utils": ^7.20.2 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 03606bc6710c15cd4e4d1163e1cbab08799f852a5dd55a1f7e115032e9406ac9430ddc0cb6d09a51a4095446985640411f60683c6fcea9bc1a7b202462022e1c + languageName: node + linkType: hard + +"@babel/plugin-transform-classes@npm:^7.12.1, @babel/plugin-transform-classes@npm:^7.19.0": + version: 7.19.0 + resolution: "@babel/plugin-transform-classes@npm:7.19.0" dependencies: "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-compilation-targets": ^7.20.0 + "@babel/helper-compilation-targets": ^7.19.0 "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.19.0 "@babel/helper-optimise-call-expression": ^7.18.6 - "@babel/helper-plugin-utils": ^7.20.2 - "@babel/helper-replace-supers": ^7.19.1 + "@babel/helper-plugin-utils": ^7.19.0 + "@babel/helper-replace-supers": ^7.18.9 "@babel/helper-split-export-declaration": ^7.18.6 globals: ^11.1.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 57f3467a8eb7853cdb61cda963cfb6c6568ad276d77c9de2ff5a2194650010217aa318ef3733975537c6fb906b73a019afb6ea650b01852e7d2e1fab4034361b + checksum: 5500953031fc3eae73f717c7b59ef406158a4a710d566a0f78a4944240bcf98f817f07cf1d6af0e749e21f0dfee29c36412b75d57b0a753c3ad823b70c596b79 languageName: node linkType: hard @@ -2236,6 +2327,25 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-classes@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/plugin-transform-classes@npm:7.20.2" + dependencies: + "@babel/helper-annotate-as-pure": ^7.18.6 + "@babel/helper-compilation-targets": ^7.20.0 + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-function-name": ^7.19.0 + "@babel/helper-optimise-call-expression": ^7.18.6 + "@babel/helper-plugin-utils": ^7.20.2 + "@babel/helper-replace-supers": ^7.19.1 + "@babel/helper-split-export-declaration": ^7.18.6 + globals: ^11.1.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 57f3467a8eb7853cdb61cda963cfb6c6568ad276d77c9de2ff5a2194650010217aa318ef3733975537c6fb906b73a019afb6ea650b01852e7d2e1fab4034361b + languageName: node + linkType: hard + "@babel/plugin-transform-computed-properties@npm:^7.18.9": version: 7.18.9 resolution: "@babel/plugin-transform-computed-properties@npm:7.18.9" @@ -2247,14 +2357,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-destructuring@npm:^7.12.1, @babel/plugin-transform-destructuring@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/plugin-transform-destructuring@npm:7.20.2" +"@babel/plugin-transform-destructuring@npm:^7.12.1, @babel/plugin-transform-destructuring@npm:^7.19.4": + version: 7.19.4 + resolution: "@babel/plugin-transform-destructuring@npm:7.19.4" dependencies: - "@babel/helper-plugin-utils": ^7.20.2 + "@babel/helper-plugin-utils": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 09033e09b28ca1b0d46a8d82f5a677b1d718a739b3c199886908c3ef1af23369317d0c429b21507d480ee82721c15892a9893be18e50ad6fc219e69312f4b097 + checksum: 0ca40f6abf7273dafefb7a1cc11fef2b9ab3edbd23188cdcff8cd5e30783b89d64e7813e44aae9efab417b90972ae80971bf6c4130eeeb112bcfb44100c72657 languageName: node linkType: hard @@ -2269,6 +2379,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-destructuring@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/plugin-transform-destructuring@npm:7.20.2" + dependencies: + "@babel/helper-plugin-utils": ^7.20.2 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 09033e09b28ca1b0d46a8d82f5a677b1d718a739b3c199886908c3ef1af23369317d0c429b21507d480ee82721c15892a9893be18e50ad6fc219e69312f4b097 + languageName: node + linkType: hard + "@babel/plugin-transform-dotall-regex@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-dotall-regex@npm:7.18.6" @@ -2441,6 +2562,21 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-modules-systemjs@npm:^7.19.0": + version: 7.19.0 + resolution: "@babel/plugin-transform-modules-systemjs@npm:7.19.0" + dependencies: + "@babel/helper-hoist-variables": ^7.18.6 + "@babel/helper-module-transforms": ^7.19.0 + "@babel/helper-plugin-utils": ^7.19.0 + "@babel/helper-validator-identifier": ^7.18.6 + babel-plugin-dynamic-import-node: ^2.3.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: a0742deee4a076d6fc303d036c1ea2bea9b7d91af390483fe91fc415f9cb43925bb5dd930fdcb8fcdc9d4c7a22774a3cec521c67f1422a9b473debcb85ee57f9 + languageName: node + linkType: hard + "@babel/plugin-transform-modules-systemjs@npm:^7.19.6": version: 7.19.6 resolution: "@babel/plugin-transform-modules-systemjs@npm:7.19.6" @@ -2514,18 +2650,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-parameters@npm:^7.12.1, @babel/plugin-transform-parameters@npm:^7.20.1": - version: 7.20.5 - resolution: "@babel/plugin-transform-parameters@npm:7.20.5" - dependencies: - "@babel/helper-plugin-utils": ^7.20.2 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: fa588b0d8551e3e0cfde5fcb9d63a7acd38da199bee1851dd7e2abb34b3d754684defb1209a5669ecf0076d3d17ddc375b3f107da770b550a30402e4b9d7aa2f - languageName: node - linkType: hard - -"@babel/plugin-transform-parameters@npm:^7.18.8": +"@babel/plugin-transform-parameters@npm:^7.12.1, @babel/plugin-transform-parameters@npm:^7.18.8": version: 7.18.8 resolution: "@babel/plugin-transform-parameters@npm:7.18.8" dependencies: @@ -2536,6 +2661,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-parameters@npm:^7.20.1": + version: 7.20.5 + resolution: "@babel/plugin-transform-parameters@npm:7.20.5" + dependencies: + "@babel/helper-plugin-utils": ^7.20.2 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: fa588b0d8551e3e0cfde5fcb9d63a7acd38da199bee1851dd7e2abb34b3d754684defb1209a5669ecf0076d3d17ddc375b3f107da770b550a30402e4b9d7aa2f + languageName: node + linkType: hard + "@babel/plugin-transform-property-literals@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-property-literals@npm:7.18.6" @@ -2924,7 +3060,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.20.2, @babel/preset-env@npm:^7.12.11": +"@babel/preset-env@npm:7.20.2": version: 7.20.2 resolution: "@babel/preset-env@npm:7.20.2" dependencies: @@ -3009,6 +3145,91 @@ __metadata: languageName: node linkType: hard +"@babel/preset-env@npm:^7.12.11": + version: 7.19.4 + resolution: "@babel/preset-env@npm:7.19.4" + dependencies: + "@babel/compat-data": ^7.19.4 + "@babel/helper-compilation-targets": ^7.19.3 + "@babel/helper-plugin-utils": ^7.19.0 + "@babel/helper-validator-option": ^7.18.6 + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.18.6 + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.18.9 + "@babel/plugin-proposal-async-generator-functions": ^7.19.1 + "@babel/plugin-proposal-class-properties": ^7.18.6 + "@babel/plugin-proposal-class-static-block": ^7.18.6 + "@babel/plugin-proposal-dynamic-import": ^7.18.6 + "@babel/plugin-proposal-export-namespace-from": ^7.18.9 + "@babel/plugin-proposal-json-strings": ^7.18.6 + "@babel/plugin-proposal-logical-assignment-operators": ^7.18.9 + "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6 + "@babel/plugin-proposal-numeric-separator": ^7.18.6 + "@babel/plugin-proposal-object-rest-spread": ^7.19.4 + "@babel/plugin-proposal-optional-catch-binding": ^7.18.6 + "@babel/plugin-proposal-optional-chaining": ^7.18.9 + "@babel/plugin-proposal-private-methods": ^7.18.6 + "@babel/plugin-proposal-private-property-in-object": ^7.18.6 + "@babel/plugin-proposal-unicode-property-regex": ^7.18.6 + "@babel/plugin-syntax-async-generators": ^7.8.4 + "@babel/plugin-syntax-class-properties": ^7.12.13 + "@babel/plugin-syntax-class-static-block": ^7.14.5 + "@babel/plugin-syntax-dynamic-import": ^7.8.3 + "@babel/plugin-syntax-export-namespace-from": ^7.8.3 + "@babel/plugin-syntax-import-assertions": ^7.18.6 + "@babel/plugin-syntax-json-strings": ^7.8.3 + "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 + "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 + "@babel/plugin-syntax-numeric-separator": ^7.10.4 + "@babel/plugin-syntax-object-rest-spread": ^7.8.3 + "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 + "@babel/plugin-syntax-optional-chaining": ^7.8.3 + "@babel/plugin-syntax-private-property-in-object": ^7.14.5 + "@babel/plugin-syntax-top-level-await": ^7.14.5 + "@babel/plugin-transform-arrow-functions": ^7.18.6 + "@babel/plugin-transform-async-to-generator": ^7.18.6 + "@babel/plugin-transform-block-scoped-functions": ^7.18.6 + "@babel/plugin-transform-block-scoping": ^7.19.4 + "@babel/plugin-transform-classes": ^7.19.0 + "@babel/plugin-transform-computed-properties": ^7.18.9 + "@babel/plugin-transform-destructuring": ^7.19.4 + "@babel/plugin-transform-dotall-regex": ^7.18.6 + "@babel/plugin-transform-duplicate-keys": ^7.18.9 + "@babel/plugin-transform-exponentiation-operator": ^7.18.6 + "@babel/plugin-transform-for-of": ^7.18.8 + "@babel/plugin-transform-function-name": ^7.18.9 + "@babel/plugin-transform-literals": ^7.18.9 + "@babel/plugin-transform-member-expression-literals": ^7.18.6 + "@babel/plugin-transform-modules-amd": ^7.18.6 + "@babel/plugin-transform-modules-commonjs": ^7.18.6 + "@babel/plugin-transform-modules-systemjs": ^7.19.0 + "@babel/plugin-transform-modules-umd": ^7.18.6 + "@babel/plugin-transform-named-capturing-groups-regex": ^7.19.1 + "@babel/plugin-transform-new-target": ^7.18.6 + "@babel/plugin-transform-object-super": ^7.18.6 + "@babel/plugin-transform-parameters": ^7.18.8 + "@babel/plugin-transform-property-literals": ^7.18.6 + "@babel/plugin-transform-regenerator": ^7.18.6 + "@babel/plugin-transform-reserved-words": ^7.18.6 + "@babel/plugin-transform-shorthand-properties": ^7.18.6 + "@babel/plugin-transform-spread": ^7.19.0 + "@babel/plugin-transform-sticky-regex": ^7.18.6 + "@babel/plugin-transform-template-literals": ^7.18.9 + "@babel/plugin-transform-typeof-symbol": ^7.18.9 + "@babel/plugin-transform-unicode-escapes": ^7.18.10 + "@babel/plugin-transform-unicode-regex": ^7.18.6 + "@babel/preset-modules": ^0.1.5 + "@babel/types": ^7.19.4 + babel-plugin-polyfill-corejs2: ^0.3.3 + babel-plugin-polyfill-corejs3: ^0.6.0 + babel-plugin-polyfill-regenerator: ^0.4.1 + core-js-compat: ^3.25.1 + semver: ^6.3.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: f12af25281f3c5e7df60fa1e79ad481ddd7f6a111d4c0fabcffdabf0eaed3a01b4f8c647ae5445ed1f58df70f52083ffd283e8919ade7afa73801a49c733d22c + languageName: node + linkType: hard + "@babel/preset-flow@npm:^7.12.1": version: 7.18.6 resolution: "@babel/preset-flow@npm:7.18.6" @@ -3117,7 +3338,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.7.6": +"@babel/runtime@npm:^7.20.0": version: 7.20.6 resolution: "@babel/runtime@npm:7.20.6" dependencies: @@ -3127,15 +3348,15 @@ __metadata: linkType: hard "@babel/runtime@npm:^7.20.7": - version: 7.20.7 - resolution: "@babel/runtime@npm:7.20.7" + version: 7.20.13 + resolution: "@babel/runtime@npm:7.20.13" dependencies: regenerator-runtime: ^0.13.11 - checksum: 4629ce5c46f06cca9cfb9b7fc00d48003335a809888e2b91ec2069a2dcfbfef738480cff32ba81e0b7c290f8918e5c22ddcf2b710001464ee84ba62c7e32a3a3 + checksum: 09b7a97a05c80540db6c9e4ddf8c5d2ebb06cae5caf3a87e33c33f27f8c4d49d9c67a2d72f1570e796045288fad569f98a26ceba0c4f5fad2af84b6ad855c4fb languageName: node linkType: hard -"@babel/runtime@npm:^7.3.1": +"@babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.7.6": version: 7.19.4 resolution: "@babel/runtime@npm:7.19.4" dependencies: @@ -3199,7 +3420,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.6": +"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.4, @babel/traverse@npm:^7.19.6": version: 7.19.6 resolution: "@babel/traverse@npm:7.19.6" dependencies: @@ -3217,24 +3438,6 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.17.9, @babel/traverse@npm:^7.20.1, @babel/traverse@npm:^7.20.5": - version: 7.20.5 - resolution: "@babel/traverse@npm:7.20.5" - dependencies: - "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.20.5 - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-function-name": ^7.19.0 - "@babel/helper-hoist-variables": ^7.18.6 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.20.5 - "@babel/types": ^7.20.5 - debug: ^4.1.0 - globals: ^11.1.0 - checksum: c7fed468614aab1cf762dda5df26e2cfcd2b1b448c9d3321ac44786c4ee773fb0e10357e6593c3c6a648ae2e0be6d90462d855998dc10e3abae84de99291e008 - languageName: node - linkType: hard - "@babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.15.4": version: 7.15.4 resolution: "@babel/traverse@npm:7.15.4" @@ -3305,6 +3508,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.17.9, @babel/traverse@npm:^7.20.1, @babel/traverse@npm:^7.20.5": + version: 7.20.5 + resolution: "@babel/traverse@npm:7.20.5" + dependencies: + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.20.5 + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-function-name": ^7.19.0 + "@babel/helper-hoist-variables": ^7.18.6 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/parser": ^7.20.5 + "@babel/types": ^7.20.5 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: c7fed468614aab1cf762dda5df26e2cfcd2b1b448c9d3321ac44786c4ee773fb0e10357e6593c3c6a648ae2e0be6d90462d855998dc10e3abae84de99291e008 + languageName: node + linkType: hard + "@babel/traverse@npm:^7.18.0, @babel/traverse@npm:^7.18.2": version: 7.18.2 resolution: "@babel/traverse@npm:7.18.2" @@ -3359,6 +3580,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.19.0": + version: 7.19.0 + resolution: "@babel/traverse@npm:7.19.0" + dependencies: + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.19.0 + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-function-name": ^7.19.0 + "@babel/helper-hoist-variables": ^7.18.6 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/parser": ^7.19.0 + "@babel/types": ^7.19.0 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: dcbd1316c9f4bf3cefee45b6f5194590563aa5d123500a60d3c8d714bef279205014c8e599ebafc469967199a7622e1444cd0235c16d4243da437e3f1281771e + languageName: node + linkType: hard + "@babel/types@npm:^7.0.0, @babel/types@npm:^7.15.4, @babel/types@npm:^7.15.6, @babel/types@npm:^7.2.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.15.6 resolution: "@babel/types@npm:7.15.6" @@ -3369,18 +3608,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.12.11, @babel/types@npm:^7.12.7, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5": - version: 7.20.5 - resolution: "@babel/types@npm:7.20.5" - dependencies: - "@babel/helper-string-parser": ^7.19.4 - "@babel/helper-validator-identifier": ^7.19.1 - to-fast-properties: ^2.0.0 - checksum: 773f0a1ad9f6ca5c5beaf751d1d8d81b9130de87689d1321fc911d73c3b1167326d66f0ae086a27fb5bfc8b4ee3ffebf1339be50d3b4d8015719692468c31f2d - languageName: node - linkType: hard - -"@babel/types@npm:^7.14.8, @babel/types@npm:^7.19.4": +"@babel/types@npm:^7.12.11, @babel/types@npm:^7.12.7, @babel/types@npm:^7.14.8, @babel/types@npm:^7.19.4": version: 7.19.4 resolution: "@babel/types@npm:7.19.4" dependencies: @@ -3473,6 +3701,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5": + version: 7.20.5 + resolution: "@babel/types@npm:7.20.5" + dependencies: + "@babel/helper-string-parser": ^7.19.4 + "@babel/helper-validator-identifier": ^7.19.1 + to-fast-properties: ^2.0.0 + checksum: 773f0a1ad9f6ca5c5beaf751d1d8d81b9130de87689d1321fc911d73c3b1167326d66f0ae086a27fb5bfc8b4ee3ffebf1339be50d3b4d8015719692468c31f2d + languageName: node + linkType: hard + "@base2/pretty-print-object@npm:1.0.1": version: 1.0.1 resolution: "@base2/pretty-print-object@npm:1.0.1" @@ -4281,6 +4520,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm@npm:0.15.12": + version: 0.15.12 + resolution: "@esbuild/android-arm@npm:0.15.12" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + "@esbuild/android-arm@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/android-arm@npm:0.16.17" @@ -4344,6 +4590,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-loong64@npm:0.15.12": + version: 0.15.12 + resolution: "@esbuild/linux-loong64@npm:0.15.12" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + "@esbuild/linux-loong64@npm:0.16.17": version: 0.16.17 resolution: "@esbuild/linux-loong64@npm:0.16.17" @@ -4853,7 +5106,7 @@ __metadata: languageName: node linkType: hard -"@grafana/runtime@9.4.0-pre, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime": +"@grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime": version: 0.0.0-use.local resolution: "@grafana/runtime@workspace:packages/grafana-runtime" dependencies: @@ -5195,7 +5448,18 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.11.6, @humanwhocodes/config-array@npm:^0.11.8": +"@humanwhocodes/config-array@npm:^0.11.6": + version: 0.11.7 + resolution: "@humanwhocodes/config-array@npm:0.11.7" + dependencies: + "@humanwhocodes/object-schema": ^1.2.1 + debug: ^4.1.1 + minimatch: ^3.0.5 + checksum: cf506dc45d9488af7fbf108ea6ac2151ba1a25e6d2b94b9b4fc36d2c1e4099b89ff560296dbfa13947e44604d4ca4a90d97a4fb167370bf8dd01a6ca2b6d83ac + languageName: node + linkType: hard + +"@humanwhocodes/config-array@npm:^0.11.8": version: 0.11.8 resolution: "@humanwhocodes/config-array@npm:0.11.8" dependencies: @@ -5302,56 +5566,6 @@ __metadata: languageName: node linkType: hard -"@jaegertracing/jaeger-ui-components@workspace:*, @jaegertracing/jaeger-ui-components@workspace:packages/jaeger-ui-components": - version: 0.0.0-use.local - resolution: "@jaegertracing/jaeger-ui-components@workspace:packages/jaeger-ui-components" - dependencies: - "@emotion/css": 11.10.5 - "@grafana/data": 9.4.0-pre - "@grafana/e2e-selectors": 9.4.0-pre - "@grafana/runtime": 9.4.0-pre - "@grafana/tsconfig": ^1.2.0-rc1 - "@grafana/ui": 9.4.0-pre - "@testing-library/jest-dom": 5.16.5 - "@testing-library/react": 12.1.4 - "@testing-library/user-event": 14.4.3 - "@types/deep-freeze": ^0.1.1 - "@types/hoist-non-react-statics": ^3.3.1 - "@types/jest": 29.2.3 - "@types/lodash": 4.14.187 - "@types/prop-types": 15.7.5 - "@types/react": 17.0.42 - "@types/react-icons": 2.2.7 - "@types/sinon": ^10.0.13 - "@types/slate-react": 0.22.9 - "@types/testing-library__jest-dom": 5.14.5 - "@types/tinycolor2": 1.4.3 - chance: ^1.0.10 - classnames: ^2.2.5 - combokeys: ^3.0.0 - copy-to-clipboard: ^3.1.0 - deep-freeze: ^0.0.1 - fuzzy: ^0.1.3 - hoist-non-react-statics: ^3.3.2 - json-markup: ^1.1.0 - lodash: 4.17.21 - lru-memoize: ^1.1.0 - memoize-one: 6.0.0 - moment: 2.29.4 - moment-timezone: 0.5.38 - prop-types: 15.8.1 - react: 17.0.2 - react-dom: 17.0.2 - react-icons: 2.2.7 - reselect: 4.1.6 - sinon: 14.0.1 - tinycolor2: 1.4.2 - tslib: 2.4.1 - tween-functions: ^1.2.0 - typescript: 4.8.4 - languageName: unknown - linkType: soft - "@jest/console@npm:^27.5.1": version: 27.5.1 resolution: "@jest/console@npm:27.5.1" @@ -7709,7 +7923,7 @@ __metadata: languageName: node linkType: hard -"@pmmmwh/react-refresh-webpack-plugin@npm:0.5.8": +"@pmmmwh/react-refresh-webpack-plugin@npm:0.5.8, @pmmmwh/react-refresh-webpack-plugin@npm:^0.5.3": version: 0.5.8 resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.8" dependencies: @@ -7748,45 +7962,6 @@ __metadata: languageName: node linkType: hard -"@pmmmwh/react-refresh-webpack-plugin@npm:^0.5.3": - version: 0.5.10 - resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.10" - dependencies: - ansi-html-community: ^0.0.8 - common-path-prefix: ^3.0.0 - core-js-pure: ^3.23.3 - error-stack-parser: ^2.0.6 - find-up: ^5.0.0 - html-entities: ^2.1.0 - loader-utils: ^2.0.4 - schema-utils: ^3.0.0 - source-map: ^0.7.3 - peerDependencies: - "@types/webpack": 4.x || 5.x - react-refresh: ">=0.10.0 <1.0.0" - sockjs-client: ^1.4.0 - type-fest: ">=0.17.0 <4.0.0" - webpack: ">=4.43.0 <6.0.0" - webpack-dev-server: 3.x || 4.x - webpack-hot-middleware: 2.x - webpack-plugin-serve: 0.x || 1.x - peerDependenciesMeta: - "@types/webpack": - optional: true - sockjs-client: - optional: true - type-fest: - optional: true - webpack-dev-server: - optional: true - webpack-hot-middleware: - optional: true - webpack-plugin-serve: - optional: true - checksum: c45beded9c56fbbdc7213a2c36131ace5db360ed704d462cc39d6678f980173a91c9a3f691e6bd3a026f25486644cd0027e8a12a0a4eced8e8b886a0472e7d34 - languageName: node - linkType: hard - "@polka/url@npm:^1.0.0-next.20": version: 1.0.0-next.21 resolution: "@polka/url@npm:1.0.0-next.21" @@ -10776,13 +10951,6 @@ __metadata: languageName: node linkType: hard -"@types/deep-freeze@npm:^0.1.1": - version: 0.1.2 - resolution: "@types/deep-freeze@npm:0.1.2" - checksum: 16a9f73ad2753049ae3d3b6d2b2d972bb47f21e237fd4a3d2a7b36bac9f69bd2b8671209d5d47d493e92861e283b1e999ec81260b158dd08d1855f8086ac8d40 - languageName: node - linkType: hard - "@types/dompurify@npm:^2": version: 2.4.0 resolution: "@types/dompurify@npm:2.4.0" @@ -10793,12 +10961,12 @@ __metadata: linkType: hard "@types/eslint-scope@npm:^3.7.3": - version: 3.7.4 - resolution: "@types/eslint-scope@npm:3.7.4" + version: 3.7.3 + resolution: "@types/eslint-scope@npm:3.7.3" dependencies: "@types/eslint": "*" "@types/estree": "*" - checksum: ea6a9363e92f301cd3888194469f9ec9d0021fe0a397a97a6dd689e7545c75de0bd2153dfb13d3ab532853a278b6572c6f678ce846980669e41029d205653460 + checksum: 6772b05e1b92003d1f295e81bc847a61f4fbe8ddab77ffa49e84ed3f9552513bdde677eb53ef167753901282857dd1d604d9f82eddb34a233495932b2dc3dc17 languageName: node linkType: hard @@ -10991,7 +11159,7 @@ __metadata: languageName: node linkType: hard -"@types/hoist-non-react-statics@npm:3.3.1, @types/hoist-non-react-statics@npm:^3.3.0, @types/hoist-non-react-statics@npm:^3.3.1": +"@types/hoist-non-react-statics@npm:3.3.1, @types/hoist-non-react-statics@npm:^3.3.0": version: 3.3.1 resolution: "@types/hoist-non-react-statics@npm:3.3.1" dependencies: @@ -11002,9 +11170,9 @@ __metadata: linkType: hard "@types/html-minifier-terser@npm:^6.0.0": - version: 6.1.0 - resolution: "@types/html-minifier-terser@npm:6.1.0" - checksum: eb843f6a8d662d44fb18ec61041117734c6aae77aa38df1be3b4712e8e50ffaa35f1e1c92fdd0fde14a5675fecf457abcd0d15a01fae7506c91926176967f452 + version: 6.0.0 + resolution: "@types/html-minifier-terser@npm:6.0.0" + checksum: 8f602498d726c9fd30d2b895478b4e7cb1f91558d892e44f54533669dbbbfae572c5fb2b04ee4fa5cbe7f8d59982d2067bf5c2931a3aefcf8dac590e4494b103 languageName: node linkType: hard @@ -11221,9 +11389,9 @@ __metadata: linkType: hard "@types/lodash@npm:^4.14.167": - version: 4.14.191 - resolution: "@types/lodash@npm:4.14.191" - checksum: ba0d5434e10690869f32d5ea49095250157cae502f10d57de0a723fd72229ce6c6a4979576f0f13e0aa9fbe3ce2457bfb9fa7d4ec3d6daba56730a51906d1491 + version: 4.14.186 + resolution: "@types/lodash@npm:4.14.186" + checksum: ee0c1368a8100bb6efb88335107473a41928fc307ff1ef4ff1278868ccddba9c04c68c36d1ffe3a0392ef4a956e1955f7de3203ec09df4f1655dd1b88485c549 languageName: node linkType: hard @@ -11354,9 +11522,9 @@ __metadata: linkType: hard "@types/node@npm:^14.0.10 || ^16.0.0, @types/node@npm:^14.14.20 || ^16.0.0": - version: 16.18.10 - resolution: "@types/node@npm:16.18.10" - checksum: 1b138616923e9a1c6d3806edf75714b605d2ec689357cdc675bc73816c508ff11b3c68df054b02a496c76654d8ed53add2e90816af39423431c73aa6eec06f29 + version: 16.18.0 + resolution: "@types/node@npm:16.18.0" + checksum: 4eb4b88012c7d3f527c1b4989cf085479d44ce418fb047fb8d3b545601a3e1fc436de8491b9734debeda8eae241963fb802cea87a5a5698bf5f6f3d489d446a8 languageName: node linkType: hard @@ -11455,13 +11623,6 @@ __metadata: languageName: node linkType: hard -"@types/prop-types@npm:15.7.5": - version: 15.7.5 - resolution: "@types/prop-types@npm:15.7.5" - checksum: 5b43b8b15415e1f298243165f1d44390403bb2bd42e662bca3b5b5633fdd39c938e91b7fce3a9483699db0f7a715d08cef220c121f723a634972fdf596aec980 - languageName: node - linkType: hard - "@types/qs@npm:*, @types/qs@npm:^6.9.5": version: 6.9.7 resolution: "@types/qs@npm:6.9.7" @@ -11560,25 +11721,6 @@ __metadata: languageName: node linkType: hard -"@types/react-icon-base@npm:*": - version: 2.1.4 - resolution: "@types/react-icon-base@npm:2.1.4" - dependencies: - "@types/react": "*" - checksum: 67b5d22c6234946b2b2dd137e75902642762248da190fbf3110f0d4c101fc435e19cc4a19866887868e77ef9ce4e5cdc2eb899a52ae5103f143de1ab6aaef85b - languageName: node - linkType: hard - -"@types/react-icons@npm:2.2.7": - version: 2.2.7 - resolution: "@types/react-icons@npm:2.2.7" - dependencies: - "@types/react": "*" - "@types/react-icon-base": "*" - checksum: b395741c537820af5b75852eed7909d203956711a296bebb8103f6e62ced9f6b4876805b4128a5b9a15f4566d2a63e3bedd6b565be5963b940e97c57c86d4db9 - languageName: node - linkType: hard - "@types/react-redux@npm:7.1.24": version: 7.1.24 resolution: "@types/react-redux@npm:7.1.24" @@ -11828,7 +11970,7 @@ __metadata: languageName: node linkType: hard -"@types/sinon@npm:10.0.13, @types/sinon@npm:^10.0.13": +"@types/sinon@npm:10.0.13": version: 10.0.13 resolution: "@types/sinon@npm:10.0.13" dependencies: @@ -13135,7 +13277,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.0, acorn@npm:^8.1.0, acorn@npm:^8.5.0": +"acorn@npm:^8.0.0, acorn@npm:^8.1.0": version: 8.8.1 resolution: "acorn@npm:8.8.1" bin: @@ -13153,6 +13295,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.5.0": + version: 8.7.0 + resolution: "acorn@npm:8.7.0" + bin: + acorn: bin/acorn + checksum: e0f79409d68923fbf1aa6d4166f3eedc47955320d25c89a20cc822e6ba7c48c5963d5bc657bc242d68f7a4ac9faf96eef033e8f73656da6c640d4219935fdfd0 + languageName: node + linkType: hard + "acorn@npm:^8.7.1": version: 8.7.1 resolution: "acorn@npm:8.7.1" @@ -13672,16 +13823,16 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.0.3, array-includes@npm:^3.1.6": - version: 3.1.6 - resolution: "array-includes@npm:3.1.6" +"array-includes@npm:^3.0.3, array-includes@npm:^3.1.5": + version: 3.1.5 + resolution: "array-includes@npm:3.1.5" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.20.4 - get-intrinsic: ^1.1.3 + es-abstract: ^1.19.5 + get-intrinsic: ^1.1.1 is-string: ^1.0.7 - checksum: f22f8cd8ba8a6448d91eebdc69f04e4e55085d09232b5216ee2d476dab3ef59984e8d1889e662c6a0ed939dcb1b57fd05b2c0209c3370942fc41b752c82a2ca5 + checksum: f6f24d834179604656b7bec3e047251d5cc87e9e87fab7c175c61af48e80e75acd296017abcde21fb52292ab6a2a449ab2ee37213ee48c8709f004d75983f9c5 languageName: node linkType: hard @@ -13698,16 +13849,16 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.1.5": - version: 3.1.5 - resolution: "array-includes@npm:3.1.5" +"array-includes@npm:^3.1.6": + version: 3.1.6 + resolution: "array-includes@npm:3.1.6" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.19.5 - get-intrinsic: ^1.1.1 + es-abstract: ^1.20.4 + get-intrinsic: ^1.1.3 is-string: ^1.0.7 - checksum: f6f24d834179604656b7bec3e047251d5cc87e9e87fab7c175c61af48e80e75acd296017abcde21fb52292ab6a2a449ab2ee37213ee48c8709f004d75983f9c5 + checksum: f22f8cd8ba8a6448d91eebdc69f04e4e55085d09232b5216ee2d476dab3ef59984e8d1889e662c6a0ed939dcb1b57fd05b2c0209c3370942fc41b752c82a2ca5 languageName: node linkType: hard @@ -13748,19 +13899,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.flat@npm:^1.2.1": - version: 1.3.1 - resolution: "array.prototype.flat@npm:1.3.1" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - es-shim-unscopables: ^1.0.0 - checksum: 5a8415949df79bf6e01afd7e8839bbde5a3581300e8ad5d8449dea52639e9e59b26a467665622783697917b43bf39940a6e621877c7dd9b3d1c1f97484b9b88b - languageName: node - linkType: hard - -"array.prototype.flat@npm:^1.2.5": +"array.prototype.flat@npm:^1.2.1, array.prototype.flat@npm:^1.2.5": version: 1.3.0 resolution: "array.prototype.flat@npm:1.3.0" dependencies: @@ -13772,15 +13911,15 @@ __metadata: languageName: node linkType: hard -"array.prototype.flatmap@npm:^1.2.1, array.prototype.flatmap@npm:^1.3.1": - version: 1.3.1 - resolution: "array.prototype.flatmap@npm:1.3.1" +"array.prototype.flatmap@npm:^1.2.1, array.prototype.flatmap@npm:^1.3.0": + version: 1.3.0 + resolution: "array.prototype.flatmap@npm:1.3.0" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 + define-properties: ^1.1.3 + es-abstract: ^1.19.2 es-shim-unscopables: ^1.0.0 - checksum: 8c1c43a4995f12cf12523436da28515184c753807b3f0bc2ca6c075f71c470b099e2090cc67dba8e5280958fea401c1d0c59e1db0143272aef6cd1103921a987 + checksum: 818538f39409c4045d874be85df0dbd195e1446b14d22f95bdcfefea44ae77db44e42dcd89a559254ec5a7c8b338cfc986cc6d641e3472f9a5326b21eb2976a2 languageName: node linkType: hard @@ -13795,41 +13934,41 @@ __metadata: languageName: node linkType: hard -"array.prototype.flatmap@npm:^1.3.0": - version: 1.3.0 - resolution: "array.prototype.flatmap@npm:1.3.0" +"array.prototype.flatmap@npm:^1.3.1": + version: 1.3.1 + resolution: "array.prototype.flatmap@npm:1.3.1" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + es-shim-unscopables: ^1.0.0 + checksum: 8c1c43a4995f12cf12523436da28515184c753807b3f0bc2ca6c075f71c470b099e2090cc67dba8e5280958fea401c1d0c59e1db0143272aef6cd1103921a987 + languageName: node + linkType: hard + +"array.prototype.map@npm:^1.0.4": + version: 1.0.4 + resolution: "array.prototype.map@npm:1.0.4" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.1.3 + es-abstract: ^1.19.0 + es-array-method-boxes-properly: ^1.0.0 + is-string: ^1.0.7 + checksum: 08c8065ae9e60585c1262e54556da2340cd140dc799d790843c1f4ad3a3f458e9866d147c8ff0308741e8316904313f682803ca15c179f65cb2f5b993fa71a82 + languageName: node + linkType: hard + +"array.prototype.reduce@npm:^1.0.4": + version: 1.0.4 + resolution: "array.prototype.reduce@npm:1.0.4" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.3 es-abstract: ^1.19.2 - es-shim-unscopables: ^1.0.0 - checksum: 818538f39409c4045d874be85df0dbd195e1446b14d22f95bdcfefea44ae77db44e42dcd89a559254ec5a7c8b338cfc986cc6d641e3472f9a5326b21eb2976a2 - languageName: node - linkType: hard - -"array.prototype.map@npm:^1.0.5": - version: 1.0.5 - resolution: "array.prototype.map@npm:1.0.5" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 es-array-method-boxes-properly: ^1.0.0 is-string: ^1.0.7 - checksum: 70c4ecdd39480a51cfe84d18e4839a5f05d0b5d2785fee6838cd2bd5f86a17340a734ce7bb90c16804a70cead214b6f42c3d285f92267e11ccc0abd1880fe3b5 - languageName: node - linkType: hard - -"array.prototype.reduce@npm:^1.0.5": - version: 1.0.5 - resolution: "array.prototype.reduce@npm:1.0.5" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - es-array-method-boxes-properly: ^1.0.0 - is-string: ^1.0.7 - checksum: f44691395f9202aba5ec2446468d4c27209bfa81464f342ae024b7157dbf05b164e47cca01250b8c7c2a8219953fb57651cca16aab3d16f43b85c0d92c26eef3 + checksum: 6a57a1a2d3b77a9543db139cd52211f43a5af8e8271cb3c173be802076e3a6f71204ba8f090f5937ebc0842d5876db282f0f63dffd0e86b153e6e5a45681e4a5 languageName: node linkType: hard @@ -14137,22 +14276,7 @@ __metadata: languageName: node linkType: hard -"babel-loader@npm:^8.0.0": - version: 8.3.0 - resolution: "babel-loader@npm:8.3.0" - dependencies: - find-cache-dir: ^3.3.1 - loader-utils: ^2.0.0 - make-dir: ^3.1.0 - schema-utils: ^2.6.5 - peerDependencies: - "@babel/core": ^7.0.0 - webpack: ">=2" - checksum: d48bcf9e030e598656ad3ff5fb85967db2eaaf38af5b4a4b99d25618a2057f9f100e6b231af2a46c1913206db506115ca7a8cbdf52c9c73d767070dae4352ab5 - languageName: node - linkType: hard - -"babel-loader@npm:^8.2.5": +"babel-loader@npm:^8.0.0, babel-loader@npm:^8.2.5": version: 8.2.5 resolution: "babel-loader@npm:8.2.5" dependencies: @@ -14888,7 +15012,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.0.0, browserslist@npm:^4.16.6, browserslist@npm:^4.17.5": +"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.16.6, browserslist@npm:^4.17.5": version: 4.17.5 resolution: "browserslist@npm:4.17.5" dependencies: @@ -14903,7 +15027,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.12.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.3, browserslist@npm:^4.21.4": +"browserslist@npm:^4.12.0, browserslist@npm:^4.21.3, browserslist@npm:^4.21.4": version: 4.21.4 resolution: "browserslist@npm:4.21.4" dependencies: @@ -15180,9 +15304,9 @@ __metadata: linkType: hard "call-me-maybe@npm:^1.0.1": - version: 1.0.2 - resolution: "call-me-maybe@npm:1.0.2" - checksum: 42ff2d0bed5b207e3f0122589162eaaa47ba618f79ad2382fe0ba14d9e49fbf901099a6227440acc5946f86a4953e8aa2d242b330b0a5de4d090bb18f8935cae + version: 1.0.1 + resolution: "call-me-maybe@npm:1.0.1" + checksum: d19e9d6ac2c6a83fb1215718b64c5e233f688ebebb603bdfe4af59cde952df1f2b648530fab555bf290ea910d69d7d9665ebc916e871e0e194f47c2e48e4886b languageName: node linkType: hard @@ -15293,9 +15417,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001109": - version: 1.0.30001439 - resolution: "caniuse-lite@npm:1.0.30001439" - checksum: 3912dd536c9735713ca85e47721988bbcefb881ddb4886b0b9923fa984247fd22cba032cf268e57d158af0e8a2ae2eae042ae01942a1d6d7849fa9fa5d62fb82 + version: 1.0.30001423 + resolution: "caniuse-lite@npm:1.0.30001423" + checksum: fe443f323f5dc6a858ef7d7deddb93db5e5f9a35e22970c4a65c4ef793bb696c1e2f038df572722d9edf29021e43ed16f5131faafde783563bd0d9eccf486592 languageName: node linkType: hard @@ -15442,9 +15566,9 @@ __metadata: linkType: hard "chance@npm:^1.0.10": - version: 1.1.8 - resolution: "chance@npm:1.1.8" - checksum: e733f51e1094d7b0343a9e79f38599086442e6284fc2789cf9e072c71a0070874a1b340f9fffe4e66260899733f768cf113434be466ecb0016e3afcb60add3ee + version: 1.1.9 + resolution: "chance@npm:1.1.9" + checksum: 57d09fd404ffb87f5e106705c28c38a77cb0a6d96f3828d63052947a12d62d65f40a100d74b123bea3d5ebce3b53333a93d3b81783c64d8473788a0ce6b6e8db languageName: node linkType: hard @@ -15674,12 +15798,12 @@ __metadata: languageName: node linkType: hard -"clean-css@npm:^5.2.2": - version: 5.3.1 - resolution: "clean-css@npm:5.3.1" +"clean-css@npm:^5.1.5": + version: 5.2.2 + resolution: "clean-css@npm:5.2.2" dependencies: source-map: ~0.6.0 - checksum: 860696c60503cbfec480b5f92f62729246304b55950571af7292f2687b57f86b277f2b9fefe6f64643d409008018b78383972b55c2cc859792dcc8658988fb16 + checksum: 10855820829b8b6ea94e462313fdc177b297aca5c7870a969591549d6a766824f912b5e58773bd345b2a7effae863ab492258b5a77a40029fba6d11d861cbee3 languageName: node linkType: hard @@ -15777,6 +15901,17 @@ __metadata: languageName: node linkType: hard +"cliui@npm:^8.0.1": + version: 8.0.1 + resolution: "cliui@npm:8.0.1" + dependencies: + string-width: ^4.2.0 + strip-ansi: ^6.0.1 + wrap-ansi: ^7.0.0 + checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56 + languageName: node + linkType: hard + "clone-buffer@npm:^1.0.0": version: 1.0.0 resolution: "clone-buffer@npm:1.0.0" @@ -16058,7 +16193,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:8.3.0, commander@npm:^8.3.0": +"commander@npm:8.3.0, commander@npm:^8.1.0, commander@npm:^8.3.0": version: 8.3.0 resolution: "commander@npm:8.3.0" checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0 @@ -16093,6 +16228,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^9.4.0": + version: 9.4.0 + resolution: "commander@npm:9.4.0" + checksum: a322de584a6ccd1ea83c24f6a660e52d16ffbe2613fcfbb8d2cc68bc9dec637492456d754fe8bb5b039ad843ed8e04fb0b107e581a75f62cde9e1a0ab1546e09 + languageName: node + linkType: hard + "commander@npm:^9.4.1, commander@npm:~9.4.1": version: 9.4.1 resolution: "commander@npm:9.4.1" @@ -16413,7 +16555,7 @@ __metadata: languageName: node linkType: hard -"copy-to-clipboard@npm:^3.1.0, copy-to-clipboard@npm:^3.3.1": +"copy-to-clipboard@npm:^3.3.1": version: 3.3.1 resolution: "copy-to-clipboard@npm:3.3.1" dependencies: @@ -16485,11 +16627,11 @@ __metadata: linkType: hard "core-js-compat@npm:^3.8.1": - version: 3.26.1 - resolution: "core-js-compat@npm:3.26.1" + version: 3.26.0 + resolution: "core-js-compat@npm:3.26.0" dependencies: browserslist: ^4.21.4 - checksum: f222bce0002eae405327d68286e1d566037e8ac21906a47d7ecd15858adca7b12e82140db11dc43c8cc1fc066c5306120f3c27bfb2d7dbc2d20a72a2d90d38dc + checksum: 120780ec33d441e476810abac9bf57199c2083006b179dc23d0ab0cfea096eff2a2fc3e9cb315d245735df661cfa4b76a8b8c37f5056fd02428a3cd2ea1d9f36 languageName: node linkType: hard @@ -16515,9 +16657,9 @@ __metadata: linkType: hard "core-js@npm:^3.0.4": - version: 3.26.1 - resolution: "core-js@npm:3.26.1" - checksum: 0a01149f51ff1e9f41d1ea49cc4c9222047949ea597189ede7c4cf8cde3b097766b9c7615acc77c86fe65b4002f20b638a133dfba7b41dba830d707aeeed45ad + version: 3.26.0 + resolution: "core-js@npm:3.26.0" + checksum: 0149eb9d3909fde9c17626af3a6e625c326e8598d0bb5e6c5b48a18e5fcd4eaf48d4964d873667d8148542ff590fb98eb3f93618da114ca54999d6bc0349734b languageName: node linkType: hard @@ -17787,13 +17929,6 @@ __metadata: languageName: node linkType: hard -"deep-freeze@npm:^0.0.1": - version: 0.0.1 - resolution: "deep-freeze@npm:0.0.1" - checksum: 1e43c98e44c7849382d9f896e679d48a1b5bf40993f7cc858e3730ef4e2ba387b9b7b7fe722cac34febe7f6a564cd242c27bbc319e8df793c2a287f21e5ba038 - languageName: node - linkType: hard - "deep-is@npm:^0.1.3, deep-is@npm:~0.1.3": version: 0.1.4 resolution: "deep-is@npm:0.1.4" @@ -18617,12 +18752,22 @@ __metadata: linkType: hard "enhanced-resolve@npm:^5.10.0": - version: 5.12.0 - resolution: "enhanced-resolve@npm:5.12.0" + version: 5.10.0 + resolution: "enhanced-resolve@npm:5.10.0" dependencies: graceful-fs: ^4.2.4 tapable: ^2.2.0 - checksum: bf3f787facaf4ce3439bef59d148646344e372bef5557f0d37ea8aa02c51f50a925cd1f07b8d338f18992c29f544ec235a8c64bcdb56030196c48832a5494174 + checksum: 0bb9830704db271610f900e8d79d70a740ea16f251263362b0c91af545576d09fe50103496606c1300a05e588372d6f9780a9bc2e30ce8ef9b827ec8f44687ff + languageName: node + linkType: hard + +"enhanced-resolve@npm:^5.9.2": + version: 5.9.2 + resolution: "enhanced-resolve@npm:5.9.2" + dependencies: + graceful-fs: ^4.2.4 + tapable: ^2.2.0 + checksum: 792b7a01abb4ee4433b658c71f92d5948675938e0c03cad1732abe843b87395f15cb880ace4f819f78ead94163278283afc79b8be63c0eddca8ab45f7d8c515d languageName: node linkType: hard @@ -18649,7 +18794,7 @@ __metadata: languageName: node linkType: hard -"entities@npm:^4.2.0, entities@npm:^4.4.0": +"entities@npm:^4.2.0, entities@npm:^4.3.1, entities@npm:^4.4.0": version: 4.4.0 resolution: "entities@npm:4.4.0" checksum: 84d250329f4b56b40fa93ed067b194db21e8815e4eb9b59f43a086f0ecd342814f6bc483de8a77da5d64e0f626033192b1b4f1792232a7ea6b970ebe0f3187c2 @@ -18809,6 +18954,38 @@ __metadata: languageName: node linkType: hard +"es-abstract@npm:^1.20.1": + version: 1.20.4 + resolution: "es-abstract@npm:1.20.4" + dependencies: + call-bind: ^1.0.2 + es-to-primitive: ^1.2.1 + function-bind: ^1.1.1 + function.prototype.name: ^1.1.5 + get-intrinsic: ^1.1.3 + get-symbol-description: ^1.0.0 + has: ^1.0.3 + has-property-descriptors: ^1.0.0 + has-symbols: ^1.0.3 + internal-slot: ^1.0.3 + is-callable: ^1.2.7 + is-negative-zero: ^2.0.2 + is-regex: ^1.1.4 + is-shared-array-buffer: ^1.0.2 + is-string: ^1.0.7 + is-weakref: ^1.0.2 + object-inspect: ^1.12.2 + object-keys: ^1.1.1 + object.assign: ^4.1.4 + regexp.prototype.flags: ^1.4.3 + safe-regex-test: ^1.0.0 + string.prototype.trimend: ^1.0.5 + string.prototype.trimstart: ^1.0.5 + unbox-primitive: ^1.0.2 + checksum: 89297cc785c31aedf961a603d5a07ed16471e435d3a1b6d070b54f157cf48454b95cda2ac55e4b86ff4fe3276e835fcffd2771578e6fa634337da49b26826141 + languageName: node + linkType: hard + "es-abstract@npm:^1.20.4": version: 1.21.1 resolution: "es-abstract@npm:1.21.1" @@ -18956,7 +19133,105 @@ __metadata: languageName: node linkType: hard -"esbuild-loader@npm:2.21.0, esbuild-loader@npm:^2.10.0": +"esbuild-android-64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-android-64@npm:0.15.12" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + +"esbuild-android-arm64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-android-arm64@npm:0.15.12" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-darwin-64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-darwin-64@npm:0.15.12" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"esbuild-darwin-arm64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-darwin-arm64@npm:0.15.12" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-freebsd-64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-freebsd-64@npm:0.15.12" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"esbuild-freebsd-arm64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-freebsd-arm64@npm:0.15.12" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-linux-32@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-linux-32@npm:0.15.12" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + +"esbuild-linux-64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-linux-64@npm:0.15.12" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + +"esbuild-linux-arm64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-linux-arm64@npm:0.15.12" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-linux-arm@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-linux-arm@npm:0.15.12" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"esbuild-linux-mips64le@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-linux-mips64le@npm:0.15.12" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + +"esbuild-linux-ppc64le@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-linux-ppc64le@npm:0.15.12" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + +"esbuild-linux-riscv64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-linux-riscv64@npm:0.15.12" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + +"esbuild-linux-s390x@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-linux-s390x@npm:0.15.12" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + +"esbuild-loader@npm:2.21.0": version: 2.21.0 resolution: "esbuild-loader@npm:2.21.0" dependencies: @@ -18972,6 +19247,36 @@ __metadata: languageName: node linkType: hard +"esbuild-loader@npm:^2.10.0": + version: 2.20.0 + resolution: "esbuild-loader@npm:2.20.0" + dependencies: + esbuild: ^0.15.6 + joycon: ^3.0.1 + json5: ^2.2.0 + loader-utils: ^2.0.0 + tapable: ^2.2.0 + webpack-sources: ^2.2.0 + peerDependencies: + webpack: ^4.40.0 || ^5.0.0 + checksum: 81faee7155b35af1fdef3dffa273a14ec83e56b9efa1efb76cb1eb64964dd738809c147a87ab9d3507de11946eed51fd1ee42d476b2c9654cbda145da0d9479b + languageName: node + linkType: hard + +"esbuild-netbsd-64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-netbsd-64@npm:0.15.12" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + +"esbuild-openbsd-64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-openbsd-64@npm:0.15.12" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + "esbuild-plugin-browserslist@npm:^0.6.0": version: 0.6.0 resolution: "esbuild-plugin-browserslist@npm:0.6.0" @@ -18985,6 +19290,34 @@ __metadata: languageName: node linkType: hard +"esbuild-sunos-64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-sunos-64@npm:0.15.12" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + +"esbuild-windows-32@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-windows-32@npm:0.15.12" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"esbuild-windows-64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-windows-64@npm:0.15.12" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"esbuild-windows-arm64@npm:0.15.12": + version: 0.15.12 + resolution: "esbuild-windows-arm64@npm:0.15.12" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "esbuild@npm:0.16.17, esbuild@npm:^0.16.17": version: 0.16.17 resolution: "esbuild@npm:0.16.17" @@ -19062,6 +19395,83 @@ __metadata: languageName: node linkType: hard +"esbuild@npm:^0.15.6": + version: 0.15.12 + resolution: "esbuild@npm:0.15.12" + dependencies: + "@esbuild/android-arm": 0.15.12 + "@esbuild/linux-loong64": 0.15.12 + esbuild-android-64: 0.15.12 + esbuild-android-arm64: 0.15.12 + esbuild-darwin-64: 0.15.12 + esbuild-darwin-arm64: 0.15.12 + esbuild-freebsd-64: 0.15.12 + esbuild-freebsd-arm64: 0.15.12 + esbuild-linux-32: 0.15.12 + esbuild-linux-64: 0.15.12 + esbuild-linux-arm: 0.15.12 + esbuild-linux-arm64: 0.15.12 + esbuild-linux-mips64le: 0.15.12 + esbuild-linux-ppc64le: 0.15.12 + esbuild-linux-riscv64: 0.15.12 + esbuild-linux-s390x: 0.15.12 + esbuild-netbsd-64: 0.15.12 + esbuild-openbsd-64: 0.15.12 + esbuild-sunos-64: 0.15.12 + esbuild-windows-32: 0.15.12 + esbuild-windows-64: 0.15.12 + esbuild-windows-arm64: 0.15.12 + dependenciesMeta: + "@esbuild/android-arm": + optional: true + "@esbuild/linux-loong64": + optional: true + esbuild-android-64: + optional: true + esbuild-android-arm64: + optional: true + esbuild-darwin-64: + optional: true + esbuild-darwin-arm64: + optional: true + esbuild-freebsd-64: + optional: true + esbuild-freebsd-arm64: + optional: true + esbuild-linux-32: + optional: true + esbuild-linux-64: + optional: true + esbuild-linux-arm: + optional: true + esbuild-linux-arm64: + optional: true + esbuild-linux-mips64le: + optional: true + esbuild-linux-ppc64le: + optional: true + esbuild-linux-riscv64: + optional: true + esbuild-linux-s390x: + optional: true + esbuild-netbsd-64: + optional: true + esbuild-openbsd-64: + optional: true + esbuild-sunos-64: + optional: true + esbuild-windows-32: + optional: true + esbuild-windows-64: + optional: true + esbuild-windows-arm64: + optional: true + bin: + esbuild: bin/esbuild + checksum: b344d52c57616917719ac2fa38a58eba7d3c9d2a295116272b3e16a4f6327dc42549274c06560d301f9235a6fe31ccb45499b31d04820dfb8527d89d9766a2ad + languageName: node + linkType: hard + "escalade@npm:^3.1.1": version: 3.1.1 resolution: "escalade@npm:3.1.1" @@ -20965,13 +21375,6 @@ __metadata: languageName: node linkType: hard -"fuzzy@npm:^0.1.3": - version: 0.1.3 - resolution: "fuzzy@npm:0.1.3" - checksum: acc09c6173e12d5dc8ae51857551ddbe834befa9ebc6be6d5581d09117265d704809d80407d220fd0652f347a9975a4d106854cacc8bd031487a0ede86982f84 - languageName: node - linkType: hard - "gauge@npm:^3.0.0": version: 3.0.2 resolution: "gauge@npm:3.0.2" @@ -21278,9 +21681,9 @@ __metadata: linkType: hard "github-slugger@npm:^1.0.0": - version: 1.5.0 - resolution: "github-slugger@npm:1.5.0" - checksum: c70988224578b3bdaa25df65973ffc8c24594a77a28550c3636e495e49d17aef5cdb04c04fa3f1744babef98c61eecc6a43299a13ea7f3cc33d680bf9053ffbe + version: 1.4.0 + resolution: "github-slugger@npm:1.4.0" + checksum: 4f52e7a21f5c6a4c5328f01fe4fe13ae8881fea78bfe31f9e72c4038f97e3e70d52fb85aa7633a52c501dc2486874474d9abd22aa61cbe9b113099a495551c6b languageName: node linkType: hard @@ -21615,7 +22018,6 @@ __metadata: "@grafana/toolkit": "workspace:*" "@grafana/tsconfig": ^1.2.0-rc1 "@grafana/ui": "workspace:*" - "@jaegertracing/jaeger-ui-components": "workspace:*" "@kusto/monaco-kusto": 5.3.6 "@leeoniya/ufuzzy": 0.9.1 "@lezer/common": 1.0.1 @@ -21730,8 +22132,10 @@ __metadata: browserslist: ^4.21.4 calculate-size: 1.1.1 centrifuge: 3.1.0 + chance: ^1.0.10 classnames: 2.3.2 codeowners: ^5.1.1 + combokeys: ^3.0.0 comlink: 4.3.1 common-tags: 1.8.2 copy-webpack-plugin: 9.0.1 @@ -21788,6 +22192,7 @@ __metadata: jest-matcher-utils: 29.3.1 jquery: 3.6.1 js-yaml: ^4.1.0 + json-markup: ^1.1.0 json-source-map: 0.6.1 jsurl: ^0.1.5 kbar: 0.1.0-beta.36 @@ -21796,6 +22201,7 @@ __metadata: lodash: 4.17.21 logfmt: ^1.3.2 lru-cache: 7.14.0 + lru-memoize: ^1.1.0 memoize-one: 6.0.0 mini-css-extract-plugin: 2.7.2 moment: 2.29.4 @@ -21889,6 +22295,7 @@ __metadata: ts-loader: 9.3.1 ts-node: 10.9.1 tslib: 2.4.1 + tween-functions: ^1.2.0 typescript: 4.8.4 uplot: 1.6.24 uuid: 9.0.0 @@ -22422,48 +22829,48 @@ __metadata: linkType: hard "html-loader@npm:^3.1.0": - version: 3.1.2 - resolution: "html-loader@npm:3.1.2" + version: 3.1.0 + resolution: "html-loader@npm:3.1.0" dependencies: html-minifier-terser: ^6.0.2 parse5: ^6.0.1 peerDependencies: webpack: ^5.0.0 - checksum: 75d665f118315056f24e248a6f0b6f6a3dbaec34593b9216af507d36eb24ca54cb8d80667a87ffc6a02b6b51c62423d59b4f64d827a745ac2e199d0c2b7c5c19 + checksum: 4c383d103c10465964924f31eeb2876df941df6515b52a7be517eb01d59ff8f5ae344a3ca428469029c999c73f5ae5dac3431701886ca16617a670a0991bd3a2 languageName: node linkType: hard "html-minifier-terser@npm:^6.0.2": - version: 6.1.0 - resolution: "html-minifier-terser@npm:6.1.0" + version: 6.0.2 + resolution: "html-minifier-terser@npm:6.0.2" dependencies: camel-case: ^4.1.2 - clean-css: ^5.2.2 - commander: ^8.3.0 + clean-css: ^5.1.5 + commander: ^8.1.0 he: ^1.2.0 param-case: ^3.0.4 relateurl: ^0.2.7 - terser: ^5.10.0 + terser: ^5.7.2 bin: html-minifier-terser: cli.js - checksum: ac52c14006476f773204c198b64838477859dc2879490040efab8979c0207424da55d59df7348153f412efa45a0840a1ca3c757bf14767d23a15e3e389d37a93 + checksum: 9c8775ea036f7b04fd5a16607cf4242efdddc64884e84fcc81e27ef56505a12b8a9e1f9ac865ca00a77a3e4c21ef4ffb194dcc6492cdf6cfdfc73bf8de6d7c2d languageName: node linkType: hard "html-minifier-terser@npm:^7.0.0": - version: 7.1.0 - resolution: "html-minifier-terser@npm:7.1.0" + version: 7.0.0 + resolution: "html-minifier-terser@npm:7.0.0" dependencies: camel-case: ^4.1.2 clean-css: 5.2.0 - commander: ^9.4.1 - entities: ^4.4.0 + commander: ^9.4.0 + entities: ^4.3.1 param-case: ^3.0.4 relateurl: ^0.2.7 - terser: ^5.15.1 + terser: ^5.14.2 bin: html-minifier-terser: cli.js - checksum: 351de28d85f142314a6a9b5222bdcaf068cef6bf2f521952ef55d99a6acdcecd0b4dbc42578da2d438d579c6e868b899ca19eac901ee6f9f0c69c223b5942099 + checksum: eabd3b4835d9663bf7c30ea0f1c57870b0d8f7dc27b9fa17852ea57bfdd5fdc0ed9b7b83a7f13edd8626ccf98d3082e347764754278a661cab291469fd37dced languageName: node linkType: hard @@ -25337,7 +25744,7 @@ __metadata: languageName: node linkType: hard -"jest-worker@npm:^27.0.2, jest-worker@npm:^27.4.5, jest-worker@npm:^27.5.1": +"jest-worker@npm:^27.0.2, jest-worker@npm:^27.5.1": version: 27.5.1 resolution: "jest-worker@npm:27.5.1" dependencies: @@ -25348,6 +25755,28 @@ __metadata: languageName: node linkType: hard +"jest-worker@npm:^27.0.6": + version: 27.3.1 + resolution: "jest-worker@npm:27.3.1" + dependencies: + "@types/node": "*" + merge-stream: ^2.0.0 + supports-color: ^8.0.0 + checksum: 125d46939d894ef8cf1ffbbf6c63cee10f28218698db3949704d5f613a353f56502da50d3425ec722927c7948c5742d0306f63ad5064a432574b8b217b9ceeba + languageName: node + linkType: hard + +"jest-worker@npm:^27.4.5": + version: 27.5.0 + resolution: "jest-worker@npm:27.5.0" + dependencies: + "@types/node": "*" + merge-stream: ^2.0.0 + supports-color: ^8.0.0 + checksum: bfd41bef36d3c217819278d8e53b7b9e02c32d90f54149ab4ec87595e389f5caca84237cc4c84050c93a435d458150876ce1812d68cd50a5a4cbb7d80286212f + languageName: node + linkType: hard + "jest-worker@npm:^28.0.2": version: 28.1.3 resolution: "jest-worker@npm:28.1.3" @@ -25637,7 +26066,7 @@ __metadata: languageName: node linkType: hard -"json-parse-better-errors@npm:^1.0.1": +"json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2": version: 1.0.2 resolution: "json-parse-better-errors@npm:1.0.2" checksum: ff2b5ba2a70e88fd97a3cb28c1840144c5ce8fae9cbeeddba15afa333a5c407cf0e42300cd0a2885dbb055227fe68d405070faad941beeffbfde9cf3b2c78c5d @@ -25729,16 +26158,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.1.3": - version: 2.2.2 - resolution: "json5@npm:2.2.2" - bin: - json5: lib/cli.js - checksum: 9a878d66b72157b073cf0017f3e5d93ec209fa5943abcb38d37a54b208917c166bd473c26a24695e67a016ce65759aeb89946592991f8f9174fb96c8e2492683 - languageName: node - linkType: hard - -"json5@npm:^2.2.0, json5@npm:^2.2.1": +"json5@npm:^2.1.3, json5@npm:^2.2.0, json5@npm:^2.2.1": version: 2.2.1 resolution: "json5@npm:2.2.1" bin: @@ -26315,9 +26735,9 @@ __metadata: linkType: hard "loader-runner@npm:^4.2.0": - version: 4.3.0 - resolution: "loader-runner@npm:4.3.0" - checksum: a90e00dee9a16be118ea43fec3192d0b491fe03a32ed48a4132eb61d498f5536a03a1315531c19d284392a8726a4ecad71d82044c28d7f22ef62e029bf761569 + version: 4.2.0 + resolution: "loader-runner@npm:4.2.0" + checksum: e61aea8b6904b8af53d9de6f0484da86c462c0001f4511bedc837cec63deb9475cea813db62f702cd7930420ccb0e75c78112270ca5c8b61b374294f53c0cb3a languageName: node linkType: hard @@ -27025,11 +27445,11 @@ __metadata: linkType: hard "memfs@npm:^3.2.2": - version: 3.4.12 - resolution: "memfs@npm:3.4.12" + version: 3.4.7 + resolution: "memfs@npm:3.4.7" dependencies: fs-monkey: ^1.0.3 - checksum: dab8dec1ae0b2a92e4d563ac86846047cd7aeb17cde4ad51da85cff6e580c32d12b886354527788e36eb75f733dd8edbaf174476b7cea73fed9c5a0e45a6b428 + checksum: fab88266dc576dc4999e38bdf531d703fb798affac2e0dd3fc17470878486844027b2766008ba80c0103b443f52cf9068a5c00f4e1ecf04106f4b29c11855822 languageName: node linkType: hard @@ -27587,7 +28007,7 @@ __metadata: languageName: node linkType: hard -"mime-types@npm:^2.1.12, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24": +"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24": version: 2.1.33 resolution: "mime-types@npm:2.1.33" dependencies: @@ -27596,7 +28016,7 @@ __metadata: languageName: node linkType: hard -"mime-types@npm:^2.1.27, mime-types@npm:^2.1.30, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.34": +"mime-types@npm:^2.1.30, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.34": version: 2.1.35 resolution: "mime-types@npm:2.1.35" dependencies: @@ -28934,18 +29354,7 @@ __metadata: languageName: node linkType: hard -"object.entries@npm:^1.1.0, object.entries@npm:^1.1.6": - version: 1.1.6 - resolution: "object.entries@npm:1.1.6" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: 0f8c47517e6a9a980241eafe3b73de11e59511883173c2b93d67424a008e47e11b77c80e431ad1d8a806f6108b225a1cab9223e53e555776c612a24297117d28 - languageName: node - linkType: hard - -"object.entries@npm:^1.1.5": +"object.entries@npm:^1.1.0, object.entries@npm:^1.1.5": version: 1.1.5 resolution: "object.entries@npm:1.1.5" dependencies: @@ -28956,6 +29365,17 @@ __metadata: languageName: node linkType: hard +"object.entries@npm:^1.1.6": + version: 1.1.6 + resolution: "object.entries@npm:1.1.6" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + checksum: 0f8c47517e6a9a980241eafe3b73de11e59511883173c2b93d67424a008e47e11b77c80e431ad1d8a806f6108b225a1cab9223e53e555776c612a24297117d28 + languageName: node + linkType: hard + "object.fromentries@npm:^2.0.0 || ^1.0.0, object.fromentries@npm:^2.0.5": version: 2.0.5 resolution: "object.fromentries@npm:2.0.5" @@ -28979,14 +29399,14 @@ __metadata: linkType: hard "object.getownpropertydescriptors@npm:^2.0.3, object.getownpropertydescriptors@npm:^2.1.2": - version: 2.1.5 - resolution: "object.getownpropertydescriptors@npm:2.1.5" + version: 2.1.4 + resolution: "object.getownpropertydescriptors@npm:2.1.4" dependencies: - array.prototype.reduce: ^1.0.5 + array.prototype.reduce: ^1.0.4 call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: 7883e1aac1f9cd4cd85e2bb8c7aab6a60940a7cfe07b788356f301844d4967482fc81058e7bda24e1b3909cbb4879387ea9407329b78704f8937bc0b97dec58b + es-abstract: ^1.20.1 + checksum: 988c466fe49fc4f19a28d2d1d894c95c6abfe33c94674ec0b14d96eed71f453c7ad16873d430dc2acbb1760de6d3d2affac4b81237a306012cc4dc49f7539e7f languageName: node linkType: hard @@ -29019,18 +29439,7 @@ __metadata: languageName: node linkType: hard -"object.values@npm:^1.1.0": - version: 1.1.6 - resolution: "object.values@npm:1.1.6" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: f6fff9fd817c24cfd8107f50fb33061d81cd11bacc4e3dbb3852e9ff7692fde4dbce823d4333ea27cd9637ef1b6690df5fbb61f1ed314fa2959598dc3ae23d8e - languageName: node - linkType: hard - -"object.values@npm:^1.1.5": +"object.values@npm:^1.1.0, object.values@npm:^1.1.5": version: 1.1.5 resolution: "object.values@npm:1.1.5" dependencies: @@ -30939,7 +31348,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.18, postcss@npm:^8.4.17": +"postcss@npm:8.4.18, postcss@npm:^8.2.15, postcss@npm:^8.4.17": version: 8.4.18 resolution: "postcss@npm:8.4.18" dependencies: @@ -30960,17 +31369,6 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.2.15": - version: 8.4.20 - resolution: "postcss@npm:8.4.20" - dependencies: - nanoid: ^3.3.4 - picocolors: ^1.0.0 - source-map-js: ^1.0.2 - checksum: 1a5609ea1c1b204f9c2974a0019ae9eef2d99bf645c2c9aac675166c4cb1005be7b5e2ba196160bc771f5d9ac896ed883f236f888c891e835e59d28fff6651aa - languageName: node - linkType: hard - "postcss@npm:^8.3.11, postcss@npm:^8.3.5": version: 8.3.11 resolution: "postcss@npm:8.3.11" @@ -31327,27 +31725,27 @@ __metadata: linkType: hard "promise.allsettled@npm:^1.0.0": - version: 1.0.6 - resolution: "promise.allsettled@npm:1.0.6" + version: 1.0.5 + resolution: "promise.allsettled@npm:1.0.5" dependencies: - array.prototype.map: ^1.0.5 + array.prototype.map: ^1.0.4 call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - get-intrinsic: ^1.1.3 + define-properties: ^1.1.3 + es-abstract: ^1.19.1 + get-intrinsic: ^1.1.1 iterate-value: ^1.0.2 - checksum: 5de80c33f41b23387be49229e47ade2fbeb86ad9b2066e5e093c21dbd5a3e7a8e4eb8e420cbf58386e2af976cc4677950092f855b677b16771191599f493d035 + checksum: 92775552d3a3487ed924852e5de00a217a202cefc833e8cc169283fe4f7dbe09953505b0c7471b2681e09aa7d064bdbd07b978d44ff536f712e4dcd7c9faba35 languageName: node linkType: hard "promise.prototype.finally@npm:^3.1.0": - version: 3.1.4 - resolution: "promise.prototype.finally@npm:3.1.4" + version: 3.1.3 + resolution: "promise.prototype.finally@npm:3.1.3" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: 116556f16e5af74a1be0faf0b76e05fc6592bf74e66c6babbba7094f89887b771691f13236d2ffcf0f8d28ee1048808ccee8f70754c4cb5b3736314fbfadc32b + define-properties: ^1.1.3 + es-abstract: ^1.19.1 + checksum: aba8af6ae8d076e2c344d2674409b44c8f98b3aba98b78619739aeb4a74ebac80dbba5f9338da7cf0108a34384799d3996c46697d2e21c6e998c04d68041213c languageName: node linkType: hard @@ -31580,18 +31978,18 @@ __metadata: linkType: hard "qs@npm:^6.4.0": - version: 6.10.3 - resolution: "qs@npm:6.10.3" + version: 6.10.1 + resolution: "qs@npm:6.10.1" dependencies: side-channel: ^1.0.4 - checksum: 0fac5e6c7191d0295a96d0e83c851aeb015df7e990e4d3b093897d3ac6c94e555dbd0a599739c84d7fa46d7fee282d94ba76943983935cf33bba6769539b8019 + checksum: 00e390dbf98eff4d8ff121b61ab2fe32106852290de99ecd0e40fc76651c4101f43fc6cc8313cb69423563876fc532951b11dda55d2917def05f292258263480 languageName: node linkType: hard "qs@npm:~6.5.2": - version: 6.5.3 - resolution: "qs@npm:6.5.3" - checksum: 6f20bf08cabd90c458e50855559539a28d00b2f2e7dddcb66082b16a43188418cb3cb77cbd09268bcef6022935650f0534357b8af9eeb29bf0f27ccb17655692 + version: 6.5.2 + resolution: "qs@npm:6.5.2" + checksum: 24af7b9928ba2141233fba2912876ff100403dba1b08b20c3b490da9ea6c636760445ea2211a079e7dfa882a5cf8f738337b3748c8bdd0f93358fa8881d2db8f languageName: node linkType: hard @@ -32466,29 +32864,6 @@ __metadata: languageName: node linkType: hard -"react-icon-base@npm:2.1.0": - version: 2.1.0 - resolution: "react-icon-base@npm:2.1.0" - peerDependencies: - prop-types: "*" - react: "*" - react-dom: "*" - checksum: 62b6bfe48649974d3ce2d9d1d1ebadc3523ae85181a2ecde858667c216abe1b3e95b68a0bf800335c6b9aa7804081d0fcbdb6647be04c00e1e5f537846788b00 - languageName: node - linkType: hard - -"react-icons@npm:2.2.7": - version: 2.2.7 - resolution: "react-icons@npm:2.2.7" - dependencies: - react-icon-base: 2.1.0 - peerDependencies: - react: ^0.14.0 || ^15.0.0 || ^16.0.0 - react-dom: ^0.14.0 || ^15.0.0 || ^16.0.0 - checksum: 74e692fdd3d3e2be7cc7a549e7d9ac00eadf21d0b6825681d55c497d5c8683d39bcb56633037c428672140c8f024f062ee34b6f51cab74467ac4d5ce0e4fd98b - languageName: node - linkType: hard - "react-immutable-proptypes@npm:^2.1.0": version: 2.2.0 resolution: "react-immutable-proptypes@npm:2.2.0" @@ -35208,7 +35583,7 @@ __metadata: languageName: node linkType: hard -"source-map-support@npm:^0.5.16, source-map-support@npm:~0.5.20": +"source-map-support@npm:^0.5.16": version: 0.5.21 resolution: "source-map-support@npm:0.5.21" dependencies: @@ -35218,7 +35593,7 @@ __metadata: languageName: node linkType: hard -"source-map-support@npm:^0.5.17, source-map-support@npm:^0.5.6": +"source-map-support@npm:^0.5.17, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.20": version: 0.5.20 resolution: "source-map-support@npm:0.5.20" dependencies: @@ -35256,7 +35631,7 @@ __metadata: languageName: node linkType: hard -"source-map@npm:^0.7.0": +"source-map@npm:^0.7.0, source-map@npm:~0.7.2": version: 0.7.4 resolution: "source-map@npm:0.7.4" checksum: 01cc5a74b1f0e1d626a58d36ad6898ea820567e87f18dfc9d24a9843a351aaa2ec09b87422589906d6ff1deed29693e176194dc88bcae7c9a852dc74b311dbf5 @@ -35714,19 +36089,19 @@ __metadata: languageName: node linkType: hard -"string.prototype.matchall@npm:^4.0.0 || ^3.0.1": - version: 4.0.8 - resolution: "string.prototype.matchall@npm:4.0.8" +"string.prototype.matchall@npm:^4.0.0 || ^3.0.1, string.prototype.matchall@npm:^4.0.7": + version: 4.0.7 + resolution: "string.prototype.matchall@npm:4.0.7" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - get-intrinsic: ^1.1.3 + define-properties: ^1.1.3 + es-abstract: ^1.19.1 + get-intrinsic: ^1.1.1 has-symbols: ^1.0.3 internal-slot: ^1.0.3 - regexp.prototype.flags: ^1.4.3 + regexp.prototype.flags: ^1.4.1 side-channel: ^1.0.4 - checksum: 952da3a818de42ad1c10b576140a5e05b4de7b34b8d9dbf00c3ac8c1293e9c0f533613a39c5cda53e0a8221f2e710bc2150e730b1c2278d60004a8a35726efb6 + checksum: fc09f3ccbfb325de0472bcc87a6be0598a7499e0b4a31db5789676155b15754a4cc4bb83924f15fc9ed48934dac7366ee52c8b9bd160bed6fd072c93b489e75c languageName: node linkType: hard @@ -35746,41 +36121,25 @@ __metadata: languageName: node linkType: hard -"string.prototype.matchall@npm:^4.0.7": - version: 4.0.7 - resolution: "string.prototype.matchall@npm:4.0.7" +"string.prototype.padend@npm:^3.0.0": + version: 3.1.3 + resolution: "string.prototype.padend@npm:3.1.3" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.3 es-abstract: ^1.19.1 - get-intrinsic: ^1.1.1 - has-symbols: ^1.0.3 - internal-slot: ^1.0.3 - regexp.prototype.flags: ^1.4.1 - side-channel: ^1.0.4 - checksum: fc09f3ccbfb325de0472bcc87a6be0598a7499e0b4a31db5789676155b15754a4cc4bb83924f15fc9ed48934dac7366ee52c8b9bd160bed6fd072c93b489e75c - languageName: node - linkType: hard - -"string.prototype.padend@npm:^3.0.0": - version: 3.1.4 - resolution: "string.prototype.padend@npm:3.1.4" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: 76e07238fe31dc12177428f0436b7ed6985f6a7ba97470fd53e4f0a6d9860bfee127d81957f3073cc879b434233df143825d140581e1340278053ad993c92f6c + checksum: ef9ee0542c17975629bc6d21497e8faaa142d873e9f07fb65de2a955df402a1eac45cbed375045a759501e9d4ef80e589e11f0e12103c20df0770e47f6b59bc7 languageName: node linkType: hard "string.prototype.padstart@npm:^3.0.0": - version: 3.1.4 - resolution: "string.prototype.padstart@npm:3.1.4" + version: 3.1.3 + resolution: "string.prototype.padstart@npm:3.1.3" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.4 - checksum: a8517d83fd4fc5832b85cd9621188156094392494983fa41f6e6e727ab6af20f6bf8b2aac43b97ffad94e21fa52f1bb21342e2f87b79965707fe174cff5b8b2b + define-properties: ^1.1.3 + es-abstract: ^1.19.1 + checksum: 8bf8bc1d25edc79c4db285aa8dfd5d269dac4024631e8ae13202c2126348a07e00b153d6bf7b858c5bd716e44675a7fbb50baedd3e8970e1034bb86be22c9475 languageName: node linkType: hard @@ -36416,7 +36775,7 @@ __metadata: languageName: node linkType: hard -"terser-webpack-plugin@npm:5.3.6, terser-webpack-plugin@npm:^5.0.3, terser-webpack-plugin@npm:^5.1.3, terser-webpack-plugin@npm:^5.3.1": +"terser-webpack-plugin@npm:5.3.6, terser-webpack-plugin@npm:^5.0.3": version: 5.3.6 resolution: "terser-webpack-plugin@npm:5.3.6" dependencies: @@ -36457,9 +36816,67 @@ __metadata: languageName: node linkType: hard -"terser@npm:^5.0.0, terser@npm:^5.10.0, terser@npm:^5.14.1, terser@npm:^5.15.1, terser@npm:^5.3.4": - version: 5.16.1 - resolution: "terser@npm:5.16.1" +"terser-webpack-plugin@npm:^5.1.3": + version: 5.2.4 + resolution: "terser-webpack-plugin@npm:5.2.4" + dependencies: + jest-worker: ^27.0.6 + p-limit: ^3.1.0 + schema-utils: ^3.1.1 + serialize-javascript: ^6.0.0 + source-map: ^0.6.1 + terser: ^5.7.2 + peerDependencies: + webpack: ^5.1.0 + peerDependenciesMeta: + "@swc/core": + optional: true + esbuild: + optional: true + uglify-js: + optional: true + checksum: ddbcdd28f9620ecacc9b50ff31776485ad012c7f1cbef53825e4fc334a78d82e2344346e5595751916494951bc64717004c07b03ad88deeb3df4a5f76c559cc9 + languageName: node + linkType: hard + +"terser-webpack-plugin@npm:^5.3.1": + version: 5.3.1 + resolution: "terser-webpack-plugin@npm:5.3.1" + dependencies: + jest-worker: ^27.4.5 + schema-utils: ^3.1.1 + serialize-javascript: ^6.0.0 + source-map: ^0.6.1 + terser: ^5.7.2 + peerDependencies: + webpack: ^5.1.0 + peerDependenciesMeta: + "@swc/core": + optional: true + esbuild: + optional: true + uglify-js: + optional: true + checksum: 1b808fd4f58ce0b532baacc50b9a850fc69ce0077a0e9e5076d4156c52fab3d40b02d5d9148a3eba64630cf7f40057de54f6a5a87fac1849b1f11d6bfdb42072 + languageName: node + linkType: hard + +"terser@npm:^5.0.0, terser@npm:^5.7.2": + version: 5.9.0 + resolution: "terser@npm:5.9.0" + dependencies: + commander: ^2.20.0 + source-map: ~0.7.2 + source-map-support: ~0.5.20 + bin: + terser: bin/terser + checksum: 11c1246b1991015a8881742878af779e3863fad42f626ffda957dbf28c94bf51e7994cffb9ffbec86ff3c23ab45ffa6d79d453c15e664306e35fc7b2c4eee5f4 + languageName: node + linkType: hard + +"terser@npm:^5.14.1, terser@npm:^5.3.4": + version: 5.15.1 + resolution: "terser@npm:5.15.1" dependencies: "@jridgewell/source-map": ^0.3.2 acorn: ^8.5.0 @@ -36467,7 +36884,21 @@ __metadata: source-map-support: ~0.5.20 bin: terser: bin/terser - checksum: cb524123504a2f0d9140c1e1a8628c83bba9cacc404c6aca79e2493a38dfdf21275617ba75b91006b3f1ff586e401ab31121160cd253699f334c6340ea2756f5 + checksum: 9880a1e0956983a1ce5de204ea35121c0009fa41d582a6904ae850e1953a1a2cc021168439565280c5a8eee67c85a874175627e24989b046c7a72589b81c3979 + languageName: node + linkType: hard + +"terser@npm:^5.14.2": + version: 5.15.0 + resolution: "terser@npm:5.15.0" + dependencies: + "@jridgewell/source-map": ^0.3.2 + acorn: ^8.5.0 + commander: ^2.20.0 + source-map-support: ~0.5.20 + bin: + terser: bin/terser + checksum: b2358c989fcb76b4a1c265f60e175c950d3f776e5f619a9f58f54e8d2d792cd6b4cca86071834075f3b9943556d695357bafdd4ee2390de2fc9fd96ba3efa8c8 languageName: node linkType: hard @@ -37154,14 +37585,14 @@ __metadata: languageName: node linkType: hard -"tslib@npm:2.4.0, tslib@npm:^2.4.0": +"tslib@npm:2.4.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.4.0": version: 2.4.0 resolution: "tslib@npm:2.4.0" checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113 languageName: node linkType: hard -"tslib@npm:2.4.1, tslib@npm:^2.0.0, tslib@npm:^2.0.1": +"tslib@npm:2.4.1": version: 2.4.1 resolution: "tslib@npm:2.4.1" checksum: 19480d6e0313292bd6505d4efe096a6b31c70e21cf08b5febf4da62e95c265c8f571f7b36fcc3d1a17e068032f59c269fab3459d6cd3ed6949eafecf64315fca @@ -38437,6 +38868,16 @@ __metadata: languageName: node linkType: hard +"watchpack@npm:^2.3.1": + version: 2.3.1 + resolution: "watchpack@npm:2.3.1" + dependencies: + glob-to-regexp: ^0.4.1 + graceful-fs: ^4.1.2 + checksum: 70a34f92842d94b5d842980f866d568d7a467de667c96ae5759c759f46587e49265863171f4650bdbafc5f3870a28f2b4453e9e847098ec4b718b38926d47d22 + languageName: node + linkType: hard + "wbuf@npm:^1.1.0, wbuf@npm:^1.7.3": version: 1.7.3 resolution: "wbuf@npm:1.7.3" @@ -38669,13 +39110,13 @@ __metadata: linkType: hard "webpack-hot-middleware@npm:^2.25.1": - version: 2.25.3 - resolution: "webpack-hot-middleware@npm:2.25.3" + version: 2.25.2 + resolution: "webpack-hot-middleware@npm:2.25.2" dependencies: ansi-html-community: 0.0.8 html-entities: ^2.1.0 strip-ansi: ^6.0.0 - checksum: 74fe5d15f3120742cf0f88a4af7e72f3678f2d05905676e37ab4e85c559f2c21d8aa72b0efe7c262993370bfc83fbe5a8d42561bcd10b370fac88640f87c463a + checksum: 9bbcb4a3109d5efc3fedc41ab84209745e47770a205897324adff9126196d9cd086237288161d71cd7273a0154e09046d025a3c30c6938bd04e58d3b379fdcca languageName: node linkType: hard @@ -38747,21 +39188,14 @@ __metadata: languageName: node linkType: hard -"webpack-virtual-modules@npm:^0.4.1": - version: 0.4.6 - resolution: "webpack-virtual-modules@npm:0.4.6" - checksum: cb056ba8c50b35436ae43149554b051b80065b0cf79f2d528ca692ddf344a422ac71c415adb9da83dc3acc6e7e58f518388cc1cd11cb4fa29dc04f2c4494afe3 - languageName: node - linkType: hard - -"webpack-virtual-modules@npm:^0.4.4": +"webpack-virtual-modules@npm:^0.4.1, webpack-virtual-modules@npm:^0.4.4": version: 0.4.5 resolution: "webpack-virtual-modules@npm:0.4.5" checksum: 0ae9a8b50d0cb1e43da5ff8acaa7b99c34a42f0d6cc83a82908fb6e131e574a949d19948df4fdd3de0dbfdbadb2b93ceb4a740c55727a4236eb3b2bbc8f785a6 languageName: node linkType: hard -"webpack@npm:5.74.0": +"webpack@npm:5.74.0, webpack@npm:>=4.43.0 <6.0.0": version: 5.74.0 resolution: "webpack@npm:5.74.0" dependencies: @@ -38798,40 +39232,40 @@ __metadata: languageName: node linkType: hard -"webpack@npm:>=4.43.0 <6.0.0, webpack@npm:^5.72.0": - version: 5.75.0 - resolution: "webpack@npm:5.75.0" +"webpack@npm:^5.72.0": + version: 5.72.0 + resolution: "webpack@npm:5.72.0" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^0.0.51 "@webassemblyjs/ast": 1.11.1 "@webassemblyjs/wasm-edit": 1.11.1 "@webassemblyjs/wasm-parser": 1.11.1 - acorn: ^8.7.1 + acorn: ^8.4.1 acorn-import-assertions: ^1.7.6 browserslist: ^4.14.5 chrome-trace-event: ^1.0.2 - enhanced-resolve: ^5.10.0 + enhanced-resolve: ^5.9.2 es-module-lexer: ^0.9.0 eslint-scope: 5.1.1 events: ^3.2.0 glob-to-regexp: ^0.4.1 graceful-fs: ^4.2.9 - json-parse-even-better-errors: ^2.3.1 + json-parse-better-errors: ^1.0.2 loader-runner: ^4.2.0 mime-types: ^2.1.27 neo-async: ^2.6.2 schema-utils: ^3.1.0 tapable: ^2.1.1 terser-webpack-plugin: ^5.1.3 - watchpack: ^2.4.0 + watchpack: ^2.3.1 webpack-sources: ^3.2.3 peerDependenciesMeta: webpack-cli: optional: true bin: webpack: bin/webpack.js - checksum: 2bcc5f3c195f375944e8af2f00bf2feea39cb9fda5f763b0d1b00077f1c51783db25c94d3fae96a07dead9fa085e6ae7474417e5ab31719c9776ea5969ceb83a + checksum: 8365f1466d0f7adbf80ebc9b780f263a28eeeabcd5fb515249bfd9a56ab7fe8d29ea53df3d9364d0732ab39ae774445eb28abce694ed375b13882a6b2fe93ffc languageName: node linkType: hard @@ -39194,9 +39628,9 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.2.3, ws@npm:^8.9.0": - version: 8.11.0 - resolution: "ws@npm:8.11.0" +"ws@npm:^8.2.3": + version: 8.7.0 + resolution: "ws@npm:8.7.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ^5.0.2 @@ -39205,7 +39639,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: 316b33aba32f317cd217df66dbfc5b281a2f09ff36815de222bc859e3424d83766d9eb2bd4d667de658b6ab7be151f258318fb1da812416b30be13103e5b5c67 + checksum: 078fa2dbc06b31a45e0057b19e2930d26c222622e355955afe019c9b9b25f62eb2a8eff7cceabdad04910ecd2bd6ef4fa48e6f3673f2fdddff02a6e4c2459584 languageName: node linkType: hard @@ -39224,6 +39658,21 @@ __metadata: languageName: node linkType: hard +"ws@npm:^8.9.0": + version: 8.11.0 + resolution: "ws@npm:8.11.0" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: 316b33aba32f317cd217df66dbfc5b281a2f09ff36815de222bc859e3424d83766d9eb2bd4d667de658b6ab7be151f258318fb1da812416b30be13103e5b5c67 + languageName: node + linkType: hard + "x-default-browser@npm:^0.4.0": version: 0.4.0 resolution: "x-default-browser@npm:0.4.0" @@ -39357,6 +39806,13 @@ __metadata: languageName: node linkType: hard +"yargs-parser@npm:^21.1.1": + version: 21.1.1 + resolution: "yargs-parser@npm:21.1.1" + checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c + languageName: node + linkType: hard + "yargs-unparser@npm:2.0.0": version: 2.0.0 resolution: "yargs-unparser@npm:2.0.0" @@ -39384,7 +39840,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.3.1, yargs@npm:^17.4.0, yargs@npm:^17.5.1": +"yargs@npm:^17.3.1, yargs@npm:^17.4.0": version: 17.5.1 resolution: "yargs@npm:17.5.1" dependencies: @@ -39399,6 +39855,21 @@ __metadata: languageName: node linkType: hard +"yargs@npm:^17.5.1": + version: 17.6.2 + resolution: "yargs@npm:17.6.2" + dependencies: + cliui: ^8.0.1 + escalade: ^3.1.1 + get-caller-file: ^2.0.5 + require-directory: ^2.1.1 + string-width: ^4.2.3 + y18n: ^5.0.5 + yargs-parser: ^21.1.1 + checksum: 47da1b0d854fa16d45a3ded57b716b013b2179022352a5f7467409da5a04a1eef5b3b3d97a2dfc13e8bbe5f2ffc0afe3bc6a4a72f8254e60f5a4bd7947138643 + languageName: node + linkType: hard + "yauzl@npm:^2.10.0": version: 2.10.0 resolution: "yauzl@npm:2.10.0"