- experiments to use esm with wasm

epam · Jan 16, 2025 · 2778488 · 2778488
1 parent dd5cb76
commit 2778488
Show file tree

Hide file tree

Showing 4 changed files with 189 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ketcher-standalone/package.json b/packages/ketcher-standalone/package.json
@@ -58,8 +58,10 @@
     "@rollup/plugin-strip": "^2.0.0",
     "@rollup/plugin-url": "^8.0.2",
     "@rollup/plugin-wasm": "^6.2.2",
+    "@surma/rollup-plugin-off-main-thread": "^2.2.3",
     "@types/jest": "^27.0.3",
     "@types/node": "^16.11.12",
+    "@web/rollup-plugin-import-meta-assets": "^2.2.1",
     "cross-env": "^7.0.3",
     "eslint": "^8.44.0",
     "eslint-plugin-jest": "^25.3.0",

diff --git a/packages/ketcher-standalone/rollup.config.js b/packages/ketcher-standalone/rollup.config.js
@@ -13,6 +13,8 @@ import { license } from '../../license.ts';
 import replace from '@rollup/plugin-replace';
 import wasm from '@rollup/plugin-wasm';
 import url from '@rollup/plugin-url';
+import { importMetaAssets } from '@web/rollup-plugin-import-meta-assets';
+import OMT from '@surma/rollup-plugin-off-main-thread';
 
 const mode = {
   PRODUCTION: 'production',
@@ -26,7 +28,6 @@ const includePattern = 'src/**/*';
 const baseConfig = {
   input: {
     index: 'src/index.ts',
-    indigoWorker: 'src/infrastructure/services/struct/indigoWorker.ts',
   },
   external: ['ketcher-core', /@babel\/runtime/],
   plugins: [
@@ -48,7 +49,6 @@ const baseConfig = {
       'process.env.SEPARATE_INDIGO_RENDER': process.env.SEPARATE_INDIGO_RENDER,
     }),
     ...(isProduction ? [strip({ include: includePattern })] : []),
-    wasm(),
   ],
 };
 
@@ -88,12 +88,6 @@ const configWithWasmBase64 = {
 const configWithWasmFetch = {
   ...baseConfig,
   output: [
-    {
-      dir: 'dist/cjs/binaryWasm',
-      exports: 'named',
-      format: 'cjs',
-      banner: license,
-    },
     {
       dir: 'dist/binaryWasm',
       exports: 'named',
@@ -111,6 +105,7 @@ const configWithWasmFetch = {
         },
       ],
     }),
+    OMT(),
   ],
 };
 

diff --git a/packages/ketcher-standalone/src/infrastructure/services/struct/standaloneStructService.ts b/packages/ketcher-standalone/src/infrastructure/services/struct/standaloneStructService.ts
@@ -78,7 +78,7 @@ import {
 } from './constants';
 
 const indigoWorker: Worker = new Worker(
-  new URL('./indigoWorker', import.meta.url),
+  new URL('./indigoWorker2.js', import.meta.url),
   { type: 'module' },
 );