Skip to content

Commit bfdeb4d

Browse files
authored
Merge branch 'WebAV-Tech:main' into opus-codec
2 parents d905852 + 88ded7d commit bfdeb4d

File tree

25 files changed

+3677
-4788
lines changed

25 files changed

+3677
-4788
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,6 @@ dist-ssr
2626
coverage
2727

2828
**/public/**/pri-*
29-
doc-site/public/_api/av-*
29+
doc-site/public/_api/av-*
30+
31+
__screenshots__

doc-site/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
"gh-pages": "^6.1.0",
2323
"husky": "^8.0.1",
2424
"lint-staged": "^13.0.3",
25-
"tailwindcss": "^3.4.1"
25+
"tailwindcss": "^3.4.17"
2626
},
2727
"dependencies": {
28-
"@xzdarcy/react-timeline-editor": "^0.1.9",
29-
"@webav/av-cliper": "workspace:*",
3028
"@webav/av-canvas": "workspace:*",
29+
"@webav/av-cliper": "workspace:*",
3130
"@webav/av-recorder": "workspace:*",
31+
"@xzdarcy/react-timeline-editor": "^0.1.9",
3232
"antd": "^5.11.5"
3333
}
3434
}

doc-site/tsconfig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"compilerOptions": {
44
"types": [
55
"node",
6+
"vitest/importMeta",
7+
"@vitest/browser/providers/webdriverio",
68
"@types/dom-mediacapture-transform",
79
"@types/dom-webcodecs",
810
"@types/wicg-file-system-access"

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"@types/dom-mediacapture-transform": "^0.1.5",
99
"@types/dom-webcodecs": "^0.1.13",
1010
"@types/wicg-file-system-access": "^2020.9.6",
11-
"@vitest/browser": "^1.6.0",
12-
"@vitest/coverage-istanbul": "^1.6.0",
11+
"@vitest/browser": "^3.2.4",
12+
"@vitest/coverage-istanbul": "^3.2.4",
1313
"conventional-changelog-cli": "^4.1.0",
1414
"jsdom": "^24.0.0",
1515
"lint-staged": "^15.2.2",
@@ -19,12 +19,12 @@
1919
"rimraf": "^5.0.1",
2020
"simple-git-hooks": "^2.11.0",
2121
"typedoc": "^0.25.4",
22-
"typescript": "^5.4.5",
23-
"vite": "^5.3.1",
24-
"vite-plugin-dts": "^4.2.4",
22+
"typescript": "^5.8.3",
23+
"vite": "^7.0.4",
24+
"vite-plugin-dts": "^4.5.4",
2525
"vite-plugin-externalize-deps": "^0.8.0",
26-
"vitest": "^1.6.0",
27-
"webdriverio": "^8.39.0"
26+
"vitest": "^3.2.4",
27+
"webdriverio": "^9.17.0"
2828
},
2929
"overrides": {
3030
"prettier": "^3.2.5"

packages/av-canvas/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @webav/av-canvas
22

3+
## 1.1.8
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [c99bd8e]
8+
- @webav/internal-utils@1.1.8
9+
- @webav/av-cliper@1.1.8
10+
11+
## 1.1.7
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [013e45c]
16+
- @webav/av-cliper@1.1.7
17+
- @webav/internal-utils@1.1.7
18+
319
## 1.1.6
420

521
### Patch Changes

packages/av-canvas/demo/video-editor.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,9 @@ async function createFileWriter(
486486
return fileHandle.createWritable();
487487
}
488488

489-
async function loadFile(accept: Record<string, string[]>) {
489+
async function loadFile(
490+
accept: Record<MIMEType, FileExtension | FileExtension[]>,
491+
) {
490492
const [fileHandle] = await window.showOpenFilePicker({
491493
types: [{ accept }],
492494
});

packages/av-canvas/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@webav/av-canvas",
3-
"version": "1.1.6",
3+
"version": "1.1.8",
44
"private": false,
55
"repository": "https://github.com/WebAV-Tech/WebAV",
66
"keywords": [
@@ -31,8 +31,8 @@
3131
"ci:test": "vitest run",
3232
"test:coverage": "vitest run --coverage",
3333
"build": "vite build",
34-
"build:api": "typedoc src/index.ts --out ../../doc-site/public/_api/av-canvas",
35-
"build:api:watch": "typedoc src/index.ts --out ../../doc-site/public/_api/av-canvas --watch",
34+
"build:api": "typedoc src/index.ts --out ../../doc-site/public/_api/av-canvas --skipErrorChecking --exclude '**/demo/**'",
35+
"build:api:watch": "typedoc src/index.ts --out ../../doc-site/public/_api/av-canvas --watch --skipErrorChecking --exclude '**/demo/**'",
3636
"prepublishOnly": "pnpm build",
3737
"preview": "vite preview"
3838
},
@@ -45,7 +45,7 @@
4545
"@webav/av-recorder": "workspace:*",
4646
"@xzdarcy/react-timeline-editor": "^0.1.9",
4747
"autoprefixer": "^10.4.19",
48-
"esbuild-plugin-react-virtualized": "^1.0.4",
48+
"esbuild-plugin-react-virtualized": "^1.0.5",
4949
"postcss": "^8.4.38",
5050
"react": "^18.3.1",
5151
"react-dom": "^18.3.1",

packages/av-canvas/vite.config.ts

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import fixReactVirtualized from 'esbuild-plugin-react-virtualized';
12
import { resolve } from 'path';
23
import { defineConfig } from 'vite';
34
import dts from 'vite-plugin-dts';
45
import { externalizeDeps } from 'vite-plugin-externalize-deps';
5-
import fixReactVirtualized from 'esbuild-plugin-react-virtualized';
66

77
export default defineConfig({
88
plugins: [dts({ rollupTypes: true }), externalizeDeps()],
@@ -14,14 +14,29 @@ export default defineConfig({
1414
},
1515
},
1616
test: {
17+
includeSource: ['src/**/*.{ts,tsx}'],
1718
browser: {
1819
provider: 'webdriverio',
1920
enabled: true,
20-
name: 'chrome', // browser name is required
2121
headless: true,
22-
providerOptions: {
23-
browserVersion: 'stable',
24-
},
22+
// 配置浏览器测试的 API 服务器端口
23+
api: 5055,
24+
instances: [
25+
{
26+
name: 'chrome-tests',
27+
browser: 'chrome',
28+
// 添加 WebDriverIO capabilities 来启用 WebGL 支持
29+
capabilities: {
30+
browserName: 'chrome',
31+
'goog:chromeOptions': {
32+
args: [
33+
// WebGL 相关参数
34+
'--enable-unsafe-webgpu',
35+
],
36+
},
37+
},
38+
},
39+
],
2540
},
2641
},
2742
server: {

packages/av-cliper/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# @webav/av-cliper
22

3+
## 1.1.8
4+
5+
### Patch Changes
6+
7+
- c99bd8e: fix: the first keyframe is trusted as an IDR frame by default for compatibility with certain video files that have abnormal annotations.
8+
- Updated dependencies [c99bd8e]
9+
- @webav/internal-utils@1.1.8
10+
11+
## 1.1.7
12+
13+
### Patch Changes
14+
15+
- 013e45c: fix: mp4clip compatible with anomalous data #424
16+
- @webav/internal-utils@1.1.7
17+
318
## 1.1.6
419

520
### Patch Changes

packages/av-cliper/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@webav/av-cliper",
3-
"version": "1.1.6",
3+
"version": "1.1.8",
44
"private": false,
55
"repository": "https://github.com/WebAV-Tech/WebAV",
66
"keywords": [
@@ -32,8 +32,8 @@
3232
"test:coverage": "vitest run --coverage",
3333
"build": "vite build",
3434
"build:dev": "vite build --watch",
35-
"build:api": "typedoc src/index.ts --out ../../doc-site/public/_api/av-cliper",
36-
"build:api:watch": "typedoc src/index.ts --out ../../doc-site/public/_api/av-cliper --watch",
35+
"build:api": "typedoc src/index.ts --out ../../doc-site/public/_api/av-cliper --skipErrorChecking --exclude '**/demo/**'",
36+
"build:api:watch": "typedoc src/index.ts --out ../../doc-site/public/_api/av-cliper --watch --skipErrorChecking --exclude '**/demo/**'",
3737
"prepare": "pnpm build"
3838
},
3939
"files": [

0 commit comments

Comments
 (0)