From 324802dae2cd1f24cc88b72369b5bea63373a3ea Mon Sep 17 00:00:00 2001
From: Anton Kosiakov <anton.kosyakov@typefox.io>
Date: Sun, 14 Jan 2018 15:55:14 +0100
Subject: [PATCH] Fix GH-42: removed a dependency to
 monaco-editor-coreSigned-off-by: Anton Kosiakov <anton.kosyakov@typefox.io>

---
 example/package-lock.json | 1 -
 example/tsconfig.json     | 2 +-
 example/webpack.config.js | 2 +-
 package-lock.json         | 5 -----
 package.json              | 1 -
 tsconfig.json             | 2 +-
 typings/monaco/index.d.ts | 2 +-
 7 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/example/package-lock.json b/example/package-lock.json
index 1db9680ce..546f86ad3 100644
--- a/example/package-lock.json
+++ b/example/package-lock.json
@@ -2358,7 +2358,6 @@
       "requires": {
         "glob-to-regexp": "0.3.0",
         "monaco-editor": "0.9.0",
-        "monaco-editor-core": "0.9.0",
         "vscode-base-languageclient": "0.0.1-alpha.3"
       },
       "dependencies": {
diff --git a/example/tsconfig.json b/example/tsconfig.json
index 5d9f78591..f38f240b1 100644
--- a/example/tsconfig.json
+++ b/example/tsconfig.json
@@ -20,6 +20,6 @@
         "src"
     ],
     "files": [
-        "../node_modules/monaco-editor-core/monaco.d.ts"
+        "../node_modules/monaco-editor/monaco.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/example/webpack.config.js b/example/webpack.config.js
index 6b17d0540..bd863eb25 100644
--- a/example/webpack.config.js
+++ b/example/webpack.config.js
@@ -2,7 +2,7 @@ const path = require('path');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 const buildRoot = path.resolve(__dirname, "lib");
-const monacoEditorPath = '../node_modules/monaco-editor-core/dev/vs';
+const monacoEditorPath = '../node_modules/monaco-editor/dev/vs';
 
 module.exports = {
     entry: path.resolve(buildRoot, "main.js"),
diff --git a/package-lock.json b/package-lock.json
index 6cd6f398d..3eb3dbf34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -87,11 +87,6 @@
       "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.10.0.tgz",
       "integrity": "sha1-ZgSTJYX+nB+ZPwAKUD0NIPvliWo="
     },
-    "monaco-editor-core": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.10.0.tgz",
-      "integrity": "sha1-W8K5nb9xhZuWRVYgFCIF4KyIFqI="
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
diff --git a/package.json b/package.json
index 4b808e77d..ef3f16501 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
   "dependencies": {
     "glob-to-regexp": "^0.3.0",
     "monaco-editor": "^0.10.0",
-    "monaco-editor-core": "^0.10.0",
     "vscode-base-languageclient": "^0.0.1-alpha.2"
   },
   "scripts": {
diff --git a/tsconfig.json b/tsconfig.json
index 3be9956ac..fac04caa5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,7 +21,7 @@
         "src"
     ],
     "files": [
-        "node_modules/monaco-editor-core/monaco.d.ts",
+        "node_modules/monaco-editor/monaco.d.ts",
         "typings/monaco/index.d.ts",
         "typings/glob-to-regexp/index.d.ts"
     ]
diff --git a/typings/monaco/index.d.ts b/typings/monaco/index.d.ts
index ef470ec53..281e434ad 100644
--- a/typings/monaco/index.d.ts
+++ b/typings/monaco/index.d.ts
@@ -1,4 +1,4 @@
-/// <reference path='../../node_modules/monaco-editor-core/monaco.d.ts'/>
+/// <reference path='../../node_modules/monaco-editor/monaco.d.ts'/>
 
 declare module monaco.editor {
     export interface IStandaloneCodeEditor {