瀏覽代碼

Don't load editor api from global API but use require directly.

Henning Dieterichs 3 年之前
父節點
當前提交
9eb7c18143
共有 4 個文件被更改,包括 10 次插入14 次删除
  1. 0 8
      build/fillers/monaco-editor-core-amd.ts
  2. 3 2
      build/utils.js
  3. 4 0
      src/fillers/editor.api.d.ts
  4. 3 4
      src/fillers/monaco-editor-core-amd.ts

+ 0 - 8
build/fillers/monaco-editor-core-amd.ts

@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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
-
-export = (<any>self).monaco;

+ 3 - 2
build/utils.js

@@ -181,9 +181,10 @@ function buildOneAMD(type, options) {
 		plugins: [
 		plugins: [
 			alias({
 			alias({
 				'vscode-nls': path.join(__dirname, '../build/fillers/vscode-nls.ts'),
 				'vscode-nls': path.join(__dirname, '../build/fillers/vscode-nls.ts'),
-				'monaco-editor-core': path.join(__dirname, '../build/fillers/monaco-editor-core-amd.ts')
+				'monaco-editor-core': path.join(__dirname, '../src/fillers/monaco-editor-core-amd.ts')
 			})
 			})
-		]
+		],
+		external: ['vs/editor/editor.api']
 	};
 	};
 	if (type === 'min') {
 	if (type === 'min') {
 		opts.minify = true;
 		opts.minify = true;

+ 4 - 0
src/fillers/editor.api.d.ts

@@ -0,0 +1,4 @@
+declare module 'vs/editor/editor.api' {
+	const x: any;
+	export = x;
+}

+ 3 - 4
src/fillers/monaco-editor-core-amd.ts

@@ -5,8 +5,7 @@
 
 
 // Resolves with the global monaco API
 // Resolves with the global monaco API
 
 
-declare var define: any;
+/// <reference path="./editor.api.d.ts" />
+import * as api from 'vs/editor/editor.api';
 
 
-define([], function () {
-	return (<any>self).monaco;
-});
+export = api;