v5.0.7

t push

CHANGELOG.md

@@ -13,6 +13,32 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 5.0.6
+
+ * **Bug Fix**
+  * Fix mangling of import references that collide with properties on `Object.prototype`.
+  * Fix duplicate declarations incorrectly being reported for `var`.
+
+## 5.0.5
+
+ * **Internal**
+  * Upgrade `core-js`.
+ * **Bug Fix**
+  * Fix arrays not being supported in `util.list`.
+
+## 5.0.4
+
+ * **Polish**
+  * Check for top level `breakConfig` in `resolveRc`.
+
+## 5.0.3
+
+ * **Bug Fix**
+  * Make relative location absolute before calling `resolveRc`.
+ * **Internal**
+  * Switch to global UID registry.
+  * Add `breakConfig` option to prevent Babel from erroring when hitting that option.
+
 ## 5.0.1
 
  * **Bug Fix**

Makefile

@@ -111,7 +111,7 @@ publish-cli:
 bootstrap:
 	npm install
 	npm link
-	cd packages/babel-cli && npm install && npm link
+	cd packages/babel-cli && npm install && npm link && npm link babel-core
 	git submodule update --init
 	cd vendor/regenerator && npm install
 	cd vendor/compat-table && npm install object-assign

README.md

@@ -9,7 +9,7 @@
 </p>
 
 <p align="center">
-  For questions and support please visit the <a href="https://gitter.im/babel/babel">gitter room</a> or <a href="stackoverflow.com">StackOverflow</a>. The Babel issue tracker is <strong>exclusively</strong> for bug reports and future requests.
+  For questions and support please visit the <a href="https://gitter.im/babel/babel">gitter room</a> or <a href="http://stackoverflow.com/questions/tagged/babeljs">StackOverflow</a>. The Babel issue tracker is <strong>exclusively</strong> for bug reports and future requests.
 </p>
 
 <p align="center">

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-core",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.0.2",
+  "version": "5.0.7",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",
@@ -30,7 +30,7 @@
     "ast-types": "~0.7.0",
     "chalk": "^1.0.0",
     "convert-source-map": "^0.5.0",
-    "core-js": "^0.8.0",
+    "core-js": "^0.8.1",
     "debug": "^2.1.1",
     "detect-indent": "^3.0.0",
     "estraverse": "^1.9.1",

packages/babel-cli/README.md

@@ -0,0 +1,5 @@
+# babel-cli
+
+Babel CLI
+
+For more information please look at [babel](https://github.com/babel/babel).

packages/babel-cli/bin/babel/dir.js

@@ -28,6 +28,8 @@ module.exports = function (commander, filenames, opts) {
   };
 
   var handleFile = function (src, filename) {
+    if (util.shouldIgnore(src)) return;
+
     if (util.canCompile(filename)) {
       write(src, filename);
     } else if (commander.copyFiles) {

packages/babel-cli/bin/babel/file.js

@@ -107,6 +107,8 @@ module.exports = function (commander, filenames, opts) {
     });
 
     _.each(_filenames, function (filename) {
+      if (util.shouldIgnore(filename)) return;
+
       results.push(util.compile(filename));
     });
 

packages/babel-cli/bin/babel/index.js

@@ -102,12 +102,15 @@ if (errors.length) {
 
 //
 
-exports.opts = {};
+var opts = exports.opts = {};
 
 each(options, function (opt, key) {
-  exports.opts[key] = commander[key];
+  opts[key] = commander[key];
 });
 
+opts.ignore = util.arrayify(opts.ignore, util.regexify);
+opts.only   = util.arrayify(opts.only, util.regexify);
+
 var fn;
 
 if (commander.outDir) {

packages/babel-cli/bin/babel/util.js

@@ -16,6 +16,10 @@ exports.readdir = readdir;
 
 exports.canCompile = util.canCompile;
 
+exports.shouldIgnore = function (loc) {
+  return util.shouldIgnore(loc, index.opts.ignore, index.opts.only);
+};
+
 exports.addSourceMappingUrl = function (code, loc) {
   return code + "\n//# sourceMappingURL=" + path.basename(loc);
 };
@@ -23,6 +27,8 @@ exports.addSourceMappingUrl = function (code, loc) {
 exports.transform = function (filename, code, opts) {
   opts = _.defaults(opts || {}, index.opts);
   opts.filename = filename;
+  opts.ignore = null;
+  opts.only = null;
 
   var result = babel.transform(code, opts);
   result.filename = filename;

packages/babel-cli/package.json

@@ -1,14 +1,14 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.0.1",
+  "version": "5.0.6",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",
   "preferGlobal": true,
   "dependencies": {
     "chokidar": "^0.12.6",
-    "babel-core": "^5.0.1",
+    "babel-core": "^5.0.6",
     "commander": "^2.6.0",
     "fs-readdir-recursive": "^0.1.0",
     "output-file-sync": "^1.1.0",
@@ -22,4 +22,4 @@
     "babel-node": "./bin/babel-node",
     "babel-external-helpers": "./bin/babel-external-helpers"
   }
-}
+}

packages/babel-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "5.0.1",
+  "version": "5.0.6",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "dependencies": {

src/babel/api/register/cache.js

@@ -3,7 +3,7 @@ import os from "os";
 import fs from "fs";
 
 function getUserHome() {
-  return process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
+  return process.env.HOME || process.env.USERPROFILE;
 }
 
 const FILENAME = process.env.BABEL_CACHE_PATH || path.join(getUserHome() || os.tmpdir(), ".babel.json");

src/babel/tools/resolve-rc.js

@@ -43,8 +43,11 @@ export default function (loc, opts = {}) {
       find(up, rel);
     }
   }
-
-  find(loc, rel);
+  
+  if (opts.breakConfig !== true) {
+    find(loc, rel);
+  }
+  
 
   return opts;
 };

src/babel/transformation/file/index.js

@@ -44,6 +44,7 @@ export default class File {
     this.usedHelpers = {};
     this.dynamicData = {};
     this.data        = {};
+    this.uids        = {};
 
     this.lastStatements = [];
     this.log            = new Logger(this, opts.filename || "unknown");
@@ -89,8 +90,10 @@ export default class File {
   normalizeOptions(opts: Object) {
     opts = assign({}, opts);
 
-    if (opts.filename && isAbsolute(opts.filename)) {
-      opts = resolveRc(opts.filename, opts);
+    if (opts.filename) {
+      var rcFilename = opts.filename;
+      if (!isAbsolute(rcFilename)) rcFilename = path.join(process.cwd(), rcFilename);
+      opts = resolveRc(rcFilename, opts);
     }
 
     //
@@ -419,23 +422,7 @@ export default class File {
 
   shouldIgnore() {
     var opts = this.opts;
-
-    var filename = opts.filename;
-    var ignore   = opts.ignore;
-    var only     = opts.only;
-
-    if (only.length) {
-      for (var i = 0; i < only.length; i++) {
-        if (only[i].test(filename)) return false;
-      }
-      return true;
-    } else if (ignore.length) {
-      for (var i = 0; i < ignore.length; i++) {
-        if (ignore[i].test(filename)) return true;
-      }
-    }
-
-    return false;
+    return util.shouldIgnore(opts.filename, opts.ignore, opts.only);
   }
 
   parse(code: string) {

src/babel/transformation/file/options.json

@@ -194,5 +194,13 @@
   "moduleRoot": {
     "type": "string",
     "description": "optional prefix for the AMD module formatter that will be prepend to the filename on module definitions"
+  },
+
+  "breakConfig": {
+    "type": "boolean",
+    "default": false,
+    "hidden": true,
+    "description": "stop trying to load .babelrc files"
   }
+
 }

src/babel/transformation/modules/_default.js

@@ -61,7 +61,6 @@ var importsVisitor = {
     enter(node, parent, scope, formatter) {
       formatter.hasLocalImports = true;
       extend(formatter.localImports, this.getBindingIdentifiers());
-      formatter.bumpImportOccurences(node);
     }
   }
 };
@@ -69,7 +68,7 @@ var importsVisitor = {
 var exportsVisitor = traverse.explode({
   ExportDeclaration: {
     enter(node, parent, scope, formatter) {
-      formatter.hasLocalImports = true;
+      formatter.hasLocalExports = true;
 
       var declar = this.get("declaration");
       if (declar.isStatement()) {
@@ -96,29 +95,23 @@ var exportsVisitor = traverse.explode({
           formatter.hasNonDefaultExports = true;
         }
       }
-
-      if (node.source) {
-        formatter.bumpImportOccurences(node);
-      }
     }
   }
 });
 
 export default class DefaultFormatter {
   constructor(file) {
-    this.internalRemap = {};
-
-    this.defaultIds = object();
-    this.scope      = file.scope;
-    this.file       = file;
-    this.ids        = object();
+    this.internalRemap = object();
+    this.defaultIds    = object();
+    this.scope         = file.scope;
+    this.file          = file;
+    this.ids           = object();
 
     this.hasNonDefaultExports = false;
 
     this.hasLocalExports = false;
     this.hasLocalImports = false;
 
-    this.localImportOccurences = object();
     this.localExports = object();
     this.localImports = object();
 
@@ -134,15 +127,6 @@ export default class DefaultFormatter {
     return (t.isExportDefaultDeclaration(node) || t.isSpecifierDefault(node)) && !this.noInteropRequireExport && !this.hasNonDefaultExports;
   }
 
-  bumpImportOccurences(node) {
-    var source = node.source.value;
-    var occurs = this.localImportOccurences;
-    occurs[source] ||= 0;
-    if (node.specifiers) {
-      occurs[source] += node.specifiers.length;
-    }
-  }
-
   getLocalExports() {
     this.file.path.traverse(exportsVisitor, this);
   }
@@ -152,7 +136,7 @@ export default class DefaultFormatter {
   }
 
   remapAssignments() {
-    if (this.hasLocalImports) {
+    if (this.hasLocalExports || this.hasLocalImports) {
       this.file.path.traverse(remapVisitor, this);
     }
   }

src/babel/transformation/modules/amd.js

@@ -6,7 +6,9 @@ import * as util from  "../../util";
 import * as t from "../../types";
 
 export default class AMDFormatter extends DefaultFormatter {
-  init = CommonFormatter.prototype.init;
+  init() {
+    CommonFormatter.prototype._init.call(this, this.hasNonDefaultExports);
+  }
 
   buildDependencyLiterals() {
     var names = [];
@@ -100,15 +102,34 @@ export default class AMDFormatter extends DefaultFormatter {
     this.internalRemap[specifier.local.name] = ref;
   }
 
-  exportSpecifier() {
-    CommonFormatter.prototype.exportSpecifier.apply(this, arguments);
+  exportSpecifier(specifier, node, nodes) {
+    if (this.doDefaultExportInterop(specifier)) {
+      nodes.push(util.template("exports-default-assign", {
+        VALUE: specifier.local
+      }, true));
+    } else {
+      CommonFormatter.prototype.exportSpecifier.apply(this, arguments);
+    }
   }
 
-  exportDeclaration(node) {
+  exportDeclaration(node, nodes) {
     if (this.doDefaultExportInterop(node)) {
       this.passModuleArg = true;
+
+      var declar = node.declaration;
+      var assign = util.template("exports-default-assign", {
+        VALUE: this._pushStatement(declar, nodes)
+      }, true);
+
+      if (t.isFunctionDeclaration(declar)) {
+        // we can hoist this assignment to the top of the file
+        assign._blockHoist = 3;
+      }
+
+      nodes.push(assign);
+      return;
     }
 
-    CommonFormatter.prototype.exportDeclaration.apply(this, arguments);
+    DefaultFormatter.prototype.exportDeclaration.apply(this, arguments);
   }
 }

src/babel/transformation/modules/common.js

@@ -5,13 +5,17 @@ import * as t from "../../types";
 
 export default class CommonJSFormatter extends DefaultFormatter {
   init() {
+    this._init(this.hasLocalExports);
+  }
+
+  _init(conditional) {
     var file  = this.file;
     var scope = file.scope;
 
     scope.rename("module");
     scope.rename("exports");
 
-    if (!this.noInteropRequireImport && this.hasNonDefaultExports) {
+    if (!this.noInteropRequireImport && conditional) {
       var templateName = "exports-module-declaration";
       if (this.file.isLoose("es6.modules")) templateName += "-loose";
       var declar = util.template(templateName, true);
@@ -20,6 +24,20 @@ export default class CommonJSFormatter extends DefaultFormatter {
     }
   }
 
+  transform(program) {
+    DefaultFormatter.prototype.transform.apply(this, arguments);
+
+    if (this.hasDefaultOnlyExport) {
+      program.body.push(
+        t.expressionStatement(t.assignmentExpression(
+          "=",
+          t.memberExpression(t.identifier("module"), t.identifier("exports")),
+          t.memberExpression(t.identifier("exports"), t.identifier("default"))
+        ))
+      );
+    }
+  }
+
   importSpecifier(specifier, node, nodes) {
     var variableName = specifier.local;
 
@@ -31,11 +49,15 @@ export default class CommonJSFormatter extends DefaultFormatter {
         this.internalRemap[variableName.name] = ref;
       } else {
         if (this.noInteropRequireImport) {
-          this.internalRemap[variableName.name] = t.memberExpression(ref, t.identifier("default"))
+          this.internalRemap[variableName.name] = t.memberExpression(ref, t.identifier("default"));
         } else if (!includes(this.file.dynamicImported, node)) {
+          var uid = this.scope.generateUidBasedOnNode(node, "import");
+
           nodes.push(t.variableDeclaration("var", [
-            t.variableDeclarator(variableName, t.callExpression(this.file.addHelper("interop-require"), [ref]))
+            t.variableDeclarator(uid, t.callExpression(this.file.addHelper("interop-require-wildcard"), [ref]))
           ]));
+
+          this.internalRemap[variableName.name] = t.memberExpression(uid, t.identifier("default"));
         }
       }
     } else {
@@ -64,29 +86,15 @@ export default class CommonJSFormatter extends DefaultFormatter {
 
   exportSpecifier(specifier, node, nodes) {
     if (this.doDefaultExportInterop(specifier)) {
-      nodes.push(util.template("exports-default-assign", {
-        VALUE: specifier.local
-      }, true));
-      return;
-    } else {
-      DefaultFormatter.prototype.exportSpecifier.apply(this, arguments);
+      this.hasDefaultOnlyExport = true;
     }
+
+    DefaultFormatter.prototype.exportSpecifier.apply(this, arguments);
   }
 
   exportDeclaration(node, nodes) {
     if (this.doDefaultExportInterop(node)) {
-      var declar = node.declaration;
-      var assign = util.template("exports-default-assign", {
-        VALUE: this._pushStatement(declar, nodes)
-      }, true);
-
-      if (t.isFunctionDeclaration(declar)) {
-        // we can hoist this assignment to the top of the file
-        assign._blockHoist = 3;
-      }
-
-      nodes.push(assign);
-      return;
+      this.hasDefaultOnlyExport = true;
     }
 
     DefaultFormatter.prototype.exportDeclaration.apply(this, arguments);

src/babel/traversal/path/index.js

@@ -547,6 +547,9 @@ export default class TraversalPath {
       var binding = this.scope.getBinding(this.node.name);
       if (!binding || !binding.constant) return;
 
+      // todo: take into consideration infinite recursion #1149
+      return;
+
       if (binding.path === this) {
         return this;
       } else {

src/babel/traversal/scope.js

@@ -135,7 +135,7 @@ export default class Scope {
       uid = this._generateUid(name, i);
       i++;
     } while (this.hasBinding(uid) || this.hasGlobal(uid) || this.hasUid(uid));
-    this.getFunctionParent().uids[uid] = true;
+    this.file.uids[uid] = true;
     return uid;
   }
 
@@ -152,7 +152,7 @@ export default class Scope {
   hasUid(name): boolean {
     var scope = this;
     do {
-      if (scope.uids[name]) return true;
+      if (scope.file.uids[name]) return true;
       scope = scope.parent;
     } while (scope);
     return false;
@@ -240,7 +240,12 @@ export default class Scope {
     if (kind === "param") return;
     if (kind === "hoisted" && local.kind === "let") return;
 
-    if (local.kind === "let" || local.kind === "const" || local.kind === "module" || local.kind === "param") {
+
+    var duplicate = false;
+    duplicate ||= local.kind === "let" || local.kind === "const" || local.kind === "module";
+    duplicate ||= local.kind === "param" && (kind === "let" || kind === "const");
+
+    if (duplicate) {
       throw this.file.errorWithNode(id, messages.get("scopeDuplicateDeclaration", name), TypeError);
     }
   }
@@ -434,8 +439,7 @@ export default class Scope {
 
     info = this.block._scopeInfo = {
       bindings: object(),
-      globals:  object(),
-      uids:     object()
+      globals:  object()
     };
 
     extend(this, info);
@@ -658,7 +662,7 @@ export default class Scope {
     if (!name) return false;
     if (this.hasOwnBinding(name)) return true;
     if (this.parentHasBinding(name)) return true;
-    if (this.uids[name]) return true;
+    if (this.file.uids[name]) return true;
     if (includes(Scope.globals, name)) return true;
     if (includes(Scope.contextVariables, name)) return true;
     return false;

src/babel/util.js

@@ -55,7 +55,15 @@ export function resolveRelative(loc: string) {
 }
 
 export function list(val: string): Array<string> {
-  return val ? val.split(",") : [];
+  if (!val) {
+    return [];
+  } else if (Array.isArray(val)) {
+    return val;
+  } else if (typeof val === "string") {
+    return val.split(",");
+  } else {
+    return [val];
+  }
 }
 
 export function regexify(val: any): RegExp {
@@ -85,6 +93,21 @@ export function booleanify(val: any): boolean {
   return val;
 }
 
+export function shouldIgnore(filename, ignore, only) {
+  if (only.length) {
+    for (var i = 0; i < only.length; i++) {
+      if (only[i].test(filename)) return false;
+    }
+    return true;
+  } else if (ignore.length) {
+    for (var i = 0; i < ignore.length; i++) {
+      if (ignore[i].test(filename)) return true;
+    }
+  }
+
+  return false;
+}
+
 var templateVisitor = {
   enter(node, parent, scope, nodes) {
     if (t.isExpressionStatement(node)) {

test/core/bin.js

@@ -70,6 +70,7 @@ var buildTest = function (binName, testName, opts) {
 
   return function (callback) {
     this.timeout(5000);
+    clear();
     saveInFiles(opts.inFiles);
 
     var args  = [binLoc].concat(opts.args);
@@ -109,11 +110,11 @@ var buildTest = function (binName, testName, opts) {
   };
 };
 
-before(function () {
+var clear = function () {
   if (fs.existsSync(tmpLoc)) rimraf.sync(tmpLoc);
   fs.mkdirSync(tmpLoc);
   process.chdir(tmpLoc);
-});
+};
 
 _.each(fs.readdirSync(fixtureLoc), function (binName) {
   if (binName[0] === ".") return;

test/core/browserify.js

@@ -12,10 +12,7 @@ suite("browserify", function() {
       assert.ok(bundle.length, "bundle output code");
 
       // ensure that the code runs without throwing an exception
-      vm.runInNewContext("var global = this;\n" + bundle, {
-        setInterval: function () {},
-        setTimeout: function () {}
-      });
+      vm.runInNewContext("var global = this;\n" + bundle, {});
       done();
     })
   })

test/core/fixtures/bin/babel/--ignore/in-files/src/bar/index.js

@@ -0,0 +1 @@
+bar;

test/core/fixtures/bin/babel/--ignore/options.json

@@ -0,0 +1,3 @@
+{
+  "args": ["src", "--out-dir", "lib", "--ignore", "src/foo/*"]
+}

test/core/fixtures/bin/babel/--ignore/stdout.txt

@@ -0,0 +1 @@
+src/bar/index.js -> lib/bar/index.js

test/core/fixtures/bin/babel/--only/in-files/src/bar/index.js

@@ -0,0 +1 @@
+bar;

test/core/fixtures/bin/babel/--only/options.json

@@ -0,0 +1,3 @@
+{
+  "args": ["src", "--out-dir", "lib", "--only", "src/bar/*"]
+}

test/core/fixtures/bin/babel/--only/stdout.txt

@@ -0,0 +1 @@
+src/bar/index.js -> lib/bar/index.js

test/core/fixtures/transformation/es6.arrow-functions/arguments/expected.js

@@ -11,17 +11,17 @@ function one() {
 one(1, 2);
 
 function two() {
-  var _arguments = arguments;
+  var _arguments2 = arguments;
 
   var inner = function inner() {
-    return _arguments;
+    return _arguments2;
   };
 
   var another = function another() {
-    var _arguments2 = arguments;
+    var _arguments3 = arguments;
 
     var inner2 = function inner2() {
-      return _arguments2;
+      return _arguments3;
     };
   };
 
@@ -30,20 +30,20 @@ function two() {
 two(1, 2);
 
 function three() {
-  var _arguments = arguments;
+  var _arguments4 = arguments;
 
   var fn = function fn() {
-    return _arguments[0] + "bar";
+    return _arguments4[0] + "bar";
   };
   return fn();
 }
 three("foo");
 
 function four() {
-  var _arguments = arguments;
+  var _arguments5 = arguments;
 
   var fn = function fn() {
-    return _arguments[0].foo + "bar";
+    return _arguments5[0].foo + "bar";
   };
   return fn();
 }
@@ -66,4 +66,4 @@ function six(obj) {
   };
   return fn();
 }
-six();
+six();

test/core/fixtures/transformation/es6.block-scoping/for-break-continue-return/expected.js

@@ -16,7 +16,7 @@
     }
   };
 
-  _loop: for (var i in nums) {
+  _loop2: for (var i in nums) {
     var _ret = _loop(i);
 
     switch (_ret) {
@@ -24,7 +24,7 @@
         continue;
 
       case "break":
-        break _loop;
+        break _loop2;
 
       default:
         if (typeof _ret === "object") return _ret.v;

test/core/fixtures/transformation/es6.classes-loose/accessing-super-class/expected.js

@@ -20,11 +20,11 @@ var Test = (function (_Foo) {
   babelHelpers.inherits(Test, _Foo);
 
   Test.prototype.test = function test() {
-    var _Foo$prototype$test, _Foo$prototype$test2;
+    var _Foo$prototype$test3, _Foo$prototype$test4;
 
     _Foo.prototype.test.call(this);
-    (_Foo$prototype$test = _Foo.prototype.test).call.apply(_Foo$prototype$test, [this].concat(babelHelpers.slice.call(arguments)));
-    (_Foo$prototype$test2 = _Foo.prototype.test).call.apply(_Foo$prototype$test2, [this, "test"].concat(babelHelpers.slice.call(arguments)));
+    (_Foo$prototype$test3 = _Foo.prototype.test).call.apply(_Foo$prototype$test3, [this].concat(babelHelpers.slice.call(arguments)));
+    (_Foo$prototype$test4 = _Foo.prototype.test).call.apply(_Foo$prototype$test4, [this, "test"].concat(babelHelpers.slice.call(arguments)));
   };
 
   Test.foo = function foo() {

test/core/fixtures/transformation/es6.classes/accessing-super-class/expected.js

@@ -21,21 +21,21 @@ var Test = (function (_Foo) {
   babelHelpers.createClass(Test, [{
     key: "test",
     value: function test() {
-      var _babelHelpers$get;
+      var _babelHelpers$get3;
 
       babelHelpers.get(Object.getPrototypeOf(Test.prototype), "test", this).call(this);
       babelHelpers.get(Object.getPrototypeOf(Test.prototype), "test", this).apply(this, arguments);
-      (_babelHelpers$get = babelHelpers.get(Object.getPrototypeOf(Test.prototype), "test", this)).call.apply(_babelHelpers$get, [this, "test"].concat(babelHelpers.slice.call(arguments)));
+      (_babelHelpers$get3 = babelHelpers.get(Object.getPrototypeOf(Test.prototype), "test", this)).call.apply(_babelHelpers$get3, [this, "test"].concat(babelHelpers.slice.call(arguments)));
     }
   }], [{
     key: "foo",
     value: function foo() {
-      var _babelHelpers$get;
+      var _babelHelpers$get4;
 
       babelHelpers.get(Object.getPrototypeOf(Test), "foo", this).call(this);
       babelHelpers.get(Object.getPrototypeOf(Test), "foo", this).apply(this, arguments);
-      (_babelHelpers$get = babelHelpers.get(Object.getPrototypeOf(Test), "foo", this)).call.apply(_babelHelpers$get, [this, "test"].concat(babelHelpers.slice.call(arguments)));
+      (_babelHelpers$get4 = babelHelpers.get(Object.getPrototypeOf(Test), "foo", this)).call.apply(_babelHelpers$get4, [this, "test"].concat(babelHelpers.slice.call(arguments)));
     }
   }]);
   return Test;
-})(Foo);
+})(Foo);

test/core/fixtures/transformation/es6.destructuring/parameters/expected.js

@@ -9,29 +9,29 @@ function somethingAdvanced(_ref) {
   var y2 = _ref$bottomRight.y;
 }
 
-function unpackObject(_ref) {
-  var title = _ref.title;
-  var author = _ref.author;
+function unpackObject(_ref2) {
+  var title = _ref2.title;
+  var author = _ref2.author;
 
   return title + " " + author;
 }
 
 console.log(unpackObject({ title: "title", author: "author" }));
 
-var unpackArray = function unpackArray(_ref, _ref3) {
-  var _ref2 = babelHelpers.slicedToArray(_ref, 3);
-
-  var a = _ref2[0];
-  var b = _ref2[1];
-  var c = _ref2[2];
-
+var unpackArray = function unpackArray(_ref3, _ref4) {
   var _ref32 = babelHelpers.slicedToArray(_ref3, 3);
 
-  var x = _ref32[0];
-  var y = _ref32[1];
-  var z = _ref32[2];
+  var a = _ref32[0];
+  var b = _ref32[1];
+  var c = _ref32[2];
+
+  var _ref42 = babelHelpers.slicedToArray(_ref4, 3);
+
+  var x = _ref42[0];
+  var y = _ref42[1];
+  var z = _ref42[2];
 
   return a + b + c;
 };
 
-console.log(unpackArray(["hello", ", ", "world"], [1, 2, 3]));
+console.log(unpackArray(["hello", ", ", "world"], [1, 2, 3]));

test/core/fixtures/transformation/es6.modules-common/exports-default/expected.js

@@ -2,13 +2,16 @@
 
 var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
 
-module.exports = foo;
-module.exports = 42;
-module.exports = {};
-module.exports = [];
-module.exports = foo;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = foo;
+exports["default"] = 42;
+exports["default"] = {};
+exports["default"] = [];
+exports["default"] = foo;
 
-module.exports = function () {};
+exports["default"] = function () {};
 
 var _default = (function () {
   var _class = function _default() {
@@ -18,7 +21,7 @@ var _default = (function () {
   return _class;
 })();
 
-module.exports = _default;
+exports["default"] = _default;
 
 function foo() {}
 
@@ -26,5 +29,6 @@ var Foo = function Foo() {
   _classCallCheck(this, Foo);
 };
 
-module.exports = Foo;
-module.exports = foo;
+exports["default"] = Foo;
+exports["default"] = foo;
+module.exports = exports["default"];

test/core/fixtures/transformation/es6.modules-common/imports-default/expected.js

@@ -1,12 +1,12 @@
 "use strict";
 
-var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
+var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
 var _foo = require("foo");
 
-var foo = _interopRequire(_foo);
+var _foo2 = _interopRequireWildcard(_foo);
 
-var foo2 = _interopRequire(_foo);
+var _foo22 = _interopRequireWildcard(_foo);
 
-foo;
-foo2;
+_foo2["default"];
+_foo22["default"];

test/core/fixtures/transformation/es6.modules-common/imports-mixing/expected.js

@@ -1,10 +1,10 @@
 "use strict";
 
-var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
+var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
 var _foo$xyz = require("foo");
 
-var foo = _interopRequire(_foo$xyz);
+var _foo$xyz2 = _interopRequireWildcard(_foo$xyz);
 
-foo;
-_foo$xyz.baz;
+_foo$xyz2["default"];
+_foo$xyz.baz;

test/core/fixtures/transformation/es6.modules-common/overview/expected.js

@@ -2,8 +2,6 @@
 
 var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
 
-var _interopRequire = function (obj) { return obj && obj.__esModule ? obj["default"] : obj; };
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -16,7 +14,7 @@ require("./directory/foo-bar");
 
 var _foo = require("foo2");
 
-var foo = _interopRequire(_foo);
+var _foo2 = _interopRequireWildcard(_foo);
 
 var _import = require("foo3");
 
@@ -32,4 +30,4 @@ var test = 5;
 exports.test = test;
 _bar.bar;
 _bar2.foo;
-foo;
+_foo2["default"];

test/core/fixtures/transformation/es6.modules-system/remap/expected.js

@@ -39,4 +39,4 @@ System.register([], function (_export) {
       _export("f", _export("e", d = 4));
     }
   };
-});
+});

test/core/fixtures/transformation/es6.parameters.rest/deopt/expected.js

@@ -9,8 +9,8 @@ var x = function x(foo) {
 };
 
 var y = function y(foo) {
-  for (var _len = arguments.length, bar = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    bar[_key - 1] = arguments[_key];
+  for (var _len2 = arguments.length, bar = Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+    bar[_key2 - 1] = arguments[_key2];
   }
 
   var x = function z(bar) {
@@ -19,8 +19,8 @@ var y = function y(foo) {
 };
 
 var b = function b(x, y) {
-  for (var _len = arguments.length, args = Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-    args[_key - 2] = arguments[_key];
+  for (var _len3 = arguments.length, args = Array(_len3 > 2 ? _len3 - 2 : 0), _key3 = 2; _key3 < _len3; _key3++) {
+    args[_key3 - 2] = arguments[_key3];
   }
 
   console.log(args[0]);
@@ -29,8 +29,8 @@ var b = function b(x, y) {
 };
 
 var z = function z(foo) {
-  for (var _len = arguments.length, bar = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    bar[_key - 1] = arguments[_key];
+  for (var _len4 = arguments.length, bar = Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
+    bar[_key4 - 1] = arguments[_key4];
   }
 
   var x = function x() {
@@ -39,18 +39,18 @@ var z = function z(foo) {
 };
 
 var a = function a(foo) {
-  for (var _len = arguments.length, bar = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    bar[_key - 1] = arguments[_key];
+  for (var _len5 = arguments.length, bar = Array(_len5 > 1 ? _len5 - 1 : 0), _key5 = 1; _key5 < _len5; _key5++) {
+    bar[_key5 - 1] = arguments[_key5];
   }
 
   return bar.join(",");
 };
 
 var b = function b(foo) {
-  for (var _len = arguments.length, bar = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    bar[_key - 1] = arguments[_key];
+  for (var _len6 = arguments.length, bar = Array(_len6 > 1 ? _len6 - 1 : 0), _key6 = 1; _key6 < _len6; _key6++) {
+    bar[_key6 - 1] = arguments[_key6];
   }
 
   var join = "join";
   return bar[join];
-};
+};

test/core/fixtures/transformation/es6.tail-call/try-catch/expected.js

@@ -43,21 +43,21 @@
   } finally {}
 })(1000000) === "foo";
 
-(function f(_x) {
-  var _again = true;
+(function f(_x2) {
+  var _again2 = true;
 
-  _function: while (_again) {
-    _again = false;
-    var n = _x;
+  _function2: while (_again2) {
+    _again2 = false;
+    var n = _x2;
 
     if (n <= 0) {
       return "foo";
     }
 
     try {} finally {
-      _x = n - 1;
-      _again = true;
-      continue _function;
+      _x2 = n - 1;
+      _again2 = true;
+      continue _function2;
     }
   }
 })(1000000) === "foo";

test/core/fixtures/transformation/es7.export-extensions/default-commonjs/expected.js

@@ -1,7 +1,11 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
 var _foo2 = require("bar");
 
-var _foo = babelHelpers.interopRequire(_foo2);
+var _foo3 = babelHelpers.interopRequireWildcard(_foo2);
 
-exports.foo = _foo;
+exports.foo = _foo3["default"];

test/core/fixtures/transformation/misc/regression-1149/actual.js

@@ -0,0 +1,3 @@
+function foo(bar) {
+  var bar = bar[0];
+}

test/core/fixtures/transformation/misc/regression-1149/expected.js

@@ -0,0 +1,5 @@
+"use strict";
+
+function foo(bar) {
+  var bar = bar[0];
+}

test/core/fixtures/transformation/misc/regression-lodash-tostring-import/actual.js

@@ -0,0 +1,2 @@
+import toString from "foo";
+toString;

test/core/fixtures/transformation/misc/regression-lodash-tostring-import/expected.js

@@ -0,0 +1,9 @@
+"use strict";
+
+var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
+
+var _toString = require("foo");
+
+var _toString2 = _interopRequireWildcard(_toString);
+
+_toString2["default"];

test/core/fixtures/transformation/optimisation.react.constant-elements/function-parameter/expected.js

@@ -11,9 +11,9 @@ function render(text) {
 var Foo2 = require("Foo");
 
 function createComponent(text) {
-  var _ref = <Foo2>{text}</Foo2>;
+  var _ref2 = <Foo2>{text}</Foo2>;
 
   return function render() {
-    return _ref;
+    return _ref2;
   };
 }

test/core/fixtures/transformation/optimisation.react.constant-elements/html-element/expected.js

@@ -6,8 +6,8 @@ function render() {
   return _ref;
 }
 
-var _ref = <div className="foo"><input type="checkbox" checked={true} /></div>;
+var _ref2 = <div className="foo"><input type="checkbox" checked={true} /></div>;
 
 function render() {
-  return _ref;
+  return _ref2;
 }

test/core/fixtures/transformation/optimisation.react.constant-elements/inline-elements/expected.js

@@ -12,7 +12,7 @@ function render() {
 
 function render() {
   var text = getText();
-  var _ref = {
+  var _ref2 = {
     type: "foo",
     ref: null,
     props: {
@@ -21,6 +21,6 @@ function render() {
     key: null
   };
   return function () {
-    return _ref;
+    return _ref2;
   };
-}
+}

test/core/fixtures/transformation/react/arrow-functions/expected.js

@@ -7,9 +7,9 @@ var foo = function foo() {
 };
 
 var bar = function bar() {
-  var _this = this;
+  var _this2 = this;
 
   return function () {
-    return React.createElement(_this.foo, null);
+    return React.createElement(_this2.foo, null);
   };
-};
+};

test/core/fixtures/transformation/react/display-name-export-default/expected.js

@@ -1,7 +1,11 @@
-module.exports = React.createClass({
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = React.createClass({
   displayName: "actual",
 
   render: function render() {
     return null;
   }
 });
+module.exports = exports["default"];

test/core/fixtures/transformation/runtime/full/expected.js

@@ -4,8 +4,6 @@ var _core = require("babel-runtime/core-js")["default"];
 
 var _regeneratorRuntime = require("babel-runtime/regenerator")["default"];
 
-var _interopRequire = require("babel-runtime/helpers/interop-require")["default"];
-
 var _interopRequireWildcard = require("babel-runtime/helpers/interop-require-wildcard")["default"];
 
 _core.Object.defineProperty(exports, "__esModule", {
@@ -30,12 +28,12 @@ exports.giveWord = giveWord;
 
 var _foo = require("someModule");
 
-var foo = _interopRequire(_foo);
+var _foo2 = _interopRequireWildcard(_foo);
 
 var bar = _interopRequireWildcard(_foo);
 
 var myWord = _core.Symbol("abc");
 exports.myWord = myWord;
 
-foo;
-bar;
+_foo2["default"];
+bar;

test/core/fixtures/transformation/runtime/modules-common/expected.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var _interopRequire = require("babel-runtime/helpers/interop-require")["default"];
+var _interopRequireWildcard = require("babel-runtime/helpers/interop-require-wildcard")["default"];
 
 var _foo = require("foo");
 
-var foo = _interopRequire(_foo);
+var _foo2 = _interopRequireWildcard(_foo);
 
-foo;
+_foo2["default"];

test/core/fixtures/transformation/spec.function-name/own-bindings/expected.js

@@ -17,9 +17,9 @@ var f = (function (_f) {
 })(function (f) {});
 
 var obj = {
-  f: (function (_f) {
-    function f(_x) {
-      return _f.apply(this, arguments);
+  f: (function (_f2) {
+    function f(_x2) {
+      return _f2.apply(this, arguments);
     }
 
     f.toString = function () {

test/core/util.js

@@ -57,6 +57,11 @@ suite("util", function () {
     assert.deepEqual(util.list(""), []);
     assert.deepEqual(util.list("foo"), ["foo"]);
     assert.deepEqual(util.list("foo,bar"), ["foo", "bar"]);
+    assert.deepEqual(util.list(["foo", "bar"]), ["foo", "bar"]);
+    assert.deepEqual(util.list(/foo/), [/foo/]);
+
+    var date = new Date;
+    assert.deepEqual(util.list(date), [date]);
   });
 
   test("arrayify", function () {