Fix imports. No longer use monaco-editor. test should no loner fail

- Remove pre-build workers from wrapper

Author: kaisalmen

package-lock.json

@@ -76,20 +76,26 @@
     "@codingame/monaco-vscode-localization-service-override": "13.0.0",
     "@codingame/monaco-vscode-log-service-override": "13.0.0",
     "@codingame/monaco-vscode-model-service-override": "13.0.0",
-    "monaco-editor": "npm:@codingame/[email protected]",
-    "vscode": "npm:@codingame/[email protected]",
-    "vscode-languageclient": "~9.0.1"
+    "vscode": "npm:@codingame/[email protected]"
   },
   "peerDependencies": {
     "@codingame/monaco-vscode-api": "13.0.0",
-    "@codingame/monaco-vscode-editor-api": "13.0.0"
+    "@codingame/monaco-vscode-editor-api": "13.0.0",
+    "@codingame/monaco-vscode-extension-api": "13.0.0",
+    "vscode-languageclient": "~9.0.1"
   },
   "peerDependenciesMeta": {
     "@codingame/monaco-vscode-api": {
       "optional": false
     },
     "@codingame/monaco-vscode-editor-api": {
       "optional": false
+    },
+    "@codingame/monaco-vscode-extension-api": {
+      "optional": false
+    },
+    "vscode-languageclient": {
+      "optional": false
     }
   },
   "scripts": {

packages/client/package.json

@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import { ConsoleLogger as VSCodeConsoleLogger, ILogger } from '@codingame/monaco-vscode-log-service-override';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 
 export interface Logger extends ILogger {
     createErrorAndLog(message: string, ...params: unknown[]): Error;

packages/client/src/tools/logging.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-import * as monaco from 'monaco-editor';
+import * as monaco from '@codingame/monaco-vscode-editor-api';
 import 'vscode/localExtensionHost';
-import { initialize, IWorkbenchConstructionOptions } from '@codingame/monaco-vscode-api/services';
+import { initialize, IWorkbenchConstructionOptions } from '@codingame/monaco-vscode-api';
 import type { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
 import type { WorkerConfig } from '@codingame/monaco-vscode-extensions-service-override';
 import getExtensionServiceOverride from '@codingame/monaco-vscode-extensions-service-override';

packages/client/src/vscode/services.ts

@@ -5,7 +5,7 @@
 
 import { describe, expect, test } from 'vitest';
 import { ConsoleLogger } from 'monaco-languageclient/tools';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 
 describe('Logger', () => {
 

packages/client/test/tools/index.test.ts

@@ -73,6 +73,7 @@
   "dependencies": {
     "@codingame/monaco-vscode-configuration-service-override": "13.0.0",
     "@codingame/monaco-vscode-cpp-default-extension": "13.0.0",
+    "@codingame/monaco-vscode-editor-api": "13.0.0",
     "@codingame/monaco-vscode-environment-service-override": "13.0.0",
     "@codingame/monaco-vscode-explorer-service-override": "13.0.0",
     "@codingame/monaco-vscode-files-service-override": "13.0.0",
@@ -103,7 +104,6 @@
     "express": "~4.21.2",
     "jszip": "~3.10.1",
     "langium": "~3.3.1",
-    "monaco-editor": "npm:@codingame/[email protected]",
     "monaco-editor-wrapper": "~6.2.0-next.0",
     "monaco-languageclient": "~9.2.0-next.0",
     "pyright": "~1.1.392",

packages/examples/package.json

@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import * as vscode from 'vscode';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { RegisteredFileSystemProvider, registerFileSystemOverlay, RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
 import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';

packages/examples/src/appPlayground/config.ts

@@ -3,12 +3,12 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-import * as monaco from 'monaco-editor';
+import * as monaco from '@codingame/monaco-vscode-editor-api';
 import { initServices } from 'monaco-languageclient/vscode/services';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
+import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
 // monaco-editor does not supply json highlighting with the json worker,
 // that's why we use the textmate extension from VSCode
-import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
 import '@codingame/monaco-vscode-json-default-extension';
 import { MonacoLanguageClient } from 'monaco-languageclient';
 import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc';

packages/examples/src/bare/client.ts

@@ -10,7 +10,7 @@ import '@codingame/monaco-vscode-json-default-extension';
 import { getLanguageService, TextDocument } from 'vscode-json-languageservice';
 import { createConverter as createCodeConverter } from 'vscode-languageclient/lib/common/codeConverter.js';
 import { createConverter as createProtocolConverter } from 'vscode-languageclient/lib/common/protocolConverter.js';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
 import { configureMonacoWorkers } from '../common/client/utils.js';
 

packages/examples/src/browser/main.ts

@@ -14,7 +14,7 @@ import getExplorerServiceOverride from '@codingame/monaco-vscode-explorer-servic
 import getRemoteAgentServiceOverride from '@codingame/monaco-vscode-remote-agent-service-override';
 import getEnvironmentServiceOverride from '@codingame/monaco-vscode-environment-service-override';
 import getSecretStorageServiceOverride from '@codingame/monaco-vscode-secret-storage-service-override';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { WrapperConfig } from 'monaco-editor-wrapper';
 import { configureMonacoWorkers } from '../../common/client/utils.js';
 import { ClangdWorkerHandler } from './workerHandler.js';