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

Merge branch 'scoped-es6-runtime' of https://github.com/AluisioASG/6to5 into AluisioASG-scoped-es6-runtime

Browse Source
This commit is contained in:
Sebastian McKenzie
2015-01-20 01:34:43 +11:00
parent 22fb346983 9d2e12dfa6
commit 9f41d6231e
29 changed files with 130 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/6to5/transformation/modules/amd.js
View File

@@ -87,7 +87,11 @@ AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
var key = t.getSpecifierName(specifier);
var ref = this._push(node);
if (t.isImportBatchSpecifier(specifier)) {
if (_.contains(this.file.dynamicImports, node)) {
// Prevent unnecessary renaming of dynamic imports.
this.ids[node.source.value] = key;
return;
} else if (t.isImportBatchSpecifier(specifier)) {
// import * as bar from "foo";
} else if (t.isSpecifierDefault(specifier) && !this.noInteropRequire) {
// import foo from "foo";

15
lib/6to5/transformation/modules/common.js
View File

@@ -6,6 +6,7 @@ var DefaultFormatter = require("./_default");
var traverse = require("../../traverse");
var util = require("../../util");
var t = require("../../types");
var _ = require("lodash");
function CommonJSFormatter(file) {
DefaultFormatter.apply(this, arguments);
@@ -26,13 +27,13 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
// import foo from "foo";
if (t.isSpecifierDefault(specifier)) {
nodes.push(t.variableDeclaration("var", [
t.variableDeclarator(variableName,
t.callExpression(this.file.addHelper("interop-require"), [util.template("require", {
MODULE_NAME: node.source
})])
)
]));
var ref = util.template("require", {
MODULE_NAME: node.source
});
if (!_.contains(this.file.dynamicImports, node)) {
ref = t.callExpression(this.file.addHelper("interop-require"), [ref]);
}
nodes.push(t.variableDeclaration("var", [t.variableDeclarator(variableName, ref)]));
} else {
if (specifier.type === "ImportBatchSpecifier") {
// import * as bar from "foo";

2
lib/6to5/transformation/transform.js
View File

@@ -96,7 +96,7 @@ _.each({
_moduleFormatter: require("./transformers/_module-formatter"),
typeofSymbol: require("./transformers/optional-typeof-symbol"),
coreAliasing: require("./transformers/optional-core-aliasing"),
selfContained: require("./transformers/optional-self-contained"),
undefinedToVoid: require("./transformers/optional-undefined-to-void"),
undeclaredVariableCheck: require("./transformers/optional-undeclared-variable-check"),

10
lib/6to5/transformation/transformers/optional-core-aliasing.js → lib/6to5/transformation/transformers/optional-self-contained.js
View File

@@ -23,7 +23,9 @@ exports.optional = true;
exports.ast = {
enter: function (ast, file) {
file._coreId = file.addImport("core-js/library", "core");
file.opts.runtime = file.addImport("6to5-runtime/helpers", "to5Runtime").name;
file._coreId = file.addImport("6to5-runtime/core-js", "core");
file._regeneratorId = file.addImport("6to5-runtime/regenerator", "regeneratorRuntime");
},
exit: function (ast, file) {
@@ -67,3 +69,9 @@ exports.ast = {
});
}
};
exports.Identifier = function (node, parent, scope, context, file) {
if (node.name === "regeneratorRuntime" && t.isReferenced(node, parent)) {
node.name = file._regeneratorId;
}
};