From 49cad96dad562d26dfe4376fb1c5abd4ec7042a3 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Wed, 14 Nov 2018 11:39:42 +0100
Subject: [PATCH] Prepare for 0.15.2

---
 CHANGELOG.md                       | 3 +++
 monaco.d.ts                        | 2 +-
 package-lock.json                  | 6 +++---
 package.json                       | 2 +-
 website/playground/monaco.d.ts.txt | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca579a01..e167b67d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Monaco Editor Changelog
 
+## [0.15.2] (14.11.2018)
+* Fixes usage of `marked` to allow for packaging with rollup (https://github.com/Microsoft/monaco-editor/issues/1183)
+
 ## [0.15.1] (13.11.2018)
 * Fixes the `/esm/` distribution (https://github.com/Microsoft/monaco-editor/issues/1178)
 
diff --git a/monaco.d.ts b/monaco.d.ts
index 62d78a16..9d6a2c51 100644
--- a/monaco.d.ts
+++ b/monaco.d.ts
@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Type definitions for monaco-editor v0.15.1
+ * Type definitions for monaco-editor v0.15.2
  * Released under the MIT license
 *-----------------------------------------------------------*/
 /*---------------------------------------------------------------------------------------------
diff --git a/package-lock.json b/package-lock.json
index 4a7cf42f..0d051ec9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2258,9 +2258,9 @@
       "dev": true
     },
     "monaco-editor-core": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.15.0.tgz",
-      "integrity": "sha512-s1zuo+p6Gl6IC4WJP6HBkr4pWULm+HdFfacB8vOFPQLLi2oJseO20UuSkxYuZTUJQIjvhNrQfLNAmPKLZaf7tg==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.15.1.tgz",
+      "integrity": "sha512-mzvwd2eYvO6sJw1Xtkm0drwOoNyQ1Nkfh/FwSr42kYcBo5+AsNPPbnIbjXgnz8PwYXtjTE93Sd5KLcuFHz0hSw==",
       "dev": true
     },
     "monaco-html": {
diff --git a/package.json b/package.json
index ae00f0a1..c2b204f2 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "gulp-typedoc": "^2.2.0",
     "http-server": "^0.11.1",
     "monaco-css": "2.3.0",
-    "monaco-editor-core": "0.15.0",
+    "monaco-editor-core": "0.15.1",
     "monaco-html": "2.3.0",
     "monaco-json": "2.3.0",
     "monaco-languages": "1.6.0",
diff --git a/website/playground/monaco.d.ts.txt b/website/playground/monaco.d.ts.txt
index 62d78a16..9d6a2c51 100644
--- a/website/playground/monaco.d.ts.txt
+++ b/website/playground/monaco.d.ts.txt
@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Type definitions for monaco-editor v0.15.1
+ * Type definitions for monaco-editor v0.15.2
  * Released under the MIT license
 *-----------------------------------------------------------*/
 /*---------------------------------------------------------------------------------------------