From 0cfd3bbe97f6f8ae6fb855438cab9944b46eee55 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Date: Tue, 17 Mar 2026 12:26:27 +0800
Subject: [PATCH] Reapply "fix(web): load hoisted monaco shiki assets locally"

This reverts commit 5391664d8198f68cec81d5671b113056343b136c.
---
 .../modern-monaco/shiki.mjs                   |  8 +++---
 web/scripts/hoist-modern-monaco.ts            | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/web/public/hoisted-modern-monaco/modern-monaco/shiki.mjs b/web/public/hoisted-modern-monaco/modern-monaco/shiki.mjs
index 4a517060af..79d4242702 100644
--- a/web/public/hoisted-modern-monaco/modern-monaco/shiki.mjs
+++ b/web/public/hoisted-modern-monaco/modern-monaco/shiki.mjs
@@ -7869,7 +7869,7 @@ async function initShiki({
   });
   return highlighterCore;
 }
-function loadTMTheme(src, cdn = "https://esm.sh") {
+function loadTMTheme(src, cdn = import.meta.url) {
   if (isUrlOrPathname(src)) {
     return cache.fetch(src).then((res) => res.json());
   }
@@ -7882,16 +7882,16 @@ function loadTMTheme(src, cdn = "https://esm.sh") {
       `Invalid theme ID: ${src}, please ensure the theme ID is one of the following: ${Array.from(shikiThemeIds.keys()).join(", ")}`
     );
   }
-  const url = new URL(`/tm-themes@${version2}/themes/${src}.json`, cdn);
+  const url = new URL(`../tm-themes@${version2}/themes/${src}.json`, cdn);
   return cache.fetch(url).then((res) => res.json());
 }
-function loadTMGrammar(src, cdn = "https://esm.sh") {
+function loadTMGrammar(src, cdn = import.meta.url) {
   if (isUrlOrPathname(src)) {
     return cache.fetch(src).then((res) => res.json());
   }
   const g = grammars.find((g2) => g2.name === src);
   if (g) {
-    const url = new URL(`/tm-grammars@${version}/grammars/${g.name}.json`, cdn);
+    const url = new URL(`../tm-grammars@${version}/grammars/${g.name}.json`, cdn);
     return cache.fetch(url).then((res) => res.json());
   }
   throw new Error(`Unsupported grammar source: ${src}`);
diff --git a/web/scripts/hoist-modern-monaco.ts b/web/scripts/hoist-modern-monaco.ts
index 99c9c5ec39..eb7036365c 100644
--- a/web/scripts/hoist-modern-monaco.ts
+++ b/web/scripts/hoist-modern-monaco.ts
@@ -198,6 +198,30 @@ async function patchTypeScriptWorkerBootstrap(setupFilePath: string) {
   await writeFile(setupFilePath, next)
 }
 
+async function patchShikiAssetLoaders(shikiFilePath: string) {
+  const original = await readFile(shikiFilePath, 'utf8')
+  const version2Expr = `$${'{version2}'}`
+  const versionExpr = `$${'{version}'}`
+  const srcExpr = `$${'{src}'}`
+  const grammarNameExpr = `$${'{g.name}'}`
+  const next = original
+    .replace(/function loadTMTheme\(src, cdn = "https:\/\/esm\.sh"\) \{/, 'function loadTMTheme(src, cdn = import.meta.url) {')
+    .replace(
+      /const url = new URL\(`\/tm-themes@\$\{version2\}\/themes\/\$\{src\}\.json`, cdn\);/,
+      `const url = new URL(\`../tm-themes@${version2Expr}/themes/${srcExpr}.json\`, cdn);`,
+    )
+    .replace(/function loadTMGrammar\(src, cdn = "https:\/\/esm\.sh"\) \{/, 'function loadTMGrammar(src, cdn = import.meta.url) {')
+    .replace(
+      /const url = new URL\(`\/tm-grammars@\$\{version\}\/grammars\/\$\{g\.name\}\.json`, cdn\);/,
+      `const url = new URL(\`../tm-grammars@${versionExpr}/grammars/${grammarNameExpr}.json\`, cdn);`,
+    )
+
+  if (next === original)
+    throw new Error('Failed to patch modern-monaco shiki asset loaders')
+
+  await writeFile(shikiFilePath, next)
+}
+
 async function writeManifest(filePath: string, manifest: object) {
   await writeFile(filePath, `${JSON.stringify(manifest, null, 2)}\n`)
 }
@@ -276,6 +300,7 @@ async function main() {
   log(`Copying modern-monaco dist -> ${path.relative(ROOT_DIR, MODERN_MONACO_PUBLIC_DIR)}`)
   await rm(MODERN_MONACO_PUBLIC_DIR, { force: true, recursive: true })
   await cp(MODERN_MONACO_DIST_DIR, MODERN_MONACO_PUBLIC_DIR, { recursive: true })
+  await patchShikiAssetLoaders(path.join(MODERN_MONACO_PUBLIC_DIR, 'shiki.mjs'))
 
   log(`Downloading typescript ESM -> ${localTypeScriptPath}`)
   await writeResponseToFile(`${ESM_SH}${localTypeScriptPath}`, typeScriptPublicPath)