v4.4.5

- Support hexadecimal, octal and binary number literals, template strings, and
  tokenize everything more robustly in general.
- Tokens spanning over several lines (such as multiline strings and comments) no
  longer leak their color into the line number gutter.
- The color scheme is preserved.
- The line numbers are now right-aligned instead of left-aligned, since that's
  how practically every editor does it.
- Superfluos space in the line number gutter has been removed.

.babelrc

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

.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,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:
@@ -113,5 +119,5 @@ publish-core:
 bootstrap:
 	npm install
 	git submodule update --init
-	cd vendor/regenerator; npm install
-	cd vendor/compat-table; npm install object-assign
+	cd vendor/regenerator && npm install
+	cd vendor/compat-table && npm install object-assign

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,19 @@
 <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 questions
+  and support please visit the <a href="https://gitter.im/babel/babel">gitter room</a> before
+  creating an issue.
+</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>

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-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,
@@ -49,7 +50,10 @@ var _eval = function (code, filename) {
     experimental: program.experimental,
     playground: program.playground
   }).code;
-  return vm.runInThisContext(code, filename);
+
+  return vm.runInThisContext(code, {
+    filename: filename
+  });
 };
 
 if (program.eval || program.print) {
@@ -60,7 +64,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 +89,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/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,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");
 
@@ -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-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/code-frame.js

@@ -1,79 +0,0 @@
-// 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 defs = {
-  string1:  "red",
-  string2:  "red",
-  punct:    ["white", "bold"],
-  curly:    "green",
-  parens:   ["blue", "bold"],
-  square:   ["yellow"],
-  name:     "white",
-  keyword:  ["cyan"],
-  number:   "magenta",
-  regexp:   "magenta",
-  comment1: "grey",
-  comment2: "grey"
-};
-
-var highlight = function (text) {
-  var colorize = function (str, col) {
-    if (!col) return str;
-
-    if (Array.isArray(col)) {
-      col.forEach(function (col) {
-        str = chalk[col](str);
-      });
-    } else {
-      str = chalk[col](str);
-    }
-    return str;
-  };
-
-  return tokenize(text, true).map(function (str) {
-    var type = tokenize.type(str);
-    return colorize(str, defs[type]);
-  }).join("");
-};
-
-module.exports = function (lines, lineNumber, colNumber) {
-  colNumber = Math.max(colNumber, 0);
-
-  if (supportsColor) {
-    lines = highlight(lines);
-  }
-
-  lines = lines.split(/\r\n|[\n\r\u2028\u2029]/);
-
-  var start = Math.max(lineNumber - 3, 0);
-  var end   = Math.min(lines.length, lineNumber + 3);
-  var width = (end + "").length;
-
-  if (!lineNumber && !colNumber) {
-    start = 0;
-    end = lines.length;
-  }
-
-  return "\n" + lines.slice(start, end).map(function (line, i) {
-    var curr = i + start + 1;
-
-    var gutter = curr === lineNumber ? "> " : "  ";
-
-    var sep = curr + util.repeat(width + 1);
-    gutter += sep + "| ";
-
-    var str = gutter + line;
-
-    if (colNumber && curr === lineNumber) {
-      str += "\n";
-      str += util.repeat(gutter.length - 2);
-      str += "|" + util.repeat(colNumber) + "^";
-    }
-
-    return str;
-  }).join("\n");
-};

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/name-method.js

@@ -1,50 +0,0 @@
-"use strict";
-
-var util = require("../../util");
-var t    = require("../../types");
-
-var visitor = {
-  enter: function (node, parent, scope, state) {
-    // check if this node is an identifier that matches the same as our function id
-    if (!t.isIdentifier(node, { name: state.id })) return;
-
-    // check if this node is the one referenced
-    if (!t.isReferenced(node, parent)) return;
-
-    // check that we don't have a local variable declared as that removes the need
-    // for the wrapper
-    var localDeclar = scope.getBinding(state.id);
-    if (localDeclar !== state.outerDeclar) return;
-
-    state.selfReference = true;
-    this.stop();
-  }
-};
-
-exports.property = function (node, file, scope) {
-  var key = t.toComputedKey(node, node.key);
-  if (!t.isLiteral(key)) return node; // we can't set a function id with this
-
-  var id = t.toIdentifier(key.value);
-  key = t.identifier(id);
-
-  var state = {
-    id: id,
-    selfReference: false,
-    outerDeclar: scope.getBinding(id),
-  };
-
-  scope.traverse(node, visitor, state);
-
-  if (state.selfReference) {
-    // todo: support generators
-    node.value = util.template("property-method-assignment-wrapper", {
-      FUNCTION: node.value,
-      FUNCTION_ID: key,
-      FUNCTION_KEY: scope.generateUidIdentifier(id),
-      WRAPPER_KEY: scope.generateUidIdentifier(id + "Wrapper")
-    });
-  } else {
-    node.value.id = key;
-  }
-};

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

@@ -1,21 +0,0 @@
-(function () {
-  function Tail(func, args, context) {
-    this.func = func;
-    this.args = args;
-    this.context = context;
-  }
-
-  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);
-      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/es6/destructuring.js

@@ -1,394 +0,0 @@
-"use strict";
-
-var t = require("../../../types");
-
-exports.check = t.isPattern;
-
-function Destructuring(opts) {
-  this.blockHoist = opts.blockHoist;
-  this.operator   = opts.operator;
-  this.nodes      = opts.nodes;
-  this.scope      = opts.scope;
-  this.file       = opts.file;
-  this.kind       = opts.kind;
-}
-
-Destructuring.prototype.buildVariableAssignment = function (id, init) {
-  var op = this.operator;
-  if (t.isMemberExpression(id)) op = "=";
-
-  var node;
-
-  if (op) {
-    node = t.expressionStatement(t.assignmentExpression(op, id, init));
-  } else {
-    node = t.variableDeclaration(this.kind, [
-      t.variableDeclarator(id, init)
-    ]);
-  }
-
-  node._blockHoist = this.blockHoist;
-
-  return node;
-};
-
-Destructuring.prototype.buildVariableDeclaration = function (id, init) {
-  var declar = t.variableDeclaration("var", [
-    t.variableDeclarator(id, init)
-  ]);
-  declar._blockHoist = this.blockHoist;
-  return declar;
-};
-
-Destructuring.prototype.push = function (elem, parentId) {
-  if (t.isObjectPattern(elem)) {
-    this.pushObjectPattern(elem, parentId);
-  } else if (t.isArrayPattern(elem)) {
-    this.pushArrayPattern(elem, parentId);
-  } else if (t.isAssignmentPattern(elem)) {
-    this.pushAssignmentPattern(elem, parentId);
-  } else {
-    this.nodes.push(this.buildVariableAssignment(elem, parentId));
-  }
-};
-
-Destructuring.prototype.pushAssignmentPattern = function (pattern, parentId) {
-  var tempParentId = this.scope.generateUidBasedOnNode(parentId);
-
-  var declar = t.variableDeclaration("var", [
-    t.variableDeclarator(tempParentId, parentId)
-  ]);
-  declar._blockHoist = this.blockHoist;
-  this.nodes.push(declar);
-
-  this.nodes.push(this.buildVariableAssignment(
-    pattern.left,
-    t.conditionalExpression(
-      t.binaryExpression("===", tempParentId, t.identifier("undefined")),
-      pattern.right,
-      tempParentId
-    )
-  ));
-};
-
-Destructuring.prototype.pushObjectSpread = function (pattern, parentId, prop, i) {
-  // get all the keys that appear in this object before the current spread
-  var keys = [];
-  for (var i2 = 0; i2 < pattern.properties.length; i2++) {
-    var prop2 = pattern.properties[i2];
-
-    if (i2 >= i) break;
-    if (t.isSpreadProperty(prop2)) continue;
-
-    var key = prop2.key;
-    if (t.isIdentifier(key)) {
-      key = t.literal(prop2.key.name);
-    }
-    keys.push(key);
-  }
-  keys = t.arrayExpression(keys);
-
-  var value = t.callExpression(this.file.addHelper("object-without-properties"), [parentId, keys]);
-  this.nodes.push(this.buildVariableAssignment(prop.argument, value));
-};
-
-Destructuring.prototype.pushObjectProperty = function (prop, parentId) {
-  if (t.isLiteral(prop.key)) prop.computed = true;
-
-  var pattern2   = prop.value;
-  var patternId2 = t.memberExpression(parentId, prop.key, prop.computed);
-
-  if (t.isPattern(pattern2)) {
-    this.push(pattern2, patternId2);
-  } else {
-    this.nodes.push(this.buildVariableAssignment(pattern2, patternId2));
-  }
-};
-
-Destructuring.prototype.pushObjectPattern = function (pattern, parentId) {
-  if (!pattern.properties.length) {
-    this.nodes.push(t.expressionStatement(
-      t.callExpression(this.file.addHelper("object-destructuring-empty"), [parentId])
-    ));
-  }
-
-  for (var i = 0; i < pattern.properties.length; i++) {
-    var prop = pattern.properties[i];
-    if (t.isSpreadProperty(prop)) {
-      this.pushObjectSpread(pattern, parentId, prop, i);
-    } else {
-      this.pushObjectProperty(prop, parentId);
-    }
-  }
-};
-
-var hasRest = function (pattern) {
-  for (var i = 0; i < pattern.elements.length; i++) {
-    if (t.isRestElement(pattern.elements[i])) {
-      return true;
-    }
-  }
-  return false;
-};
-
-Destructuring.prototype.pushArrayPattern = function (pattern, parentId) {
-  if (!pattern.elements) return;
-
-  // if we have a rest then we need all the elements
-  var count = !hasRest(pattern) && pattern.elements.length;
-
-  var toArray = this.file.toArray(parentId, count);
-
-  var _parentId = this.scope.generateUidBasedOnNode(parentId, this.file);
-  this.nodes.push(this.buildVariableDeclaration(_parentId, toArray));
-  parentId = _parentId;
-
-  for (var i = 0; i < pattern.elements.length; i++) {
-    var elem = pattern.elements[i];
-
-    // hole
-    if (!elem) continue;
-
-    var newPatternId;
-
-    if (t.isRestElement(elem)) {
-      newPatternId = this.file.toArray(parentId);
-
-      if (i > 0) {
-        newPatternId = t.callExpression(t.memberExpression(newPatternId, t.identifier("slice")), [t.literal(i)]);
-      }
-
-      elem = elem.argument;
-    } else {
-      newPatternId = t.memberExpression(parentId, t.literal(i), true);
-    }
-
-    this.push(elem, newPatternId);
-  }
-};
-
-Destructuring.prototype.init = function (pattern, parentId) {
-  if (!t.isArrayExpression(parentId) && !t.isMemberExpression(parentId) && !t.isIdentifier(parentId)) {
-    var key = this.scope.generateUidBasedOnNode(parentId);
-    this.nodes.push(this.buildVariableDeclaration(key, parentId));
-    parentId = key;
-  }
-
-  this.push(pattern, parentId);
-};
-
-exports.ForInStatement =
-exports.ForOfStatement = function (node, parent, scope, file) {
-  var left = node.left;
-
-  if (t.isPattern(left)) {
-    // for ({ length: k } in { abc: 3 });
-
-    var temp = scope.generateUidIdentifier("ref");
-
-    node.left = t.variableDeclaration("var", [
-      t.variableDeclarator(temp)
-    ]);
-
-    t.ensureBlock(node);
-
-    node.body.body.unshift(t.variableDeclaration("var", [
-      t.variableDeclarator(left, temp)
-    ]));
-
-    return;
-  }
-
-  if (!t.isVariableDeclaration(left)) return;
-
-  var pattern = left.declarations[0].id;
-  if (!t.isPattern(pattern)) return;
-
-  var key = scope.generateUidIdentifier("ref");
-  node.left = t.variableDeclaration(left.kind, [
-    t.variableDeclarator(key, null)
-  ]);
-
-  var nodes = [];
-
-  var destructuring = new Destructuring({
-    kind: left.kind,
-    file: file,
-    scope: scope,
-    nodes: nodes
-  });
-
-  destructuring.init(pattern, key);
-
-  t.ensureBlock(node);
-
-  var block = node.body;
-  block.body = nodes.concat(block.body);
-};
-
-exports.Function = function (node, parent, scope, file) {
-  var nodes = [];
-
-  var hasDestructuring = false;
-
-  node.params = node.params.map(function (pattern, i) {
-    if (!t.isPattern(pattern)) return pattern;
-
-    hasDestructuring = true;
-    var parentId = scope.generateUidIdentifier("ref");
-
-    var destructuring = new Destructuring({
-      blockHoist: node.params.length - i,
-      nodes:      nodes,
-      scope:      scope,
-      file:       file,
-      kind:       "var",
-    });
-    destructuring.init(pattern, parentId);
-
-    return parentId;
-  });
-
-  if (!hasDestructuring) return;
-
-  t.ensureBlock(node);
-
-  var block = node.body;
-  block.body = nodes.concat(block.body);
-};
-
-exports.CatchClause = function (node, parent, scope, file) {
-  var pattern = node.param;
-  if (!t.isPattern(pattern)) return;
-
-  var ref = scope.generateUidIdentifier("ref");
-  node.param = ref;
-
-  var nodes = [];
-
-  var destructuring = new Destructuring({
-    kind: "let",
-    file: file,
-    scope: scope,
-    nodes: nodes
-  });
-  destructuring.init(pattern, ref);
-
-  node.body.body = nodes.concat(node.body.body);
-
-  return node;
-};
-
-exports.ExpressionStatement = function (node, parent, scope, file) {
-  var expr = node.expression;
-  if (expr.type !== "AssignmentExpression") return;
-  if (!t.isPattern(expr.left)) return;
-  if (file.isConsequenceExpressionStatement(node)) return;
-
-  var nodes = [];
-
-  var ref = scope.generateUidIdentifier("ref");
-  nodes.push(t.variableDeclaration("var", [
-    t.variableDeclarator(ref, expr.right)
-  ]));
-
-  var destructuring = new Destructuring({
-    operator: expr.operator,
-    file: file,
-    scope: scope,
-    nodes: nodes
-  });
-  destructuring.init(expr.left, ref);
-
-  return nodes;
-};
-
-exports.AssignmentExpression = function (node, parent, scope, file) {
-  if (!t.isPattern(node.left)) return;
-
-  var ref = scope.generateUidIdentifier("temp");
-  scope.push({
-    key: ref.name,
-    id: ref
-  });
-
-  var nodes = [];
-  nodes.push(t.assignmentExpression("=", ref, node.right));
-
-  var destructuring = new Destructuring({
-    operator: node.operator,
-    file: file,
-    scope: scope,
-    nodes: nodes
-  });
-  destructuring.init(node.left, ref);
-
-  nodes.push(ref);
-
-  return t.toSequenceExpression(nodes, scope);
-};
-
-var variableDeclarationhasPattern = function (node) {
-  for (var i = 0; i < node.declarations.length; i++) {
-    if (t.isPattern(node.declarations[i].id)) {
-      return true;
-    }
-  }
-  return false;
-};
-
-exports.VariableDeclaration = function (node, parent, scope, file) {
-  if (t.isForInStatement(parent) || t.isForOfStatement(parent)) return;
-  if (!variableDeclarationhasPattern(node)) return;
-
-  var nodes = [];
-  var declar;
-
-  for (var i = 0; i < node.declarations.length; i++) {
-    declar = node.declarations[i];
-
-    var patternId = declar.init;
-    var pattern   = declar.id;
-
-    var destructuring = new Destructuring({
-      nodes: nodes,
-      scope: scope,
-      kind:  node.kind,
-      file:  file
-    });
-
-    if (t.isPattern(pattern) && patternId) {
-      destructuring.init(pattern, patternId);
-
-      if (+i !== node.declarations.length - 1) {
-        // we aren't the last declarator so let's just make the
-        // last transformed node inherit from us
-        t.inherits(nodes[nodes.length - 1], declar);
-      }
-    } else {
-      nodes.push(t.inherits(destructuring.buildVariableAssignment(declar.id, declar.init), declar));
-    }
-  }
-
-  if (!t.isProgram(parent) && !t.isBlockStatement(parent)) {
-    // https://github.com/6to5/6to5/issues/113
-    // for (let [x] = [0]; false;) {}
-
-    declar = null;
-
-    for (i = 0; i < nodes.length; i++) {
-      node = nodes[i];
-      declar = declar || t.variableDeclaration(node.kind, []);
-
-      if (!t.isVariableDeclaration(node) && declar.kind !== node.kind) {
-        throw file.errorWithNode(node, "Cannot use this node within the current parent");
-      }
-
-      declar.declarations = declar.declarations.concat(node.declarations);
-    }
-
-    return declar;
-  }
-
-  return nodes;
-};

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

@@ -1,153 +0,0 @@
-"use strict";
-
-var t    = require("../../../types");
-
-function returnBlock(expr) {
-  return t.blockStatement([t.returnStatement(expr)]);
-}
-
-function transformExpression(node, scope, state) {
-  if (!node) return;
-
-  return (function subTransform(node) {
-    switch (node.type) {
-      case "ConditionalExpression":
-        var callConsequent = subTransform(node.consequent);
-        var callAlternate = subTransform(node.alternate);
-        if (!callConsequent && !callAlternate) {
-          return;
-        }
-
-        // if ternary operator had tail recursion in value, convert to optimized if-statement
-        node.type = "IfStatement";
-        node.consequent = callConsequent ? t.toBlock(callConsequent) : returnBlock(node.consequent);
-        if (callAlternate) {
-          node.alternate = t.isIfStatement(callAlternate) ? callAlternate : t.toBlock(callAlternate);
-        } else {
-          node.alternate = returnBlock(node.alternate);
-        }
-        return [node];
-
-      case "LogicalExpression":
-        // only call in right-value of can be optimized
-        var callRight = subTransform(node.right);
-        if (!callRight) {
-          return;
-        }
-
-        var test = state.wrapSideEffect(node.left);
-        if (node.operator === "&&") {
-          test.expr = t.unaryExpression("!", test.expr);
-        }
-        return [t.ifStatement(test.expr, returnBlock(test.ref))].concat(callRight);
-
-      case "SequenceExpression":
-        var seq = node.expressions;
-
-        // only last element can be optimized
-        var lastCall = subTransform(seq[seq.length - 1]);
-        if (!lastCall) {
-          return;
-        }
-
-        // remove converted expression from sequence
-        // and convert to regular expression if needed
-        if (--seq.length === 1) {
-          node = seq[0];
-        }
-
-        return [t.expressionStatement(node)].concat(lastCall);
-
-      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);
-        }
-
-        return [t.returnStatement(t.callExpression(
-          state.getHelperRef(),
-          args
-        ))];
-    }
-  })(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
-      return transformExpression(node.argument, scope, state);
-    } else if (t.isFunction(node)) {
-      return this.skip();
-    } else if (t.isTryStatement(parent)) {
-      if (node === parent.block) {
-        return this.skip();
-      } else if (node === parent.finalizer) {
-        return;
-      } else {
-        if (parent.finalizer) {
-          this.skip();
-        }
-        return;
-      }
-    }
-  }
-};
-
-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/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/internal/module-formatter.js

@@ -1,17 +0,0 @@
-"use strict";
-
-var useStrict = require("../../helpers/use-strict");
-
-exports.post = function (file) {
-  if (!file.transformers["es6.modules"].canRun()) return;
-
-  var program = file.ast.program;
-
-  useStrict.wrap(program, function () {
-    program.body = file.dynamicImports.concat(program.body);
-  });
-
-  if (file.moduleFormatter.transform) {
-    file.moduleFormatter.transform(program);
-  }
-};

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/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,20 +0,0 @@
-"use strict";
-
-var useStrict = require("../../helpers/use-strict");
-var t         = require("../../../types");
-
-exports.post = function (file) {
-  var program = file.ast.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/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);
   }
 };
 
@@ -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,17 +158,17 @@ 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)) {
-    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);
@@ -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/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/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");
@@ -21,13 +21,8 @@ exports.IfStatement = function (node, print) {
   print.indentOnComments(node.consequent);
 
   if (node.alternate) {
-    if (this.isLast("}")) this.push(" ");
-    this.keyword("else");
-
-    if (this.format.format && !t.isBlockStatement(node.alternate)) {
-      this.push(" ");
-    }
-
+    if (this.isLast("}")) this.space();
+    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

@@ -0,0 +1,91 @@
+var lineNumbers = require("line-numbers");
+var repeating   = require("repeating");
+var jsTokens    = require("js-tokens");
+var esutils     = require("esutils");
+var chalk       = require("chalk");
+var ary         = require("lodash/function/ary");
+
+var defs = {
+  string:      chalk.red,
+  punctuation: chalk.white.bold,
+  operator:    chalk.white.bold,
+  curly:       chalk.green,
+  parens:      chalk.blue.bold,
+  square:      chalk.yellow,
+  name:        chalk.white,
+  keyword:     chalk.cyan,
+  number:      chalk.magenta,
+  regex:       chalk.magenta,
+  comment:     chalk.grey,
+  invalid:     chalk.inverse
+};
+
+var newline = /\r\n|[\n\r\u2028\u2029]/;
+
+var highlight = function (text) {
+  var tokenType = function (match) {
+    var token = jsTokens.matchToToken(match);
+    if (token.type === "name" && esutils.keyword.isKeywordES6(token.value)) {
+      return "keyword";
+    }
+
+    if (token.type === "punctuation") {
+      switch (token.value) {
+        case "{":
+        case "}":
+          return "curly";
+        case "(":
+        case ")":
+          return "parens";
+        case "[":
+        case "]":
+          return "square";
+      }
+    }
+
+    return token.type;
+  };
+
+  return text.replace(jsTokens, function (match) {
+    var type = tokenType(arguments);
+    if (type in defs) {
+      var colorize = ary(defs[type], 1);
+      return match.split(newline).map(colorize).join("\n");
+    }
+    return match;
+  });
+};
+
+module.exports = function (lines, lineNumber, colNumber) {
+  colNumber = Math.max(colNumber, 0);
+
+  if (chalk.supportsColor) {
+    lines = highlight(lines);
+  }
+
+  lines = lines.split(newline);
+
+  var start = Math.max(lineNumber - 3, 0);
+  var end   = Math.min(lines.length, lineNumber + 3);
+
+  if (!lineNumber && !colNumber) {
+    start = 0;
+    end = lines.length;
+  }
+
+  return "\n" + lineNumbers(lines.slice(start, end), {
+    start: start + 1,
+    before: "  ",
+    after: " | ",
+    transform: function (params) {
+      if (params.number !== lineNumber) {
+        return;
+      }
+      if (colNumber) {
+        params.line += "\n" + params.before + repeating(" ", params.width) +
+                       params.after + repeating(" ", colNumber - 1) + "^";
+      }
+      params.before = params.before.replace(/^./, ">");
+    }
+  }).join("\n");
+};

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,51 @@
+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",
+  codeGeneratorDeopt: "Note: The code generator has deoptimised the styling of $1 as it exceeds the max of $2."
+};
+
+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,7 @@ File.helpers = [
   "object-destructuring-empty",
   "temporal-undefined",
   "temporal-assert-defined",
-  "tail-call"
+  "self-global"
 ];
 
 File.validOptions = [
@@ -79,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",
@@ -93,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) {
@@ -104,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:              [],
@@ -116,23 +126,31 @@ 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 = opts.filename.replace(/\\/g, "/");
+  opts.filename = slash(opts.filename);
+  if (opts.sourceRoot) {
+    opts.sourceRoot = slash(opts.sourceRoot);
+  }
+
+  if (opts.moduleId) {
+    opts.moduleIds = true;
+  }
 
   opts.basename = path.basename(opts.filename, path.extname(opts.filename));
 
   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 (contains(opts.loose, "all")) {
+  if (includes(opts.loose, "all") || includes(opts.loose, true)) {
     opts.loose = Object.keys(transform.transformers);
   }
 
@@ -157,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);
@@ -168,15 +186,23 @@ 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) {
+    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 +239,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 +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;
@@ -276,17 +287,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 +311,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);
   }
 
@@ -308,14 +333,14 @@ 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);
   } 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 +350,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 +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);
@@ -436,36 +465,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);
     }
   };
@@ -67,7 +73,7 @@ module.exports = function (exports, opts) {
       };
 
       if (opts.pre) {
-        opts.pre(state);
+        opts.pre(state, file);
       }
 
       var attribs = node.attributes;
@@ -80,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/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

@@ -0,0 +1,118 @@
+"use strict";
+
+var util = require("../../util");
+var t    = require("../../types");
+
+var visitor = {
+  enter: function (node, parent, scope, state) {
+    // check if this node is a referenced identifier that matches the same as our
+    // function id
+    if (!t.isReferencedIdentifier(node, parent, { name: state.name })) return;
+
+    // check that we don't have a local variable declared as that removes the need
+    // for the wrapper
+    var localDeclar = scope.getBindingIdentifier(state.name);
+    if (localDeclar !== state.outerDeclar) return;
+
+    state.selfReference = true;
+    this.stop();
+  }
+};
+
+var wrap = function (state, method, id, scope) {
+  if (state.selfReference) {
+    var templateName = "property-method-assignment-wrapper";
+    if (method.generator) templateName += "-generator";
+    return util.template(templateName, {
+      FUNCTION: method,
+      FUNCTION_ID: id,
+      FUNCTION_KEY: scope.generateUidIdentifier(id.name),
+      WRAPPER_KEY: scope.generateUidIdentifier(id.name + "Wrapper")
+    });
+  } else {
+    method.id = id;
+    return method;
+  }
+};
+
+var visit = function (node, name, scope) {
+  var state = {
+    selfAssignment: false,
+    selfReference:  false,
+    outerDeclar:    scope.getBindingIdentifier(name),
+    references:     [],
+    name:           name,
+  };
+
+  // check to see if we have a local binding of the id we're setting inside of
+  // the function, this is important as there are caveats associated
+
+  var bindingInfo = scope.getOwnBindingInfo(name);
+
+  if (bindingInfo) {
+    if (bindingInfo.kind === "param") {
+      // safari will blow up in strict mode with code like:
+      //
+      //   var t = function t(t) {};
+      //
+      // with the error:
+      //
+      //   Cannot declare a parameter named 't' as it shadows the name of a
+      //   strict mode function.
+      //
+      // this isn't to the spec and they've invented this behaviour which is
+      // **extremely** annoying so we avoid setting the name if it has a param
+      // with the same id
+      state.selfReference = true;
+    } else {
+      // otherwise it's defined somewhere in scope like:
+      //
+      //   var t = function () {
+      //     var t = 2;
+      //   };
+      //
+      // so we can safely just set the id and move along as it shadows the
+      // bound function id
+    }
+  } else {
+    scope.traverse(node, visitor, state);
+  }
+
+  return state;
+};
+
+exports.property = function (node, file, scope) {
+  var key = t.toComputedKey(node, node.key);
+  if (!t.isLiteral(key)) return node; // we can't set a function id with this
+
+  var name = t.toIdentifier(key.value);
+  var id = t.identifier(name);
+
+  var method = node.value;
+  var state  = visit(method, name, scope);
+  node.value = wrap(state, method, id, scope);
+};
+
+exports.bare = function (node, parent, scope) {
+  // has an `id` so we don't need to infer one
+  if (node.id) return;
+
+  var id;
+  if (t.isProperty(parent) && parent.kind === "init" && !parent.computed) {
+    // { foo: function () {} };
+    id = parent.key;
+  } else if (t.isVariableDeclarator(parent)) {
+    // var foo = function () {};
+    id = parent.id;
+  } else {
+    return;
+  }
+
+  if (!t.isIdentifier(id)) return;
+
+  var name = t.toIdentifier(id.name);
+  id = t.identifier(name);
+
+  var state = visit(node, name, scope);
+  return wrap(state, node, id, scope);
+};