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

kaisalmen · kaisalmen · commit ea2fa7e52e32 · 2025-01-25T20:51:28.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -76,7 +76,6 @@
     "@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/monaco-vscode-editor-api@13.0.0",
     "vscode": "npm:@codingame/monaco-vscode-extension-api@13.0.0",
     "vscode-languageclient": "~9.0.1"
   },
diff --git a/packages/client/src/tools/logging.ts b/packages/client/src/tools/logging.ts
@@ -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;
diff --git a/packages/client/src/vscode/services.ts b/packages/client/src/vscode/services.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';
diff --git a/packages/client/test/tools/index.test.ts b/packages/client/test/tools/index.test.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', () => {
 
diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -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/monaco-vscode-editor-api@13.0.0",
     "monaco-editor-wrapper": "~6.2.0-next.0",
     "monaco-languageclient": "~9.2.0-next.0",
     "pyright": "~1.1.392",
diff --git a/packages/examples/src/appPlayground/config.ts b/packages/examples/src/appPlayground/config.ts
@@ -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';
diff --git a/packages/examples/src/bare/client.ts b/packages/examples/src/bare/client.ts
@@ -3,9 +3,9 @@
  * 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';
 // 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';
diff --git a/packages/examples/src/browser/main.ts b/packages/examples/src/browser/main.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';
 
diff --git a/packages/examples/src/clangd/client/config.ts b/packages/examples/src/clangd/client/config.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';
diff --git a/packages/examples/src/eclipse.jdt.ls/client/main.ts b/packages/examples/src/eclipse.jdt.ls/client/main.ts
@@ -9,7 +9,7 @@ import { RegisteredFileSystemProvider, RegisteredMemoryFile, registerFileSystemO
 // this is required syntax highlighting
 import '@codingame/monaco-vscode-java-default-extension';
 import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { eclipseJdtLsConfig } from '../config.js';
 import helloJavaCode from '../../../resources/eclipse.jdt.ls/workspace/hello.java?raw';
 import { configureMonacoWorkers } from '../../common/client/utils.js';
diff --git a/packages/examples/src/groovy/client/main.ts b/packages/examples/src/groovy/client/main.ts
@@ -6,7 +6,7 @@
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 // this is required syntax highlighting
 import '@codingame/monaco-vscode-groovy-default-extension';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
 import { groovyConfig } from '../config.js';
 import { configureMonacoWorkers } from '../../common/client/utils.js';
diff --git a/packages/examples/src/json/client/wrapperWs.ts b/packages/examples/src/json/client/wrapperWs.ts
@@ -6,7 +6,7 @@
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 // this is required syntax highlighting
 import '@codingame/monaco-vscode-json-default-extension';
-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';
 
diff --git a/packages/examples/src/langium/langium-dsl/config/classicConfig.ts b/packages/examples/src/langium/langium-dsl/config/classicConfig.ts
@@ -5,7 +5,7 @@
 
 import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { Logger } from 'monaco-languageclient/tools';
 import { WrapperConfig } from 'monaco-editor-wrapper';
 import { LangiumMonarchContent } from './langium.monarch.js';
diff --git a/packages/examples/src/langium/langium-dsl/config/extendedConfig.ts b/packages/examples/src/langium/langium-dsl/config/extendedConfig.ts
@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import '../../../../resources/vsix/github-vscode-theme.vsix';
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser.js';
 import { WrapperConfig } from 'monaco-editor-wrapper';
diff --git a/packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts b/packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts
@@ -7,7 +7,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
 import getLifecycleServiceOverride from '@codingame/monaco-vscode-lifecycle-service-override';
 import getLocalizationServiceOverride from '@codingame/monaco-vscode-localization-service-override';
 import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscode/services';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { LanguageClientConfig, WrapperConfig } from 'monaco-editor-wrapper';
 // cannot be imported with assert as json contains comments
 import statemachineLanguageConfig from './language-configuration.json?raw';
diff --git a/packages/examples/src/multi/twoLanguageClients.ts b/packages/examples/src/multi/twoLanguageClients.ts
@@ -8,7 +8,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
 // this is required syntax highlighting
 import '@codingame/monaco-vscode-json-default-extension';
 import '@codingame/monaco-vscode-python-default-extension';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { CodePlusFileExt, configureAndInitVscodeApi, disposeLanguageClients, LanguageClientWrapper, MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
 import { configureMonacoWorkers, disableButton } from '../common/client/utils.js';
 import { createJsonLanguageClientConfig, createPythonLanguageClientConfig } from './config.js';
diff --git a/packages/examples/src/python/client/config.ts b/packages/examples/src/python/client/config.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 import '@codingame/monaco-vscode-python-default-extension';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { MonacoLanguageClient } from 'monaco-languageclient';
 import { createUrl } from 'monaco-languageclient/tools';
 import { WrapperConfig } from 'monaco-editor-wrapper';
diff --git a/packages/examples/src/ts/wrapperTs.ts b/packages/examples/src/ts/wrapperTs.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 import '@codingame/monaco-vscode-typescript-basics-default-extension';
 import '@codingame/monaco-vscode-typescript-language-features-default-extension';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { CodePlusUri, MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
 import { configureMonacoWorkers } from '../common/client/utils.js';
 
diff --git a/packages/wrapper-react/package.json b/packages/wrapper-react/package.json
@@ -46,7 +46,7 @@
     "npm": "10.9.2"
   },
   "dependencies": {
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@13.0.0",
+    "@codingame/monaco-vscode-editor-api": "13.0.0",
     "monaco-languageclient": "~9.2.0-next.0",
     "vscode": "npm:@codingame/monaco-vscode-extension-api@13.0.0",
     "vscode-ws-jsonrpc": "~3.4.0"
diff --git a/packages/wrapper-react/src/index.tsx b/packages/wrapper-react/src/index.tsx
@@ -3,7 +3,7 @@
 * 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 React, { CSSProperties, useCallback, useEffect, useRef, useState } from 'react';
 import { didModelContentChange, MonacoEditorLanguageClientWrapper, TextChanges, TextModels, WrapperConfig } from 'monaco-editor-wrapper';
 
diff --git a/packages/wrapper-react/test/index.test.tsx b/packages/wrapper-react/test/index.test.tsx
@@ -6,7 +6,7 @@
 import { describe, expect, test } from 'vitest';
 import { render, RenderResult } from '@testing-library/react';
 import React from 'react';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { MonacoEditorLanguageClientWrapper, TextChanges, WrapperConfig } from 'monaco-editor-wrapper';
 import { MonacoEditorReactComp } from '@typefox/monaco-editor-react';
 import { configureMonacoWorkers } from './helper.js';
diff --git a/packages/wrapper/package.json b/packages/wrapper/package.json
@@ -90,6 +90,7 @@
   },
   "dependencies": {
     "@codingame/monaco-vscode-configuration-service-override": "13.0.0",
+    "@codingame/monaco-vscode-editor-api": "13.0.0",
     "@codingame/monaco-vscode-editor-service-override": "13.0.0",
     "@codingame/monaco-vscode-language-pack-cs": "13.0.0",
     "@codingame/monaco-vscode-language-pack-de": "13.0.0",
@@ -111,7 +112,6 @@
     "@codingame/monaco-vscode-theme-service-override": "13.0.0",
     "@codingame/monaco-vscode-views-service-override": "13.0.0",
     "@codingame/monaco-vscode-workbench-service-override": "13.0.0",
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@13.0.0",
     "vscode": "npm:@codingame/monaco-vscode-extension-api@13.0.0",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver-protocol": "~3.17.5"
diff --git a/packages/wrapper/src/editorApp.ts b/packages/wrapper/src/editorApp.ts
@@ -4,9 +4,9 @@
  * ------------------------------------------------------------------------------------------ */
 
 import * as vscode from 'vscode';
-import * as monaco from 'monaco-editor';
+import * as monaco from '@codingame/monaco-vscode-editor-api';
 import { createModelReference, ITextFileEditorModel } from '@codingame/monaco-vscode-api/monaco';
-import { ConfigurationTarget, IConfigurationService, StandaloneServices } from '@codingame/monaco-vscode-api/services';
+import { ConfigurationTarget, IConfigurationService, StandaloneServices } from '@codingame/monaco-vscode-api';
 import { IReference } from '@codingame/monaco-vscode-editor-service-override';
 import { Logger } from 'monaco-languageclient/tools';
 import { OverallConfigType } from './vscode/services.js';
diff --git a/packages/wrapper/src/vscode/services.ts b/packages/wrapper/src/vscode/services.ts
@@ -4,9 +4,9 @@
  * ------------------------------------------------------------------------------------------ */
 
 import * as vscode from 'vscode';
-import * as monaco from 'monaco-editor';
+import * as monaco from '@codingame/monaco-vscode-editor-api';
 import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { mergeServices, ViewsConfig, VscodeApiConfig } from 'monaco-languageclient/vscode/services';
 
 export type OverallConfigType = 'extended' | 'classic';
diff --git a/packages/wrapper/src/wrapper.ts b/packages/wrapper/src/wrapper.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 { DisposableStore } from '@codingame/monaco-vscode-api/monaco';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { registerExtension, IExtensionManifest, ExtensionHostKind, RegisterExtensionResult } from '@codingame/monaco-vscode-api/extensions';
 import { MonacoLanguageClient } from 'monaco-languageclient';
 import { initServices, InitServicesInstructions, VscodeApiConfig } from 'monaco-languageclient/vscode/services';
diff --git a/packages/wrapper/test/vscode/services.test.ts b/packages/wrapper/test/vscode/services.test.ts
@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import { describe, expect, test } from 'vitest';
-import { LogLevel } from '@codingame/monaco-vscode-api/services';
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import { augmentVscodeApiConfig } from 'monaco-editor-wrapper/vscode/services';
 
 describe('createUrl', () => {
diff --git a/packages/wrapper/test/wrapper.test.ts b/packages/wrapper/test/wrapper.test.ts
@@ -8,7 +8,7 @@ import { createModelReference } from '@codingame/monaco-vscode-api/monaco';
 import { describe, expect, test } from 'vitest';
 import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
 import { createMonacoEditorDiv, createWrapperConfigClassicApp, createWrapperConfigExtendedApp } from './helper.js';
-import { IConfigurationService, StandaloneServices } from '@codingame/monaco-vscode-api/services';
+import { IConfigurationService, StandaloneServices } from '@codingame/monaco-vscode-api';
 
 describe('Test MonacoEditorLanguageClientWrapper', () => {
 
diff --git a/verify/angular/package.json b/verify/angular/package.json
@@ -16,7 +16,7 @@
     "@angular/core": "~18.2.8",
     "@angular/platform-browser": "~18.2.8",
     "@angular/platform-browser-dynamic": "~18.2.8",
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@13.0.0",
+    "@codingame/monaco-vscode-editor-api": "13.0.0",
     "monaco-editor-wrapper": "~6.2.0-next.0",
     "monaco-languageclient-examples": "~2025.1.2",
     "rxjs": "~7.8.1",
diff --git a/verify/angular/src/monaco-angular-wrapper/monaco-angular-wrapper.component.ts b/verify/angular/src/monaco-angular-wrapper/monaco-angular-wrapper.component.ts
@@ -12,7 +12,7 @@ import {
     Output,
 } from '@angular/core';
 
-import * as monaco from 'monaco-editor';
+import * as monaco from '@codingame/monaco-vscode-editor-api';
 import {
     MonacoEditorLanguageClientWrapper,
     TextChanges,
diff --git a/verify/yarn/package.json b/verify/yarn/package.json
@@ -22,7 +22,6 @@
     "@codingame/monaco-vscode-log-service-override": "13.0.0",
     "@codingame/monaco-vscode-model-service-override": "13.0.0",
     "@typefox/monaco-editor-react": "~6.1.0",
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@13.0.0",
     "monaco-editor-wrapper": "~6.1.0",
     "monaco-languageclient": "~9.1.0",
     "monaco-languageclient-examples": "~2025.1.1",
diff --git a/vite.config.ts b/vite.config.ts
diff --git a/vitest.config.ts b/vitest.config.ts
