diff --git a/src/tools/gif-to-mp4/gif-to-mp4.vue b/src/tools/gif-to-mp4/gif-to-mp4.vue index 91aac9ac..2afc23fa 100644 --- a/src/tools/gif-to-mp4/gif-to-mp4.vue +++ b/src/tools/gif-to-mp4/gif-to-mp4.vue @@ -4,8 +4,9 @@ import { ref } from 'vue'; import { FFmpeg } from '@ffmpeg/ffmpeg'; import ffmpegClassWorkerUrl from '@ffmpeg/ffmpeg/worker?worker&url'; - -import { toBlobURL } from '@ffmpeg/util'; +// Shipped with the app (single-threaded ESM build). The worker above is a module worker, so it `import()`s the core. +import ffmpegCoreUrl from '@ffmpeg/core?url'; +import ffmpegWasmUrl from '@ffmpeg/core/wasm?url'; const { t } = useI18n(); @@ -22,11 +23,9 @@ const loop = ref(5); async function loadFFmpeg() { if (!ffmpeg.loaded) { - const baseURL = 'https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10/dist/esm'; - await ffmpeg.load({ - coreURL: await toBlobURL(`${baseURL}/ffmpeg-core.js`, 'text/javascript'), - wasmURL: await toBlobURL(`${baseURL}/ffmpeg-core.wasm`, 'application/wasm'), + coreURL: ffmpegCoreUrl, + wasmURL: ffmpegWasmUrl, classWorkerURL: ffmpegClassWorkerUrl, }); } diff --git a/src/tools/gif-to-mp4/index.ts b/src/tools/gif-to-mp4/index.ts index 61ee4204..1fd067db 100644 --- a/src/tools/gif-to-mp4/index.ts +++ b/src/tools/gif-to-mp4/index.ts @@ -10,6 +10,4 @@ export const tool = defineTool({ icon: defineAsyncComponent(() => import('@vicons/tabler/es/VideoPlus')), createdAt: new Date('2026-03-15'), category: 'Images', - externalHTMLContent: - 'Download FFMPEG from https://cdn.jsdelivr.net/npm/@ffmpeg/core@0.12.10. All processing done in your browser.', }); diff --git a/src/tools/math-ocr/index.ts b/src/tools/math-ocr/index.ts index e982278f..7a47bdd4 100644 --- a/src/tools/math-ocr/index.ts +++ b/src/tools/math-ocr/index.ts @@ -1,4 +1,5 @@ import { defineTool } from '../tool'; +import { getToolsSettingString } from '@/utils/tools-settings'; import { translate as t } from '@/plugins/i18n.plugin'; export const tool = defineTool({ @@ -11,4 +12,5 @@ export const tool = defineTool({ createdAt: new Date('2024-08-15'), category: 'Maths', externAccessDescription: t('tools.math-ocr.externalAccess'), + requiresInternet: (settings) => !getToolsSettingString(settings, 'transformers', 'models-url'), }); diff --git a/src/tools/math-ocr/math-ocr.vue b/src/tools/math-ocr/math-ocr.vue index aef63398..66c87881 100644 --- a/src/tools/math-ocr/math-ocr.vue +++ b/src/tools/math-ocr/math-ocr.vue @@ -2,7 +2,7 @@ import { useI18n } from 'vue-i18n'; import type { Ref } from 'vue'; import { pipeline } from '@huggingface/transformers'; -import { useScriptTag } from '@vueuse/core'; +import '@/utils/transformers-env'; import TextareaCopyable from '@/components/TextareaCopyable.vue'; const { t } = useI18n(); diff --git a/src/tools/math-ocr/vue-mathjax-next.d.ts b/src/tools/math-ocr/vue-mathjax-next.d.ts deleted file mode 100644 index b94778d2..00000000 --- a/src/tools/math-ocr/vue-mathjax-next.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare module 'vue-mathjax-next' {} diff --git a/src/tools/ocr-image/ocr-image.vue b/src/tools/ocr-image/ocr-image.vue index 28be4f35..9ac47af4 100644 --- a/src/tools/ocr-image/ocr-image.vue +++ b/src/tools/ocr-image/ocr-image.vue @@ -1,13 +1,20 @@