@wandelbots/wandelbots-js-react-components 1.51.0 → 1.51.1-pr.fix-shiki-singleton.170.af06691

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wandelbots/wandelbots-js-react-components",
-  "version": "1.51.0",
+  "version": "v1.51.1-pr.fix-shiki-singleton.170.af06691",
   "description": "React UI toolkit for building applications on top of the Wandelbots platform",
   "type": "module",
   "sideEffects": false,

package/src/components/wandelscript-editor/WandelscriptEditor.tsx

@@ -24,6 +24,37 @@ type WandelscriptEditorProps = {
 
 const Editor = lazy(() => import("@monaco-editor/react"))
 
+let preparedShiki: {
+  shiki: HighlighterGeneric<BundledLanguage, BundledTheme>
+  shikiToMonaco: (
+    shiki: HighlighterGeneric<BundledLanguage, BundledTheme>,
+    monaco: Monaco,
+  ) => void
+} | null = null
+
+async function getShiki() {
+  if (!preparedShiki) {
+    const [{ createHighlighter }, { shikiToMonaco }] = await Promise.all([
+      import("shiki"),
+      import("@shikijs/monaco"),
+    ])
+
+    const shiki = await createHighlighter({
+      // Our textmate grammar doesn't quite conform to the expected type
+      // here; I'm not sure what the missing properties mean exactly
+      langs: [wandelscriptTextmateGrammar as any],
+      themes: ["dark-plus", "light-plus"],
+    })
+
+    preparedShiki = {
+      shiki,
+      shikiToMonaco,
+    }
+  }
+
+  return preparedShiki
+}
+
 /** A Monaco (VSCode-style) embedded code editor with Wandelscript syntax highlighting */
 export const WandelscriptEditor = externalizeComponent(
   (props: WandelscriptEditorProps) => {
@@ -38,11 +69,6 @@ export const WandelscriptEditor = externalizeComponent(
       theme.palette.mode === "dark" ? "dark-plus" : "light-plus"
 
     async function setupEditor(monaco: Monaco) {
-      const [{ createHighlighter }, { shikiToMonaco }] = await Promise.all([
-        import("shiki"),
-        import("@shikijs/monaco"),
-      ])
-
       // Register and configure the Wandelscript language
       monaco.languages.register({ id: "wandelscript" })
 
@@ -64,19 +90,11 @@ export const WandelscriptEditor = externalizeComponent(
         ],
       })
 
+      const { shiki, shikiToMonaco } = await getShiki()
+
       // Monaco doesn't support TextMate grammar config directly, so we
       // use Shiki as an intermediary
-
-      if (!shikiHighlighterRef.current) {
-        shikiHighlighterRef.current = await createHighlighter({
-          // Our textmate grammar doesn't quite conform to the expected type
-          // here; I'm not sure what the missing properties mean exactly
-          langs: [wandelscriptTextmateGrammar as any],
-          themes: ["dark-plus", "light-plus"],
-        })
-      }
-
-      shikiToMonaco(shikiHighlighterRef.current, monaco)
+      shikiToMonaco(shiki, monaco)
 
       // Override the generated shiki theme to use shiki syntax highlighting
       // but vscode colors