Adopt latest monaco-editor-core

microsoft · Jun 30, 2017 · e294277 · e294277
1 parent ecfce90
commit e294277
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "jsdom-no-contextify": "^3.1.0",
     "merge-stream": "^1.0.1",
     "mocha": "^3.4.2",
-    "monaco-editor-core": "^0.8.0",
+    "monaco-editor-core": "^0.9.0",
     "object-assign": "^4.1.1",
     "rimraf": "^2.6.1",
     "typescript": "2.3.4"

diff --git a/test/all.js b/test/all.js
@@ -4,6 +4,8 @@ var jsdom = require('jsdom-no-contextify');
 requirejs.config({
 	baseUrl: '',
 	paths: {
+		'vs/css': 'test/css.mock',
+		'vs/nls': 'test/nls.mock',
 		// 'vs': '../vscode/out/vs'
 		'vs': 'node_modules/monaco-editor-core/dev/vs'
 	},
@@ -15,6 +17,7 @@ global.document.queryCommandSupported = function() {};
 global.self = global.window = global.document.parentWindow;
 global.navigator = global.window.navigator;
 global.window.require = requirejs;
+global.doNotInitLoader = true;
 
 function MyWorker() {}
 MyWorker.prototype.postMessage = function() {};

diff --git a/test/css.mock.js b/test/css.mock.js
@@ -0,0 +1,5 @@
+define('vs/css', [], {
+	load: function(name, req, load) {
+		load({});
+	}
+});
diff --git a/test/nls.mock.js b/test/nls.mock.js
@@ -0,0 +1,15 @@
+define('vs/nls', [], {
+	create: function() {
+		return {
+			localize: function() {
+				return 'NO_LOCALIZATION_FOR_YOU';
+			}
+		};
+	},
+	localize: function() {
+		return 'NO_LOCALIZATION_FOR_YOU';
+	},
+	load: function(name, req, load) {
+		load({});
+	}
+});