npm - @opensumi/ide-monaco - Versions diffs - 3.0.2-next-1716279955.0 → 3.0.2 - Mend

@opensumi/ide-monaco 3.0.2-next-1716279955.0 → 3.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/browser/monaco.contribution.d.ts +2 -18
package/lib/browser/monaco.contribution.d.ts.map +1 -1
package/lib/browser/monaco.contribution.js +1 -48
package/lib/browser/monaco.contribution.js.map +1 -1
package/package.json +11 -13
package/src/browser/monaco.contribution.ts +2 -92

package/lib/browser/monaco.contribution.d.ts CHANGED Viewed

@@ -1,22 +1,10 @@
-import { ClientAppContribution, CommandContribution, ISchemaStore, KeyCode, KeybindingContribution, KeybindingRegistry, StaticResourceContribution, StaticResourceService } from '@opensumi/ide-core-browser';
+import { ClientAppContribution, CommandContribution, ISchemaStore, KeyCode, KeybindingContribution, KeybindingRegistry } from '@opensumi/ide-core-browser';
 import { IMenuRegistry, MenuContribution } from '@opensumi/ide-core-browser/lib/menu/next';
 import { URI } from '@opensumi/ide-core-common';
 import { ISemanticTokenRegistry } from '@opensumi/ide-theme/lib/common/semantic-tokens-registry';
 import { EditorExtensionsRegistry } from './contrib/command';
 import { MonacoSnippetSuggestProvider } from './monaco-snippet-suggest-provider';
-export interface Environment {
-    /**
-     * A web worker factory.
-     * NOTE: If `getWorker` is defined, `getWorkerUrl` is not invoked.
-     */
-    getWorker?(workerId: string, label: string): Promise<Worker> | Worker;
-    /**
-     * Return the location for web worker scripts.
-     * NOTE: If `getWorker` is defined, `getWorkerUrl` is not invoked.
-     */
-    getWorkerUrl?(workerId: string, label: string): string;
-}
-export declare class MonacoClientContribution implements ClientAppContribution, CommandContribution, MenuContribution, KeybindingContribution, StaticResourceContribution {
+export declare class MonacoClientContribution implements ClientAppContribution, CommandContribution, MenuContribution, KeybindingContribution {
     private readonly monacoContributionProvider;
     private readonly schemaContributionProvider;
     private readonly monacoCommandService;
@@ -36,12 +24,9 @@ export declare class MonacoClientContribution implements ClientAppContribution,
     private readonly logger;
     private readonly overrideServicesRegistry;
     private readonly keybindings;
-    private readonly staticResourceService;
-    private readonly appConfig;
     get editorExtensionsRegistry(): typeof EditorExtensionsRegistry;
     private toDisposeOnKeybindingChange;
     initialize(): Promise<void>;
-    registerMonacoEnvironment(): void;
     private registerOverrideServices;
     private patchMonacoInternalServices;
     private patchMonacoInternalMenus;
@@ -57,6 +42,5 @@ export declare class MonacoClientContribution implements ClientAppContribution,
     registerMenus(menuRegistry: IMenuRegistry): void;
     registerKeybindings(keybindings: KeybindingRegistry): void;
     protected interceptOpen(uri: URI): Promise<boolean>;
-    registerStaticResolver(service: StaticResourceService): void;
 }
 //# sourceMappingURL=monaco.contribution.d.ts.map

package/lib/browser/monaco.contribution.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"monaco.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/monaco.contribution.ts"],"names":[],"mappings":"AACA,OAAO,~~EAEL~~,qBAAqB,EACrB,mBAAmB,EAQnB,YAAY,EAEZ,OAAO,EAEP,sBAAsB,EACtB,kBAAkB,~~EAOlB~~,~~0BAA0B,EAC1B,qBAAqB,EAEtB,~~MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,aAAa,EAEb,gBAAgB,EAEjB,MAAM,0CAA0C,CAAC;AAClD,OAAO,~~EAKL~~,GAAG,EAIJ,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,sBAAsB,EAGvB,MAAM,yDAAyD,CAAC;AA+BjE,OAAO,EACL,wBAAwB,EAKzB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAKjF,~~MAAM~~,WAAW,WAAW;IAC1B;;;OAGG;IACH,SAAS,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IACtE;;;OAGG;IACH,YAAY,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CACxD;AAQD,qBAOa,wBACX,~~YACE~~,qBAAqB,~~EACrB~~,mBAAmB,~~EACnB~~,gBAAgB,~~EAChB~~,sBAAsB~~,EACtB,0BAA0B~~;~~IAG5B~~,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAA2C;IAGtF,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAA+C;IAG1F,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAwB;IAG7D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA0B;IAGhE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAGhD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAwB;IAG7D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAG7D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAG1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAG3C,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAsB;IAG/D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAGpC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAGlD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,sBAAsB,CAAC;IAGjE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;IAGxE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAgC;IAGzE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;~~IAGjD~~,~~OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAwB;IAG9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAEtC,~~IAAI,wBAAwB,IAAI,OAAO,wBAAwB,CAE9D;IAED,OAAO,CAAC,2BAA2B,CAA8B;IAE3D,UAAU;~~IA0EhB~~,~~yBAAyB;IAoBzB,~~OAAO,CAAC,wBAAwB;IAyBhC,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,wBAAwB;IAsChC,OAAO,CAAC,mBAAmB;IAK3B,OAAO,CAAC,iCAAiC;IAIzC,SAAS,CAAC,uBAAuB;IAsBjC,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM;IAU5D,SAAS,CAAC,8BAA8B,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM;IAkB/D,SAAS,CAAC,4BAA4B;IAgBtC,SAAS,CAAC,2BAA2B,CAAC,QAAQ,EAAE,YAAY;IAO5D,OAAO,CAAC,uBAAuB;IAmD/B,gBAAgB;IAKhB,aAAa,CAAC,YAAY,EAAE,aAAa;IA0BzC,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;cAwD1C,aAAa,CAAC,GAAG,EAAE,GAAG;~~IAUtC,sBAAsB,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI;CAyB7D~~"}
1	+ {"version":3,"file":"monaco.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/monaco.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EAQnB,YAAY,EAEZ,OAAO,EAEP,sBAAsB,EACtB,kBAAkB,EAOnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,aAAa,EAEb,gBAAgB,EAEjB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAIL,GAAG,EAIJ,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,sBAAsB,EAGvB,MAAM,yDAAyD,CAAC;AA+BjE,OAAO,EACL,wBAAwB,EAKzB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAKjF,qBACa,wBACX,YAAW,qBAAqB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,sBAAsB;IAG/F,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAA2C;IAGtF,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAA+C;IAG1F,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAwB;IAG7D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA0B;IAGhE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAGhD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAwB;IAG7D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAG7D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAG1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAG3C,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAsB;IAG/D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAGpC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAGlD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,sBAAsB,CAAC;IAGjE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;IAGxE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAgC;IAGzE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IAEjD,IAAI,wBAAwB,IAAI,OAAO,wBAAwB,CAE9D;IAED,OAAO,CAAC,2BAA2B,CAA8B;IAE3D,UAAU;IAuEhB,OAAO,CAAC,wBAAwB;IAyBhC,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,wBAAwB;IAsChC,OAAO,CAAC,mBAAmB;IAK3B,OAAO,CAAC,iCAAiC;IAIzC,SAAS,CAAC,uBAAuB;IAsBjC,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM;IAU5D,SAAS,CAAC,8BAA8B,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM;IAkB/D,SAAS,CAAC,4BAA4B;IAgBtC,SAAS,CAAC,2BAA2B,CAAC,QAAQ,EAAE,YAAY;IAO5D,OAAO,CAAC,uBAAuB;IAmD/B,gBAAgB;IAKhB,aAAa,CAAC,YAAY,EAAE,aAAa;IA0BzC,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;cAwD1C,aAAa,CAAC,GAAG,EAAE,GAAG;CASvC"}

package/lib/browser/monaco.contribution.js CHANGED Viewed

@@ -29,7 +29,6 @@ const monaco_snippet_suggest_provider_1 = require("./monaco-snippet-suggest-prov
 const monaco_keycode_map_1 = require("./monaco.keycode-map");
 const monaco_resolved_keybinding_1 = require("./monaco.resolved-keybinding");
 const telemetry_service_1 = require("./telemetry.service");
-const packageName = '@opensumi/ide-monaco';
 let MonacoClientContribution = class MonacoClientContribution {
     constructor() {
         this.toDisposeOnKeybindingChange = new ide_core_common_1.DisposableCollection();
@@ -82,8 +81,6 @@ let MonacoClientContribution = class MonacoClientContribution {
         this.setSchemaPreferenceListener(this.schemaStore);
         // 监听 preferences 更新事件，同步更新 mime
         this.setPreferencesChangeListener();
-        // 注册 monaco environment
-        this.registerMonacoEnvironment();
         // 修改一些 Monaco 内置 Services 的行为
         this.patchMonacoInternalServices();
         // 注册/拦截 Monaco 内置的菜单
@@ -93,21 +90,6 @@ let MonacoClientContribution = class MonacoClientContribution {
         // 在快捷键被用户修改时，同步更新编辑器内的快捷键展示
         this.keybindings.onKeybindingsChanged(() => this.updateMonacoKeybindings());
     }
-    registerMonacoEnvironment() {
-        window.MonacoEnvironment = {
-            getWorkerUrl: (moduleId, label) => {
-                const result = this.staticResourceService.resolveStaticResource(ide_core_common_1.URI.from({
-                    scheme: ide_core_common_1.Schemes.monaco,
-                    path: 'worker',
-                    query: JSON.stringify({ moduleId, label }),
-                }));
-                if (result.scheme === ide_core_common_1.Schemes.monaco) {
-                    throw new Error(`Unsupported monaco worker: ${moduleId}:${label}`);
-                }
-                return result.toString();
-            },
-        };
-    }
     registerOverrideServices() {
         const codeEditorService = this.overrideServicesRegistry.getRegisteredService(ide_core_browser_1.ServiceNames.CODE_EDITOR_SERVICE);
         // Monaco CommandService
@@ -366,27 +348,6 @@ let MonacoClientContribution = class MonacoClientContribution {
             return false;
         }
     }
-    registerStaticResolver(service) {
-        service.registerStaticResourceProvider({
-            scheme: ide_core_common_1.Schemes.monaco,
-            resolveStaticResource: (uri) => {
-                const path = uri.codeUri.path;
-                switch (path) {
-                    case 'worker': {
-                        const query = uri.query;
-                        if (query) {
-                            const { moduleId } = JSON.parse(query);
-                            if (moduleId === 'workerMain.js') {
-                                return ide_core_common_1.URI.parse((0, ide_core_browser_1.getCdnHref)(packageName, 'worker/editor.worker.bundle.js', '3.0.1', this.appConfig.componentCDNType));
-                            }
-                        }
-                        break;
-                    }
-                }
-                return uri;
-            },
-        });
-    }
 };
 tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_browser_1.MonacoContribution),
@@ -464,16 +425,8 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_browser_1.KeybindingRegistry),
     tslib_1.__metadata("design:type", Object)
 ], MonacoClientContribution.prototype, "keybindings", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_core_browser_1.StaticResourceService),
-    tslib_1.__metadata("design:type", ide_core_browser_1.StaticResourceService)
-], MonacoClientContribution.prototype, "staticResourceService", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_core_browser_1.AppConfig),
-    tslib_1.__metadata("design:type", Object)
-], MonacoClientContribution.prototype, "appConfig", void 0);
 MonacoClientContribution = tslib_1.__decorate([
-    (0, ide_core_browser_1.Domain)(ide_core_browser_1.ClientAppContribution, ide_core_browser_1.CommandContribution, next_1.MenuContribution, ide_core_browser_1.KeybindingContribution, ide_core_browser_1.StaticResourceContribution)
+    (0, ide_core_browser_1.Domain)(ide_core_browser_1.ClientAppContribution, ide_core_browser_1.CommandContribution, next_1.MenuContribution, ide_core_browser_1.KeybindingContribution)
 ], MonacoClientContribution);
 exports.MonacoClientContribution = MonacoClientContribution;
 function transformMonacoMenuItem(item) {

package/lib/browser/monaco.contribution.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"monaco.contribution.js","sourceRoot":"","sources":["../../src/browser/monaco.contribution.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"monaco.contribution.js","sourceRoot":"","sources":["../../src/browser/monaco.contribution.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,29 +1,27 @@
 {
   "name": "@opensumi/ide-monaco",
-  "version": "3.0.2-next-1716279955.0",
+  "version": "3.0.2",
   "files": [
     "lib",
-    "src",
-    "worker"
+    "src"
   ],
   "license": "MIT",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
-    "prepublishOnly": "yarn build",
-    "build": "tsc --build ../../configs/ts/references/tsconfig.monaco.json && yarn build:worker",
-    "build:worker": "../../node_modules/.bin/webpack --config webpack.config.js"
+    "prepublishOnly": "yarn run build",
+    "build": "tsc --build ../../configs/ts/references/tsconfig.monaco.json"
   },
   "dependencies": {
-    "@opensumi/ide-core-browser": "3.0.2-next-1716279955.0",
-    "@opensumi/ide-core-common": "3.0.2-next-1716279955.0",
-    "@opensumi/ide-theme": "3.0.2-next-1716279955.0",
+    "@opensumi/ide-core-browser": "3.0.2",
+    "@opensumi/ide-core-common": "3.0.2",
+    "@opensumi/ide-theme": "3.0.2",
     "@opensumi/monaco-editor-core": "0.47.0-patch.15"
   },
   "devDependencies": {
-    "@opensumi/ide-dev-tool": "3.0.2-next-1716279955.0",
-    "@opensumi/ide-file-service": "3.0.2-next-1716279955.0",
-    "@opensumi/ide-workspace": "3.0.2-next-1716279955.0"
+    "@opensumi/ide-dev-tool": "3.0.2",
+    "@opensumi/ide-file-service": "3.0.2",
+    "@opensumi/ide-workspace": "3.0.2"
   },
-  "gitHead": "b07a6c7d13ff632503495db3e76839e5075811c4"
+  "gitHead": "d813b4aa35602e73a367dea5b9e21b47f873f930"
 }

package/src/browser/monaco.contribution.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import { Autowired, INJECTOR_TOKEN, Injector } from '@opensumi/di';
 import {
-  AppConfig,
   ClientAppContribution,
   CommandContribution,
   ContributionProvider,
@@ -22,9 +21,6 @@ import {
   PreferenceScope,
   PreferenceService,
   ServiceNames,
-  StaticResourceContribution,
-  StaticResourceService,
-  getCdnHref,
 } from '@opensumi/ide-core-browser';
 import {
   IMenuItem,
@@ -37,7 +33,6 @@ import {
   CommandService,
   DisposableCollection,
   ILogger,
-  Schemes,
   URI,
   isOSX,
   isString,
@@ -95,39 +90,9 @@ import { KEY_CODE_MAP } from './monaco.keycode-map';
 import { MonacoResolvedKeybinding } from './monaco.resolved-keybinding';
 import { MonacoTelemetryService } from './telemetry.service';
-export interface Environment {
-  /**
-   * A web worker factory.
-   * NOTE: If `getWorker` is defined, `getWorkerUrl` is not invoked.
-   */
-  getWorker?(workerId: string, label: string): Promise<Worker> | Worker;
-  /**
-   * Return the location for web worker scripts.
-   * NOTE: If `getWorker` is defined, `getWorkerUrl` is not invoked.
-   */
-  getWorkerUrl?(workerId: string, label: string): string;
-}
-interface Window {
-  MonacoEnvironment?: Environment | undefined;
-}
-const packageName = '@opensumi/ide-monaco';
-@Domain(
-  ClientAppContribution,
-  CommandContribution,
-  MenuContribution,
-  KeybindingContribution,
-  StaticResourceContribution,
-)
+@Domain(ClientAppContribution, CommandContribution, MenuContribution, KeybindingContribution)
 export class MonacoClientContribution
-  implements
-    ClientAppContribution,
-    CommandContribution,
-    MenuContribution,
-    KeybindingContribution,
-    StaticResourceContribution
+  implements ClientAppContribution, CommandContribution, MenuContribution, KeybindingContribution
 {
   @Autowired(MonacoContribution)
   private readonly monacoContributionProvider: ContributionProvider<MonacoContribution>;
@@ -186,12 +151,6 @@ export class MonacoClientContribution
   @Autowired(KeybindingRegistry)
   private readonly keybindings: KeybindingRegistry;
-  @Autowired(StaticResourceService)
-  private readonly staticResourceService: StaticResourceService;
-  @Autowired(AppConfig)
-  private readonly appConfig: AppConfig;
   get editorExtensionsRegistry(): typeof EditorExtensionsRegistry {
     return EditorExtensionsRegistry;
   }
@@ -256,9 +215,6 @@ export class MonacoClientContribution
     // 监听 preferences 更新事件，同步更新 mime
     this.setPreferencesChangeListener();
-    // 注册 monaco environment
-    this.registerMonacoEnvironment();
     // 修改一些 Monaco 内置 Services 的行为
     this.patchMonacoInternalServices();
@@ -272,26 +228,6 @@ export class MonacoClientContribution
     this.keybindings.onKeybindingsChanged(() => this.updateMonacoKeybindings());
   }
-  registerMonacoEnvironment() {
-    (window as Window).MonacoEnvironment = {
-      getWorkerUrl: (moduleId, label) => {
-        const result = this.staticResourceService.resolveStaticResource(
-          URI.from({
-            scheme: Schemes.monaco,
-            path: 'worker',
-            query: JSON.stringify({ moduleId, label }),
-          }),
-        );
-        if (result.scheme === Schemes.monaco) {
-          throw new Error(`Unsupported monaco worker: ${moduleId}:${label}`);
-        }
-        return result.toString();
-      },
-    };
-  }
   private registerOverrideServices() {
     const codeEditorService = this.overrideServicesRegistry.getRegisteredService<AbstractCodeEditorService>(
       ServiceNames.CODE_EDITOR_SERVICE,
@@ -595,32 +531,6 @@ export class MonacoClientContribution
       return false;
     }
   }
-  registerStaticResolver(service: StaticResourceService): void {
-    service.registerStaticResourceProvider({
-      scheme: Schemes.monaco,
-      resolveStaticResource: (uri) => {
-        const path = uri.codeUri.path;
-        switch (path) {
-          case 'worker': {
-            const query = uri.query;
-            if (query) {
-              const { moduleId } = JSON.parse(query);
-              if (moduleId === 'workerMain.js') {
-                return URI.parse(
-                  getCdnHref(packageName, 'worker/editor.worker.bundle.js', '3.0.1', this.appConfig.componentCDNType),
-                );
-              }
-            }
-            break;
-          }
-        }
-        return uri;
-      },
-    });
-  }
 }
 function transformMonacoMenuItem(item: monacoActions.IMenuItem | monacoActions.ISubmenuItem): IMenuItem | ISubmenuItem {