@tscircuit/3d-viewer 0.0.625 → 0.0.626

package/dist/index.js

@@ -18978,6 +18978,41 @@ var useHiddenCadComponents = (circuitKey) => {
   };
 };
 
+// src/utils/configure-runtime-font.ts
+import { configureTextBuilder } from "troika-three-text";
+
+// src/utils/get-runtime-asset-url.ts
+function getRuntimeAssetUrl(packageName, version, path) {
+  const baseUrl = typeof window !== "undefined" ? window.TSCIRCUIT_JSCDN_BASE_URL : void 0;
+  if (!baseUrl) {
+    return `https://cdn.jsdelivr.net/npm/${packageName}@${version}/${path}`;
+  }
+  return new URL(
+    `${baseUrl.replace(/\/+$/, "")}/${packageName}/${version}/${path}`,
+    window.location.href
+  ).href;
+}
+
+// src/utils/configure-runtime-font.ts
+var configured = false;
+function configureRuntimeFont() {
+  if (configured || typeof window === "undefined" || !window.TSCIRCUIT_JSCDN_BASE_URL)
+    return;
+  configureTextBuilder({
+    defaultFontURL: getRuntimeAssetUrl(
+      "three",
+      "0.165.0",
+      "examples/fonts/ttf/kenpixel.ttf"
+    ),
+    unicodeFontsURL: getRuntimeAssetUrl(
+      "troika-three-text",
+      "0.52.5",
+      "unicode-fonts/"
+    )
+  });
+  configured = true;
+}
+
 // src/CadViewer.tsx
 import { useCallback as useCallback25, useContext as useContext11, useEffect as useEffect51, useRef as useRef29, useState as useState42 } from "react";
 import * as THREE57 from "three";
@@ -20129,7 +20164,6 @@ function occtMeshesToGroup(meshes) {
 // src/three-components/StepModel.tsx
 import { jsx as jsx9 } from "react/jsx-runtime";
 var occtImportPromise;
-var OCCT_CDN_BASE_URL = "https://cdn.jsdelivr.net/npm/occt-import-js@0.0.23/dist";
 function resolveOcctFactory(candidate) {
   if (typeof candidate === "function") {
     return candidate;
@@ -20141,13 +20175,19 @@ function resolveOcctFactory(candidate) {
 }
 async function loadOcctImport() {
   if (!occtImportPromise) {
-    const imported = await import(
-      /* @vite-ignore */
-      "https://cdn.jsdelivr.net/npm/occt-import-js@0.0.23/+esm"
-    );
-    const factory = resolveOcctFactory(imported);
-    occtImportPromise = factory({
-      locateFile: (path) => `${OCCT_CDN_BASE_URL}/${path}`
+    occtImportPromise = (async () => {
+      const imported = await import(
+        /* @vite-ignore */
+        /* webpackIgnore: true */
+        getRuntimeAssetUrl("occt-import-js", "0.0.23", "+esm")
+      );
+      const factory = resolveOcctFactory(imported);
+      return factory({
+        locateFile: (path) => getRuntimeAssetUrl("occt-import-js", "0.0.23", `dist/${path}`)
+      });
+    })().catch((error) => {
+      occtImportPromise = void 0;
+      throw error;
     });
   }
   return occtImportPromise;
@@ -20951,7 +20991,7 @@ import * as THREE27 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.624",
+  version: "0.0.625",
   repository: {
     type: "git",
     url: "https://github.com/tscircuit/3d-viewer"
@@ -30173,6 +30213,33 @@ function createGeometryMeshes(geoms) {
   return meshes;
 }
 
+// src/utils/manifold/load-manifold.ts
+var manifoldPromise;
+function loadManifold() {
+  if (!manifoldPromise) {
+    manifoldPromise = (async () => {
+      const existing = window.ManifoldModule ?? window.MANIFOLD ?? window.MANIFOLD_MODULE;
+      if (existing && typeof existing === "object" && existing.setup) {
+        window.ManifoldModule = existing;
+        return existing;
+      }
+      const factory = existing ?? (await import(
+        /* @vite-ignore */
+        /* webpackIgnore: true */
+        getRuntimeAssetUrl("manifold-3d", "3.2.1", "manifold.js")
+      )).default;
+      const module = await factory();
+      module.setup();
+      window.ManifoldModule = module;
+      return module;
+    })().catch((error) => {
+      manifoldPromise = void 0;
+      throw error;
+    });
+  }
+  return manifoldPromise;
+}
+
 // src/CadViewerManifold.tsx
 import { jsx as jsx19, jsxs as jsxs5 } from "react/jsx-runtime";
 var BoardMeshes = ({
@@ -30247,7 +30314,6 @@ var BoardMeshes = ({
   }, [rootObject, textureMeshes]);
   return null;
 };
-var MANIFOLD_CDN_BASE_URL = "https://cdn.jsdelivr.net/npm/manifold-3d@3.2.1";
 var CadViewerManifold = ({
   circuitJson: circuitJsonProp,
   foldPcbs,
@@ -30269,65 +30335,18 @@ var CadViewerManifold = ({
   const [manifoldLoadingError, setManifoldLoadingError] = useState19(null);
   const { visibility } = useLayerVisibility();
   useEffect31(() => {
-    if (window.ManifoldModule && typeof window.ManifoldModule === "object" && window.ManifoldModule.setup) {
-      setManifoldJSModule(window.ManifoldModule);
-      return;
-    }
-    const initManifold = async (ManifoldModule) => {
-      try {
-        const loadedModule = await ManifoldModule();
-        loadedModule.setup();
-        window.ManifoldModule = loadedModule;
-        setManifoldJSModule(loadedModule);
-      } catch (error) {
-        console.error("Failed to initialize Manifold:", error);
-        setManifoldLoadingError(
-          `Failed to initialize Manifold: ${error instanceof Error ? error.message : "Unknown error"}`
-        );
-      }
-    };
-    const existingManifold = window.ManifoldModule ?? window.MANIFOLD ?? window.MANIFOLD_MODULE;
-    if (existingManifold) {
-      window.ManifoldModule = existingManifold;
-      initManifold(window.ManifoldModule);
-      return;
-    }
-    const eventName = "manifoldLoaded";
-    const handleLoad = () => {
-      const loadedManifold = window.ManifoldModule ?? window.MANIFOLD ?? window.MANIFOLD_MODULE;
-      if (loadedManifold) {
-        window.ManifoldModule = loadedManifold;
-        initManifold(window.ManifoldModule);
-      } else {
-        const errText = "ManifoldModule not found on window after script load.";
-        console.error(errText);
-        setManifoldLoadingError(errText);
-      }
-    };
-    window.addEventListener(eventName, handleLoad, { once: true });
-    const script = document.createElement("script");
-    script.type = "module";
-    script.innerHTML = `
-try {
-  const { default: ManifoldModule } = await import('${MANIFOLD_CDN_BASE_URL}/manifold.js');
-  window.ManifoldModule = ManifoldModule;
-} catch (e) {
-  console.error('Error importing manifold in dynamic script:', e);
-} finally {
-  window.dispatchEvent(new CustomEvent('${eventName}'));
-}
-    `.trim();
-    const scriptError = (err) => {
-      const errText = "Failed to load Manifold loader script.";
-      console.error(errText, err);
-      setManifoldLoadingError(errText);
-      window.removeEventListener(eventName, handleLoad);
-    };
-    script.addEventListener("error", scriptError);
-    document.body.appendChild(script);
+    let isActive = true;
+    loadManifold().then((module) => {
+      if (isActive) setManifoldJSModule(module);
+    }).catch((error) => {
+      if (!isActive) return;
+      console.error("Failed to initialize Manifold:", error);
+      setManifoldLoadingError(
+        `Failed to initialize Manifold: ${error instanceof Error ? error.message : "Unknown error"}`
+      );
+    });
     return () => {
-      window.removeEventListener(eventName, handleLoad);
-      script.removeEventListener("error", scriptError);
+      isActive = false;
     };
   }, []);
   const {
@@ -38827,6 +38846,7 @@ var CadViewerInner = (props) => {
   );
 };
 var CadViewer = (props) => {
+  configureRuntimeFont();
   const sceneRef = useRef29(null);
   return /* @__PURE__ */ jsx38(SchematicNavigationContext.Provider, { value: sceneRef, children: /* @__PURE__ */ jsx38(
     CameraControllerProvider,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.625",
+  "version": "0.0.626",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/3d-viewer"