Merge pull request #30 from CodinGame/fix-accessibility-themes

Fix accessibility themes

Author: CGNonofr

README.md

@@ -32,14 +32,14 @@ npm install @codingame/monaco-editor-wrapper
 ### Usage
 
 :warning: You should NEVER import `monaco-editor` directly in your code.
-`monaco-editor/esm/vs/editor/edcore.main` should be used instead or Monaco will load all languages/worker and break the loading.
+`monaco-editor/esm/vs/editor/editor.api` should be used instead or Monaco will load all languages/worker and break the loading.
 There are 2 solutions:
 - if webpack is used, a resolve alias can be used:
 ```javascript
 {
   resolve: {
     alias: {
-      'monaco-editor$': require.resolve('monaco-editor/esm/vs/editor/edcore.main')
+      'monaco-editor$': require.resolve('monaco-editor/esm/vs/editor/editor.api')
     }
   }
 }

rollup.config.ts

@@ -44,8 +44,8 @@ export default rollup.defineConfig({
     dir: 'dist',
     format: 'esm',
     paths: {
-      'monaco-editor': 'monaco-editor/esm/vs/editor/edcore.main',
-      'monaco-editor-core': 'monaco-editor/esm/vs/editor/edcore.main'
+      'monaco-editor': 'monaco-editor/esm/vs/editor/editor.api',
+      'monaco-editor-core': 'monaco-editor/esm/vs/editor/editor.api'
     },
     entryFileNames: (module) => {
       const name = path.join(
@@ -101,7 +101,7 @@ export default rollup.defineConfig({
         replacement: 'monaco-editor/'
       }, {
         find: /^(monaco-editor|monaco-editor-core)$/,
-        replacement: 'monaco-editor/esm/vs/editor/edcore.main'
+        replacement: 'monaco-editor/esm/vs/editor/editor.api'
       }]
     }),
     string({

src/monaco.ts

@@ -6,6 +6,16 @@ import TextModelService from './services/TextModelService'
 import './worker'
 import setupExtensions from './extensions'
 
+import 'monaco-editor/esm/vs/editor/editor.all'
+import 'monaco-editor/esm/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp'
+import 'monaco-editor/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard'
+import 'monaco-editor/esm/vs/editor/standalone/browser/inspectTokens/inspectTokens'
+import 'monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess'
+import 'monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess'
+import 'monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess'
+import 'monaco-editor/esm/vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess'
+import 'monaco-editor/esm/vs/editor/standalone/browser/referenceSearch/standaloneReferenceSearch'
+
 monaco.extra.StandaloneServices.initialize({
   get textModelService () {
     return new TextModelService(monaco.extra.StandaloneServices.get(monaco.extra.IModelService))
@@ -18,6 +28,8 @@ monaco.extra.StandaloneServices.initialize({
     )
   }
 })
+// Disable high contrast autodetection because it fallbacks on the hc-black no matter what
+monaco.extra.StandaloneServices.get(monaco.editor.IStandaloneThemeService).setAutoDetectHighContrast(false)
 
 // Force EOL to be '\n' even on Windows
 const configurationService = monaco.extra.StandaloneServices.get(monaco.extra.IConfigurationService)