v4.3.0

Set Function.name for funcs in variables and properties as per spec.

.babelrc

@@ -0,0 +1,5 @@
+{
+  "experimental": true,
+  "playground": true,
+  "loose": true
+}

.gitignore

@@ -11,5 +11,5 @@ test/tmp
 coverage
 dist
 .package.json
-packages/6to5-runtime/*.js
-packages/6to5-runtime/regenerator/*.js
+packages/babel-runtime/*.js
+packages/babel-runtime/regenerator/*.js

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/google/traceur-compiler
 [submodule "vendor/regenerator"]
 	path = vendor/regenerator
-	url = https://github.com/6to5/regenerator-6to5
+	url = https://github.com/babel/regenerator-babel
 [submodule "vendor/test262"]
 	path = vendor/test262
 	url = https://github.com/tc39/test262

.jscsrc

@@ -1,5 +1,5 @@
 {
-  "excludeFiles": ["lib/6to5/transformation/templates"],
+  "excludeFiles": ["lib/babel/transformation/templates"],
   "disallowSpacesInNamedFunctionExpression": {
     "beforeOpeningRoundBrace": true
   },

.jshintignore

@@ -1 +1 @@
-lib/6to5/transformation/templates
+lib/babel/transformation/templates

.npmignore

@@ -1,7 +1,7 @@
 node_modules
 *.log
 *.cache
-lib/6to5/transformation/templates
+lib/babel/transformation/templates
 test
 benchmark
 Makefile

.travis.yml

@@ -2,7 +2,8 @@ sudo: false
 language: node_js
 node_js:
   - "0.10"
-  - "0.11"
+  - "0.12"
+  - "iojs"
 
 branches:
   except:

CONTRIBUTING.md

@@ -1,18 +1,25 @@
 # Contributing
 
-Contributions are always welcome, no matter how large or small. Before contributing, please read the [code of conduct](https://github.com/6to5/6to5/blob/master/CODE_OF_CONDUCT.md).
+Contributions are always welcome, no matter how large or small. Before
+contributing, please read the
+[code of conduct](https://github.com/babel/babel/blob/master/CODE_OF_CONDUCT.md).
+
+**NOTE:** Please do not send pull requests that fix linting issues. It's highly
+likely that they've already been fixed by the time it's submitted and it just
+pollutes the git tree.
 
 ## Developing
 
 #### Workflow
 
 * Fork the repository
-* Clone your fork and change directory to it (`git clone git@github.com:yourUserName/6to5.git && cd 6to5`)
+* Clone your fork and change directory to it (`git clone git@github.com:yourUserName/babel.git && cd babel`)
 * Install the project dependencies (`make bootstrap`)
 * Link your forked clone (`npm link`)
 * Develop your changes ensuring you're fetching updates from upstream often
 * Ensure the test are passing (`make test`)
-* Create new pull request explaining your proposed change or reference an issue in your commit message
+* Create new pull request explaining your proposed change or reference an issue
+  in your commit message
 
 #### Code Standards
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 Sebastian McKenzie
+Copyright (c) 2014-2015 Sebastian McKenzie <sebmck@gmail.com>
 
 MIT License
 

Makefile

@@ -5,24 +5,31 @@ UGLIFY_CMD = node_modules/uglify-js/bin/uglifyjs
 JSHINT_CMD = node_modules/jshint/bin/jshint
 MOCHA_CMD = node_modules/mocha/bin/_mocha
 JSCS_CMD = node_modules/jscs/bin/jscs
+BABEL_CMD = node_modules/babel/bin/babel
 
 export NODE_ENV = test
 
-.PHONY: clean test test-cov test-clean lint test-travis test-simple test-all test-browser publish build bootstrap publish-core publish-runtime
+.PHONY: clean test test-cov test-clean lint test-travis test-simple test-all test-browser publish build bootstrap publish-core publish-runtime build-core watch-core
+
+build-core:
+	#node $(BABEL_CMD) src --out-dir lib
+
+watch-core:
+	#node $(BABEL_CMD) src --out-dir lib --watch
 
 build:
 	mkdir -p dist
 
 	node tools/cache-templates
 
-	node $(BROWSERIFY_CMD) -e lib/6to5/polyfill.js >dist/polyfill.js
+	node $(BROWSERIFY_CMD) -e lib/babel/polyfill.js >dist/polyfill.js
 	node $(UGLIFY_CMD) dist/polyfill.js >dist/polyfill.min.js
 
-	node $(BROWSERIFY_CMD) lib/6to5/api/browser.js -s to5 >dist/6to5.js
-	node $(UGLIFY_CMD) dist/6to5.js >dist/6to5.min.js
+	node $(BROWSERIFY_CMD) lib/babel/api/browser.js -s babel >dist/babel.js
+	node $(UGLIFY_CMD) dist/babel.js >dist/babel.min.js
 
-	node bin/6to5-runtime >dist/runtime.js
-	node $(UGLIFY_CMD) dist/runtime.js >dist/runtime.min.js
+	node bin/babel-external-helpers >dist/external-helpers.js
+	node $(UGLIFY_CMD) dist/external-helpers.js >dist/external-helpers.min.js
 
 	rm -rf templates.json
 
@@ -42,20 +49,19 @@ test: lint
 
 test-simple:
 	# excludes test262
-	export SIMPLE_6TO5_TESTS=1; \
+	export SIMPLE_BABEL_TESTS=1; \
 	make test
 
 test-all:
-	# includes traceur, esnext, regenerator
-	export ALL_6TO5_TESTS=1; \
+	export ALL_BABEL_TESTS=1; \
 	make test
 
 test-cov:
 	rm -rf coverage
-	export SIMPLE_6TO5_TESTS=1; \
+	export SIMPLE_BABEL_TESTS=1; \
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
 
-test-travis: bootstrap
+test-travis: build-core bootstrap
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
 	if test -n "$$CODECLIMATE_REPO_TOKEN"; then codeclimate < coverage/lcov.info; fi
 
@@ -64,7 +70,7 @@ test-browser:
 
 	node tools/cache-templates
 	node tools/cache-tests
-	node $(BROWSERIFY_CMD) -e test/_browser.js >dist/6to5-test.js
+	node $(BROWSERIFY_CMD) -e test/_browser.js >dist/babel-test.js
 	rm -rf templates.json tests.json
 
 	test -n "`which open`" && open test/browser.html
@@ -78,9 +84,9 @@ publish:
 	npm version $$version --message "v%s"
 
 	make build
-	cp dist/6to5.min.js browser.js
+	cp dist/babel.min.js browser.js
 	cp dist/polyfill.min.js browser-polyfill.js
-	cp dist/runtime.min.js runtime.js
+	cp dist/external-helpers.min.js external-helpers.js
 
 	node tools/cache-templates
 	test -f templates.json
@@ -92,12 +98,12 @@ publish:
 	make publish-core
 	make publish-runtime
 
-	rm -rf templates.json browser.js browser-polyfill.js runtime.js
+	rm -rf templates.json browser.js browser-polyfill.js external-helpers.js
 
 publish-runtime:
 	cd packages; \
 	node build-runtime.js; \
-	cd 6to5-runtime; \
+	cd babel-runtime; \
 	npm publish
 
 publish-core:

NOTES.md

@@ -1,3 +0,0 @@
-# Notes
-
- * Wildcard exports/imports wont normalize if `export default` is a non-object. See [#224](https://github.com/6to5/6to5/issues/224).

README.md

@@ -1,12 +1,12 @@
 <p align="center">
-  <img alt="6to5" src="https://raw.githubusercontent.com/6to5/logo/master/logo.png" width="546">
+  <img alt="babel" src="https://raw.githubusercontent.com/babel/logo/master/logo.png" width="546">
 </p>
 
 <p align="center">
-  <strong>6to5</strong> turns ES6+ code into vanilla ES5, so you can use next generation features <strong>today.</strong>
+  <strong>Babel</strong> is a transpiler for writing next generation JavaScript.
 </p>
 
 <p align="center">
-  For more information view the <a href="https://6to5.github.io">documentation</a>. For
-  support visit the <a href="https://gitter.im/6to5/6to5">gitter room</a>.
+  For more information view the <a href="https://babeljs.io/">documentation</a>. For
+  support visit the <a href="https://gitter.im/babel/babel">gitter room</a>.
 </p>

appveyor.yml

@@ -1,17 +0,0 @@
-environment:
-  matrix:
-    - nodejs_version: "0.10"
-    - nodejs_version: "0.11"
-
-install:
- - "npm install"
- - "cinst make"
-
-test_script:
- - "node --version"
- - "npm --version"
- - "make test-spec"
-
-build: "off"
-
-version: "{build}"

bin/6to5-runtime

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-var runtime = require("../lib/6to5/build-runtime");
-console.log(runtime());

bin/_babel-node

@@ -1,15 +1,16 @@
 #!/usr/bin/env node
 
-var commander = require("commander");
-var Module    = require("module");
-var path      = require("path");
-var repl      = require("repl");
-var to5       = require("../lib/6to5/api/node");
-var util      = require("../lib/6to5/util");
-var vm        = require("vm");
-var _         = require("lodash");
+var pathIsAbsolute = require("path-is-absolute");
+var commander      = require("commander");
+var Module         = require("module");
+var babel          = require("../lib/babel/api/node");
+var path           = require("path");
+var repl           = require("repl");
+var util           = require("../lib/babel/util");
+var vm             = require("vm");
+var _              = require("lodash");
 
-var program = new commander.Command("6to5-node");
+var program = new commander.Command("babel-node");
 
 program.option("-e, --eval [script]", "Evaluate script");
 program.option("-p, --print [code]", "Evaluate script and print result");
@@ -28,7 +29,7 @@ program.parse(process.argv);
 
 //
 
-to5.register({
+babel.register({
   experimental: program.experimental,
   extensions:   program.extensions,
   playground:   program.playground,
@@ -41,7 +42,7 @@ to5.register({
 //
 
 var _eval = function (code, filename) {
-  code = to5.transform(code, {
+  code = babel.transform(code, {
     filename: filename,
     blacklist: ["useStrict"].concat(program.blacklist || []),
     whitelist: program.whitelist,
@@ -60,7 +61,7 @@ if (program.eval || program.print) {
   if (program.print) console.log(result);
 } else {
   if (program.args.length) {
-    // slice all arguments up to the first filename since they're 6to5 args that we handle
+    // slice all arguments up to the first filename since they're babel args that we handle
     var args = process.argv.slice(2);
 
     var i = 0;
@@ -85,7 +86,7 @@ if (program.eval || program.print) {
 
     // make the filename absolute
     var filename = args[0]
-    if (!util.isAbsolute(filename)) args[0] = path.join(process.cwd(), filename);
+    if (!pathIsAbsolute(filename)) args[0] = path.join(process.cwd(), filename);
 
     // add back on node and concat the sliced args
     process.argv = ["node"].concat(args);

bin/babel-external-helpers

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+
+var runtime = require("../lib/babel/build-external-helpers");
+console.log(runtime());

bin/babel-minify

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-var opts = require("./6to5").opts;
+var opts = require("./babel").opts;
 opts.optional = (opts.optional || []).concat("minification");
 opts.format = {
   compact: true

bin/babel-node

@@ -2,10 +2,10 @@
 
 /**
  * This tiny wrapper file checks for known node flags and appends them
- * when found, before invoking the "real" _6to5-node(1) executable.
+ * when found, before invoking the "real" _babel-node(1) executable.
  */
 
-var args  = [__dirname + "/_6to5-node"];
+var args  = [__dirname + "/_babel-node"];
 
 process.argv.slice(2).forEach(function(arg){
   var flag = arg.split("=")[0];

bin/babel/dir.js

@@ -16,7 +16,9 @@ module.exports = function (commander, filenames, opts) {
 
     var dest = path.join(commander.outDir, relative);
 
-    var data = util.compile(src, { sourceMapName: dest });
+    var data = util.compile(src, {
+      sourceFileName: path.relative(dest + "/..", src)
+    });
 
     if (commander.sourceMaps) {
       var mapLoc = dest + ".map";
@@ -37,8 +39,13 @@ module.exports = function (commander, filenames, opts) {
     if (stat.isDirectory(filename)) {
       var dirname = filename;
 
-      _.each(util.readdirFilter(dirname), function (filename) {
-        write(path.join(dirname, filename), filename);
+      _.each(util.readdir(dirname), function (filename) {
+        var src = path.join(dirname, filename);
+        if (util.canCompile(filename)) {
+          write(src, filename);
+        } else {
+          outputFileSync(path.join(commander.outDir, filename), fs.readFileSync(src));
+        }
       });
     } else {
       write(filename, filename);

bin/babel/file.js

@@ -1,10 +1,10 @@
-var sourceMap = require("source-map");
-var chokidar  = require("chokidar");
-var util2     = require("../../lib/6to5/util");
-var path      = require("path");
-var util      = require("./util");
-var fs        = require("fs");
-var _         = require("lodash");
+var sourceMapToComment = require("source-map-to-comment");
+var sourceMap          = require("source-map");
+var chokidar           = require("chokidar");
+var path               = require("path");
+var util               = require("./util");
+var fs                 = require("fs");
+var _                  = require("lodash");
 
 module.exports = function (commander, filenames) {
   var results = [];
@@ -42,7 +42,7 @@ module.exports = function (commander, filenames) {
     });
 
     if (commander.sourceMapsInline || (!commander.outFile && commander.sourceMaps)) {
-      code += "\n" + util2.sourceMapToComment(map);
+      code += "\n" + sourceMapToComment(map);
     }
 
     return {

bin/babel/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 var commander = require("commander");
-var transform = require("../../lib/6to5/transformation");
-var util      = require("../../lib/6to5/util");
+var transform = require("../../lib/babel/transformation");
+var util      = require("../../lib/babel/util");
 var fs        = require("fs");
 var each      = require("lodash/collection/each");
 var keys      = require("lodash/object/keys");
@@ -11,7 +11,7 @@ commander.option("-t, --source-maps-inline", "Append sourceMappingURL comment to
 commander.option("-s, --source-maps", "Save source map alongside the compiled code");
 commander.option("-f, --filename [filename]", "Filename to use when reading from stdin - this will be used in source-maps, errors etc [stdin]", "stdin");
 commander.option("-w, --watch", "Recompile files on changes");
-commander.option("-r, --runtime", "Replace 6to5 declarations with references to a runtime");
+commander.option("-r, --external-helpers", "Replace helpers with references to a `babelHelpers` global");
 commander.option("-e, --experimental", "Enable experimental support for proposed ES7 features");
 commander.option("-p, --playground", "Enable playground support");
 
@@ -26,6 +26,7 @@ commander.option("-c, --remove-comments", "Remove comments from the compiled cod
 commander.option("-M, --module-ids", "Insert module id in modules", false);
 commander.option("-R, --react-compat", "Makes the react transformer produce pre-v0.12 code");
 commander.option("--keep-module-id-extensions", "Keep extensions when generating module ids", false);
+commander.option("-a, --auxiliary-comment [comment]", "Comment text to prepend to all auxiliary code");
 
 commander.on("--help", function () {
   var outKeys = function (title, obj) {
@@ -99,6 +100,8 @@ if (errors.length) {
 
 exports.opts = {
   keepModuleIdExtensions: commander.keepModuleIdExtensions,
+  auxiliaryComment:       commander.auxiliaryComment,
+  externalHelpers:        commander.externalHelpers,
   sourceMapName:          commander.outFile,
   experimental:           commander.experimental,
   reactCompat:            commander.reactCompat,
@@ -109,13 +112,12 @@ exports.opts = {
   sourceMap:              commander.sourceMaps || commander.sourceMapsInline,
   optional:               commander.optional,
   comments:               !commander.removeComments,
-  runtime:                commander.runtime,
   modules:                commander.modules,
   loose:                  commander.loose
 };
 
 setTimeout(function () {
-  // this is just a hack to give `6to5-minify` and other files including this
+  // this is just a hack to give `babel-minify` and other files including this
   // time to modify `exports.opts`
 
   var fn;

bin/babel/util.js

@@ -1,8 +1,8 @@
 var readdir = require("fs-readdir-recursive");
 var index   = require("./index");
-var util    = require("../../lib/6to5/util");
+var babel   = require("../../lib/babel/api/node");
+var util    = require("../../lib/babel/util");
 var path    = require("path");
-var to5     = require("../../lib/6to5/api/node");
 var fs      = require("fs");
 var _       = require("lodash");
 
@@ -12,17 +12,21 @@ exports.readdirFilter = function (filename) {
   });
 };
 
+exports.readdir = readdir;
+
+exports.canCompile = util.canCompile;
+
 exports.addSourceMappingUrl = function (code, loc) {
   return code + "\n//# sourceMappingURL=" + path.basename(loc);
 };
 
 exports.transform = function (filename, code, opts) {
-  opts = _.extend(opts || {}, index.opts);
+  opts = _.defaults(opts || {}, index.opts);
   opts.filename = filename;
 
   var result;
   try {
-    result = to5.transform(code, opts);
+    result = babel.transform(code, opts);
   } catch (e) {
     if (e instanceof SyntaxError) {
       console.error("SyntaxError:", e.message);

bin/deprecated/6to5

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+console.error("`6to5` has been renamed to `babel`");
+require("../babel");

bin/deprecated/6to5-minify

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+console.error("`6to5-minify` has been renamed to `babel-minify`");
+require("../babel-minify");

bin/deprecated/6to5-node

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+console.error("`6to5-node` has been renamed to `babel-node`");
+require("../_babel-node");

bin/deprecated/6to5-runtime

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+console.error("`6to5-runtime` has been renamed to `babel-external-helpers`");
+require("../babel-external-helpers");

doc/index.md

@@ -1 +1 @@
-See [6to5.github.io/docs](https://github.com/6to5/6to5.github.io/tree/master/docs).
+See [babel.github.io/docs](https://github.com/babel/babel.github.io/tree/master/docs).

lib/6to5/helpers/clone.js

@@ -1,12 +0,0 @@
-"use strict";
-
-module.exports = function cloneDeep(obj) {
-  var obj2 = {};
-  if (!obj) return obj2;
-
-  for (var key in obj) {
-    obj2[key] = obj[key];
-  }
-
-  return obj2;
-};

lib/6to5/helpers/levenshtein.js

@@ -1,38 +0,0 @@
-// taken from stackoverflow, it's crap i know.
-
-module.exports = function (a, b) {
-  if (a.length === 0) return b.length;
-  if (b.length === 0) return a.length;
-
-  var matrix = [];
-
-  // increment along the first column of each row
-  var i;
-  for (i = 0; i <= b.length; i++) {
-    matrix[i] = [i];
-  }
-
-  // increment each column in the first row
-  var j;
-  for (j = 0; j <= a.length; j++) {
-    matrix[0][j] = j;
-  }
-
-  // Fill in the rest of the matrix
-  for (i = 1; i <= b.length; i++) {
-    for (j = 1; j <= a.length; j++) {
-      if (b.charAt(i - 1) == a.charAt(j - 1)) {
-        matrix[i][j] = matrix[i - 1][j - 1];
-      } else {
-        matrix[i][j] = Math.min(
-          matrix[i - 1][j - 1] + 1, // substitution
-          Math.min(
-            matrix[i][j - 1] + 1, // insertion
-            matrix[i - 1][j] + 1) // deletion
-          );
-      }
-    }
-  }
-
-  return matrix[b.length][a.length];
-};

lib/6to5/polyfill.js

@@ -1,9 +0,0 @@
-"use strict";
-
-if (global._6to5Polyfill) {
-  throw new Error("only one instance of 6to5/polyfill is allowed");
-}
-global._6to5Polyfill = true;
-
-require("core-js/shim");
-require("regenerator-6to5/runtime");

lib/6to5/transformation/modules/common-standard.js

@@ -1,13 +0,0 @@
-"use strict";
-
-module.exports = CommonStandardFormatter;
-
-var CommonStrictFormatter = require("./common-strict");
-var util = require("../../util");
-
-function CommonStandardFormatter() {
-  this.noInteropRequireImport = true;
-  CommonStrictFormatter.apply(this, arguments);
-}
-
-util.inherits(CommonStandardFormatter, CommonStrictFormatter);

lib/6to5/transformation/modules/index.js

@@ -1,11 +0,0 @@
-module.exports = {
-  commonStandard: require("./common-standard"),
-  commonStrict:   require("./common-strict"),
-  amdStrict:      require("./amd-strict"),
-  umdStrict:      require("./umd-strict"),
-  common:         require("./common"),
-  system:         require("./system"),
-  ignore:         require("./ignore"),
-  amd:            require("./amd"),
-  umd:            require("./umd")
-};

lib/6to5/transformation/templates/defaults.js

@@ -1,8 +0,0 @@
-(function (obj, defaults) {
-  for (var key in defaults) {
-    if (obj[key] === undefined) {
-      obj[key] = defaults[key];
-    }
-  }
-  return obj;
-})

lib/6to5/transformation/transformers/deprecated.json

@@ -1,41 +0,0 @@
-{
-  "specNoForInOfAssignment": "validation.noForInOfAssignment",
-  "specSetters": "validation.setters",
-  "specBlockScopedFunctions": "spec.blockScopedFunctions",
-  "malletOperator": "playground.malletOperator",
-  "methodBinding": "playground.methodBinding",
-  "memoizationOperator": "playground.memoizationOperator",
-  "objectGetterMemoization": "playground.objectGetterMemoization",
-  "modules": "es6.modules",
-  "propertyNameShorthand": "es6.properties.shorthand",
-  "arrayComprehension": "es7.comprehensions",
-  "generatorComprehension": "es7.comprehensions",
-  "arrowFunctions": "es6.arrowFunctions",
-  "classes": "es6.classes",
-  "objectSpread": "es7.objectRestSpread",
-  "es7.objectSpread": "es7.objectRestSpread",
-  "exponentiationOperator": "es7.exponentiationOperator",
-  "spread": "es6.spread",
-  "templateLiterals": "es6.templateLiterals",
-  "propertyMethodAssignment": "es6.properties.shorthand",
-  "computedPropertyNames": "es6.properties.computed",
-  "defaultParameters": "es6.parameters.default",
-  "restParameters": "es6.parameters.rest",
-  "destructuring": "es6.destructuring",
-  "forOf": "es6.forOf",
-  "unicodeRegex": "es6.unicodeRegex",
-  "abstractReferences": "es7.abstractReferences",
-  "constants": "es6.constants",
-  "letScoping": "es6.letScoping",
-  "blockScopingTDZ": "es6.blockScopingTDZ",
-  "generators": "regenerator",
-  "protoToAssign": "spec.protoToAssign",
-  "typeofSymbol": "spec.typeofSymbol",
-  "coreAliasing": "selfContained",
-  "undefinedToVoid": "spec.undefinedToVoid",
-  "undeclaredVariableCheck": "validation.undeclaredVariableCheck",
-  "specPropertyLiterals": "es3.propertyLiterals",
-  "specMemberExpressionLiterals": "es3.memberExpressionLiterals",
-  "minification.propertyLiterals": "es3.propertyLiterals",
-  "minification.memberExpressionLiterals": "es3.memberExpressionLiterals"
-}

lib/6to5/transformation/transformers/es6/tail-call.js

@@ -1,118 +0,0 @@
-"use strict";
-
-/*
-var t    = require("../../../types");
-
-function transformExpression(node, scope, state) {
-  if (!node) return;
-
-  return (function subTransform(node) {
-    switch (node.type) {
-      case "ConditionalExpression":
-        // any value of ternary operator can be final one
-        subTransform(node.consequent);
-        subTransform(node.alternate);
-        break;
-
-      case "LogicalExpression":
-        // only right expression can be final and so optimized
-        subTransform(node.right);
-        break;
-
-      case "SequenceExpression":
-        // only last element of sequence can be optimized
-        var seq = node.expressions;
-        subTransform(seq[seq.length - 1]);
-        break;
-
-      case "CallExpression":
-        var callee = node.callee, thisBinding;
-        var args = [callee];
-
-        // bind `this` to object in member expressions
-        if (t.isMemberExpression(callee)) {
-          var object = state.wrapSideEffect(callee.object);
-          callee.object = object.expr;
-          thisBinding = object.ref;
-        }
-
-        if (node.arguments.length > 0 || thisBinding) {
-          args.push(t.arrayExpression(node.arguments));
-        }
-
-        if (thisBinding) {
-          args.push(thisBinding);
-        }
-
-        node.callee = state.getHelperRef();
-        node.arguments = args;
-        break;
-    }
-  })(node);
-}
-
-var functionChildrenVisitor = {
-  enter: function (node, parent, scope, state) {
-    if (t.isReturnStatement(node)) {
-      // prevent entrance by current visitor
-      this.skip();
-      // transform return argument into statement if
-      // it contains tail recursion
-      transformExpression(node.argument, scope, state);
-    } else if (t.isFunction(node)) {
-      // inner function's bodies are irrelevant
-      this.skip();
-    } else if (t.isTryStatement(parent)) {
-      if (node === parent.block) {
-        // `try`-blocks can't be optimized
-        this.skip();
-      } else if (parent.finalizer && node !== parent.finalizer) {
-        // `catch` clause followed by `finally` can't be optimized
-        this.skip();
-      }
-    }
-  }
-};
-
-var functionVisitor = {
-  enter: function (node, parent, scope, state) {
-    // traverse all child nodes of this function and find `arguments` and `this`
-    scope.traverse(node, functionChildrenVisitor, state);
-
-    return this.skip();
-  }
-};
-
-exports.FunctionDeclaration =
-exports.FunctionExpression = function (node, parent, scope, file) {
-  var tempId, helperRef;
-
-  var state = {
-    ownerId: node.id,
-
-    getHelperRef: function () {
-      return helperRef = helperRef || file.addHelper("tail-call");
-    },
-
-    wrapSideEffect: function (node) {
-      if (t.isIdentifier(node) || t.isLiteral(node)) {
-        return {expr: node, ref: node};
-      }
-      tempId = tempId || scope.generateUidIdentifier("temp");
-      return {
-        expr: t.assignmentExpression("=", tempId, node),
-        ref: tempId
-      };
-    }
-  };
-
-  // traverse the function and look for tail recursion
-  scope.traverse(node, functionVisitor, state);
-
-  if (tempId) {
-    t.ensureBlock(node).body.unshift(t.variableDeclaration("var", [
-      t.variableDeclarator(tempId)
-    ]));
-  }
-};
-*/

lib/6to5/transformation/transformers/minification/rename-local-variables.js

@@ -1,11 +0,0 @@
-//var t = require("../../../types");
-
-exports.optional = true;
-
-exports.Scope = function () {
-  // todo: get all binding identifiers, generate compact names
-  // that wont collide and then call the remap identifier helper
-
-  // this transformer **has** to be ran last as it will absolutley
-  // destroy the scope tree
-};

lib/6to5/traversal/scope.js

@@ -1,512 +0,0 @@
-"use strict";
-
-module.exports = Scope;
-
-var contains = require("lodash/collection/contains");
-var traverse = require("./index");
-var defaults = require("lodash/object/defaults");
-var globals  = require("globals");
-var flatten  = require("lodash/array/flatten");
-var extend   = require("lodash/object/extend");
-var object   = require("../helpers/object");
-var each     = require("lodash/collection/each");
-var has      = require("lodash/object/has");
-var t        = require("../types");
-
-/**
- * This searches the current "scope" and collects all references/bindings
- * within.
- *
- * @param {Node} block
- * @param {Node} parentBlock
- * @param {Scope} [parent]
- * @param {File} [file]
- */
-
-function Scope(block, parentBlock, parent, file) {
-  this.parent = parent;
-  this.file   = parent ? parent.file : file;
-
-  this.parentBlock = parentBlock;
-  this.block       = block;
-
-  this.crawl();
-}
-
-Scope.defaultDeclarations = flatten([globals.builtin, globals.browser, globals.node].map(Object.keys));
-
-/**
- * Description
- *
- * @param {Object} node
- * @param {Object} opts
- * @param [state]
- */
-
-Scope.prototype.traverse = function (node, opts, state) {
-  traverse(node, opts, this, state);
-};
-
-/**
- * Description
- *
- * @param {File} file
- * @param {String} [name="temp"]
- */
-
-Scope.prototype.generateTemp = function (file, name) {
-  var id = file.generateUidIdentifier(name || "temp", this);
-  this.push({
-    key: id.name,
-    id: id
-  });
-  return id;
-};
-
-/**
- * Description
- *
- * @param {String} name
- */
-
-Scope.prototype.generateUidIdentifier = function (name) {
-  return this.file.generateUidIdentifier(name, this);
-};
-
-/*
- * Description
- *
- * @param {Object} parent
- * @returns {Object}
- */
-
-Scope.prototype.generateUidBasedOnNode = function (parent) {
-  var node = parent;
-
-  if (t.isAssignmentExpression(parent)) {
-    node = parent.left;
-  } else if (t.isVariableDeclarator(parent)) {
-    node = parent.id;
-  } else if (t.isProperty(node)) {
-    node = node.key;
-  }
-
-  var parts = [];
-
-  var add = function (node) {
-    if (t.isMemberExpression(node)) {
-      add(node.object);
-      add(node.property);
-    } else if (t.isIdentifier(node)) {
-      parts.push(node.name);
-    } else if (t.isLiteral(node)) {
-      parts.push(node.value);
-    } else if (t.isCallExpression(node)) {
-      add(node.callee);
-    }
-  };
-
-  add(node);
-
-  var id = parts.join("$");
-  id = id.replace(/^_/, "") || "ref";
-
-  return this.file.generateUidIdentifier(id, this);
-};
-
-/**
- * Description
- *
- * @param {Object} node
- * @returns {Object}
- */
-
-Scope.prototype.generateTempBasedOnNode = function (node) {
-  if (t.isIdentifier(node) && this.hasBinding(node.name)) {
-    return null;
-  }
-
-  var id = this.generateUidBasedOnNode(node);
-  this.push({
-    key: id.name,
-    id: id
-  });
-  return id;
-};
-
-Scope.prototype.checkBlockScopedCollisions = function (key, id) {
-  if (this.declarationKinds["let"][key] || this.declarationKinds["const"][key]) {
-    throw this.file.errorWithNode(id, "Duplicate declaration " + key, TypeError);
-  }
-};
-
-Scope.prototype.inferType = function (node) {
-  var target;
-
-  if (t.isVariableDeclarator(node)) {
-    target = node.init;
-  }
-
-  if (t.isLiteral(target) || t.isArrayExpression(target) || t.isObjectExpression(target)) {
-    // todo: possibly call some helper that will resolve these to a flow type annotation
-  }
-
-  if (t.isCallExpression(target)) {
-    // todo: resolve this to a return type
-  }
-
-  if (t.isMemberExpression(target)) {
-    // todo: crawl this and find the correct type, bail on anything that we cannot possibly be 100% confident on
-  }
-
-  if (t.isIdentifier(target)) {
-    return this.getType(target.name);
-  }
-};
-
-Scope.prototype.registerType = function (key, id, node) {
-  var type;
-
-  if (id.typeAnnotation) {
-    type = id.typeAnnotation;
-  }
-
-  if (!type) {
-    type = this.inferType(node);
-  }
-
-  if (type) {
-    if (t.isTypeAnnotation(type)) type = type.typeAnnotation;
-    this.types[key] = type;
-  }
-};
-
-Scope.prototype.register = function (node, reference, kind) {
-  if (t.isVariableDeclaration(node)) {
-    return this.registerVariableDeclaration(node);
-  }
-
-  var ids = t.getBindingIdentifiers(node);
-
-  extend(this.references, ids);
-
-  if (reference) return;
-
-  for (var key in ids) {
-    var id = ids[key];
-
-    this.checkBlockScopedCollisions(key, id);
-
-    this.registerType(key, id, node);
-    this.bindings[key] = id;
-  }
-
-  var kinds = this.declarationKinds[kind];
-  if (kinds) extend(kinds, ids);
-};
-
-Scope.prototype.registerVariableDeclaration = function (declar) {
-  var declars = declar.declarations;
-  for (var i = 0; i < declars.length; i++) {
-    this.register(declars[i], false, declar.kind);
-  }
-};
-
-var functionVariableVisitor = {
-  enter: function (node, parent, scope, state) {
-    if (t.isFor(node)) {
-      each(t.FOR_INIT_KEYS, function (key) {
-        var declar = node[key];
-        if (t.isVar(declar)) state.scope.register(declar);
-      });
-    }
-
-    // this block is a function so we'll stop since none of the variables
-    // declared within are accessible
-    if (t.isFunction(node)) return this.skip();
-
-    // function identifier doesn't belong to this scope
-    if (state.blockId && node === state.blockId) return;
-
-    // delegate block scope handling to the `blockVariableVisitor`
-    if (t.isBlockScoped(node)) return;
-
-    // this will be hit again once we traverse into it after this iteration
-    if (t.isExportDeclaration(node) && t.isDeclaration(node.declaration)) return;
-
-    // we've ran into a declaration!
-    if (t.isDeclaration(node)) state.scope.register(node);
-  }
-};
-
-var programReferenceVisitor = {
-  enter: function (node, parent, scope, state) {
-    if (t.isReferencedIdentifier(node, parent) && !scope.hasReference(node.name)) {
-      state.register(node, true);
-    }
-  }
-};
-
-var blockVariableVisitor = {
-  enter: function (node, parent, scope, state) {
-    if (t.isBlockScoped(node)) {
-      state.register(node);
-    } else if (t.isScope(node)) {
-      this.skip();
-    }
-  }
-};
-
-Scope.prototype.crawl = function () {
-  var parent = this.parent;
-  var block  = this.block;
-  var i;
-
-  //
-
-  var info = block._scopeInfo;
-  if (info) {
-    extend(this, info);
-    return;
-  }
-
-  info = block._scopeInfo = {
-    declarationKinds: {
-      "const": object(),
-      "var":   object(),
-      "let":   object()
-    },
-
-    references: object(),
-    bindings:   object(),
-    types:      object(),
-  };
-
-  extend(this, info);
-
-  //
-
-  if (parent && t.isBlockStatement(block)) {
-    if (t.isLoop(parent.block, { body: block }) ||
-        t.isFunction(parent.block, { body: block })) {
-      return;
-    }
-  }
-
-  // ForStatement - left, init
-
-  if (t.isLoop(block)) {
-    for (i = 0; i < t.FOR_INIT_KEYS.length; i++) {
-      var node = block[t.FOR_INIT_KEYS[i]];
-      if (t.isBlockScoped(node)) this.register(node, false, true);
-    }
-
-    if (t.isBlockStatement(block.body)) {
-      block = block.body;
-    }
-  }
-
-  // FunctionExpression - id
-
-  if (t.isFunctionExpression(block) && block.id) {
-    if (!t.isProperty(this.parentBlock, { method: true })) {
-      this.register(block.id);
-    }
-  }
-
-  // Function - params, rest
-
-  if (t.isFunction(block)) {
-    for (i = 0; i < block.params.length; i++) {
-      this.register(block.params[i]);
-    }
-    this.traverse(block.body, blockVariableVisitor, this);
-  }
-
-  // Program, BlockStatement, Function - let variables
-
-  if (t.isBlockStatement(block) || t.isProgram(block)) {
-    this.traverse(block, blockVariableVisitor, this);
-  }
-
-  // CatchClause - param
-
-  if (t.isCatchClause(block)) {
-    this.register(block.param);
-  }
-
-  // ComprehensionExpression - blocks
-
-  if (t.isComprehensionExpression(block)) {
-    this.register(block);
-  }
-
-  // Program, Function - var variables
-
-  if (t.isProgram(block) || t.isFunction(block)) {
-    this.traverse(block, functionVariableVisitor, {
-      blockId: block.id,
-      scope:   this
-    });
-  }
-
-  // Program
-
-  if (t.isProgram(block)) {
-    this.traverse(block, programReferenceVisitor, this);
-  }
-};
-
-/**
- * Description
- *
- * @param {Object} opts
- */
-
-Scope.prototype.push = function (opts) {
-  var block = this.block;
-
-  if (t.isFor(block) || t.isCatchClause(block) || t.isFunction(block)) {
-    t.ensureBlock(block);
-    block = block.body;
-  }
-
-  if (t.isBlockStatement(block) || t.isProgram(block)) {
-    block._declarations = block._declarations || {};
-    block._declarations[opts.key] = {
-      kind: opts.kind,
-      id: opts.id,
-      init: opts.init
-    };
-  } else {
-    throw new TypeError("cannot add a declaration here in node type " + block.type);
-  }
-};
-
-/**
- * Walk up the scope tree until we hit a `Function` and then
- * push our `node` to it's references.
- *
- * @param {String} kind
- * @param {Object} node
- */
-
-Scope.prototype.addDeclarationToFunctionScope = function (kind, node) {
-  var scope = this.getFunctionParent();
-  var ids   = t.getBindingIdentifiers(node);
-
-  extend(scope.bindings, ids);
-  extend(scope.references, ids);
-
-  // this ignores the duplicate declaration logic specified in `getInfo`
-  // but it doesn't really matter
-  extend(scope.declarationKinds[kind], ids);
-};
-
-/**
- * Walk up the scope tree until we hit either a Function or reach the
- * very top and hit Program.
- */
-
-Scope.prototype.getFunctionParent = function () {
-  var scope = this;
-  while (scope.parent && !t.isFunction(scope.block)) {
-    scope = scope.parent;
-  }
-  return scope;
-};
-
-/**
- * Walks the scope tree and gathers **all** bindings.
- *
- * @returns {Object}
- */
-
-Scope.prototype.getAllBindings = function () {
-  var ids = object();
-
-  var scope = this;
-  do {
-    defaults(ids, scope.bindings);
-    scope = scope.parent;
-  } while (scope);
-
-  return ids;
-};
-
-/**
- * Walks the scope tree and gathers all declarations of `kind`.
- *
- * @param {String} kind
- * @returns {Object}
- */
-
-Scope.prototype.getAllDeclarationsOfKind = function (kind) {
-  var ids = object();
-
-  var scope = this;
-  do {
-    defaults(ids, scope.declarationKinds[kind]);
-    scope = scope.parent;
-  } while (scope);
-
-  return ids;
-};
-
-//
-
-Scope.prototype.get = function (id, type) {
-  return id && (this.getOwn(id, type) || this.parentGet(id, type));
-};
-
-Scope.prototype.getOwn = function (id, type) {
-  var refs = {
-    reference: this.references,
-    binding:   this.bindings,
-    type:      this.types
-  }[type];
-  return refs && has(refs, id) && refs[id];
-};
-
-Scope.prototype.parentGet = function (id, type) {
-  return this.parent && this.parent.get(id, type);
-};
-
-Scope.prototype.has = function (id, type) {
-  if (!id) return false;
-  if (this.hasOwn(id, type)) return true;
-  if (this.parentHas(id, type)) return true;
-  if (contains(Scope.defaultDeclarations, id)) return true;
-  return false;
-};
-
-Scope.prototype.hasOwn = function (id, type) {
-  return !!this.getOwn(id, type);
-};
-
-Scope.prototype.parentHas = function (id, type) {
-  return this.parent && this.parent.has(id, type);
-};
-
-each({
-  reference: "Reference",
-  binding: "Binding",
-  type: "Type"
-}, function (title, type) {
-  Scope.prototype[type + "Equals"] = function (id, node) {
-    return this["get" + title](id) === node;
-  };
-
-  each([
-    "get",
-    "has",
-    "getOwn",
-    "hasOwn",
-    "parentGet",
-    "parentHas",
-  ], function (methodName) {
-    Scope.prototype[methodName + title] = function (id) {
-      return this[methodName](id, type);
-    };
-  });
-});

lib/6to5/types/builder-keys.json

@@ -1,33 +0,0 @@
-{
-  "ArrayExpression":         ["elements"],
-  "ArrowFunctionExpression": ["params", "body"],
-  "AssignmentExpression":    ["operator", "left", "right"],
-  "BinaryExpression":        ["operator", "left", "right"],
-  "BlockStatement":          ["body"],
-  "CallExpression":          ["callee", "arguments"],
-  "ConditionalExpression":   ["test", "consequent", "alternate"],
-  "ExpressionStatement":     ["expression"],
-  "File":                    ["program", "comments", "tokens"],
-  "FunctionExpression":      ["id", "params", "body", "generator"],
-  "FunctionDeclaration":     ["id", "params", "body", "generator"],
-  "Identifier":              ["name"],
-  "IfStatement":             ["test", "consequent", "alternate"],
-  "ImportDeclaration":       ["specifiers", "source"],
-  "ImportSpecifier":         ["id", "name"],
-  "Literal":                 ["value"],
-  "LogicalExpression":       ["operator", "left", "right"],
-  "MemberExpression":        ["object", "property", "computed"],
-  "MethodDefinition":        ["key", "value", "computed", "kind"],
-  "NewExpression":           ["callee", "arguments"],
-  "ObjectExpression":        ["properties"],
-  "Program":                 ["body"],
-  "Property":                ["kind", "key", "value", "computed"],
-  "ReturnStatement":         ["argument"],
-  "SequenceExpression":      ["expressions"],
-  "ThrowExpression":         ["argument"],
-  "UnaryExpression":         ["operator", "argument", "prefix"],
-  "VariableDeclaration":     ["kind", "declarations"],
-  "VariableDeclarator":      ["id", "init"],
-  "WithStatement":           ["object", "body"],
-  "YieldExpression":         ["argument", "delegate"]
-}

lib/6to5/types/node.js

@@ -1,12 +0,0 @@
-"use strict";
-
-module.exports = Node;
-
-var acorn = require("acorn-6to5");
-
-var oldNode = acorn.Node;
-acorn.Node = Node;
-
-function Node() {
-  oldNode.apply(this);
-}

lib/babel/api/browser.js

@@ -38,7 +38,7 @@ transform.load = function (url, callback, opts, hold) {
 
 var runScripts = function () {
   var scripts = [];
-  var types   = ["text/ecmascript-6", "text/6to5", "module"];
+  var types   = ["text/ecmascript-6", "text/6to5", "text/babel", "module"];
   var index   = 0;
 
   var exec = function () {

lib/babel/api/node.js

@@ -7,7 +7,7 @@ var fs         = require("fs");
 
 exports.version = require("../../../package").version;
 
-exports.runtime = require("../build-runtime");
+exports.buildExternalHelpers = require("../build-external-helpers");
 
 exports.types = require("../types");
 
@@ -23,7 +23,7 @@ exports.polyfill = function () {
 
 exports.canCompile = util.canCompile;
 
-// do not use this - this is for use by official maintained 6to5 plugins
+// do not use this - this is for use by official maintained babel plugins
 exports._util = util;
 
 exports.transform = transform;

lib/babel/api/register/browser.js

@@ -1,6 +1,6 @@
 "use strict";
 
-// required to safely use 6to5/register within a browserify codebase
+// required to safely use babel/register within a browserify codebase
 
 module.exports = function () {};
 

lib/babel/api/register/cache.js

@@ -4,7 +4,7 @@ var path = require("path");
 var os   = require("os");
 var fs   = require("fs");
 
-var FILENAME = path.join(os.tmpdir(), "6to5.json");
+var FILENAME = process.env.BABEL_CACHE_PATH || path.join(os.tmpdir(), "babel.json");
 var data = {};
 
 exports.save = function () {
@@ -12,6 +12,8 @@ exports.save = function () {
 };
 
 exports.load = function () {
+  if (process.env.BABEL_DISABLE_CACHE) return;
+
   process.on("exit", exports.save);
 
   var sigint = function () {

lib/babel/api/register/node.js

@@ -5,9 +5,9 @@ require("../../polyfill");
 var sourceMapSupport = require("source-map-support");
 var registerCache    = require("./cache");
 var extend           = require("lodash/object/extend");
+var babel            = require("../node");
 var each             = require("lodash/collection/each");
 var util             = require("../../util");
-var to5              = require("../node");
 var fs               = require("fs");
 
 sourceMapSupport.install({
@@ -54,7 +54,7 @@ var compile = function (filename) {
   }
 
   if (!result) {
-    result = to5.transformFileSync(filename, extend({
+    result = babel.transformFileSync(filename, extend({
       sourceMap: true,
       ast:       false
     }, transformOpts));

lib/babel/build-external-helpers.js

@@ -6,7 +6,7 @@ var util         = require("./util");
 var t            = require("./types");
 
 module.exports = function () {
-  var namespace = t.identifier("to5Runtime");
+  var namespace = t.identifier("babelHelpers");
 
   var body      = [];
   var container = t.functionExpression(null, [t.identifier("global")], t.blockStatement(body));

lib/babel/detection/visitors.js

@@ -1,5 +1,5 @@
 var t = require("../types");
-var _ = require("lodash");
+var includes = require("lodash/collection/includes");
 
 exports.AssignmentExpression = function (node, parent, detected) {
   if (node.operator === "**=") {
@@ -38,7 +38,7 @@ exports.Property = function (node, parent, detected) {
 };
 
 exports.AssignmentPattern = function (node, parent, detected) {
-  if (t.isFunction(parent) && _.contains(parent.params, node)) {
+  if (t.isFunction(parent) && includes(parent.params, node)) {
     detected("es6.parameters.default");
   }
 };

lib/babel/generation/buffer.js

@@ -2,10 +2,11 @@
 
 module.exports = Buffer;
 
+var repeating = require("repeating");
+var trimRight = require("trim-right");
 var isBoolean = require("lodash/lang/isBoolean");
-var contains  = require("lodash/collection/contains");
+var includes  = require("lodash/collection/includes");
 var isNumber  = require("lodash/lang/isNumber");
-var util      = require("../util");
 
 function Buffer(position, format) {
   this.position = position;
@@ -15,14 +16,14 @@ function Buffer(position, format) {
 }
 
 Buffer.prototype.get = function () {
-  return util.trimRight(this.buf);
+  return trimRight(this.buf);
 };
 
 Buffer.prototype.getIndent = function () {
   if (this.format.compact || this.format.concise) {
     return "";
   } else {
-    return util.repeat(this._indent, this.format.indent.style);
+    return repeating(this.format.indent.style, this._indent);
   }
 };
 
@@ -81,7 +82,7 @@ Buffer.prototype.newline = function (i, removeLast) {
 
   if (isNumber(i)) {
     if (this.endsWith("{\n")) i--;
-    if (this.endsWith(util.repeat(i, "\n"))) return;
+    if (this.endsWith(repeating("\n", i > 0 ? i : 0))) return;
 
     while (i--) {
       this._newline(removeLast);
@@ -153,13 +154,13 @@ Buffer.prototype.endsWith = function (str) {
   return d >= 0 && this.buf.lastIndexOf(str) === d;
 };
 
-Buffer.prototype.isLast = function (cha, trimRight) {
+Buffer.prototype.isLast = function (cha, shouldTrimRight) {
   var buf = this.buf;
-  if (trimRight) buf = util.trimRight(buf);
+  if (shouldTrimRight) buf = trimRight(buf);
   var last = buf[buf.length - 1];
 
   if (Array.isArray(cha)) {
-    return contains(cha, last);
+    return includes(cha, last);
   } else {
     return cha === last;
   }

lib/babel/generation/generators/expressions.js

@@ -1,8 +1,8 @@
 "use strict";
 
-var util     = require("../../util");
-var t        = require("../../types");
-var isNumber = require("lodash/lang/isNumber");
+var isInteger = require("is-integer");
+var isNumber  = require("lodash/lang/isNumber");
+var t         = require("../../types");
 
 exports.UnaryExpression = function (node, print) {
   var hasSpace = /[a-z]$/.test(node.operator);
@@ -146,7 +146,7 @@ exports.MemberExpression = function (node, print) {
     this.push("]");
   } else {
     // 5..toFixed(2);
-    if (t.isLiteral(obj) && util.isInteger(obj.value) && !SCIENTIFIC_NOTATION.test(obj.value.toString())) {
+    if (t.isLiteral(obj) && isInteger(obj.value) && !SCIENTIFIC_NOTATION.test(obj.value.toString())) {
       this.push(".");
     }
 

lib/babel/generation/generators/flow.js

@@ -30,6 +30,7 @@ exports.ObjectTypeIndexer =
 exports.ObjectTypeProperty =
 exports.QualifiedTypeIdentifier =
 exports.UnionTypeAnnotation =
+exports.TypeCastExpression =
 exports.VoidTypeAnnotation = function () {
   // todo: implement these once we have a `--keep-types` option
 };

lib/babel/generation/generators/statements.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var util = require("../../util");
-var t    = require("../../types");
+var repeating = require("repeating");
+var t         = require("../../types");
 
 exports.WithStatement = function (node, print) {
   this.keyword("with");
@@ -21,7 +21,7 @@ exports.IfStatement = function (node, print) {
   print.indentOnComments(node.consequent);
 
   if (node.alternate) {
-    if (this.isLast("}")) this.push(" ");
+    if (this.isLast("}")) this.space();
     this.keyword("else");
 
     if (this.format.format && !t.isBlockStatement(node.alternate)) {
@@ -190,7 +190,7 @@ exports.VariableDeclaration = function (node, print, parent) {
 
   var sep = ",";
   if (hasInits) {
-    sep += "\n" + util.repeat(node.kind.length + 1);
+    sep += "\n" + repeating(" ", node.kind.length + 1);
   } else {
     sep += " ";
   }

lib/babel/generation/index.js

@@ -9,13 +9,13 @@ module.exports.CodeGenerator = CodeGenerator;
 
 var detectIndent = require("detect-indent");
 var Whitespace   = require("./whitespace");
+var repeating    = require("repeating");
 var SourceMap    = require("./source-map");
 var Position     = require("./position");
 var Buffer       = require("./buffer");
 var extend       = require("lodash/object/extend");
 var merge        = require("lodash/object/merge");
 var each         = require("lodash/collection/each");
-var util         = require("../util");
 var n            = require("./node");
 var t            = require("../types");
 
@@ -344,7 +344,7 @@ CodeGenerator.prototype._printComments = function (comments) {
       }
 
       var indent = Math.max(self.indentSize(), column);
-      val = val.replace(/\n/g, "\n" + util.repeat(indent));
+      val = val.replace(/\n/g, "\n" + repeating(" ", indent));
     }
 
     if (column === 0) {

lib/babel/generation/whitespace.js

@@ -82,7 +82,7 @@ Whitespace.prototype.getNewlinesAfter = function (node) {
     }
   }
 
-  if (endToken.type.type === "eof") {
+  if (endToken && endToken.type.type === "eof") {
     return 1;
   } else {
     var lines = this.getNewlinesBetween(startToken, endToken);
@@ -96,6 +96,8 @@ Whitespace.prototype.getNewlinesAfter = function (node) {
 };
 
 Whitespace.prototype.getNewlinesBetween = function (startToken, endToken) {
+  if (!endToken || !endToken.loc) return 0;
+
   var start = startToken ? startToken.loc.end.line : 1;
   var end   = endToken.loc.start.line;
   var lines = 0;

lib/babel/helpers/code-frame.js

@@ -1,9 +1,8 @@
 // syntax highlighting based on https://github.com/dominictarr/ansi-highlight by the fantastic Dominic Tarr
 
-var supportsColor = require("supports-color");
-var tokenize      = require("js-tokenizer");
-var chalk         = require("chalk");
-var util          = require("../util");
+var repeating = require("repeating");
+var tokenize  = require("js-tokenizer");
+var chalk     = require("chalk");
 
 var defs = {
   string1:  "red",
@@ -43,7 +42,7 @@ var highlight = function (text) {
 module.exports = function (lines, lineNumber, colNumber) {
   colNumber = Math.max(colNumber, 0);
 
-  if (supportsColor) {
+  if (chalk.supportsColor) {
     lines = highlight(lines);
   }
 
@@ -63,15 +62,15 @@ module.exports = function (lines, lineNumber, colNumber) {
 
     var gutter = curr === lineNumber ? "> " : "  ";
 
-    var sep = curr + util.repeat(width + 1);
+    var sep = curr + repeating(" ", width + 1);
     gutter += sep + "| ";
 
     var str = gutter + line;
 
     if (colNumber && curr === lineNumber) {
       str += "\n";
-      str += util.repeat(gutter.length - 2);
-      str += "|" + util.repeat(colNumber) + "^";
+      str += repeating(" ", gutter.length - 2);
+      str += "|" + repeating(" ", colNumber) + "^";
     }
 
     return str;

lib/babel/helpers/parse.js

@@ -1,7 +1,7 @@
 var normalizeAst = require("./normalize-ast");
 var estraverse   = require("estraverse");
 var codeFrame    = require("./code-frame");
-var acorn        = require("acorn-6to5");
+var acorn        = require("acorn-babel");
 
 module.exports = function (opts, code, callback) {
   try {
@@ -30,8 +30,8 @@ module.exports = function (opts, code, callback) {
       return ast;
     }
   } catch (err) {
-    if (!err._6to5) {
-      err._6to5 = true;
+    if (!err._babel) {
+      err._babel = true;
       var message = opts.filename + ": " + err.message;
 
       var loc = err.loc;

lib/babel/messages.js

@@ -0,0 +1,50 @@
+var util = require("util");
+
+exports.messages = {
+  tailCallReassignmentDeopt: "Function reference has been reassigned so it's probably be dereferenced so we can't optimise this with confidence",
+  JSXNamespacedTags: "Namespace tags are not supported. ReactJSX is not XML.",
+  classesIllegalBareSuper: "Illegal use of bare super",
+  classesIllegalSuperCall: "Direct super call is illegal in non-constructor, use super.$1() instead",
+  classesIllegalConstructorKind: "Illegal kind for constructor method",
+  scopeDuplicateDeclaration: "Duplicate declaration $1",
+  undeclaredVariable: "Reference to undeclared variable $1",
+  undeclaredVariableSuggestion: "Reference to undeclared variable $1 - did you mean $2?",
+  settersInvalidParamLength: "Setters must have exactly one parameter",
+  noAssignmentsInForHead: "No assignments allowed in for-in/of head",
+  expectedMemberExpressionOrIdentifier: "Expected type MemeberExpression or Identifier",
+  invalidParentForThisNode: "We don't know how to handle this node within the current parent - please open an issue",
+  readOnly: "$1 is read-only",
+  modulesIllegalExportName: "Illegal export $1",
+  unknownForHead: "Unknown node type $1 in ForStatement",
+  didYouMean: "Did you mean $1?",
+  evalInStrictMode: "eval is not allowed in strict mode"
+};
+
+exports.get = function (key) {
+  var msg = exports.messages[key];
+  if (!msg) throw new ReferenceError("Unknown message `" + key + "`");
+
+  var args = [];
+  for (var i = 1; i < arguments.length; i++) {
+    args.push(arguments[i]);
+  }
+  args = exports.parseArgs(args);
+
+  return msg.replace(/\$(\d+)/g, function (str, i) {
+    return args[--i];
+  });
+};
+
+exports.parseArgs = function (args) {
+  return args.map(function (val) {
+    if (val != null && val.inspect) {
+      return val.inspect();
+    } else {
+      try {
+        return JSON.stringify(val) || val + "";
+      } catch (e) {
+        return util.inspect(val);
+      }
+    }
+  });
+};

lib/babel/patch.js

@@ -3,14 +3,12 @@
 var extend = require("lodash/object/extend");
 var t      = require("./types");
 
-require("./types/node");
-
 // estraverse
 
 var estraverse = require("estraverse");
 extend(estraverse.VisitorKeys, t.VISITOR_KEYS);
 
-// regenerator-6to5/ast-types
+// regenerator-babel/ast-types
 
 var types = require("ast-types");
 var def   = types.Type.def;

lib/babel/polyfill.js

@@ -0,0 +1,9 @@
+"use strict";
+
+if (global._babelPolyfill) {
+  throw new Error("only one instance of babel/polyfill is allowed");
+}
+global._babelPolyfill = true;
+
+require("core-js/shim");
+require("regenerator-babel/runtime");

lib/babel/transformation/file.js

@@ -2,25 +2,27 @@
 
 module.exports = File;
 
-var SHEBANG_REGEX = /^\#\!.*/;
-
-var isFunction = require("lodash/lang/isFunction");
-var transform  = require("./index");
-var generate   = require("../generation");
-var defaults   = require("lodash/object/defaults");
-var contains   = require("lodash/collection/contains");
-var clone      = require("../helpers/clone");
-var parse      = require("../helpers/parse");
-var Scope      = require("../traversal/scope");
-var util       = require("../util");
-var path       = require("path");
-var each       = require("lodash/collection/each");
-var t          = require("../types");
+var sourceMapToComment = require("source-map-to-comment");
+var shebangRegex       = require("shebang-regex");
+var isFunction         = require("lodash/lang/isFunction");
+var transform          = require("./index");
+var generate           = require("../generation");
+var defaults           = require("lodash/object/defaults");
+var includes           = require("lodash/collection/includes");
+var assign             = require("lodash/object/assign");
+var parse              = require("../helpers/parse");
+var Scope              = require("../traversal/scope");
+var slash              = require("slash");
+var util               = require("../util");
+var path               = require("path");
+var each               = require("lodash/collection/each");
+var t                  = require("../types");
 
 function File(opts) {
-  this.dynamicImportIds = {};
-  this.dynamicImported  = [];
-  this.dynamicImports   = [];
+  this.dynamicImportedNoDefault = [];
+  this.dynamicImportIds         = {};
+  this.dynamicImported          = [];
+  this.dynamicImports           = [];
 
   this.dynamicData      = {};
   this.data             = {};
@@ -41,6 +43,7 @@ File.helpers = [
   "tagged-template-literal-loose",
   "interop-require",
   "to-array",
+  "to-consumable-array",
   "sliced-to-array",
   "object-without-properties",
   "has-own",
@@ -57,7 +60,8 @@ File.helpers = [
   "object-destructuring-empty",
   "temporal-undefined",
   "temporal-assert-defined",
-  "tail-call"
+  "tail-call",
+  "self-global"
 ];
 
 File.validOptions = [
@@ -83,7 +87,8 @@ File.validOptions = [
   "playground",
   "experimental",
   "resolveModuleSource",
-  "runtime",
+  "externalHelpers",
+  "auxiliaryComment",
 
   // these are used by plugins
   "ignore",
@@ -93,7 +98,7 @@ File.validOptions = [
 ];
 
 File.prototype.normalizeOptions = function (opts) {
-  opts = clone(opts);
+  opts = assign({}, opts);
 
   for (var key in opts) {
     if (key[0] !== "_" && File.validOptions.indexOf(key) < 0) {
@@ -104,6 +109,8 @@ File.prototype.normalizeOptions = function (opts) {
   defaults(opts, {
     keepModuleIdExtensions: false,
     resolveModuleSource:    null,
+    externalHelpers:        false,
+    auxilaryComment:        "",
     experimental:           false,
     reactCompat:            false,
     playground:             false,
@@ -116,14 +123,16 @@ File.prototype.normalizeOptions = function (opts) {
     comments:               true,
     filename:               "unknown",
     modules:                "common",
-    runtime:                false,
     loose:                  [],
     code:                   true,
     ast:                    true
   });
 
   // normalize windows path separators to unix
-  opts.filename = opts.filename.replace(/\\/g, "/");
+  opts.filename = slash(opts.filename);
+  if (opts.sourceRoot) {
+    opts.sourceRoot = slash(opts.sourceRoot);
+  }
 
   opts.basename = path.basename(opts.filename, path.extname(opts.filename));
 
@@ -132,7 +141,7 @@ File.prototype.normalizeOptions = function (opts) {
   opts.optional  = util.arrayify(opts.optional);
   opts.loose     = util.arrayify(opts.loose);
 
-  if (contains(opts.loose, "all")) {
+  if (includes(opts.loose, "all") || includes(opts.loose, true)) {
     opts.loose = Object.keys(transform.transformers);
   }
 
@@ -157,8 +166,8 @@ File.prototype.normalizeOptions = function (opts) {
     opts.experimental = true;
   }
 
-  if (opts.runtime) {
-    this.set("runtimeIdentifier", t.identifier("to5Runtime"));
+  if (opts.externalHelpers) {
+    this.set("runtimeIdentifier", t.identifier("babelHelpers"));
   }
 
   opts.blacklist = transform._ensureTransformerNames("blacklist", opts.blacklist);
@@ -172,11 +181,20 @@ File.prototype.normalizeOptions = function (opts) {
                   "`reactCompat` - backwards compatibility will be removed in v4.0.0");
   }
 
+  var ensureEnabled = function (key) {
+    var namespace = transform.transformerNamespaces[key];
+    if (namespace === "es7") opts.experimental = true;
+    if (namespace === "playground") opts.playground = true;
+  };
+
+  each(opts.whitelist, ensureEnabled);
+  each(opts.optional, ensureEnabled);
+
   return opts;
 };
 
 File.prototype.isLoose = function (key) {
-  return contains(this.opts.loose, key);
+  return includes(this.opts.loose, key);
 };
 
 File.prototype.buildTransformers = function () {
@@ -213,22 +231,6 @@ File.prototype.debug = function (msg) {
   util.debug(parts);
 };
 
-File.prototype.toArray = function (node, i) {
-  if (t.isArrayExpression(node)) {
-    return node;
-  } else if (t.isIdentifier(node) && node.name === "arguments") {
-    return t.callExpression(t.memberExpression(this.addHelper("slice"), t.identifier("call")), [node]);
-  } else {
-    var declarationName = "to-array";
-    var args = [node];
-    if (i) {
-      args.push(t.literal(i));
-      declarationName = "sliced-to-array";
-    }
-    return t.callExpression(this.addHelper(declarationName), args);
-  }
-};
-
 File.prototype.getModuleFormatter = function (type) {
   var ModuleFormatter = isFunction(type) ? type : transform.moduleFormatters[type];
 
@@ -245,12 +247,13 @@ File.prototype.getModuleFormatter = function (type) {
 };
 
 File.prototype.parseShebang = function (code) {
-  var shebangMatch = code.match(SHEBANG_REGEX);
+  var shebangMatch = shebangRegex.exec(code);
+
   if (shebangMatch) {
     this.shebang = shebangMatch[0];
 
     // remove shebang
-    code = code.replace(SHEBANG_REGEX, "");
+    code = code.replace(shebangRegex, "");
   }
 
   return code;
@@ -276,17 +279,19 @@ File.prototype.get = function (key) {
   }
 };
 
-File.prototype.addImport = function (source, name) {
+File.prototype.addImport = function (source, name, noDefault) {
   name = name || source;
   var id = this.dynamicImportIds[name];
 
   if (!id) {
-    id = this.dynamicImportIds[name] = this.generateUidIdentifier(name);
+    id = this.dynamicImportIds[name] = this.scope.generateUidIdentifier(name);
 
     var specifiers = [t.importSpecifier(t.identifier("default"), id)];
     var declar = t.importDeclaration(specifiers, t.literal(source));
     declar._blockHoist = 3;
+
     this.dynamicImported.push(declar);
+    if (noDefault) this.dynamicImportedNoDefault.push(declar);
 
     this.moduleFormatter.importSpecifier(specifiers[0], declar, this.dynamicImports);
   }
@@ -298,8 +303,20 @@ File.prototype.isConsequenceExpressionStatement = function (node) {
   return t.isExpressionStatement(node) && this.lastStatements.indexOf(node) >= 0;
 };
 
+File.prototype.attachAuxiliaryComment = function (node) {
+  var comment = this.opts.auxiliaryComment;
+  if (comment) {
+    node.leadingComments = node.leadingComments || [];
+    node.leadingComments.push({
+      type: "Line",
+      value: " " + comment
+    });
+  }
+  return node;
+};
+
 File.prototype.addHelper = function (name) {
-  if (!contains(File.helpers, name)) {
+  if (!includes(File.helpers, name)) {
     throw new ReferenceError("Unknown helper " + name);
   }
 
@@ -315,7 +332,7 @@ File.prototype.addHelper = function (name) {
   } else {
     var ref = util.template(name);
     ref._compact = true;
-    var uid = this.generateUidIdentifier(name);
+    var uid = this.scope.generateUidIdentifier(name);
     this.scope.push({
       key: name,
       id: uid,
@@ -325,6 +342,10 @@ File.prototype.addHelper = function (name) {
   }
 };
 
+File.prototype.logDeopt = function () {
+  // todo, (node, msg)
+};
+
 File.prototype.errorWithNode = function (node, msg, Error) {
   Error = Error || SyntaxError;
 
@@ -348,7 +369,7 @@ File.prototype.parse = function (code) {
   var opts = this.opts;
 
   opts.allowImportExportEverywhere = this.isLoose("es6.modules");
-  //opts.strictMode = this.transformers.useStrict.canRun();
+  opts.strictMode = this.transformers.useStrict.canRun();
 
   return parse(opts, code, function (tree) {
     self.transform(tree);
@@ -436,36 +457,9 @@ File.prototype.generate = function () {
   }
 
   if (opts.sourceMap === "inline") {
-    result.code += "\n" + util.sourceMapToComment(result.map);
+    result.code += "\n" + sourceMapToComment(result.map);
     result.map = null;
   }
 
   return result;
 };
-
-File.prototype.generateUid = function (name, scope) {
-  name = t.toIdentifier(name).replace(/^_+/, "");
-
-  scope = scope || this.scope;
-
-  var uid;
-  var i = 0;
-  do {
-    uid = this._generateUid(name, i);
-    i++;
-  } while (scope.hasReference(uid));
-  return uid;
-};
-
-File.prototype.generateUidIdentifier = function (name, scope) {
-  scope = scope || this.scope;
-  var id = t.identifier(this.generateUid(name, scope));
-  scope.addDeclarationToFunctionScope("var", id);
-  return id;
-};
-
-File.prototype._generateUid = function (name, i) {
-  var id = name;
-  if (i > 1) id += i;
-  return "_" + id;
-};

lib/babel/transformation/helpers/build-react-transformer.js

@@ -6,6 +6,7 @@
 // jsx
 
 var isString = require("lodash/lang/isString");
+var messages = require("../../messages");
 var esutils  = require("esutils");
 var react    = require("./react");
 var t        = require("../../types");
@@ -28,7 +29,7 @@ module.exports = function (exports, opts) {
   };
 
   exports.JSXNamespacedName = function (node, parent, scope, file) {
-    throw file.errorWithNode(node, "Namespace tags are not supported. ReactJSX is not XML.");
+    throw file.errorWithNode(node, messages.get("JSXNamespacedTags"));
   };
 
   exports.JSXMemberExpression = {
@@ -45,6 +46,11 @@ module.exports = function (exports, opts) {
   exports.JSXAttribute = {
     exit: function (node) {
       var value = node.value || t.literal(true);
+
+      if (t.isLiteral(value) && isString(value.value)) {
+        value.value = value.value.replace(/\n\s+/g, " ");
+      }
+
       return t.inherits(t.property("init", node.name, value), node);
     }
   };

lib/babel/transformation/helpers/explode-assignable-expression.js

@@ -18,7 +18,7 @@ var getObjRef = function (node, nodes, file, scope) {
   } else if (t.isMemberExpression(node)) {
     ref = node.object;
 
-    if (t.isIdentifier(ref) && scope.hasReference(ref.name)) {
+    if (t.isIdentifier(ref) && scope.hasGlobal(ref.name)) {
       // the object reference that we need to save is locally declared
       // so as per the previous comment we can be 100% sure evaluating
       // it multiple times will be safe

lib/babel/transformation/helpers/name-method.js

@@ -13,7 +13,7 @@ var visitor = {
 
     // check that we don't have a local variable declared as that removes the need
     // for the wrapper
-    var localDeclar = scope.getBinding(state.id);
+    var localDeclar = scope.getBindingIdentifier(state.id);
     if (localDeclar !== state.outerDeclar) return;
 
     state.selfReference = true;
@@ -31,7 +31,7 @@ exports.property = function (node, file, scope) {
   var state = {
     id: id,
     selfReference: false,
-    outerDeclar: scope.getBinding(id),
+    outerDeclar: scope.getBindingIdentifier(id),
   };
 
   scope.traverse(node, visitor, state);

lib/babel/transformation/helpers/replace-supers.js

@@ -2,7 +2,8 @@
 
 module.exports = ReplaceSupers;
 
-var t = require("../../types");
+var messages = require("../../messages");
+var t        = require("../../types");
 
 /**
  * Description
@@ -142,7 +143,7 @@ ReplaceSupers.prototype.getThisReference = function () {
   if (this.topLevelThisReference) {
     return this.topLevelThisReference;
   } else {
-    var ref = this.topLevelThisReference = this.file.generateUidIdentifier("this");
+    var ref = this.topLevelThisReference = this.scope.generateUidIdentifier("this");
     this.methodNode.value.body.body.unshift(t.variableDeclaration("var", [
       t.variableDeclarator(this.topLevelThisReference, t.thisExpression())
     ]));
@@ -232,7 +233,7 @@ ReplaceSupers.prototype.specHandle = function (getThisReference, node, parent) {
   var thisReference;
 
   if (isIllegalBareSuper(node, parent)) {
-    throw this.file.errorWithNode(node, "Illegal use of bare super");
+    throw this.file.errorWithNode(node, messages.get("classesIllegalBareSuper"));
   }
 
   if (t.isCallExpression(node)) {
@@ -248,7 +249,7 @@ ReplaceSupers.prototype.specHandle = function (getThisReference, node, parent) {
       //  - https://twitter.com/wycats/status/544553184396836864
       if (methodNode.key.name !== "constructor" || !this.inClass) {
         var methodName = methodNode.key.name || "METHOD_NAME";
-        throw this.file.errorWithNode(node, "Direct super call is illegal in non-constructor, use super." + methodName + "() instead");
+        throw this.file.errorWithNode(node, messages.get("classesIllegalSuperCall", methodName));
       }
     } else if (t.isMemberExpression(callee) && isSuper(callee.object, callee)) {
       // super.test(); -> _get(Object.getPrototypeOf(ClassName.prototype), "test", this).call(this);

lib/babel/transformation/index.js

@@ -31,10 +31,7 @@ transform._ensureTransformerNames = function (type, rawKeys) {
     var deprecatedKey = transform.deprecatedTransformerMap[key];
     if (deprecatedKey) {
       // deprecated key, remap it to the new one
-      console.error(
-        "The transformer " + key + " has been renamed to " + deprecatedKey +
-        " in v3.0.0 - backwards compatibilty will be removed 4.0.0"
-      );
+      console.error("The transformer " + key + " has been renamed to " + deprecatedKey);
       rawKeys.push(deprecatedKey);
     } else if (transform.transformers[key]) {
       // valid key
@@ -44,20 +41,16 @@ transform._ensureTransformerNames = function (type, rawKeys) {
       keys = keys.concat(transform.namespaces[key]);
     } else {
       // invalid key
-      throw new ReferenceError(
-        "Unknown transformer " + key + " specified in " + type + " - " +
-        "transformer key names have been changed in 3.0.0 see " +
-        "the changelog for more info " +
-        "https://github.com/6to5/6to5/blob/master/CHANGELOG.md#300"
-      );
+      throw new ReferenceError("Unknown transformer " + key + " specified in " + type);
     }
   }
 
   return keys;
 };
 
-transform.transformers = object();
-transform.namespaces   = object();
+transform.transformerNamespaces = object();
+transform.transformers          = object();
+transform.namespaces            = object();
 
 transform.deprecatedTransformerMap = require("./transformers/deprecated");
 transform.moduleFormatters = require("./modules");
@@ -66,8 +59,10 @@ var rawTransformers = require("./transformers");
 
 each(rawTransformers, function (transformer, key) {
   var namespace = key.split(".")[0];
+
   transform.namespaces[namespace] = transform.namespaces[namespace] || [];
   transform.namespaces[namespace].push(key);
+  transform.transformerNamespaces[key] = namespace;
 
   transform.transformers[key] = new Transformer(key, transformer);
 });

lib/babel/transformation/modules/_default.js

@@ -2,14 +2,16 @@
 
 module.exports = DefaultFormatter;
 
+var messages = require("../../messages");
+var extend   = require("lodash/object/extend");
 var object   = require("../../helpers/object");
 var util     = require("../../util");
 var t        = require("../../types");
-var extend   = require("lodash/object/extend");
 
 function DefaultFormatter(file) {
-  this.file = file;
-  this.ids  = object();
+  this.scope = file.scope;
+  this.file  = file;
+  this.ids   = object();
 
   this.hasNonDefaultExports = false;
 
@@ -124,13 +126,6 @@ DefaultFormatter.prototype.isLocalReference = function (node) {
   return t.isIdentifier(node) && localImports[node.name] && localImports[node.name] !== node;
 };
 
-DefaultFormatter.prototype.checkLocalReference = function (node) {
-  var file = this.file;
-  if (this.isLocalReference(node)) {
-    throw file.errorWithNode(node, "Illegal assignment of module import");
-  }
-};
-
 DefaultFormatter.prototype.remapExportAssignment = function (node) {
   return t.assignmentExpression(
     "=",
@@ -146,7 +141,7 @@ DefaultFormatter.prototype.remapExportAssignment = function (node) {
 DefaultFormatter.prototype.isLocalReference = function (node, scope) {
   var localExports = this.localExports;
   var name = node.name;
-  return t.isIdentifier(node) && localExports[name] && localExports[name] === scope.getBinding(name);
+  return t.isIdentifier(node) && localExports[name] && localExports[name] === scope.getBindingIdentifier(name);
 };
 
 DefaultFormatter.prototype.getModuleName = function () {
@@ -213,14 +208,11 @@ DefaultFormatter.prototype.getExternalReference = function (node, nodes) {
 
 DefaultFormatter.prototype.checkExportIdentifier = function (node) {
   if (t.isIdentifier(node, { name: "__esModule" })) {
-    throw this.file.errorWithNode(node, "Illegal export __esModule - this is used internally for CommonJS interop");
+    throw this.file.errorWithNode(node, messages.get("modulesIllegalExportName", node.name));
   }
 };
 
 DefaultFormatter.prototype.exportSpecifier = function (specifier, node, nodes) {
-  var inherits = false;
-  if (node.specifiers.length === 1) inherits = node;
-
   if (node.source) {
     var ref = this.getExternalReference(node, nodes);
 

lib/babel/transformation/modules/_strict.js

@@ -4,6 +4,7 @@ var util = require("../../util");
 
 module.exports = function (Parent) {
   var Constructor = function () {
+    this.noInteropRequireImport = true;
     this.noInteropRequireExport = true;
     Parent.apply(this, arguments);
   };

lib/babel/transformation/modules/amd.js

@@ -4,10 +4,10 @@ module.exports = AMDFormatter;
 
 var DefaultFormatter = require("./_default");
 var CommonFormatter  = require("./common");
+var includes         = require("lodash/collection/includes");
+var values           = require("lodash/object/values");
 var util             = require("../../util");
 var t                = require("../../types");
-var contains         = require("lodash/collection/contains");
-var values           = require("lodash/object/values");
 
 function AMDFormatter() {
   CommonFormatter.apply(this, arguments);
@@ -70,7 +70,7 @@ AMDFormatter.prototype.getModuleName = function () {
 };
 
 AMDFormatter.prototype._getExternalReference = function (node) {
-  return this.file.generateUidIdentifier(node.source.value);
+  return this.scope.generateUidIdentifier(node.source.value);
 };
 
 AMDFormatter.prototype.importDeclaration = function (node) {
@@ -81,12 +81,12 @@ AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
   var key = t.getSpecifierName(specifier);
   var ref = this.getExternalReference(node);
 
-  if (contains(this.file.dynamicImported, node)) {
+  if (includes(this.file.dynamicImportedNoDefault, node)) {
     // Prevent unnecessary renaming of dynamic imports.
     this.ids[node.source.value] = ref;
   } else if (t.isImportBatchSpecifier(specifier)) {
     // import * as bar from "foo";
-  } else if (t.isSpecifierDefault(specifier) && !this.noInteropRequireImport) {
+  } else if (!includes(this.file.dynamicImported, node) && t.isSpecifierDefault(specifier) && !this.noInteropRequireImport) {
     // import foo from "foo";
     ref = t.callExpression(this.file.addHelper("interop-require"), [ref]);
   } else {

lib/babel/transformation/modules/common.js

@@ -3,7 +3,7 @@
 module.exports = CommonJSFormatter;
 
 var DefaultFormatter = require("./_default");
-var contains         = require("lodash/collection/contains");
+var includes         = require("lodash/collection/includes");
 var util             = require("../../util");
 var t                = require("../../types");
 
@@ -14,8 +14,15 @@ function CommonJSFormatter() {
 util.inherits(CommonJSFormatter, DefaultFormatter);
 
 CommonJSFormatter.prototype.init = function () {
+  var file  = this.file;
+  var scope = file.scope;
+
+  scope.rename("module");
+
   if (!this.noInteropRequireImport && this.hasNonDefaultExports) {
-    this.file.ast.program.body.push(util.template("exports-module-declaration", true));
+    var templateName = "exports-module-declaration";
+    if (this.file.isLoose("es6.modules")) templateName += "-loose";
+    file.ast.program.body.push(util.template(templateName, true));
   }
 };
 
@@ -26,8 +33,8 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
 
   // import foo from "foo";
   if (t.isSpecifierDefault(specifier)) {
-    if (!contains(this.file.dynamicImported, node)) {
-      if (this.noInteropRequireImport) {
+    if (!includes(this.file.dynamicImportedNoDefault, node)) {
+      if (this.noInteropRequireImport || includes(this.file.dynamicImported, node)) {
         ref = t.memberExpression(ref, t.identifier("default"));
       } else {
         ref = t.callExpression(this.file.addHelper("interop-require"), [ref]);
@@ -88,7 +95,7 @@ CommonJSFormatter.prototype._getExternalReference = function (node, nodes) {
   var call = t.callExpression(t.identifier("require"), [node.source]);
 
   if (this.localImportOccurences[source] > 1) {
-    var uid = this.file.generateUidIdentifier(source);
+    var uid = this.scope.generateUidIdentifier(source);
     nodes.push(t.variableDeclaration("var", [
       t.variableDeclarator(uid, call)
     ]));

lib/babel/transformation/modules/index.js

@@ -0,0 +1,10 @@
+module.exports = {
+  commonStrict: require("./common-strict"),
+  amdStrict:    require("./amd-strict"),
+  umdStrict:    require("./umd-strict"),
+  common:       require("./common"),
+  system:       require("./system"),
+  ignore:       require("./ignore"),
+  amd:          require("./amd"),
+  umd:          require("./umd")
+};