@abi-software/simulationvuer 4.0.0 → 4.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/simulationvuer",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "private": false,
   "scripts": {
     "serve": "vite serve --host --force",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@abi-software/plotvuer": "1.0.7",
-    "@opencor/opencor": "^0.20260728.1",
+    "@opencor/opencor": "^0.20260729.0",
     "element-plus": "2.8.4",
     "jsonschema": "^1.5.0",
     "mathjs": "^15.2.0",

package/vite.config.js

@@ -9,17 +9,10 @@ import { defineConfig } from "vite";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pathSrc = path.resolve(__dirname, "./src");
-
-// Retrieve the version of libOpenCOR used by @opencor/opencor.
-
-const opencorPackage = JSON.parse(
-  fs.readFileSync(
-    path.resolve(__dirname, "node_modules/@opencor/opencor/package.json"),
-    "utf-8",
-  ),
+const libopencorDir = path.resolve(
+  __dirname,
+  "node_modules/@opencor/opencor/dist/libopencor",
 );
-const libopencorVersion = opencorPackage.libopencorVersion;
-const libopencorUrl = `https://opencor.ws/libopencor/downloads/wasm/${libopencorVersion}`;
 
 export default defineConfig(({ command, mode }) => {
   const config = {
@@ -38,44 +31,100 @@ export default defineConfig(({ command, mode }) => {
         dts: "src/components.d.ts",
       }),
 
-      // Rewrite the libOpenCOR import URL in @opencor/opencor to a same-origin path. This is needed because
-      // libopencor.js constructs pthread workers via new Worker(), which requires the worker script to be
-      // same-origin with the page. The actual files are served by the dev server proxy (see below).
+      // Resolve the libopencor.js import URL in @opencor/opencor's opencor.es.js so that it works for all consumers
+      // (not just Vite projects) and this without server configuration.
+      //
+      // In @opencor/opencor, the code uses:
+      //   new URL("./libopencor/wasm/<version>/libopencor.js", window.location.href).href
+      //
+      // This resolves relative to the page URL, requiring the server to host libopencor.js at a page-relative path
+      // (which doesn't work for library consumers or static builds).
+      //
+      // We fix this by:
+      //   - Dev (serve): rewriting to "/libopencor/libopencor.js", served by the middleware below.
+      //   - Build (lib): rewriting to use import.meta.url, so the import resolves relative to simulationvuer.js's URL
+      //                  (same directory, libopencor.js is copied alongside it via closeBundle).
 
       {
-        name: "opencor-local-libopencor",
-        enforce: "pre",
-
-        // Tell Vite that /libopencor/* paths are external.
-        // Note: they are served via the dev server proxy, so Vite should not try to resolve them locally.
-
-        resolveId(id) {
-          if (id.startsWith("/libopencor/")) {
-            return { id, external: true };
+        name: "opencor-libopencor",
+        transform(code, id) {
+          if (id.includes("@opencor/opencor") && id.endsWith("opencor.es.js")) {
+            const importRegex =
+              /(\/\*\s*@vite-ignore\s*\*\/[\s\n]*)(new URL\("(\.\/libopencor\/wasm\/[^/]+\/libopencor\.js)",\s*window\.location\.href\)\.href)/g;
+            const res = code.replace(
+              importRegex,
+              (_match, prefix, _urlExpr, urlPath) => {
+                if (command === "serve") {
+                  // Dev mode: absolute path served by the middleware below.
+
+                  return `${prefix}"/libopencor/libopencor.js"`;
+                }
+
+                // Build mode: resolve relative to the bundle's own URL.
+                // Note: we use replace() instead of new URL(..., import.meta.url) to avoid Vite's asset handler, which
+                //       would inline the file as a data: URL (which breaks Emscripten's pthread Worker creation). At
+                //       runtime, import.meta.url points to simulationvuer.js and the derived path correctly reaches
+                //       libopencor in the same directory (copied alongside by closeBundle).
+
+                return `${prefix}import.meta.url.replace(/[^/]*$/, "") + ${JSON.stringify(urlPath.substring(2))}`;
+              },
+            );
+
+            if (res !== code) {
+              return {
+                code: res,
+                map: null,
+              };
+            }
           }
         },
+        configureServer(server) {
+          // Serve libopencor files from @opencor/opencor during development so the dynamic import in opencor.es.js
+          // resolves same-origin (required for pthread Workers).
 
-        // Rewrite the libOpenCOR URL to same-origin path for @opencor/opencor.
-        // Note: this is needed so the worker constructed inside libopencor.js is same-origin (i.e. no CORS error).
-        //       For production, the target server should be configured to serve /libopencor/* files.
+          server.middlewares.use((req, res, next) => {
+            const urlPath = req.url;
 
-        transform(code, id) {
-          if (command !== "serve") {
+            if (!urlPath.startsWith("/libopencor/")) {
+              next();
+
+              return;
+            }
+
+            const filePath = path.join(
+              libopencorDir,
+              urlPath.replace("/libopencor/", ""),
+            );
+
+            if (!fs.existsSync(filePath)) {
+              next();
+
+              return;
+            }
+
+            res.writeHead(200, {
+              "Content-Type": "application/javascript",
+              "Cross-Origin-Embedder-Policy": "require-corp",
+              "Cross-Origin-Resource-Policy": "same-origin",
+            });
+            res.end(fs.readFileSync(filePath));
+          });
+        },
+        closeBundle() {
+          // Copy libopencor alongside the built JavaScript file so that the dynamic import (using import.meta.url as
+          // base) resolves correctly. App mode puts the built JavaScript file in dist/assets while lib mode puts it in
+          // dist.
+
+          if (!fs.existsSync(libopencorDir)) {
             return;
           }
 
-          if (
-            id.includes("@opencor/opencor") &&
-            !id.split("?")[0].endsWith(".css")
-          ) {
-            return {
-              code: code.replace(
-                /"https:\/\/opencor\.ws\/libopencor\/downloads\/wasm\/[^/]+\/libopencor\.js"/g,
-                '"/libopencor/libopencor.js"',
-              ),
-              map: null,
-            };
-          }
+          const distDir = path.resolve(__dirname, "dist");
+          const targetDir = fs.existsSync(path.join(distDir, "assets"))
+            ? path.join(distDir, "assets", "libopencor")
+            : path.join(distDir, "libopencor");
+
+          fs.cpSync(libopencorDir, targetDir, { recursive: true, force: true });
         },
       },
     ],
@@ -115,17 +164,6 @@ export default defineConfig(({ command, mode }) => {
     config.server = {
       port: 8081,
 
-      // Proxy /libopencor/* requests to the libOpenCOR server, so the worker constructed inside libopencor.js loads
-      // from a same-origin path (new Worker() requires the worker script to be same-origin with the page).
-
-      proxy: {
-        "/libopencor": {
-          target: libopencorUrl,
-          changeOrigin: true,
-          rewrite: (path) => path.replace(/^\/libopencor/, ""),
-        },
-      },
-
       // Emscripten pthreads require SharedArrayBuffer, which needs cross-origin isolation.
 
       headers: {
@@ -133,13 +171,6 @@ export default defineConfig(({ command, mode }) => {
         "Cross-Origin-Embedder-Policy": "require-corp",
       },
     };
-
-    // Exclude @opencor/opencor from Vite's pre-bundling so our transform plugin above can rewrite the import URL in
-    // opencor.es.js.
-
-    config.optimizeDeps = {
-      exclude: ["@opencor/opencor"],
-    };
     config.define = {
       "process.env.HTTP_PROXY": 8081,
       global: "globalThis",