Use helper-module-import inside entry plugin too

packages/babel-preset-env/src/use-built-ins-entry-plugin.js

@@ -1,11 +1,6 @@
 // @flow
 import { logEntryPolyfills } from "./debug";
-import {
-  createImport,
-  isPolyfillSource,
-  isRequire,
-  type RequireType,
-} from "./utils";
+import { createImport, isPolyfillSource, isRequire } from "./utils";
 
 type Plugin = {
   visitor: Object,
@@ -15,21 +10,22 @@ type Plugin = {
 };
 
 export default function({ types: t }: { types: Object }): Plugin {
-  function createImports(
-    polyfills: Array<string>,
-    requireType: RequireType,
+  function replaceWithPolyfillImports(
+    path: Object,
+    polyfills: Array<string> | Set<string>,
     regenerator: boolean,
-  ): Array<Object> {
-    const items = Array.isArray(polyfills) ? new Set(polyfills) : polyfills;
-    const imports = [];
-
-    items.forEach(p => imports.push(createImport(t, p, requireType)));
-
+  ): void {
     if (regenerator) {
-      imports.push(createImport(t, "regenerator-runtime", requireType));
+      createImport(path, "regenerator-runtime");
     }
 
-    return imports;
+    const items = Array.isArray(polyfills) ? new Set(polyfills) : polyfills;
+
+    for (const p of Array.from(items).reverse()) {
+      createImport(path, p);
+    }
+
+    path.remove();
   }
 
   const isPolyfillImport = {
@@ -39,20 +35,21 @@ export default function({ types: t }: { types: Object }): Plugin {
         isPolyfillSource(path.node.source.value)
       ) {
         this.importPolyfillIncluded = true;
-        path.replaceWithMultiple(
-          createImports(state.opts.polyfills, "import", state.opts.regenerator),
+
+        replaceWithPolyfillImports(
+          path,
+          state.opts.polyfills,
+          state.opts.regenerator,
         );
       }
     },
     Program(path, state) {
       path.get("body").forEach(bodyPath => {
         if (isRequire(t, bodyPath)) {
-          bodyPath.replaceWithMultiple(
-            createImports(
-              state.opts.polyfills,
-              "require",
-              state.opts.regenerator,
-            ),
+          replaceWithPolyfillImports(
+            bodyPath,
+            state.opts.polyfills,
+            state.opts.regenerator,
           );
         }
       });

packages/babel-preset-env/src/use-built-ins-plugin.js

@@ -1,9 +1,7 @@
 // @flow
-import { addSideEffect } from "@babel/helper-module-imports";
-
 import { definitions } from "./built-in-definitions";
 import { logUsagePolyfills } from "./debug";
-import { isPolyfillSource, isRequire } from "./utils";
+import { createImport, isPolyfillSource, isRequire } from "./utils";
 
 type Plugin = {
   visitor: Object,
@@ -44,7 +42,7 @@ export default function({ types: t }: { types: Object }): Plugin {
   ): void {
     if (builtIn && !builtIns.has(builtIn)) {
       builtIns.add(builtIn);
-      addSideEffect(path, builtIn);
+      createImport(path, builtIn);
     }
   }
 

packages/babel-preset-env/src/utils.js

@@ -1,6 +1,6 @@
 // @flow
-
 import semver from "semver";
+import { addSideEffect } from "@babel/helper-module-imports";
 import unreleasedLabels from "../data/unreleased-labels";
 import { semverMin } from "./targets-parser";
 import type { Targets } from "./types";
@@ -88,6 +88,16 @@ export const filterStageFromList = (list: any, stageList: any) => {
 export const isPolyfillSource = (source: string): boolean =>
   source === "@babel/polyfill" || source === "core-js";
 
+const modulePathMap = {
+  "regenerator-runtime": "regenerator-runtime/runtime",
+};
+
+export const getModulePath = (mod: string) =>
+  modulePathMap[mod] || `core-js/modules/${mod}`;
+
+export const createImport = (path: Object, mod: string) =>
+  addSideEffect(path, getModulePath(mod));
+
 export const isRequire = (t: Object, path: Object): boolean =>
   t.isExpressionStatement(path.node) &&
   t.isCallExpression(path.node.expression) &&

packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/input.js

@@ -0,0 +1,8 @@
+require("foo");
+
+const x = new Promise(resolve => {
+  const p = [];
+
+  if (p.includes("a")) {
+  }
+});

packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/options.json

@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["../../../../lib", {
+      "modules": false,
+      "targets": {
+        "node": "4.0.0"
+      },
+      "useBuiltIns": "usage",
+      "shippedProposals": true
+    }]
+  ]
+}

packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/source-type-script/output.js

@@ -0,0 +1,11 @@
+require("core-js/modules/es7.array.includes");
+
+require("core-js/modules/es6.promise");
+
+require("foo");
+
+var x = new Promise(function (resolve) {
+  var p = [];
+
+  if (p.includes("a")) {}
+});

packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/test-modules-transform/options.json

@@ -1,5 +1,4 @@
 {
-  "sourceType": "module",
   "presets": [
     ["../../../../lib", {
       "useBuiltIns": "usage"

packages/babel-preset-env/test/fixtures/preset-options/empty-options/output.js

@@ -1 +1,3 @@
+"use strict";
+
 var a = "1";

packages/babel-preset-env/test/fixtures/preset-options/loose-typeof-symbol/output.js

@@ -1 +1,3 @@
+"use strict";
+
 typeof Symbol();

packages/babel-preset-env/test/fixtures/preset-options/loose-with-typeof-symbol-includes/output.js

@@ -1,3 +1,5 @@
+"use strict";
+
 function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 _typeof(Symbol());

packages/babel-preset-env/test/fixtures/preset-options/no-options/output.js

@@ -1 +1,3 @@
+"use strict";
+
 var a = "1";