From 6075b3fbe808c0b5a742d667a7884413b34456b9 Mon Sep 17 00:00:00 2001 From: Thijs Triemstra Date: Sun, 17 Mar 2024 16:47:36 +0100 Subject: [PATCH] ts-ebml plugin: add support for v3.x (#716) * update dev dependencies * add support for ts-ebml v3.x * update changelog --- CHANGES.md | 4 + build-config/fragments/common.js | 5 + package-lock.json | 260 +++++++++++++++++-------------- package.json | 8 +- src/js/plugins/ts-ebml-plugin.js | 8 +- 5 files changed, 159 insertions(+), 126 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2dc658c44..1923d83bb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # videojs-record changelog +## 4.8.0 - unreleased + +- ts-ebml plugin: add support for v3.x (#716) + ## 4.7.0 - 2024/02/14 - Fix video.js v8 deprecation warnings (#707) diff --git a/build-config/fragments/common.js b/build-config/fragments/common.js index d333b5013..9bbb25399 100644 --- a/build-config/fragments/common.js +++ b/build-config/fragments/common.js @@ -47,7 +47,12 @@ module.exports = { // webpack < 5 used to include polyfills for node.js core modules by default. // This is no longer the case; enable required polyfills here. fallback: { + // used for ts-ebml plugin, see https://github.com/legokichi/ts-ebml/issues/25 'buffer': require.resolve('buffer/') + }, + alias: { + // used for ts-ebml plugin, see https://github.com/legokichi/ts-ebml/issues/48 + ebml: 'ebml/lib/ebml.esm.js' } }, // specify dependencies for the library that are not resolved by webpack, diff --git a/package-lock.json b/package-lock.json index 14aee13d0..f9adce0c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "copy-webpack-plugin": "^12.0.2", "css-loader": "^6.10.0", "css-minimizer-webpack-plugin": "^6.0.0", - "date-fns": "^3.3.1", + "date-fns": "^3.5.0", "esdoc": "^1.1.0", "esdoc-standard-plugin": "^1.0.0", "eslint": "^8.57.0", @@ -71,18 +71,18 @@ "parse-ms": "^3.0.0", "recorderjs": "git+https://github.com/mattdiamond/Recorderjs.git", "rimraf": "^5.0.5", - "sass": "^1.71.1", + "sass": "^1.72.0", "sass-loader": "^14.1.1", "style-loader": "^3.3.4", "terser-webpack-plugin": "^5.3.10", - "ts-ebml": "^2.0.2", + "ts-ebml": "^3.0.1", "url-loader": "^4.1.1", "videojs-languages": "^2.0.0", "vmsg": ">=0.4.0", "webm-wasm": ">=0.4.1", "webpack": "^5.90.3", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^5.0.2", + "webpack-dev-server": "^5.0.3", "webpack-merge": "^5.10.0", "webpack-remove-empty-scripts": "^1.0.4" } @@ -4054,6 +4054,19 @@ "node": "*" } }, + "node_modules/bigint-buffer": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/bigint-buffer/-/bigint-buffer-1.1.5.tgz", + "integrity": "sha512-trfYco6AoZ+rKhKnxA0hgX0HAbVP/s808/EuDSe2JDzUnCp/xAsli35Orvk67UrTEcwuxZqYZDmfA2RXJgxVvA==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "bindings": "^1.3.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -4063,6 +4076,15 @@ "node": ">=8" } }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, "node_modules/body-parser": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", @@ -4854,6 +4876,15 @@ "node": ">= 0.8" } }, + "node_modules/commander": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz", + "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==", + "dev": true, + "engines": { + "node": ">=18" + } + }, "node_modules/common-path-prefix": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", @@ -5669,9 +5700,9 @@ } }, "node_modules/date-fns": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.3.1.tgz", - "integrity": "sha512-y8e109LYGgoQDveiEBD3DYXKba1jWf5BA8YU1FL5Tvm0BTdEfy54WLCwnuYWZNnzzvALy/QQ4Hov+Q9RVRv+Zw==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.5.0.tgz", + "integrity": "sha512-a+DwyXn7NOfdJireCzAA0B9p7jIXEu/Q9JKCyMYvH6+0vPUNbQceA0neXrdfJ/xzl3mhOh5vibQQ3936Tssm6A==", "dev": true, "funding": { "type": "github", @@ -6022,13 +6053,16 @@ "dev": true }, "node_modules/ebml": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/ebml/-/ebml-2.2.4.tgz", - "integrity": "sha512-wInOW1ASaWDJgatWqgZQ3RCXXYCLRMDkW4yA/HJvDi5auKbwyRQZfsQQ3aTVIeIo537cVUsD0rvNqKq7alKxtA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ebml/-/ebml-3.0.0.tgz", + "integrity": "sha512-Q6C1u4/TX1nYipT9HNIopp95YyyyI0zs1GXdNRKO7XL7k+oo+ZtDc1CaJjpCdmlLxWsnlKBOXJCXkYU0K/Anlg==", "dev": true, "dependencies": { "buffers": "^0.1.1", "debug": "~3.1.0" + }, + "engines": { + "node": ">= 6.4" } }, "node_modules/ebml-block": { @@ -7682,6 +7716,12 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true + }, "node_modules/fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -9239,10 +9279,13 @@ "dev": true }, "node_modules/int64-buffer": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz", - "integrity": "sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA==", - "dev": true + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-1.0.1.tgz", + "integrity": "sha512-+3azY4pXrjAupJHU1V9uGERWlhoqNswJNji6aD/02xac7oxol508AsMC5lxKhEqyZeDFy3enq5OGWXF4u75hiw==", + "dev": true, + "engines": { + "node": ">= 4.5.0" + } }, "node_modules/interpret": { "version": "3.1.1", @@ -11108,6 +11151,12 @@ "node": ">=12" } }, + "node_modules/matroska-schema": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/matroska-schema/-/matroska-schema-2.1.0.tgz", + "integrity": "sha512-6c1oFmDxf4Vc5J5lA+9wO7TKcw5M1w85HfzFhAFT4OuEUuqp/s/jqqC3OKlaWe1YwN5wTThJyTC7iwhyW7kQdg==", + "dev": true + }, "node_modules/matroska/node_modules/async": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", @@ -13690,9 +13739,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.71.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz", - "integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==", + "version": "1.72.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz", + "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -15310,62 +15359,24 @@ } }, "node_modules/ts-ebml": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ts-ebml/-/ts-ebml-2.0.2.tgz", - "integrity": "sha512-V/HdlCn3FITQrFHQlVE02XtfMiRLab2QB/YOCfkbJWqiFYG/j5v7gHKV+wem6g0PD6/uxXs5oxMQfDXILmts/Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ts-ebml/-/ts-ebml-3.0.1.tgz", + "integrity": "sha512-gPpBXaePtnBR/MYRUyyJybD6vikWf9cY57MSWx+1lTmItSl/ESQj1GouBEuTs6f9OZfM+y8ORrY6QyBWWH8CUg==", "dev": true, "dependencies": { - "buffer": "^5.0.7", - "commander": "^2.11.0", - "ebml": "^2.2.1", - "ebml-block": "^1.1.0", - "events": "^1.1.1", - "int64-buffer": "^0.1.9", - "matroska": "^2.2.3" + "bigint-buffer": "^1.1.5", + "commander": "^12.0.0", + "ebml": "^3.0.0", + "ebml-block": "^1.1.2", + "events": "^3.3.0", + "int64-buffer": "^1.0.1", + "matroska": "^2.2.5", + "matroska-schema": "^2.1.0" }, "bin": { "ts-ebml": "lib/cli.js" } }, - "node_modules/ts-ebml/node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/ts-ebml/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "node_modules/ts-ebml/node_modules/events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==", - "dev": true, - "engines": { - "node": ">=0.4.x" - } - }, "node_modules/tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", @@ -16221,9 +16232,9 @@ } }, "node_modules/webpack-dev-server": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.2.tgz", - "integrity": "sha512-IVj3qsQhiLJR82zVg3QdPtngMD05CYP/Am+9NG5QSl+XwUR/UPtFwllRBKrMwM9ttzFsC6Zj3DMgniPyn/Z0hQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.3.tgz", + "integrity": "sha512-4aj4I8FJLsFbd4Vt6YBXC8CWrOOwviEI9DdVTu9hrgIBGWs4oKOVfDnaRc+vgf1JUSir1psph1ChPFDkTGHR2Q==", "dev": true, "dependencies": { "@types/bonjour": "^3.5.13", @@ -19650,12 +19661,30 @@ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true }, + "bigint-buffer": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/bigint-buffer/-/bigint-buffer-1.1.5.tgz", + "integrity": "sha512-trfYco6AoZ+rKhKnxA0hgX0HAbVP/s808/EuDSe2JDzUnCp/xAsli35Orvk67UrTEcwuxZqYZDmfA2RXJgxVvA==", + "dev": true, + "requires": { + "bindings": "^1.3.0" + } + }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "body-parser": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", @@ -20277,6 +20306,12 @@ "delayed-stream": "~1.0.0" } }, + "commander": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz", + "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==", + "dev": true + }, "common-path-prefix": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", @@ -20862,9 +20897,9 @@ } }, "date-fns": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.3.1.tgz", - "integrity": "sha512-y8e109LYGgoQDveiEBD3DYXKba1jWf5BA8YU1FL5Tvm0BTdEfy54WLCwnuYWZNnzzvALy/QQ4Hov+Q9RVRv+Zw==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.5.0.tgz", + "integrity": "sha512-a+DwyXn7NOfdJireCzAA0B9p7jIXEu/Q9JKCyMYvH6+0vPUNbQceA0neXrdfJ/xzl3mhOh5vibQQ3936Tssm6A==", "dev": true }, "date-format": { @@ -21140,9 +21175,9 @@ "dev": true }, "ebml": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/ebml/-/ebml-2.2.4.tgz", - "integrity": "sha512-wInOW1ASaWDJgatWqgZQ3RCXXYCLRMDkW4yA/HJvDi5auKbwyRQZfsQQ3aTVIeIo537cVUsD0rvNqKq7alKxtA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ebml/-/ebml-3.0.0.tgz", + "integrity": "sha512-Q6C1u4/TX1nYipT9HNIopp95YyyyI0zs1GXdNRKO7XL7k+oo+ZtDc1CaJjpCdmlLxWsnlKBOXJCXkYU0K/Anlg==", "dev": true, "requires": { "buffers": "^0.1.1", @@ -22431,6 +22466,12 @@ } } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true + }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -23609,9 +23650,9 @@ "dev": true }, "int64-buffer": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz", - "integrity": "sha512-v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/int64-buffer/-/int64-buffer-1.0.1.tgz", + "integrity": "sha512-+3azY4pXrjAupJHU1V9uGERWlhoqNswJNji6aD/02xac7oxol508AsMC5lxKhEqyZeDFy3enq5OGWXF4u75hiw==", "dev": true }, "interpret": { @@ -25094,6 +25135,12 @@ } } }, + "matroska-schema": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/matroska-schema/-/matroska-schema-2.1.0.tgz", + "integrity": "sha512-6c1oFmDxf4Vc5J5lA+9wO7TKcw5M1w85HfzFhAFT4OuEUuqp/s/jqqC3OKlaWe1YwN5wTThJyTC7iwhyW7kQdg==", + "dev": true + }, "mdn-data": { "version": "2.0.30", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", @@ -26976,9 +27023,9 @@ "dev": true }, "sass": { - "version": "1.71.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz", - "integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==", + "version": "1.72.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz", + "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", @@ -28207,42 +28254,19 @@ "dev": true }, "ts-ebml": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ts-ebml/-/ts-ebml-2.0.2.tgz", - "integrity": "sha512-V/HdlCn3FITQrFHQlVE02XtfMiRLab2QB/YOCfkbJWqiFYG/j5v7gHKV+wem6g0PD6/uxXs5oxMQfDXILmts/Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ts-ebml/-/ts-ebml-3.0.1.tgz", + "integrity": "sha512-gPpBXaePtnBR/MYRUyyJybD6vikWf9cY57MSWx+1lTmItSl/ESQj1GouBEuTs6f9OZfM+y8ORrY6QyBWWH8CUg==", "dev": true, "requires": { - "buffer": "^5.0.7", - "commander": "^2.11.0", - "ebml": "^2.2.1", - "ebml-block": "^1.1.0", - "events": "^1.1.1", - "int64-buffer": "^0.1.9", - "matroska": "^2.2.3" - }, - "dependencies": { - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==", - "dev": true - } + "bigint-buffer": "^1.1.5", + "commander": "^12.0.0", + "ebml": "^3.0.0", + "ebml-block": "^1.1.2", + "events": "^3.3.0", + "int64-buffer": "^1.0.1", + "matroska": "^2.2.5", + "matroska-schema": "^2.1.0" } }, "tslib": { @@ -28899,9 +28923,9 @@ } }, "webpack-dev-server": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.2.tgz", - "integrity": "sha512-IVj3qsQhiLJR82zVg3QdPtngMD05CYP/Am+9NG5QSl+XwUR/UPtFwllRBKrMwM9ttzFsC6Zj3DMgniPyn/Z0hQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.3.tgz", + "integrity": "sha512-4aj4I8FJLsFbd4Vt6YBXC8CWrOOwviEI9DdVTu9hrgIBGWs4oKOVfDnaRc+vgf1JUSir1psph1ChPFDkTGHR2Q==", "dev": true, "requires": { "@types/bonjour": "^3.5.13", diff --git a/package.json b/package.json index 418304246..8ecbac7fe 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "copy-webpack-plugin": "^12.0.2", "css-loader": "^6.10.0", "css-minimizer-webpack-plugin": "^6.0.0", - "date-fns": "^3.3.1", + "date-fns": "^3.5.0", "esdoc": "^1.1.0", "esdoc-standard-plugin": "^1.0.0", "eslint": "^8.57.0", @@ -133,18 +133,18 @@ "parse-ms": "^3.0.0", "recorderjs": "git+https://github.com/mattdiamond/Recorderjs.git", "rimraf": "^5.0.5", - "sass": "^1.71.1", + "sass": "^1.72.0", "sass-loader": "^14.1.1", "style-loader": "^3.3.4", "terser-webpack-plugin": "^5.3.10", - "ts-ebml": "^2.0.2", + "ts-ebml": "^3.0.1", "url-loader": "^4.1.1", "videojs-languages": "^2.0.0", "vmsg": ">=0.4.0", "webm-wasm": ">=0.4.1", "webpack": "^5.90.3", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^5.0.2", + "webpack-dev-server": "^5.0.3", "webpack-merge": "^5.10.0", "webpack-remove-empty-scripts": "^1.0.4" }, diff --git a/src/js/plugins/ts-ebml-plugin.js b/src/js/plugins/ts-ebml-plugin.js index 0d076a41d..1fc14b76e 100644 --- a/src/js/plugins/ts-ebml-plugin.js +++ b/src/js/plugins/ts-ebml-plugin.js @@ -11,7 +11,7 @@ const ConvertEngine = videojs.getComponent('ConvertEngine'); import {Buffer} from 'buffer'; window.Buffer = Buffer; -import {Decoder, Encoder, tools, Reader} from 'ts-ebml'; +import * as ebml from 'ts-ebml'; /** * Converter engine using the ts-ebml library. @@ -28,8 +28,8 @@ class TsEBMLEngine extends ConvertEngine { * @param {Blob} data - Recorded data that needs to be converted. */ convert(data) { - const decoder = new Decoder(); - const reader = new Reader(); + const decoder = new ebml.Decoder(); + const reader = new ebml.Reader(); reader.logging = false; reader.drop_default_duration = false; @@ -55,7 +55,7 @@ class TsEBMLEngine extends ConvertEngine { reader.stop(); // generate metadata - let refinedMetadataBuf = tools.makeMetadataSeekable( + let refinedMetadataBuf = ebml.tools.makeMetadataSeekable( reader.metadatas, reader.duration, reader.cues); let body = buffer.slice(reader.metadataSize);