From 0671eb8327cfcba6f4baa0b535db821ba97d06fd Mon Sep 17 00:00:00 2001 From: Matt McClure Date: Thu, 1 Oct 2026 00:28:55 +0000 Subject: [PATCH 1/3] feat(skin): port the publisher skin to VJSC Authors the publisher skin in VJSC at packages/skins/src/presets/publisher and generates the HTML and React package CSS skins from it, so the vendored legacy-skin copies are gone. The publisher compiles through the shared graph under its own `skin=default-publisher` variant and stays out of skinStyles, the catalog, and the registry. - core: VJSC component declarations for the publisher UI modules - react: CameraRadioGroup and MicRadioGroup Root/Value/Options parts - skins: fork-owned build/publisher.ts generator, publisher tokens, and small hooks in the shared transform, targets, and package plugin - A failed publish keeps the Go live look (closes the gaps.md entry) - PublisherSkinTailwind(Element) removed: packages ship CSS only; the sandbox compiles Tailwind from the authored source - Drops the generate-cache exclusion and the sandbox media-pulse token - Fixes the React sandbox for createPlayer's `Player` rename Closes #54 --- apps/sandbox/app/styles.css | 20 - .../templates/moq-publisher-react/main.tsx | 33 +- .../src/core/ui/camera-button/component.ts | 9 + .../core/ui/camera-radio-group/component.ts | 14 + .../core/ui/capture-placeholder/component.ts | 9 + .../core/ui/connection-indicator/component.ts | 9 + .../ui/enable-devices-button/component.ts | 9 + .../core/src/core/ui/mic-button/component.ts | 9 + .../src/core/ui/mic-radio-group/component.ts | 14 + .../src/core/ui/publish-badge/component.ts | 9 + .../src/core/ui/publish-button/component.ts | 9 + .../src/core/ui/publish-timer/component.ts | 9 + .../core/ui/screen-share-button/component.ts | 9 + packages/html/src/define/publisher/skin.css | 3 +- .../src/define/publisher/skin.tailwind.ts | 5 - packages/html/src/define/publisher/skin.ts | 1 + packages/html/src/presets/publisher/index.ts | 1 - .../presets/publisher/legacy-skin/README.md | 5 - .../default/css/components/badge.css | 10 - .../default/css/components/button-group.css | 9 - .../default/css/components/button.css | 173 -- .../default/css/components/capture.css | 202 --- .../default/css/components/container.css | 75 - .../css/components/controls-backdrop.css | 16 - .../default/css/components/controls.css | 17 - .../default/css/components/dialog.css | 65 - .../default/css/components/icons.css | 17 - .../default/css/components/media.css | 19 - .../default/css/components/menus.css | 257 --- .../default/css/components/popup.css | 134 -- .../default/css/components/publish.css | 168 -- .../default/css/components/reset.css | 25 - .../default/css/components/surface.css | 21 - .../legacy-skin/default/css/publisher.css | 256 --- .../default/tailwind/components/badge.ts | 2 - .../tailwind/components/button-group.ts | 1 - .../default/tailwind/components/button.ts | 38 - .../default/tailwind/components/capture.ts | 106 -- .../default/tailwind/components/container.ts | 37 - .../tailwind/components/controls-backdrop.ts | 7 - .../default/tailwind/components/controls.ts | 15 - .../default/tailwind/components/dialog.ts | 30 - .../default/tailwind/components/icon.ts | 11 - .../default/tailwind/components/menu.ts | 119 -- .../default/tailwind/components/popup.ts | 45 - .../default/tailwind/components/publish.ts | 83 - .../default/tailwind/components/reset.ts | 9 - .../default/tailwind/components/surface.ts | 8 - .../default/tailwind/publisher.tailwind.ts | 198 --- .../presets/publisher/legacy-skin/host.css | 18 - .../legacy-skin/shared/css/sr-only.css | 11 - .../shared/css/video/icon-state.css | 78 - .../shared/global/video/keyframes.css | 14 - .../legacy-skin/shared/tailwind/icon-state.ts | 67 - .../src/presets/publisher/skin.tailwind.ts | 181 -- packages/html/src/presets/publisher/skin.ts | 152 +- .../react/src/internal/skin-primitives.ts | 13 +- packages/react/src/presets/publisher/index.ts | 1 - .../presets/publisher/legacy-skin/README.md | 5 - .../default/css/components/badge.css | 10 - .../default/css/components/button-group.css | 9 - .../default/css/components/button.css | 173 -- .../default/css/components/capture.css | 202 --- .../default/css/components/container.css | 75 - .../css/components/controls-backdrop.css | 16 - .../default/css/components/controls.css | 17 - .../default/css/components/dialog.css | 65 - .../default/css/components/icons.css | 17 - .../default/css/components/media.css | 19 - .../default/css/components/menus.css | 257 --- .../default/css/components/popup.css | 134 -- .../default/css/components/publish.css | 168 -- .../default/css/components/reset.css | 25 - .../default/css/components/surface.css | 21 - .../legacy-skin/default/css/publisher.css | 256 --- .../default/tailwind/components/badge.ts | 2 - .../tailwind/components/button-group.ts | 1 - .../default/tailwind/components/button.ts | 38 - .../default/tailwind/components/capture.ts | 106 -- .../default/tailwind/components/container.ts | 37 - .../tailwind/components/controls-backdrop.ts | 7 - .../default/tailwind/components/controls.ts | 15 - .../default/tailwind/components/dialog.ts | 30 - .../default/tailwind/components/icon.ts | 11 - .../default/tailwind/components/menu.ts | 119 -- .../default/tailwind/components/popup.ts | 45 - .../default/tailwind/components/publish.ts | 83 - .../default/tailwind/components/reset.ts | 9 - .../default/tailwind/components/surface.ts | 8 - .../default/tailwind/publisher.tailwind.ts | 198 --- .../legacy-skin/shared/css/sr-only.css | 11 - .../shared/css/video/icon-state.css | 78 - .../shared/global/video/keyframes.css | 14 - .../legacy-skin/shared/tailwind/icon-state.ts | 67 - packages/react/src/presets/publisher/skin.css | 1562 ++++++++++++++++- .../src/presets/publisher/skin.tailwind.tsx | 291 --- packages/react/src/presets/publisher/skin.tsx | 282 +-- .../src/presets/publisher/tests/skin.test.tsx | 17 +- .../src/ui/camera-radio-group/component.tsx | 148 ++ .../src/ui/camera-radio-group/index.parts.ts | 10 + .../react/src/ui/camera-radio-group/index.ts | 1 + .../src/ui/mic-radio-group/component.tsx | 146 ++ .../src/ui/mic-radio-group/index.parts.ts | 10 + .../react/src/ui/mic-radio-group/index.ts | 1 + packages/skins/build/config.ts | 5 +- packages/skins/build/packages/html.ts | 2 +- packages/skins/build/packages/plugin.ts | 7 +- packages/skins/build/packages/react.ts | 4 +- packages/skins/build/publisher.ts | 201 +++ packages/skins/build/target/html-render.ts | 1 + packages/skins/build/target/html.tsx | 16 + packages/skins/build/target/react.tsx | 4 + .../skins/build/tests/browser-support.test.ts | 5 +- packages/skins/build/transform.ts | 13 +- packages/skins/src/presets/publisher/base.css | 43 + .../presets/publisher/capture-controls.tsx | 95 + .../src/presets/publisher/publisher.styles.ts | 189 ++ packages/skins/src/presets/publisher/skin.tsx | 86 + packages/skins/src/styles/vars.ts | 20 + packages/skins/vite.config.ts | 8 +- 120 files changed, 2725 insertions(+), 5675 deletions(-) create mode 100644 packages/core/src/core/ui/camera-button/component.ts create mode 100644 packages/core/src/core/ui/camera-radio-group/component.ts create mode 100644 packages/core/src/core/ui/capture-placeholder/component.ts create mode 100644 packages/core/src/core/ui/connection-indicator/component.ts create mode 100644 packages/core/src/core/ui/enable-devices-button/component.ts create mode 100644 packages/core/src/core/ui/mic-button/component.ts create mode 100644 packages/core/src/core/ui/mic-radio-group/component.ts create mode 100644 packages/core/src/core/ui/publish-badge/component.ts create mode 100644 packages/core/src/core/ui/publish-button/component.ts create mode 100644 packages/core/src/core/ui/publish-timer/component.ts create mode 100644 packages/core/src/core/ui/screen-share-button/component.ts delete mode 100644 packages/html/src/define/publisher/skin.tailwind.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/README.md delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/badge.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/button-group.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/button.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/capture.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/container.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/controls-backdrop.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/controls.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/dialog.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/icons.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/media.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/menus.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/popup.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/publish.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/reset.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/components/surface.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/css/publisher.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/badge.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/button-group.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/button.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/capture.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/container.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/controls-backdrop.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/controls.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/dialog.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/icon.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/menu.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/popup.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/publish.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/reset.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/components/surface.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/default/tailwind/publisher.tailwind.ts delete mode 100644 packages/html/src/presets/publisher/legacy-skin/host.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/shared/css/sr-only.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/shared/css/video/icon-state.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/shared/global/video/keyframes.css delete mode 100644 packages/html/src/presets/publisher/legacy-skin/shared/tailwind/icon-state.ts delete mode 100644 packages/html/src/presets/publisher/skin.tailwind.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/README.md delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/badge.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/button-group.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/button.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/capture.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/container.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/controls-backdrop.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/controls.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/dialog.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/icons.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/media.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/menus.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/popup.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/publish.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/reset.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/components/surface.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/css/publisher.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/badge.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/button-group.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/button.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/capture.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/container.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/controls-backdrop.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/controls.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/dialog.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/icon.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/menu.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/popup.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/publish.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/reset.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/components/surface.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/default/tailwind/publisher.tailwind.ts delete mode 100644 packages/react/src/presets/publisher/legacy-skin/shared/css/sr-only.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/shared/css/video/icon-state.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/shared/global/video/keyframes.css delete mode 100644 packages/react/src/presets/publisher/legacy-skin/shared/tailwind/icon-state.ts delete mode 100644 packages/react/src/presets/publisher/skin.tailwind.tsx create mode 100644 packages/react/src/ui/camera-radio-group/component.tsx create mode 100644 packages/react/src/ui/camera-radio-group/index.parts.ts create mode 100644 packages/react/src/ui/mic-radio-group/component.tsx create mode 100644 packages/react/src/ui/mic-radio-group/index.parts.ts create mode 100644 packages/skins/build/publisher.ts create mode 100644 packages/skins/src/presets/publisher/base.css create mode 100644 packages/skins/src/presets/publisher/capture-controls.tsx create mode 100644 packages/skins/src/presets/publisher/publisher.styles.ts create mode 100644 packages/skins/src/presets/publisher/skin.tsx diff --git a/apps/sandbox/app/styles.css b/apps/sandbox/app/styles.css index 75d7d719d2..cdf6fb2d36 100644 --- a/apps/sandbox/app/styles.css +++ b/apps/sandbox/app/styles.css @@ -4,13 +4,6 @@ @source "../app"; @source "../templates"; @source "./_generated/registry"; -/* - * The publisher's Tailwind skin predates VJSC and is not in the generated registry. Its class maps ship bundled inside - * the public packages, so scan those copies. Keep these paths narrow: scanning either package root follows workspace - * symlinks across thousands of generated files and blocks cold requests. - */ -@source "../node_modules/@videojs/html/dist/default/presets/publisher"; -@source "../node_modules/@videojs/react/dist/default/presets/publisher"; /* The shell's scheme control pins `data-color-scheme`; without it the operating system decides. */ :root { @@ -40,19 +33,6 @@ @theme { --font-sans: Inter, ui-sans-serif, system-ui, sans-serif; - /* Publisher Tailwind skin animation token; ejected from the publisher's legacy skin `shared/tailwind.css`. */ - --animate-media-pulse: media-pulse 2s ease-in-out infinite; -} - -/* Soft opacity pulse for live/connecting status dots (publisher skins). */ -@keyframes media-pulse { - 0%, - 100% { - opacity: 1; - } - 50% { - opacity: 0.4; - } } @layer base { diff --git a/apps/sandbox/templates/moq-publisher-react/main.tsx b/apps/sandbox/templates/moq-publisher-react/main.tsx index 37b38ce78c..8e38066541 100644 --- a/apps/sandbox/templates/moq-publisher-react/main.tsx +++ b/apps/sandbox/templates/moq-publisher-react/main.tsx @@ -10,11 +10,11 @@ import '@app/styles.css'; // ?real publish to an actual MoQ relay via // ?relay= relay endpoint for ?real (default https://relay.mux.dev) // ?ns= publish namespace for ?real (default: random name) -// ?styling=tailwind use the Tailwind skin twin +// ?styling=tailwind compile the skin's Tailwind styling from its authored source import { SandboxI18nProvider } from '@app/shared/react/sandbox-i18n'; import type { Styling } from '@app/types'; import { createPlayer, useComposedRefs, useMediaInstance } from '@videojs/react'; -import { MoqPublishVideo, PublisherSkin, PublisherSkinTailwind, publisherFeatures } from '@videojs/react/publisher'; +import { MoqPublishVideo, PublisherSkin, publisherFeatures } from '@videojs/react/publisher'; import { type ComponentProps, forwardRef, useCallback } from 'react'; import { createRoot } from 'react-dom/client'; @@ -28,9 +28,28 @@ const real = params.has('real'); const relay = params.get('relay') || 'https://relay.mux.dev'; const namespace = params.get('ns') || `vjs-sandbox-${Math.random().toString(36).slice(2, 8)}`; -if (styling === 'css') await import('@videojs/react/publisher/skin.css'); +/** + * The packages ship only the CSS skin, so Tailwind compiles the authored source on request, as the shell does for the + * playback skins. + */ +async function loadSkin(): Promise { + if (styling === 'css') { + await import('@videojs/react/publisher/skin.css'); + + return PublisherSkin; + } + + const [authored] = await Promise.all([ + import('../../../../packages/skins/src/presets/publisher/skin.tsx?style=tailwind&target=react&skin=default-publisher&theme=default'), + import('@app/styles.authored.css'), + ]); -const { Provider } = createPlayer({ features: publisherFeatures }); + return authored.PublisherSkin; +} + +const Skin = await loadSkin(); + +const { Player } = createPlayer({ features: publisherFeatures }); /** * Fake twin of `MoqPublishVideo` — the same preview `