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

Merge branch 'master' into code-generator

Browse Source 
Conflicts:
	lib/6to5/register.js
This commit is contained in:
Sebastian McKenzie
2014-11-03 12:22:07 +11:00
parent 9f8e8d96a8 89ecd46b77
commit f3d371869d
29 changed files with 57 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/6to5/register.js
View File

@@ -90,13 +90,9 @@ module.exports = function (opts) {
opts = opts || {};
if (_.isRegExp(opts)) opts = { ignoreRegex: opts };
if (opts.ignoreRegex != null) {
ignoreRegex = opts.ignoreRegex;
}
if (opts.blacklist) {
blacklist = opts.blacklist;
}
if (opts.ignoreRegex != null) ignoreRegex = opts.ignoreRegex;
if (opts.extensions) hookExtensions(opts.extensions);
if (opts.blacklist) blacklist = opts.blacklist;
};

6
lib/6to5/transform.js
View File

@@ -105,6 +105,7 @@ transform.transformers = {
forOf: require("./transformers/for-of"),
unicodeRegex: require("./transformers/unicode-regex"),
generators: require("./transformers/generators"),
numericLiterals: require("./transformers/numeric-literals"),
react: require("./transformers/react"),
jsx: require("./transformers/jsx"),
@@ -112,9 +113,10 @@ transform.transformers = {
_aliasFunctions: require("./transformers/_alias-functions"),
_blockHoist: require("./transformers/_block-hoist"),
_declarations: require("./transformers/_declarations"),
_moduleFormatter: require("./transformers/_module-formatter"),
useStrict: require("./transformers/use-strict")
useStrict: require("./transformers/use-strict"),
_moduleFormatter: require("./transformers/_module-formatter")
};
transform.moduleFormatters = {

6
lib/6to5/transformers/numeric-literals.js Normal file
View File

@@ -0,0 +1,6 @@
var _ = require("lodash");
exports.Literal = function (node) {
// TODO: remove this when the new code generator is released
if (_.isNumber(node.value)) delete node.raw;
};

5
lib/6to5/transformers/use-strict.js
View File

@@ -1,15 +1,12 @@
var b = require("../builders");
module.exports = function (ast, file) {
module.exports = function (ast) {
var body = ast.program.body;
var first = body[0];
var noStrict = !first || first.type !== "ExpressionStatement" || first.expression.type !== "Literal" || first.expression.value !== "use strict";
if (noStrict) {
if (file.opts._noStrict) return;
body.unshift(b.expressionStatement(b.literal("use strict")));
} else {
if (file.opts._noStrict) body.shift();
}
};