gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-16 14:41:11 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

change way we import tesseract.js for service workers

Browse Source
This commit is contained in:
ChaosExAnima 2025-04-22 11:47:16 +02:00
parent 8de9ab9ff3
commit a283702446
No known key found for this signature in database
GPG Key ID: 8F2B333100FB6117
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/mastodon/features/alt_text_modal/index.tsx
View File

@ -15,10 +15,6 @@ import type { List as ImmutableList, Map as ImmutableMap } from 'immutable';
import { useSpring, animated } from '@react-spring/web'; import { useSpring, animated } from '@react-spring/web';
import Textarea from 'react-textarea-autosize'; import Textarea from 'react-textarea-autosize';
import { length } from 'stringz'; import { length } from 'stringz';
// eslint-disable-next-line import/extensions
import tesseractWorkerPath from 'tesseract.js/dist/worker.min.js?url';
// eslint-disable-next-line import/no-extraneous-dependencies
import tesseractCorePath from 'tesseract.js-core/tesseract-core.wasm.js?url';
import { showAlertForError } from 'mastodon/actions/alerts'; import { showAlertForError } from 'mastodon/actions/alerts';
import { uploadThumbnail } from 'mastodon/actions/compose'; import { uploadThumbnail } from 'mastodon/actions/compose';
@ -350,9 +346,15 @@ export const AltTextModal = forwardRef<ModalRef, Props & Partial<RestoreProps>>(
fetchTesseract() fetchTesseract()
.then(async ({ createWorker }) => { .then(async ({ createWorker }) => {
const [tesseractWorkerPath, tesseractCorePath] = await Promise.all([
// eslint-disable-next-line import/extensions
import('tesseract.js/dist/worker.min.js?url'),
// eslint-disable-next-line import/no-extraneous-dependencies
import('tesseract.js-core/tesseract-core.wasm.js?url'),
]);
const worker = await createWorker('eng', 1, { const worker = await createWorker('eng', 1, {
workerPath: tesseractWorkerPath, workerPath: tesseractWorkerPath.default,
corePath: tesseractCorePath, corePath: tesseractCorePath.default,
langPath: `${assetHost}/ocr/lang-data`, langPath: `${assetHost}/ocr/lang-data`,
cacheMethod: 'write', cacheMethod: 'write',
}); });

1
vite.config.mts
View File

@ -131,6 +131,7 @@ const config: UserConfigFnPromise = async ({ mode }) => {
'extra_polyfills-*.js', 'extra_polyfills-*.js',
'polyfill-force-*.js', 'polyfill-force-*.js',
'assets/mailer-*.{js,css}', 'assets/mailer-*.{js,css}',
'**/*tesseract*',
], ],
maximumFileSizeToCacheInBytes: 2 * 1_024 * 1_024, // 2 MiB maximumFileSizeToCacheInBytes: 2 * 1_024 * 1_024, // 2 MiB
}, },