Merge pull request #760 from CodinGame/vscode-1.108.1

Vscode 1.108.1

Author: CGNonofr

package-lock.json

@@ -30,9 +30,9 @@
   },
   "config": {
     "vscode": {
-      "version": "1.108.0",
-      "ref": "1.108.0",
-      "commit": "94e8ae2b28cb5cc932b86e1070569c4463565c37"
+      "version": "1.108.1",
+      "ref": "1.108.1",
+      "commit": "585eba7c0c34fd6b30faac7c62a42050bfbc0086"
     },
     "monaco": {
       "ref": "v0.55.1",
@@ -105,7 +105,7 @@
     "@xterm/addon-search": "^0.17.0-beta.91",
     "@xterm/addon-serialize": "^0.15.0-beta.91",
     "@xterm/addon-unicode11": "^0.10.0-beta.91",
-    "@xterm/addon-webgl": "^0.20.0-beta.90",
+    "@xterm/addon-webgl": "^0.20.0-beta.101",
     "@xterm/headless": "^6.1.0-beta.91",
     "@xterm/xterm": "^6.1.0-beta.91",
     "cookie": "^0.7.2",

package.json

@@ -123,7 +123,7 @@ export default function importMetaAssets({
               return
             }
 
-            const { globby } = await import('globby')
+            const { default: globby } = await import('globby')
             // execute the glob
             const result = await globby(glob, { cwd: path.dirname(id) })
             const paths = result.map((r) =>

rollup/plugins/import-meta-assets-plugin.ts

@@ -24,7 +24,7 @@ import { Schemas } from 'vs/base/common/network'
 import type { IFileSystemProvider } from 'vs/platform/files/common/files'
 import { HTMLFileSystemProvider } from 'vs/platform/files/browser/htmlFileSystemProvider'
 import { WorkspaceSearchProvider } from './tools/search-providers/workspace-search-provider'
-import { IWorkspaceContextService } from '../services'
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service'
 import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService.service'
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service'
 

src/service-override/search.ts

@@ -1,6 +1,6 @@
 import { type IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices'
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'
-import { ITelemetryService } from '../services'
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry.service'
 import { TelemetryService } from 'vs/workbench/services/telemetry/browser/telemetryService'
 import { IDataChannelService } from 'vs/platform/dataChannel/common/dataChannel.service'
 export type { ITelemetryData, TelemetryLevel } from 'vs/platform/telemetry/common/telemetry'

src/service-override/telemetry.ts

@@ -5,7 +5,9 @@ import {
   type SearchConfig,
   getSearchConfigFromVSCode
 } from './config'
-import type { IFileService, ILogService, IWorkspaceContextService } from '../../../services'
+import type { IFileService } from 'vs/platform/files/common/files.service'
+import type { ILogService } from 'vs/platform/log/common/log.service'
+import type { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace.service'
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration.service'
 import type { FileChangesEvent, IFileStat } from 'vs/platform/files/common/files'
 import * as glob from 'vs/base/common/glob'

src/service-override/tools/search-utils/base-provider.ts

@@ -127,7 +127,7 @@ index 726ce214681..238770697f8 100644
  import { ChatConfirmationWidget, IChatConfirmationButton } from '../chatConfirmationWidget.js';
  import { IChatContentPartRenderContext } from '../chatContentParts.js';
 diff --git a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
-index 0358e6a89b2..84993ba0721 100644
+index 868a9a84174..ef85432d97f 100644
 --- a/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
 +++ b/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.ts
 @@ -36,7 +36,7 @@ import { migrateLegacyTerminalToolSpecificData } from '../../../../common/chat.j

vscode-patches/0065-fix-break-cyclic-dependency.patch

@@ -3636,7 +3636,7 @@ index 5a53b5423a4..57c88e3ab62 100644
  		part.id = id;
  		part.setAttribute('role', role);
 diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
-index abd18da3a4e..d1175818998 100644
+index 376f1dda25e..7b8c2f1a30d 100644
 --- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
 +++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
 @@ -3,7 +3,7 @@