From 35388e9e6ec483681f0256f51585751737108c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= <nicolo.ribaudo@gmail.com>
Date: Thu, 26 Dec 2019 14:33:50 +0100
Subject: [PATCH] Fix rollup build

---
 Gulpfile.js                           |  6 +++++-
 babel.config.js                       | 24 +++++-------------------
 scripts/rollup-plugin-babel-source.js | 15 +++++++++++----
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/Gulpfile.js b/Gulpfile.js
index a91d4e54b84d..19031a9827b2 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -181,7 +181,11 @@ function buildRollup(packages) {
                 },
               }),
               rollupCommonJs({
-                include: [/node_modules/, "packages/babel-preset-env/data/**"],
+                include: [
+                  /node_modules/,
+                  "packages/babel-preset-env/data/**",
+                  "packages/babel-runtime/regenerator/**",
+                ],
                 namedExports: {
                   "babel-plugin-dynamic-import-node/utils.js": [
                     "createDynamicImportTransform",
diff --git a/babel.config.js b/babel.config.js
index 0f1dbeaf4027..ecdb2f6a92bc 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,7 +1,5 @@
 "use strict";
 
-const path = require("path");
-
 module.exports = function(api) {
   const env = api.env();
 
@@ -34,31 +32,20 @@ module.exports = function(api) {
   ];
 
   switch (env) {
-    // Configs used during bundling builds.
-    case "rollup":
-      convertESM = false;
-      ignoreLib = false;
-      // rollup-commonjs will converts node_modules to ESM
-      unambiguousSources.push(
-        "**/node_modules",
-        // todo: remove this after it is rewritten into ESM
-        "packages/babel-preset-env/data"
-      );
-      envOpts.targets = {
-        node: nodeVersion,
-      };
-      break;
     case "standalone":
+      includeRegeneratorRuntime = true;
+      // Configs used during bundling builds.
+      unambiguousSources.push("packages/babel-runtime/regenerator");
+    case "rollup":
       convertESM = false;
       ignoreLib = false;
-      includeRegeneratorRuntime = true;
       // rollup-commonjs will converts node_modules to ESM
       unambiguousSources.push(
         "**/node_modules",
         // todo: remove this after it is rewritten into ESM
         "packages/babel-preset-env/data"
       );
-      // targets to browserslists: defaults
+      if (env === "rollup") envOpts.targets = { node: nodeVersion };
       break;
     case "production":
       // Config during builds before publish.
@@ -86,7 +73,6 @@ module.exports = function(api) {
       helpers: false, // Helpers are handled by rollup when needed
       regenerator: true,
       version: require(babelRuntimePkgPath).version,
-      absoluteRuntime: path.dirname(babelRuntimePkgPath),
     };
   }
 
diff --git a/scripts/rollup-plugin-babel-source.js b/scripts/rollup-plugin-babel-source.js
index 79f1a6c4101b..54f71f34e050 100644
--- a/scripts/rollup-plugin-babel-source.js
+++ b/scripts/rollup-plugin-babel-source.js
@@ -37,13 +37,20 @@ module.exports = function() {
       return null;
     },
     resolveId(importee) {
-      let packageFolderName;
+      if (importee === "@babel/runtime/regenerator") {
+        return path.join(
+          dirname,
+          "packages",
+          "babel-runtime",
+          "regenerator",
+          "index.js"
+        );
+      }
+
       const matches = importee.match(/^@babel\/([^/]+)$/);
       if (matches) {
-        packageFolderName = `babel-${matches[1]}`;
-      }
+        const packageFolderName = `babel-${matches[1]}`;
 
-      if (packageFolderName) {
         // resolve babel package names to their src index file
         const packageFolder = path.join(dirname, "packages", packageFolderName);
         const packageJson = require(path.join(packageFolder, "package.json"));