diff --git a/package.json b/package.json index 05a5eb136cd..6bb52a3b158 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@betterer/cli": "5.4.0", "@betterer/eslint": "5.4.0", "@betterer/regexp": "5.4.0", - "@emotion/eslint-plugin": "11.7.0", + "@emotion/eslint-plugin": "11.10.0", "@grafana/e2e": "workspace:*", "@grafana/eslint-config": "5.0.0", "@grafana/toolkit": "workspace:*", @@ -246,8 +246,8 @@ }, "dependencies": { "@daybrush/utils": "1.10.0", - "@emotion/css": "11.9.0", - "@emotion/react": "11.9.3", + "@emotion/css": "11.10.5", + "@emotion/react": "11.10.5", "@grafana/agent-core": "0.4.0", "@grafana/agent-web": "0.4.0", "@grafana/aws-sdk": "0.0.37", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 40dd0dbf3d0..4c303c21b7b 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -45,8 +45,8 @@ "not IE 11" ], "dependencies": { - "@emotion/css": "11.9.0", - "@emotion/react": "11.9.3", + "@emotion/css": "11.10.5", + "@emotion/react": "11.10.5", "@grafana/data": "9.3.0-pre", "@grafana/e2e-selectors": "9.3.0-pre", "@grafana/schema": "9.3.0-pre", diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index f5930844529..8810297f568 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -30,7 +30,7 @@ "typescript": "4.8.4" }, "dependencies": { - "@emotion/css": "11.9.0", + "@emotion/css": "11.10.5", "@grafana/data": "9.3.0-pre", "@grafana/e2e-selectors": "9.3.0-pre", "@grafana/runtime": "9.3.0-pre", diff --git a/yarn.lock b/yarn.lock index f0a3620bbaa..c97d9228d2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1921,7 +1921,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-jsx@npm:^7.18.6": +"@babel/plugin-syntax-jsx@npm:^7.17.12, @babel/plugin-syntax-jsx@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-syntax-jsx@npm:7.18.6" dependencies: @@ -3739,6 +3739,28 @@ __metadata: languageName: node linkType: hard +"@emotion/babel-plugin@npm:^11.10.5": + version: 11.10.5 + resolution: "@emotion/babel-plugin@npm:11.10.5" + dependencies: + "@babel/helper-module-imports": ^7.16.7 + "@babel/plugin-syntax-jsx": ^7.17.12 + "@babel/runtime": ^7.18.3 + "@emotion/hash": ^0.9.0 + "@emotion/memoize": ^0.8.0 + "@emotion/serialize": ^1.1.1 + babel-plugin-macros: ^3.1.0 + convert-source-map: ^1.5.0 + escape-string-regexp: ^4.0.0 + find-root: ^1.1.0 + source-map: ^0.5.7 + stylis: 4.1.3 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: e3353499c76c4422d6e900c0dfab73607056d9da86161a3f27c3459c193c4908050c5d252c68fcde231e13f02a9d8e0dc07d260317ae0e5206841e331cc4caae + languageName: node + linkType: hard + "@emotion/babel-plugin@npm:^11.7.1": version: 11.7.2 resolution: "@emotion/babel-plugin@npm:11.7.2" @@ -3773,6 +3795,19 @@ __metadata: languageName: node linkType: hard +"@emotion/cache@npm:^11.10.5": + version: 11.10.5 + resolution: "@emotion/cache@npm:11.10.5" + dependencies: + "@emotion/memoize": ^0.8.0 + "@emotion/sheet": ^1.2.1 + "@emotion/utils": ^1.2.0 + "@emotion/weak-memoize": ^0.3.0 + stylis: 4.1.3 + checksum: 1dd2d9af2d3ecbd3d4469ecdf91a335eef6034c851b57a474471b2d2280613eb35bbed98c0368cc4625f188619fbdaf04cf07e8107aaffce94b2178444c0fe7b + languageName: node + linkType: hard + "@emotion/cache@npm:^11.4.0": version: 11.5.0 resolution: "@emotion/cache@npm:11.5.0" @@ -3799,19 +3834,6 @@ __metadata: languageName: node linkType: hard -"@emotion/cache@npm:^11.9.3": - version: 11.9.3 - resolution: "@emotion/cache@npm:11.9.3" - dependencies: - "@emotion/memoize": ^0.7.4 - "@emotion/sheet": ^1.1.1 - "@emotion/utils": ^1.0.0 - "@emotion/weak-memoize": ^0.2.5 - stylis: 4.0.13 - checksum: 6e0aab2fa5b9b6b0b9bf66b5328ed44265c23ced16b46c13d2602c3497fabd95299f6cf2c87cbc02b630452aa3cff599c194c538125d744aa135824129698ccc - languageName: node - linkType: hard - "@emotion/core@npm:^10.0.9": version: 10.3.1 resolution: "@emotion/core@npm:10.3.1" @@ -3828,21 +3850,21 @@ __metadata: languageName: node linkType: hard -"@emotion/css@npm:11.9.0": - version: 11.9.0 - resolution: "@emotion/css@npm:11.9.0" +"@emotion/css@npm:11.10.5": + version: 11.10.5 + resolution: "@emotion/css@npm:11.10.5" dependencies: - "@emotion/babel-plugin": ^11.7.1 - "@emotion/cache": ^11.7.1 - "@emotion/serialize": ^1.0.3 - "@emotion/sheet": ^1.0.3 - "@emotion/utils": ^1.0.0 + "@emotion/babel-plugin": ^11.10.5 + "@emotion/cache": ^11.10.5 + "@emotion/serialize": ^1.1.1 + "@emotion/sheet": ^1.2.1 + "@emotion/utils": ^1.2.0 peerDependencies: "@babel/core": ^7.0.0 peerDependenciesMeta: "@babel/core": optional: true - checksum: bd83d9af5cf87b82992dea030b5c7db9cc26f8fee508fc8c20257bc040d35b0cc595143c5c8e3f5d6719351f3ae1c53b152899c22b60a2a5ff37d3439304401e + checksum: 2f1e953c3519cd69e40d2931cf36c3f1daf33d9f5064cb2612071bd316e38c8debb83d9520db5694ac323b6475f86004f6542919746f005fea0c14a855fc579b languageName: node linkType: hard @@ -3857,12 +3879,12 @@ __metadata: languageName: node linkType: hard -"@emotion/eslint-plugin@npm:11.7.0": - version: 11.7.0 - resolution: "@emotion/eslint-plugin@npm:11.7.0" +"@emotion/eslint-plugin@npm:11.10.0": + version: 11.10.0 + resolution: "@emotion/eslint-plugin@npm:11.10.0" peerDependencies: eslint: 6 || 7 || 8 - checksum: 71bdeed3663e00af57631d810d615517051e8941799ef9177083e3d5db45aada21288383bcb7d150aaa29a6519b2cabe3dc9a2e61f1262290e4b5b3d5644f93a + checksum: b848600bbd047a5100e541369ab56ee84f7a4fae59f811b3835ba686c5b35d0c564953f946c9912d98df0e70fa5533b574f629aa10791e02bcd268263ff7adf1 languageName: node linkType: hard @@ -3873,6 +3895,13 @@ __metadata: languageName: node linkType: hard +"@emotion/hash@npm:^0.9.0": + version: 0.9.0 + resolution: "@emotion/hash@npm:0.9.0" + checksum: b63428f7c8186607acdca5d003700cecf0ded519d0b5c5cc3b3154eafcad6ff433f8361bd2bac8882715b557e6f06945694aeb6ba8b25c6095d7a88570e2e0bb + languageName: node + linkType: hard + "@emotion/memoize@npm:0.7.4": version: 0.7.4 resolution: "@emotion/memoize@npm:0.7.4" @@ -3887,16 +3916,24 @@ __metadata: languageName: node linkType: hard -"@emotion/react@npm:11.9.3": - version: 11.9.3 - resolution: "@emotion/react@npm:11.9.3" +"@emotion/memoize@npm:^0.8.0": + version: 0.8.0 + resolution: "@emotion/memoize@npm:0.8.0" + checksum: c87bb110b829edd8e1c13b90a6bc37cebc39af29c7599a1e66a48e06f9bec43e8e53495ba86278cc52e7589549492c8dfdc81d19f4fdec0cee6ba13d2ad2c928 + languageName: node + linkType: hard + +"@emotion/react@npm:11.10.5": + version: 11.10.5 + resolution: "@emotion/react@npm:11.10.5" dependencies: - "@babel/runtime": ^7.13.10 - "@emotion/babel-plugin": ^11.7.1 - "@emotion/cache": ^11.9.3 - "@emotion/serialize": ^1.0.4 - "@emotion/utils": ^1.1.0 - "@emotion/weak-memoize": ^0.2.5 + "@babel/runtime": ^7.18.3 + "@emotion/babel-plugin": ^11.10.5 + "@emotion/cache": ^11.10.5 + "@emotion/serialize": ^1.1.1 + "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0 + "@emotion/utils": ^1.2.0 + "@emotion/weak-memoize": ^0.3.0 hoist-non-react-statics: ^3.3.1 peerDependencies: "@babel/core": ^7.0.0 @@ -3906,7 +3943,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: 19bc7205e85e87cadebbe5a926d45103b836af70ab6972ea4c333c8dd01b463fc9646d4e4097a36f145a05dd4bc388739667437b990f8cf7f7f925f9610d1aa8 + checksum: 32b67b28e9b6d6c53b970072680697f04c2521441050bdeb19a1a7f0164af549b4dad39ff375eda1b6a3cf1cc86ba2c6fa55460ec040e6ebbca3e9ec58353cf7 languageName: node linkType: hard @@ -3972,16 +4009,16 @@ __metadata: languageName: node linkType: hard -"@emotion/serialize@npm:^1.0.4": - version: 1.0.4 - resolution: "@emotion/serialize@npm:1.0.4" +"@emotion/serialize@npm:^1.1.1": + version: 1.1.1 + resolution: "@emotion/serialize@npm:1.1.1" dependencies: - "@emotion/hash": ^0.8.0 - "@emotion/memoize": ^0.7.4 - "@emotion/unitless": ^0.7.5 - "@emotion/utils": ^1.0.0 + "@emotion/hash": ^0.9.0 + "@emotion/memoize": ^0.8.0 + "@emotion/unitless": ^0.8.0 + "@emotion/utils": ^1.2.0 csstype: ^3.0.2 - checksum: e8cc342056734e176ea837fe44035126dea174962db40852a7ced499d258c0056b0fd3c298743c446f9ba0f2647cb42dfb623b8e5783c265deb9eb20138d68e7 + checksum: 24cfd5b16e6f2335c032ca33804a876e0442aaf8f9c94d269d23735ebd194fb1ed142542dd92191a3e6ef8bad5bd560dfc5aaf363a1b70954726dbd4dd93085c languageName: node linkType: hard @@ -4006,10 +4043,10 @@ __metadata: languageName: node linkType: hard -"@emotion/sheet@npm:^1.1.1": - version: 1.1.1 - resolution: "@emotion/sheet@npm:1.1.1" - checksum: b916ac665735ef6dfda26b09f2d3493789d432d649733db9da18c4db0115e7fdadeb8d45f6490320248916bb13d978bba74c914b711ac96f659b76a5e52d5cd2 +"@emotion/sheet@npm:^1.2.1": + version: 1.2.1 + resolution: "@emotion/sheet@npm:1.2.1" + checksum: ce78763588ea522438156344d9f592203e2da582d8d67b32e1b0b98eaba26994c6c270f8c7ad46442fc9c0a9f048685d819cd73ca87e544520fd06f0e24a1562 languageName: node linkType: hard @@ -4027,6 +4064,22 @@ __metadata: languageName: node linkType: hard +"@emotion/unitless@npm:^0.8.0": + version: 0.8.0 + resolution: "@emotion/unitless@npm:0.8.0" + checksum: 176141117ed23c0eb6e53a054a69c63e17ae532ec4210907a20b2208f91771821835f1c63dd2ec63e30e22fcc984026d7f933773ee6526dd038e0850919fae7a + languageName: node + linkType: hard + +"@emotion/use-insertion-effect-with-fallbacks@npm:^1.0.0": + version: 1.0.0 + resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.0" + peerDependencies: + react: ">=16.8.0" + checksum: 4f06a3b48258c832aa8022a262572061a31ff078d377e9164cccc99951309d70f4466e774fe704461b2f8715007a82ed625a54a5c7a127c89017d3ce3187d4f1 + languageName: node + linkType: hard + "@emotion/utils@npm:0.11.3": version: 0.11.3 resolution: "@emotion/utils@npm:0.11.3" @@ -4048,6 +4101,13 @@ __metadata: languageName: node linkType: hard +"@emotion/utils@npm:^1.2.0": + version: 1.2.0 + resolution: "@emotion/utils@npm:1.2.0" + checksum: 55457a49ddd4db6a014ea0454dc09eaa23eedfb837095c8ff90470cb26a303f7ceb5fcc1e2190ef64683e64cfd33d3ba3ca3109cd87d12bc9e379e4195c9a4dd + languageName: node + linkType: hard + "@emotion/weak-memoize@npm:0.2.5, @emotion/weak-memoize@npm:^0.2.5": version: 0.2.5 resolution: "@emotion/weak-memoize@npm:0.2.5" @@ -4055,6 +4115,13 @@ __metadata: languageName: node linkType: hard +"@emotion/weak-memoize@npm:^0.3.0": + version: 0.3.0 + resolution: "@emotion/weak-memoize@npm:0.3.0" + checksum: f43ef4c8b7de70d9fa5eb3105921724651e4188e895beb71f0c5919dc899a7b8743e1fdd99d38b9092dd5722c7be2312ebb47fbdad0c4e38bea58f6df5885cc0 + languageName: node + linkType: hard + "@es-joy/jsdoccomment@npm:~0.22.1": version: 0.22.2 resolution: "@es-joy/jsdoccomment@npm:0.22.2" @@ -4610,8 +4677,8 @@ __metadata: resolution: "@grafana/ui@workspace:packages/grafana-ui" dependencies: "@babel/core": 7.19.6 - "@emotion/css": 11.9.0 - "@emotion/react": 11.9.3 + "@emotion/css": 11.10.5 + "@emotion/react": 11.10.5 "@grafana/data": 9.3.0-pre "@grafana/e2e-selectors": 9.3.0-pre "@grafana/schema": 9.3.0-pre @@ -4888,7 +4955,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jaegertracing/jaeger-ui-components@workspace:packages/jaeger-ui-components" dependencies: - "@emotion/css": 11.9.0 + "@emotion/css": 11.10.5 "@grafana/data": 9.3.0-pre "@grafana/e2e-selectors": 9.3.0-pre "@grafana/runtime": 9.3.0-pre @@ -13907,7 +13974,7 @@ __metadata: languageName: node linkType: hard -"babel-plugin-macros@npm:3.1.0, babel-plugin-macros@npm:^3.0.1": +"babel-plugin-macros@npm:3.1.0, babel-plugin-macros@npm:^3.0.1, babel-plugin-macros@npm:^3.1.0": version: 3.1.0 resolution: "babel-plugin-macros@npm:3.1.0" dependencies: @@ -21327,9 +21394,9 @@ __metadata: "@betterer/eslint": 5.4.0 "@betterer/regexp": 5.4.0 "@daybrush/utils": 1.10.0 - "@emotion/css": 11.9.0 - "@emotion/eslint-plugin": 11.7.0 - "@emotion/react": 11.9.3 + "@emotion/css": 11.10.5 + "@emotion/eslint-plugin": 11.10.0 + "@emotion/react": 11.10.5 "@grafana/agent-core": 0.4.0 "@grafana/agent-web": 0.4.0 "@grafana/aws-sdk": 0.0.37 @@ -35892,6 +35959,13 @@ __metadata: languageName: node linkType: hard +"stylis@npm:4.1.3": + version: 4.1.3 + resolution: "stylis@npm:4.1.3" + checksum: d04dbffcb9bf2c5ca8d8dc09534203c75df3bf711d33973ea22038a99cc475412a350b661ebd99cbc01daa50d7eedcf0d130d121800eb7318759a197023442a6 + languageName: node + linkType: hard + "stylis@npm:^4.0.10, stylis@npm:^4.0.6": version: 4.0.10 resolution: "stylis@npm:4.0.10"