Update Monthly patch updates (#64323)

* Update Monthly patch updates

* don't update dangerously-set-html-content

* run prettier

* fix types

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
This commit is contained in:
renovate[bot] 2023-03-08 09:38:06 +00:00 committed by GitHub
parent a317e48de8
commit 523f675dd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 806 additions and 699 deletions

View File

@ -87,7 +87,7 @@
"@babel/core": "7.20.5", "@babel/core": "7.20.5",
"@babel/plugin-proposal-class-properties": "7.18.6", "@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6", "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
"@babel/plugin-proposal-object-rest-spread": "7.20.2", "@babel/plugin-proposal-object-rest-spread": "7.20.7",
"@babel/plugin-proposal-optional-chaining": "7.20.7", "@babel/plugin-proposal-optional-chaining": "7.20.7",
"@babel/plugin-syntax-dynamic-import": "7.8.3", "@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-transform-react-constant-elements": "7.20.2", "@babel/plugin-transform-react-constant-elements": "7.20.2",
@ -107,14 +107,14 @@
"@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules", "@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules",
"@grafana/toolkit": "workspace:*", "@grafana/toolkit": "workspace:*",
"@grafana/tsconfig": "^1.2.0-rc1", "@grafana/tsconfig": "^1.2.0-rc1",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.8", "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
"@react-types/button": "3.7.0", "@react-types/button": "3.7.1",
"@react-types/menu": "3.7.2", "@react-types/menu": "3.7.2",
"@react-types/overlays": "3.6.4", "@react-types/overlays": "3.6.4",
"@react-types/shared": "3.16.0", "@react-types/shared": "3.16.0",
"@rtsao/plugin-proposal-class-properties": "7.0.1-patch.1", "@rtsao/plugin-proposal-class-properties": "7.0.1-patch.1",
"@swc/core": "1.3.11", "@swc/core": "1.3.38",
"@swc/helpers": "0.4.12", "@swc/helpers": "0.4.14",
"@testing-library/dom": "8.20.0", "@testing-library/dom": "8.20.0",
"@testing-library/jest-dom": "5.16.5", "@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "12.1.4", "@testing-library/react": "12.1.4",
@ -126,9 +126,9 @@
"@types/d3": "7.4.0", "@types/d3": "7.4.0",
"@types/d3-force": "^3.0.0", "@types/d3-force": "^3.0.0",
"@types/d3-scale-chromatic": "3.0.0", "@types/d3-scale-chromatic": "3.0.0",
"@types/debounce-promise": "3.1.5", "@types/debounce-promise": "3.1.6",
"@types/dompurify": "^2", "@types/dompurify": "^2",
"@types/eslint": "8.21.0", "@types/eslint": "8.21.1",
"@types/file-saver": "2.0.5", "@types/file-saver": "2.0.5",
"@types/glob": "^8.0.0", "@types/glob": "^8.0.0",
"@types/google.analytics": "^0.0.42", "@types/google.analytics": "^0.0.42",
@ -136,25 +136,25 @@
"@types/history": "4.7.11", "@types/history": "4.7.11",
"@types/hoist-non-react-statics": "3.3.1", "@types/hoist-non-react-statics": "3.3.1",
"@types/jest": "29.2.3", "@types/jest": "29.2.3",
"@types/jquery": "3.5.14", "@types/jquery": "3.5.16",
"@types/js-yaml": "^4.0.5", "@types/js-yaml": "^4.0.5",
"@types/jsurl": "^1.2.28", "@types/jsurl": "^1.2.28",
"@types/lodash": "4.14.187", "@types/lodash": "4.14.191",
"@types/logfmt": "^1.2.3", "@types/logfmt": "^1.2.3",
"@types/mousetrap": "1.6.10", "@types/mousetrap": "1.6.11",
"@types/node": "18.14.0", "@types/node": "18.14.6",
"@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.0.6", "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.0.9",
"@types/papaparse": "5.3.5", "@types/papaparse": "5.3.7",
"@types/pluralize": "^0.0.29", "@types/pluralize": "^0.0.29",
"@types/prismjs": "1.26.0", "@types/prismjs": "1.26.0",
"@types/react": "17.0.42", "@types/react": "17.0.42",
"@types/react-beautiful-dnd": "13.1.2", "@types/react-beautiful-dnd": "13.1.3",
"@types/react-dom": "17.0.14", "@types/react-dom": "17.0.14",
"@types/react-grid-layout": "1.3.2", "@types/react-grid-layout": "1.3.2",
"@types/react-highlight-words": "0.16.4", "@types/react-highlight-words": "0.16.4",
"@types/react-redux": "7.1.24", "@types/react-redux": "7.1.25",
"@types/react-router-dom": "5.3.3", "@types/react-router-dom": "5.3.3",
"@types/react-table": "7.7.12", "@types/react-table": "7.7.14",
"@types/react-test-renderer": "17.0.1", "@types/react-test-renderer": "17.0.1",
"@types/react-transition-group": "4.4.5", "@types/react-transition-group": "4.4.5",
"@types/react-virtualized-auto-sizer": "1.0.1", "@types/react-virtualized-auto-sizer": "1.0.1",
@ -168,12 +168,12 @@
"@types/testing-library__jest-dom": "5.14.5", "@types/testing-library__jest-dom": "5.14.5",
"@types/tinycolor2": "1.4.3", "@types/tinycolor2": "1.4.3",
"@types/uuid": "9.0.1", "@types/uuid": "9.0.1",
"@types/yargs": "17.0.12", "@types/yargs": "17.0.22",
"@typescript-eslint/eslint-plugin": "5.42.0", "@typescript-eslint/eslint-plugin": "5.42.0",
"@typescript-eslint/parser": "5.42.0", "@typescript-eslint/parser": "5.42.0",
"autoprefixer": "10.4.13", "autoprefixer": "10.4.13",
"babel-jest": "29.3.1", "babel-jest": "29.3.1",
"babel-loader": "9.1.0", "babel-loader": "9.1.2",
"babel-plugin-angularjs-annotate": "0.10.0", "babel-plugin-angularjs-annotate": "0.10.0",
"babel-plugin-macros": "3.1.0", "babel-plugin-macros": "3.1.0",
"blob-polyfill": "7.0.20220408", "blob-polyfill": "7.0.20220408",
@ -181,7 +181,7 @@
"chance": "^1.0.10", "chance": "^1.0.10",
"codeowners": "^5.1.1", "codeowners": "^5.1.1",
"copy-webpack-plugin": "11.0.0", "copy-webpack-plugin": "11.0.0",
"css-loader": "6.7.1", "css-loader": "6.7.3",
"css-minimizer-webpack-plugin": "4.2.2", "css-minimizer-webpack-plugin": "4.2.2",
"cypress": "9.5.1", "cypress": "9.5.1",
"esbuild": "0.16.17", "esbuild": "0.16.17",
@ -194,7 +194,7 @@
"eslint-plugin-jsdoc": "40.0.1", "eslint-plugin-jsdoc": "40.0.1",
"eslint-plugin-jsx-a11y": "6.7.1", "eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-lodash": "7.4.0", "eslint-plugin-lodash": "7.4.0",
"eslint-plugin-react": "7.32.1", "eslint-plugin-react": "7.32.2",
"eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-hooks": "4.6.0",
"eslint-webpack-plugin": "4.0.0", "eslint-webpack-plugin": "4.0.0",
"expose-loader": "4.0.0", "expose-loader": "4.0.0",
@ -203,7 +203,7 @@
"html-loader": "4.2.0", "html-loader": "4.2.0",
"html-webpack-plugin": "5.5.0", "html-webpack-plugin": "5.5.0",
"http-server": "14.1.1", "http-server": "14.1.1",
"husky": "8.0.1", "husky": "8.0.3",
"i18next-parser": "6.6.0", "i18next-parser": "6.6.0",
"jest": "29.3.1", "jest": "29.3.1",
"jest-canvas-mock": "2.4.0", "jest-canvas-mock": "2.4.0",
@ -213,17 +213,17 @@
"jest-junit": "15.0.0", "jest-junit": "15.0.0",
"jest-matcher-utils": "29.3.1", "jest-matcher-utils": "29.3.1",
"lerna": "5.5.4", "lerna": "5.5.4",
"lint-staged": "13.1.0", "lint-staged": "13.1.2",
"mini-css-extract-plugin": "2.7.2", "mini-css-extract-plugin": "2.7.2",
"msw": "1.1.0", "msw": "1.1.0",
"mutationobserver-shim": "0.3.7", "mutationobserver-shim": "0.3.7",
"ngtemplate-loader": "2.1.0", "ngtemplate-loader": "2.1.0",
"node-notifier": "10.0.1", "node-notifier": "10.0.1",
"postcss": "8.4.18", "postcss": "8.4.21",
"postcss-loader": "7.0.1", "postcss-loader": "7.0.2",
"postcss-reporter": "7.0.5", "postcss-reporter": "7.0.5",
"postcss-scss": "4.0.5", "postcss-scss": "4.0.6",
"prettier": "2.8.1", "prettier": "2.8.4",
"react-refresh": "0.14.0", "react-refresh": "0.14.0",
"react-select-event": "5.5.1", "react-select-event": "5.5.1",
"react-simple-compat": "1.2.3", "react-simple-compat": "1.2.3",
@ -231,16 +231,16 @@
"redux-mock-store": "1.5.4", "redux-mock-store": "1.5.4",
"rimraf": "4.2.0", "rimraf": "4.2.0",
"rudder-sdk-js": "2.25.0", "rudder-sdk-js": "2.25.0",
"sass": "1.58.2", "sass": "1.58.3",
"sass-loader": "13.2.0", "sass-loader": "13.2.0",
"sinon": "15.0.1", "sinon": "15.0.1",
"style-loader": "3.3.1", "style-loader": "3.3.1",
"stylelint": "15.2.0", "stylelint": "15.2.0",
"stylelint-config-prettier": "9.0.3", "stylelint-config-prettier": "9.0.5",
"stylelint-config-sass-guidelines": "9.0.1", "stylelint-config-sass-guidelines": "9.0.1",
"terser-webpack-plugin": "5.3.6", "terser-webpack-plugin": "5.3.6",
"testing-library-selector": "0.2.1", "testing-library-selector": "0.2.1",
"ts-jest": "29.0.3", "ts-jest": "29.0.5",
"ts-loader": "9.3.1", "ts-loader": "9.3.1",
"ts-node": "10.9.1", "ts-node": "10.9.1",
"typescript": "4.8.4", "typescript": "4.8.4",
@ -254,27 +254,27 @@
"yargs": "^17.5.1" "yargs": "^17.5.1"
}, },
"dependencies": { "dependencies": {
"@daybrush/utils": "1.10.0", "@daybrush/utils": "1.10.2",
"@emotion/css": "11.10.5", "@emotion/css": "11.10.6",
"@emotion/react": "11.10.5", "@emotion/react": "11.10.6",
"@grafana/aws-sdk": "0.0.40", "@grafana/aws-sdk": "0.0.44",
"@grafana/data": "workspace:*", "@grafana/data": "workspace:*",
"@grafana/e2e-selectors": "workspace:*", "@grafana/e2e-selectors": "workspace:*",
"@grafana/experimental": "1.1.0", "@grafana/experimental": "1.1.0",
"@grafana/faro-core": "1.0.0-beta2", "@grafana/faro-core": "1.0.0",
"@grafana/faro-web-sdk": "1.0.0-beta2", "@grafana/faro-web-sdk": "1.0.0",
"@grafana/google-sdk": "0.0.4", "@grafana/google-sdk": "0.0.4",
"@grafana/lezer-logql": "0.1.2", "@grafana/lezer-logql": "0.1.2",
"@grafana/monaco-logql": "^0.0.6", "@grafana/monaco-logql": "^0.0.7",
"@grafana/runtime": "workspace:*", "@grafana/runtime": "workspace:*",
"@grafana/scenes": "^0.0.14", "@grafana/scenes": "^0.0.16",
"@grafana/schema": "workspace:*", "@grafana/schema": "workspace:*",
"@grafana/ui": "workspace:*", "@grafana/ui": "workspace:*",
"@kusto/monaco-kusto": "5.3.6", "@kusto/monaco-kusto": "5.3.6",
"@leeoniya/ufuzzy": "1.0.2", "@leeoniya/ufuzzy": "1.0.5",
"@lezer/common": "1.0.1", "@lezer/common": "1.0.2",
"@lezer/highlight": "1.1.2", "@lezer/highlight": "1.1.3",
"@lezer/lr": "1.3.1", "@lezer/lr": "1.3.3",
"@opentelemetry/api": "1.4.0", "@opentelemetry/api": "1.4.0",
"@opentelemetry/exporter-collector": "0.25.0", "@opentelemetry/exporter-collector": "0.25.0",
"@opentelemetry/semantic-conventions": "1.9.1", "@opentelemetry/semantic-conventions": "1.9.1",
@ -290,7 +290,7 @@
"@react-stately/collections": "3.4.1", "@react-stately/collections": "3.4.1",
"@react-stately/menu": "3.4.1", "@react-stately/menu": "3.4.1",
"@react-stately/tree": "3.3.1", "@react-stately/tree": "3.3.1",
"@reduxjs/toolkit": "1.9.1", "@reduxjs/toolkit": "1.9.3",
"@sentry/browser": "6.19.7", "@sentry/browser": "6.19.7",
"@sentry/types": "6.19.7", "@sentry/types": "6.19.7",
"@sentry/utils": "6.19.7", "@sentry/utils": "6.19.7",
@ -315,7 +315,7 @@
"centrifuge": "3.1.0", "centrifuge": "3.1.0",
"classnames": "2.3.2", "classnames": "2.3.2",
"combokeys": "^3.0.0", "combokeys": "^3.0.0",
"comlink": "4.4.0", "comlink": "4.4.1",
"common-tags": "1.8.2", "common-tags": "1.8.2",
"core-js": "3.28.0", "core-js": "3.28.0",
"d3": "7.8.2", "d3": "7.8.2",
@ -334,38 +334,38 @@
"history": "4.10.1", "history": "4.10.1",
"hoist-non-react-statics": "3.3.2", "hoist-non-react-statics": "3.3.2",
"i18next": "^22.0.0", "i18next": "^22.0.0",
"immer": "9.0.16", "immer": "9.0.19",
"immutable": "4.2.2", "immutable": "4.2.4",
"jquery": "3.6.1", "jquery": "3.6.3",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"json-markup": "^1.1.0", "json-markup": "^1.1.0",
"json-source-map": "0.6.1", "json-source-map": "0.6.1",
"jsurl": "^0.1.5", "jsurl": "^0.1.5",
"kbar": "0.1.0-beta.36", "kbar": "0.1.0-beta.40",
"lodash": "4.17.21", "lodash": "4.17.21",
"logfmt": "^1.3.2", "logfmt": "^1.3.2",
"lru-cache": "7.17.0", "lru-cache": "7.17.0",
"lru-memoize": "^1.1.0", "lru-memoize": "^1.1.0",
"memoize-one": "6.0.0", "memoize-one": "6.0.0",
"moment": "2.29.4", "moment": "2.29.4",
"moment-timezone": "0.5.38", "moment-timezone": "0.5.41",
"monaco-editor": "0.34.0", "monaco-editor": "0.34.0",
"monaco-promql": "1.7.4", "monaco-promql": "1.7.4",
"mousetrap": "1.6.5", "mousetrap": "1.6.5",
"mousetrap-global-bind": "1.1.0", "mousetrap-global-bind": "1.1.0",
"moveable": "0.43.1", "moveable": "0.43.1",
"ol": "7.2.2", "ol": "7.2.2",
"ol-ext": "4.0.3", "ol-ext": "4.0.6",
"papaparse": "5.3.2", "papaparse": "5.3.2",
"pluralize": "^8.0.0", "pluralize": "^8.0.0",
"prismjs": "1.29.0", "prismjs": "1.29.0",
"prop-types": "15.8.1", "prop-types": "15.8.1",
"pseudoizer": "^0.1.0", "pseudoizer": "^0.1.0",
"rc-cascader": "3.8.0", "rc-cascader": "3.8.0",
"rc-drawer": "6.1.2", "rc-drawer": "6.1.3",
"rc-slider": "10.1.0", "rc-slider": "10.1.1",
"rc-time-picker": "3.7.3", "rc-time-picker": "3.7.3",
"rc-tree": "5.7.0", "rc-tree": "5.7.2",
"re-resizable": "6.9.9", "re-resizable": "6.9.9",
"react": "17.0.2", "react": "17.0.2",
"react-awesome-query-builder": "5.4.0", "react-awesome-query-builder": "5.4.0",
@ -379,7 +379,7 @@
"react-highlight-words": "0.20.0", "react-highlight-words": "0.20.0",
"react-hook-form": "7.5.3", "react-hook-form": "7.5.3",
"react-i18next": "^12.0.0", "react-i18next": "^12.0.0",
"react-inlinesvg": "3.0.1", "react-inlinesvg": "3.0.2",
"react-moveable": "0.46.1", "react-moveable": "0.46.1",
"react-popper": "2.3.0", "react-popper": "2.3.0",
"react-popper-tooltip": "4.4.2", "react-popper-tooltip": "4.4.2",
@ -396,10 +396,10 @@
"react-virtualized-auto-sizer": "1.0.7", "react-virtualized-auto-sizer": "1.0.7",
"react-window": "1.8.8", "react-window": "1.8.8",
"react-window-infinite-loader": "1.0.8", "react-window-infinite-loader": "1.0.8",
"redux": "4.2.0", "redux": "4.2.1",
"redux-thunk": "2.4.1", "redux-thunk": "2.4.2",
"regenerator-runtime": "0.13.10", "regenerator-runtime": "0.13.11",
"reselect": "4.1.6", "reselect": "4.1.7",
"rst2html": "github:thoward/rst2html#990cb89f2a300cdd9151790be377c4c0840df809", "rst2html": "github:thoward/rst2html#990cb89f2a300cdd9151790be377c4c0840df809",
"rxjs": "7.8.0", "rxjs": "7.8.0",
"sass": "link:./public/sass", "sass": "link:./public/sass",
@ -425,14 +425,14 @@
"resolutions": { "resolutions": {
"underscore": "1.13.6", "underscore": "1.13.6",
"@types/slate": "0.47.11", "@types/slate": "0.47.11",
"@rushstack/rig-package": "0.3.17", "@rushstack/rig-package": "0.3.18",
"@rushstack/ts-command-line": "4.13.0", "@rushstack/ts-command-line": "4.13.2",
"@storybook/builder-webpack4/css-loader": "6.7.1", "@storybook/builder-webpack4/css-loader": "6.7.3",
"@storybook/builder-webpack4/html-webpack-plugin": "5.5.0", "@storybook/builder-webpack4/html-webpack-plugin": "5.5.0",
"@storybook/builder-webpack4/webpack": "5.75.0", "@storybook/builder-webpack4/webpack": "5.75.0",
"@storybook/core-common/webpack": "5.75.0", "@storybook/core-common/webpack": "5.75.0",
"@storybook/core-server/webpack": "5.75.0", "@storybook/core-server/webpack": "5.75.0",
"@storybook/manager-webpack4/css-loader": "6.7.1", "@storybook/manager-webpack4/css-loader": "6.7.3",
"@storybook/manager-webpack4/html-webpack-plugin": "5.5.0", "@storybook/manager-webpack4/html-webpack-plugin": "5.5.0",
"@storybook/manager-webpack4/webpack": "5.75.0", "@storybook/manager-webpack4/webpack": "5.75.0",
"@storybook/builder-webpack5/webpack": "5.75.0", "@storybook/builder-webpack5/webpack": "5.75.0",

View File

@ -35,7 +35,7 @@
"postpack": "mv package.json.bak package.json" "postpack": "mv package.json.bak package.json"
}, },
"dependencies": { "dependencies": {
"@braintree/sanitize-url": "6.0.1", "@braintree/sanitize-url": "6.0.2",
"@grafana/schema": "9.5.0-pre", "@grafana/schema": "9.5.0-pre",
"@types/d3-interpolate": "^3.0.0", "@types/d3-interpolate": "^3.0.0",
"d3-interpolate": "3.0.1", "d3-interpolate": "3.0.1",
@ -44,13 +44,13 @@
"fast_array_intersect": "1.1.0", "fast_array_intersect": "1.1.0",
"history": "4.10.1", "history": "4.10.1",
"lodash": "4.17.21", "lodash": "4.17.21",
"marked": "4.2.0", "marked": "4.2.12",
"moment": "2.29.4", "moment": "2.29.4",
"moment-timezone": "0.5.38", "moment-timezone": "0.5.41",
"ol": "7.2.2", "ol": "7.2.2",
"papaparse": "5.3.2", "papaparse": "5.3.2",
"react-use": "17.4.0", "react-use": "17.4.0",
"regenerator-runtime": "0.13.10", "regenerator-runtime": "0.13.11",
"rxjs": "7.8.0", "rxjs": "7.8.0",
"tinycolor2": "1.6.0", "tinycolor2": "1.6.0",
"tslib": "2.5.0", "tslib": "2.5.0",
@ -69,11 +69,11 @@
"@testing-library/user-event": "14.4.3", "@testing-library/user-event": "14.4.3",
"@types/history": "4.7.11", "@types/history": "4.7.11",
"@types/jest": "29.2.3", "@types/jest": "29.2.3",
"@types/jquery": "3.5.14", "@types/jquery": "3.5.16",
"@types/lodash": "4.14.187", "@types/lodash": "4.14.191",
"@types/marked": "4.0.7", "@types/marked": "4.0.8",
"@types/node": "18.14.0", "@types/node": "18.14.6",
"@types/papaparse": "5.3.5", "@types/papaparse": "5.3.7",
"@types/react": "17.0.42", "@types/react": "17.0.42",
"@types/react-dom": "17.0.14", "@types/react-dom": "17.0.14",
"@types/sinon": "10.0.13", "@types/sinon": "10.0.13",

View File

@ -30,7 +30,7 @@ export const preferredVisualizationTypes = [
'flamegraph', 'flamegraph',
'rawPrometheus', 'rawPrometheus',
] as const; ] as const;
export type PreferredVisualisationType = typeof preferredVisualizationTypes[number]; export type PreferredVisualisationType = (typeof preferredVisualizationTypes)[number];
/** /**
* @public * @public

View File

@ -41,7 +41,7 @@
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "23.0.2", "@rollup/plugin-commonjs": "23.0.2",
"@rollup/plugin-node-resolve": "15.0.1", "@rollup/plugin-node-resolve": "15.0.1",
"@types/node": "18.14.0", "@types/node": "18.14.6",
"esbuild": "0.16.17", "esbuild": "0.16.17",
"rimraf": "4.2.0", "rimraf": "4.2.0",
"rollup": "2.79.1", "rollup": "2.79.1",

View File

@ -48,9 +48,9 @@
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-node-resolve": "15.0.1", "@rollup/plugin-node-resolve": "15.0.1",
"@types/chrome-remote-interface": "0.31.4", "@types/chrome-remote-interface": "0.31.9",
"@types/lodash": "4.14.187", "@types/lodash": "4.14.191",
"@types/node": "18.14.0", "@types/node": "18.14.6",
"@types/uuid": "9.0.1", "@types/uuid": "9.0.1",
"esbuild": "0.16.17", "esbuild": "0.16.17",
"rollup": "2.79.1", "rollup": "2.79.1",
@ -66,13 +66,13 @@
"@grafana/e2e-selectors": "9.5.0-pre", "@grafana/e2e-selectors": "9.5.0-pre",
"@grafana/tsconfig": "^1.2.0-rc1", "@grafana/tsconfig": "^1.2.0-rc1",
"@mochajs/json-file-reporter": "^1.2.0", "@mochajs/json-file-reporter": "^1.2.0",
"babel-loader": "9.1.0", "babel-loader": "9.1.2",
"blink-diff": "1.0.13", "blink-diff": "1.0.13",
"chrome-remote-interface": "0.32.0", "chrome-remote-interface": "0.32.1",
"commander": "8.3.0", "commander": "8.3.0",
"cypress": "9.5.1", "cypress": "9.5.1",
"cypress-file-upload": "5.0.8", "cypress-file-upload": "5.0.8",
"devtools-protocol": "0.0.1065144", "devtools-protocol": "0.0.1113774",
"execa": "5.1.1", "execa": "5.1.1",
"lodash": "4.17.21", "lodash": "4.17.21",
"mocha": "10.2.0", "mocha": "10.2.0",

View File

@ -39,7 +39,7 @@
"dependencies": { "dependencies": {
"@grafana/data": "9.5.0-pre", "@grafana/data": "9.5.0-pre",
"@grafana/e2e-selectors": "9.5.0-pre", "@grafana/e2e-selectors": "9.5.0-pre",
"@grafana/faro-web-sdk": "1.0.0-beta2", "@grafana/faro-web-sdk": "1.0.0",
"@grafana/ui": "9.5.0-pre", "@grafana/ui": "9.5.0-pre",
"@sentry/browser": "6.19.7", "@sentry/browser": "6.19.7",
"history": "4.10.1", "history": "4.10.1",
@ -59,7 +59,7 @@
"@types/angular": "1.8.4", "@types/angular": "1.8.4",
"@types/history": "4.7.11", "@types/history": "4.7.11",
"@types/jest": "29.2.3", "@types/jest": "29.2.3",
"@types/lodash": "4.14.187", "@types/lodash": "4.14.191",
"@types/react": "17.0.42", "@types/react": "17.0.42",
"@types/react-dom": "17.0.14", "@types/react-dom": "17.0.14",
"@types/systemjs": "^0.20.6", "@types/systemjs": "^0.20.6",

View File

@ -47,12 +47,12 @@
"not IE 11" "not IE 11"
], ],
"dependencies": { "dependencies": {
"@emotion/css": "11.10.5", "@emotion/css": "11.10.6",
"@emotion/react": "11.10.5", "@emotion/react": "11.10.6",
"@grafana/data": "9.5.0-pre", "@grafana/data": "9.5.0-pre",
"@grafana/e2e-selectors": "9.5.0-pre", "@grafana/e2e-selectors": "9.5.0-pre",
"@grafana/schema": "9.5.0-pre", "@grafana/schema": "9.5.0-pre",
"@leeoniya/ufuzzy": "1.0.2", "@leeoniya/ufuzzy": "1.0.5",
"@monaco-editor/react": "4.4.6", "@monaco-editor/react": "4.4.6",
"@popperjs/core": "2.11.6", "@popperjs/core": "2.11.6",
"@react-aria/button": "3.6.1", "@react-aria/button": "3.6.1",
@ -71,9 +71,9 @@
"date-fns": "2.29.3", "date-fns": "2.29.3",
"hoist-non-react-statics": "3.3.2", "hoist-non-react-statics": "3.3.2",
"i18next": "^22.0.0", "i18next": "^22.0.0",
"immutable": "4.2.2", "immutable": "4.2.4",
"is-hotkey": "0.2.0", "is-hotkey": "0.2.0",
"jquery": "3.6.1", "jquery": "3.6.3",
"lodash": "4.17.21", "lodash": "4.17.21",
"memoize-one": "6.0.0", "memoize-one": "6.0.0",
"moment": "2.29.4", "moment": "2.29.4",
@ -81,8 +81,8 @@
"ol": "7.2.2", "ol": "7.2.2",
"prismjs": "1.29.0", "prismjs": "1.29.0",
"rc-cascader": "3.8.0", "rc-cascader": "3.8.0",
"rc-drawer": "6.1.2", "rc-drawer": "6.1.3",
"rc-slider": "10.1.0", "rc-slider": "10.1.1",
"rc-time-picker": "^3.7.3", "rc-time-picker": "^3.7.3",
"rc-tooltip": "5.3.1", "rc-tooltip": "5.3.1",
"react-beautiful-dnd": "13.1.1", "react-beautiful-dnd": "13.1.1",
@ -93,7 +93,7 @@
"react-highlight-words": "0.20.0", "react-highlight-words": "0.20.0",
"react-hook-form": "7.5.3", "react-hook-form": "7.5.3",
"react-i18next": "^12.0.0", "react-i18next": "^12.0.0",
"react-inlinesvg": "3.0.1", "react-inlinesvg": "3.0.2",
"react-popper": "2.3.0", "react-popper": "2.3.0",
"react-popper-tooltip": "4.4.2", "react-popper-tooltip": "4.4.2",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
@ -143,19 +143,19 @@
"@types/hoist-non-react-statics": "3.3.1", "@types/hoist-non-react-statics": "3.3.1",
"@types/is-hotkey": "0.1.7", "@types/is-hotkey": "0.1.7",
"@types/jest": "29.2.3", "@types/jest": "29.2.3",
"@types/jquery": "3.5.14", "@types/jquery": "3.5.16",
"@types/lodash": "4.14.187", "@types/lodash": "4.14.191",
"@types/mock-raf": "1.0.3", "@types/mock-raf": "1.0.3",
"@types/node": "18.14.0", "@types/node": "18.14.6",
"@types/prismjs": "1.26.0", "@types/prismjs": "1.26.0",
"@types/react": "17.0.42", "@types/react": "17.0.42",
"@types/react-beautiful-dnd": "13.1.2", "@types/react-beautiful-dnd": "13.1.3",
"@types/react-calendar": "3.9.0", "@types/react-calendar": "3.9.0",
"@types/react-color": "3.0.6", "@types/react-color": "3.0.6",
"@types/react-dom": "17.0.14", "@types/react-dom": "17.0.14",
"@types/react-highlight-words": "0.16.4", "@types/react-highlight-words": "0.16.4",
"@types/react-router-dom": "5.3.3", "@types/react-router-dom": "5.3.3",
"@types/react-table": "7.7.12", "@types/react-table": "7.7.14",
"@types/react-test-renderer": "17.0.1", "@types/react-test-renderer": "17.0.1",
"@types/react-transition-group": "4.4.5", "@types/react-transition-group": "4.4.5",
"@types/react-window": "1.8.5", "@types/react-window": "1.8.5",
@ -166,7 +166,7 @@
"@types/tinycolor2": "1.4.3", "@types/tinycolor2": "1.4.3",
"@types/uuid": "9.0.1", "@types/uuid": "9.0.1",
"common-tags": "1.8.2", "common-tags": "1.8.2",
"css-loader": "6.7.1", "css-loader": "6.7.3",
"csstype": "3.1.1", "csstype": "3.1.1",
"esbuild": "0.16.17", "esbuild": "0.16.17",
"expose-loader": "4.0.0", "expose-loader": "4.0.0",

View File

@ -1,6 +1,6 @@
import { css, cx } from '@emotion/css'; import { css, cx } from '@emotion/css';
import React, { MouseEventHandler } from 'react'; import React, { MouseEventHandler } from 'react';
import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd'; import { DraggableProvided } from 'react-beautiful-dnd';
import { GrafanaTheme2 } from '@grafana/data'; import { GrafanaTheme2 } from '@grafana/data';
import { Icon, IconButton, useStyles2 } from '@grafana/ui'; import { Icon, IconButton, useStyles2 } from '@grafana/ui';
@ -9,7 +9,7 @@ interface QueryOperationRowHeaderProps {
actionsElement?: React.ReactNode; actionsElement?: React.ReactNode;
disabled?: boolean; disabled?: boolean;
draggable: boolean; draggable: boolean;
dragHandleProps?: DraggableProvidedDragHandleProps; dragHandleProps?: DraggableProvided['dragHandleProps'];
headerElement?: React.ReactNode; headerElement?: React.ReactNode;
isContentVisible: boolean; isContentVisible: boolean;
onRowToggle: () => void; onRowToggle: () => void;

View File

@ -99,6 +99,8 @@ describe('GrafanaJavascriptAgentEchoBackend', () => {
getSession: jest.fn(), getSession: jest.fn(),
resetUser: jest.fn(), resetUser: jest.fn(),
resetSession: jest.fn(), resetSession: jest.fn(),
setView: jest.fn(),
getView: jest.fn(),
}, },
config: { config: {
globalObjectKey: '', globalObjectKey: '',
@ -193,6 +195,8 @@ describe('GrafanaJavascriptAgentEchoBackend', () => {
getSession: jest.fn(), getSession: jest.fn(),
resetUser: jest.fn(), resetUser: jest.fn(),
resetSession: jest.fn(), resetSession: jest.fn(),
setView: jest.fn(),
getView: jest.fn(),
}, },
config: { config: {
globalObjectKey: '', globalObjectKey: '',

View File

@ -199,10 +199,10 @@ const getStyles = (theme: GrafanaTheme2) => ({
margin-bottom: ${theme.spacing(3)}; margin-bottom: ${theme.spacing(3)};
`, `,
deleteButton: css` deleteButton: css`
margin-left: ${theme.spacing(3)}; ; margin-left: ${theme.spacing(3)};
`, `,
deleteButtonMobile: css` deleteButtonMobile: css`
margin-top: ${theme.spacing(2)}; ; margin-top: ${theme.spacing(2)};
`, `,
}); });

View File

@ -122,7 +122,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
logSamplesButton: css` logSamplesButton: css`
position: absolute; position: absolute;
top: ${theme.spacing(1)}; top: ${theme.spacing(1)};
right: ${theme.spacing(1)}; ; right: ${theme.spacing(1)};
`, `,
logContainer: css` logContainer: css`
overflow-x: scroll; overflow-x: scroll;

View File

@ -239,7 +239,7 @@ export function createGetLinks(linkPatterns: ProcessedLinkPattern[], cache: Weak
const processedLinks = (getConfigValue('linkPatterns') || []) const processedLinks = (getConfigValue('linkPatterns') || [])
.map(processLinkPattern) .map(processLinkPattern)
.filter((link): link is ProcessedLinkPattern => Boolean(link)); .filter((link: ProcessedLinkPattern | null): link is ProcessedLinkPattern => Boolean(link));
export const getTraceLinks: (trace: Trace | undefined) => TLinksRV = memoize(10)((trace: Trace | undefined) => { export const getTraceLinks: (trace: Trace | undefined) => TLinksRV = memoize(10)((trace: Trace | undefined) => {
const result: TLinksRV = []; const result: TLinksRV = [];

View File

@ -139,7 +139,7 @@ describe('Bucket Aggregations Reducer', () => {
type: 'date_histogram', type: 'date_histogram',
}; };
const expectedSettings: typeof firstAggregation['settings'] = { const expectedSettings: (typeof firstAggregation)['settings'] = {
min_doc_count: '1', min_doc_count: '1',
}; };

View File

@ -170,7 +170,7 @@ describe('Metric Aggregations Reducer', () => {
type: 'count', type: 'count',
}; };
const expectedSettings: typeof firstAggregation['settings'] = { const expectedSettings: (typeof firstAggregation)['settings'] = {
unit: 'Changed unit', unit: 'Changed unit',
}; };
@ -195,7 +195,7 @@ describe('Metric Aggregations Reducer', () => {
type: 'count', type: 'count',
}; };
const expectedMeta: typeof firstAggregation['meta'] = { const expectedMeta: (typeof firstAggregation)['meta'] = {
avg: false, avg: false,
}; };
@ -215,7 +215,7 @@ describe('Metric Aggregations Reducer', () => {
type: 'count', type: 'count',
}; };
const expectedHide: typeof firstAggregation['hide'] = false; const expectedHide: (typeof firstAggregation)['hide'] = false;
reducerTester<ElasticsearchQuery['metrics']>() reducerTester<ElasticsearchQuery['metrics']>()
.givenReducer(reducer, [firstAggregation, secondAggregation]) .givenReducer(reducer, [firstAggregation, secondAggregation])

View File

@ -1,6 +1,6 @@
import { css } from '@emotion/css'; import { css } from '@emotion/css';
import React, { useState } from 'react'; import React, { useState } from 'react';
import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd'; import { DraggableProvided } from 'react-beautiful-dnd';
import { GrafanaTheme2, SelectableValue } from '@grafana/data'; import { GrafanaTheme2, SelectableValue } from '@grafana/data';
import { FlexItem } from '@grafana/experimental'; import { FlexItem } from '@grafana/experimental';
@ -14,7 +14,7 @@ export interface Props {
def: QueryBuilderOperationDef; def: QueryBuilderOperationDef;
index: number; index: number;
queryModeller: VisualQueryModeller; queryModeller: VisualQueryModeller;
dragHandleProps?: DraggableProvidedDragHandleProps; dragHandleProps?: DraggableProvided['dragHandleProps'];
onChange: (index: number, update: QueryBuilderOperation) => void; onChange: (index: number, update: QueryBuilderOperation) => void;
onRemove: (index: number) => void; onRemove: (index: number) => void;
} }

View File

@ -6,7 +6,7 @@ import { SeriesColorPicker, SeriesIcon } from '@grafana/ui';
import { TimeSeries } from 'app/core/core'; import { TimeSeries } from 'app/core/core';
export const LEGEND_STATS = ['min', 'max', 'avg', 'current', 'total'] as const; export const LEGEND_STATS = ['min', 'max', 'avg', 'current', 'total'] as const;
export type LegendStat = typeof LEGEND_STATS[number]; export type LegendStat = (typeof LEGEND_STATS)[number];
export interface LegendLabelProps { export interface LegendLabelProps {
series: TimeSeries; series: TimeSeries;

View File

@ -87,7 +87,7 @@ export interface ExploreState {
} }
export const EXPLORE_GRAPH_STYLES = ['lines', 'bars', 'points', 'stacked_lines', 'stacked_bars'] as const; export const EXPLORE_GRAPH_STYLES = ['lines', 'bars', 'points', 'stacked_lines', 'stacked_bars'] as const;
export type ExploreGraphStyle = typeof EXPLORE_GRAPH_STYLES[number]; export type ExploreGraphStyle = (typeof EXPLORE_GRAPH_STYLES)[number];
export interface ExploreItemState { export interface ExploreItemState {
/** /**
@ -264,7 +264,7 @@ export enum TABLE_RESULTS_STYLE {
raw = 'raw', raw = 'raw',
} }
export const TABLE_RESULTS_STYLES = [TABLE_RESULTS_STYLE.table, TABLE_RESULTS_STYLE.raw]; export const TABLE_RESULTS_STYLES = [TABLE_RESULTS_STYLE.table, TABLE_RESULTS_STYLE.raw];
export type TableResultsStyle = typeof TABLE_RESULTS_STYLES[number]; export type TableResultsStyle = (typeof TABLE_RESULTS_STYLES)[number];
export interface SupplementaryQuery { export interface SupplementaryQuery {
enabled: boolean; enabled: boolean;

1283
yarn.lock

File diff suppressed because it is too large Load Diff