Split vscode extension api into new package

README.md

@@ -36,7 +36,7 @@ import * as monaco from 'monaco-editor';
 import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
 
 // utilities to override Monaco services
-import { initialize } from 'vscode/services'
+import { initialize } from '@codingame/monaco-vscode-api'
 import getConfigurationServiceOverride, { updateUserConfiguration } from '@codingame/monaco-vscode-configuration-service-override'
 
 window.MonacoEnvironment = {
@@ -110,7 +110,7 @@ import * as monaco from 'monaco-editor';
 import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
 
 // utilities to override Monaco services
-import { initialize } from 'vscode/services'
+import { initialize } from '@codingame/monaco-vscode-api'
 import getThemeServiceOverride from "@codingame/monaco-vscode-theme-service-override";
 
 window.MonacoEnvironment = {
@@ -256,7 +256,7 @@ vscode.languages.registerCompletionItemProvider(...)
 You can also register a new extension from its manifest:
 
 ```typescript
-import { registerExtension, initialize, ExtensionHostKind } from 'vscode/extensions'
+import { registerExtension, initialize, ExtensionHostKind } from '@codingame/monaco-vscode-api/extensions'
 
 await initialize()
 

demo/package.json

@@ -46,14 +46,14 @@
     "@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common": "file:../dist/packages/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common",
     "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "file:../dist/packages/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common",
     "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "file:../dist/packages/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common",
+    "@codingame/monaco-vscode-1d9dbcb3-6f53-58ad-b0a4-92b1ef1fd6a8-common": "file:../dist/packages/monaco-vscode-1d9dbcb3-6f53-58ad-b0a4-92b1ef1fd6a8-common",
     "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common": "file:../dist/packages/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common",
     "@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common": "file:../dist/packages/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common",
     "@codingame/monaco-vscode-2448342b-297f-5823-9f41-f18eef0f6ee8-common": "file:../dist/packages/monaco-vscode-2448342b-297f-5823-9f41-f18eef0f6ee8-common",
     "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "file:../dist/packages/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common",
     "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common": "file:../dist/packages/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common",
     "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "file:../dist/packages/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common",
     "@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common": "file:../dist/packages/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common",
-    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "file:../dist/packages/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common",
     "@codingame/monaco-vscode-2e67e044-0db9-5fa6-8bd1-3737a7d586d4-common": "file:../dist/packages/monaco-vscode-2e67e044-0db9-5fa6-8bd1-3737a7d586d4-common",
     "@codingame/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common": "file:../dist/packages/monaco-vscode-2f06fe84-148e-5e6b-a7ca-c7989c5f128a-common",
     "@codingame/monaco-vscode-33833ac7-3af3-5e9d-8fb9-11838d852c59-common": "file:../dist/packages/monaco-vscode-33833ac7-3af3-5e9d-8fb9-11838d852c59-common",
@@ -77,6 +77,7 @@
     "@codingame/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common": "file:../dist/packages/monaco-vscode-5108c2c9-4ada-52d8-8c4b-fe03b3160e71-common",
     "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "file:../dist/packages/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common",
     "@codingame/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common": "file:../dist/packages/monaco-vscode-5452e2b7-9081-5f95-839b-4ab3544ce28f-common",
+    "@codingame/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common": "file:../dist/packages/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common",
     "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common": "file:../dist/packages/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common",
     "@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common": "file:../dist/packages/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common",
     "@codingame/monaco-vscode-5e324391-11e3-5ceb-93ee-938e4098e4ad-common": "file:../dist/packages/monaco-vscode-5e324391-11e3-5ceb-93ee-938e4098e4ad-common",
@@ -111,14 +112,15 @@
     "@codingame/monaco-vscode-all-default-extensions": "file:../dist/packages/monaco-vscode-all-default-extensions",
     "@codingame/monaco-vscode-all-language-default-extensions": "file:../dist/packages/monaco-vscode-all-language-default-extensions",
     "@codingame/monaco-vscode-all-language-feature-default-extensions": "file:../dist/packages/monaco-vscode-all-language-feature-default-extensions",
-    "vscode": "file:../dist/packages/monaco-vscode-api",
+    "@codingame/monaco-vscode-api": "file:../dist/packages/monaco-vscode-api",
     "@codingame/monaco-vscode-authentication-service-override": "file:../dist/packages/monaco-vscode-authentication-service-override",
     "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "file:../dist/packages/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common",
     "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common": "file:../dist/packages/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common",
     "@codingame/monaco-vscode-b71b5434-ce96-5581-8993-e8da380bd63f-common": "file:../dist/packages/monaco-vscode-b71b5434-ce96-5581-8993-e8da380bd63f-common",
     "@codingame/monaco-vscode-b8988f79-16c1-5bff-b0e7-699bab3431da-common": "file:../dist/packages/monaco-vscode-b8988f79-16c1-5bff-b0e7-699bab3431da-common",
     "@codingame/monaco-vscode-base-service-override": "file:../dist/packages/monaco-vscode-base-service-override",
     "@codingame/monaco-vscode-bat-default-extension": "file:../dist/packages/monaco-vscode-bat-default-extension",
+    "@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common": "file:../dist/packages/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common",
     "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "file:../dist/packages/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common",
     "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "file:../dist/packages/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common",
     "@codingame/monaco-vscode-bulk-edit-service-override": "file:../dist/packages/monaco-vscode-bulk-edit-service-override",
@@ -166,6 +168,7 @@
     "@codingame/monaco-vscode-emmet-service-override": "file:../dist/packages/monaco-vscode-emmet-service-override",
     "@codingame/monaco-vscode-environment-service-override": "file:../dist/packages/monaco-vscode-environment-service-override",
     "@codingame/monaco-vscode-explorer-service-override": "file:../dist/packages/monaco-vscode-explorer-service-override",
+    "vscode": "file:../dist/packages/monaco-vscode-extension-api",
     "@codingame/monaco-vscode-extension-editing-default-extension": "file:../dist/packages/monaco-vscode-extension-editing-default-extension",
     "@codingame/monaco-vscode-extension-gallery-service-override": "file:../dist/packages/monaco-vscode-extension-gallery-service-override",
     "@codingame/monaco-vscode-extensions-service-override": "file:../dist/packages/monaco-vscode-extensions-service-override",

demo/src/features/ai.ts

@@ -1,4 +1,4 @@
-import { ExtensionHostKind, registerExtension } from 'vscode/extensions'
+import { ExtensionHostKind, registerExtension } from '@codingame/monaco-vscode-api/extensions'
 
 const { getApi } = registerExtension(
   {

demo/src/features/customView.views.ts

@@ -4,7 +4,7 @@ import {
   createInstance,
   IInstantiationService,
   IEditorGroup
-} from 'vscode/services'
+} from '@codingame/monaco-vscode-api'
 import {
   IEditorCloseHandler,
   IEditorSerializer,

demo/src/features/customView.workbench.ts

@@ -4,7 +4,7 @@ import {
   createInstance,
   IInstantiationService,
   IEditorGroup
-} from 'vscode/services'
+} from '@codingame/monaco-vscode-api'
 import {
   IEditorCloseHandler,
   IEditorSerializer,

demo/src/features/debugger.ts

@@ -1,4 +1,4 @@
-import { ExtensionHostKind, registerExtension } from 'vscode/extensions'
+import { ExtensionHostKind, registerExtension } from '@codingame/monaco-vscode-api/extensions'
 import type * as vscode from 'vscode'
 
 const { getApi, registerFileUrl } = registerExtension(

demo/src/features/intellisense.ts

@@ -5,7 +5,7 @@ import '@codingame/monaco-vscode-html-language-features-default-extension'
 import '@codingame/monaco-vscode-css-language-features-default-extension'
 import '@codingame/monaco-vscode-markdown-language-features-default-extension'
 import '@codingame/monaco-vscode-emmet-default-extension'
-import { ExtensionHostKind, registerExtension } from 'vscode/extensions'
+import { ExtensionHostKind, registerExtension } from '@codingame/monaco-vscode-api/extensions'
 
 const { getApi } = registerExtension(
   {

demo/src/features/notifications.ts

@@ -1,4 +1,4 @@
-import { ExtensionHostKind, registerExtension } from 'vscode/extensions'
+import { ExtensionHostKind, registerExtension } from '@codingame/monaco-vscode-api/extensions'
 
 const { getApi } = registerExtension(
   {

demo/src/features/output.ts

@@ -1,4 +1,4 @@
-import { ExtensionHostKind, registerExtension } from 'vscode/extensions'
+import { ExtensionHostKind, registerExtension } from '@codingame/monaco-vscode-api/extensions'
 import { useHtmlFileSystemProvider } from '../setup.common'
 
 if (!useHtmlFileSystemProvider) {

demo/src/features/remoteExtension.ts

@@ -1,4 +1,4 @@
-import { registerRemoteExtension } from 'vscode/extensions'
+import { registerRemoteExtension } from '@codingame/monaco-vscode-api/extensions'
 
 declare global {
   interface Window {

demo/src/features/scm.ts

@@ -1,5 +1,5 @@
 import type { Uri } from 'vscode'
-import { ExtensionHostKind, registerExtension } from 'vscode/extensions'
+import { ExtensionHostKind, registerExtension } from '@codingame/monaco-vscode-api/extensions'
 import { remoteAuthority } from '../setup.common'
 
 if (remoteAuthority == null) {

demo/src/features/search.ts

@@ -1,4 +1,4 @@
-import { ExtensionHostKind, registerExtension } from 'vscode/extensions'
+import { ExtensionHostKind, registerExtension } from '@codingame/monaco-vscode-api/extensions'
 import * as monaco from 'monaco-editor'
 import { useHtmlFileSystemProvider } from '../setup.common'
 

demo/src/features/testing.ts

@@ -1,5 +1,5 @@
 import type * as vscode from 'vscode'
-import { ExtensionHostKind, registerExtension } from 'vscode/extensions'
+import { ExtensionHostKind, registerExtension } from '@codingame/monaco-vscode-api/extensions'
 
 const { getApi } = registerExtension(
   {

demo/src/main.common.ts

@@ -1,6 +1,6 @@
 import './style.css'
 import * as monaco from 'monaco-editor'
-import { ExtensionHostKind, registerExtension } from 'vscode/extensions'
+import { ExtensionHostKind, registerExtension } from '@codingame/monaco-vscode-api/extensions'
 import { useHtmlFileSystemProvider } from './setup.common'
 import './features/output'
 import './features/debugger'

demo/src/main.views.ts

@@ -5,7 +5,7 @@ import {
   StandaloneServices,
   createInstance,
   getService
-} from 'vscode/services'
+} from '@codingame/monaco-vscode-api'
 import * as monaco from 'monaco-editor'
 import {
   defaultUserConfigurationFile,

demo/src/main.workbench.ts

@@ -1,4 +1,4 @@
-import { IEditorService, StandaloneServices, createInstance } from 'vscode/services'
+import { IEditorService, StandaloneServices, createInstance } from '@codingame/monaco-vscode-api'
 import { clearStorage, remoteAuthority } from './setup.workbench'
 import { CustomEditorInput } from './features/customView.workbench'
 import './main.common'

demo/src/setup.common.ts

@@ -15,7 +15,11 @@ import {
   initFile
 } from '@codingame/monaco-vscode-files-service-override'
 import * as monaco from 'monaco-editor'
-import { IWorkbenchConstructionOptions, LogLevel, IEditorOverrideServices } from 'vscode/services'
+import {
+  IWorkbenchConstructionOptions,
+  LogLevel,
+  IEditorOverrideServices
+} from '@codingame/monaco-vscode-api'
 import * as vscode from 'vscode'
 import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override'
 import getNotificationServiceOverride from '@codingame/monaco-vscode-notifications-service-override'
@@ -73,7 +77,7 @@ import getUpdateServiceOverride from '@codingame/monaco-vscode-update-service-ov
 import getExplorerServiceOverride from '@codingame/monaco-vscode-explorer-service-override'
 import getLocalizationServiceOverride from '@codingame/monaco-vscode-localization-service-override'
 import getTreeSitterServiceOverride from '@codingame/monaco-vscode-treesitter-service-override'
-import { EnvironmentOverride } from 'vscode/workbench'
+import { EnvironmentOverride } from '@codingame/monaco-vscode-api/workbench'
 import { Worker } from './tools/crossOriginWorker'
 import defaultKeybindings from './user/keybindings.json?raw'
 import defaultConfiguration from './user/configuration.json?raw'
@@ -379,13 +383,14 @@ export const constructOptions: IWorkbenchConstructionOptions = {
     nameShort: 'monaco-vscode-api',
     nameLong: 'monaco-vscode-api',
     extensionsGallery: {
-      serviceUrl: 'https://open-vsx.org/vscode/gallery',
-      itemUrl: 'https://open-vsx.org/vscode/item',
-      resourceUrlTemplate: 'https://open-vsx.org/vscode/unpkg/{publisher}/{name}/{version}/{path}',
-      extensionUrlTemplate: '',
-      controlUrl: '',
-      nlsBaseUrl: '',
-      publisherUrl: ''
+      nlsBaseUrl: 'https://www.vscode-unpkg.net/_lp/',
+      serviceUrl: 'https://marketplace.visualstudio.com/_apis/public/gallery',
+      itemUrl: 'https://marketplace.visualstudio.com/items',
+      publisherUrl: 'https://marketplace.visualstudio.com/publishers',
+      resourceUrlTemplate:
+        'https://{publisher}.vscode-unpkg.net/{publisher}/{name}/{version}/{path}',
+      extensionUrlTemplate: 'https://www.vscode-unpkg.net/_gallery/{publisher}/{name}/latest',
+      controlUrl: 'https://main.vscode-cdn.net/extensions/marketplace.json'
     }
   }
 }

demo/src/setup.views.ts

@@ -3,11 +3,11 @@ import {
   IWorkbenchLayoutService,
   getService,
   initialize as initializeMonacoService
-} from 'vscode/services'
+} from '@codingame/monaco-vscode-api'
 import getQuickAccessServiceOverride from '@codingame/monaco-vscode-quickaccess-service-override'
 import { BrowserStorageService } from '@codingame/monaco-vscode-storage-service-override'
 import { ExtensionHostKind } from '@codingame/monaco-vscode-extensions-service-override'
-import { registerExtension } from 'vscode/extensions'
+import { registerExtension } from '@codingame/monaco-vscode-api/extensions'
 import getViewsServiceOverride, {
   isEditorPartVisible,
   Parts,
@@ -18,7 +18,7 @@ import getViewsServiceOverride, {
   onDidChangeSideBarPosition,
   Position
 } from '@codingame/monaco-vscode-views-service-override'
-import { setUnexpectedErrorHandler } from 'vscode/monaco'
+import { setUnexpectedErrorHandler } from '@codingame/monaco-vscode-api/monaco'
 import { openNewCodeEditor } from './features/editor'
 import './features/customView.views'
 import {

demo/src/setup.workbench.ts

@@ -3,14 +3,14 @@ import {
   IWorkbenchLayoutService,
   getService,
   initialize as initializeMonacoService
-} from 'vscode/services'
+} from '@codingame/monaco-vscode-api'
 import getWorkbenchServiceOverride, {
   Parts
 } from '@codingame/monaco-vscode-workbench-service-override'
 import getQuickAccessServiceOverride from '@codingame/monaco-vscode-quickaccess-service-override'
 import { BrowserStorageService } from '@codingame/monaco-vscode-storage-service-override'
 import { ExtensionHostKind } from '@codingame/monaco-vscode-extensions-service-override'
-import { registerExtension } from 'vscode/extensions'
+import { registerExtension } from '@codingame/monaco-vscode-api/extensions'
 import './features/customView.workbench'
 import {
   commonServices,

demo/src/tools/extHostWorker.ts

@@ -1,9 +1,12 @@
 import type { WorkerConfig } from '@codingame/monaco-vscode-extensions-service-override'
 import { Worker } from './fakeWorker'
 
-const fakeWorker = new Worker(new URL('vscode/workers/extensionHost.worker', import.meta.url), {
-  type: 'module'
-})
+const fakeWorker = new Worker(
+  new URL('@codingame/monaco-vscode-api/workers/extensionHost.worker', import.meta.url),
+  {
+    type: 'module'
+  }
+)
 
 export const workerConfig: WorkerConfig = {
   url: fakeWorker.url.toString(),

demo/update-local-dependencies.ts

@@ -10,7 +10,7 @@ const packageJson: PackageJson = JSON.parse(
 const packagesUrl = new URL('../dist/packages', import.meta.url)
 
 const aliases: Record<string, string> = {
-  '@codingame/monaco-vscode-api': 'vscode',
+  '@codingame/monaco-vscode-extension-api': 'vscode',
   '@codingame/monaco-vscode-editor-api': 'monaco-editor'
 }
 

demo/vite.config.ts

@@ -62,9 +62,9 @@ export default defineConfig({
       // add all local dependencies...
       ...localDependencies,
       // and their exports
-      'vscode/extensions',
-      'vscode/services',
-      'vscode/monaco',
+      '@codingame/monaco-vscode-api/extensions',
+      '@codingame/monaco-vscode-api',
+      '@codingame/monaco-vscode-api/monaco',
       'vscode/localExtensionHost',
 
       // These 2 lines prevent vite from reloading the whole page when starting a worker (so 2 times in a row after cleaning the vite cache - for the editor then the textmate workers)

package.json

@@ -30,9 +30,9 @@
   },
   "config": {
     "vscode": {
-      "version": "1.96.3",
-      "ref": "1.96.3",
-      "commit": "91fbdddc47bc9c09064bf7acf133d22631cbf083"
+      "version": "1.96.4",
+      "ref": "1.96.4",
+      "commit": "cd4ee3b1c348a13bafd8f9ad8060705f6d4b9cba"
     },
     "monaco": {
       "ref": "v0.52.2",

rollup/plugins/rollup-subpackage-plugin.ts

@@ -341,6 +341,7 @@ export default ({
     }
     const allGroupSets = Array.from(groupSetMap.values())
 
+    // eslint-disable-next-line prefer-const
     let { filtered: entryGroupSets, removed: combinationGroupSets } = splitArray(
       allGroupSets,
       (groupSet) => groupSet.groups.size === 1
@@ -490,7 +491,7 @@ export default ({
                       .filter((infos) => infos.isExternal)
                       .flatMap((infos): SubPackageExternalDependency[] => {
                         const match = /^(?:@[^/]*\/)?[^/]*/.exec(infos.id)
-                        if (match != null && !builtinModules.includes(match[0])) {
+                        if (match != null && !builtinModules.includes(match[0]) && match[0] !== (packageAlias ?? packageName)) {
                           const name = match[0]
                           let version = '*'
                           if (ownPackageAliases.has(name)) {
@@ -503,7 +504,7 @@ export default ({
                           } else {
                             try {
                               version = require(`${name}/package.json`).version
-                            } catch (err) {
+                            } catch {
                               this.error(`Unable to find version of ${name}`)
                             }
                           }
@@ -633,7 +634,7 @@ export default ({
       await fs.promises.rm(options.dir!, {
         recursive: true
       })
-    } catch (err) {
+    } catch {
       // ignore, may not exists
     }
   }

rollup/rollup.config.ts

@@ -32,7 +32,7 @@ import {
 import { transformImportEqualsTransformerFactory } from './tools/typescript.js'
 
 const input = {
-  api: './src/extension.api.ts',
+  'extension.api': './src/extension.api.ts',
   'editor.api': './src/editor.api.ts',
   localExtensionHost: './src/localExtensionHost.ts',
   extensions: './src/extensions.ts',

rollup/rollup.default-extensions.ts

@@ -9,6 +9,7 @@ import { fileURLToPath } from 'url'
 import dynamicImportPolyfillPlugin from './plugins/dynamic-import-polyfill-plugin.js'
 import resolveAssetUrlPlugin from './plugins/resolve-asset-url-plugin.js'
 import extensionDirectoryPlugin from '../dist/packages/monaco-vscode-rollup-extension-directory-plugin/rollup-extension-directory-plugin.js'
+import { MAIN_PACKAGE_NAME } from './tools/config.js'
 
 const pkg = JSON.parse(
   fs.readFileSync(new URL('../package.json', import.meta.url).pathname).toString()
@@ -69,7 +70,7 @@ export default rollup.defineConfig([
           }
         ],
         external(source) {
-          return source === 'vscode/extensions'
+          return source.startsWith(MAIN_PACKAGE_NAME)
         },
         plugins: [
           resolveAssetUrlPlugin(),