diff --git a/package.json b/package.json index f02237ac485..ad06ee5f1fa 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "@betterer/cli": "5.4.0", "@betterer/eslint": "5.4.0", "@cypress/webpack-preprocessor": "6.0.2", - "@emotion/eslint-plugin": "11.11.0", + "@emotion/eslint-plugin": "11.12.0", "@grafana/eslint-config": "7.0.0", "@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules", "@grafana/plugin-e2e": "1.8.1", @@ -246,8 +246,8 @@ "yargs": "^17.5.1" }, "dependencies": { - "@emotion/css": "11.11.2", - "@emotion/react": "11.11.4", + "@emotion/css": "11.13.0", + "@emotion/react": "11.13.3", "@fingerprintjs/fingerprintjs": "^3.4.2", "@floating-ui/react": "0.26.24", "@formatjs/intl-durationformat": "^0.2.4", diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json index e8daf20dabd..29f945b8d28 100644 --- a/packages/grafana-flamegraph/package.json +++ b/packages/grafana-flamegraph/package.json @@ -43,7 +43,7 @@ "not IE 11" ], "dependencies": { - "@emotion/css": "11.11.2", + "@emotion/css": "11.13.0", "@grafana/data": "11.3.0-pre", "@grafana/ui": "11.3.0-pre", "@leeoniya/ufuzzy": "1.0.14", diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json index f6c5c6cb8ca..df4acb26060 100644 --- a/packages/grafana-o11y-ds-frontend/package.json +++ b/packages/grafana-o11y-ds-frontend/package.json @@ -17,7 +17,7 @@ "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "dependencies": { - "@emotion/css": "11.11.2", + "@emotion/css": "11.13.0", "@grafana/data": "11.3.0-pre", "@grafana/e2e-selectors": "11.3.0-pre", "@grafana/experimental": "1.8.0", diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json index 573cf60102a..5833a424a3d 100644 --- a/packages/grafana-prometheus/package.json +++ b/packages/grafana-prometheus/package.json @@ -36,7 +36,7 @@ "postpack": "mv package.json.bak package.json" }, "dependencies": { - "@emotion/css": "11.11.2", + "@emotion/css": "11.13.0", "@floating-ui/react": "0.26.24", "@grafana/data": "11.3.0-pre", "@grafana/experimental": "1.8.0", @@ -75,7 +75,7 @@ "whatwg-fetch": "3.6.20" }, "devDependencies": { - "@emotion/eslint-plugin": "11.11.0", + "@emotion/eslint-plugin": "11.12.0", "@grafana/e2e-selectors": "11.3.0-pre", "@grafana/tsconfig": "^2.0.0", "@rollup/plugin-image": "3.0.3", diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json index 409e725d56e..854d02f8ac6 100644 --- a/packages/grafana-sql/package.json +++ b/packages/grafana-sql/package.json @@ -14,7 +14,7 @@ "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "dependencies": { - "@emotion/css": "11.11.2", + "@emotion/css": "11.13.0", "@grafana/data": "11.3.0-pre", "@grafana/e2e-selectors": "11.3.0-pre", "@grafana/experimental": "1.8.0", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 7499d50b06b..0dd2d285a57 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -47,8 +47,9 @@ "not IE 11" ], "dependencies": { - "@emotion/css": "11.11.2", - "@emotion/react": "11.11.4", + "@emotion/css": "11.13.0", + "@emotion/react": "11.13.3", + "@emotion/serialize": "1.3.2", "@floating-ui/react": "0.26.24", "@grafana/data": "11.3.0-pre", "@grafana/e2e-selectors": "11.3.0-pre", diff --git a/packages/grafana-ui/src/components/Layout/utils/responsiveness.tsx b/packages/grafana-ui/src/components/Layout/utils/responsiveness.tsx index 8c3a5a632a6..e1f1e5258e2 100644 --- a/packages/grafana-ui/src/components/Layout/utils/responsiveness.tsx +++ b/packages/grafana-ui/src/components/Layout/utils/responsiveness.tsx @@ -1,4 +1,4 @@ -import { CSSInterpolation } from '@emotion/css'; +import { CSSInterpolation } from '@emotion/serialize'; import { GrafanaTheme2, ThemeBreakpointsKey } from '@grafana/data'; diff --git a/packages/grafana-ui/src/themes/GlobalStyles/utilityClasses.ts b/packages/grafana-ui/src/themes/GlobalStyles/utilityClasses.ts index c1f392c096c..4d52642a762 100644 --- a/packages/grafana-ui/src/themes/GlobalStyles/utilityClasses.ts +++ b/packages/grafana-ui/src/themes/GlobalStyles/utilityClasses.ts @@ -1,5 +1,5 @@ -import { CSSInterpolation } from '@emotion/css'; import { css } from '@emotion/react'; +import { CSSInterpolation } from '@emotion/serialize'; import { GrafanaTheme2 } from '@grafana/data'; diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json index 4eb8cb54aa4..6ffbd08797f 100644 --- a/public/app/plugins/datasource/azuremonitor/package.json +++ b/public/app/plugins/datasource/azuremonitor/package.json @@ -4,7 +4,7 @@ "private": true, "version": "11.3.0-pre", "dependencies": { - "@emotion/css": "11.11.2", + "@emotion/css": "11.13.0", "@grafana/data": "11.3.0-pre", "@grafana/experimental": "1.8.0", "@grafana/runtime": "11.3.0-pre", diff --git a/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap b/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap index 0f342bc4bf9..59a0857a532 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap +++ b/public/app/plugins/datasource/cloud-monitoring/components/__snapshots__/VariableQueryEditor.test.tsx.snap @@ -18,7 +18,7 @@ exports[`VariableQueryEditor renders correctly 1`] = `
Loading...
=16.8.0" peerDependenciesMeta: "@types/react": optional: true - checksum: 10/e7da3a1ddc1d72a4179010bdfd17423c13b1a77bf83a8b18271e919fd382d08c62dc2313ed5347acfd1ef85bb1bae8932597647a986e8a1ea1462552716cd495 + checksum: 10/ee70d3afc2e8dd771e6fe176d27dd87a5e21a54e54d871438fd1caa5aa2312d848c6866292fdc65a6ea1c945147c8422bda2d22ed739178af9902dc86d6b298a + languageName: node + linkType: hard + +"@emotion/serialize@npm:1.3.2, @emotion/serialize@npm:^1.1.2, @emotion/serialize@npm:^1.2.0, @emotion/serialize@npm:^1.3.0, @emotion/serialize@npm:^1.3.1": + version: 1.3.2 + resolution: "@emotion/serialize@npm:1.3.2" + dependencies: + "@emotion/hash": "npm:^0.9.2" + "@emotion/memoize": "npm:^0.9.0" + "@emotion/unitless": "npm:^0.10.0" + "@emotion/utils": "npm:^1.4.1" + csstype: "npm:^3.0.2" + checksum: 10/ead557c1ff19d917ef8169c02738ef36f0851fbfdf0bf69a543045bddea3b7281dc8252ee466cc5fb44ed27d1e61280ff943bb60a2c04158751fb07b3457cc93 languageName: node linkType: hard @@ -2100,19 +2135,6 @@ __metadata: languageName: node linkType: hard -"@emotion/serialize@npm:^1.1.2, @emotion/serialize@npm:^1.1.3": - version: 1.1.3 - resolution: "@emotion/serialize@npm:1.1.3" - dependencies: - "@emotion/hash": "npm:^0.9.1" - "@emotion/memoize": "npm:^0.8.1" - "@emotion/unitless": "npm:^0.8.1" - "@emotion/utils": "npm:^1.2.1" - csstype: "npm:^3.0.2" - checksum: 10/48d88923663273ae70359bc1a1f30454136716cbe0ddd9664be08e257ce56acedab911f125b627627358e37c9f450bbac3ea09b534ef42f9f67325d47b1e2a7b - languageName: node - linkType: hard - "@emotion/sheet@npm:0.9.4": version: 0.9.4 resolution: "@emotion/sheet@npm:0.9.4" @@ -2120,10 +2142,10 @@ __metadata: languageName: node linkType: hard -"@emotion/sheet@npm:^1.2.2": - version: 1.2.2 - resolution: "@emotion/sheet@npm:1.2.2" - checksum: 10/cc46b20ef7273dc28de889927ae1498f854be2890905745fcc3154fbbacaa54df1e28c3d89ff3339c2022782c78933f51955bb950d105d5a219576db1eadfb7a +"@emotion/sheet@npm:^1.2.2, @emotion/sheet@npm:^1.4.0": + version: 1.4.0 + resolution: "@emotion/sheet@npm:1.4.0" + checksum: 10/8ac6e9bf6b373a648f26ae7f1c24041038524f4c72f436f4f8c4761c665e58880c3229d8d89b1f7a4815dd8e5b49634d03e60187cb6f93097d7f7c1859e869d5 languageName: node linkType: hard @@ -2141,19 +2163,19 @@ __metadata: languageName: node linkType: hard -"@emotion/unitless@npm:^0.8.1": - version: 0.8.1 - resolution: "@emotion/unitless@npm:0.8.1" - checksum: 10/918f73c46ac0b7161e3c341cc07d651ce87e31ab1695e74b12adb7da6bb98dfbff8c69cf68a4e40d9eb3d820ca055dc1267aeb3007927ce88f98b885bf729b63 +"@emotion/unitless@npm:^0.10.0": + version: 0.10.0 + resolution: "@emotion/unitless@npm:0.10.0" + checksum: 10/6851c16edce01c494305f43b2cad7a26b939a821131b7c354e49b8e3b012c8810024755b0f4a03ef51117750309e55339825a97bd10411fb3687e68904769106 languageName: node linkType: hard -"@emotion/use-insertion-effect-with-fallbacks@npm:^1.0.1": - version: 1.0.1 - resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.1" +"@emotion/use-insertion-effect-with-fallbacks@npm:^1.0.1, @emotion/use-insertion-effect-with-fallbacks@npm:^1.1.0": + version: 1.1.0 + resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.1.0" peerDependencies: react: ">=16.8.0" - checksum: 10/7d7ead9ba3f615510f550aea67815281ec5a5487de55aafc250f820317afc1fd419bd9e9e27602a0206ec5c152f13dc6130bccad312c1036706c584c65d66ef7 + checksum: 10/33a10f44a873b3f5ccd2a1a3d13c2f34ed628f5a2be1ccf28540a86535a14d3a930afcbef209d48346a22ec60ff48f43c86ee9c846b9480d23a55a17145da66c languageName: node linkType: hard @@ -2164,10 +2186,10 @@ __metadata: languageName: node linkType: hard -"@emotion/utils@npm:^1.2.1": - version: 1.2.1 - resolution: "@emotion/utils@npm:1.2.1" - checksum: 10/472fa529c64a13edff80aa11698092e8841c1ffb5001c739d84eb9d0fdd6d8e1cd1848669310578ccfa6383b8601132eca54f8749fca40af85d21fdfc9b776c4 +"@emotion/utils@npm:^1.2.1, @emotion/utils@npm:^1.4.0, @emotion/utils@npm:^1.4.1": + version: 1.4.1 + resolution: "@emotion/utils@npm:1.4.1" + checksum: 10/95e56fc0c9e05cf01a96268f0486ce813f1109a8653d2f575c67df9e8765d9c1b2daf09ad1ada67d933efbb08ca7990228e14b210c713daf90156b4869abe6a7 languageName: node linkType: hard @@ -2178,10 +2200,10 @@ __metadata: languageName: node linkType: hard -"@emotion/weak-memoize@npm:^0.3.1": - version: 0.3.1 - resolution: "@emotion/weak-memoize@npm:0.3.1" - checksum: 10/b2be47caa24a8122622ea18cd2d650dbb4f8ad37b636dc41ed420c2e082f7f1e564ecdea68122b546df7f305b159bf5ab9ffee872abd0f052e687428459af594 +"@emotion/weak-memoize@npm:^0.4.0": + version: 0.4.0 + resolution: "@emotion/weak-memoize@npm:0.4.0" + checksum: 10/db5da0e89bd752c78b6bd65a1e56231f0abebe2f71c0bd8fc47dff96408f7065b02e214080f99924f6a3bfe7ee15afc48dad999d76df86b39b16e513f7a94f52 languageName: node linkType: hard @@ -3117,7 +3139,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/grafana-azure-monitor-datasource@workspace:public/app/plugins/datasource/azuremonitor" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" "@grafana/experimental": "npm:1.8.0" @@ -3161,7 +3183,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/grafana-postgresql-datasource@workspace:public/app/plugins/datasource/grafana-postgresql-datasource" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" "@grafana/experimental": "npm:1.8.0" @@ -3192,7 +3214,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/grafana-pyroscope-datasource@workspace:public/app/plugins/datasource/grafana-pyroscope-datasource" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/plugin-configs": "npm:11.3.0-pre" "@grafana/runtime": "npm:11.3.0-pre" @@ -3233,7 +3255,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" "@grafana/experimental": "npm:1.8.0" @@ -3274,7 +3296,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/jaeger@workspace:public/app/plugins/datasource/jaeger" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "workspace:*" "@grafana/e2e-selectors": "workspace:*" "@grafana/experimental": "npm:1.8.0" @@ -3316,7 +3338,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/mssql@workspace:public/app/plugins/datasource/mssql" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" "@grafana/experimental": "npm:1.8.0" @@ -3347,7 +3369,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/mysql@workspace:public/app/plugins/datasource/mysql" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" "@grafana/experimental": "npm:1.8.0" @@ -3378,7 +3400,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/plugin-configs": "npm:11.3.0-pre" "@grafana/runtime": "npm:11.3.0-pre" @@ -3410,7 +3432,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" "@grafana/experimental": "npm:1.8.0" @@ -3458,7 +3480,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/tempo@workspace:public/app/plugins/datasource/tempo" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "workspace:*" "@grafana/e2e-selectors": "workspace:*" "@grafana/experimental": "npm:1.8.0" @@ -3518,7 +3540,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana-plugins/zipkin@workspace:public/app/plugins/datasource/zipkin" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "workspace:*" "@grafana/e2e-selectors": "workspace:*" "@grafana/experimental": "npm:1.8.0" @@ -3791,7 +3813,7 @@ __metadata: "@babel/core": "npm:7.25.2" "@babel/preset-env": "npm:7.25.4" "@babel/preset-react": "npm:7.24.7" - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/tsconfig": "npm:^2.0.0" "@grafana/ui": "npm:11.3.0-pre" @@ -3875,7 +3897,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana/o11y-ds-frontend@workspace:packages/grafana-o11y-ds-frontend" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" "@grafana/experimental": "npm:1.8.0" @@ -3944,8 +3966,8 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana/prometheus@workspace:packages/grafana-prometheus" dependencies: - "@emotion/css": "npm:11.11.2" - "@emotion/eslint-plugin": "npm:11.11.0" + "@emotion/css": "npm:11.13.0" + "@emotion/eslint-plugin": "npm:11.12.0" "@floating-ui/react": "npm:0.26.24" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" @@ -4173,7 +4195,7 @@ __metadata: version: 0.0.0-use.local resolution: "@grafana/sql@workspace:packages/grafana-sql" dependencies: - "@emotion/css": "npm:11.11.2" + "@emotion/css": "npm:11.13.0" "@grafana/data": "npm:11.3.0-pre" "@grafana/e2e-selectors": "npm:11.3.0-pre" "@grafana/experimental": "npm:1.8.0" @@ -4234,8 +4256,9 @@ __metadata: resolution: "@grafana/ui@workspace:packages/grafana-ui" dependencies: "@babel/core": "npm:7.25.2" - "@emotion/css": "npm:11.11.2" - "@emotion/react": "npm:11.11.4" + "@emotion/css": "npm:11.13.0" + "@emotion/react": "npm:11.13.3" + "@emotion/serialize": "npm:1.3.2" "@faker-js/faker": "npm:^8.4.1" "@floating-ui/react": "npm:0.26.24" "@grafana/data": "npm:11.3.0-pre" @@ -11169,7 +11192,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:^5.58.0": +"@typescript-eslint/utils@npm:^5.25.0, @typescript-eslint/utils@npm:^5.58.0": version: 5.62.0 resolution: "@typescript-eslint/utils@npm:5.62.0" dependencies: @@ -18907,9 +18930,9 @@ __metadata: "@betterer/cli": "npm:5.4.0" "@betterer/eslint": "npm:5.4.0" "@cypress/webpack-preprocessor": "npm:6.0.2" - "@emotion/css": "npm:11.11.2" - "@emotion/eslint-plugin": "npm:11.11.0" - "@emotion/react": "npm:11.11.4" + "@emotion/css": "npm:11.13.0" + "@emotion/eslint-plugin": "npm:11.12.0" + "@emotion/react": "npm:11.13.3" "@fingerprintjs/fingerprintjs": "npm:^3.4.2" "@floating-ui/react": "npm:0.26.24" "@formatjs/intl-durationformat": "npm:^0.2.4"