diff --git a/apps/angular-app/src/app/app.component.ts b/apps/angular-app/src/app/app.component.ts index f27144ed9e2..93d4a89721b 100644 --- a/apps/angular-app/src/app/app.component.ts +++ b/apps/angular-app/src/app/app.component.ts @@ -4,7 +4,7 @@ import { RouterOutlet } from '@angular/router'; import { FFmpeg } from '@ffmpeg/ffmpeg'; import { fetchFile, toBlobURL } from '@ffmpeg/util'; -const baseURL = 'https://unpkg.com/@ffmpeg/core-mt@0.12.10/dist/esm'; +const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@0.12.10/dist/esm'; @Component({ selector: 'app-root', diff --git a/apps/nextjs-app/app/Home.tsx b/apps/nextjs-app/app/Home.tsx index 0681b48443b..29ee210e47c 100644 --- a/apps/nextjs-app/app/Home.tsx +++ b/apps/nextjs-app/app/Home.tsx @@ -13,7 +13,7 @@ export default function Home() { const load = async () => { setIsLoading(true); - const baseURL = "https://unpkg.com/@ffmpeg/core@0.12.10/dist/umd"; + const baseURL = "https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10/dist/umd"; const ffmpeg = ffmpegRef.current; ffmpeg.on("log", ({ message }) => { if (messageRef.current) messageRef.current.innerHTML = message; diff --git a/apps/react-vite-app/src/App.tsx b/apps/react-vite-app/src/App.tsx index 68a71e76f1b..0b8a4c50168 100644 --- a/apps/react-vite-app/src/App.tsx +++ b/apps/react-vite-app/src/App.tsx @@ -9,7 +9,7 @@ function App() { const messageRef = useRef(null); const load = async () => { - const baseURL = "https://unpkg.com/@ffmpeg/core-mt@0.12.10/dist/esm"; + const baseURL = "https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@0.12.10/dist/esm"; const ffmpeg = ffmpegRef.current; ffmpeg.on("log", ({ message }) => { if (messageRef.current) messageRef.current.innerHTML = message; diff --git a/apps/solidstart-app/package.json b/apps/solidstart-app/package.json index 8db0fd64ea5..be665404bbd 100644 --- a/apps/solidstart-app/package.json +++ b/apps/solidstart-app/package.json @@ -1,23 +1,23 @@ { - "name": "solidstart-ffmpeg", - "type": "module", - "scripts": { - "dev": "vinxi dev", - "build": "vinxi build", - "start": "vinxi start" - }, - "dependencies": { - "@ffmpeg/ffmpeg": "^0.12.15", - "@ffmpeg/util": "^0.12.2", - "@solidjs/router": "^0.14.1", - "@solidjs/start": "^1.0.4", - "autoprefixer": "^10.4.19", - "postcss": "^8.4.38", - "solid-js": "^1.8.18", - "tailwindcss": "^3.4.3", - "vinxi": "^0.3.14" - }, - "engines": { - "node": ">=18" - } + "name": "solidstart-ffmpeg", + "type": "module", + "scripts": { + "dev": "vinxi dev", + "build": "vinxi build", + "start": "vinxi start" + }, + "dependencies": { + "@ffmpeg/ffmpeg": "^0.12.15", + "@ffmpeg/util": "^0.12.2", + "@solidjs/router": "^0.14.1", + "@solidjs/start": "^1.0.4", + "autoprefixer": "^10.4.19", + "postcss": "^8.4.38", + "solid-js": "^1.8.18", + "tailwindcss": "^3.4.3", + "vinxi": "^0.5.7" + }, + "engines": { + "node": ">=18" + } } diff --git a/apps/solidstart-app/src/routes/index.tsx b/apps/solidstart-app/src/routes/index.tsx index 189082cf26b..0e8d06986fb 100644 --- a/apps/solidstart-app/src/routes/index.tsx +++ b/apps/solidstart-app/src/routes/index.tsx @@ -2,7 +2,7 @@ import { FFmpeg } from '@ffmpeg/ffmpeg'; import { fetchFile, toBlobURL } from '@ffmpeg/util'; import { createSignal, Show } from 'solid-js'; -const baseURL = 'https://unpkg.com/@ffmpeg/core-mt@0.12.6/dist/esm'; +const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@0.12.10/dist/esm'; const videoURL = 'https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi'; diff --git a/apps/sveltekit-app/src/lib/FFmpegDemo.svelte b/apps/sveltekit-app/src/lib/FFmpegDemo.svelte index 4b451ebf0c1..c97d1bbd1b5 100644 --- a/apps/sveltekit-app/src/lib/FFmpegDemo.svelte +++ b/apps/sveltekit-app/src/lib/FFmpegDemo.svelte @@ -6,7 +6,7 @@ let videoEl: HTMLVideoElement; - const baseURL = 'https://unpkg.com/@ffmpeg/core-mt@0.12.6/dist/esm'; + const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@0.12.10/dist/esm'; const videoURL = 'https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi'; let message = 'Click Start to Transcode'; diff --git a/apps/vue-vite-app/src/components/FFmpegDemo.vue b/apps/vue-vite-app/src/components/FFmpegDemo.vue index 56cf22f29d3..68013b3354b 100644 --- a/apps/vue-vite-app/src/components/FFmpegDemo.vue +++ b/apps/vue-vite-app/src/components/FFmpegDemo.vue @@ -11,7 +11,7 @@ import type { LogEvent } from '@ffmpeg/ffmpeg/dist/esm/types' import { fetchFile, toBlobURL } from '@ffmpeg/util' import { defineComponent, ref } from 'vue' -const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@0.12.9/dist/esm' +const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@0.12.10/dist/esm' const videoURL = 'https://raw.githubusercontent.com/ffmpegwasm/testdata/master/video-15s.avi' export default defineComponent({ diff --git a/apps/website/docs/getting-started/installation.md b/apps/website/docs/getting-started/installation.md index 30f46ae6520..285a4eb516d 100644 --- a/apps/website/docs/getting-started/installation.md +++ b/apps/website/docs/getting-started/installation.md @@ -31,5 +31,5 @@ yarn add @ffmpeg/ffmpeg @ffmpeg/util :::info As `@ffmpeg/ffmpeg` spawns a web worker, you cannot import `@ffmpeg/ffmpeg` from CDN like -unpkg. It is recommended to download it and host it on your server most of the time. +jsdelivr. It is recommended to download it and host it on your server most of the time. ::: diff --git a/apps/website/docs/getting-started/usage.md b/apps/website/docs/getting-started/usage.md index 3631ed0a34f..878ed6fd056 100644 --- a/apps/website/docs/getting-started/usage.md +++ b/apps/website/docs/getting-started/usage.md @@ -11,7 +11,7 @@ It is recommended to read [Overview](/docs/overview) first. :::caution If you are a [vite](https://vitejs.dev/) user, use `esm` in **baseURL** instead of `umd`: -~~https://unpkg.com/@ffmpeg/core@0.12.10/dist/umd~~ => https://unpkg.com/@ffmpeg/core@0.12.10/dist/esm +~~https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10/dist/umd~~ => https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10/dist/esm ::: ```jsx live @@ -24,7 +24,7 @@ function() { const messageRef = useRef(null); const load = async () => { - const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.6/dist/umd' + const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10/dist/umd' const ffmpeg = ffmpegRef.current; ffmpeg.on('log', ({ message }) => { messageRef.current.innerHTML = message; @@ -81,7 +81,7 @@ function() { const messageRef = useRef(null); const load = async () => { - const baseURL = 'https://unpkg.com/@ffmpeg/core-mt@0.12.6/dist/umd' + const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@0.12.10/dist/umd' const ffmpeg = ffmpegRef.current; ffmpeg.on('log', ({ message }) => { messageRef.current.innerHTML = message; @@ -134,7 +134,7 @@ function() { const messageRef = useRef(null); const load = async () => { - const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.6/dist/umd' + const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10/dist/umd' const ffmpeg = ffmpegRef.current; ffmpeg.on('log', ({ message }) => { messageRef.current.innerHTML = message; @@ -192,7 +192,7 @@ function() { const messageRef = useRef(null); const load = async () => { - const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.6/dist/umd' + const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10/dist/umd' const ffmpeg = ffmpegRef.current; // Listen to progress event instead of log. ffmpeg.on('progress', ({ progress, time }) => { @@ -243,7 +243,7 @@ function() { const messageRef = useRef(null); const load = async () => { - const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.6/dist/umd' + const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10/dist/umd' const ffmpeg = ffmpegRef.current; ffmpeg.on('log', ({ message }) => { messageRef.current.innerHTML = message; @@ -313,7 +313,7 @@ function() { const messageRef = useRef(null); const load = async () => { - const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.6/dist/umd' + const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10/dist/umd' const ffmpeg = ffmpegRef.current; ffmpeg.on('log', ({ message }) => { messageRef.current.innerHTML = message; @@ -372,7 +372,7 @@ function() { const messageRef = useRef(null); const load = async () => { - const baseURL = 'https://unpkg.com/@ffmpeg/core@0.12.6/dist/umd' + const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10/dist/umd' const ffmpeg = ffmpegRef.current; ffmpeg.on('log', ({ message }) => { messageRef.current.innerHTML = message; @@ -426,7 +426,7 @@ function() { :::note Required: -- @ffmpeg/ffmpeg@0.12.6+ +- @ffmpeg/ffmpeg@0.12.10+ - @ffmpeg/core@0.12.4+ ::: @@ -437,7 +437,7 @@ Please Check this PR: [Add WORKERFS support](https://github.com/ffmpegwasm/ffmpe :::note Required: -- @ffmpeg/ffmpeg@0.12.6+ +- @ffmpeg/ffmpeg@0.12.10+ - @ffmpeg/core@0.12.4+ ::: diff --git a/apps/website/src/components/Playground/const.ts b/apps/website/src/components/Playground/const.ts index fb040bc816b..896b38d7ba2 100644 --- a/apps/website/src/components/Playground/const.ts +++ b/apps/website/src/components/Playground/const.ts @@ -1,14 +1,14 @@ -export const CORE_VERSION = "0.12.6"; +export const CORE_VERSION = "0.12.10"; -export const CORE_URL = `https://unpkg.com/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.js`; -export const CORE_MT_URL = `https://unpkg.com/@ffmpeg/core-mt@${CORE_VERSION}/dist/umd/ffmpeg-core.js`; +export const CORE_URL = `https://cdn.jsdelivr.net/npm/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.js`; +export const CORE_MT_URL = `https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@${CORE_VERSION}/dist/umd/ffmpeg-core.js`; export const CORE_SIZE = { - [`https://unpkg.com/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.js`]: 114673, - [`https://unpkg.com/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.wasm`]: 32129114, - [`https://unpkg.com/@ffmpeg/core-mt@${CORE_VERSION}/dist/umd/ffmpeg-core.js`]: 132680, - [`https://unpkg.com/@ffmpeg/core-mt@${CORE_VERSION}/dist/umd/ffmpeg-core.wasm`]: 32609891, - [`https://unpkg.com/@ffmpeg/core-mt@${CORE_VERSION}/dist/umd/ffmpeg-core.worker.js`]: 2915, + [`https://cdn.jsdelivr.net/npm/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.js`]: 114673, + [`https://cdn.jsdelivr.net/npm/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.wasm`]: 32129114, + [`https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@${CORE_VERSION}/dist/umd/ffmpeg-core.js`]: 132680, + [`https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@${CORE_VERSION}/dist/umd/ffmpeg-core.wasm`]: 32609891, + [`https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@${CORE_VERSION}/dist/umd/ffmpeg-core.worker.js`]: 2915, }; export const SAMPLE_FILES = { diff --git a/packages/ffmpeg/src/const.ts b/packages/ffmpeg/src/const.ts index 940651330e9..5ced388c061 100644 --- a/packages/ffmpeg/src/const.ts +++ b/packages/ffmpeg/src/const.ts @@ -2,7 +2,7 @@ export const MIME_TYPE_JAVASCRIPT = "text/javascript"; export const MIME_TYPE_WASM = "application/wasm"; export const CORE_VERSION = "0.12.10"; -export const CORE_URL = `https://unpkg.com/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.js`; +export const CORE_URL = `https://cdn.jsdelivr.net/npm/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.js`; export enum FFMessageType { LOAD = "LOAD", diff --git a/packages/ffmpeg/src/types.ts b/packages/ffmpeg/src/types.ts index 6082a6d908d..5ddf97d50e0 100644 --- a/packages/ffmpeg/src/types.ts +++ b/packages/ffmpeg/src/types.ts @@ -7,20 +7,20 @@ export interface FFMessageLoadConfig { /** * `ffmpeg-core.js` URL. * - * @defaultValue `https://unpkg.com/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.js`; + * @defaultValue `https://cdn.jsdelivr.net/npm/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.js`; */ coreURL?: string; /** * `ffmpeg-core.wasm` URL. * - * @defaultValue `https://unpkg.com/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.wasm`; + * @defaultValue `https://cdn.jsdelivr.net/npm/@ffmpeg/core@${CORE_VERSION}/dist/umd/ffmpeg-core.wasm`; */ wasmURL?: string; /** * `ffmpeg-core.worker.js` URL. This worker is spawned when using multithread version of ffmpeg-core. * * @ref: https://ffmpegwasm.netlify.app/docs/overview#architecture - * @defaultValue `https://unpkg.com/@ffmpeg/core-mt@${CORE_VERSION}/dist/umd/ffmpeg-core.worker.js`; + * @defaultValue `https://cdn.jsdelivr.net/npm/@ffmpeg/core-mt@${CORE_VERSION}/dist/umd/ffmpeg-core.worker.js`; */ workerURL?: string; /**