Skip to content

Commit

Permalink
Chore: Bump various dependencies (#682)
Browse files Browse the repository at this point in the history
  • Loading branch information
kaydelaney authored May 1, 2024
1 parent 7b75042 commit 609cb4a
Show file tree
Hide file tree
Showing 12 changed files with 560 additions and 768 deletions.
4 changes: 2 additions & 2 deletions docusaurus/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"clsx": "^1.2.1",
"docusaurus-lunr-search": "^2.4.1",
"prism-react-renderer": "^1.3.5",
"react": "^17.0.2",
"react-dom": "^17.0.2"
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "2.4.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"typecheck": "lerna run typecheck"
},
"resolutions": {
"@types/react": "17.0.42"
"@types/react": "18.2.74"
},
"packageManager": "[email protected]",
"workspaces": [
Expand Down
10 changes: 5 additions & 5 deletions packages/scenes-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"devDependencies": {
"@babel/core": "^7.16.7",
"@grafana/e2e": "9.2.1",
"@grafana/e2e-selectors": "10.3.3",
"@grafana/e2e-selectors": "10.4.1",
"@grafana/eslint-config": "5.0.0",
"@grafana/tsconfig": "1.3.0-rc1",
"@swc/core": "^1.2.144",
Expand Down Expand Up @@ -60,11 +60,11 @@
},
"dependencies": {
"@emotion/css": "^11.1.3",
"@grafana/data": "10.3.3",
"@grafana/runtime": "10.3.3",
"@grafana/data": "^10.4.1",
"@grafana/runtime": "^10.4.1",
"@grafana/scenes": "workspace:*",
"@grafana/schema": "10.3.3",
"@grafana/ui": "10.3.3",
"@grafana/schema": "^10.4.1",
"@grafana/ui": "^10.4.1",
"@types/lodash": "latest",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
14 changes: 7 additions & 7 deletions packages/scenes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@
"url": "https://github.com/grafana/scenes/issues"
},
"dependencies": {
"@grafana/e2e-selectors": "10.3.3",
"@grafana/e2e-selectors": "^10.4.1",
"react-grid-layout": "1.3.4",
"react-use": "17.4.0",
"react-virtualized-auto-sizer": "1.0.7",
"uuid": "^9.0.0"
},
"peerDependencies": {
"@grafana/data": "^10.0.3",
"@grafana/runtime": "^10.0.3",
"@grafana/schema": "^10.0.3",
"@grafana/ui": "^10.0.3",
"@grafana/data": "^10.4.1",
"@grafana/runtime": "^10.4.1",
"@grafana/schema": "^10.4.1",
"@grafana/ui": "^10.4.1",
"react": "^18.0.0",
"react-dom": "^18.0.0"
},
Expand All @@ -69,8 +69,8 @@
"@types/jest": "29.5.12",
"@types/lodash": "4.14.187",
"@types/node": "20.11.30",
"@types/react": "18.2.55",
"@types/react-dom": "18.2.19",
"@types/react": "18.2.74",
"@types/react-dom": "18.2.24",
"@types/react-grid-layout": "1.3.2",
"@types/react-router-dom": "5.3.3",
"@types/react-virtualized-auto-sizer": "1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/scenes/src/components/layout/LazyLoader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function useUniqueId(): string {
return idRefLazy.current;
}

export interface Props extends Omit<React.HTMLProps<HTMLDivElement>, 'onChange'> {
export interface Props extends Omit<React.HTMLProps<HTMLDivElement>, 'onChange' | 'children'> {
children: React.ReactNode | (({ isInView }: { isInView: boolean }) => React.ReactNode);
key: string;
onLoad?: () => void;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export function SceneGridLayoutRenderer({ model }: SceneComponentProps<SceneGrid
rowHeight={GRID_CELL_HEIGHT}
draggableHandle={`.grid-drag-handle-${model.state.key}`}
draggableCancel=".grid-drag-cancel"
// @ts-ignore: ignoring for now until we make the size type numbers-only
layout={layout}
onDragStart={model.onDragStart}
onDragStop={model.onDragStop}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ exports[`VizPanelBuilder options and field config standard panels defaults provi

exports[`VizPanelBuilder options and field config standard panels defaults provides histogram defaults 1`] = `
{
"bucketCount": 30,
"bucketOffset": 0,
}
`;
Expand Down
2 changes: 1 addition & 1 deletion packages/scenes/src/core/SceneObjectBase.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export abstract class SceneObjectBase<TState extends SceneObjectState = SceneObj
* Wraps the component in an EditWrapper that handles edit mode
*/
public get Component(): SceneComponent<this> {
return SceneComponentWrapper;
return SceneComponentWrapper as SceneComponent<this>;
}

private _setParent(state: Partial<TState>) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ export class AdHocFiltersVariable
const otherFilters = this.state.filters.filter((f) => f.key !== currentKey).concat(this.state.baseFilters ?? []);
const timeRange = sceneGraph.getTimeRange(this).state.value;
const queries = getQueriesForVariables(this);
// @ts-expect-error TODO: remove this once 10.4.0 is released
let keys = await ds.getTagKeys({ filters: otherFilters, queries, timeRange });

if (override) {
Expand Down
1 change: 0 additions & 1 deletion packages/scenes/src/variables/groupby/GroupByVariable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ export class GroupByVariable extends MultiValueVariable<GroupByVariableState> {

const otherFilters = this.state.baseFilters || [];
const timeRange = sceneGraph.getTimeRange(this).state.value;
// @ts-expect-error TODO: remove this once 10.4.0 is released
let keys = await ds.getTagKeys({ filters: otherFilters, queries, timeRange });

if (override) {
Expand Down
1 change: 0 additions & 1 deletion packages/scenes/src/variables/variants/guards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,5 @@ export function isTextBoxVariable(variable: SceneVariable): variable is TextBoxV
}

export function isGroupByVariable(variable: SceneVariable): variable is GroupByVariable {
// @ts-expect-error until we update to grafana-data 10.4.x
return variable.state.type === 'groupby';
}
Loading

0 comments on commit 609cb4a

Please sign in to comment.