Skip to content

Commit 1547018

Browse files
kaisalmenkaisalmen
committed
Fix imports. No longer use monaco-editor. test should no loner fail
- Remove pre-build workers from wrapper
1 parent 5fb683f commit 1547018

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+149
-425
lines changed

‎package-lock.json

+61-43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/client/package.json

+10-4
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,26 @@
7676
"@codingame/monaco-vscode-localization-service-override": "13.0.0",
7777
"@codingame/monaco-vscode-log-service-override": "13.0.0",
7878
"@codingame/monaco-vscode-model-service-override": "13.0.0",
79-
"monaco-editor": "npm:@codingame/[email protected]",
80-
"vscode": "npm:@codingame/[email protected]",
81-
"vscode-languageclient": "~9.0.1"
79+
"vscode": "npm:@codingame/[email protected]"
8280
},
8381
"peerDependencies": {
8482
"@codingame/monaco-vscode-api": "13.0.0",
85-
"@codingame/monaco-vscode-editor-api": "13.0.0"
83+
"@codingame/monaco-vscode-editor-api": "13.0.0",
84+
"@codingame/monaco-vscode-extension-api": "13.0.0",
85+
"vscode-languageclient": "~9.0.1"
8686
},
8787
"peerDependenciesMeta": {
8888
"@codingame/monaco-vscode-api": {
8989
"optional": false
9090
},
9191
"@codingame/monaco-vscode-editor-api": {
9292
"optional": false
93+
},
94+
"@codingame/monaco-vscode-extension-api": {
95+
"optional": false
96+
},
97+
"vscode-languageclient": {
98+
"optional": false
9399
}
94100
},
95101
"scripts": {

‎packages/client/src/tools/logging.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* ------------------------------------------------------------------------------------------ */
55

66
import { ConsoleLogger as VSCodeConsoleLogger, ILogger } from '@codingame/monaco-vscode-log-service-override';
7-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
7+
import { LogLevel } from '@codingame/monaco-vscode-api';
88

99
export interface Logger extends ILogger {
1010
createErrorAndLog(message: string, ...params: unknown[]): Error;

‎packages/client/src/vscode/services.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* Licensed under the MIT License. See LICENSE in the package root for license information.
44
* ------------------------------------------------------------------------------------------ */
55

6-
import * as monaco from 'monaco-editor';
6+
import * as monaco from '@codingame/monaco-vscode-editor-api';
77
import 'vscode/localExtensionHost';
8-
import { initialize, IWorkbenchConstructionOptions } from '@codingame/monaco-vscode-api/services';
8+
import { initialize, IWorkbenchConstructionOptions } from '@codingame/monaco-vscode-api';
99
import type { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
1010
import type { WorkerConfig } from '@codingame/monaco-vscode-extensions-service-override';
1111
import getExtensionServiceOverride from '@codingame/monaco-vscode-extensions-service-override';

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { describe, expect, test } from 'vitest';
77
import { ConsoleLogger } from 'monaco-languageclient/tools';
8-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
8+
import { LogLevel } from '@codingame/monaco-vscode-api';
99

1010
describe('Logger', () => {
1111

‎packages/examples/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"dependencies": {
7474
"@codingame/monaco-vscode-configuration-service-override": "13.0.0",
7575
"@codingame/monaco-vscode-cpp-default-extension": "13.0.0",
76+
"@codingame/monaco-vscode-editor-api": "13.0.0",
7677
"@codingame/monaco-vscode-environment-service-override": "13.0.0",
7778
"@codingame/monaco-vscode-explorer-service-override": "13.0.0",
7879
"@codingame/monaco-vscode-files-service-override": "13.0.0",
@@ -103,7 +104,6 @@
103104
"express": "~4.21.2",
104105
"jszip": "~3.10.1",
105106
"langium": "~3.3.1",
106-
"monaco-editor": "npm:@codingame/[email protected]",
107107
"monaco-editor-wrapper": "~6.2.0-next.0",
108108
"monaco-languageclient": "~9.2.0-next.0",
109109
"pyright": "~1.1.392",

‎packages/examples/src/appPlayground/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* ------------------------------------------------------------------------------------------ */
55

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

‎packages/examples/src/bare/client.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
* ------------------------------------------------------------------------------------------ */
55

6-
import * as monaco from 'monaco-editor';
6+
import * as monaco from '@codingame/monaco-vscode-editor-api';
77
import { initServices } from 'monaco-languageclient/vscode/services';
8-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
8+
import { LogLevel } from '@codingame/monaco-vscode-api';
9+
import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
910
// monaco-editor does not supply json highlighting with the json worker,
1011
// that's why we use the textmate extension from VSCode
11-
import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
1212
import '@codingame/monaco-vscode-json-default-extension';
1313
import { MonacoLanguageClient } from 'monaco-languageclient';
1414
import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc';

‎packages/examples/src/browser/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import '@codingame/monaco-vscode-json-default-extension';
1010
import { getLanguageService, TextDocument } from 'vscode-json-languageservice';
1111
import { createConverter as createCodeConverter } from 'vscode-languageclient/lib/common/codeConverter.js';
1212
import { createConverter as createProtocolConverter } from 'vscode-languageclient/lib/common/protocolConverter.js';
13-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
13+
import { LogLevel } from '@codingame/monaco-vscode-api';
1414
import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
1515
import { configureMonacoWorkers } from '../common/client/utils.js';
1616

‎packages/examples/src/clangd/client/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import getExplorerServiceOverride from '@codingame/monaco-vscode-explorer-servic
1414
import getRemoteAgentServiceOverride from '@codingame/monaco-vscode-remote-agent-service-override';
1515
import getEnvironmentServiceOverride from '@codingame/monaco-vscode-environment-service-override';
1616
import getSecretStorageServiceOverride from '@codingame/monaco-vscode-secret-storage-service-override';
17-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
17+
import { LogLevel } from '@codingame/monaco-vscode-api';
1818
import { WrapperConfig } from 'monaco-editor-wrapper';
1919
import { configureMonacoWorkers } from '../../common/client/utils.js';
2020
import { ClangdWorkerHandler } from './workerHandler.js';

‎packages/examples/src/common/client/utils.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@ export const disableButton = (id: string, disabled: boolean) => {
1818

1919
export const configureMonacoWorkers = (logger?: Logger) => {
2020
useWorkerFactory({
21-
workerOverrides: {
22-
ignoreMapping: true,
23-
workerLoaders: {
24-
TextEditorWorker: () => new Worker(new URL('monaco-editor/esm/vs/editor/editor.worker.js', import.meta.url), { type: 'module' }),
25-
TextMateWorker: () => new Worker(new URL('@codingame/monaco-vscode-textmate-service-override/worker', import.meta.url), { type: 'module' })
26-
}
21+
workerLoaders: {
22+
TextEditorWorker: () => new Worker(new URL('@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js', import.meta.url), { type: 'module' }),
23+
TextMateWorker: () => new Worker(new URL('@codingame/monaco-vscode-textmate-service-override/worker', import.meta.url), { type: 'module' })
2724
},
2825
logger
2926
});

‎packages/examples/src/eclipse.jdt.ls/client/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { RegisteredFileSystemProvider, RegisteredMemoryFile, registerFileSystemO
99
// this is required syntax highlighting
1010
import '@codingame/monaco-vscode-java-default-extension';
1111
import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
12-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
12+
import { LogLevel } from '@codingame/monaco-vscode-api';
1313
import { eclipseJdtLsConfig } from '../config.js';
1414
import helloJavaCode from '../../../resources/eclipse.jdt.ls/workspace/hello.java?raw';
1515
import { configureMonacoWorkers } from '../../common/client/utils.js';

‎packages/examples/src/groovy/client/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
77
// this is required syntax highlighting
88
import '@codingame/monaco-vscode-groovy-default-extension';
9-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
9+
import { LogLevel } from '@codingame/monaco-vscode-api';
1010
import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
1111
import { groovyConfig } from '../config.js';
1212
import { configureMonacoWorkers } from '../../common/client/utils.js';

‎packages/examples/src/json/client/wrapperWs.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
77
// this is required syntax highlighting
88
import '@codingame/monaco-vscode-json-default-extension';
9-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
9+
import { LogLevel } from '@codingame/monaco-vscode-api';
1010
import { MonacoEditorLanguageClientWrapper, WrapperConfig } from 'monaco-editor-wrapper';
1111
import { configureMonacoWorkers } from '../../common/client/utils.js';
1212

‎packages/examples/src/langium/langium-dsl/config/classicConfig.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
77
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
8-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
8+
import { LogLevel } from '@codingame/monaco-vscode-api';
99
import { Logger } from 'monaco-languageclient/tools';
1010
import { WrapperConfig } from 'monaco-editor-wrapper';
1111
import { LangiumMonarchContent } from './langium.monarch.js';
@@ -42,6 +42,9 @@ export const setupLangiumClientClassic = async (langiumWorker: Worker): Promise<
4242
},
4343
monacoWorkerFactory: (logger?: Logger) => {
4444
useWorkerFactory({
45+
workerLoaders: {
46+
TextEditorWorker: () => new Worker(new URL('@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js', import.meta.url), { type: 'module' })
47+
},
4548
logger
4649
});
4750
}

‎packages/examples/src/langium/langium-dsl/config/extendedConfig.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* ------------------------------------------------------------------------------------------ */
55

66
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
7-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
7+
import { LogLevel } from '@codingame/monaco-vscode-api';
88
import '../../../../resources/vsix/github-vscode-theme.vsix';
99
import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser.js';
1010
import { WrapperConfig } from 'monaco-editor-wrapper';

‎packages/examples/src/langium/statemachine/config/wrapperStatemachineConfig.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
77
import getLifecycleServiceOverride from '@codingame/monaco-vscode-lifecycle-service-override';
88
import getLocalizationServiceOverride from '@codingame/monaco-vscode-localization-service-override';
99
import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscode/services';
10-
import { LogLevel } from '@codingame/monaco-vscode-api/services';
10+
import { LogLevel } from '@codingame/monaco-vscode-api';
1111
import { LanguageClientConfig, WrapperConfig } from 'monaco-editor-wrapper';
1212
// cannot be imported with assert as json contains comments
1313
import statemachineLanguageConfig from './language-configuration.json?raw';

0 commit comments

Comments
 (0)