From 92c53dd2341304208a7c6afeeee66177fa139a0b Mon Sep 17 00:00:00 2001 From: Matt McClure Date: Thu, 1 Oct 2026 00:03:22 +0000 Subject: [PATCH 1/2] refactor(core): rename publisher UI modules to the upstream file convention Moves the publisher's core, HTML, and React UI modules to core.ts/data.ts, element.ts, and component.tsx (tests included), matching their upstream siblings. Exports and tag names are unchanged. Closes #55 --- .../publisher-multi-source-capture.md | 4 +- packages/core/src/core/index.ts | 44 +++++++++---------- .../{camera-button-core.ts => core.ts} | 0 .../{camera-button-data-attrs.ts => data.ts} | 2 +- ...amera-button-core.test.ts => core.test.ts} | 4 +- .../{camera-radio-group-core.ts => core.ts} | 0 ...mera-radio-group-data-attrs.ts => data.ts} | 2 +- ...-radio-group-core.test.ts => core.test.ts} | 4 +- .../{capture-placeholder-core.ts => core.ts} | 0 ...ture-placeholder-data-attrs.ts => data.ts} | 2 +- ...-placeholder-core.test.ts => core.test.ts} | 4 +- .../{connection-indicator-core.ts => core.ts} | 0 ...ection-indicator-data-attrs.ts => data.ts} | 2 +- ...on-indicator-core.test.ts => core.test.ts} | 4 +- ...{enable-devices-button-core.ts => core.ts} | 0 ...e-devices-button-data-attrs.ts => data.ts} | 2 +- ...vices-button-core.test.ts => core.test.ts} | 4 +- .../{mic-button-core.ts => core.ts} | 0 .../{mic-button-data-attrs.ts => data.ts} | 2 +- .../{mic-button-core.test.ts => core.test.ts} | 4 +- .../{mic-radio-group-core.ts => core.ts} | 0 ...{mic-radio-group-data-attrs.ts => data.ts} | 2 +- ...-radio-group-core.test.ts => core.test.ts} | 4 +- .../{publish-badge-core.ts => core.ts} | 0 .../{publish-badge-data-attrs.ts => data.ts} | 2 +- ...ublish-badge-core.test.ts => core.test.ts} | 4 +- .../{publish-button-core.ts => core.ts} | 0 .../{publish-button-data-attrs.ts => data.ts} | 2 +- ...blish-button-core.test.ts => core.test.ts} | 4 +- .../{publish-timer-core.ts => core.ts} | 0 .../{publish-timer-data-attrs.ts => data.ts} | 2 +- ...ublish-timer-core.test.ts => core.test.ts} | 4 +- .../{screen-share-button-core.ts => core.ts} | 0 ...een-share-button-data-attrs.ts => data.ts} | 2 +- ...share-button-core.test.ts => core.test.ts} | 4 +- packages/html/src/define/publisher/ui.ts | 22 +++++----- packages/html/src/define/ui/camera-button.ts | 2 +- .../html/src/define/ui/camera-radio-group.ts | 2 +- .../html/src/define/ui/capture-placeholder.ts | 2 +- .../src/define/ui/connection-indicator.ts | 2 +- .../src/define/ui/enable-devices-button.ts | 2 +- packages/html/src/define/ui/mic-button.ts | 2 +- .../html/src/define/ui/mic-radio-group.ts | 2 +- packages/html/src/define/ui/publish-badge.ts | 2 +- packages/html/src/define/ui/publish-button.ts | 2 +- packages/html/src/define/ui/publish-timer.ts | 2 +- .../html/src/define/ui/screen-share-button.ts | 2 +- packages/html/src/index.ts | 22 +++++----- .../{camera-button-element.ts => element.ts} | 0 ...button-element.test.ts => element.test.ts} | 2 +- ...mera-radio-group-element.ts => element.ts} | 0 ...-group-element.test.ts => element.test.ts} | 2 +- ...ture-placeholder-element.ts => element.ts} | 0 ...holder-element.test.ts => element.test.ts} | 2 +- ...ection-indicator-element.ts => element.ts} | 0 ...icator-element.test.ts => element.test.ts} | 2 +- ...e-devices-button-element.ts => element.ts} | 0 .../{mic-button-element.ts => element.ts} | 0 ...{mic-radio-group-element.ts => element.ts} | 0 .../{publish-badge-element.ts => element.ts} | 0 .../{publish-button-element.ts => element.ts} | 0 ...button-element.test.ts => element.test.ts} | 2 +- .../{publish-timer-element.ts => element.ts} | 0 ...-timer-element.test.ts => element.test.ts} | 2 +- ...een-share-button-element.ts => element.ts} | 0 packages/react/src/index.ts | 18 ++++---- .../{camera-button.tsx => component.tsx} | 0 packages/react/src/ui/camera-button/index.ts | 2 +- ...{capture-placeholder.tsx => component.tsx} | 0 .../react/src/ui/capture-placeholder/index.ts | 2 +- ...laceholder.test.tsx => component.test.tsx} | 2 +- ...connection-indicator.tsx => component.tsx} | 0 .../src/ui/connection-indicator/index.ts | 2 +- ...-indicator.test.tsx => component.test.tsx} | 2 +- ...nable-devices-button.tsx => component.tsx} | 0 .../src/ui/enable-devices-button/index.ts | 2 +- .../{mic-button.tsx => component.tsx} | 0 packages/react/src/ui/mic-button/index.ts | 2 +- .../{publish-badge.tsx => component.tsx} | 0 packages/react/src/ui/publish-badge/index.ts | 2 +- .../{publish-button.tsx => component.tsx} | 0 packages/react/src/ui/publish-button/index.ts | 2 +- ...ish-button.test.tsx => component.test.tsx} | 2 +- .../{publish-timer.tsx => component.tsx} | 0 packages/react/src/ui/publish-timer/index.ts | 2 +- ...lish-timer.test.tsx => component.test.tsx} | 2 +- ...{screen-share-button.tsx => component.tsx} | 0 .../react/src/ui/screen-share-button/index.ts | 2 +- 88 files changed, 118 insertions(+), 118 deletions(-) rename packages/core/src/core/ui/camera-button/{camera-button-core.ts => core.ts} (100%) rename packages/core/src/core/ui/camera-button/{camera-button-data-attrs.ts => data.ts} (77%) rename packages/core/src/core/ui/camera-button/tests/{camera-button-core.test.ts => core.test.ts} (95%) rename packages/core/src/core/ui/camera-radio-group/{camera-radio-group-core.ts => core.ts} (100%) rename packages/core/src/core/ui/camera-radio-group/{camera-radio-group-data-attrs.ts => data.ts} (85%) rename packages/core/src/core/ui/camera-radio-group/tests/{camera-radio-group-core.test.ts => core.test.ts} (96%) rename packages/core/src/core/ui/capture-placeholder/{capture-placeholder-core.ts => core.ts} (100%) rename packages/core/src/core/ui/capture-placeholder/{capture-placeholder-data-attrs.ts => data.ts} (75%) rename packages/core/src/core/ui/capture-placeholder/tests/{capture-placeholder-core.test.ts => core.test.ts} (97%) rename packages/core/src/core/ui/connection-indicator/{connection-indicator-core.ts => core.ts} (100%) rename packages/core/src/core/ui/connection-indicator/{connection-indicator-data-attrs.ts => data.ts} (76%) rename packages/core/src/core/ui/connection-indicator/tests/{connection-indicator-core.test.ts => core.test.ts} (94%) rename packages/core/src/core/ui/enable-devices-button/{enable-devices-button-core.ts => core.ts} (100%) rename packages/core/src/core/ui/enable-devices-button/{enable-devices-button-data-attrs.ts => data.ts} (79%) rename packages/core/src/core/ui/enable-devices-button/tests/{enable-devices-button-core.test.ts => core.test.ts} (97%) rename packages/core/src/core/ui/mic-button/{mic-button-core.ts => core.ts} (100%) rename packages/core/src/core/ui/mic-button/{mic-button-data-attrs.ts => data.ts} (78%) rename packages/core/src/core/ui/mic-button/tests/{mic-button-core.test.ts => core.test.ts} (96%) rename packages/core/src/core/ui/mic-radio-group/{mic-radio-group-core.ts => core.ts} (100%) rename packages/core/src/core/ui/mic-radio-group/{mic-radio-group-data-attrs.ts => data.ts} (86%) rename packages/core/src/core/ui/mic-radio-group/tests/{mic-radio-group-core.test.ts => core.test.ts} (96%) rename packages/core/src/core/ui/publish-badge/{publish-badge-core.ts => core.ts} (100%) rename packages/core/src/core/ui/publish-badge/{publish-badge-data-attrs.ts => data.ts} (77%) rename packages/core/src/core/ui/publish-badge/tests/{publish-badge-core.test.ts => core.test.ts} (95%) rename packages/core/src/core/ui/publish-button/{publish-button-core.ts => core.ts} (100%) rename packages/core/src/core/ui/publish-button/{publish-button-data-attrs.ts => data.ts} (81%) rename packages/core/src/core/ui/publish-button/tests/{publish-button-core.test.ts => core.test.ts} (98%) rename packages/core/src/core/ui/publish-timer/{publish-timer-core.ts => core.ts} (100%) rename packages/core/src/core/ui/publish-timer/{publish-timer-data-attrs.ts => data.ts} (77%) rename packages/core/src/core/ui/publish-timer/tests/{publish-timer-core.test.ts => core.test.ts} (96%) rename packages/core/src/core/ui/screen-share-button/{screen-share-button-core.ts => core.ts} (100%) rename packages/core/src/core/ui/screen-share-button/{screen-share-button-data-attrs.ts => data.ts} (82%) rename packages/core/src/core/ui/screen-share-button/tests/{screen-share-button-core.test.ts => core.test.ts} (96%) rename packages/html/src/ui/camera-button/{camera-button-element.ts => element.ts} (100%) rename packages/html/src/ui/camera-button/tests/{camera-button-element.test.ts => element.test.ts} (98%) rename packages/html/src/ui/camera-radio-group/{camera-radio-group-element.ts => element.ts} (100%) rename packages/html/src/ui/camera-radio-group/tests/{camera-radio-group-element.test.ts => element.test.ts} (98%) rename packages/html/src/ui/capture-placeholder/{capture-placeholder-element.ts => element.ts} (100%) rename packages/html/src/ui/capture-placeholder/tests/{capture-placeholder-element.test.ts => element.test.ts} (98%) rename packages/html/src/ui/connection-indicator/{connection-indicator-element.ts => element.ts} (100%) rename packages/html/src/ui/connection-indicator/tests/{connection-indicator-element.test.ts => element.test.ts} (97%) rename packages/html/src/ui/enable-devices-button/{enable-devices-button-element.ts => element.ts} (100%) rename packages/html/src/ui/mic-button/{mic-button-element.ts => element.ts} (100%) rename packages/html/src/ui/mic-radio-group/{mic-radio-group-element.ts => element.ts} (100%) rename packages/html/src/ui/publish-badge/{publish-badge-element.ts => element.ts} (100%) rename packages/html/src/ui/publish-button/{publish-button-element.ts => element.ts} (100%) rename packages/html/src/ui/publish-button/tests/{publish-button-element.test.ts => element.test.ts} (98%) rename packages/html/src/ui/publish-timer/{publish-timer-element.ts => element.ts} (100%) rename packages/html/src/ui/publish-timer/tests/{publish-timer-element.test.ts => element.test.ts} (98%) rename packages/html/src/ui/screen-share-button/{screen-share-button-element.ts => element.ts} (100%) rename packages/react/src/ui/camera-button/{camera-button.tsx => component.tsx} (100%) rename packages/react/src/ui/capture-placeholder/{capture-placeholder.tsx => component.tsx} (100%) rename packages/react/src/ui/capture-placeholder/tests/{capture-placeholder.test.tsx => component.test.tsx} (98%) rename packages/react/src/ui/connection-indicator/{connection-indicator.tsx => component.tsx} (100%) rename packages/react/src/ui/connection-indicator/tests/{connection-indicator.test.tsx => component.test.tsx} (95%) rename packages/react/src/ui/enable-devices-button/{enable-devices-button.tsx => component.tsx} (100%) rename packages/react/src/ui/mic-button/{mic-button.tsx => component.tsx} (100%) rename packages/react/src/ui/publish-badge/{publish-badge.tsx => component.tsx} (100%) rename packages/react/src/ui/publish-button/{publish-button.tsx => component.tsx} (100%) rename packages/react/src/ui/publish-button/tests/{publish-button.test.tsx => component.test.tsx} (98%) rename packages/react/src/ui/publish-timer/{publish-timer.tsx => component.tsx} (100%) rename packages/react/src/ui/publish-timer/tests/{publish-timer.test.tsx => component.test.tsx} (97%) rename packages/react/src/ui/screen-share-button/{screen-share-button.tsx => component.tsx} (100%) diff --git a/internal/design/spf/features/publisher-multi-source-capture.md b/internal/design/spf/features/publisher-multi-source-capture.md index 6d22338b4e..eb7ded8fb7 100644 --- a/internal/design/spf/features/publisher-multi-source-capture.md +++ b/internal/design/spf/features/publisher-multi-source-capture.md @@ -214,10 +214,10 @@ with no measured bandwidth need. Revisit with data, in independently" — call sites are unaffected). State fields become `cameraActive`, `screenShareActive`, `cameraState`, `screenShareState`, and (added after review) the read-only `micState`. -- **`screen-share-button-core.ts`**: `sharing` becomes +- **`screen-share-button/core.ts`**: `sharing` becomes `media.screenShareActive` directly, replacing `media.captureSource === 'screen'`. -- **`capture-placeholder-core.ts`**: the placeholder is shown before +- **`capture-placeholder/core.ts`**: the placeholder is shown before *any* source is active — `captureState` becomes a derived aggregate, `active` if either `cameraState` or `screenShareState` is `active`, else the more "in-progress" of the two (`acquiring` > `denied` > diff --git a/packages/core/src/core/index.ts b/packages/core/src/core/index.ts index 0dd8df6b2f..8c8950e310 100644 --- a/packages/core/src/core/index.ts +++ b/packages/core/src/core/index.ts @@ -6,20 +6,20 @@ export * from './ui/audio-track-radio-group/core'; export * from './ui/audio-track-radio-group/data'; export * from './ui/buffering-indicator/core'; export * from './ui/buffering-indicator/data'; -export * from './ui/camera-button/camera-button-core'; -export * from './ui/camera-button/camera-button-data-attrs'; -export * from './ui/camera-radio-group/camera-radio-group-core'; -export * from './ui/camera-radio-group/camera-radio-group-data-attrs'; +export * from './ui/camera-button/core'; +export * from './ui/camera-button/data'; +export * from './ui/camera-radio-group/core'; +export * from './ui/camera-radio-group/data'; export * from './ui/captions-button/core'; export * from './ui/captions-button/data'; export * from './ui/captions-radio-group/core'; export * from './ui/captions-radio-group/data'; -export * from './ui/capture-placeholder/capture-placeholder-core'; -export * from './ui/capture-placeholder/capture-placeholder-data-attrs'; +export * from './ui/capture-placeholder/core'; +export * from './ui/capture-placeholder/data'; export * from './ui/cast-button/core'; export * from './ui/cast-button/data'; -export * from './ui/connection-indicator/connection-indicator-core'; -export * from './ui/connection-indicator/connection-indicator-data-attrs'; +export * from './ui/connection-indicator/core'; +export * from './ui/connection-indicator/data'; export * from './ui/container/core'; export * from './ui/container/data'; export * from './ui/controls/core'; @@ -27,8 +27,8 @@ export * from './ui/controls/data'; export * from './ui/constants'; export * from './ui/dialog/core'; export * from './ui/dialog/data'; -export * from './ui/enable-devices-button/enable-devices-button-core'; -export * from './ui/enable-devices-button/enable-devices-button-data-attrs'; +export * from './ui/enable-devices-button/core'; +export * from './ui/enable-devices-button/data'; export * from './ui/error-dialog/core'; export * from './ui/error-dialog/data'; export * from './ui/error-dialog/i18n'; @@ -45,10 +45,10 @@ export * from './ui/menu/core'; export * from './ui/menu/data'; export * from './ui/menu/item'; export * from './ui/menu/vars'; -export * from './ui/mic-button/mic-button-core'; -export * from './ui/mic-button/mic-button-data-attrs'; -export * from './ui/mic-radio-group/mic-radio-group-core'; -export * from './ui/mic-radio-group/mic-radio-group-data-attrs'; +export * from './ui/mic-button/core'; +export * from './ui/mic-button/data'; +export * from './ui/mic-radio-group/core'; +export * from './ui/mic-radio-group/data'; export * from './ui/mute-button/core'; export * from './ui/mute-button/data'; export * from './ui/pip-button/core'; @@ -65,16 +65,16 @@ export * from './ui/popover/host'; export * from './ui/popover/vars'; export * from './ui/poster/core'; export * from './ui/poster/data'; -export * from './ui/publish-badge/publish-badge-core'; -export * from './ui/publish-badge/publish-badge-data-attrs'; -export * from './ui/publish-button/publish-button-core'; -export * from './ui/publish-button/publish-button-data-attrs'; -export * from './ui/publish-timer/publish-timer-core'; -export * from './ui/publish-timer/publish-timer-data-attrs'; +export * from './ui/publish-badge/core'; +export * from './ui/publish-badge/data'; +export * from './ui/publish-button/core'; +export * from './ui/publish-button/data'; +export * from './ui/publish-timer/core'; +export * from './ui/publish-timer/data'; export * from './ui/quality-radio-group/core'; export * from './ui/quality-radio-group/data'; -export * from './ui/screen-share-button/screen-share-button-core'; -export * from './ui/screen-share-button/screen-share-button-data-attrs'; +export * from './ui/screen-share-button/core'; +export * from './ui/screen-share-button/data'; export * from './ui/seek-button/core'; export * from './ui/seek-button/data'; export * from './ui/seek-indicator/core'; diff --git a/packages/core/src/core/ui/camera-button/camera-button-core.ts b/packages/core/src/core/ui/camera-button/core.ts similarity index 100% rename from packages/core/src/core/ui/camera-button/camera-button-core.ts rename to packages/core/src/core/ui/camera-button/core.ts diff --git a/packages/core/src/core/ui/camera-button/camera-button-data-attrs.ts b/packages/core/src/core/ui/camera-button/data.ts similarity index 77% rename from packages/core/src/core/ui/camera-button/camera-button-data-attrs.ts rename to packages/core/src/core/ui/camera-button/data.ts index 297ee55a65..c4d46ab3aa 100644 --- a/packages/core/src/core/ui/camera-button/camera-button-data-attrs.ts +++ b/packages/core/src/core/ui/camera-button/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { CameraButtonState } from './camera-button-core'; +import type { CameraButtonState } from './core'; export const CameraButtonDataAttrs = { /** Present when outgoing video is muted. */ diff --git a/packages/core/src/core/ui/camera-button/tests/camera-button-core.test.ts b/packages/core/src/core/ui/camera-button/tests/core.test.ts similarity index 95% rename from packages/core/src/core/ui/camera-button/tests/camera-button-core.test.ts rename to packages/core/src/core/ui/camera-button/tests/core.test.ts index 1f08ae5fb2..2a272c9920 100644 --- a/packages/core/src/core/ui/camera-button/tests/camera-button-core.test.ts +++ b/packages/core/src/core/ui/camera-button/tests/core.test.ts @@ -1,8 +1,8 @@ import type { MediaCaptureTracksState } from '@videojs/media'; import { describe, expect, it, vi } from 'vite-plus/test'; -import type { CameraButtonState } from '../camera-button-core'; -import { CameraButtonCore } from '../camera-button-core'; +import type { CameraButtonState } from '../core'; +import { CameraButtonCore } from '../core'; function createMediaState(overrides: Partial = {}): MediaCaptureTracksState { return { diff --git a/packages/core/src/core/ui/camera-radio-group/camera-radio-group-core.ts b/packages/core/src/core/ui/camera-radio-group/core.ts similarity index 100% rename from packages/core/src/core/ui/camera-radio-group/camera-radio-group-core.ts rename to packages/core/src/core/ui/camera-radio-group/core.ts diff --git a/packages/core/src/core/ui/camera-radio-group/camera-radio-group-data-attrs.ts b/packages/core/src/core/ui/camera-radio-group/data.ts similarity index 85% rename from packages/core/src/core/ui/camera-radio-group/camera-radio-group-data-attrs.ts rename to packages/core/src/core/ui/camera-radio-group/data.ts index b3725df75b..d370e774d6 100644 --- a/packages/core/src/core/ui/camera-radio-group/camera-radio-group-data-attrs.ts +++ b/packages/core/src/core/ui/camera-radio-group/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { CameraRadioGroupState } from './camera-radio-group-core'; +import type { CameraRadioGroupState } from './core'; export const CameraRadioGroupDataAttrs = { /** Currently selected camera device id. */ diff --git a/packages/core/src/core/ui/camera-radio-group/tests/camera-radio-group-core.test.ts b/packages/core/src/core/ui/camera-radio-group/tests/core.test.ts similarity index 96% rename from packages/core/src/core/ui/camera-radio-group/tests/camera-radio-group-core.test.ts rename to packages/core/src/core/ui/camera-radio-group/tests/core.test.ts index 1a7c68f6d0..2bc355ad3a 100644 --- a/packages/core/src/core/ui/camera-radio-group/tests/camera-radio-group-core.test.ts +++ b/packages/core/src/core/ui/camera-radio-group/tests/core.test.ts @@ -1,8 +1,8 @@ import type { MediaCaptureDevicesState } from '@videojs/media'; import { describe, expect, it, vi } from 'vite-plus/test'; -import type { CameraRadioGroupState } from '../camera-radio-group-core'; -import { CameraRadioGroupCore } from '../camera-radio-group-core'; +import type { CameraRadioGroupState } from '../core'; +import { CameraRadioGroupCore } from '../core'; function createMediaState(overrides: Partial = {}): MediaCaptureDevicesState { return { diff --git a/packages/core/src/core/ui/capture-placeholder/capture-placeholder-core.ts b/packages/core/src/core/ui/capture-placeholder/core.ts similarity index 100% rename from packages/core/src/core/ui/capture-placeholder/capture-placeholder-core.ts rename to packages/core/src/core/ui/capture-placeholder/core.ts diff --git a/packages/core/src/core/ui/capture-placeholder/capture-placeholder-data-attrs.ts b/packages/core/src/core/ui/capture-placeholder/data.ts similarity index 75% rename from packages/core/src/core/ui/capture-placeholder/capture-placeholder-data-attrs.ts rename to packages/core/src/core/ui/capture-placeholder/data.ts index a2de697d1a..6e9200a289 100644 --- a/packages/core/src/core/ui/capture-placeholder/capture-placeholder-data-attrs.ts +++ b/packages/core/src/core/ui/capture-placeholder/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { CapturePlaceholderState } from './capture-placeholder-core'; +import type { CapturePlaceholderState } from './core'; export const CapturePlaceholderDataAttrs = { /** Current capture lifecycle. */ diff --git a/packages/core/src/core/ui/capture-placeholder/tests/capture-placeholder-core.test.ts b/packages/core/src/core/ui/capture-placeholder/tests/core.test.ts similarity index 97% rename from packages/core/src/core/ui/capture-placeholder/tests/capture-placeholder-core.test.ts rename to packages/core/src/core/ui/capture-placeholder/tests/core.test.ts index f703c0e118..d0e0faa93c 100644 --- a/packages/core/src/core/ui/capture-placeholder/tests/capture-placeholder-core.test.ts +++ b/packages/core/src/core/ui/capture-placeholder/tests/core.test.ts @@ -1,8 +1,8 @@ import type { MediaCaptureSourceState } from '@videojs/media'; import { describe, expect, it, vi } from 'vite-plus/test'; -import type { CapturePlaceholderState } from '../capture-placeholder-core'; -import { CapturePlaceholderCore } from '../capture-placeholder-core'; +import type { CapturePlaceholderState } from '../core'; +import { CapturePlaceholderCore } from '../core'; function createMediaState(overrides: Partial = {}): MediaCaptureSourceState { return { diff --git a/packages/core/src/core/ui/connection-indicator/connection-indicator-core.ts b/packages/core/src/core/ui/connection-indicator/core.ts similarity index 100% rename from packages/core/src/core/ui/connection-indicator/connection-indicator-core.ts rename to packages/core/src/core/ui/connection-indicator/core.ts diff --git a/packages/core/src/core/ui/connection-indicator/connection-indicator-data-attrs.ts b/packages/core/src/core/ui/connection-indicator/data.ts similarity index 76% rename from packages/core/src/core/ui/connection-indicator/connection-indicator-data-attrs.ts rename to packages/core/src/core/ui/connection-indicator/data.ts index cefc41b5df..10e008ce65 100644 --- a/packages/core/src/core/ui/connection-indicator/connection-indicator-data-attrs.ts +++ b/packages/core/src/core/ui/connection-indicator/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { ConnectionIndicatorState } from './connection-indicator-core'; +import type { ConnectionIndicatorState } from './core'; export const ConnectionIndicatorDataAttrs = { /** Coarse connection health (`unknown`, `good`, `fair`, or `poor`). */ diff --git a/packages/core/src/core/ui/connection-indicator/tests/connection-indicator-core.test.ts b/packages/core/src/core/ui/connection-indicator/tests/core.test.ts similarity index 94% rename from packages/core/src/core/ui/connection-indicator/tests/connection-indicator-core.test.ts rename to packages/core/src/core/ui/connection-indicator/tests/core.test.ts index 56b04028b6..71586ffd96 100644 --- a/packages/core/src/core/ui/connection-indicator/tests/connection-indicator-core.test.ts +++ b/packages/core/src/core/ui/connection-indicator/tests/core.test.ts @@ -1,8 +1,8 @@ import type { MediaPublishStatsState } from '@videojs/media'; import { describe, expect, it } from 'vite-plus/test'; -import type { ConnectionIndicatorState } from '../connection-indicator-core'; -import { ConnectionIndicatorCore } from '../connection-indicator-core'; +import type { ConnectionIndicatorState } from '../core'; +import { ConnectionIndicatorCore } from '../core'; function createMediaState(overrides: Partial = {}): MediaPublishStatsState { return { diff --git a/packages/core/src/core/ui/enable-devices-button/enable-devices-button-core.ts b/packages/core/src/core/ui/enable-devices-button/core.ts similarity index 100% rename from packages/core/src/core/ui/enable-devices-button/enable-devices-button-core.ts rename to packages/core/src/core/ui/enable-devices-button/core.ts diff --git a/packages/core/src/core/ui/enable-devices-button/enable-devices-button-data-attrs.ts b/packages/core/src/core/ui/enable-devices-button/data.ts similarity index 79% rename from packages/core/src/core/ui/enable-devices-button/enable-devices-button-data-attrs.ts rename to packages/core/src/core/ui/enable-devices-button/data.ts index e9c60cf564..c9d45a8951 100644 --- a/packages/core/src/core/ui/enable-devices-button/enable-devices-button-data-attrs.ts +++ b/packages/core/src/core/ui/enable-devices-button/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { EnableDevicesButtonState } from './enable-devices-button-core'; +import type { EnableDevicesButtonState } from './core'; export const EnableDevicesButtonDataAttrs = { /** Current capture lifecycle. */ diff --git a/packages/core/src/core/ui/enable-devices-button/tests/enable-devices-button-core.test.ts b/packages/core/src/core/ui/enable-devices-button/tests/core.test.ts similarity index 97% rename from packages/core/src/core/ui/enable-devices-button/tests/enable-devices-button-core.test.ts rename to packages/core/src/core/ui/enable-devices-button/tests/core.test.ts index d82b0490b2..a055f72bfb 100644 --- a/packages/core/src/core/ui/enable-devices-button/tests/enable-devices-button-core.test.ts +++ b/packages/core/src/core/ui/enable-devices-button/tests/core.test.ts @@ -1,8 +1,8 @@ import type { MediaCaptureSourceState } from '@videojs/media'; import { describe, expect, it, vi } from 'vite-plus/test'; -import type { EnableDevicesButtonState } from '../enable-devices-button-core'; -import { EnableDevicesButtonCore } from '../enable-devices-button-core'; +import type { EnableDevicesButtonState } from '../core'; +import { EnableDevicesButtonCore } from '../core'; function createMediaState(overrides: Partial = {}): MediaCaptureSourceState { return { diff --git a/packages/core/src/core/ui/mic-button/mic-button-core.ts b/packages/core/src/core/ui/mic-button/core.ts similarity index 100% rename from packages/core/src/core/ui/mic-button/mic-button-core.ts rename to packages/core/src/core/ui/mic-button/core.ts diff --git a/packages/core/src/core/ui/mic-button/mic-button-data-attrs.ts b/packages/core/src/core/ui/mic-button/data.ts similarity index 78% rename from packages/core/src/core/ui/mic-button/mic-button-data-attrs.ts rename to packages/core/src/core/ui/mic-button/data.ts index c1ef437631..bf6197f47b 100644 --- a/packages/core/src/core/ui/mic-button/mic-button-data-attrs.ts +++ b/packages/core/src/core/ui/mic-button/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { MicButtonState } from './mic-button-core'; +import type { MicButtonState } from './core'; export const MicButtonDataAttrs = { /** Present when outgoing audio is muted. */ diff --git a/packages/core/src/core/ui/mic-button/tests/mic-button-core.test.ts b/packages/core/src/core/ui/mic-button/tests/core.test.ts similarity index 96% rename from packages/core/src/core/ui/mic-button/tests/mic-button-core.test.ts rename to packages/core/src/core/ui/mic-button/tests/core.test.ts index 07d9f69aec..c5260d291d 100644 --- a/packages/core/src/core/ui/mic-button/tests/mic-button-core.test.ts +++ b/packages/core/src/core/ui/mic-button/tests/core.test.ts @@ -1,8 +1,8 @@ import type { MediaCaptureTracksState } from '@videojs/media'; import { describe, expect, it, vi } from 'vite-plus/test'; -import type { MicButtonState } from '../mic-button-core'; -import { MicButtonCore } from '../mic-button-core'; +import type { MicButtonState } from '../core'; +import { MicButtonCore } from '../core'; function createMediaState(overrides: Partial = {}): MediaCaptureTracksState { return { diff --git a/packages/core/src/core/ui/mic-radio-group/mic-radio-group-core.ts b/packages/core/src/core/ui/mic-radio-group/core.ts similarity index 100% rename from packages/core/src/core/ui/mic-radio-group/mic-radio-group-core.ts rename to packages/core/src/core/ui/mic-radio-group/core.ts diff --git a/packages/core/src/core/ui/mic-radio-group/mic-radio-group-data-attrs.ts b/packages/core/src/core/ui/mic-radio-group/data.ts similarity index 86% rename from packages/core/src/core/ui/mic-radio-group/mic-radio-group-data-attrs.ts rename to packages/core/src/core/ui/mic-radio-group/data.ts index 8750007b1a..8677868a40 100644 --- a/packages/core/src/core/ui/mic-radio-group/mic-radio-group-data-attrs.ts +++ b/packages/core/src/core/ui/mic-radio-group/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { MicRadioGroupState } from './mic-radio-group-core'; +import type { MicRadioGroupState } from './core'; export const MicRadioGroupDataAttrs = { /** Currently selected microphone device id. */ diff --git a/packages/core/src/core/ui/mic-radio-group/tests/mic-radio-group-core.test.ts b/packages/core/src/core/ui/mic-radio-group/tests/core.test.ts similarity index 96% rename from packages/core/src/core/ui/mic-radio-group/tests/mic-radio-group-core.test.ts rename to packages/core/src/core/ui/mic-radio-group/tests/core.test.ts index 5a4a681089..008f4e0058 100644 --- a/packages/core/src/core/ui/mic-radio-group/tests/mic-radio-group-core.test.ts +++ b/packages/core/src/core/ui/mic-radio-group/tests/core.test.ts @@ -1,8 +1,8 @@ import type { MediaCaptureDevicesState } from '@videojs/media'; import { describe, expect, it, vi } from 'vite-plus/test'; -import type { MicRadioGroupState } from '../mic-radio-group-core'; -import { MicRadioGroupCore } from '../mic-radio-group-core'; +import type { MicRadioGroupState } from '../core'; +import { MicRadioGroupCore } from '../core'; function createMediaState(overrides: Partial = {}): MediaCaptureDevicesState { return { diff --git a/packages/core/src/core/ui/publish-badge/publish-badge-core.ts b/packages/core/src/core/ui/publish-badge/core.ts similarity index 100% rename from packages/core/src/core/ui/publish-badge/publish-badge-core.ts rename to packages/core/src/core/ui/publish-badge/core.ts diff --git a/packages/core/src/core/ui/publish-badge/publish-badge-data-attrs.ts b/packages/core/src/core/ui/publish-badge/data.ts similarity index 77% rename from packages/core/src/core/ui/publish-badge/publish-badge-data-attrs.ts rename to packages/core/src/core/ui/publish-badge/data.ts index 91bb62154e..20285d0749 100644 --- a/packages/core/src/core/ui/publish-badge/publish-badge-data-attrs.ts +++ b/packages/core/src/core/ui/publish-badge/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { PublishBadgeState } from './publish-badge-core'; +import type { PublishBadgeState } from './core'; export const PublishBadgeDataAttrs = { /** Current publish session lifecycle. */ diff --git a/packages/core/src/core/ui/publish-badge/tests/publish-badge-core.test.ts b/packages/core/src/core/ui/publish-badge/tests/core.test.ts similarity index 95% rename from packages/core/src/core/ui/publish-badge/tests/publish-badge-core.test.ts rename to packages/core/src/core/ui/publish-badge/tests/core.test.ts index 99b8e09cc4..d4d4c33a80 100644 --- a/packages/core/src/core/ui/publish-badge/tests/publish-badge-core.test.ts +++ b/packages/core/src/core/ui/publish-badge/tests/core.test.ts @@ -1,8 +1,8 @@ import type { MediaPublishState } from '@videojs/media'; import { describe, expect, it, vi } from 'vite-plus/test'; -import type { PublishBadgeState } from '../publish-badge-core'; -import { PublishBadgeCore } from '../publish-badge-core'; +import type { PublishBadgeState } from '../core'; +import { PublishBadgeCore } from '../core'; function createMediaState(overrides: Partial = {}): MediaPublishState { return { diff --git a/packages/core/src/core/ui/publish-button/publish-button-core.ts b/packages/core/src/core/ui/publish-button/core.ts similarity index 100% rename from packages/core/src/core/ui/publish-button/publish-button-core.ts rename to packages/core/src/core/ui/publish-button/core.ts diff --git a/packages/core/src/core/ui/publish-button/publish-button-data-attrs.ts b/packages/core/src/core/ui/publish-button/data.ts similarity index 81% rename from packages/core/src/core/ui/publish-button/publish-button-data-attrs.ts rename to packages/core/src/core/ui/publish-button/data.ts index 121279280e..2a5bb8edd5 100644 --- a/packages/core/src/core/ui/publish-button/publish-button-data-attrs.ts +++ b/packages/core/src/core/ui/publish-button/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { PublishButtonState } from './publish-button-core'; +import type { PublishButtonState } from './core'; export const PublishButtonDataAttrs = { /** Current publish session lifecycle. */ diff --git a/packages/core/src/core/ui/publish-button/tests/publish-button-core.test.ts b/packages/core/src/core/ui/publish-button/tests/core.test.ts similarity index 98% rename from packages/core/src/core/ui/publish-button/tests/publish-button-core.test.ts rename to packages/core/src/core/ui/publish-button/tests/core.test.ts index 4e95d6344a..f530fde7cf 100644 --- a/packages/core/src/core/ui/publish-button/tests/publish-button-core.test.ts +++ b/packages/core/src/core/ui/publish-button/tests/core.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vite-plus/test'; -import type { PublishButtonMediaState, PublishButtonState } from '../publish-button-core'; -import { PublishButtonCore } from '../publish-button-core'; +import type { PublishButtonMediaState, PublishButtonState } from '../core'; +import { PublishButtonCore } from '../core'; function createMediaState(overrides: Partial = {}): PublishButtonMediaState { return { diff --git a/packages/core/src/core/ui/publish-timer/publish-timer-core.ts b/packages/core/src/core/ui/publish-timer/core.ts similarity index 100% rename from packages/core/src/core/ui/publish-timer/publish-timer-core.ts rename to packages/core/src/core/ui/publish-timer/core.ts diff --git a/packages/core/src/core/ui/publish-timer/publish-timer-data-attrs.ts b/packages/core/src/core/ui/publish-timer/data.ts similarity index 77% rename from packages/core/src/core/ui/publish-timer/publish-timer-data-attrs.ts rename to packages/core/src/core/ui/publish-timer/data.ts index c23160ef9f..59a144e672 100644 --- a/packages/core/src/core/ui/publish-timer/publish-timer-data-attrs.ts +++ b/packages/core/src/core/ui/publish-timer/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { PublishTimerState } from './publish-timer-core'; +import type { PublishTimerState } from './core'; export const PublishTimerDataAttrs = { /** Current publish session lifecycle. */ diff --git a/packages/core/src/core/ui/publish-timer/tests/publish-timer-core.test.ts b/packages/core/src/core/ui/publish-timer/tests/core.test.ts similarity index 96% rename from packages/core/src/core/ui/publish-timer/tests/publish-timer-core.test.ts rename to packages/core/src/core/ui/publish-timer/tests/core.test.ts index c12fad29a7..54d56c490d 100644 --- a/packages/core/src/core/ui/publish-timer/tests/publish-timer-core.test.ts +++ b/packages/core/src/core/ui/publish-timer/tests/core.test.ts @@ -1,8 +1,8 @@ import type { MediaPublishState } from '@videojs/media'; import { afterEach, describe, expect, it, vi } from 'vite-plus/test'; -import type { PublishTimerState } from '../publish-timer-core'; -import { PublishTimerCore } from '../publish-timer-core'; +import type { PublishTimerState } from '../core'; +import { PublishTimerCore } from '../core'; function createMediaState(overrides: Partial = {}): MediaPublishState { return { diff --git a/packages/core/src/core/ui/screen-share-button/screen-share-button-core.ts b/packages/core/src/core/ui/screen-share-button/core.ts similarity index 100% rename from packages/core/src/core/ui/screen-share-button/screen-share-button-core.ts rename to packages/core/src/core/ui/screen-share-button/core.ts diff --git a/packages/core/src/core/ui/screen-share-button/screen-share-button-data-attrs.ts b/packages/core/src/core/ui/screen-share-button/data.ts similarity index 82% rename from packages/core/src/core/ui/screen-share-button/screen-share-button-data-attrs.ts rename to packages/core/src/core/ui/screen-share-button/data.ts index 446edec812..2ec665b7c6 100644 --- a/packages/core/src/core/ui/screen-share-button/screen-share-button-data-attrs.ts +++ b/packages/core/src/core/ui/screen-share-button/data.ts @@ -1,5 +1,5 @@ import type { StateAttrMap } from '../types'; -import type { ScreenShareButtonState } from './screen-share-button-core'; +import type { ScreenShareButtonState } from './core'; export const ScreenShareButtonDataAttrs = { /** Present when the screen is the active capture source. */ diff --git a/packages/core/src/core/ui/screen-share-button/tests/screen-share-button-core.test.ts b/packages/core/src/core/ui/screen-share-button/tests/core.test.ts similarity index 96% rename from packages/core/src/core/ui/screen-share-button/tests/screen-share-button-core.test.ts rename to packages/core/src/core/ui/screen-share-button/tests/core.test.ts index 98d552d969..3b7a23c49c 100644 --- a/packages/core/src/core/ui/screen-share-button/tests/screen-share-button-core.test.ts +++ b/packages/core/src/core/ui/screen-share-button/tests/core.test.ts @@ -1,8 +1,8 @@ import type { MediaCaptureSourceState } from '@videojs/media'; import { describe, expect, it, vi } from 'vite-plus/test'; -import type { ScreenShareButtonState } from '../screen-share-button-core'; -import { ScreenShareButtonCore } from '../screen-share-button-core'; +import type { ScreenShareButtonState } from '../core'; +import { ScreenShareButtonCore } from '../core'; function createMediaState(overrides: Partial = {}): MediaCaptureSourceState { return { diff --git a/packages/html/src/define/publisher/ui.ts b/packages/html/src/define/publisher/ui.ts index cb51f469d8..f0f617715b 100644 --- a/packages/html/src/define/publisher/ui.ts +++ b/packages/html/src/define/publisher/ui.ts @@ -6,21 +6,21 @@ import { I18nProviderElement } from '../../i18n/provider-element'; import { VideoPublisherElement } from '../../presets/publisher/player'; import { safeDefine } from '../../registration/safe-define'; import { defineControls, defineErrorDialog, defineMenu, defineTooltip } from '../../registration/ui-compounds'; -import { CameraButtonElement } from '../../ui/camera-button/camera-button-element'; -import { CameraRadioGroupElement } from '../../ui/camera-radio-group/camera-radio-group-element'; -import { CapturePlaceholderElement } from '../../ui/capture-placeholder/capture-placeholder-element'; -import { ConnectionIndicatorElement } from '../../ui/connection-indicator/connection-indicator-element'; +import { CameraButtonElement } from '../../ui/camera-button/element'; +import { CameraRadioGroupElement } from '../../ui/camera-radio-group/element'; +import { CapturePlaceholderElement } from '../../ui/capture-placeholder/element'; +import { ConnectionIndicatorElement } from '../../ui/connection-indicator/element'; import { ContainerElement } from '../../ui/container/element'; -import { EnableDevicesButtonElement } from '../../ui/enable-devices-button/enable-devices-button-element'; +import { EnableDevicesButtonElement } from '../../ui/enable-devices-button/element'; import { FullscreenButtonElement } from '../../ui/fullscreen-button/element'; import { HotkeyElement } from '../../ui/hotkey/element'; -import { MicButtonElement } from '../../ui/mic-button/mic-button-element'; -import { MicRadioGroupElement } from '../../ui/mic-radio-group/mic-radio-group-element'; +import { MicButtonElement } from '../../ui/mic-button/element'; +import { MicRadioGroupElement } from '../../ui/mic-radio-group/element'; import { PopoverElement } from '../../ui/popover/element'; -import { PublishBadgeElement } from '../../ui/publish-badge/publish-badge-element'; -import { PublishButtonElement } from '../../ui/publish-button/publish-button-element'; -import { PublishTimerElement } from '../../ui/publish-timer/publish-timer-element'; -import { ScreenShareButtonElement } from '../../ui/screen-share-button/screen-share-button-element'; +import { PublishBadgeElement } from '../../ui/publish-badge/element'; +import { PublishButtonElement } from '../../ui/publish-button/element'; +import { PublishTimerElement } from '../../ui/publish-timer/element'; +import { ScreenShareButtonElement } from '../../ui/screen-share-button/element'; import { TextElement } from '../../ui/text/element'; // ── Registration (providers / parents first) ──────────────────────────── diff --git a/packages/html/src/define/ui/camera-button.ts b/packages/html/src/define/ui/camera-button.ts index 7bba4e0382..675e25eef1 100644 --- a/packages/html/src/define/ui/camera-button.ts +++ b/packages/html/src/define/ui/camera-button.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { CameraButtonElement } from '../../ui/camera-button/camera-button-element'; +import { CameraButtonElement } from '../../ui/camera-button/element'; safeDefine(CameraButtonElement); diff --git a/packages/html/src/define/ui/camera-radio-group.ts b/packages/html/src/define/ui/camera-radio-group.ts index 56f2e123e6..e05c8cb69b 100644 --- a/packages/html/src/define/ui/camera-radio-group.ts +++ b/packages/html/src/define/ui/camera-radio-group.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { CameraRadioGroupElement } from '../../ui/camera-radio-group/camera-radio-group-element'; +import { CameraRadioGroupElement } from '../../ui/camera-radio-group/element'; safeDefine(CameraRadioGroupElement); diff --git a/packages/html/src/define/ui/capture-placeholder.ts b/packages/html/src/define/ui/capture-placeholder.ts index 69bb67b395..2ec0862bad 100644 --- a/packages/html/src/define/ui/capture-placeholder.ts +++ b/packages/html/src/define/ui/capture-placeholder.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { CapturePlaceholderElement } from '../../ui/capture-placeholder/capture-placeholder-element'; +import { CapturePlaceholderElement } from '../../ui/capture-placeholder/element'; safeDefine(CapturePlaceholderElement); diff --git a/packages/html/src/define/ui/connection-indicator.ts b/packages/html/src/define/ui/connection-indicator.ts index ecdf3e1dc5..74d2bb6b18 100644 --- a/packages/html/src/define/ui/connection-indicator.ts +++ b/packages/html/src/define/ui/connection-indicator.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { ConnectionIndicatorElement } from '../../ui/connection-indicator/connection-indicator-element'; +import { ConnectionIndicatorElement } from '../../ui/connection-indicator/element'; safeDefine(ConnectionIndicatorElement); diff --git a/packages/html/src/define/ui/enable-devices-button.ts b/packages/html/src/define/ui/enable-devices-button.ts index 6586bb865a..9c087d281f 100644 --- a/packages/html/src/define/ui/enable-devices-button.ts +++ b/packages/html/src/define/ui/enable-devices-button.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { EnableDevicesButtonElement } from '../../ui/enable-devices-button/enable-devices-button-element'; +import { EnableDevicesButtonElement } from '../../ui/enable-devices-button/element'; safeDefine(EnableDevicesButtonElement); diff --git a/packages/html/src/define/ui/mic-button.ts b/packages/html/src/define/ui/mic-button.ts index c693ee4ee9..9f850cea5c 100644 --- a/packages/html/src/define/ui/mic-button.ts +++ b/packages/html/src/define/ui/mic-button.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { MicButtonElement } from '../../ui/mic-button/mic-button-element'; +import { MicButtonElement } from '../../ui/mic-button/element'; safeDefine(MicButtonElement); diff --git a/packages/html/src/define/ui/mic-radio-group.ts b/packages/html/src/define/ui/mic-radio-group.ts index 1373df2083..a47773b858 100644 --- a/packages/html/src/define/ui/mic-radio-group.ts +++ b/packages/html/src/define/ui/mic-radio-group.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { MicRadioGroupElement } from '../../ui/mic-radio-group/mic-radio-group-element'; +import { MicRadioGroupElement } from '../../ui/mic-radio-group/element'; safeDefine(MicRadioGroupElement); diff --git a/packages/html/src/define/ui/publish-badge.ts b/packages/html/src/define/ui/publish-badge.ts index 5c6d165de1..cf3f74ee63 100644 --- a/packages/html/src/define/ui/publish-badge.ts +++ b/packages/html/src/define/ui/publish-badge.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { PublishBadgeElement } from '../../ui/publish-badge/publish-badge-element'; +import { PublishBadgeElement } from '../../ui/publish-badge/element'; safeDefine(PublishBadgeElement); diff --git a/packages/html/src/define/ui/publish-button.ts b/packages/html/src/define/ui/publish-button.ts index 0740c3a723..4906b91b44 100644 --- a/packages/html/src/define/ui/publish-button.ts +++ b/packages/html/src/define/ui/publish-button.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { PublishButtonElement } from '../../ui/publish-button/publish-button-element'; +import { PublishButtonElement } from '../../ui/publish-button/element'; safeDefine(PublishButtonElement); diff --git a/packages/html/src/define/ui/publish-timer.ts b/packages/html/src/define/ui/publish-timer.ts index ad112564cc..8cb2da19a6 100644 --- a/packages/html/src/define/ui/publish-timer.ts +++ b/packages/html/src/define/ui/publish-timer.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { PublishTimerElement } from '../../ui/publish-timer/publish-timer-element'; +import { PublishTimerElement } from '../../ui/publish-timer/element'; safeDefine(PublishTimerElement); diff --git a/packages/html/src/define/ui/screen-share-button.ts b/packages/html/src/define/ui/screen-share-button.ts index 9cd07f682a..d2ce3df60c 100644 --- a/packages/html/src/define/ui/screen-share-button.ts +++ b/packages/html/src/define/ui/screen-share-button.ts @@ -1,5 +1,5 @@ import { safeDefine } from '../../registration/safe-define'; -import { ScreenShareButtonElement } from '../../ui/screen-share-button/screen-share-button-element'; +import { ScreenShareButtonElement } from '../../ui/screen-share-button/element'; safeDefine(ScreenShareButtonElement); diff --git a/packages/html/src/index.ts b/packages/html/src/index.ts index 8778fbe89e..2e9b25859a 100644 --- a/packages/html/src/index.ts +++ b/packages/html/src/index.ts @@ -81,13 +81,13 @@ export { AlertDialogElement } from './ui/alert-dialog/element'; // UI Components export { AudioTrackRadioGroupElement } from './ui/audio-track-radio-group/element'; export { BufferingIndicatorElement } from './ui/buffering-indicator/element'; -export { CameraButtonElement } from './ui/camera-button/camera-button-element'; -export { CameraRadioGroupElement } from './ui/camera-radio-group/camera-radio-group-element'; +export { CameraButtonElement } from './ui/camera-button/element'; +export { CameraRadioGroupElement } from './ui/camera-radio-group/element'; export { CaptionsButtonElement } from './ui/captions-button/element'; export { CaptionsRadioGroupElement } from './ui/captions-radio-group/element'; -export { CapturePlaceholderElement } from './ui/capture-placeholder/capture-placeholder-element'; +export { CapturePlaceholderElement } from './ui/capture-placeholder/element'; export { CastButtonElement } from './ui/cast-button/element'; -export { ConnectionIndicatorElement } from './ui/connection-indicator/connection-indicator-element'; +export { ConnectionIndicatorElement } from './ui/connection-indicator/element'; export { ContainerElement } from './ui/container/element'; export { ContextPartElement, type PartContextValue } from './ui/context-part-element'; export { ControlsBackdropElement } from './ui/controls/backdrop'; @@ -101,7 +101,7 @@ export { DialogDescriptionElement } from './ui/dialog/description'; export { DialogElement } from './ui/dialog/element'; export { DialogPopupElement } from './ui/dialog/popup'; export { DialogTitleElement } from './ui/dialog/title'; -export { EnableDevicesButtonElement } from './ui/enable-devices-button/enable-devices-button-element'; +export { EnableDevicesButtonElement } from './ui/enable-devices-button/element'; export { ErrorDialogElement } from './ui/error-dialog/element'; export { FullscreenButtonElement } from './ui/fullscreen-button/element'; export { GestureElement } from './ui/gesture/element'; @@ -128,8 +128,8 @@ export { MenuItemIndicatorElement } from './ui/menu/item-indicator'; export { MenuRadioGroupElement } from './ui/menu/radio-group'; export { MenuRadioItemElement } from './ui/menu/radio-item'; export { MenuSeparatorElement } from './ui/menu/separator'; -export { MicButtonElement } from './ui/mic-button/mic-button-element'; -export { MicRadioGroupElement } from './ui/mic-radio-group/mic-radio-group-element'; +export { MicButtonElement } from './ui/mic-button/element'; +export { MicRadioGroupElement } from './ui/mic-radio-group/element'; export { MuteButtonElement } from './ui/mute-button/element'; export { PiPButtonElement } from './ui/pip-button/element'; export { PlayButtonElement } from './ui/play-button/element'; @@ -137,11 +137,11 @@ export { PlaybackRateButtonElement } from './ui/playback-rate-button/element'; export { PlaybackRateRadioGroupElement } from './ui/playback-rate-radio-group/element'; export { PopoverElement } from './ui/popover/element'; export { PosterElement } from './ui/poster/element'; -export { PublishBadgeElement } from './ui/publish-badge/publish-badge-element'; -export { PublishButtonElement } from './ui/publish-button/publish-button-element'; -export { PublishTimerElement } from './ui/publish-timer/publish-timer-element'; +export { PublishBadgeElement } from './ui/publish-badge/element'; +export { PublishButtonElement } from './ui/publish-button/element'; +export { PublishTimerElement } from './ui/publish-timer/element'; export { QualityRadioGroupElement } from './ui/quality-radio-group/element'; -export { ScreenShareButtonElement } from './ui/screen-share-button/screen-share-button-element'; +export { ScreenShareButtonElement } from './ui/screen-share-button/element'; export { SeekButtonElement } from './ui/seek-button/element'; export { SeekIndicatorElement } from './ui/seek-indicator/element'; export { SeekIndicatorValueElement } from './ui/seek-indicator/value'; diff --git a/packages/html/src/ui/camera-button/camera-button-element.ts b/packages/html/src/ui/camera-button/element.ts similarity index 100% rename from packages/html/src/ui/camera-button/camera-button-element.ts rename to packages/html/src/ui/camera-button/element.ts diff --git a/packages/html/src/ui/camera-button/tests/camera-button-element.test.ts b/packages/html/src/ui/camera-button/tests/element.test.ts similarity index 98% rename from packages/html/src/ui/camera-button/tests/camera-button-element.test.ts rename to packages/html/src/ui/camera-button/tests/element.test.ts index 3e05be562a..b2f655fff9 100644 --- a/packages/html/src/ui/camera-button/tests/camera-button-element.test.ts +++ b/packages/html/src/ui/camera-button/tests/element.test.ts @@ -6,7 +6,7 @@ import { afterEach, describe, expect, it, vi } from 'vite-plus/test'; import { playerContext } from '../../../player/context'; import { UIElement } from '../../ui-element'; -import { CameraButtonElement } from '../camera-button-element'; +import { CameraButtonElement } from '../element'; let tagCounter = 0; diff --git a/packages/html/src/ui/camera-radio-group/camera-radio-group-element.ts b/packages/html/src/ui/camera-radio-group/element.ts similarity index 100% rename from packages/html/src/ui/camera-radio-group/camera-radio-group-element.ts rename to packages/html/src/ui/camera-radio-group/element.ts diff --git a/packages/html/src/ui/camera-radio-group/tests/camera-radio-group-element.test.ts b/packages/html/src/ui/camera-radio-group/tests/element.test.ts similarity index 98% rename from packages/html/src/ui/camera-radio-group/tests/camera-radio-group-element.test.ts rename to packages/html/src/ui/camera-radio-group/tests/element.test.ts index d3c2c822c0..94080a56fc 100644 --- a/packages/html/src/ui/camera-radio-group/tests/camera-radio-group-element.test.ts +++ b/packages/html/src/ui/camera-radio-group/tests/element.test.ts @@ -10,7 +10,7 @@ import { MenuItemIndicatorElement } from '../../menu/item-indicator'; import { MenuRadioGroupElement } from '../../menu/radio-group'; import { MenuRadioItemElement } from '../../menu/radio-item'; import { UIElement } from '../../ui-element'; -import { CameraRadioGroupElement } from '../camera-radio-group-element'; +import { CameraRadioGroupElement } from '../element'; let tagCounter = 0; diff --git a/packages/html/src/ui/capture-placeholder/capture-placeholder-element.ts b/packages/html/src/ui/capture-placeholder/element.ts similarity index 100% rename from packages/html/src/ui/capture-placeholder/capture-placeholder-element.ts rename to packages/html/src/ui/capture-placeholder/element.ts diff --git a/packages/html/src/ui/capture-placeholder/tests/capture-placeholder-element.test.ts b/packages/html/src/ui/capture-placeholder/tests/element.test.ts similarity index 98% rename from packages/html/src/ui/capture-placeholder/tests/capture-placeholder-element.test.ts rename to packages/html/src/ui/capture-placeholder/tests/element.test.ts index 3ae8cb64e4..1ff4dd48e6 100644 --- a/packages/html/src/ui/capture-placeholder/tests/capture-placeholder-element.test.ts +++ b/packages/html/src/ui/capture-placeholder/tests/element.test.ts @@ -6,7 +6,7 @@ import { afterEach, describe, expect, it, vi } from 'vite-plus/test'; import { playerContext } from '../../../player/context'; import { UIElement } from '../../ui-element'; -import { CapturePlaceholderElement } from '../capture-placeholder-element'; +import { CapturePlaceholderElement } from '../element'; let tagCounter = 0; diff --git a/packages/html/src/ui/connection-indicator/connection-indicator-element.ts b/packages/html/src/ui/connection-indicator/element.ts similarity index 100% rename from packages/html/src/ui/connection-indicator/connection-indicator-element.ts rename to packages/html/src/ui/connection-indicator/element.ts diff --git a/packages/html/src/ui/connection-indicator/tests/connection-indicator-element.test.ts b/packages/html/src/ui/connection-indicator/tests/element.test.ts similarity index 97% rename from packages/html/src/ui/connection-indicator/tests/connection-indicator-element.test.ts rename to packages/html/src/ui/connection-indicator/tests/element.test.ts index ff7aed79b2..8490833396 100644 --- a/packages/html/src/ui/connection-indicator/tests/connection-indicator-element.test.ts +++ b/packages/html/src/ui/connection-indicator/tests/element.test.ts @@ -6,7 +6,7 @@ import { afterEach, describe, expect, it, vi } from 'vite-plus/test'; import { playerContext } from '../../../player/context'; import { UIElement } from '../../ui-element'; -import { ConnectionIndicatorElement } from '../connection-indicator-element'; +import { ConnectionIndicatorElement } from '../element'; let tagCounter = 0; diff --git a/packages/html/src/ui/enable-devices-button/enable-devices-button-element.ts b/packages/html/src/ui/enable-devices-button/element.ts similarity index 100% rename from packages/html/src/ui/enable-devices-button/enable-devices-button-element.ts rename to packages/html/src/ui/enable-devices-button/element.ts diff --git a/packages/html/src/ui/mic-button/mic-button-element.ts b/packages/html/src/ui/mic-button/element.ts similarity index 100% rename from packages/html/src/ui/mic-button/mic-button-element.ts rename to packages/html/src/ui/mic-button/element.ts diff --git a/packages/html/src/ui/mic-radio-group/mic-radio-group-element.ts b/packages/html/src/ui/mic-radio-group/element.ts similarity index 100% rename from packages/html/src/ui/mic-radio-group/mic-radio-group-element.ts rename to packages/html/src/ui/mic-radio-group/element.ts diff --git a/packages/html/src/ui/publish-badge/publish-badge-element.ts b/packages/html/src/ui/publish-badge/element.ts similarity index 100% rename from packages/html/src/ui/publish-badge/publish-badge-element.ts rename to packages/html/src/ui/publish-badge/element.ts diff --git a/packages/html/src/ui/publish-button/publish-button-element.ts b/packages/html/src/ui/publish-button/element.ts similarity index 100% rename from packages/html/src/ui/publish-button/publish-button-element.ts rename to packages/html/src/ui/publish-button/element.ts diff --git a/packages/html/src/ui/publish-button/tests/publish-button-element.test.ts b/packages/html/src/ui/publish-button/tests/element.test.ts similarity index 98% rename from packages/html/src/ui/publish-button/tests/publish-button-element.test.ts rename to packages/html/src/ui/publish-button/tests/element.test.ts index 84af818c59..fab6b8204b 100644 --- a/packages/html/src/ui/publish-button/tests/publish-button-element.test.ts +++ b/packages/html/src/ui/publish-button/tests/element.test.ts @@ -6,7 +6,7 @@ import { afterEach, describe, expect, it, vi } from 'vite-plus/test'; import { playerContext } from '../../../player/context'; import { UIElement } from '../../ui-element'; -import { PublishButtonElement } from '../publish-button-element'; +import { PublishButtonElement } from '../element'; let tagCounter = 0; diff --git a/packages/html/src/ui/publish-timer/publish-timer-element.ts b/packages/html/src/ui/publish-timer/element.ts similarity index 100% rename from packages/html/src/ui/publish-timer/publish-timer-element.ts rename to packages/html/src/ui/publish-timer/element.ts diff --git a/packages/html/src/ui/publish-timer/tests/publish-timer-element.test.ts b/packages/html/src/ui/publish-timer/tests/element.test.ts similarity index 98% rename from packages/html/src/ui/publish-timer/tests/publish-timer-element.test.ts rename to packages/html/src/ui/publish-timer/tests/element.test.ts index a1f8892e0f..a2c9d705fe 100644 --- a/packages/html/src/ui/publish-timer/tests/publish-timer-element.test.ts +++ b/packages/html/src/ui/publish-timer/tests/element.test.ts @@ -6,7 +6,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vite-plus/test' import { playerContext } from '../../../player/context'; import { UIElement } from '../../ui-element'; -import { PublishTimerElement } from '../publish-timer-element'; +import { PublishTimerElement } from '../element'; let tagCounter = 0; diff --git a/packages/html/src/ui/screen-share-button/screen-share-button-element.ts b/packages/html/src/ui/screen-share-button/element.ts similarity index 100% rename from packages/html/src/ui/screen-share-button/screen-share-button-element.ts rename to packages/html/src/ui/screen-share-button/element.ts diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts index 218c5e5042..f71571c9f6 100644 --- a/packages/react/src/index.ts +++ b/packages/react/src/index.ts @@ -84,7 +84,7 @@ export { } from './ui/audio-track'; export { AudioTrackRadioGroupLegacy as AudioTrackRadioGroup } from './ui/audio-track-radio-group'; export { BufferingIndicator, type BufferingIndicatorProps } from './ui/buffering-indicator/component'; -export { CameraButton, type CameraButtonProps } from './ui/camera-button/camera-button'; +export { CameraButton, type CameraButtonProps } from './ui/camera-button/component'; export { type CameraOption, type CameraOptionsProps, @@ -99,15 +99,15 @@ export { type CaptionsOptionsResult, useCaptionsOptions, } from './ui/captions-radio-group'; -export { CapturePlaceholder, type CapturePlaceholderProps } from './ui/capture-placeholder/capture-placeholder'; +export { CapturePlaceholder, type CapturePlaceholderProps } from './ui/capture-placeholder/component'; export { CastButton, type CastButtonProps } from './ui/cast-button/component'; -export { ConnectionIndicator, type ConnectionIndicatorProps } from './ui/connection-indicator/connection-indicator'; +export { ConnectionIndicator, type ConnectionIndicatorProps } from './ui/connection-indicator/component'; export { Controls } from './ui/controls'; export type { ControlsContentProps } from './ui/controls/content'; export type { ControlsGroupProps } from './ui/controls/group'; export type { ControlsRootProps } from './ui/controls/root'; export { Dialog, type DialogContextValue, useDialogContext } from './ui/dialog'; -export { EnableDevicesButton, type EnableDevicesButtonProps } from './ui/enable-devices-button/enable-devices-button'; +export { EnableDevicesButton, type EnableDevicesButtonProps } from './ui/enable-devices-button/component'; export { ErrorDialog, type ErrorDialogContextValue, useErrorDialogContext } from './ui/error-dialog'; export { FullscreenButton, type FullscreenButtonProps } from './ui/fullscreen-button/component'; export { Gesture, type GestureProps, MediaGesture, type MediaGestureProps } from './ui/gesture/component'; @@ -120,7 +120,7 @@ export { type UseHotkeyOptions, useHotkey } from './ui/hotkey/use-hotkey'; export { useHotkeyShortcut } from './ui/hotkey/use-hotkey-shortcut'; export { LiveButton, type LiveButtonProps } from './ui/live-button/component'; export { Menu, type MenuContextValue, useMenuContext, useOptionalMenuContext } from './ui/menu'; -export { MicButton, type MicButtonProps } from './ui/mic-button/mic-button'; +export { MicButton, type MicButtonProps } from './ui/mic-button/component'; export { type MicrophoneOption, type MicrophoneOptionsProps, @@ -142,9 +142,9 @@ export { Popover, type PopoverContextValue, usePopoverContext } from './ui/popov export { Poster } from './ui/poster'; export type { PosterImageProps } from './ui/poster/image'; export type { PosterRootProps } from './ui/poster/root'; -export { PublishBadge, type PublishBadgeProps } from './ui/publish-badge/publish-badge'; -export { PublishButton, type PublishButtonProps } from './ui/publish-button/publish-button'; -export { PublishTimer, type PublishTimerProps } from './ui/publish-timer/publish-timer'; +export { PublishBadge, type PublishBadgeProps } from './ui/publish-badge/component'; +export { PublishButton, type PublishButtonProps } from './ui/publish-button/component'; +export { PublishTimer, type PublishTimerProps } from './ui/publish-timer/component'; export { type QualityOption, type QualityOptionsProps, @@ -152,7 +152,7 @@ export { useQualityOptions, } from './ui/quality'; export { QualityRadioGroupLegacy as QualityRadioGroup } from './ui/quality-radio-group'; -export { ScreenShareButton, type ScreenShareButtonProps } from './ui/screen-share-button/screen-share-button'; +export { ScreenShareButton, type ScreenShareButtonProps } from './ui/screen-share-button/component'; export { SeekButton, type SeekButtonProps } from './ui/seek-button/component'; export { SeekIndicator } from './ui/seek-indicator'; export type { SeekIndicatorRootProps } from './ui/seek-indicator/root'; diff --git a/packages/react/src/ui/camera-button/camera-button.tsx b/packages/react/src/ui/camera-button/component.tsx similarity index 100% rename from packages/react/src/ui/camera-button/camera-button.tsx rename to packages/react/src/ui/camera-button/component.tsx diff --git a/packages/react/src/ui/camera-button/index.ts b/packages/react/src/ui/camera-button/index.ts index 349bdab78c..8322dafb93 100644 --- a/packages/react/src/ui/camera-button/index.ts +++ b/packages/react/src/ui/camera-button/index.ts @@ -1 +1 @@ -export { CameraButton, type CameraButtonProps } from './camera-button'; +export { CameraButton, type CameraButtonProps } from './component'; diff --git a/packages/react/src/ui/capture-placeholder/capture-placeholder.tsx b/packages/react/src/ui/capture-placeholder/component.tsx similarity index 100% rename from packages/react/src/ui/capture-placeholder/capture-placeholder.tsx rename to packages/react/src/ui/capture-placeholder/component.tsx diff --git a/packages/react/src/ui/capture-placeholder/index.ts b/packages/react/src/ui/capture-placeholder/index.ts index 41f0a6a33a..beef54518c 100644 --- a/packages/react/src/ui/capture-placeholder/index.ts +++ b/packages/react/src/ui/capture-placeholder/index.ts @@ -1 +1 @@ -export { CapturePlaceholder, type CapturePlaceholderProps } from './capture-placeholder'; +export { CapturePlaceholder, type CapturePlaceholderProps } from './component'; diff --git a/packages/react/src/ui/capture-placeholder/tests/capture-placeholder.test.tsx b/packages/react/src/ui/capture-placeholder/tests/component.test.tsx similarity index 98% rename from packages/react/src/ui/capture-placeholder/tests/capture-placeholder.test.tsx rename to packages/react/src/ui/capture-placeholder/tests/component.test.tsx index 2311954414..041fa01b58 100644 --- a/packages/react/src/ui/capture-placeholder/tests/capture-placeholder.test.tsx +++ b/packages/react/src/ui/capture-placeholder/tests/component.test.tsx @@ -3,7 +3,7 @@ import type { MediaCaptureState } from '@videojs/media'; import { afterEach, describe, expect, it, vi } from 'vite-plus/test'; import { createPlayerWrapper } from '../../../testing/mocks'; -import { CapturePlaceholder } from '../capture-placeholder'; +import { CapturePlaceholder } from '../component'; afterEach(() => { cleanup(); diff --git a/packages/react/src/ui/connection-indicator/connection-indicator.tsx b/packages/react/src/ui/connection-indicator/component.tsx similarity index 100% rename from packages/react/src/ui/connection-indicator/connection-indicator.tsx rename to packages/react/src/ui/connection-indicator/component.tsx diff --git a/packages/react/src/ui/connection-indicator/index.ts b/packages/react/src/ui/connection-indicator/index.ts index 70a888ba99..31c08a0971 100644 --- a/packages/react/src/ui/connection-indicator/index.ts +++ b/packages/react/src/ui/connection-indicator/index.ts @@ -1 +1 @@ -export { ConnectionIndicator, type ConnectionIndicatorProps } from './connection-indicator'; +export { ConnectionIndicator, type ConnectionIndicatorProps } from './component'; diff --git a/packages/react/src/ui/connection-indicator/tests/connection-indicator.test.tsx b/packages/react/src/ui/connection-indicator/tests/component.test.tsx similarity index 95% rename from packages/react/src/ui/connection-indicator/tests/connection-indicator.test.tsx rename to packages/react/src/ui/connection-indicator/tests/component.test.tsx index 7a91e480da..a90749aa72 100644 --- a/packages/react/src/ui/connection-indicator/tests/connection-indicator.test.tsx +++ b/packages/react/src/ui/connection-indicator/tests/component.test.tsx @@ -3,7 +3,7 @@ import type { MediaConnectionQuality } from '@videojs/media'; import { afterEach, describe, expect, it } from 'vite-plus/test'; import { createPlayerWrapper } from '../../../testing/mocks'; -import { ConnectionIndicator } from '../connection-indicator'; +import { ConnectionIndicator } from '../component'; afterEach(() => { cleanup(); diff --git a/packages/react/src/ui/enable-devices-button/enable-devices-button.tsx b/packages/react/src/ui/enable-devices-button/component.tsx similarity index 100% rename from packages/react/src/ui/enable-devices-button/enable-devices-button.tsx rename to packages/react/src/ui/enable-devices-button/component.tsx diff --git a/packages/react/src/ui/enable-devices-button/index.ts b/packages/react/src/ui/enable-devices-button/index.ts index 0308150534..05e20bb904 100644 --- a/packages/react/src/ui/enable-devices-button/index.ts +++ b/packages/react/src/ui/enable-devices-button/index.ts @@ -1 +1 @@ -export { EnableDevicesButton, type EnableDevicesButtonProps } from './enable-devices-button'; +export { EnableDevicesButton, type EnableDevicesButtonProps } from './component'; diff --git a/packages/react/src/ui/mic-button/mic-button.tsx b/packages/react/src/ui/mic-button/component.tsx similarity index 100% rename from packages/react/src/ui/mic-button/mic-button.tsx rename to packages/react/src/ui/mic-button/component.tsx diff --git a/packages/react/src/ui/mic-button/index.ts b/packages/react/src/ui/mic-button/index.ts index 1f556ae902..a4476e15c6 100644 --- a/packages/react/src/ui/mic-button/index.ts +++ b/packages/react/src/ui/mic-button/index.ts @@ -1 +1 @@ -export { MicButton, type MicButtonProps } from './mic-button'; +export { MicButton, type MicButtonProps } from './component'; diff --git a/packages/react/src/ui/publish-badge/publish-badge.tsx b/packages/react/src/ui/publish-badge/component.tsx similarity index 100% rename from packages/react/src/ui/publish-badge/publish-badge.tsx rename to packages/react/src/ui/publish-badge/component.tsx diff --git a/packages/react/src/ui/publish-badge/index.ts b/packages/react/src/ui/publish-badge/index.ts index d2c76e39d4..e2aeaeb7e8 100644 --- a/packages/react/src/ui/publish-badge/index.ts +++ b/packages/react/src/ui/publish-badge/index.ts @@ -1 +1 @@ -export { PublishBadge, type PublishBadgeProps } from './publish-badge'; +export { PublishBadge, type PublishBadgeProps } from './component'; diff --git a/packages/react/src/ui/publish-button/publish-button.tsx b/packages/react/src/ui/publish-button/component.tsx similarity index 100% rename from packages/react/src/ui/publish-button/publish-button.tsx rename to packages/react/src/ui/publish-button/component.tsx diff --git a/packages/react/src/ui/publish-button/index.ts b/packages/react/src/ui/publish-button/index.ts index c226068d4b..cdc3ff3b1f 100644 --- a/packages/react/src/ui/publish-button/index.ts +++ b/packages/react/src/ui/publish-button/index.ts @@ -1 +1 @@ -export { PublishButton, type PublishButtonProps } from './publish-button'; +export { PublishButton, type PublishButtonProps } from './component'; diff --git a/packages/react/src/ui/publish-button/tests/publish-button.test.tsx b/packages/react/src/ui/publish-button/tests/component.test.tsx similarity index 98% rename from packages/react/src/ui/publish-button/tests/publish-button.test.tsx rename to packages/react/src/ui/publish-button/tests/component.test.tsx index e21c3b23ed..120a8c42ff 100644 --- a/packages/react/src/ui/publish-button/tests/publish-button.test.tsx +++ b/packages/react/src/ui/publish-button/tests/component.test.tsx @@ -3,7 +3,7 @@ import type { MediaCaptureState, MediaPublishSessionState } from '@videojs/media import { afterEach, describe, expect, it, vi } from 'vite-plus/test'; import { createPlayerWrapper } from '../../../testing/mocks'; -import { PublishButton } from '../publish-button'; +import { PublishButton } from '../component'; afterEach(cleanup); diff --git a/packages/react/src/ui/publish-timer/publish-timer.tsx b/packages/react/src/ui/publish-timer/component.tsx similarity index 100% rename from packages/react/src/ui/publish-timer/publish-timer.tsx rename to packages/react/src/ui/publish-timer/component.tsx diff --git a/packages/react/src/ui/publish-timer/index.ts b/packages/react/src/ui/publish-timer/index.ts index 073f1ddae5..02b3c4302c 100644 --- a/packages/react/src/ui/publish-timer/index.ts +++ b/packages/react/src/ui/publish-timer/index.ts @@ -1 +1 @@ -export { PublishTimer, type PublishTimerProps } from './publish-timer'; +export { PublishTimer, type PublishTimerProps } from './component'; diff --git a/packages/react/src/ui/publish-timer/tests/publish-timer.test.tsx b/packages/react/src/ui/publish-timer/tests/component.test.tsx similarity index 97% rename from packages/react/src/ui/publish-timer/tests/publish-timer.test.tsx rename to packages/react/src/ui/publish-timer/tests/component.test.tsx index 98989879dc..daaca606ab 100644 --- a/packages/react/src/ui/publish-timer/tests/publish-timer.test.tsx +++ b/packages/react/src/ui/publish-timer/tests/component.test.tsx @@ -3,7 +3,7 @@ import type { MediaPublishSessionState } from '@videojs/media'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vite-plus/test'; import { createPlayerWrapper } from '../../../testing/mocks'; -import { PublishTimer } from '../publish-timer'; +import { PublishTimer } from '../component'; beforeEach(() => { vi.useFakeTimers(); diff --git a/packages/react/src/ui/screen-share-button/screen-share-button.tsx b/packages/react/src/ui/screen-share-button/component.tsx similarity index 100% rename from packages/react/src/ui/screen-share-button/screen-share-button.tsx rename to packages/react/src/ui/screen-share-button/component.tsx diff --git a/packages/react/src/ui/screen-share-button/index.ts b/packages/react/src/ui/screen-share-button/index.ts index 0cd0169775..69ce8ffad7 100644 --- a/packages/react/src/ui/screen-share-button/index.ts +++ b/packages/react/src/ui/screen-share-button/index.ts @@ -1 +1 @@ -export { ScreenShareButton, type ScreenShareButtonProps } from './screen-share-button'; +export { ScreenShareButton, type ScreenShareButtonProps } from './component'; From f7f101972b07ee1c74f1acc4d11cde1c3ba87dda Mon Sep 17 00:00:00 2001 From: Matt McClure Date: Thu, 1 Oct 2026 04:31:58 +0000 Subject: [PATCH 2/2] fix(sandbox): keep the React publisher out of the media matrix The sandbox treats every html-/react- template as a media matrix page, so react-moq-publisher failed its media table check. Rename it to moq-publisher-react like the other one-off templates, and point the design record's implementation glob at the renamed core.ts modules. --- .../{react-moq-publisher => moq-publisher-react}/index.html | 0 .../{react-moq-publisher => moq-publisher-react}/main.tsx | 2 +- internal/design/spf/features/publisher-multi-source-capture.md | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename apps/sandbox/templates/{react-moq-publisher => moq-publisher-react}/index.html (100%) rename apps/sandbox/templates/{react-moq-publisher => moq-publisher-react}/main.tsx (98%) diff --git a/apps/sandbox/templates/react-moq-publisher/index.html b/apps/sandbox/templates/moq-publisher-react/index.html similarity index 100% rename from apps/sandbox/templates/react-moq-publisher/index.html rename to apps/sandbox/templates/moq-publisher-react/index.html diff --git a/apps/sandbox/templates/react-moq-publisher/main.tsx b/apps/sandbox/templates/moq-publisher-react/main.tsx similarity index 98% rename from apps/sandbox/templates/react-moq-publisher/main.tsx rename to apps/sandbox/templates/moq-publisher-react/main.tsx index 954c3cedd1..37b38ce78c 100644 --- a/apps/sandbox/templates/react-moq-publisher/main.tsx +++ b/apps/sandbox/templates/moq-publisher-react/main.tsx @@ -1,6 +1,6 @@ import '@app/styles.css'; // React MoQ Publisher sandbox -// http://localhost:5173/react-moq-publisher/ +// http://localhost:5173/moq-publisher-react/ // // Renders the React publisher preset (`PublisherSkin` over `publisherFeatures`). // The default mode reuses the fake publish host from the HTML publisher diff --git a/internal/design/spf/features/publisher-multi-source-capture.md b/internal/design/spf/features/publisher-multi-source-capture.md index eb7ded8fb7..202380d134 100644 --- a/internal/design/spf/features/publisher-multi-source-capture.md +++ b/internal/design/spf/features/publisher-multi-source-capture.md @@ -272,7 +272,7 @@ plus what this record defers beyond the RFC: intent/fact slots, adapter properties (`cameraActive`, `screenShareActive`, `previewSource`, plural state/stream getters). - `packages/core/src/dom/store/features/capture-source.ts`, - `packages/core/src/core/ui/{screen-share-button,capture-placeholder,enable-devices-button}/*-core.ts`. + `packages/core/src/core/ui/{screen-share-button,capture-placeholder,enable-devices-button}/core.ts`. ## See also