ui: monaco feature loader: support multi

packages/ui-default/components/monaco/loader.ts

@@ -19,9 +19,12 @@ const loaders = {
   typescript: () => import('./languages/typescript'),
   yaml: () => import('./languages/yaml'),
   external: async (monaco, feat) => {
-    let apply = await loadExternalModule(window.externalModules[`monaco-${feat}`]);
+    const items = Object.keys(window.externalModules).filter((i) => i === `monaco-${feat}` || i.startsWith(`monaco-${feat}@`));
-    if (typeof apply !== 'function') apply = apply.default || apply.apply;
+    for (const item of items) {
-    if (typeof apply === 'function') await apply(monaco);
+      let apply = await loadExternalModule(window.externalModules[`monaco-${item}`]);
+      if (typeof apply !== 'function') apply = apply.default || apply.apply;
+      if (typeof apply === 'function') await apply(monaco);
+    }
   },
 };
 
@@ -38,9 +41,12 @@ export async function load(features = ['markdown']) {
   }
   for (const feat of features) {
     if (loaded.includes(feat)) continue;
-    if (!loaders[feat] && !window.externalModules[`monaco-${feat}`]) {
+    if (!loaders[feat]) {
-      console.warn('Unknown monaco feature:', feat);
+      const items = Object.keys(window.externalModules).filter((i) => i === `monaco-${feat}` || i.startsWith(`monaco-${feat}@`));
-      continue;
+      if (!items.length) {
+        console.warn('Unknown monaco feature:', feat);
+        continue;
+      }
     }
     s = Date.now();
     console.log('Loading monaco feature:', feat);

packages/ui-default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.38.30",
+  "version": "4.38.31",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",