From f6bd66074a8c02fc706a78ffd733a340e985c0d4 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 13 Jan 2025 17:20:12 +0800 Subject: [PATCH] Revert "chore: enable local worker file in development mode" (#4314) This reverts commit 5e82bb2afc5688df96af456b53b164470ff84aeb. --- .../src/node/express-file-server.contribution.ts | 12 ------------ packages/monaco/src/browser/monaco.contribution.ts | 12 +----------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/packages/express-file-server/src/node/express-file-server.contribution.ts b/packages/express-file-server/src/node/express-file-server.contribution.ts index b1a7c7b705..3e61866bcb 100644 --- a/packages/express-file-server/src/node/express-file-server.contribution.ts +++ b/packages/express-file-server/src/node/express-file-server.contribution.ts @@ -30,18 +30,6 @@ export class ExpressFileServerContribution implements ServerAppContribution { return; } - if (process.env.NODE_ENV === 'development' && uriPath.startsWith('/monaco/worker')) { - const filePath = path.resolve(__dirname, `../../../${uriPath}`); - const contentType = ALLOW_MIME[path.extname(filePath).slice(1)]; - if (!contentType) { - ctx.status = 404; - return; - } - ctx.set('Content-Type', contentType); - ctx.body = fs.createReadStream(filePath); - return; - } - const filePath = URI.parse(`file://${uriPath}`).codeUri.fsPath; const whitelist = this.getWhiteList(); const contentType = ALLOW_MIME[path.extname(filePath).slice(1)]; diff --git a/packages/monaco/src/browser/monaco.contribution.ts b/packages/monaco/src/browser/monaco.contribution.ts index 82453f4c94..483b6d755c 100644 --- a/packages/monaco/src/browser/monaco.contribution.ts +++ b/packages/monaco/src/browser/monaco.contribution.ts @@ -301,17 +301,7 @@ export class MonacoClientContribution }; const getWorker = (moduleId, label) => { - let url: string; - - /** - * 开发模式下，直接使用本地文件 - */ - if (process.env.NODE_ENV === 'development') { - url = 'assets/monaco/worker/editor.worker.bundle.js'; - } else { - url = getWorkerUrl(moduleId, label); - } - + const url = getWorkerUrl(moduleId, label); /** * monaco 0.53 版本开始，创建 worker 线程时都指定了 type 为 module，而我们模块格式不兼容 * 所以需要覆写 getWorker 函数，手动创建 worker 线程