From 4f1c7ef60c485151133aa6939b06700b603fb9a8 Mon Sep 17 00:00:00 2001
From: Lukas Taegert-Atkinson <lukastaegert@users.noreply.github.com>
Date: Sat, 7 Mar 2020 09:44:24 +0100
Subject: [PATCH] Fix conditional exports in Node 13.0 - 13.7 (#3428)

* Fix conditional exports

* Fix dependencies
---
 package-lock.json | 24 +++++++-----------------
 package.json      |  5 +++--
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f307241c04d..8bd6921a29a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -428,9 +428,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "13.7.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.7.tgz",
-      "integrity": "sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg==",
+      "version": "13.9.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.0.tgz",
+      "integrity": "sha512-0ARSQootUG1RljH2HncpsY2TJBfGQIKOOi7kxzUY6z54ePu/ZD+wJA8zI2Q6v8rol2qpG/rvqsReco8zNMPvhQ==",
       "dev": true
     },
     "@types/parse-json": {
@@ -701,14 +701,6 @@
         "minimist": "^1.2.0",
         "os-homedir": "^2.0.0",
         "regexpu-core": "^4.5.4"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-          "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
-          "dev": true
-        }
       }
     },
     "buffer-from": {
@@ -4246,14 +4238,12 @@
       }
     },
     "rollup": {
-      "version": "1.32.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz",
-      "integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.0.0.tgz",
+      "integrity": "sha512-tbvWownITR+0ebaX6iRr7IcLkziTCJacRpmWz03NIj3CZDmGlergYSwdG8wPx68LT0ms1YzqmbjUQHb6ut8pdw==",
       "dev": true,
       "requires": {
-        "@types/estree": "*",
-        "@types/node": "*",
-        "acorn": "^7.1.0"
+        "fsevents": "~2.1.2"
       }
     },
     "rollup-plugin-license": {
diff --git a/package.json b/package.json
index 58a4e34fa4f..0ce4f0ab25f 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "@rollup/plugin-replace": "^2.3.1",
     "@types/micromatch": "^4.0.1",
     "@types/minimist": "^1.2.0",
-    "@types/node": "^13.7.7",
+    "@types/node": "^13.9.0",
     "acorn": "^7.1.1",
     "acorn-export-ns-from": "^0.1.0",
     "acorn-import-meta": "^1.0.0",
@@ -108,7 +108,7 @@
     "pretty-ms": "^6.0.1",
     "require-relative": "^0.8.7",
     "requirejs": "^2.3.6",
-    "rollup": "^1.32.1",
+    "rollup": "^2.0.0",
     "rollup-plugin-license": "^0.13.0",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^5.2.0",
@@ -137,6 +137,7 @@
   },
   "exports": {
     ".": {
+      "default": "./dist/rollup.js",
       "require": "./dist/rollup.js",
       "import": "./dist/es/rollup.js"
     },