#6246 - Import indigo with EXPORT_ES6 & USE_ES6_IMPORT_META options

example/.env

@@ -1,4 +1,4 @@
 SKIP_PREFLIGHT_CHECK=true
 REACT_APP_API_PATH=/v2
 PUBLIC_URL=./
-GENERATE_SOURCEMAP = false
+GENERATE_SOURCEMAP = false

example/config/webpack.config.js

@@ -3,6 +3,7 @@ const {
   addBundleVisualizer,
   addWebpackModuleRule,
   addWebpackPlugin,
+  addWebpackResolve,
 } = require('customize-cra');
 const webpack = require('webpack');
 const HtmlReplaceWebpackPlugin = require('html-replace-webpack-plugin');
@@ -26,6 +27,9 @@ module.exports = override(
     loader: 'source-map-loader',
     exclude: /node_modules/,
   }),
+  addWebpackResolve({
+    fallback: { url: false },
+  }),
   addWebpackPlugin(new webpack.EnvironmentPlugin(envVariables)),
   addWebpackPlugin(
     new HtmlReplaceWebpackPlugin([
@@ -35,16 +39,6 @@ module.exports = override(
       },
     ]),
   ),
-  addWebpackPlugin(
-    new CopyPlugin({
-      patterns: [
-        {
-          from: '../node_modules/ketcher-standalone/**/*.wasm',
-          to: '[name][ext]',
-        },
-      ],
-    }),
-  ),
 );
 
 module.exports.envVariables = envVariables;

example/src/App.tsx

@@ -25,27 +25,14 @@ let structServiceProvider: StructServiceProvider =
   new RemoteStructServiceProvider(
     process.env.API_PATH || process.env.REACT_APP_API_PATH,
   );
+
 if (process.env.MODE === 'standalone') {
-  if (process.env.USE_SEPARATE_INDIGO_WASM === 'true') {
-    // It is possible to use just 'ketcher-standalone' instead of ketcher-standalone/dist/binaryWasm
-    // however, it will increase the size of the bundle more than two times because wasm will be
-    // included in ketcher bundle as base64 string.
-    // In case of usage ketcher-standalone/dist/binaryWasm additional build configuration required
-    // to copy .wasm files in build folder. Please check /example/config/webpack.config.js.
-    const {
-      StandaloneStructServiceProvider,
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-    } = require('ketcher-standalone/dist/binaryWasm');
-    structServiceProvider =
-      new StandaloneStructServiceProvider() as StructServiceProvider;
-  } else {
-    const {
-      StandaloneStructServiceProvider,
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-    } = require('ketcher-standalone');
-    structServiceProvider =
-      new StandaloneStructServiceProvider() as StructServiceProvider;
-  }
+  const {
+    StandaloneStructServiceProvider,
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+  } = require('ketcher-standalone');
+  structServiceProvider =
+    new StandaloneStructServiceProvider() as StructServiceProvider;
 }
 
 const App = () => {

example/vite.config.js

@@ -12,6 +12,7 @@ import { valuesToReplace as ketcherReactValues } from '../packages/ketcher-react
 import ketcherReactTSConfig from '../packages/ketcher-react/tsconfig.json';
 import ketcherStandaloneTSConfig from '../packages/ketcher-standalone/tsconfig.json';
 import { envVariables as exampleEnv } from './config/webpack.config';
+import { INDIGO_WORKER_IMPORTS } from '../packages/ketcher-standalone/rollup.config';
 
 const dotEnv = loadEnv('development', '.', '');
 Object.assign(process.env, dotEnv, exampleEnv);
@@ -202,13 +203,17 @@ export default defineConfig({
 
       /** Web worker in ketcher-standalone */
       {
-        find: 'web-worker:./indigoWorker',
-        replacement: './indigoWorker?worker',
+        find: 'web-worker:./../indigoWorker',
+        replacement: './../indigoWorker?worker',
       },
       {
         find: '_indigo-ketcher-import-alias_',
         replacement: 'indigo-ketcher',
       },
+      {
+        find: '_indigo-worker-import-alias_',
+        replacement: INDIGO_WORKER_IMPORTS.WASM_LOADER,
+      },
     ],
   },
   customLogger: logger,

packages/ketcher-standalone/package.json

@@ -29,7 +29,7 @@
     "node": ">=14"
   },
   "scripts": {
-    "build": "cross-env NODE_ENV=production rollup -c -m true && cross-env NODE_ENV=production INDIGO_MODULE_NAME=wasm rollup -c -m true && cross-env NODE_ENV=production INDIGO_MODULE_NAME=base64WithoutRender SEPARATE_INDIGO_RENDER=true rollup -c -m true && cross-env NODE_ENV=production INDIGO_MODULE_NAME=wasmWithoutRender SEPARATE_INDIGO_RENDER=true rollup -c -m true",
+    "build": "cross-env NODE_ENV=production rollup -c -m true && cross-env NODE_ENV=production INDIGO_MODULE_NAME=base64Cjs rollup -c -m true && cross-env NODE_ENV=production INDIGO_MODULE_NAME=wasm rollup -c -m true && cross-env NODE_ENV=production INDIGO_MODULE_NAME=base64WithoutRender SEPARATE_INDIGO_RENDER=true rollup -c -m true && cross-env NODE_ENV=production INDIGO_MODULE_NAME=base64WithoutRenderCjs SEPARATE_INDIGO_RENDER=true rollup -c -m true && cross-env NODE_ENV=production INDIGO_MODULE_NAME=wasmWithoutRender SEPARATE_INDIGO_RENDER=true rollup -c -m true",
     "start": "cross-env NODE_ENV=development rollup -c -m true -w",
     "test": "run-s test:prettier test:eslint:quiet test:types test:unit",
     "test:eslint": "eslint . --ext .ts,.js",
@@ -56,6 +56,7 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.7",
     "@rollup/plugin-strip": "^2.0.0",
+    "@surma/rollup-plugin-off-main-thread": "^2.2.3",
     "@types/jest": "^27.0.3",
     "@types/node": "^16.11.12",
     "cross-env": "^7.0.3",
@@ -79,20 +80,18 @@
   ],
   "exports": {
     ".": {
-      "import": "./dist/index.modern.js",
-      "require": "./dist/index.js"
+      "import": "./dist/index.js",
+      "require": "./dist/cjs/index.js"
     },
     "./dist/binaryWasm": {
-      "import": "./dist/binaryWasm/index.modern.js",
-      "require": "./dist/binaryWasm/index.js"
+      "import": "./dist/binaryWasm/index.js"
     },
     "./dist/jsNoRender": {
-      "import": "./dist/jsNoRender/index.modern.js",
-      "require": "./dist/jsNoRender/index.js"
+      "import": "./dist/jsNoRender/index.js",
+      "require": "./dist/cjs/jsNoRender/index.js"
     },
     "./dist/binaryWasmNoRender": {
-      "import": "./dist/binaryWasmNoRender/index.modern.js",
-      "require": "./dist/binaryWasmNoRender/index.js"
+      "import": "./dist/binaryWasmNoRender/index.js"
     }
   }
 }