diff --git a/frontend/overlays/package.json b/frontend/overlays/package.json index 8b5f0c52a..cb9915aa8 100644 --- a/frontend/overlays/package.json +++ b/frontend/overlays/package.json @@ -10,6 +10,7 @@ "dependencies": { "@protobuf-ts/twirp-transport": "^2.9.1", "@twir/grpc": "workspace:^", + "nested-css-to-flat": "^1.0.5", "obs-websocket-js": "^5.0.3", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/frontend/overlays/src/pages/overlaysRegistry.tsx b/frontend/overlays/src/pages/overlaysRegistry.tsx index 24650c7d2..cb50b313a 100644 --- a/frontend/overlays/src/pages/overlaysRegistry.tsx +++ b/frontend/overlays/src/pages/overlaysRegistry.tsx @@ -1,7 +1,9 @@ +import { transform } from 'nested-css-to-flat'; import { Fragment, useCallback, useEffect, useRef, useState } from 'react'; import { useParams } from 'react-router-dom'; import useWebSocket from 'react-use-websocket'; + declare global { interface Window { webkitAudioContext: typeof AudioContext @@ -133,9 +135,9 @@ export const OverlaysRegistry: React.FC = () => { {layers.filter(l => l.type === 'HTML').map((layer) => { return
=8'} @@ -2988,7 +3001,7 @@ packages: vite: '>4.0.0 || ^3.0.0 || ^2.0.0' dependencies: '@plugin-web-update-notification/core': 1.6.4 - vite: 4.4.3(sass@1.63.6) + vite: 4.4.3(@types/node@20.4.2)(sass@1.63.6) dev: true /@popperjs/core@2.11.8: @@ -3543,7 +3556,6 @@ packages: /@types/trusted-types@2.0.3: resolution: {integrity: sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g==} - dev: true /@types/unist@2.0.6: resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==} @@ -3765,7 +3777,7 @@ packages: vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 4.4.3(sass@1.63.6) + vite: 4.4.3(@types/node@20.4.2)(sass@1.63.6) vue: 3.3.4 dev: true @@ -3908,7 +3920,7 @@ packages: '@vue/shared': 3.3.4 estree-walker: 2.0.2 magic-string: 0.30.1 - postcss: 8.4.26 + postcss: 8.4.27 source-map-js: 1.0.2 /@vue/compiler-ssr@3.3.4: @@ -4480,6 +4492,23 @@ packages: picocolors: 1.0.0 postcss: 8.4.26 postcss-value-parser: 4.2.0 + dev: true + + /autoprefixer@10.4.14(postcss@8.4.27): + resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==} + engines: {node: ^10 || ^12 || >=14} + hasBin: true + peerDependencies: + postcss: ^8.1.0 + dependencies: + browserslist: 4.21.9 + caniuse-lite: 1.0.30001516 + fraction.js: 4.2.0 + normalize-range: 0.1.2 + picocolors: 1.0.0 + postcss: 8.4.27 + postcss-value-parser: 4.2.0 + dev: false /available-typed-arrays@1.0.5: resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} @@ -7072,7 +7101,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.4.2 + '@types/node': 18.13.0 merge-stream: 2.0.0 supports-color: 7.2.0 dev: true @@ -7277,6 +7306,28 @@ packages: /lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + /lit-element@3.3.3: + resolution: {integrity: sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA==} + dependencies: + '@lit-labs/ssr-dom-shim': 1.1.1 + '@lit/reactive-element': 1.6.3 + lit-html: 2.8.0 + dev: false + + /lit-html@2.8.0: + resolution: {integrity: sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q==} + dependencies: + '@types/trusted-types': 2.0.3 + dev: false + + /lit@2.8.0: + resolution: {integrity: sha512-4Sc3OFX9QHOJaHbmTMk28SYgVxLN3ePDjg7hofEft2zWlehFL3LiAuapWc4U/kYwMYJSh2hTCPZ6/LIC7ii0MA==} + dependencies: + '@lit/reactive-element': 1.6.3 + lit-element: 3.3.3 + lit-html: 2.8.0 + dev: false + /load-yaml-file@0.2.0: resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==} engines: {node: '>=6'} @@ -8006,6 +8057,13 @@ packages: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true + /nested-css-to-flat@1.0.5: + resolution: {integrity: sha512-tJeN4qsmlP2HN3uhD5pfuFm8UlFXWcNaFiZSVakGOFLuwPbXino8F2KC7lF2WH98olePKSLgIAfwyoVJOOFd9A==} + hasBin: true + dependencies: + lit: 2.8.0 + dev: false + /network-information-types@0.1.1(typescript@5.1.6): resolution: {integrity: sha512-mLXNafJYOkiJB6IlF727YWssTRpXitR+tKSLyA5VAdBi3SOvLf5gtizHgxf241YHPWocnAO/fAhVrB/68tPHDw==} peerDependencies: @@ -8550,13 +8608,13 @@ packages: resolve: 1.22.2 dev: true - /postcss-import@15.1.0(postcss@8.4.26): + /postcss-import@15.1.0(postcss@8.4.27): resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==} engines: {node: '>=14.0.0'} peerDependencies: postcss: ^8.0.0 dependencies: - postcss: 8.4.26 + postcss: 8.4.27 postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.2 @@ -8570,6 +8628,17 @@ packages: dependencies: camelcase-css: 2.0.1 postcss: 8.4.26 + dev: true + + /postcss-js@4.0.1(postcss@8.4.27): + resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} + engines: {node: ^12 || ^14 || >= 16} + peerDependencies: + postcss: ^8.4.21 + dependencies: + camelcase-css: 2.0.1 + postcss: 8.4.27 + dev: false /postcss-load-config@3.1.4(postcss@8.4.26)(ts-node@10.9.1): resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} @@ -8589,7 +8658,7 @@ packages: yaml: 1.10.2 dev: true - /postcss-load-config@4.0.1(postcss@8.4.26)(ts-node@10.9.1): + /postcss-load-config@4.0.1(postcss@8.4.27)(ts-node@10.9.1): resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} peerDependencies: @@ -8602,7 +8671,7 @@ packages: optional: true dependencies: lilconfig: 2.1.0 - postcss: 8.4.26 + postcss: 8.4.27 ts-node: 10.9.1(@types/node@20.4.2)(typescript@5.1.6) yaml: 2.3.1 dev: false @@ -8617,13 +8686,13 @@ packages: postcss-selector-parser: 6.0.13 dev: true - /postcss-nested@6.0.1(postcss@8.4.26): + /postcss-nested@6.0.1(postcss@8.4.27): resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==} engines: {node: '>=12.0'} peerDependencies: postcss: ^8.2.14 dependencies: - postcss: 8.4.26 + postcss: 8.4.27 postcss-selector-parser: 6.0.13 dev: false @@ -8652,6 +8721,7 @@ packages: nanoid: 3.3.6 picocolors: 1.0.0 source-map-js: 1.0.2 + dev: true /postcss@8.4.27: resolution: {integrity: sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==} @@ -10055,11 +10125,11 @@ packages: normalize-path: 3.0.0 object-hash: 3.0.0 picocolors: 1.0.0 - postcss: 8.4.26 - postcss-import: 15.1.0(postcss@8.4.26) - postcss-js: 4.0.1(postcss@8.4.26) - postcss-load-config: 4.0.1(postcss@8.4.26)(ts-node@10.9.1) - postcss-nested: 6.0.1(postcss@8.4.26) + postcss: 8.4.27 + postcss-import: 15.1.0(postcss@8.4.27) + postcss-js: 4.0.1(postcss@8.4.27) + postcss-load-config: 4.0.1(postcss@8.4.27)(ts-node@10.9.1) + postcss-nested: 6.0.1(postcss@8.4.27) postcss-selector-parser: 6.0.13 resolve: 1.22.2 sucrase: 3.34.0 @@ -10740,7 +10810,7 @@ packages: debug: 4.3.4 fast-glob: 3.3.0 pretty-bytes: 6.1.1 - vite: 4.4.3(sass@1.63.6) + vite: 4.4.3(@types/node@20.4.2)(sass@1.63.6) workbox-build: 7.0.0 workbox-window: 7.0.0 transitivePeerDependencies: @@ -10781,13 +10851,13 @@ packages: dependencies: '@types/node': 20.4.2 esbuild: 0.17.19 - postcss: 8.4.26 + postcss: 8.4.27 rollup: 3.25.1 optionalDependencies: fsevents: 2.3.2 dev: true - /vite@4.4.3(sass@1.63.6): + /vite@4.4.3(@types/node@20.4.2)(sass@1.63.6): resolution: {integrity: sha512-IMnXQXXWgLi5brBQx/4WzDxdzW0X3pjO4nqFJAuNvwKtxzAmPzFE1wszW3VDpAGQJm3RZkm/brzRdyGsnwgJIA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -10815,8 +10885,9 @@ packages: terser: optional: true dependencies: + '@types/node': 20.4.2 esbuild: 0.18.11 - postcss: 8.4.26 + postcss: 8.4.27 rollup: 3.26.2 sass: 1.63.6 optionalDependencies: @@ -10853,7 +10924,7 @@ packages: dependencies: '@types/node': 20.4.2 esbuild: 0.18.11 - postcss: 8.4.26 + postcss: 8.4.27 rollup: 3.26.2 optionalDependencies: fsevents: 2.3.2