From 8dbf34777327acafeb0c07d4dfdaa74e71e19171 Mon Sep 17 00:00:00 2001
From: Lukas Taegert-Atkinson <lukastaegert@users.noreply.github.com>
Date: Sun, 17 Feb 2019 16:38:37 +0100
Subject: [PATCH] Fix ESM version of Rollup (#2705)

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 rollup.config.js  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1757e4383c5..14ed1e06874 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4227,14 +4227,14 @@
       }
     },
     "rollup": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.1.2.tgz",
-      "integrity": "sha512-OkdMxqMl8pWoQc5D8y1cIinYQPPLV8ZkfLgCzL6SytXeNA2P7UHynEQXI9tYxuAjAMsSyvRaWnyJDLHMxq0XAg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.2.0.tgz",
+      "integrity": "sha512-oHNv2NSX5y/rY6W8MuKW8BVQwpIfwfTNp4PJiQYR7cLcBYeR5wP0LsPqKNw3Heji6hYci5Nd53q/fVfTuNe3GA==",
       "dev": true,
       "requires": {
         "@types/estree": "0.0.39",
         "@types/node": "*",
-        "acorn": "^6.0.5"
+        "acorn": "^6.1.0"
       }
     },
     "rollup-plugin-alias": {
diff --git a/package.json b/package.json
index 8a7adeb23a7..52d1b8320cd 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "pretty-ms": "^4.0.0",
     "remap-istanbul": "^0.13.0",
     "require-relative": "^0.8.7",
-    "rollup": "^1.1.2",
+    "rollup": "^1.2.0",
     "rollup-plugin-alias": "^1.5.1",
     "rollup-plugin-buble": "^0.19.6",
     "rollup-plugin-commonjs": "^9.2.0",
diff --git a/rollup.config.js b/rollup.config.js
index cf36bda461f..05162f0a784 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -40,9 +40,9 @@ const onwarn = warning => {
 	throw new Error(warning.message);
 };
 
-const expectedAcornImport = /import acorn__default, { tokTypes, Parser( as [\w$]+)? } from 'acorn';/;
+const expectedAcornImport = "import acorn__default, { tokTypes, Parser as Parser$1 } from 'acorn';";
 const newAcornImport =
-	"import * as acorn__default from 'acorn';\nimport { tokTypes, Parser } from 'acorn';";
+	"import * as acorn__default from 'acorn';\nimport { tokTypes, Parser as Parser$1 } from 'acorn';";
 
 // by default, rollup-plugin-commonjs will translate require statements as default imports
 // which can cause issues for secondary tools that use the ESM version of acorn
@@ -85,7 +85,7 @@ export default command => {
 				resolve(),
 				json(),
 				typescript(),
-				commonjs({ include: 'node_modules/**', namedExports: { micromatch: ['matcher' ] } }),
+				commonjs({ include: 'node_modules/**', namedExports: { micromatch: ['matcher'] } }),
 				fixAcornEsmImport()
 			],
 			// acorn needs to be external as some plugins rely on a shared acorn instance