Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Patch video.js types to unbreak the build

Chocobozzzf93870ea3120
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4791d44e45..d76e72cfb3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,6 +8,11 @@ overrides:
'@types/express': 4.17.9
'@types/express-serve-static-core': 4.19.5
+patchedDependencies:
+ video.js:
+ hash: 66459642658d85da52b45ff0472242e9daade1ff3dd765974103db72a7c55377
+ path: pnpm-patches/video.js.patch
+
importers:
.:
@@ -474,7 +479,7 @@ importers:
version: 9.32.0
eslint-config-love:
specifier: ^119.0.0
fast-xml-parser:
specifier: ^5.2.2
version: 5.2.5
@@ -589,7 +594,7 @@ importers:
version: 9.34.0
eslint-config-love:
specifier: ^119.0.0
devDependencies:
'@angular/animations':
specifier: ^19.1.4
@@ -821,7 +826,7 @@ importers:
version: 2.0.4([email protected])
video.js:
specifier: ^8.23.4
- version: 8.23.4
+ version: 8.23.4(patch_hash=66459642658d85da52b45ff0472242e9daade1ff3dd765974103db72a7c55377)
vite:
specifier: ^6.0.11
@@ -14885,10 +14890,10 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
'@eslint-community/regexpp': 4.12.1
- '@typescript-eslint/parser': 8.38.0([email protected])([email protected])
+ '@typescript-eslint/parser': 8.38.0([email protected])([email protected])
'@typescript-eslint/scope-manager': 8.38.0
'@typescript-eslint/type-utils': 8.38.0([email protected])([email protected])
'@typescript-eslint/utils': 8.38.0([email protected])([email protected])
@@ -15099,7 +15104,7 @@ snapshots:
bytes: 3.1.2
multiparty: 4.2.3
+ '@videojs/[email protected]([email protected](patch_hash=66459642658d85da52b45ff0472242e9daade1ff3dd765974103db72a7c55377))':
dependencies:
'@babel/runtime': 7.28.3
'@videojs/vhs-utils': 4.1.1
@@ -15108,7 +15113,7 @@ snapshots:
m3u8-parser: 7.2.0
mpd-parser: 1.3.1
mux.js: 7.1.0
- video.js: 8.23.4
+ video.js: 8.23.4(patch_hash=66459642658d85da52b45ff0472242e9daade1ff3dd765974103db72a7c55377)
'@videojs/[email protected]':
dependencies:
@@ -17467,28 +17472,12 @@ snapshots:
eslint: 9.34.0
semver: 7.7.2
- dependencies:
- '@typescript-eslint/utils': 8.38.0([email protected])([email protected])
- eslint: 9.34.0
- eslint-plugin-eslint-comments: 3.2.0([email protected])
- eslint-plugin-import: 2.32.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
- eslint-plugin-n: 17.21.3([email protected])([email protected])
- eslint-plugin-promise: 7.2.1([email protected])
- typescript: 5.7.3
- typescript-eslint: 8.38.0([email protected])([email protected])
- transitivePeerDependencies:
- - '@typescript-eslint/parser'
- - eslint-import-resolver-typescript
- - eslint-import-resolver-webpack
- - supports-color
-
dependencies:
'@typescript-eslint/utils': 8.38.0([email protected])([email protected])
eslint: 9.32.0
eslint-plugin-eslint-comments: 3.2.0([email protected])
- eslint-plugin-import: 2.32.0([email protected])
+ eslint-plugin-import: 2.32.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
eslint-plugin-n: 17.21.3([email protected])([email protected])
eslint-plugin-promise: 7.2.1([email protected])
typescript: 5.8.3
@@ -17499,6 +17488,22 @@ snapshots:
- eslint-import-resolver-webpack
- supports-color
+ dependencies:
+ '@typescript-eslint/utils': 8.38.0([email protected])([email protected])
+ eslint: 9.34.0
+ eslint-plugin-eslint-comments: 3.2.0([email protected])
+ eslint-plugin-import: 2.32.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])
+ eslint-plugin-n: 17.21.3([email protected])([email protected])
+ eslint-plugin-promise: 7.2.1([email protected])
+ typescript: 5.7.3
+ typescript-eslint: 8.38.0([email protected])([email protected])
+ transitivePeerDependencies:
+ - '@typescript-eslint/parser'
+ - eslint-import-resolver-typescript
+ - eslint-import-resolver-webpack
+ - supports-color
+
dependencies:
debug: 3.2.7
@@ -17507,21 +17512,22 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
debug: 3.2.7
optionalDependencies:
- '@typescript-eslint/parser': 8.38.0([email protected])([email protected])
- eslint: 9.34.0
+ '@typescript-eslint/parser': 8.38.0([email protected])([email protected])
+ eslint: 9.32.0
eslint-import-resolver-node: 0.3.9
transitivePeerDependencies:
- supports-color
dependencies:
debug: 3.2.7
optionalDependencies:
- eslint: 9.32.0
+ '@typescript-eslint/parser': 8.38.0([email protected])([email protected])
+ eslint: 9.34.0
eslint-import-resolver-node: 0.3.9
transitivePeerDependencies:
- supports-color
@@ -17552,7 +17558,7 @@ snapshots:
eslint: 9.34.0
ignore: 5.3.2
dependencies:
'@rtsao/scc': 1.1.0
array-includes: 3.1.9
@@ -17561,9 +17567,9 @@ snapshots:
array.prototype.flatmap: 1.3.3
debug: 3.2.7
doctrine: 2.1.0
- eslint: 9.34.0
+ eslint: 9.32.0
eslint-import-resolver-node: 0.3.9
hasown: 2.0.2
is-core-module: 2.16.1
is-glob: 4.0.3
@@ -17575,13 +17581,13 @@ snapshots:
string.prototype.trimend: 1.0.9
tsconfig-paths: 3.15.0
optionalDependencies:
- '@typescript-eslint/parser': 8.38.0([email protected])([email protected])
+ '@typescript-eslint/parser': 8.38.0([email protected])([email protected])
transitivePeerDependencies:
- eslint-import-resolver-typescript
- eslint-import-resolver-webpack
- supports-color
dependencies:
'@rtsao/scc': 1.1.0
array-includes: 3.1.9
@@ -17590,9 +17596,9 @@ snapshots:
array.prototype.flatmap: 1.3.3
debug: 3.2.7
doctrine: 2.1.0
- eslint: 9.32.0
+ eslint: 9.34.0
eslint-import-resolver-node: 0.3.9
- eslint-module-utils: 2.12.1([email protected])([email protected])
hasown: 2.0.2
is-core-module: 2.16.1
is-glob: 4.0.3
@@ -17603,6 +17609,8 @@ snapshots:
semver: 6.3.1
string.prototype.trimend: 1.0.9
tsconfig-paths: 3.15.0
+ optionalDependencies:
+ '@typescript-eslint/parser': 8.38.0([email protected])([email protected])
transitivePeerDependencies:
- eslint-import-resolver-typescript
- eslint-import-resolver-webpack
@@ -22738,7 +22746,7 @@ snapshots:
dependencies:
- '@typescript-eslint/eslint-plugin': 8.38.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
+ '@typescript-eslint/eslint-plugin': 8.38.0(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
'@typescript-eslint/parser': 8.38.0([email protected])([email protected])
'@typescript-eslint/typescript-estree': 8.38.0([email protected])
'@typescript-eslint/utils': 8.38.0([email protected])([email protected])
@@ -22942,10 +22950,10 @@ snapshots:
core-util-is: 1.0.2
extsprintf: 1.4.1
+ [email protected](patch_hash=66459642658d85da52b45ff0472242e9daade1ff3dd765974103db72a7c55377):
dependencies:
'@babel/runtime': 7.28.3
- '@videojs/http-streaming': 3.17.2([email protected])
+ '@videojs/http-streaming': 3.17.2([email protected](patch_hash=66459642658d85da52b45ff0472242e9daade1ff3dd765974103db72a7c55377))
'@videojs/vhs-utils': 4.1.1
'@videojs/xhr': 2.7.0
aes-decrypter: 4.0.2
@@ -22953,14 +22961,14 @@ snapshots:
m3u8-parser: 7.2.0
mpd-parser: 1.3.1
mux.js: 7.1.0
- videojs-contrib-quality-levels: 4.1.0([email protected])
+ videojs-contrib-quality-levels: 4.1.0([email protected](patch_hash=66459642658d85da52b45ff0472242e9daade1ff3dd765974103db72a7c55377))
videojs-font: 4.2.0
videojs-vtt.js: 0.15.5
+ [email protected]([email protected](patch_hash=66459642658d85da52b45ff0472242e9daade1ff3dd765974103db72a7c55377)):
dependencies:
global: 4.4.0
- video.js: 8.23.4
+ video.js: 8.23.4(patch_hash=66459642658d85da52b45ff0472242e9daade1ff3dd765974103db72a7c55377)
diff --git a/pnpm-patches/video.js.patch b/pnpm-patches/video.js.patch
new file mode 100644
index 0000000000..0d4f031375
--- /dev/null
+++ b/pnpm-patches/video.js.patch
@@ -0,0 +1,25 @@
+diff --git a/dist/types/menu/menu-button.d.ts b/dist/types/menu/menu-button.d.ts
+index 58572dee9b32202c1656269c749efbce623ea363..323101a846fe2064dc74ea9b8faa250fded70744 100644
+--- a/dist/types/menu/menu-button.d.ts
++++ b/dist/types/menu/menu-button.d.ts
+@@ -67,8 +67,11 @@ declare class MenuButton extends Component {
+ *
+ * @param {string} name
+ * The icon name to be added.
++ *
++ * @return {Element}
++ * The element that gets created.
+ */
+- setIcon(name: string): void;
++ setIcon(name: string): Element;
+ /**
+ * Allow sub components to stack CSS class names for the wrapper element
+ *
+diff --git a/dist/types/menu/menu-button.d.ts.map b/dist/types/menu/menu-button.d.ts.map
+index 4768d14c2d8c0a977b93b63eaa9ca5f48d7a2d1a..5bc21645324ccc7c790df13d6f34beedcbf0d7f4 100644
+--- a/dist/types/menu/menu-button.d.ts.map
++++ b/dist/types/menu/menu-button.d.ts.map
+@@ -1 +1 @@
+-{"version":3,"file":"menu-button.d.ts","sourceRoot":"","sources":["../../../src/js/menu/menu-button.js"],"names":[],"mappings":";AAYA,sCAAsC;AAEtC;;;;GAIG;AACH;IAEE;;;;;;;;OAQG;IACH,oBANW,MAAM,iBAwChB;IA/BC,oBAA8C;IAe9C,kBAAoB;IAIpB,mCAAsD;IAcxD;;OAEG;IACH,eA4BC;IApBC,WAAgB;IAGhB;;;;;OAKG;IACH,uBAA2B;IAa7B;;;;;OAKG;IACH,cAHY,IAAI,CAuCf;IAjCC;;;;;;;OAOG;IACH,iCAAuB;IAevB,YAA+B;IAYjC;;;;OAIG;IACH,oBAAgB;IAEhB;;;;;OAKG;IACH,YAHY,OAAO,CAQlB;IAED;;;;;;OAMG;IACH,cAHW,MAAM,QAKhB;IAED;;;;;OAKG;IACH,wBAHY,MAAM,CAiBjB;IAqBD;;;;;;;;;;;;;OAaG;IACH,mBATW,MAAM,OAGN,OAAO,GAGN,MAAM,CAKjB;IAED;;OAEG;IACH,gBAGC;IAED;;;;;;;;;;OAUG;IACH,mBAPW,KAAK,QAaf;IAED;;;;;;;OAOG;IACH,wBALW,KAAK,QAQf;IAgBD;;;;;;;;OAQG;IACH,qBALW,KAAK,QA0Bf;IAED;;;;;;;;OAQG;IACH,uBALW,KAAK,QAUf;IAED;;;;;;;OAOG;IACH,6BAHW,KAAK,QAKf;IAED;;;;;;;;OAQG;IACH,4BALW,KAAK,QAuBf;IAED;;OAEG;IACH,oBAgBC;IAED;;OAEG;IACH,sBAOC;IAED;;OAEG;IACH,gBAOC;IAED;;OAEG;IACH,eAKC;CACF;sBA1aqB,iBAAiB;mBADpB,cAAc;iBAEhB,WAAW;wBAOJ,WAAW"}
+\ No newline at end of file
++{"version":3,"file":"menu-button.d.ts","sourceRoot":"","sources":["../../../src/js/menu/menu-button.js"],"names":[],"mappings":";AAYA,sCAAsC;AAEtC;;;;GAIG;AACH;IAEE;;;;;;;;OAQG;IACH,oBANW,MAAM,iBAwChB;IA/BC,oBAA8C;IAe9C,kBAAoB;IAIpB,mCAAsD;IAcxD;;OAEG;IACH,eA4BC;IApBC,WAAgB;IAGhB;;;;;OAKG;IACH,uBAA2B;IAa7B;;;;;OAKG;IACH,cAHY,IAAI,CAuCf;IAjCC;;;;;;;OAOG;IACH,iCAAuB;IAevB,YAA+B;IAYjC;;;;OAIG;IACH,oBAAgB;IAEhB;;;;;OAKG;IACH,YAHY,OAAO,CAQlB;IAED;;;;;;;;;OASG;IACH,cANW,MAAM,GAGL,OAAO,CAKlB;IAED;;;;;OAKG;IACH,wBAHY,MAAM,CAiBjB;IAqBD;;;;;;;;;;;;;OAaG;IACH,mBATW,MAAM,OAGN,OAAO,GAGN,MAAM,CAKjB;IAED;;OAEG;IACH,gBAGC;IAED;;;;;;;;;;OAUG;IACH,mBAPW,KAAK,QAaf;IAED;;;;;;;OAOG;IACH,wBALW,KAAK,QAQf;IAgBD;;;;;;;;OAQG;IACH,qBALW,KAAK,QA0Bf;IAED;;;;;;;;OAQG;IACH,uBALW,KAAK,QAUf;IAED;;;;;;;OAOG;IACH,6BAHW,KAAK,QAKf;IAED;;;;;;;;OAQG;IACH,4BALW,KAAK,QAuBf;IAED;;OAEG;IACH,oBAgBC;IAED;;OAEG;IACH,sBAOC;IAED;;OAEG;IACH,gBAOC;IAED;;OAEG;IACH,eAKC;CACF;sBA7aqB,iBAAiB;mBADpB,cAAc;iBAEhB,WAAW;wBAOJ,WAAW"}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index f76d047540..af5697401c 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -20,3 +20,6 @@ onlyBuiltDependencies:
- node-datachannel
- utf-8-validate
- utp-native
+
+patchedDependencies:
+ video.js: pnpm-patches/video.js.patch
diff --git a/scripts/nightly.sh b/scripts/nightly.sh
index 56a6aee271..31c9a3d606 100755
--- a/scripts/nightly.sh
+++ b/scripts/nightly.sh
@@ -47,7 +47,7 @@ sed -i 's/"version": "\([^"]\+\)"/"version": "\1-'"$nightly_version"'"/' ./packa
"$directory_name/scripts/upgrade.sh" "$directory_name/support/doc" "$directory_name/support/freebsd" \
"$directory_name/support/init.d" "$directory_name/support/nginx" "$directory_name/support/openapi" \
"$directory_name/support/sysctl.d" "$directory_name/support/systemd" \
- "$directory_name/pnpm-lock.yaml" "$directory_name/pnpm-workspace.yaml")
+ "$directory_name/pnpm-patches" "$directory_name/pnpm-lock.yaml" "$directory_name/pnpm-workspace.yaml")
# temporary setup
cd ..
diff --git a/scripts/release.sh b/scripts/release.sh
index 44c7b8d603..7e6eed2c4f 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -94,7 +94,7 @@ find dist/ packages/core-utils/dist/ \
"$directory_name/scripts/upgrade.sh" "$directory_name/support/doc" "$directory_name/support/freebsd" \
"$directory_name/support/init.d" "$directory_name/support/nginx" "$directory_name/support/openapi" \
"$directory_name/support/sysctl.d" "$directory_name/support/systemd" \
- "$directory_name/pnpm-lock.yaml" "$directory_name/pnpm-workspace.yaml")
+ "$directory_name/pnpm-patches" "$directory_name/pnpm-lock.yaml" "$directory_name/pnpm-workspace.yaml")
# temporary setup
cd ..