Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Rename new default theme #771

Merged
merged 9 commits into from
Oct 2, 2023
Merged

feat: Rename new default theme #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fd848d9
updated parts
AdamJaggard Sep 7, 2023
0959ed4
Merge remote-tracking branch 'upstream/main'
AdamJaggard Sep 14, 2023
c663dc7
Merge remote-tracking branch 'upstream/main'
AdamJaggard Sep 19, 2023
592d15b
Merge remote-tracking branch 'upstream/main'
AdamJaggard Sep 20, 2023
6325212
Merge remote-tracking branch 'upstream/main'
AdamJaggard Sep 22, 2023
e7a1b60
2023 -> Gerwig
AdamJaggard Sep 15, 2023
d60e8ba
classic -> daniel
AdamJaggard Sep 15, 2023
0881ee4
Revert "classic -> daniel"
AdamJaggard Sep 22, 2023
d830b19
Merge branch 'main' into feat/theme-renaming
AdamJaggard Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/nextjs-with-typescript/pages/MuxPlayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Script from 'next/script';
import MuxPlayer, { MuxPlayerProps } from "@mux/mux-player-react";
import "@mux/mux-player/themes/minimal";
import "@mux/mux-player/themes/microvideo";
import "@mux/mux-player/themes/2023";
import "@mux/mux-player/themes/gerwig";
import { useEffect, useReducer, useRef, useState } from "react";
import mediaAssetsJSON from "@mux/assets/media-assets.json";
import { useRouter } from "next/router";
Expand Down Expand Up @@ -472,7 +472,7 @@ function MuxPlayerPage({ location }: Props) {
value={state.theme}
name="theme"
onChange={genericOnChange}
values={['classic', 'microvideo', 'minimal', '2023']}
values={['classic', 'microvideo', 'minimal', 'gerwig']}
/>
<TextRenderer
value={state.envKey}
Expand Down
2 changes: 1 addition & 1 deletion examples/vanilla-ts-esm/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h1><a href="/">Elements</a></h1>
<li><a href="./mux-player-poster-slot.html" class="player">&lt;mux-player&gt; (poster slot)</a></li>
<li><a href="./mux-player-audio-tracks.html" class="player">&lt;mux-player&gt; (audio tracks)</a></li>
<li><a href="./mux-player-theme.html" class="player">&lt;mux-player&gt; (microvideo theme)</a></li>
<li><a href="./mux-player-theme-2023.html" class="player">&lt;mux-player&gt; (2023 theme)</a></li>
<li><a href="./mux-player-theme-gerwig.html" class="player">&lt;mux-player&gt; (Gerwig theme)</a></li>
<li><a href="./mux-uploader-simple.html" class="uploader">&lt;mux-uploader&gt;</a></li>
<li><a href="./mux-uploader-full.html" class="uploader">&lt;mux-uploader&gt; (full-page)</a></li>
</ul>
Expand Down
8 changes: 4 additions & 4 deletions ...-ts-esm/public/mux-player-theme-2023.html → ...s-esm/public/mux-player-theme-gerwig.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<html>
<head>
<meta name="viewport" content="width=device-width" />
<title>&lt;mux-player&gt; theme 2023</title>
<title>&lt;mux-player&gt; theme Gerwig</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css">
<link rel="stylesheet" href="./styles.css">
<script
defer
src="https://www.gstatic.com/cv/js/sender/v1/cast_sender.js?loadCastFramework=1"
></script>
<script type="module" src="./dist/mux-player-2023-theme.js"></script>
<script type="module" src="./dist/mux-player-gerwig-theme.js"></script>
<script type="module" src="./dist/mux-player.js"></script>
<style>
mux-player {
Expand Down Expand Up @@ -45,13 +45,13 @@ <h1><a href="/">Elements</a></h1>
</header>

<mux-player
theme="2023"
theme="gerwig"
stream-type="on-demand"
playback-id="VcmKA6aqzIzlg3MayLJDnbF55kX00mds028Z65QxvBYaA"
></mux-player>

<mux-player
theme="2023"
theme="gerwig"
stream-type="live:dvr"
playback-id="v69RSHhFelSm4701snP22dYz2jICy4E4FUyk02rW4gxRM"
title="My amazing video"
Expand Down
1 change: 0 additions & 1 deletion examples/vanilla-ts-esm/src/mux-player-2023-theme.ts
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions examples/vanilla-ts-esm/src/mux-player-gerwig-theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * as ThemeGerwig from "@mux/mux-player/themes/gerwig";
3 changes: 0 additions & 3 deletions packages/mux-player-react/src/themes/2023.ts
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions packages/mux-player-react/src/themes/gerwig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// @ts-ignore
import '@mux/mux-player/themes/gerwig';
export default 'gerwig';
10 changes: 5 additions & 5 deletions packages/mux-player/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
"browser": "./dist/themes/classic/index.mjs",
"default": "./dist/themes/classic/index.cjs.js"
},
"./themes/2023": {
"import": "./dist/themes/2023/index.mjs",
"require": "./dist/themes/2023/index.cjs.js",
"browser": "./dist/themes/2023/index.mjs",
"default": "./dist/themes/2023/index.cjs.js"
"./themes/gerwig": {
"import": "./dist/themes/gerwig/index.mjs",
"require": "./dist/themes/gerwig/index.cjs.js",
"browser": "./dist/themes/gerwig/index.mjs",
"default": "./dist/themes/gerwig/index.cjs.js"
}
},
"types": "./dist/types/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/mux-player/scripts/build-themes.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node
import { build } from 'esbuild';

const themes = ['classic', 'microvideo', 'minimal', '2023'];
const themes = ['classic', 'microvideo', 'minimal', 'gerwig'];
const devMode = process.argv.includes('--dev');

const shared = {
Expand Down
2 changes: 1 addition & 1 deletion ...ages/mux-player/src/themes/2023/2023.html → .../mux-player/src/themes/gerwig/gerwig.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<template id="media-theme-2023">
<template id="media-theme-gerwig">
<style>
@keyframes pre-play-hide {
0% {
Expand Down
10 changes: 5 additions & 5 deletions packages/mux-player/src/themes/2023/index.ts → ...ges/mux-player/src/themes/gerwig/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// @ts-ignore
import theme from './2023.html';
import theme from './gerwig.html';
import { document, globalThis } from '../../polyfills';
import { MediaThemeElement } from 'media-chrome/dist/media-theme-element.js';

const template = document.createElement('template');
if ('innerHTML' in template) template.innerHTML = theme;

class MediaTheme2023 extends MediaThemeElement {
class MediaThemeGerwig extends MediaThemeElement {
static template = template.content?.children?.[0];
}

if (!globalThis.customElements.get('media-theme-2023')) {
globalThis.customElements.define('media-theme-2023', MediaTheme2023);
if (!globalThis.customElements.get('media-theme-gerwig')) {
globalThis.customElements.define('media-theme-gerwig', MediaThemeGerwig);
}

export default MediaTheme2023;
export default MediaThemeGerwig;
Loading