From 552bfedb75ef8959de4b7844dd0b566e4f7bb3cf Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Fri, 10 Aug 2018 12:30:59 +0200
Subject: [PATCH] Update dependencies

---
 package-lock.json | 36 +++++++++++++++---------------------
 package.json      |  7 +++----
 test/index.html   | 22 ++++++++++++++--------
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80d4de20..ff654a56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,15 +11,15 @@
       "dev": true
     },
     "monaco-editor-core": {
-      "version": "0.13.2",
-      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.13.2.tgz",
-      "integrity": "sha512-UwUpmT+37fryykVcfuG/KA3sUV/Siip2V+kzzH/F6gzi6QGAe/A/qvr5sfTALdoW55V5aVpUNctPFUw5Bm1Qeg==",
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.14.1.tgz",
+      "integrity": "sha512-bWJuPbDEftxaN2bG+JZ29+aJhg0rmq+y6VmCUqPZpmw8bSevoYjuTcdLkt9BbNaGnwosAVy+vSktXgs/JW7OvQ==",
       "dev": true
     },
     "monaco-languages": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.3.1.tgz",
-      "integrity": "sha512-zOrUBPBUW7RenUoQocl/O5wPlPVR5Ekb4GstgeCxD8PXM5qfU2djdIgAbxIVIPgoGemrQrKKfPV093T0Ot7n4Q==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.4.0.tgz",
+      "integrity": "sha512-39MZMAEKToktfSpOS0Soj05IvkT5vbebL9AIBGPn8fGi8WgJOcfS3YLiMu07gZKViR7CFZ4RyQJKJHglx0fPdA==",
       "dev": true
     },
     "monaco-plugin-helpers": {
@@ -28,7 +28,7 @@
       "integrity": "sha512-7kUx8dtd5qVNVgUARBRhnM8oftPglYwlINfigC4yGUiuzqtIN22u1tly8umiOCIPR0eFiBLjt6aN23oZh2QJgg==",
       "dev": true,
       "requires": {
-        "typescript": "^2.7.2"
+        "typescript": "2.9.2"
       },
       "dependencies": {
         "typescript": {
@@ -39,12 +39,6 @@
         }
       }
     },
-    "monaco-typescript": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/monaco-typescript/-/monaco-typescript-3.1.0.tgz",
-      "integrity": "sha512-GQWDKoXVrh4r0TpjJuRTpGEDeyN0/bqel4Op08CV0bpFL4xifFDfLPAyGeDPJiSlapaY5i+shC6VK0JELfE1OQ==",
-      "dev": true
-    },
     "requirejs": {
       "version": "2.3.5",
       "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz",
@@ -64,13 +58,13 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.4.6",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz",
-      "integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==",
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.7.tgz",
+      "integrity": "sha512-J0M2i1mQA+ze3EdN9SBi751DNdAXmeFLfJrd/MDIkRc3G3Gbb9OPVSx7GIQvVwfWxQARcYV2DTxIkMyDAk3o9Q==",
       "dev": true,
       "requires": {
-        "commander": "~2.16.0",
-        "source-map": "~0.6.1"
+        "commander": "2.16.0",
+        "source-map": "0.6.1"
       }
     },
     "vscode-html-languageservice": {
@@ -79,9 +73,9 @@
       "integrity": "sha512-3SMcTOaiqFTCiHOeAFbHcBSsAgJA81q9PrRdOR7b5LQhkGDUwL5FEETp9gzd+A4c1Bxe14Zu51bY7+jwfTnfzA==",
       "dev": true,
       "requires": {
-        "vscode-languageserver-types": "^3.10.0",
-        "vscode-nls": "^3.2.4",
-        "vscode-uri": "^1.0.5"
+        "vscode-languageserver-types": "3.10.0",
+        "vscode-nls": "3.2.4",
+        "vscode-uri": "1.0.5"
       }
     },
     "vscode-languageserver-types": {
diff --git a/package.json b/package.json
index 28dafbb8..542bccf4 100644
--- a/package.json
+++ b/package.json
@@ -19,13 +19,12 @@
     "url": "https://github.com/Microsoft/monaco-editor/issues"
   },
   "devDependencies": {
-    "monaco-editor-core": "0.13.2",
-    "monaco-languages": "^1.3.1",
+    "monaco-editor-core": "0.14.1",
+    "monaco-languages": "^1.4.0",
     "monaco-plugin-helpers": "^1.0.2",
-    "monaco-typescript": "^3.1.0",
     "requirejs": "^2.3.5",
     "typescript": "^3.0.1",
-    "uglify-js": "^3.4.6",
+    "uglify-js": "^3.4.7",
     "vscode-html-languageservice": "^2.1.4",
     "vscode-languageserver-types": "^3.10.0"
   }
diff --git a/test/index.html b/test/index.html
index 87b88f0a..70d43156 100644
--- a/test/index.html
+++ b/test/index.html
@@ -12,14 +12,21 @@
 
 <script>
 	// Loading basic-languages to get the html language definition
-	// Loading monaco-typescript to get javascript coloring
-	var require = {
-		paths: {
-			'vs/basic-languages': '../node_modules/monaco-languages/release/dev',
-			'vs/language/typescript': '../node_modules/monaco-typescript/release/dev',
-			'vs/language/html': '../release/dev',
-			'vs': '../node_modules/monaco-editor-core/dev/vs'
+	var paths = {
+		'vs/basic-languages': '../node_modules/monaco-languages/release/dev',
+		'vs/language/html': '../release/dev',
+		'vs': '../node_modules/monaco-editor-core/dev/vs'
+	};
+	if (document.location.protocol === 'http:') {
+		// Add support for running local http server
+		let testIndex = document.location.pathname.indexOf('/test/');
+		if (testIndex !== -1) {
+			let prefix = document.location.pathname.substr(0, testIndex);
+			paths['vs/language/html'] = prefix + '/release/dev';
 		}
+	}
+	var require = {
+		paths: paths
 	};
 </script>
 <script src="../node_modules/monaco-editor-core/dev/vs/loader.js"></script>
@@ -29,7 +36,6 @@
 <script>
 	require([
 		'vs/basic-languages/monaco.contribution',
-		'vs/language/typescript/monaco.contribution',
 		'vs/language/html/monaco.contribution'
 	], function() {
 		var editor = monaco.editor.create(document.getElementById('container'), {