v4.4.3

Links the babel logo in the readme to the home page

.editorconfig

@@ -5,6 +5,7 @@ insert_final_newline = true
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+end_of_line = lf
 
 [*.{js,json}]
 indent_style = space

.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,8 +2,8 @@ sudo: false
 language: node_js
 node_js:
   - "0.10"
-  - "0.11"
   - "0.12"
+  - "iojs"
 
 branches:
   except:

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 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).
+[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
@@ -13,7 +13,7 @@ pollutes the git tree.
 #### 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

LICENSE

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

Makefile

@@ -5,31 +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
-6TO5_CMD = node_modules/6to5/bin/6to5
+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 build-core watch-core
 
 build-core:
-	#node $(6TO5_CMD) src --out-dir lib
+	#node $(BABEL_CMD) src --out-dir lib
 
 watch-core:
-	#node $(6TO5_CMD) src --out-dir lib --watch
+	#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
 
@@ -49,17 +49,16 @@ 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: build-core bootstrap
@@ -71,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
@@ -85,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
@@ -99,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,18 @@
 <p align="center">
-  <img alt="6to5" src="https://raw.githubusercontent.com/6to5/logo/master/logo.png" width="546">
+  <a href="https://babeljs.io/">
+    <img alt="babel" src="https://raw.githubusercontent.com/babel/logo/master/logo.png" width="546">
+  </a>
 </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>
+
+<p align="center">
+  For documentation and website issues please visit the <a href="https://github.com/babel/babel.github.io">babel.github.io</a> repo.
 </p>

bin/6to5-minify

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

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-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/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,10 +11,11 @@ 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");
 
+commander.option("-c, --compact [mode]", "When set to \"auto\" compact is `true` when the input size exceeds 100KB. (auto|true|false)", "auto");
 commander.option("-m, --modules [modules]", "Module formatter type to use [common]", "common");
 commander.option("-l, --whitelist [whitelist]", "Whitelist of transformers to ONLY use", util.list);
 commander.option("-b, --blacklist [blacklist]", "Blacklist of transformers to NOT use", util.list);
@@ -26,6 +27,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 +101,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,22 +113,17 @@ exports.opts = {
   sourceMap:              commander.sourceMaps || commander.sourceMapsInline,
   optional:               commander.optional,
   comments:               !commander.removeComments,
-  runtime:                commander.runtime,
   modules:                commander.modules,
+  compact:                commander.compact,
   loose:                  commander.loose
 };
 
-setTimeout(function () {
-  // this is just a hack to give `6to5-minify` and other files including this
-  // time to modify `exports.opts`
+var fn;
 
-  var fn;
+if (commander.outDir) {
+  fn = require("./dir");
+} else {
+  fn = require("./file");
+}
 
-  if (commander.outDir) {
-    fn = require("./dir");
-  } else {
-    fn = require("./file");
-  }
-
-  fn(commander, filenames, exports.opts);
-}, 0);
+fn(commander, filenames, exports.opts);

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");
 
@@ -26,7 +26,7 @@ exports.transform = function (filename, code, opts) {
 
   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-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/generation/node/whitespace.js

@@ -1,84 +0,0 @@
-"use strict";
-
-var t        = require("../../types");
-var each     = require("lodash/collection/each");
-var map      = require("lodash/collection/map");
-var isNumber = require("lodash/lang/isNumber");
-
-exports.before = {
-  nodes: {
-    Property: function (node, parent) {
-      if (parent.properties[0] === node) {
-        return 1;
-      }
-    },
-
-    SpreadProperty: function (node, parent) {
-      return exports.before.nodes.Property(node, parent);
-    },
-
-    SwitchCase: function (node, parent) {
-      if (parent.cases[0] === node) {
-        return 1;
-      }
-    },
-
-    CallExpression: function (node) {
-      if (t.isFunction(node.callee)) {
-        return 1;
-      }
-    }
-  }
-};
-
-exports.after = {
-  nodes: {
-    LogicalExpression: function (node) {
-      return t.isFunction(node.left) || t.isFunction(node.right);
-    },
-
-    AssignmentExpression: function (node) {
-      if (t.isFunction(node.right)) {
-        return 1;
-      }
-    }
-  },
-
-  list: {
-    VariableDeclaration: function (node) {
-      return map(node.declarations, "init");
-    },
-
-    ArrayExpression: function (node) {
-      return node.elements;
-    },
-
-    ObjectExpression: function (node) {
-      return node.properties;
-    }
-  }
-};
-
-each({
-  Function: 1,
-  Class: 1,
-  For: 1,
-  ArrayExpression: { after: 1 },
-  ObjectExpression: { after: 1 },
-  SwitchStatement: 1,
-  IfStatement: { before: 1 },
-  CallExpression: { after: 1 },
-  Literal: { after: 1 }
-}, function (amounts, type) {
-  if (isNumber(amounts)) {
-    amounts = { after: amounts, before: amounts };
-  }
-
-  each([type].concat(t.FLIPPED_ALIAS_KEYS[type] || []), function (type) {
-    each(amounts, function (amount, key) {
-      exports[key].nodes[type] = function () {
-        return amount;
-      };
-    });
-  });
-});

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/helpers/use-strict.js

@@ -1,21 +0,0 @@
-"use strict";
-
-var t = require("../../types");
-
-exports.has = function (node) {
-  var first = node.body[0];
-  return t.isExpressionStatement(first) && t.isLiteral(first.expression, { value: "use strict" });
-};
-
-exports.wrap = function (node, callback) {
-  var useStrictNode;
-  if (exports.has(node)) {
-    useStrictNode = node.body.shift();
-  }
-
-  callback();
-
-  if (useStrictNode) {
-    node.body.unshift(useStrictNode);
-  }
-};

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/tail-call-body.js

@@ -1,3 +0,0 @@
-{
-  FUNCTION_ID:while (true) BLOCK
-}

lib/6to5/transformation/templates/tail-call.js

@@ -1,23 +0,0 @@
-(function () {
-  function Tail(func, args, context) {
-    this.func = func;
-    this.args = args;
-    this.context = context;
-  }
-
-  Tail.prototype._isTailDescriptor = true;
-
-  var isRunning = false;
-
-  return function (func, args, context) {
-    var result = new Tail(func, args, context);
-    if (!isRunning) {
-      isRunning = true;
-      do {
-        result = result.func.apply(result.context, result.args);
-      } while (result instanceof Tail || (result && result._isTailDescriptor));
-      isRunning = false;
-    }
-    return result;
-  };
-})()

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/internal/block-hoist.js

@@ -1,36 +0,0 @@
-"use strict";
-
-var useStrict = require("../../helpers/use-strict");
-var groupBy   = require("lodash/collection/groupBy");
-var flatten   = require("lodash/array/flatten");
-var values    = require("lodash/object/values");
-
-// Priority:
-//
-//  - 0 We want this to be at the **very** bottom
-//  - 1 Default node position
-//  - 2 Priority over normal nodes
-//  - 3 We want this to be at the **very** top
-
-exports.BlockStatement =
-exports.Program = {
-  exit: function (node) {
-    var hasChange = false;
-    for (var i = 0; i < node.body.length; i++) {
-      var bodyNode = node.body[i];
-      if (bodyNode && bodyNode._blockHoist != null) hasChange = true;
-    }
-    if (!hasChange) return;
-
-    useStrict.wrap(node, function () {
-      var nodePriorities = groupBy(node.body, function (bodyNode) {
-        var priority = bodyNode._blockHoist;
-        if (priority == null) priority = 1;
-        if (priority === true) priority = 2;
-        return priority;
-      });
-
-      node.body = flatten(values(nodePriorities).reverse());
-    });
-  }
-};

lib/6to5/transformation/transformers/internal/declarations.js

@@ -1,36 +0,0 @@
-"use strict";
-
-var useStrict = require("../../helpers/use-strict");
-var t         = require("../../../types");
-
-exports.secondPass = true;
-
-exports.BlockStatement =
-exports.Program = function (node) {
-  if (!node._declarations) return;
-
-  var kinds = {};
-  var kind;
-
-  useStrict.wrap(node, function () {
-    for (var i in node._declarations) {
-      var declar = node._declarations[i];
-
-      kind = declar.kind || "var";
-      var declarNode = t.variableDeclarator(declar.id, declar.init);
-
-      if (!declar.init) {
-        kinds[kind] = kinds[kind] || [];
-        kinds[kind].push(declarNode);
-      } else {
-        node.body.unshift(t.variableDeclaration(kind, [declarNode]));
-      }
-    }
-
-    for (kind in kinds) {
-      node.body.unshift(t.variableDeclaration(kind, kinds[kind]));
-    }
-  });
-
-  node._declarations = null;
-};

lib/6to5/transformation/transformers/other/react.js

@@ -1,20 +0,0 @@
-"use strict";
-
-var react = require("../../helpers/react");
-var t     = require("../../../types");
-
-require("../../helpers/build-react-transformer")(exports, {
-  pre: function (state) {
-    var tagName = state.tagName;
-    var args    = state.args;
-    if (react.isCompatTag(tagName)) {
-      args.push(t.literal(tagName));
-    } else {
-      args.push(state.tagExpr);
-    }
-  },
-
-  post: function (state) {
-    state.callee = t.memberExpression(t.identifier("React"), t.identifier("createElement"));
-  }
-});

lib/6to5/transformation/transformers/other/use-strict.js

@@ -1,19 +0,0 @@
-"use strict";
-
-var useStrict = require("../../helpers/use-strict");
-var t         = require("../../../types");
-
-exports.Program = function (program) {
-  if (!useStrict.has(program)) {
-    program.body.unshift(t.expressionStatement(t.literal("use strict")));
-  }
-};
-
-exports.FunctionDeclaration =
-exports.FunctionExpression = function () {
-  this.skip();
-};
-
-exports.ThisExpression = function () {
-  return t.identifier("undefined");
-};

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/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 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);
   }
 };
 
@@ -58,13 +59,13 @@ Buffer.prototype.keyword = function (name) {
 
 Buffer.prototype.space = function () {
   if (this.format.compact) return;
-
-  if (this.buf && !this.isLast([" ", "\n"])) {
+  if (this.buf && !this.isLast(" ") && !this.isLast("\n")) {
     this.push(" ");
   }
 };
 
 Buffer.prototype.removeLast = function (cha) {
+  if (this.format.compact) return;
   if (!this.isLast(cha)) return;
 
   this.buf = this.buf.substr(0, this.buf.length - 1);
@@ -72,7 +73,9 @@ Buffer.prototype.removeLast = function (cha) {
 };
 
 Buffer.prototype.newline = function (i, removeLast) {
-  if (this.format.compact || this.format.concise) {
+  if (this.format.compact) return;
+
+  if (this.format.concise) {
     this.space();
     return;
   }
@@ -80,11 +83,14 @@ Buffer.prototype.newline = function (i, removeLast) {
   removeLast = removeLast || false;
 
   if (isNumber(i)) {
-    if (this.endsWith("{\n")) i--;
-    if (this.endsWith(util.repeat(i, "\n"))) return;
+    i = Math.min(2, i);
 
-    while (i--) {
+    if (this.endsWith("{\n") || this.endsWith(":\n")) i--;
+    if (i <= 0) return;
+
+    while (i > 0) {
       this._newline(removeLast);
+      i--;
     }
     return;
   }
@@ -97,11 +103,13 @@ Buffer.prototype.newline = function (i, removeLast) {
 };
 
 Buffer.prototype._newline = function (removeLast) {
+  // never allow more than two lines
+  if (this.endsWith("\n\n")) return;
+
+  // remove the last newline
   if (removeLast && this.isLast("\n")) this.removeLast("\n");
 
   this.removeLast(" ");
-
-  // remove whitespace if last character was a newline
   this._removeSpacesAfterLastNewline();
   this._push("\n");
 };
@@ -109,6 +117,7 @@ Buffer.prototype._newline = function (removeLast) {
 /**
  * If buffer ends with a newline and some spaces after it, trim those spaces.
  */
+
 Buffer.prototype._removeSpacesAfterLastNewline = function () {
   var lastNewlineIndex = this.buf.lastIndexOf("\n");
   if (lastNewlineIndex === -1)
@@ -129,7 +138,7 @@ Buffer.prototype._removeSpacesAfterLastNewline = function () {
 };
 
 Buffer.prototype.push = function (str, noIndent) {
-  if (this._indent && !noIndent && str !== "\n") {
+  if (!this.format.compact && this._indent && !noIndent && str !== "\n") {
     // we have an indent level and we aren't pushing a newline
     var indent = this.getIndent();
 
@@ -137,7 +146,7 @@ Buffer.prototype.push = function (str, noIndent) {
     str = str.replace(/\n/g, "\n" + indent);
 
     // we've got a newline before us so prepend on the indentation
-    if (this.isLast("\n")) str = indent + str;
+    if (this.isLast("\n")) this._push(indent);
   }
 
   this._push(str);
@@ -149,13 +158,13 @@ Buffer.prototype._push = function (str) {
 };
 
 Buffer.prototype.endsWith = function (str) {
-  var d = this.buf.length - str.length;
-  return d >= 0 && this.buf.lastIndexOf(str) === d;
+  return this.buf.slice(-str.length) === str;
 };
 
-Buffer.prototype.isLast = function (cha, trimRight) {
+Buffer.prototype.isLast = function (cha) {
+  if (this.format.compact) return false;
+
   var buf = this.buf;
-  if (trimRight) buf = util.trimRight(buf);
   var last = buf[buf.length - 1];
 
   if (Array.isArray(cha)) {

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);
@@ -46,11 +46,9 @@ exports.ConditionalExpression = function (node, print) {
 exports.NewExpression = function (node, print) {
   this.push("new ");
   print(node.callee);
-  if (node.arguments.length || this.format.parentheses) {
-    this.push("(");
-    print.list(node.arguments);
-    this.push(")");
-  }
+  this.push("(");
+  print.list(node.arguments);
+  this.push(")");
 };
 
 exports.SequenceExpression = function (node, print) {
@@ -146,7 +144,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/modules.js

@@ -62,6 +62,10 @@ exports.ImportDeclaration = function (node, print) {
 
   this.push("import ");
 
+  if (node.isType) {
+    this.push("type ");
+  }
+
   var specfiers = node.specifiers;
   if (specfiers && specfiers.length) {
     var foundImportSpecifier = false;

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");
@@ -22,12 +22,7 @@ exports.IfStatement = function (node, print) {
 
   if (node.alternate) {
     if (this.isLast("}")) this.space();
-    this.keyword("else");
-
-    if (this.format.format && !t.isBlockStatement(node.alternate)) {
-      this.push(" ");
-    }
-
+    this.push("else ");
     print.indentOnComments(node.alternate);
   }
 };
@@ -153,7 +148,14 @@ exports.SwitchStatement = function (node, print) {
   this.push(")");
   this.space();
   this.push("{");
-  print.sequence(node.cases, { indent: true });
+
+  print.sequence(node.cases, {
+    indent: true,
+    addNewlines: function (leading, cas) {
+      if (!leading && node.cases[node.cases.length - 1] === cas) return -1;
+    }
+  });
+
   this.push("}");
 };
 
@@ -166,8 +168,10 @@ exports.SwitchCase = function (node, print) {
     this.push("default:");
   }
 
-  this.newline();
-  print.sequence(node.consequent, { indent: true });
+  if (node.consequent.length) {
+    this.newline();
+    print.sequence(node.consequent, { indent: true });
+  }
 };
 
 exports.DebuggerStatement = function () {
@@ -189,8 +193,8 @@ exports.VariableDeclaration = function (node, print, parent) {
   }
 
   var sep = ",";
-  if (hasInits) {
-    sep += "\n" + util.repeat(node.kind.length + 1);
+  if (!this.format.compact && hasInits) {
+    sep += "\n" + repeating(" ", node.kind.length + 1);
   } else {
     sep += " ";
   }

lib/babel/generation/generators/types.js

@@ -72,7 +72,7 @@ exports.ArrayPattern = function (node, print) {
       // both (all) of the holes.
       self.push(",");
     } else {
-      if (i > 0 && !self.format.compact) self.push(" ");
+      if (i > 0) self.push(" ");
       print(elem);
       if (i < len - 1) self.push(",");
     }

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 messages     = require("../messages");
 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");
 
@@ -28,7 +28,7 @@ function CodeGenerator(ast, opts, code) {
   this.opts     = opts;
   this.ast      = ast;
 
-  this.whitespace = new Whitespace(this.tokens, this.comments);
+  this.whitespace = new Whitespace(this.tokens, this.comments, this.format);
   this.position   = new Position;
   this.map        = new SourceMap(this.position, opts, code);
   this.buffer     = new Buffer(this.position, this.format);
@@ -47,17 +47,25 @@ CodeGenerator.normalizeOptions = function (code, opts) {
     if (indent && indent !== " ") style = indent;
   }
 
-  return merge({
-    parentheses: true,
+  var format = {
     comments: opts.comments == null || opts.comments,
-    compact: false,
-    concise: false,
+    compact: opts.compact,
     indent: {
       adjustMultilineComment: true,
       style: style,
       base: 0
     }
-  }, opts.format || {});
+  };
+
+  if (format.compact === "auto") {
+    format.compact = code.length > 100000; // 100KB
+
+    if (format.compact) {
+      console.error(messages.get("codeGeneratorDeopt", opts.filename, "100KB"));
+    }
+  }
+
+  return format;
 };
 
 CodeGenerator.generators = {
@@ -115,11 +123,7 @@ CodeGenerator.prototype.buildPrint = function (parent) {
 
   print.list = function (items, opts) {
     opts = opts || {};
-
-    var sep = opts.separator || ", ";
-    if (self.format.compact) sep = ",";
-    opts.separator = sep;
-
+    opts.separator = opts.separator || ", ";
     print.join(items, opts);
   };
 
@@ -167,13 +171,14 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
     } else {
       // generated node
       if (!leading) lines++; // always include at least a single line after
+      if (opts.addNewlines) lines += opts.addNewlines(leading, node) || 0;
 
       var needs = n.needsWhitespaceAfter;
       if (leading) needs = n.needsWhitespaceBefore;
-      lines += needs(node, parent);
+      if (needs(node, parent)) lines++;
 
       // generated nodes can't add starting file whitespace
-      if (!self.buffer.get()) lines = 0;
+      if (!self.buffer.buf) lines = 0;
     }
 
     self.newline(lines);
@@ -227,6 +232,7 @@ CodeGenerator.prototype.printJoin = function (print, nodes, opts) {
   each(nodes, function (node, i) {
     print(node, {
       statement: opts.statement,
+      addNewlines: opts.addNewlines,
       after: function () {
         if (opts.iterator) {
           opts.iterator(node, i);
@@ -302,6 +308,7 @@ CodeGenerator.prototype._getComments = function (key, node) {
 
 CodeGenerator.prototype._printComments = function (comments) {
   if (this.format.compact) return;
+
   if (!this.format.comments) return;
   if (!comments || !comments.length) return;
 
@@ -344,7 +351,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/node/index.js

@@ -4,9 +4,9 @@ module.exports = Node;
 
 var whitespace = require("./whitespace");
 var parens     = require("./parentheses");
-var t          = require("../../types");
 var each       = require("lodash/collection/each");
 var some       = require("lodash/collection/some");
+var t          = require("../../types");
 
 var find = function (obj, node, parent) {
   if (!obj) return;
@@ -42,14 +42,19 @@ Node.needsWhitespace = function (node, parent, type) {
     node = node.expression;
   }
 
-  var lines = find(whitespace[type].nodes, node, parent);
-  if (lines) return lines;
+  var linesInfo = find(whitespace.nodes, node, parent);
 
-  each(find(whitespace[type].list, node, parent), function (expr) {
-    lines = Node.needsWhitespace(expr, node, type);
-    if (lines) return false;
-  });
-  return lines || 0;
+  if (!linesInfo) {
+    var items = find(whitespace.list, node, parent);
+    if (items) {
+      for (var i = 0; i < items.length; i++) {
+        linesInfo = Node.needsWhitespace(items[i], node, type);
+        if (linesInfo) break;
+      }
+    }
+  }
+
+  return (linesInfo && linesInfo[type]) || 0;
 };
 
 Node.needsWhitespaceBefore = function (node, parent) {

lib/babel/generation/node/whitespace.js

@@ -0,0 +1,159 @@
+"use strict";
+
+var isBoolean = require("lodash/lang/isBoolean");
+var each      = require("lodash/collection/each");
+var map       = require("lodash/collection/map");
+var t         = require("../../types");
+
+var crawl = function (node, state) {
+  state = state || {};
+
+  if (t.isMemberExpression(node)) {
+    crawl(node.object, state);
+    if (node.computed) crawl(node.property, state);
+  } else if (t.isBinary(node) || t.isAssignmentExpression(node)) {
+    crawl(node.left, state);
+    crawl(node.right, state);
+  } else if (t.isCallExpression(node)) {
+    state.hasCall = true;
+    crawl(node.callee, state);
+  } else if (t.isFunction(node)) {
+    state.hasFunction = true;
+  } else if (t.isIdentifier(node)) {
+    state.hasHelper = state.hasHelper || isHelper(node.callee);
+  }
+
+  return state;
+};
+
+var isHelper = function (node) {
+  if (t.isMemberExpression(node)) {
+    return isHelper(node.object) || isHelper(node.property);
+  } else if (t.isIdentifier(node)) {
+    return node.name === "require" || node.name[0] === "_";
+  } else if (t.isCallExpression(node)) {
+    return isHelper(node.callee);
+  } else if (t.isBinary(node) || t.isAssignmentExpression(node)) {
+    return (t.isIdentifier(node.left) && isHelper(node.left)) || isHelper(node.right);
+  } else {
+    return false;
+  }
+};
+
+var isType = function (node) {
+  return t.isLiteral(node) || t.isObjectExpression(node) || t.isArrayExpression(node) ||
+         t.isIdentifier(node) || t.isMemberExpression(node);
+};
+
+exports.nodes = {
+  AssignmentExpression: function (node) {
+    var state = crawl(node.right);
+    if ((state.hasCall && state.hasHelper) || state.hasFunction) {
+      return {
+        before: state.hasFunction,
+        after: true
+      };
+    }
+  },
+
+  SwitchCase: function (node, parent) {
+    return {
+      before: node.consequent.length || parent.cases[0] === node
+    };
+  },
+
+  LogicalExpression: function (node) {
+    if (t.isFunction(node.left) || t.isFunction(node.right)) {
+      return {
+        after: true
+      };
+    }
+  },
+
+  Literal: function (node) {
+    if (node.value === "use strict") {
+      return {
+        after: true
+      };
+    }
+  },
+
+  CallExpression: function (node) {
+    if (t.isFunction(node.callee) || isHelper(node)) {
+      return {
+        before: true,
+        after: true
+      };
+    }
+  },
+
+  VariableDeclaration: function (node) {
+    for (var i = 0; i < node.declarations.length; i++) {
+      var declar = node.declarations[i];
+
+      var enabled = isHelper(declar.id) && !isType(declar.init);
+      if (!enabled) {
+        var state = crawl(declar.init);
+        enabled = (isHelper(declar.init) && state.hasCall) || state.hasFunction;
+      }
+
+      if (enabled) {
+        return {
+          before: true,
+          after: true
+        };
+      }
+    }
+  },
+
+  IfStatement: function (node) {
+    if (t.isBlockStatement(node.consequent)) {
+      return {
+        before: true,
+        after: true
+      };
+    }
+  }
+};
+
+exports.nodes.Property =
+exports.nodes.SpreadProperty = function (node, parent) {
+  if (parent.properties[0] === node) {
+    return {
+      before: true
+    };
+  }
+};
+
+exports.list = {
+  VariableDeclaration: function (node) {
+    return map(node.declarations, "init");
+  },
+
+  ArrayExpression: function (node) {
+    return node.elements;
+  },
+
+  ObjectExpression: function (node) {
+    return node.properties;
+  }
+};
+
+each({
+  Function: true,
+  Class: true,
+  Loop: true,
+  LabeledStatement: true,
+  SwitchStatement: true,
+  TryStatement: true
+}, function (amounts, type) {
+  if (isBoolean(amounts)) {
+    amounts = { after: amounts, before: amounts };
+  }
+
+  each([type].concat(t.FLIPPED_ALIAS_KEYS[type] || []), function (type) {
+    exports.nodes[type] = function () {
+      return amounts;
+    };
+  });
+});

lib/babel/generation/whitespace.js

@@ -13,11 +13,13 @@ var sortBy = require("lodash/collection/sortBy");
  * @param {Number} max Array length
  * @returns {Number} shiftedIndex
  */
+
 function getLookupIndex(i, base, max) {
   i += base;
 
-  if (i >= max)
+  if (i >= max) {
     i -= max;
+  }
 
   return i;
 }
@@ -82,7 +84,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 +98,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

@@ -9,13 +9,16 @@ exports.messages = {
   scopeDuplicateDeclaration: "Duplicate declaration $1",
   undeclaredVariable: "Reference to undeclared variable $1",
   undeclaredVariableSuggestion: "Reference to undeclared variable $1 - did you mean $2?",
-  settersInvalidParamLength: "Setters must have only one parameter",
+  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"
+  unknownForHead: "Unknown node type $1 in ForStatement",
+  didYouMean: "Did you mean $1?",
+  evalInStrictMode: "eval is not allowed in strict mode",
+  codeGeneratorDeopt: "Note: The code generator has deoptimised the styling of $1 as it exceeds the max of $2."
 };
 
 exports.get = function (key) {

lib/babel/patch.js

@@ -8,7 +8,7 @@ var t      = require("./types");
 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,20 +2,21 @@
 
 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 includes   = require("lodash/collection/includes");
-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.dynamicImportedNoDefault = [];
@@ -59,7 +60,7 @@ File.helpers = [
   "object-destructuring-empty",
   "temporal-undefined",
   "temporal-assert-defined",
-  "tail-call"
+  "self-global"
 ];
 
 File.validOptions = [
@@ -81,11 +82,17 @@ File.validOptions = [
   "keepModuleIdExtensions",
   "code",
   "ast",
-  "format",
   "playground",
   "experimental",
+  "externalHelpers",
+  "auxiliaryComment",
+  "compact",
+
   "resolveModuleSource",
-  "runtime",
+  "moduleId",
+
+  // legacy
+  "format",
 
   // these are used by plugins
   "ignore",
@@ -95,7 +102,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) {
@@ -106,10 +113,11 @@ File.prototype.normalizeOptions = function (opts) {
   defaults(opts, {
     keepModuleIdExtensions: false,
     resolveModuleSource:    null,
+    externalHelpers:        false,
+    auxilaryComment:        "",
     experimental:           false,
     reactCompat:            false,
     playground:             false,
-    whitespace:             true,
     moduleIds:              false,
     blacklist:              [],
     whitelist:              [],
@@ -118,16 +126,20 @@ File.prototype.normalizeOptions = function (opts) {
     comments:               true,
     filename:               "unknown",
     modules:                "common",
-    runtime:                false,
+    compact:                "auto",
     loose:                  [],
     code:                   true,
     ast:                    true
   });
 
   // normalize windows path separators to unix
-  opts.filename = util.normalisePathSeparator(opts.filename);
+  opts.filename = slash(opts.filename);
   if (opts.sourceRoot) {
-    opts.sourceRoot = util.normalisePathSeparator(opts.sourceRoot);
+    opts.sourceRoot = slash(opts.sourceRoot);
+  }
+
+  if (opts.moduleId) {
+    opts.moduleIds = true;
   }
 
   opts.basename = path.basename(opts.filename, path.extname(opts.filename));
@@ -135,6 +147,7 @@ File.prototype.normalizeOptions = function (opts) {
   opts.blacklist = util.arrayify(opts.blacklist);
   opts.whitelist = util.arrayify(opts.whitelist);
   opts.optional  = util.arrayify(opts.optional);
+  opts.compact   = util.booleanify(opts.compact);
   opts.loose     = util.arrayify(opts.loose);
 
   if (includes(opts.loose, "all") || includes(opts.loose, true)) {
@@ -162,8 +175,8 @@ File.prototype.normalizeOptions = function (opts) {
     opts.experimental = true;
   }
 
-  if (opts.runtime) {
-    this.set("runtimeIdentifier", t.identifier("to5Runtime"));
+  if (opts.externalHelpers) {
+    this.set("helpersNamespace", t.identifier("babelHelpers"));
   }
 
   opts.blacklist = transform._ensureTransformerNames("blacklist", opts.blacklist);
@@ -173,8 +186,7 @@ File.prototype.normalizeOptions = function (opts) {
 
   if (opts.reactCompat) {
     opts.optional.push("reactCompat");
-    console.error("The reactCompat option has been moved into the optional transformer " +
-                  "`reactCompat` - backwards compatibility will be removed in v4.0.0");
+    console.error("The reactCompat option has been moved into the optional transformer `reactCompat`");
   }
 
   var ensureEnabled = function (key) {
@@ -243,12 +255,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;
@@ -298,6 +311,18 @@ 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 (!includes(File.helpers, name)) {
     throw new ReferenceError("Unknown helper " + name);
@@ -308,7 +333,7 @@ File.prototype.addHelper = function (name) {
   var declar = program._declarations && program._declarations[name];
   if (declar) return declar.id;
 
-  var runtime = this.get("runtimeIdentifier");
+  var runtime = this.get("helpersNamespace");
   if (runtime) {
     name = t.identifier(t.toIdentifier(name));
     return t.memberExpression(runtime, name);
@@ -352,7 +377,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);
@@ -440,7 +465,7 @@ File.prototype.generate = function () {
   }
 
   if (opts.sourceMap === "inline") {
-    result.code += "\n" + util.sourceMapToComment(result.map);
+    result.code += "\n" + sourceMapToComment(result.map);
     result.map = null;
   }
 

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

@@ -73,7 +73,7 @@ module.exports = function (exports, opts) {
       };
 
       if (opts.pre) {
-        opts.pre(state);
+        opts.pre(state, file);
       }
 
       var attribs = node.attributes;
@@ -86,7 +86,7 @@ module.exports = function (exports, opts) {
       args.push(attribs);
 
       if (opts.post) {
-        opts.post(state);
+        opts.post(state, file);
       }
 
       return state.call || t.callExpression(state.callee, args);

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,12 +41,7 @@ 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);
     }
   }
 

lib/babel/transformation/modules/_default.js

@@ -146,6 +146,8 @@ DefaultFormatter.prototype.isLocalReference = function (node, scope) {
 
 DefaultFormatter.prototype.getModuleName = function () {
   var opts = this.file.opts;
+  if (opts.moduleId) return opts.moduleId;
+
   var filenameRelative = opts.filenameRelative;
   var moduleName = "";
 

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/common.js

@@ -20,7 +20,9 @@ CommonJSFormatter.prototype.init = function () {
   scope.rename("module");
 
   if (!this.noInteropRequireImport && this.hasNonDefaultExports) {
-    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));
   }
 };
 

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")
+};