Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ dist
# ignore polyfills copy
packages/*/src/polyfills

# Vendored mux-embed types — regenerated on install via root prepare hook
packages/playback-core/src/vendor/mux-embed.ts

.turbo
examples/astro/.vercel/

Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ examples
*.sublime-*
*.vscode*
*.md
packages/playback-core/src/vendor
7 changes: 3 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"build:packages": "turbo run build --filter '!./examples/*'",
"build": "turbo run build",
"i18n": "turbo run i18n",
"prepare": "husky"
"prepare": "husky && npm run vendor:types -w @mux/playback-core"
},
"packageManager": "npm@11.2.0"
}
2 changes: 1 addition & 1 deletion packages/mux-video/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@
"dependencies": {
"@mux/mux-data-google-ima": "^0.3.4",
"@mux/playback-core": "0.35.0",
"@types/google_interactive_media_ads_types": "^3.697.0",
"castable-video": "~1.1.13",
"custom-media-element": "~1.4.6",
"media-tracks": "~0.3.5"
},
"devDependencies": {
"@open-wc/testing": "^4.0.0",
"@types/google_interactive_media_ads_types": "^3.697.0",
"@typescript-eslint/eslint-plugin": "^8.27.0",
"@typescript-eslint/parser": "^8.27.0",
"@web/dev-server-esbuild": "^1.0.4",
Expand Down
1 change: 0 additions & 1 deletion packages/mux-video/src/ads/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* eslint @typescript-eslint/triple-slash-reference: "off" */
/// <reference types="google_interactive_media_ads_types" preserve="true"/>
/// <reference path="../../../../node_modules/mux-embed/dist/types/mux-embed.d.ts" preserve="true" />

/** @TODO publish types for package to use here (CJP) */
// @ts-ignore
Expand Down
1 change: 1 addition & 0 deletions packages/playback-core/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/vendor
3 changes: 2 additions & 1 deletion packages/playback-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
"build:esm-module": "esbuilder src/index.ts --sourcemap --format=esm --outfile=./dist/playback-core.mjs",
"build:cjs": "esbuilder src/index.ts --sourcemap --format=cjs --out-extension:.js=.cjs.js --external:mux-embed --external:hls.js",
"build:iife": "esbuilder src/index.ts --sourcemap --format=iife --outfile=./dist/playback-core.js",
"prebuild:types": "shx mkdir -p ./dist/types",
"vendor:types": "node ./scripts/vendor-mux-embed-types.mjs",
"prebuild:types": "npm run vendor:types && shx mkdir -p ./dist/types",
"build:types": "tsc",
"postbuild:types": "downlevel-dts ./dist/types ./dist/types-ts3.4 --to=3.4",
"build": "npm-run-all --parallel 'build:esm -- --minify' 'build:iife -- --minify' 'build:cjs -- --minify' 'build:esm-module -- --minify'"
Expand Down
38 changes: 38 additions & 0 deletions packages/playback-core/scripts/vendor-mux-embed-types.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { createRequire } from 'node:module';
import { existsSync } from 'node:fs';
import { mkdir, readFile, writeFile } from 'node:fs/promises';
import { dirname, join, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';

const require = createRequire(import.meta.url);
const __dirname = dirname(fileURLToPath(import.meta.url));

// Resolve the mux-embed package root by walking up from its main entry
// (require.resolve respects exports, so we can't use a subpath directly)
const muxEmbedMain = require.resolve('mux-embed');
let pkgRoot = dirname(muxEmbedMain);
while (!existsSync(join(pkgRoot, 'package.json'))) {
const parent = dirname(pkgRoot);
if (parent === pkgRoot) {
throw new Error(`Could not find mux-embed package.json starting from ${muxEmbedMain}`);
}
pkgRoot = parent;
}

const pkg = JSON.parse(await readFile(join(pkgRoot, 'package.json'), 'utf8'));
if (pkg.name !== 'mux-embed') {
throw new Error(`Found package.json at ${pkgRoot}, but it is "${pkg.name}", not mux-embed`);
}
Comment thread
cursor[bot] marked this conversation as resolved.

const SOURCE = join(pkgRoot, 'dist/types/mux-embed.d.ts');
const DEST = resolve(__dirname, '../src/vendor/mux-embed.ts');
const HEADER = `// AUTO-GENERATED — do not edit.
// Source: mux-embed@${pkg.version} / dist/types/mux-embed.d.ts
// Run \`npm run vendor:types\` to refresh.

`;

const content = await readFile(SOURCE, 'utf8');
await mkdir(dirname(DEST), { recursive: true });
await writeFile(DEST, HEADER + content);
console.log(`Vendored mux-embed@${pkg.version} types -> ${DEST}`);
2 changes: 1 addition & 1 deletion packages/playback-core/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint @typescript-eslint/triple-slash-reference: "off" */
/// <reference path="../../../node_modules/mux-embed/dist/types/mux-embed.d.ts" preserve="true" />
/// <reference path="./vendor/mux-embed.ts" preserve="true" />
import type { Options, Mux } from 'mux-embed';
import type { MediaError } from './errors';
import type { HlsConfig } from 'hls.js';
Expand Down
Loading