@abi-software/simulationvuer 3.2.6 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/simulationvuer",
-  "version": "3.2.6",
+  "version": "4.0.0",
   "private": false,
   "scripts": {
     "serve": "vite serve --host --force",
@@ -21,32 +21,35 @@
   },
   "dependencies": {
     "@abi-software/plotvuer": "1.0.7",
-    "@opencor/opencor": "^0.20260616.0",
+    "@opencor/opencor": "^0.20260728.1",
     "element-plus": "2.8.4",
-    "jsonschema": "^1.4.0",
-    "mathjs": "^15.1.0",
+    "jsonschema": "^1.5.0",
+    "mathjs": "^15.2.0",
     "unplugin-vue-components": "^0.26.0",
-    "vue": "^3.4.21"
+    "vue": "3.4.21"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.28.6",
-    "@vitejs/plugin-vue": "^5.0.3",
+    "@babel/eslint-parser": "^7.29.7",
+    "@vitejs/plugin-vue": "^5.2.4",
     "@vuese/markdown-render": "^2.11.3",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.1",
     "base64-inline-loader": "^2.0.1",
     "chokidar": "^3.6.0",
     "concurrently": "^8.2.2",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-vue": "^9.20.1",
-    "prettier": "^3.0.0",
-    "sass": "^1.70.0",
-    "vite": "^5.0.12",
-    "vitepress": "^1.0.0-rc.45",
+    "eslint": "^8.57.1",
+    "eslint-config-prettier": "^9.1.2",
+    "eslint-plugin-prettier": "^5.5.6",
+    "eslint-plugin-vue": "^9.33.0",
+    "jsonschema": "^1.5.0",
+    "mathjs": "^15.2.0",
+    "prettier": "^3.9.6",
+    "sass": "^1.102.0",
+    "unplugin-vue-components": "^0.26.0",
+    "vite": "^5.4.21",
+    "vitepress": "^1.6.4",
     "vue-docgen-api": "^4.79.2",
-    "vue-router": "^4.2.5",
+    "vue-router": "4.2.5",
     "webpack-node-externals": "^2.5.2"
   },
   "eslintConfig": {

package/vite.config.js

@@ -1,5 +1,6 @@
 import vue from "@vitejs/plugin-vue";
 
+import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { ElementPlusResolver } from "unplugin-vue-components/resolvers";
@@ -9,6 +10,17 @@ 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 libopencorVersion = opencorPackage.libopencorVersion;
+const libopencorUrl = `https://opencor.ws/libopencor/downloads/wasm/${libopencorVersion}`;
+
 export default defineConfig(({ command, mode }) => {
   const config = {
     plugins: [
@@ -25,24 +37,73 @@ export default defineConfig(({ command, mode }) => {
         ],
         dts: "src/components.d.ts",
       }),
-    ],
-    build: {
-      lib: {
-        entry: path.resolve(__dirname, "./src/components/index.js"),
-        name: "SimulationVuer",
-        fileName: "simulationvuer",
-      },
-      rollupOptions: {
-        external: ["vue", "@abi-software/svg-sprite", "@abi-software/plotvuer"],
-        output: {
-          globals: {
-            vue: "Vue",
-            "@abi-software/svg-sprite": "@abi-software/svg-sprite",
-            "@abi-software/plotvuer": "@abi-software/plotvuer",
-          },
+
+      // 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).
+
+      {
+        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 };
+          }
+        },
+
+        // 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.
+
+        transform(code, id) {
+          if (command !== "serve") {
+            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,
+            };
+          }
         },
       },
-    },
+    ],
+    base: mode === "app" ? "./" : "/",
+    build:
+      mode === "app"
+        ? {}
+        : {
+            lib: {
+              entry: path.resolve(__dirname, "./src/components/index.js"),
+              name: "SimulationVuer",
+              fileName: "simulationvuer",
+            },
+            rollupOptions: {
+              external: [
+                "vue",
+                "@abi-software/svg-sprite",
+                "@abi-software/plotvuer",
+              ],
+              output: {
+                globals: {
+                  vue: "Vue",
+                  "@abi-software/svg-sprite": "@abi-software/svg-sprite",
+                  "@abi-software/plotvuer": "@abi-software/plotvuer",
+                },
+              },
+            },
+          },
     resolve: {
       alias: {
         "~/": `${pathSrc}/`,
@@ -53,6 +114,31 @@ export default defineConfig(({ command, mode }) => {
   if (command === "serve") {
     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: {
+        "Cross-Origin-Opener-Policy": "same-origin",
+        "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,
@@ -60,13 +146,5 @@ export default defineConfig(({ command, mode }) => {
     };
   }
 
-  if (mode === "app") {
-    config.base = "./";
-
-    for (const key of ["build", "define", "resolve", "server"]) {
-      delete config[key];
-    }
-  }
-
   return config;
 });