youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-03-21 06:18:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reapply "fix(web): load hoisted monaco shiki assets locally"

Browse Source 
This reverts commit 5391664d81.
This commit is contained in:
Stephen Zhou
2026-03-17 12:26:27 +08:00
parent 9e95bf02bf
commit 0cfd3bbe97
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/public/hoisted-modern-monaco/modern-monaco/shiki.mjs
View File

@ -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}`);

25
web/scripts/hoist-modern-monaco.ts
View File

@ -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)