Merge pull request #75 from CodinGame/update-monaco-0.36

Update to monaco 0.36

Author: CGNonofr

README.md

@@ -68,15 +68,13 @@ Usage:
 ```typescript
 import { StandaloneServices } from 'vscode/services'
 import getModelEditorServiceOverride from 'vscode/service-override/modelEditor'
-import getMessageServiceOverride from 'vscode/service-override/messages'
 import getConfigurationServiceOverride, { updateUserConfiguration, configurationRegistry } from 'vscode/service-override/configuration'
 
 StandaloneServices.initialize({
   ...getModelEditorServiceOverride((model, input, sideBySide) => {
     // Open a new editor here and return it
     // It will be called when for instance the user ctrl+click on an import
   }),
-  ...getMessageServiceOverride(document.body),
   ...getConfigurationServiceOverride()
 })
 
@@ -167,7 +165,7 @@ From CLI run:
 ```bash
 cd demo
 npm ci
-npm run start
+npm start
 # OR: for vite debug output
 npm run start:debug
 ```

demo/package-lock.json

@@ -6,19 +6,18 @@
   "scripts": {
     "clean": "tsc -b -c",
     "compile": "tsc",
-    "start": "vite",
-    "start:debug": "vite --debug --force"
+    "start": "vite --config vite.config.ts",
+    "start:debug": "vite --config vite.config.ts --debug --force"
   },
   "devDependencies": {
     "@types/throttle-debounce": "~5.0.0",
     "typescript": "~4.9.5",
     "vite": "~4.1.4"
   },
   "dependencies": {
-    "monaco-editor": "~0.34.1",
     "throttle-debounce": "~5.0.0",
     "vscode": "file:../",
-    "vscode-oniguruma": "~1.6.2"
+    "vscode-oniguruma": "~1.7.0"
   },
   "volta": {
     "node": "18.14.2",

demo/package.json

@@ -17,6 +17,11 @@ import { createConfiguredEditor, getJsonSchemas, onDidChangeJsonSchema } from 'v
 import { debounce } from 'throttle-debounce'
 import * as vscode from 'vscode'
 
+monaco.languages.json.jsonDefaults.setModeConfiguration({
+  ...monaco.languages.json.jsonDefaults.modeConfiguration,
+  tokens: false // Disable monarch tokenizer as we use TextMate here
+})
+
 void vscode.window.showInformationMessage('Hello', {
   detail: 'Welcome to the monaco-vscode-api demo',
   modal: true

demo/src/main.ts

@@ -23,10 +23,10 @@ import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
 import themes from './resources/themes/themes.json'
 
 // Workers
-interface WrappedWorker {
+interface WorkerConstructor {
   new(): Worker
 }
-export type WorkerLoader = () => WrappedWorker | Promise<WrappedWorker>
+export type WorkerLoader = () => WorkerConstructor | Promise<WorkerConstructor>
 const workerLoaders: Partial<Record<string, WorkerLoader>> = {
   editorWorkerService: () => EditorWorker,
   json: () => JsonWorker
@@ -63,14 +63,14 @@ StandaloneServices.initialize({
   ...getLanguagesServiceOverride()
 })
 
-const loader = {
+const loader: Partial<Record<string, () => Promise<string>>> = {
   '/themes/dark_plus.json': async () => (await import('./resources/themes/theme-defaults~dark_plus.json?raw')).default,
   '/themes/light_plus.json': async () => (await import('./resources/themes/theme-defaults~light_plus.json?raw')).default,
   '/themes/dark_vs.json': async () => (await import('./resources/themes/theme-defaults~dark_vs.json?raw')).default,
   '/themes/light_vs.json': async () => (await import('./resources/themes/theme-defaults~light_vs.json?raw')).default,
   '/themes/hc_black.json': async () => (await import('./resources/themes/theme-defaults~hc_black.json?raw')).default,
   '/themes/hc_light.json': async () => (await import('./resources/themes/theme-defaults~hc_light.json?raw')).default
-} as Partial<Record<string, () => Promise<string>>>
+}
 setDefaultThemes(themes as IThemeExtensionPoint[], async (theme) => loader[theme.path.slice(1)]!())
 
 setLanguages([{

demo/src/setup.ts

@@ -0,0 +1,18 @@
+declare module '*?url' {
+  const url: string
+  export default url
+}
+
+declare module '*?worker' {
+  interface WorkerConstructor {
+    new(): Worker
+  }
+
+  const Worker: WorkerConstructor
+  export default Worker
+}
+
+declare module '*?raw' {
+  const content: string
+  export default content
+}

demo/src/types.d.ts

@@ -0,0 +1,9 @@
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  server: {
+    fs: {
+      allow: ['../'] // allow to load codicon.tss from monaco-editor in the parent folder
+    }
+  }
+})