Use the global monaco only in the AMD case (see microsoft/monaco-ed…

…itor#1974)

README.md

@@ -9,7 +9,7 @@ JSON language plugin for the Monaco Editor. It provides the following features w
 * Syntax highlighting
 * Color decorators for all properties matching a schema containing `format: "color-hex"'` (non-standard schema extension)
 
-Schemas can be provided by configuration. See [here](https://github.com/Microsoft/monaco-json/blob/master/src/monaco.d.ts)
+Schemas can be provided by configuration. See [here](https://github.com/Microsoft/monaco-json/blob/master/monaco.d.ts)
 for the API that the JSON plugin offers to configure the JSON language support.
 
 Internally the JSON plugin uses the [vscode-json-languageservice](https://github.com/Microsoft/vscode-json-languageservice)

src/monaco.d.ts → monaco.d.ts

@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-declare module monaco.languages.json {
+declare namespace monaco.languages.json {
+
 	export interface DiagnosticsOptions {
 		/**
 		 * If set, the validator will be enabled and perform syntax validation as well as schema based validation.
@@ -35,67 +36,56 @@ declare module monaco.languages.json {
 		 */
 		readonly enableSchemaRequest?: boolean;
 	}
-
 	export interface ModeConfiguration {
 		/**
 		 * Defines whether the built-in documentFormattingEdit provider is enabled.
 		 */
 		readonly documentFormattingEdits?: boolean;
-
 		/**
 		 * Defines whether the built-in documentRangeFormattingEdit provider is enabled.
 		 */
 		readonly documentRangeFormattingEdits?: boolean;
-
 		/**
 		 * Defines whether the built-in completionItemProvider is enabled.
 		 */
 		readonly completionItems?: boolean;
-
 		/**
 		 * Defines whether the built-in hoverProvider is enabled.
 		 */
 		readonly hovers?: boolean;
-
 		/**
 		 * Defines whether the built-in documentSymbolProvider is enabled.
 		 */
 		readonly documentSymbols?: boolean;
-
 		/**
 		 * Defines whether the built-in tokens provider is enabled.
 		 */
 		readonly tokens?: boolean;
-
 		/**
 		 * Defines whether the built-in color provider is enabled.
 		 */
 		readonly colors?: boolean;
-
 		/**
 		 * Defines whether the built-in foldingRange provider is enabled.
 		 */
 		readonly foldingRanges?: boolean;
-
 		/**
 		 * Defines whether the built-in diagnostic provider is enabled.
 		 */
 		readonly diagnostics?: boolean;
-
 		/**
 		 * Defines whether the built-in selection range provider is enabled.
 		 */
 		readonly selectionRanges?: boolean;
-
 	}
-
 	export interface LanguageServiceDefaults {
+		readonly languageId: string;
 		readonly onDidChange: IEvent<LanguageServiceDefaults>;
 		readonly diagnosticsOptions: DiagnosticsOptions;
 		readonly modeConfiguration: ModeConfiguration;
 		setDiagnosticsOptions(options: DiagnosticsOptions): void;
 		setModeConfiguration(modeConfiguration: ModeConfiguration): void;
 	}
+	export const jsonDefaults: LanguageServiceDefaults;
 
-	export var jsonDefaults: LanguageServiceDefaults;
 }

package.json

@@ -3,9 +3,9 @@
   "version": "2.9.0",
   "description": "JSON plugin for the Monaco Editor",
   "scripts": {
-    "compile": "mrmdir ./out && tsc -p ./src/tsconfig.json && tsc -p ./src/tsconfig.esm.json",
+    "compile": "mrmdir ./out && tsc -p ./src/tsconfig.json && tsc -p ./src/tsconfig.esm.json && node ./scripts/dts",
     "watch": "tsc -p ./src --watch",
-    "prepublishOnly": "mrmdir ./release && npm run compile && node ./scripts/release.js && node ./scripts/bundle && mcopy ./src/monaco.d.ts ./release/monaco.d.ts",
+    "prepublishOnly": "mrmdir ./release && npm run compile && node ./scripts/release.js && node ./scripts/bundle && mcopy ./monaco.d.ts ./release/monaco.d.ts && mcopy ./out/esm/monaco.contribution.d.ts ./release/esm/monaco.contribution.d.ts && mcopy ./out/esm/fillers/monaco-editor-core.d.ts ./release/esm/fillers/monaco-editor-core.d.ts",
     "install-service-next": "npm install vscode-json-languageservice@next -f -D && npm install vscode-languageserver-types@next -f -D",
     "install-service-local": "npm install ../vscode-json-languageservice -f -D && npm install ../vscode-languageserver-node/types -f -D"
   },
@@ -18,14 +18,16 @@
   "bugs": {
     "url": "https://github.com/Microsoft/monaco-json/issues"
   },
+  "module": "./release/esm/monaco.contribution.js",
+  "typings": "./release/esm/monaco.contribution.d.ts",
   "devDependencies": {
     "jsonc-parser": "^2.2.0",
     "monaco-editor-core": "0.20.0",
     "monaco-languages": "1.10.0",
-    "monaco-plugin-helpers": "^1.0.2",
+    "monaco-plugin-helpers": "^1.0.3",
     "requirejs": "^2.3.6",
-    "typescript": "3.7.5",
-    "terser": "^4.6.3",
+    "typescript": "4.0.2",
+    "terser": "^5.3.0",
     "vscode-json-languageservice": "3.4.11"
   }
 }

scripts/bundle.js

@@ -24,14 +24,14 @@ bundleOne('monaco.contribution');
 bundleOne('jsonMode');
 bundleOne('jsonWorker');
 
-function bundleOne(moduleId, exclude) {
+function bundleOne(moduleId) {
 	requirejs.optimize({
 		baseUrl: 'out/amd/',
 		name: 'vs/language/json/' + moduleId,
 		out: 'release/dev/' + moduleId + '.js',
-		exclude: exclude,
 		paths: {
-			'vs/language/json': REPO_ROOT + '/out/amd'
+			'vs/language/json': REPO_ROOT + '/out/amd',
+			'vs/language/json/fillers/monaco-editor-core': REPO_ROOT + '/out/amd/fillers/monaco-editor-core-amd',
 		},
 		optimize: 'none',
 		packages: [{

scripts/dts.js

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const path = require('path');
+const fs = require('fs');
+
+const REPO_ROOT = path.join(__dirname, '../');
+const SRC_PATH = path.join(REPO_ROOT, 'out/amd/monaco.contribution.d.ts');
+const DST_PATH = path.join(REPO_ROOT, 'monaco.d.ts');
+
+const lines = fs.readFileSync(SRC_PATH).toString().split(/\r\n|\r|\n/);
+let result = [
+	`/*---------------------------------------------------------------------------------------------`,
+	` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
+	` *  Licensed under the MIT License. See License.txt in the project root for license information.`,
+	` *--------------------------------------------------------------------------------------------*/`,
+	``,
+	`declare namespace monaco.languages.json {`,
+	``
+];
+for (let line of lines) {
+	if (/^import/.test(line)) {
+		continue;
+	}
+	line = line.replace(/    /g, '\t');
+	line = line.replace(/export declare/g, 'export');
+	if (line.length > 0) {
+		line = `\t${line}`;
+	}
+	result.push(line);
+}
+result.push(`}`);
+result.push(``);
+
+fs.writeFileSync(DST_PATH, result.join('\n'));

src/fillers/monaco-editor-core-amd.ts

@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// Resolves with the global monaco API
+
+declare var define;
+
+define([], function() {
+    return (<any>self).monaco;
+});

src/typings/refs.d.ts → src/fillers/monaco-editor-core.ts

@@ -2,4 +2,5 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-/// <reference path='../../node_modules/monaco-editor-core/monaco.d.ts'/>
+
+export * from 'monaco-editor-core';

src/json.worker.ts

@@ -2,7 +2,6 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import * as worker from 'monaco-editor-core/esm/vs/editor/editor.worker';
 import { JSONWorker } from './jsonWorker';

src/jsonMode.ts

@@ -2,18 +2,15 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import { WorkerManager } from './workerManager';
-import { JSONWorker } from './jsonWorker';
-import { LanguageServiceDefaultsImpl } from './monaco.contribution';
+import type { JSONWorker } from './jsonWorker';
+import { LanguageServiceDefaults } from './monaco.contribution';
 import * as languageFeatures from './languageFeatures';
 import { createTokenizationSupport } from './tokenization';
+import { Uri, IDisposable, languages } from './fillers/monaco-editor-core'
 
-import Uri = monaco.Uri;
-import IDisposable = monaco.IDisposable;
-
-export function setupMode(defaults: LanguageServiceDefaultsImpl): IDisposable {
+export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
 
 	const disposables: IDisposable[] = [];
 	const providers: IDisposable[] = [];
@@ -32,40 +29,40 @@ export function setupMode(defaults: LanguageServiceDefaultsImpl): IDisposable {
 		disposeAll(providers);
 
 		if (modeConfiguration.documentFormattingEdits) {
-			providers.push(monaco.languages.registerDocumentFormattingEditProvider(languageId, new languageFeatures.DocumentFormattingEditProvider(worker)));
+			providers.push(languages.registerDocumentFormattingEditProvider(languageId, new languageFeatures.DocumentFormattingEditProvider(worker)));
 		}
 		if (modeConfiguration.documentRangeFormattingEdits) {
-			providers.push(monaco.languages.registerDocumentRangeFormattingEditProvider(languageId, new languageFeatures.DocumentRangeFormattingEditProvider(worker)));
+			providers.push(languages.registerDocumentRangeFormattingEditProvider(languageId, new languageFeatures.DocumentRangeFormattingEditProvider(worker)));
 		}
 		if (modeConfiguration.completionItems) {
-			providers.push(monaco.languages.registerCompletionItemProvider(languageId, new languageFeatures.CompletionAdapter(worker)));
+			providers.push(languages.registerCompletionItemProvider(languageId, new languageFeatures.CompletionAdapter(worker)));
 		}
 		if (modeConfiguration.hovers) {
-			providers.push(monaco.languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker)));
+			providers.push(languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker)));
 		}
 		if (modeConfiguration.documentSymbols) {
-			providers.push(monaco.languages.registerDocumentSymbolProvider(languageId, new languageFeatures.DocumentSymbolAdapter(worker)));
+			providers.push(languages.registerDocumentSymbolProvider(languageId, new languageFeatures.DocumentSymbolAdapter(worker)));
 		}
 		if (modeConfiguration.tokens) {
-			providers.push(monaco.languages.setTokensProvider(languageId, createTokenizationSupport(true)));
+			providers.push(languages.setTokensProvider(languageId, createTokenizationSupport(true)));
 		}
 		if (modeConfiguration.colors) {
-			providers.push(monaco.languages.registerColorProvider(languageId, new languageFeatures.DocumentColorAdapter(worker)));
+			providers.push(languages.registerColorProvider(languageId, new languageFeatures.DocumentColorAdapter(worker)));
 		}
 		if (modeConfiguration.foldingRanges) {
-			providers.push(monaco.languages.registerFoldingRangeProvider(languageId, new languageFeatures.FoldingRangeAdapter(worker)));
+			providers.push(languages.registerFoldingRangeProvider(languageId, new languageFeatures.FoldingRangeAdapter(worker)));
 		}
 		if (modeConfiguration.diagnostics) {
 			providers.push(new languageFeatures.DiagnosticsAdapter(languageId, worker, defaults));
 		}
 		if (modeConfiguration.selectionRanges) {
-			providers.push(monaco.languages.registerSelectionRangeProvider(languageId, new languageFeatures.SelectionRangeAdapter(worker)));
+			providers.push(languages.registerSelectionRangeProvider(languageId, new languageFeatures.SelectionRangeAdapter(worker)));
 		}
 	}
 
 	registerProviders();
 
-	disposables.push(monaco.languages.setLanguageConfiguration(defaults.languageId, richEditConfiguration));
+	disposables.push(languages.setLanguageConfiguration(defaults.languageId, richEditConfiguration));
 
 	let modeConfiguration = defaults.modeConfiguration;
 	defaults.onDidChange((newDefaults) => {
@@ -90,7 +87,7 @@ function disposeAll(disposables: IDisposable[]) {
 	}
 }
 
-const richEditConfiguration: monaco.languages.LanguageConfiguration = {
+const richEditConfiguration: languages.LanguageConfiguration = {
 	wordPattern: /(-?\d*\.\d\w*)|([^\[\{\]\}\:\"\,\s]+)/g,
 
 	comments: {