From 44e4dc970f1d495bc83c0df4a714ad874b406842 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Sun, 8 Mar 2015 02:52:23 +1100 Subject: [PATCH] more es6 --- src/babel/helpers/code-frame.js | 2 +- src/babel/helpers/normalize-ast.js | 2 +- src/babel/helpers/object.js | 2 +- src/babel/helpers/parse.js | 2 +- .../build-binary-assignment-operator-transformer.js | 2 +- .../transformation/helpers/build-comprehension.js | 4 ++-- ...uild-conditional-assignment-operator-transformer.js | 2 +- .../transformation/helpers/build-react-transformer.js | 2 +- .../helpers/explode-assignable-expression.js | 2 +- src/babel/transformation/helpers/get-function-arity.js | 2 +- .../transformation/helpers/remap-async-to-generator.js | 2 +- src/babel/transformation/modules/_default.js | 10 +++++----- src/babel/transformation/modules/index.js | 2 +- .../transformation/transformers/validation/react.js | 4 ++-- src/babel/traversal/context.js | 7 +++---- 15 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/babel/helpers/code-frame.js b/src/babel/helpers/code-frame.js index caafa4e87d..e1bb415681 100644 --- a/src/babel/helpers/code-frame.js +++ b/src/babel/helpers/code-frame.js @@ -55,7 +55,7 @@ var highlight = function (text) { }); }; -module.exports = function (lines, lineNumber, colNumber) { +export default function (lines, lineNumber, colNumber) { colNumber = Math.max(colNumber, 0); if (chalk.supportsColor) { diff --git a/src/babel/helpers/normalize-ast.js b/src/babel/helpers/normalize-ast.js index 3bbb50932d..d7fea96cd2 100644 --- a/src/babel/helpers/normalize-ast.js +++ b/src/babel/helpers/normalize-ast.js @@ -1,6 +1,6 @@ import t from "../types"; -module.exports = function (ast, comments, tokens) { +export default function (ast, comments, tokens) { if (ast && ast.type === "Program") { return t.file(ast, comments || [], tokens || []); } else { diff --git a/src/babel/helpers/object.js b/src/babel/helpers/object.js index c2211979c6..1866b65cce 100644 --- a/src/babel/helpers/object.js +++ b/src/babel/helpers/object.js @@ -1,3 +1,3 @@ -module.exports = function () { +export default function () { return Object.create(null); }; diff --git a/src/babel/helpers/parse.js b/src/babel/helpers/parse.js index 20997af4f5..c8dc921ee7 100644 --- a/src/babel/helpers/parse.js +++ b/src/babel/helpers/parse.js @@ -3,7 +3,7 @@ import estraverse from "estraverse"; import codeFrame from "./code-frame"; import acorn from "acorn-babel"; -module.exports = function (opts, code, callback) { +export default function (opts, code, callback) { try { var comments = []; var tokens = []; diff --git a/src/babel/transformation/helpers/build-binary-assignment-operator-transformer.js b/src/babel/transformation/helpers/build-binary-assignment-operator-transformer.js index 5d49a830f8..e575daa9fd 100644 --- a/src/babel/transformation/helpers/build-binary-assignment-operator-transformer.js +++ b/src/babel/transformation/helpers/build-binary-assignment-operator-transformer.js @@ -1,7 +1,7 @@ import explode from "./explode-assignable-expression"; import t from "../../types"; -module.exports = function (exports, opts) { +export default function (exports, opts) { var isAssignment = function (node) { return node.operator === opts.operator + "="; }; diff --git a/src/babel/transformation/helpers/build-comprehension.js b/src/babel/transformation/helpers/build-comprehension.js index 44f3bfa74b..795fa19d63 100644 --- a/src/babel/transformation/helpers/build-comprehension.js +++ b/src/babel/transformation/helpers/build-comprehension.js @@ -1,6 +1,6 @@ import t from "../../types"; -module.exports = function build(node, buildBody) { +export default function build(node, buildBody) { var self = node.blocks.shift(); if (!self) return; @@ -20,4 +20,4 @@ module.exports = function build(node, buildBody) { self.right, t.blockStatement([child]) ); -}; +} diff --git a/src/babel/transformation/helpers/build-conditional-assignment-operator-transformer.js b/src/babel/transformation/helpers/build-conditional-assignment-operator-transformer.js index 62cfc62edd..4c30b38bc5 100644 --- a/src/babel/transformation/helpers/build-conditional-assignment-operator-transformer.js +++ b/src/babel/transformation/helpers/build-conditional-assignment-operator-transformer.js @@ -1,7 +1,7 @@ import explode from "./explode-assignable-expression"; import t from "../../types"; -module.exports = function (exports, opts) { +export default function (exports, opts) { var buildAssignment = function (left, right) { return t.assignmentExpression("=", left, right); }; diff --git a/src/babel/transformation/helpers/build-react-transformer.js b/src/babel/transformation/helpers/build-react-transformer.js index 49a625ae67..5fe2f27942 100644 --- a/src/babel/transformation/helpers/build-react-transformer.js +++ b/src/babel/transformation/helpers/build-react-transformer.js @@ -9,7 +9,7 @@ import esutils from "esutils"; import * as react from "./react"; import t from "../../types"; -module.exports = function (exports, opts) { +export default function (exports, opts) { exports.check = function (node) { if (t.isJSX(node)) return true; if (react.isCreateClass(node)) return true; diff --git a/src/babel/transformation/helpers/explode-assignable-expression.js b/src/babel/transformation/helpers/explode-assignable-expression.js index bfecd0f26b..29daf31f3c 100644 --- a/src/babel/transformation/helpers/explode-assignable-expression.js +++ b/src/babel/transformation/helpers/explode-assignable-expression.js @@ -45,7 +45,7 @@ var getPropRef = function (node, nodes, file, scope) { return temp; }; -module.exports = function (node, nodes, file, scope, allowedSingleIdent) { +export default function (node, nodes, file, scope, allowedSingleIdent) { var obj; if (t.isIdentifier(node) && allowedSingleIdent) { obj = node; diff --git a/src/babel/transformation/helpers/get-function-arity.js b/src/babel/transformation/helpers/get-function-arity.js index e9825a024c..5f2d94b61f 100644 --- a/src/babel/transformation/helpers/get-function-arity.js +++ b/src/babel/transformation/helpers/get-function-arity.js @@ -1,6 +1,6 @@ import t from "../../types"; -module.exports = function (node) { +export default function (node) { var lastNonDefault = 0; for (var i = 0; i < node.params.length; i++) { if (!t.isAssignmentPattern(node.params[i])) lastNonDefault = i + 1; diff --git a/src/babel/transformation/helpers/remap-async-to-generator.js b/src/babel/transformation/helpers/remap-async-to-generator.js index f93e16b286..63fd76d1c0 100644 --- a/src/babel/transformation/helpers/remap-async-to-generator.js +++ b/src/babel/transformation/helpers/remap-async-to-generator.js @@ -16,7 +16,7 @@ var visitor = { } }; -module.exports = function (node, callId, scope) { +export default function (node, callId, scope) { node.async = false; node.generator = true; diff --git a/src/babel/transformation/modules/_default.js b/src/babel/transformation/modules/_default.js index 8ee7fdca0d..838162b6a5 100644 --- a/src/babel/transformation/modules/_default.js +++ b/src/babel/transformation/modules/_default.js @@ -42,8 +42,8 @@ var remapVisitor = { }; var importsVisitor = { - enter(node, parent, scope, formatter) { - if (t.isImportDeclaration(node)) { + ImportDeclaration: { + enter(node, parent, scope, formatter) { formatter.hasLocalImports = true; extend(formatter.localImports, t.getBindingIdentifiers(node)); formatter.bumpImportOccurences(node); @@ -52,9 +52,9 @@ var importsVisitor = { }; var exportsVisitor = { - enter(node, parent, scope, formatter) { - var declar = node && node.declaration; - if (t.isExportDeclaration(node)) { + ExportDeclaration: { + enter(node, parent, scope, formatter) { + var declar = node.declaration; formatter.hasLocalImports = true; if (declar && t.isStatement(declar)) { diff --git a/src/babel/transformation/modules/index.js b/src/babel/transformation/modules/index.js index 8202dff6ad..65c17b7cf9 100644 --- a/src/babel/transformation/modules/index.js +++ b/src/babel/transformation/modules/index.js @@ -1,4 +1,4 @@ -module.exports = { +export default { commonStrict: require("./common-strict"), amdStrict: require("./amd-strict"), umdStrict: require("./umd-strict"), diff --git a/src/babel/transformation/transformers/validation/react.js b/src/babel/transformation/transformers/validation/react.js index c772b7280b..3a04444b22 100644 --- a/src/babel/transformation/transformers/validation/react.js +++ b/src/babel/transformation/transformers/validation/react.js @@ -2,7 +2,7 @@ import * as messages from "../../../messages"; import t from "../../../types"; // check if the input Literal `source` is an alternate casing of "react" -var check = function (source, file) { +function check(source, file) { if (t.isLiteral(source)) { var name = source.value; var lower = name.toLowerCase(); @@ -11,7 +11,7 @@ var check = function (source, file) { throw file.errorWithNode(source, messages.get("didYouMean", "react")); } } -}; +} export function CallExpression(node, parent, scope, file) { if (t.isIdentifier(node.callee, { name: "require" }) && node.arguments.length === 1) { diff --git a/src/babel/traversal/context.js b/src/babel/traversal/context.js index aac749a024..70e37ca92c 100644 --- a/src/babel/traversal/context.js +++ b/src/babel/traversal/context.js @@ -6,10 +6,9 @@ export default class TraversalContext { constructor(scope, opts, state, parentPath) { this.shouldFlatten = false; this.parentPath = parentPath; - - this.scope = scope; - this.state = state; - this.opts = opts; + this.scope = scope; + this.state = state; + this.opts = opts; } flatten() {