Update to latest monaco-vscode-api version and remove themes helpers again

Author: kaisalmen

.eslintrc.cjs

@@ -53,7 +53,7 @@ module.exports = {
     },
     ignorePatterns: [
         '**/{node_modules,dist,lib,out,bin}',
-        '.eslintrc.js',
+        '.eslintrc.cjs',
         'config/header.js',
         'packages/examples/*/*.ts'
     ]

package-lock.json

@@ -23,26 +23,12 @@
     ".": {
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
-    },
-    "./themeRemoteHelper": {
-      "types": "./lib/helpers/themeRemoteHelper.d.ts",
-      "default": "./lib/helpers/themeRemoteHelper.js"
-    },
-    "./themeLocalHelper": {
-      "types": "./lib/helpers/themeLocalHelper.d.ts",
-      "default": "./lib/helpers/themeLocalHelper.js"
     }
   },
   "typesVersions": {
     "*": {
       ".": [
         "lib/index.d.ts"
-      ],
-      "themeRemoteHelper": [
-        "./lib/helpers/themeRemoteHelper.d.ts"
-      ],
-      "themeLocalHelper": [
-        "./lib/helpers/themeLocalHelper.d.ts"
       ]
     }
   },
@@ -66,7 +52,7 @@
     "vscode-languageclient": "~8.1.0"
   },
   "peerDependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@~1.76.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@~1.76.2"
   },
   "scripts": {
     "clean": "npx shx rm -fr lib *.tsbuildinfo",

packages/client/package.json

@@ -81,6 +81,7 @@ export class MonacoLanguageClient extends BaseLanguageClient {
 
     protected override registerBuiltinFeatures() {
         const pendingFullTextDocumentChanges: Map<string, TextDocument> = new Map();
+        this.registerFeature(new ConfigurationFeature(this));
         this.registerFeature(new DidOpenTextDocumentFeature(this, this['_syncedDocuments']));
         this.registerFeature(new DidChangeTextDocumentFeature(this, this['_syncedDocuments']));
         this['_didChangeTextDocumentFeature'] = new DidChangeTextDocumentFeature(this, pendingFullTextDocumentChanges);
@@ -104,6 +105,7 @@ export class MonacoLanguageClient extends BaseLanguageClient {
         this.registerFeature(new RenameFeature(this));
         this.registerFeature(new DocumentLinkFeature(this));
         this.registerFeature(new ExecuteCommandFeature(this));
+        this.registerFeature(new SyncConfigurationFeature(this));
         this.registerFeature(new TypeDefinitionFeature(this));
         this.registerFeature(new ImplementationFeature(this));
         this.registerFeature(new ColorProviderFeature(this));
@@ -126,11 +128,9 @@ export class MonacoLanguageClient extends BaseLanguageClient {
      * in MonacoLanguageClient. This method is not called!
      */
     public registerNotUsedFeatures() {
-        this.registerFeature(new ConfigurationFeature(this));
         this.registerFeature(new WillSaveFeature(this));
         this.registerFeature(new WillSaveWaitUntilFeature(this));
         this.registerFeature(new DidSaveTextDocumentFeature(this));
-        this.registerFeature(new SyncConfigurationFeature(this));
         this.registerFeature(new WorkspaceSymbolFeature(this));
         this.registerFeature(new ProgressFeature(this));
         this.registerFeature(new DidCreateFilesFeature(this));

packages/client/src/helpers/themeHelper.ts

@@ -19,7 +19,6 @@
     "vscode-languageserver": "~8.1.0",
     "vscode-uri": "~3.0.7",
     "vscode-ws-jsonrpc": "3.0.0",
-    "vscode-oniguruma": "~1.7.0",
     "ws": "~8.13.0"
   },
   "devDependencies": {

packages/client/src/helpers/themeLocalHelper.ts

@@ -19,7 +19,6 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
 import { buildWorkerDefinition } from 'monaco-editor-workers';
 
 import { MonacoLanguageClient, MonacoServices } from 'monaco-languageclient';
-import { loadAllDefaultThemes } from 'monaco-languageclient/themeLocalHelper';
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver-protocol/browser.js';
 import { CloseAction, ErrorAction, MessageTransports } from 'vscode-languageclient';
 
@@ -42,14 +41,12 @@ const languageId = 'statemachine';
 let editorText = '';
 
 const setup = async () => {
-    const onigFileUrl = new URL('../../../node_modules/vscode-oniguruma/release/onig.wasm', window.location.href).href;
     const statemachineLanguageConfig = new URL('../../../node_modules/langium-statemachine-dsl/language-configuration.json', window.location.href).href;
     const statemachineTmUrl = new URL('../../../node_modules/langium-statemachine-dsl/syntaxes/statemachine.tmLanguage.json', window.location.href).href;
     const exampleStatemachineUrl = new URL('./src/langium/example.statemachine', window.location.href).href;
 
     const responseLanguageConfig = await fetch(statemachineLanguageConfig);
     const responseStatemachineTm = await fetch(statemachineTmUrl);
-    const responseOnig = await fetch(onigFileUrl);
     const responseStatemachine = await fetch(exampleStatemachineUrl);
     editorText = await responseStatemachine.text();
 
@@ -62,18 +59,13 @@ const setup = async () => {
         ...getDialogsServiceOverride(),
         ...getConfigurationServiceOverride(),
         ...getKeybindingsServiceOverride(),
-        ...getTextmateServiceOverride(async () => {
-            return await responseOnig.arrayBuffer();
-        }),
+        ...getTextmateServiceOverride(),
         ...getThemeServiceOverride(),
         ...getTokenClassificationServiceOverride(),
         ...getLanguageConfigurationServiceOverride(),
         ...getLanguagesServiceOverride()
     });
 
-    // IMPORTANT: Please run 'npm run fetch:themes' otherwise the themes are not available
-    loadAllDefaultThemes('./resources/themes');
-
     setLanguages([{
         id: languageId,
         extensions: [
@@ -101,9 +93,9 @@ const setup = async () => {
     });
 
     updateUserConfiguration(`{
-        "workbench.colorTheme": "Dark+ (Experimental)",
         "editor.fontSize": 14
     }`);
+
 };
 
 const run = async () => {

packages/client/src/helpers/themeRemoteHelper.ts

@@ -44,8 +44,9 @@
     "**/packages/*/*/*.ts",
     "**/packages/*/*/*.js",
     "**/resources/**/*.mts",
-    "**/resources/**/*.mjs"
-, "packages/examples/main/resources/fetchThemes.jts"  ],
+    "**/resources/**/*.mjs",
+    "*.ts"
+  ],
   "exclude": [
     "dist/**/*",
     "lib/**/*",