diff --git a/Dockerfile b/Dockerfile index 7828ae2..c162afc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ FROM ffmpeg-builder AS ffmpeg-wasm-builder COPY src/bind /src/wasm/bind COPY src/fftools /src/wasm/fftools COPY build/ffmpeg-wasm.sh build.sh -RUN mkdir -p /src/dist/cjs && bash -x /src/build.sh -o dist/cjs/ffmpeg.js +RUN mkdir -p /src/dist/umd && bash -x /src/build.sh -o dist/umd/ffmpeg.js RUN mkdir -p /src/dist/esm && bash -x /src/build.sh -sEXPORT_ES6 -o dist/esm/ffmpeg.js # Export ffmpeg-core.wasm to dist/, use `docker buildx build -o . .` to get assets diff --git a/apps/browser/transcode.esm.html b/apps/browser/transcode.esm.html new file mode 100644 index 0000000..8d3c556 --- /dev/null +++ b/apps/browser/transcode.esm.html @@ -0,0 +1,35 @@ + + + + + +

Upload a video to transcode to mp4 (x264) and play!

+
+ +

+ + + diff --git a/apps/browser/transcode.html b/apps/browser/transcode.html index 8d3c556..9c614dc 100644 --- a/apps/browser/transcode.html +++ b/apps/browser/transcode.html @@ -1,6 +1,8 @@ + +

Upload a video to transcode to mp4 (x264) and play!

@@ -8,8 +10,7 @@

- + + +

Upload a mp4 (x264) video and trim its first 1 seconds and play!

@@ -20,19 +10,22 @@

- + diff --git a/packages/ffmpeg/package.json b/packages/ffmpeg/package.json index 082336e..6f77b0d 100644 --- a/packages/ffmpeg/package.json +++ b/packages/ffmpeg/package.json @@ -2,13 +2,13 @@ "name": "@ffmpeg/ffmpeg", "version": "0.11.5", "description": "FFmpeg WebAssembly version", - "main": "./dist/cjs/ffmpeg.js", + "main": "./dist/umd/ffmpeg.js", "types": "./types/ffmpeg.d.ts", "exports": { ".": { "types": "./types/ffmpeg.d.ts", "import": "./dist/esm/ffmpeg.js", - "require": "./dist/cjs/ffmpeg.js" + "require": "./dist/umd/ffmpeg.js" } }, "scripts": { diff --git a/packages/ffmpeg/tests/ffmpeg.test.html b/packages/ffmpeg/tests/ffmpeg.test.html index 76a9fe6..3dc7513 100644 --- a/packages/ffmpeg/tests/ffmpeg.test.html +++ b/packages/ffmpeg/tests/ffmpeg.test.html @@ -9,7 +9,7 @@
- + diff --git a/packages/util/package.json b/packages/util/package.json index 7e62721..f3859ec 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -13,7 +13,7 @@ }, "scripts": { "dev": "tsc -p tsconfig-esm.json --watch", - "build": "rimraf dist && tsc -p tsconfig-esm.json && tsc -p tsconfig-cjs.json", + "build": "rimraf dist && tsc -p tsconfig-esm.json && tsc -p tsconfig-cjs.json && webpack", "lint": "eslint src" }, "files": [ @@ -46,6 +46,7 @@ "@typescript-eslint/parser": "^5.37.0", "eslint": "^8.23.1", "rimraf": "^3.0.2", - "typescript": "^4.8.3" + "typescript": "^4.8.3", + "webpack-cli": "^4.10.0" } } diff --git a/packages/util/webpack.config.cjs b/packages/util/webpack.config.cjs new file mode 100644 index 0000000..1e504df --- /dev/null +++ b/packages/util/webpack.config.cjs @@ -0,0 +1,12 @@ +const path = require("path"); + +module.exports = { + mode: "production", + entry: "./dist/cjs/index.js", + output: { + library: "FFmpegUtil", + libraryTarget: "umd", + filename: "index.js", + path: path.resolve(__dirname, "dist", "umd"), + }, +};