@codingame/monaco-vscode-api 16.0.3 → 16.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "16.0.3",
+  "version": "16.0.4",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
@@ -15,13 +15,14 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-base-service-override": "16.0.3",
-    "@codingame/monaco-vscode-environment-service-override": "16.0.3",
-    "@codingame/monaco-vscode-extensions-service-override": "16.0.3",
-    "@codingame/monaco-vscode-files-service-override": "16.0.3",
-    "@codingame/monaco-vscode-host-service-override": "16.0.3",
-    "@codingame/monaco-vscode-layout-service-override": "16.0.3",
-    "@codingame/monaco-vscode-quickaccess-service-override": "16.0.3",
+    "@c4312/eventsource-umd": "3.0.5",
+    "@codingame/monaco-vscode-base-service-override": "16.0.4",
+    "@codingame/monaco-vscode-environment-service-override": "16.0.4",
+    "@codingame/monaco-vscode-extensions-service-override": "16.0.4",
+    "@codingame/monaco-vscode-files-service-override": "16.0.4",
+    "@codingame/monaco-vscode-host-service-override": "16.0.4",
+    "@codingame/monaco-vscode-layout-service-override": "16.0.4",
+    "@codingame/monaco-vscode-quickaccess-service-override": "16.0.4",
     "marked": "14.0.0"
   },
   "main": "services.js",

package/services.js

@@ -181,10 +181,10 @@ export { IKeybindingService } from './vscode/src/vs/platform/keybinding/common/k
 export { ISecretStorageService } from './vscode/src/vs/platform/secrets/common/secrets.service.js';
 export { ConfigurationTarget } from './vscode/src/vs/platform/configuration/common/configuration.js';
 
-if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.99.3-6fbbdba3-e1d0-4e7a-a048-11f5a59e49c5") {
-    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.99.3-6fbbdba3-e1d0-4e7a-a048-11f5a59e49c5"}, ${window.monacoVscodeApiBuildId} is already loaded`);
+if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.99.3-2d334896-16b2-4125-a190-26e53250d84f") {
+    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.99.3-2d334896-16b2-4125-a190-26e53250d84f"}, ${window.monacoVscodeApiBuildId} is already loaded`);
 }
-window.monacoVscodeApiBuildId = "1.99.3-6fbbdba3-e1d0-4e7a-a048-11f5a59e49c5";
+window.monacoVscodeApiBuildId = "1.99.3-2d334896-16b2-4125-a190-26e53250d84f";
 async function initialize(overrides, container = document.body, configuration = {}, env) {
     checkServicesNotInitialized();
     initialize$1(container, configuration, env);

package/vscode/src/vs/workbench/api/common/extHostMcp.js

@@ -1,6 +1,5 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { importAMDNodeModule } from '../../../amdX.js';
 import { Sequencer, DeferredPromise } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Lazy } from '../../../base/common/lazy.js';
@@ -20,7 +19,7 @@ let ExtHostMcpService = class ExtHostMcpService extends Disposable {
         this._initialProviderPromises = ( new Set());
         this._sseEventSources = this._register(( new DisposableMap()));
         this._eventSource = ( new Lazy(async () => {
-            const es = await importAMDNodeModule('@c4312/eventsource-umd', 'dist/index.umd.js');
+            const es = await import('@c4312/eventsource-umd').then(module => module.default ?? module);
             return es.EventSource;
         }));
         this._proxy = ( extHostRpc.getProxy(MainContext.MainThreadMcp));

package/vscode/src/vs/amdX.d.ts

@@ -1,3 +0,0 @@
-export declare const canASAR = false;
-export declare function importAMDNodeModule<T>(nodeModuleName: string, pathInsideNodeModule: string, isBuilt?: boolean): Promise<T>;
-export declare function resolveAmdNodeModulePath(nodeModuleName: string, pathInsideNodeModule: string): string;

package/vscode/src/vs/amdX.js

@@ -1,188 +0,0 @@
-
-import { Schemas, VSCODE_AUTHORITY, nodeModulesPath, FileAccess } from './base/common/network.js';
-import './base/common/platform.js';
-import { URI } from './base/common/uri.js';
-import { generateUuid } from './base/common/uuid.js';
-
-class DefineCall {
-    constructor(id, dependencies, callback) {
-        this.id = id;
-        this.dependencies = dependencies;
-        this.callback = callback;
-    }
-}
-var AMDModuleImporterState;
-(function (AMDModuleImporterState) {
-    AMDModuleImporterState[AMDModuleImporterState["Uninitialized"] = 1] = "Uninitialized";
-    AMDModuleImporterState[AMDModuleImporterState["InitializedInternal"] = 2] = "InitializedInternal";
-    AMDModuleImporterState[AMDModuleImporterState["InitializedExternal"] = 3] = "InitializedExternal";
-})(AMDModuleImporterState || (AMDModuleImporterState = {}));
-class AMDModuleImporter {
-    static { this.INSTANCE = ( new AMDModuleImporter()); }
-    constructor() {
-        this._isWebWorker = (typeof self === 'object' && self.constructor && self.constructor.name === 'DedicatedWorkerGlobalScope');
-        this._isRenderer = typeof document === 'object';
-        this._defineCalls = [];
-        this._state = AMDModuleImporterState.Uninitialized;
-    }
-    _initialize() {
-        if (this._state === AMDModuleImporterState.Uninitialized) {
-            if (globalThis.define) {
-                this._state = AMDModuleImporterState.InitializedExternal;
-                return;
-            }
-        }
-        else {
-            return;
-        }
-        this._state = AMDModuleImporterState.InitializedInternal;
-        globalThis.define = (id, dependencies, callback) => {
-            if (typeof id !== 'string') {
-                callback = dependencies;
-                dependencies = id;
-                id = null;
-            }
-            if (typeof dependencies !== 'object' || !Array.isArray(dependencies)) {
-                callback = dependencies;
-                dependencies = null;
-            }
-            this._defineCalls.push(( new DefineCall(id, dependencies, callback)));
-        };
-        globalThis.define.amd = true;
-        if (this._isRenderer) {
-            this._amdPolicy = globalThis._VSCODE_WEB_PACKAGE_TTP ?? window.trustedTypes?.createPolicy('amdLoader', {
-                createScriptURL(value) {
-                    if (value.startsWith(window.location.origin)) {
-                        return value;
-                    }
-                    if (value.startsWith(`${Schemas.vscodeFileResource}://${VSCODE_AUTHORITY}`)) {
-                        return value;
-                    }
-                    throw ( new Error(`[trusted_script_src] Invalid script url: ${value}`));
-                }
-            });
-        }
-        else if (this._isWebWorker) {
-            this._amdPolicy = globalThis._VSCODE_WEB_PACKAGE_TTP ?? globalThis.trustedTypes?.createPolicy('amdLoader', {
-                createScriptURL(value) {
-                    return value;
-                }
-            });
-        }
-    }
-    async load(scriptSrc) {
-        this._initialize();
-        if (this._state === AMDModuleImporterState.InitializedExternal) {
-            return ( new Promise(resolve => {
-                const tmpModuleId = generateUuid();
-                globalThis.define(tmpModuleId, [scriptSrc], function (moduleResult) {
-                    resolve(moduleResult);
-                });
-            }));
-        }
-        const defineCall = await (this._isWebWorker ? this._workerLoadScript(scriptSrc) : this._isRenderer ? this._rendererLoadScript(scriptSrc) : this._nodeJSLoadScript(scriptSrc));
-        if (!defineCall) {
-            console.warn(`Did not receive a define call from script ${scriptSrc}`);
-            return undefined;
-        }
-        const exports = {};
-        const dependencyObjs = [];
-        const dependencyModules = [];
-        if (Array.isArray(defineCall.dependencies)) {
-            for (const mod of defineCall.dependencies) {
-                if (mod === 'exports') {
-                    dependencyObjs.push(exports);
-                }
-                else {
-                    dependencyModules.push(mod);
-                }
-            }
-        }
-        if (dependencyModules.length > 0) {
-            throw ( new Error(
-                `Cannot resolve dependencies for script ${scriptSrc}. The dependencies are: ${dependencyModules.join(', ')}`
-            ));
-        }
-        if (typeof defineCall.callback === 'function') {
-            return defineCall.callback(...dependencyObjs) ?? exports;
-        }
-        else {
-            return defineCall.callback;
-        }
-    }
-    _rendererLoadScript(scriptSrc) {
-        return ( new Promise((resolve, reject) => {
-            const scriptElement = document.createElement('script');
-            scriptElement.setAttribute('async', 'async');
-            scriptElement.setAttribute('type', 'text/javascript');
-            const unbind = () => {
-                scriptElement.removeEventListener('load', loadEventListener);
-                scriptElement.removeEventListener('error', errorEventListener);
-            };
-            const loadEventListener = (e) => {
-                unbind();
-                resolve(this._defineCalls.pop());
-            };
-            const errorEventListener = (e) => {
-                unbind();
-                reject(e);
-            };
-            scriptElement.addEventListener('load', loadEventListener);
-            scriptElement.addEventListener('error', errorEventListener);
-            if (this._amdPolicy) {
-                scriptSrc = this._amdPolicy.createScriptURL(scriptSrc);
-            }
-            scriptElement.setAttribute('src', scriptSrc);
-            window.document.getElementsByTagName('head')[0].appendChild(scriptElement);
-        }));
-    }
-    async _workerLoadScript(scriptSrc) {
-        if (this._amdPolicy) {
-            scriptSrc = this._amdPolicy.createScriptURL(scriptSrc);
-        }
-        await import(scriptSrc).then(module => module.default ?? module);
-        return this._defineCalls.pop();
-    }
-    async _nodeJSLoadScript(scriptSrc) {
-        try {
-            const fs = (await import(`${'fs'}`).then(module => module.default ?? module)).default;
-            const vm = (await import(`${'vm'}`).then(module => module.default ?? module)).default;
-            const module = (await import(`${'module'}`).then(module => module.default ?? module)).default;
-            const filePath = ( URI.parse(scriptSrc)).fsPath;
-            const content = ( fs.readFileSync(filePath).toString());
-            const scriptSource = module.wrap(content.replace(/^#!.*/, ''));
-            const script = new vm.Script(scriptSource);
-            const compileWrapper = script.runInThisContext();
-            compileWrapper.apply();
-            return this._defineCalls.pop();
-        }
-        catch (error) {
-            throw error;
-        }
-    }
-}
-const cache = ( new Map());
-async function importAMDNodeModule(nodeModuleName, pathInsideNodeModule, isBuilt) {
-    if (isBuilt === undefined) {
-        const product = globalThis._VSCODE_PRODUCT_JSON;
-        isBuilt = Boolean((product ?? globalThis.vscode?.context?.configuration()?.product)?.commit);
-    }
-    const nodeModulePath = `${nodeModuleName}/${pathInsideNodeModule}` ;
-    if (( cache.has(nodeModulePath))) {
-        return cache.get(nodeModulePath);
-    }
-    let scriptSrc;
-    if (/^\w[\w\d+.-]*:\/\//.test(nodeModulePath)) {
-        scriptSrc = nodeModulePath;
-    }
-    else {
-        const actualNodeModulesPath = (nodeModulesPath);
-        const resourcePath = `${actualNodeModulesPath}/${nodeModulePath}`;
-        scriptSrc = ( ( FileAccess.asBrowserUri(resourcePath)).toString(true));
-    }
-    const result = AMDModuleImporter.INSTANCE.load(scriptSrc);
-    cache.set(nodeModulePath, result);
-    return result;
-}
-
-export { importAMDNodeModule };