IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-26 08:16:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Clean up package.json files (#86951)

Browse Source 
* Chore: Clean up package.json files

Removes any unused packages, adds missing peer dependencies
This commit is contained in:
kay delaney 2024-04-29 14:03:01 +01:00 committed by GitHub
parent b52e349639
commit 6f875188b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 532 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.betterer.results
View File

@ -1205,10 +1205,6 @@ exports[`better eslint`] = {
[0, 0, 0, "Styles should be written using objects.", "16"],
[0, 0, 0, "Styles should be written using objects.", "17"]
],
"public/app/core/components/connectWithCleanUp.tsx:5381": [
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
[0, 0, 0, "Do not use any type assertions.", "1"]
],
"public/app/core/config.ts:5381": [
[0, 0, 0, "Do not re-export imported variable (\`config\`)", "0"]
],

13
.yarnrc.yml
View File

@ -24,19 +24,10 @@ packageExtensions:
peerDependencies:
react: 17.0.1
react-dom: 17.0.1
react-compat-css-styled@1.0.8:
dependencies:
react-simple-compat: 1.2.2
react-icons@2.2.7:
peerDependencies:
prop-types: '*'
react-resizable@3.0.4:
peerDependencies:
react-dom: 17.0.1
'@msagl/drawing@*':
dependencies:
queue-typescript: "^1.0.1"
"@esfx/collections-sortedmap": "^1.0.0"
queue-typescript: '^1.0.1'
'@esfx/collections-sortedmap': '^1.0.0'
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs

32
package.json
View File

@ -66,6 +66,8 @@
"releaseNotesUrl": "https://grafana.com/docs/grafana/next/release-notes/"
},
"devDependencies": {
"@babel/core": "7.24.4",
"@babel/preset-env": "7.24.4",
"@babel/runtime": "7.24.4",
"@betterer/betterer": "5.4.0",
"@betterer/cli": "5.4.0",
@ -93,6 +95,8 @@
"@testing-library/user-event": "14.5.2",
"@types/angular": "1.8.9",
"@types/angular-route": "1.7.6",
"@types/babel__core": "^7",
"@types/babel__preset-env": "^7",
"@types/chance": "^1.1.3",
"@types/common-tags": "^1.8.0",
"@types/d3": "7.4.3",
@ -107,7 +111,6 @@
"@types/google.analytics": "^0.0.46",
"@types/gtag.js": "^0.0.19",
"@types/history": "4.7.11",
"@types/hoist-non-react-statics": "3.3.5",
"@types/jest": "29.5.12",
"@types/jquery": "3.5.29",
"@types/js-yaml": "^4.0.5",
@ -117,9 +120,7 @@
"@types/lucene": "^2",
"@types/mousetrap": "1.6.15",
"@types/node": "20.12.7",
"@types/node-forge": "^1",
"@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.2.4",
"@types/papaparse": "5.3.14",
"@types/pluralize": "^0.0.33",
"@types/prismjs": "1.26.3",
"@types/react": "18.2.79",
@ -127,6 +128,7 @@
"@types/react-dom": "18.2.25",
"@types/react-grid-layout": "1.3.5",
"@types/react-highlight-words": "0.16.7",
"@types/react-resizable": "3.0.7",
"@types/react-router": "5.1.20",
"@types/react-router-dom": "5.3.3",
"@types/react-table": "7.7.20",
@ -145,10 +147,12 @@
"@types/tinycolor2": "1.4.6",
"@types/uuid": "9.0.8",
"@types/webpack-assets-manifest": "^5",
"@types/webpack-env": "^1.18.4",
"@types/yargs": "17.0.32",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"autoprefixer": "10.4.19",
"babel-loader": "9.1.3",
"blob-polyfill": "7.0.20220408",
"browserslist": "^4.21.4",
"chance": "^1.0.10",
@ -190,6 +194,7 @@
"jest-junit": "16.0.0",
"jest-matcher-utils": "29.7.0",
"jest-watch-typeahead": "^2.2.2",
"knip": "^5.10.0",
"lerna": "8.1.2",
"mini-css-extract-plugin": "2.9.0",
"msw": "2.2.14",
@ -204,7 +209,6 @@
"prettier": "3.2.5",
"react-refresh": "0.14.0",
"react-select-event": "5.5.1",
"react-simple-compat": "1.2.3",
"react-test-renderer": "18.2.0",
"redux-mock-store": "1.5.4",
"rimraf": "5.0.5",
@ -232,7 +236,6 @@
"yargs": "^17.5.1"
},
"dependencies": {
"@daybrush/utils": "1.13.0",
"@emotion/css": "11.11.2",
"@emotion/react": "11.11.4",
"@fingerprintjs/fingerprintjs": "^3.4.2",
@ -275,18 +278,12 @@
"@react-aria/focus": "3.16.2",
"@react-aria/overlays": "3.21.1",
"@react-aria/utils": "3.23.2",
"@react-awesome-query-builder/core": "6.4.2",
"@react-awesome-query-builder/ui": "6.4.2",
"@reduxjs/toolkit": "1.9.5",
"@remix-run/router": "^1.5.0",
"@testing-library/react-hooks": "^8.0.1",
"@types/react-resizable": "3.0.7",
"@types/trusted-types": "2.0.7",
"@types/webpack-env": "1.18.4",
"@visx/event": "3.3.0",
"@visx/gradient": "3.3.0",
"@visx/group": "3.3.0",
"@visx/scale": "3.5.0",
"@visx/shape": "3.5.0",
"@visx/tooltip": "3.3.0",
"@welldone-software/why-did-you-render": "8.0.1",
@ -297,7 +294,6 @@
"ansicolor": "1.1.100",
"baron": "3.0.3",
"brace": "0.11.1",
"calculate-size": "1.1.1",
"centrifuge": "5.1.1",
"classnames": "2.5.1",
"combokeys": "^3.0.0",
@ -310,14 +306,10 @@
"date-fns": "3.6.0",
"debounce-promise": "3.1.2",
"diff": "^5.1.0",
"emotion": "11.0.0",
"eventemitter3": "5.0.1",
"fast-deep-equal": "^3.1.3",
"fast-json-patch": "3.1.1",
"file-saver": "2.0.5",
"framework-utils": "^1.1.0",
"history": "4.10.1",
"hoist-non-react-statics": "3.3.2",
"i18next": "^23.0.0",
"i18next-browser-languagedetector": "^7.0.2",
"immer": "10.0.4",
@ -335,28 +327,20 @@
"lru-memoize": "^1.1.0",
"lucene": "^2.1.1",
"marked": "12.0.2",
"marked-mangle": "1.1.7",
"memoize-one": "6.0.0",
"ml-regression-polynomial": "^3.0.0",
"ml-regression-simple-linear": "^3.0.0",
"moment": "2.30.1",
"moment-timezone": "0.5.45",
"monaco-editor": "0.34.1",
"monaco-promql": "1.7.4",
"mousetrap": "1.6.5",
"mousetrap-global-bind": "1.1.0",
"moveable": "0.53.0",
"nanoid": "^5.0.4",
"node-forge": "^1.3.1",
"ol": "7.4.0",
"ol-ext": "4.0.18",
"papaparse": "5.4.1",
"pluralize": "^8.0.0",
"prismjs": "1.29.0",
"prop-types": "15.8.1",
"pseudoizer": "^0.1.0",
"rc-cascader": "3.24.1",
"rc-drawer": "7.1.0",
"rc-slider": "10.6.2",
"rc-time-picker": "3.7.3",
"rc-tree": "5.8.5",

3
packages/grafana-flamegraph/package.json
View File

@ -61,16 +61,19 @@
"@babel/preset-react": "7.24.1",
"@grafana/tsconfig": "^1.3.0-rc1",
"@rollup/plugin-node-resolve": "15.2.3",
"@testing-library/dom": "10.0.0",
"@testing-library/jest-dom": "^6.1.2",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/d3": "^7",
"@types/jest": "^29.5.4",
"@types/lodash": "4.17.0",
"@types/node": "20.12.7",
"@types/react": "18.2.79",
"@types/react-virtualized-auto-sizer": "1.0.4",
"@types/tinycolor2": "1.4.6",
"babel-jest": "29.7.0",
"esbuild": "0.20.2",
"jest": "^29.6.4",
"jest-canvas-mock": "2.5.2",
"rollup": "2.79.1",

3
packages/grafana-icons/package.json
View File

@ -34,14 +34,17 @@
"build": "yarn generate && rollup -c rollup.config.ts"
},
"devDependencies": {
"@babel/core": "7.24.4",
"@grafana/tsconfig": "^1.3.0-rc1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-typescript": "^11.1.6",
"@svgr/babel-plugin-remove-jsx-attribute": "^8.0.0",
"@svgr/cli": "^8.1.0",
"@svgr/core": "8.1.0",
"@svgr/plugin-jsx": "^8.1.0",
"@svgr/plugin-prettier": "^8.1.0",
"@svgr/plugin-svgo": "^8.1.0",
"@types/babel__core": "^7",
"@types/node": "20.12.7",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",

3
packages/grafana-o11y-ds-frontend/package.json
View File

@ -24,16 +24,19 @@
"@grafana/runtime": "11.1.0-pre",
"@grafana/schema": "11.1.0-pre",
"@grafana/ui": "11.1.0-pre",
"react-select": "5.8.0",
"react-use": "17.5.0",
"rxjs": "7.8.1",
"tslib": "2.6.2"
},
"devDependencies": {
"@grafana/tsconfig": "^1.3.0-rc1",
"@testing-library/dom": "10.0.0",
"@testing-library/jest-dom": "^6.1.2",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "^29.5.4",
"@types/node": "20.12.7",
"@types/react": "18.2.79",
"@types/systemjs": "6.13.5",
"@types/testing-library__jest-dom": "5.14.9",

4
packages/grafana-plugin-configs/package.json
View File

@ -8,12 +8,16 @@
},
"devDependencies": {
"@grafana/tsconfig": "^1.3.0-rc1",
"@swc/core": "1.4.2",
"@types/eslint": "8.56.10",
"copy-webpack-plugin": "12.0.2",
"eslint": "8.57.0",
"eslint-webpack-plugin": "4.1.0",
"fork-ts-checker-webpack-plugin": "9.0.2",
"glob": "10.3.12",
"replace-in-file-webpack-plugin": "1.0.6",
"swc-loader": "0.2.6",
"typescript": "5.4.5",
"webpack": "5.91.0"
},
"packageManager": "yarn@4.1.1"

14
packages/grafana-sql/package.json
View File

@ -16,15 +16,16 @@
"dependencies": {
"@emotion/css": "11.11.2",
"@grafana/data": "11.1.0-pre",
"@grafana/e2e-selectors": "11.1.0-pre",
"@grafana/experimental": "1.7.10",
"@grafana/runtime": "11.1.0-pre",
"@grafana/ui": "11.1.0-pre",
"@react-awesome-query-builder/ui": "6.4.2",
"@types/lodash": "4.17.0",
"@types/react-virtualized-auto-sizer": "1.0.4",
"@types/uuid": "9.0.8",
"immutable": "4.3.5",
"lodash": "4.17.21",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-select": "5.8.0",
"react-use": "17.5.0",
"react-virtualized-auto-sizer": "1.0.24",
"rxjs": "7.8.1",
@ -34,16 +35,21 @@
},
"devDependencies": {
"@grafana/tsconfig": "^1.3.0-rc1",
"@testing-library/dom": "10.0.0",
"@testing-library/jest-dom": "^6.1.2",
"@testing-library/react": "15.0.2",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "14.5.2",
"@types/jest": "^29.5.4",
"@types/lodash": "4.17.0",
"@types/node": "20.12.7",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@types/react-virtualized-auto-sizer": "1.0.4",
"@types/systemjs": "6.13.5",
"@types/testing-library__jest-dom": "5.14.9",
"@types/uuid": "9.0.8",
"jest": "^29.6.4",
"react": "18.2.0",
"ts-jest": "29.1.2",
"ts-node": "10.9.2",
"typescript": "5.4.5"

38
public/app/core/components/connectWithCleanUp.tsx
View File

@ -1,38 +0,0 @@
import hoistNonReactStatics from 'hoist-non-react-statics';
import React, { ComponentType, FunctionComponent, useEffect } from 'react';
import { connect, MapDispatchToPropsParam, MapStateToPropsParam } from 'react-redux';
import { useDispatch } from 'app/types';
import { cleanUpAction, CleanUpAction } from '../actions/cleanUp';
export const connectWithCleanUp =
<TStateProps extends {} = {}, TDispatchProps = {}, TOwnProps = {}, State = {}, Statics = {}>(
mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>,
cleanupAction: CleanUpAction
) =>
(Component: ComponentType<any>) => {
const ConnectedComponent = connect(
mapStateToProps,
mapDispatchToProps
// @ts-ignore
)(Component);
const ConnectedComponentWithCleanUp: FunctionComponent = (props) => {
const dispatch = useDispatch();
useEffect(() => {
return function cleanUp() {
dispatch(cleanUpAction({ cleanupAction: cleanupAction }));
};
}, [dispatch]);
// @ts-ignore
return <ConnectedComponent {...props} />;
};
ConnectedComponentWithCleanUp.displayName = `ConnectWithCleanUp(${ConnectedComponent.displayName})`;
hoistNonReactStatics(ConnectedComponentWithCleanUp, Component);
type Hoisted = typeof ConnectedComponentWithCleanUp & Statics;
return ConnectedComponentWithCleanUp as Hoisted;
};

4
public/app/plugins/datasource/azuremonitor/package.json
View File

@ -18,6 +18,8 @@
"monaco-editor": "0.34.1",
"prismjs": "1.29.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-select": "5.8.0",
"react-use": "17.5.0",
"rxjs": "7.8.1",
"tslib": "2.6.2"
@ -25,6 +27,7 @@
"devDependencies": {
"@grafana/e2e-selectors": "11.1.0-pre",
"@grafana/plugin-configs": "11.1.0-pre",
"@testing-library/dom": "10.0.0",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",
@ -32,6 +35,7 @@
"@types/node": "20.12.7",
"@types/prismjs": "1.26.3",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@types/testing-library__jest-dom": "5.14.9",
"react-select-event": "5.5.1",
"ts-node": "10.9.2",

4
public/app/plugins/datasource/cloud-monitoring/package.json
View File

@ -19,6 +19,8 @@
"monaco-editor": "0.34.1",
"prismjs": "1.29.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-select": "5.8.0",
"react-use": "17.5.0",
"rxjs": "7.8.1",
"tslib": "2.6.2"
@ -26,6 +28,7 @@
"devDependencies": {
"@grafana/e2e-selectors": "11.1.0-pre",
"@grafana/plugin-configs": "11.1.0-pre",
"@testing-library/dom": "10.0.0",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/debounce-promise": "3.1.9",
@ -34,6 +37,7 @@
"@types/node": "20.12.7",
"@types/prismjs": "1.26.3",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@types/react-test-renderer": "18.0.7",
"@types/testing-library__jest-dom": "5.14.9",
"react-select-event": "5.5.1",

2
public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
View File

@ -21,11 +21,13 @@
},
"devDependencies": {
"@grafana/plugin-configs": "11.1.0-pre",
"@testing-library/dom": "10.0.0",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",
"@types/lodash": "4.17.0",
"@types/node": "20.12.7",
"@types/prismjs": "1.26.3",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",

5
public/app/plugins/datasource/grafana-testdata-datasource/package.json
View File

@ -14,6 +14,8 @@
"lodash": "4.17.21",
"micro-memoize": "^4.1.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-select": "5.8.0",
"react-use": "17.5.0",
"rxjs": "7.8.1",
"tslib": "2.6.2",
@ -22,6 +24,7 @@
"devDependencies": {
"@grafana/e2e-selectors": "11.1.0-pre",
"@grafana/plugin-configs": "11.1.0-pre",
"@testing-library/dom": "10.0.0",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/d3-random": "^3.0.2",
@ -29,9 +32,11 @@
"@types/lodash": "4.17.0",
"@types/node": "20.12.7",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@types/testing-library__jest-dom": "5.14.9",
"@types/uuid": "9.0.8",
"ts-node": "10.9.2",
"typescript": "5.4.5",
"webpack": "5.91.0"
},
"peerDependencies": {

9
public/app/plugins/datasource/jaeger/package.json
View File

@ -6,12 +6,16 @@
"dependencies": {
"@emotion/css": "11.11.2",
"@grafana/data": "workspace:*",
"@grafana/e2e-selectors": "workspace:*",
"@grafana/experimental": "1.7.10",
"@grafana/o11y-ds-frontend": "workspace:*",
"@grafana/runtime": "workspace:*",
"@grafana/ui": "workspace:*",
"lodash": "4.17.21",
"logfmt": "^1.3.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-select": "5.8.0",
"react-window": "1.8.10",
"rxjs": "7.8.1",
"stream-browserify": "3.0.0",
@ -20,15 +24,20 @@
},
"devDependencies": {
"@grafana/plugin-configs": "workspace:*",
"@testing-library/dom": "10.0.0",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",
"@types/lodash": "4.17.0",
"@types/logfmt": "^1.2.3",
"@types/node": "20.12.7",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@types/react-window": "1.8.8",
"@types/uuid": "9.0.8",
"ts-node": "10.9.2",
"typescript": "5.4.5",
"webpack": "5.91.0"
},
"peerDependencies": {

5
public/app/plugins/datasource/parca/package.json
View File

@ -12,17 +12,22 @@
"lodash": "4.17.21",
"monaco-editor": "0.34.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-use": "17.5.0",
"rxjs": "7.8.1",
"tslib": "2.6.2"
},
"devDependencies": {
"@grafana/plugin-configs": "11.1.0-pre",
"@testing-library/dom": "10.0.0",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",
"@types/lodash": "4.17.0",
"@types/node": "20.12.7",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"ts-node": "10.9.2",
"typescript": "5.4.5",
"webpack": "5.91.0"
},
"peerDependencies": {

2
public/app/plugins/datasource/tempo/package.json
View File

@ -29,6 +29,7 @@
"prismjs": "1.29.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-select": "5.8.0",
"react-use": "17.5.0",
"rxjs": "7.8.1",
"semver": "7.6.0",
@ -39,6 +40,7 @@
},
"devDependencies": {
"@grafana/plugin-configs": "11.1.0-pre",
"@testing-library/dom": "10.0.0",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "15.0.2",
"@testing-library/user-event": "14.5.2",

6
public/app/plugins/datasource/zipkin/package.json
View File

@ -6,12 +6,15 @@
"dependencies": {
"@emotion/css": "11.11.2",
"@grafana/data": "workspace:*",
"@grafana/e2e-selectors": "workspace:*",
"@grafana/experimental": "1.7.10",
"@grafana/o11y-ds-frontend": "workspace:*",
"@grafana/runtime": "workspace:*",
"@grafana/ui": "workspace:*",
"lodash": "4.17.21",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-select": "5.8.0",
"react-use": "17.5.0",
"rxjs": "7.8.1",
"tslib": "2.6.2"
@ -22,8 +25,11 @@
"@testing-library/react": "15.0.2",
"@types/jest": "29.5.12",
"@types/lodash": "4.17.0",
"@types/node": "20.12.7",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"ts-node": "10.9.2",
"typescript": "5.4.5",
"webpack": "5.91.0"
},
"peerDependencies": {

536
yarn.lock
View File

File diff suppressed because it is too large Load Diff