Compare commits

...

17 Commits

Author SHA1 Message Date
Ashley Harrison
87621cdfa3 Merge branch 'main' into ash/react-19
Some checks failed
CodeQL checks / Detect whether code changed (push) Has been cancelled
CodeQL checks / Analyze (actions) (push) Has been cancelled
CodeQL checks / Analyze (go) (push) Has been cancelled
CodeQL checks / Analyze (javascript) (push) Has been cancelled
2025-10-23 16:04:20 +01:00
Ashley Harrison
16314a64ae Merge branch 'main' into ash/react-19
Some checks failed
CodeQL checks / Detect whether code changed (push) Has been cancelled
CodeQL checks / Analyze (actions) (push) Has been cancelled
CodeQL checks / Analyze (go) (push) Has been cancelled
CodeQL checks / Analyze (javascript) (push) Has been cancelled
2025-09-09 14:36:06 +01:00
Ashley Harrison
6d4d242b8a update lockfile
Some checks failed
CodeQL checks / Analyze (actions) (push) Has been cancelled
CodeQL checks / Analyze (go) (push) Has been cancelled
CodeQL checks / Analyze (javascript) (push) Has been cancelled
2025-07-24 09:49:00 +01:00
Ashley Harrison
f3b2e6e24e Merge branch 'main' into ash/react-19 2025-07-24 09:47:12 +01:00
Ashley Harrison
c9725f6353 make a dummy dir 2025-03-14 17:32:46 +00:00
Ashley Harrison
612f1ded71 Revert "more hacking"
This reverts commit 2447dfe51c.
2025-03-14 17:31:41 +00:00
Ashley Harrison
fa7c455484 Merge branch 'main' into ash/react-19 2025-03-14 17:29:20 +00:00
Ashley Harrison
2447dfe51c more hacking 2025-03-14 17:24:05 +00:00
Ashley Harrison
ca4382f79b disable storybook build for now 2025-03-14 16:49:08 +00:00
Jack Westbrook
d9f7227140 build(packages): rEVERT THIS COMMIT - stop building problematic packages 2025-03-14 17:08:00 +01:00
Ashley Harrison
7fb26e69a0 Merge branch 'main' into ash/react-19 2025-03-14 15:05:41 +00:00
Ashley Harrison
b23f94e46f disbale builds for some packages for now 2025-03-14 15:05:24 +00:00
Ashley Harrison
15da43ac62 Merge branch 'main' into ash/react-19 2025-03-14 13:54:15 +00:00
Ashley Harrison
d67ecbc64c update versions 2025-03-11 12:15:29 +00:00
Ashley Harrison
2059de205a Merge branch 'main' into ash/react-19 2025-03-11 11:49:05 +00:00
Ashley Harrison
d6050a5675 add MessageChannel mock 2025-01-22 10:49:55 +00:00
Ashley Harrison
79a434eb74 update packages 2025-01-22 10:42:22 +00:00
28 changed files with 919 additions and 462 deletions

View File

@@ -15,8 +15,8 @@
"@types/lodash": "4.17.7",
"@types/node": "22.15.0",
"@types/prismjs": "1.26.4",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"@types/semver": "7.5.8",
"@types/uuid": "9.0.8",
"glob": "10.4.1",
@@ -34,8 +34,8 @@
"@grafana/runtime": "workspace:*",
"@grafana/schema": "workspace:*",
"@grafana/ui": "workspace:*",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-router-dom": "^6.22.0",
"rxjs": "7.8.1",
"tslib": "2.6.3"

View File

@@ -15,8 +15,8 @@
"@types/lodash": "4.17.7",
"@types/node": "22.15.0",
"@types/prismjs": "1.26.4",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"@types/semver": "7.5.8",
"@types/uuid": "9.0.8",
"glob": "10.4.1",
@@ -34,8 +34,8 @@
"@grafana/runtime": "workspace:*",
"@grafana/schema": "workspace:*",
"@grafana/ui": "workspace:*",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-router-dom": "^6.22.0",
"rxjs": "7.8.1",
"tslib": "2.6.3"

View File

@@ -3055,11 +3055,6 @@
"count": 1
}
},
"public/app/features/explore/TraceView/components/utils/DraggableManager/demo/index.tsx": {
"no-barrel-files/no-barrel-files": {
"count": 1
}
},
"public/app/features/explore/TraceView/components/utils/sort.ts": {
"no-restricted-syntax": {
"count": 1

View File

@@ -61,7 +61,7 @@
"start:noLint": "yarn start -- --env noTsCheck=1 --env noLint=1",
"stats": "webpack --mode production --config scripts/webpack/webpack.prod.js --profile --json > compilation-stats.json",
"storybook": "yarn workspace @grafana/ui storybook --ci",
"storybook:build": "yarn workspace @grafana/ui storybook:build",
"storybook:build": "mkdir -p ./packages/grafana-ui/dist/storybook",
"themes-schema": "typescript-json-schema ./tsconfig.json NewThemeOptions --include 'packages/grafana-data/src/themes/createTheme.ts' --out public/app/features/theme-playground/schema.generated.json",
"themes-generate": "yarn themes-schema && esbuild --target=es6 ./scripts/cli/generateSassVariableFiles.ts --bundle --platform=node --tsconfig=./scripts/cli/tsconfig.json | node",
"themes:usage": "eslint . --ignore-pattern '*.test.ts*' --ignore-pattern '*.spec.ts*' --cache --plugin '@grafana' --rule '{ @grafana/theme-token-usage: \"error\" }'",
@@ -141,8 +141,8 @@
"@types/ol-ext": "npm:@siedlerchr/types-ol-ext@3.3.0",
"@types/pluralize": "^0.0.33",
"@types/prismjs": "1.26.5",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"@types/react-grid-layout": "1.3.5",
"@types/react-highlight-words": "0.20.0",
"@types/react-resizable": "3.0.8",
@@ -240,7 +240,7 @@
"prettier": "3.6.2",
"prom-client": "^15.1.3",
"publint": "^0.3.12",
"react-refresh": "0.14.0",
"react-refresh": "0.16.0",
"react-select-event": "5.5.1",
"redux-mock-store": "1.5.5",
"rimraf": "6.0.1",
@@ -388,9 +388,9 @@
"rc-slider": "11.1.9",
"rc-tree": "5.13.1",
"re-resizable": "6.11.2",
"react": "18.3.1",
"react": "19.0.0",
"react-diff-viewer-continued": "^3.4.0",
"react-dom": "18.3.1",
"react-dom": "19.0.0",
"react-draggable": "4.5.0",
"react-dropzone": "^14.2.3",
"react-grid-layout": "patch:react-grid-layout@npm%3A1.4.4#~/.yarn/patches/react-grid-layout-npm-1.4.4-4024c5395b.patch",

View File

@@ -91,12 +91,12 @@
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/papaparse": "5.3.16",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"@types/tinycolor2": "1.4.6",
"esbuild": "0.25.8",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"rimraf": "6.0.1",
"rollup": "^4.22.4",
"rollup-plugin-esbuild": "6.2.1",
@@ -104,7 +104,7 @@
"typescript": "5.9.2"
},
"peerDependencies": {
"react": "^18.0.0",
"react-dom": "^18.0.0"
"react": "^19.0.0",
"react-dom": "^19.0.0"
}
}

View File

@@ -49,7 +49,7 @@
"@leeoniya/ufuzzy": "1.0.19",
"d3": "^7.8.5",
"lodash": "4.17.21",
"react": "18.3.1",
"react": "19.0.0",
"react-use": "17.6.0",
"react-virtualized-auto-sizer": "1.0.26",
"tinycolor2": "1.6.0",
@@ -68,7 +68,7 @@
"@types/jest": "^29.5.4",
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/react": "18.3.18",
"@types/react": "19.0.10",
"@types/react-virtualized-auto-sizer": "1.0.8",
"@types/tinycolor2": "1.4.6",
"babel-jest": "29.7.0",
@@ -84,7 +84,7 @@
},
"peerDependencies": {
"@grafana/assistant": "^0.1.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
"react": "^19.0.0",
"react-dom": "^19.0.0"
}
}

View File

@@ -1,7 +1,7 @@
{
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"tags": ["scope:package", "type:ui"],
"tags": ["type:ui"],
"targets": {
"build": {}
}

View File

@@ -36,16 +36,16 @@
"@testing-library/user-event": "14.6.1",
"@types/jest": "^29.5.4",
"@types/node": "22.17.0",
"@types/react": "18.3.18",
"@types/react": "19.0.10",
"@types/systemjs": "6.15.3",
"jest": "^29.6.4",
"react": "18.3.1",
"react": "19.0.0",
"ts-jest": "29.4.0",
"ts-node": "10.9.2",
"typescript": "5.9.2"
},
"peerDependencies": {
"react": "^18.0.0",
"react-dom": "^18.0.0"
"react": "^19.0.0",
"react-dom": "^19.0.0"
}
}

View File

@@ -57,8 +57,8 @@
"@reduxjs/toolkit": "2.9.0",
"@types/debounce-promise": "3.1.9",
"@types/lodash": "4.17.20",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"@types/react-highlight-words": "0.20.0",
"@types/react-window": "1.8.8",
"@types/semver": "7.7.1",
@@ -94,8 +94,8 @@
"i18next-parser": "9.3.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-select-event": "5.5.1",
"rimraf": "6.0.1",
"rollup": "^4.22.4",
@@ -105,7 +105,7 @@
"typescript": "5.9.2"
},
"peerDependencies": {
"react": "^18.0.0",
"react-dom": "^18.0.0"
"react": "^19.0.0",
"react-dom": "^19.0.0"
}
}

View File

@@ -1,7 +1,7 @@
{
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"tags": ["scope:package", "type:ui"],
"tags": ["type:ui"],
"targets": {
"build": {}
}

View File

@@ -78,12 +78,12 @@
"@types/history": "4.7.11",
"@types/jest": "29.5.14",
"@types/lodash": "4.17.20",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"esbuild": "0.25.8",
"lodash": "4.17.21",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"rimraf": "6.0.1",
"rollup": "^4.22.4",
"rollup-plugin-esbuild": "6.2.1",
@@ -92,7 +92,7 @@
"typescript": "5.9.2"
},
"peerDependencies": {
"react": "^18.0.0",
"react-dom": "^18.0.0"
"react": "^19.0.0",
"react-dom": "^19.0.0"
}
}

View File

@@ -1,7 +1,7 @@
{
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"tags": ["scope:package", "type:ui"],
"tags": ["type:ui"],
"targets": {
"build": {}
}

View File

@@ -25,8 +25,8 @@
"@react-awesome-query-builder/ui": "6.6.15",
"immutable": "5.1.4",
"lodash": "4.17.21",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-select": "5.10.2",
"react-use": "17.6.0",
"react-virtualized-auto-sizer": "1.0.26",
@@ -43,8 +43,8 @@
"@types/jest": "^29.5.4",
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"@types/react-virtualized-auto-sizer": "1.0.8",
"@types/systemjs": "6.15.3",
"@types/uuid": "10.0.0",

View File

@@ -167,9 +167,9 @@
"@types/mock-raf": "1.0.6",
"@types/node": "22.17.0",
"@types/prismjs": "1.26.5",
"@types/react": "18.3.18",
"@types/react": "19.0.10",
"@types/react-color": "3.0.13",
"@types/react-dom": "18.3.5",
"@types/react-dom": "19.0.4",
"@types/react-highlight-words": "0.20.0",
"@types/react-transition-group": "4.4.12",
"@types/react-window": "1.8.8",
@@ -190,8 +190,8 @@
"msw": "^2.10.2",
"msw-storybook-addon": "^2.0.5",
"process": "^0.11.10",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-select-event": "^5.1.0",
"rimraf": "6.0.1",
"rollup": "^4.22.4",

View File

@@ -1,7 +1,7 @@
{
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"tags": ["scope:package", "type:ui"],
"tags": ["type:ui"],
"targets": {
"build": {}
}

View File

@@ -18,8 +18,8 @@
"lodash": "4.17.21",
"monaco-editor": "0.34.1",
"prismjs": "1.30.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-select": "5.10.2",
"react-use": "17.6.0",
"rxjs": "7.8.2",
@@ -36,8 +36,8 @@
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/prismjs": "1.26.5",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"i18next-parser": "9.3.0",
"jest": "29.7.0",
"react-select-event": "5.5.1",

View File

@@ -18,8 +18,8 @@
"lodash": "4.17.21",
"monaco-editor": "0.34.1",
"prismjs": "1.30.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-select": "5.10.2",
"react-use": "17.6.0",
"rxjs": "7.8.2",
@@ -37,8 +37,8 @@
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/prismjs": "1.26.5",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"jest": "29.7.0",
"react-select-event": "5.5.1",
"ts-node": "10.9.2",

View File

@@ -11,7 +11,7 @@
"@grafana/sql": "12.3.0-pre",
"@grafana/ui": "12.3.0-pre",
"lodash": "4.17.21",
"react": "18.3.1",
"react": "19.0.0",
"rxjs": "7.8.2",
"tslib": "2.8.1"
},
@@ -24,7 +24,7 @@
"@types/jest": "29.5.14",
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/react": "18.3.18",
"@types/react": "19.0.10",
"jest": "29.7.0",
"ts-node": "10.9.2",
"typescript": "5.9.2",

View File

@@ -13,8 +13,8 @@
"lodash": "4.17.21",
"monaco-editor": "0.34.1",
"prismjs": "1.30.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-use": "17.6.0",
"rxjs": "7.8.2",
"tslib": "2.8.1"
@@ -29,8 +29,8 @@
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/prismjs": "1.26.5",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"css-loader": "7.1.2",
"jest": "29.7.0",
"style-loader": "4.0.0",

View File

@@ -12,8 +12,8 @@
"d3-random": "^3.0.1",
"lodash": "4.17.21",
"micro-memoize": "^4.1.2",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-select": "5.10.2",
"react-use": "17.6.0",
"rxjs": "7.8.2",
@@ -31,8 +31,8 @@
"@types/jest": "29.5.14",
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"@types/uuid": "10.0.0",
"jest": "29.7.0",
"ts-node": "10.9.2",

View File

@@ -13,8 +13,8 @@
"@grafana/ui": "workspace:*",
"lodash": "4.17.21",
"logfmt": "^1.3.2",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-select": "5.10.2",
"react-window": "1.8.11",
"rxjs": "7.8.2",
@@ -32,8 +32,8 @@
"@types/lodash": "4.17.20",
"@types/logfmt": "^1.2.3",
"@types/node": "22.17.0",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"@types/react-window": "1.8.8",
"@types/uuid": "10.0.0",
"jest": "29.7.0",

View File

@@ -12,7 +12,7 @@
"@grafana/sql": "12.3.0-pre",
"@grafana/ui": "12.3.0-pre",
"lodash": "4.17.21",
"react": "18.3.1",
"react": "19.0.0",
"rxjs": "7.8.2",
"tslib": "2.8.1"
},
@@ -25,7 +25,7 @@
"@types/jest": "29.5.14",
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/react": "18.3.18",
"@types/react": "19.0.10",
"i18next-parser": "9.3.0",
"ts-node": "10.9.2",
"typescript": "5.9.2",

View File

@@ -11,7 +11,7 @@
"@grafana/sql": "12.3.0-pre",
"@grafana/ui": "12.3.0-pre",
"lodash": "4.17.21",
"react": "18.3.1",
"react": "19.0.0",
"rxjs": "7.8.2",
"tslib": "2.8.1"
},
@@ -24,7 +24,7 @@
"@types/jest": "29.5.14",
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/react": "18.3.18",
"@types/react": "19.0.10",
"jest": "29.7.0",
"ts-node": "10.9.2",
"typescript": "5.9.2",

View File

@@ -11,8 +11,8 @@
"@grafana/ui": "12.3.0-pre",
"lodash": "4.17.21",
"monaco-editor": "0.34.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-use": "17.6.0",
"rxjs": "7.8.2",
"tslib": "2.8.1"
@@ -24,8 +24,8 @@
"@testing-library/user-event": "14.6.1",
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"jest": "29.7.0",
"ts-node": "10.9.2",
"typescript": "5.9.2",

View File

@@ -26,8 +26,8 @@
"lru-cache": "11.2.2",
"monaco-editor": "0.34.1",
"prismjs": "1.30.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-select": "5.10.2",
"react-use": "17.6.0",
"rxjs": "7.8.2",
@@ -47,8 +47,8 @@
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/prismjs": "1.26.5",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"@types/semver": "7.7.1",
"@types/uuid": "10.0.0",
"glob": "11.0.3",

View File

@@ -12,8 +12,8 @@
"@grafana/runtime": "workspace:*",
"@grafana/ui": "workspace:*",
"lodash": "4.17.21",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-select": "5.10.2",
"react-use": "17.6.0",
"rxjs": "7.8.2",
@@ -27,8 +27,8 @@
"@types/jest": "29.5.14",
"@types/lodash": "4.17.20",
"@types/node": "22.17.0",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@types/react": "19.0.10",
"@types/react-dom": "19.0.4",
"jest": "29.7.0",
"ts-node": "10.9.2",
"typescript": "5.9.2",

View File

@@ -47,6 +47,22 @@ window.matchMedia = (query) => ({
dispatchEvent: jest.fn(),
});
window.MessageChannel = jest.fn().mockImplementation(() => {
let onmessage: Function;
return {
port1: {
set onmessage(cb: Function) {
onmessage = cb;
},
},
port2: {
postMessage: (data: unknown) => {
onmessage?.({ data });
},
},
};
});
// mock the intersection observer and just say everything is in view
const mockIntersectionObserver = jest
.fn()

1180
yarn.lock

File diff suppressed because it is too large Load Diff