cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use helper-module-imports instead of custom import (#7457)

Browse Source
This commit is contained in:
Gaël Gillard 2018-03-09 11:51:51 +01:00 committed by Brian Ng
parent 82994ce087
commit 29d44193cd
No known key found for this signature in database
GPG Key ID: 3F2380E1E1508CA9
3 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/babel-preset-env/package.json
View File

@ -11,6 +11,7 @@
"build-data": "node ./scripts/build-data.js; node ./scripts/build-modules-support.js"
},
"dependencies": {
"@babel/helper-module-imports": "7.0.0-beta.41",
"@babel/helper-plugin-utils": "7.0.0-beta.41",
"@babel/plugin-proposal-async-generator-functions": "7.0.0-beta.41",
"@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.41",

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

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

27
packages/babel-preset-env/src/utils.js
View File

@ -96,30 +96,3 @@ export const isRequire = (t: Object, path: Object): boolean =>
path.node.expression.arguments.length === 1 &&
t.isStringLiteral(path.node.expression.arguments[0]) &&
isPolyfillSource(path.node.expression.arguments[0].value);
const modulePathMap = {
"regenerator-runtime": "regenerator-runtime/runtime",
};
export const getModulePath = (mod: string) =>
modulePathMap[mod] || `core-js/modules/${mod}`;
export type RequireType = "require" | "import";
export const createImport = (
t: Object,
polyfill: string,
requireType?: RequireType = "import",
): Object => {
const modulePath = getModulePath(polyfill);
if (requireType === "import") {
const declar = t.importDeclaration([], t.stringLiteral(modulePath));
declar._blockHoist = 3;
return declar;
}
return t.expressionStatement(
t.callExpression(t.identifier("require"), [t.stringLiteral(modulePath)]),
);
};