diff --git a/config/rollup.config.js b/config/rollup.config.js index d19c404..526288b 100644 --- a/config/rollup.config.js +++ b/config/rollup.config.js @@ -63,9 +63,10 @@ export default [ ], }, { - input: `./node_modules/tfhe/snippets/${wasmBindgenRayon}/src/workerHelpers.worker.js`, + input: `./node_modules/tfhe/snippets/${wasmBindgenRayon}/src/workerHelpers.js`, output: { - file: 'lib/workerHelpers.worker.js', + file: 'lib/workerHelpers.js', + inlineDynamicImports: true, name: 'worker', format: 'esm', }, diff --git a/config/vite.config.js b/config/vite.config.js index 7a25cb8..0c5d3fe 100644 --- a/config/vite.config.js +++ b/config/vite.config.js @@ -35,7 +35,7 @@ export default defineConfig({ ], worker: { format: 'iife', - plugins: [ignoreURL(basePath)], + plugins: () => [ignoreURL(basePath)], rollupOptions: { output: { entryFileNames: '[name].js', diff --git a/config/vite.replace.js b/config/vite.replace.js index 083d33e..c9bc636 100644 --- a/config/vite.replace.js +++ b/config/vite.replace.js @@ -5,18 +5,18 @@ export const changeLoadingWorker = (basePath) => ({ // Only apply transformations to .js files (or other specific conditions) if (id.endsWith('.js')) { const searchValue = - /const worker = new Worker\(\s*new URL\(['"]\.?\/?workerHelpers\.worker\.js['"],\s*import\.meta\.url\),\s*\{\s*type:\s*'module',?\s*\},?\s*\);/; + /const worker = new Worker\(\s*new URL\(['"]\.?\/?workerHelpers.js['"],\s*import\.meta\.url\),\s*\{\s*type:\s*'module',?\s*\},?\s*\);/; const replacement = `let worker; try { worker = new Worker( - new URL('./workerHelpers.worker.js', import.meta.url), + new URL('./workerHelpers.js', import.meta.url), { type: 'module' } ); } catch (e) { - const r = await fetch('${basePath}workerHelpers.worker.js'); + const r = await fetch('${basePath}workerHelpers.js'); const blob = await r.blob(); const blobUrl = URL.createObjectURL(blob); worker = new Worker(blobUrl);