From 52c457a19621ffd49646b91339df111af1ab39b9 Mon Sep 17 00:00:00 2001
From: Remco Haszing <remcohaszing@gmail.com>
Date: Thu, 22 Apr 2021 20:00:34 +0200
Subject: [PATCH] Use monaco-editor/esm/vs/editor/editor.api
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This doesn’t enforce users to pull in all of monaco-editor.
---
 scripts/bundle-umd.js      | 3 ++-
 src/languageFeatures.ts    | 2 +-
 src/monaco.contribution.ts | 6 +++++-
 src/monaco.d.ts            | 4 ++--
 src/workerManager.ts       | 6 +++++-
 src/yamlMode.ts            | 6 +++++-
 src/yamlWorker.ts          | 2 +-
 7 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/scripts/bundle-umd.js b/scripts/bundle-umd.js
index d6e1983..ccd9974 100644
--- a/scripts/bundle-umd.js
+++ b/scripts/bundle-umd.js
@@ -33,7 +33,8 @@ function bundleOne(moduleId, exclude) {
       exclude: exclude,
       paths: {
         'vs/language/yaml': REPO_ROOT + '/out/amd',
-        'monaco-editor': REPO_ROOT + '/out/amd/fillers/monaco-editor-amd',
+        'monaco-editor/esm/vs/editor/editor.api':
+          REPO_ROOT + '/out/amd/fillers/monaco-editor-amd',
       },
       optimize: 'none',
       packages: [
diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
index 1c2e4f2..7ec31fa 100644
--- a/src/languageFeatures.ts
+++ b/src/languageFeatures.ts
@@ -19,7 +19,7 @@ import {
   Position,
   Range,
   Uri,
-} from 'monaco-editor';
+} from 'monaco-editor/esm/vs/editor/editor.api';
 import { CustomFormatterOptions } from 'yaml-language-server';
 
 export type WorkerAccessor = (...more: Uri[]) => PromiseLike<YAMLWorker>;
diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts
index ddf3b0b..ae8e5de 100644
--- a/src/monaco.contribution.ts
+++ b/src/monaco.contribution.ts
@@ -4,7 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { languages, Emitter, IEvent } from 'monaco-editor';
+import {
+  languages,
+  Emitter,
+  IEvent,
+} from 'monaco-editor/esm/vs/editor/editor.api';
 import { setupMode } from './yamlMode';
 
 declare var require: <T>(
diff --git a/src/monaco.d.ts b/src/monaco.d.ts
index 5dd49d6..702f02f 100644
--- a/src/monaco.d.ts
+++ b/src/monaco.d.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IEvent } from 'monaco-editor';
+import { IEvent } from 'monaco-editor/esm/vs/editor/editor.api';
 
-declare module 'monaco-editor' {
+declare module 'monaco-editor/esm/vs/editor/editor.api' {
   namespace languages.yaml {
     export interface DiagnosticsOptions {
       /**
diff --git a/src/workerManager.ts b/src/workerManager.ts
index ef2af4c..7d9d4cd 100644
--- a/src/workerManager.ts
+++ b/src/workerManager.ts
@@ -4,7 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { editor, Uri, IDisposable } from 'monaco-editor';
+import {
+  editor,
+  Uri,
+  IDisposable,
+} from 'monaco-editor/esm/vs/editor/editor.api';
 import { LanguageServiceDefaultsImpl } from './monaco.contribution';
 import { YAMLWorker } from './yamlWorker';
 
diff --git a/src/yamlMode.ts b/src/yamlMode.ts
index 51c1d53..b789ec9 100644
--- a/src/yamlMode.ts
+++ b/src/yamlMode.ts
@@ -4,7 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { languages, Uri, IDisposable } from 'monaco-editor';
+import {
+  languages,
+  Uri,
+  IDisposable,
+} from 'monaco-editor/esm/vs/editor/editor.api';
 import * as languageFeatures from './languageFeatures';
 import { LanguageServiceDefaultsImpl } from './monaco.contribution';
 import { WorkerManager } from './workerManager';
diff --git a/src/yamlWorker.ts b/src/yamlWorker.ts
index bf2216c..065c866 100644
--- a/src/yamlWorker.ts
+++ b/src/yamlWorker.ts
@@ -6,7 +6,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { worker } from 'monaco-editor';
+import { worker } from 'monaco-editor/esm/vs/editor/editor.api';
 import * as ls from 'vscode-languageserver-types';
 import * as yamlService from 'yaml-language-server';