v5.4.4

correct cli source map file: value, honor sourceRoot when using -o opion

CHANGELOG.md

@@ -13,6 +13,43 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 5.4.4
+
+ * **Bug Fix**
+  * Fix bug where replacing variable declarations in the head of a `for` loop would turn them into `ExpressionStatement`s.
+  * Fix renaming of assignment expressions that were non-identifiers ie. patterns.
+  * Force space before `class` `id` to avoid breaking named classes when using `compact` mode.
+  * Add assignment pattern explosion to avoid initial duplicate nodes.
+  * Ignore this and arguments when performing TCO on shadowed functions.
+ * **Polish**
+  * Rename `sourceMapName` option to `sourceMapTarget`. Thanks [@getify](https://github.com/getify)!
+  * Better detection of completion records, ignore those in `Function`s.
+  * Clarified descriptions of the options that are enabled by default.
+  * Resolve `\`babel-plugin-${name}\`` plugin names **before** just checking the `name`. Thanks [@jquense](https://github.com/jquense)!
+  * Update AMD module formatter to add import default remapping.
+
+## 5.4.3
+
+ * **Bug Fix**
+  * Fix `module` being incorrectly rewritten when used as in an export declaration.
+  * When performing single-reference inlining, ensure that the single reference isn't a child of the binding itself.
+  * Fix a bug in `minification.deadCodeElimination` where a new binding instance was being created for local class bindings instead of just inheriting the parent one.
+  * Fix bug with paren printing in `compact` and `retainLines` mode where a left paren was already printed before catching up.
+ * **Internal**
+  * Handle contexts for paths much better. This will ensure that the path node location info is in sync.
+
+## 5.4.2
+
+ * **Polish**
+  * `ignore` and `only` patterns are now **very** liberal. The pattern can now exist anywhere in the path.
+
+## 5.4.1
+
+ * **Bug Fix**
+  * Add missing `slash` dependency. Thanks [@browncolyn](https://github.com/browncolyn)!
+ * **Polish**
+  * Clean up `shouldIgnore` algorithm to work how you'd expect rather than being a hacky piece of shit. It now crawls the entire path, checking each section of it against the input ignore/only patterns. This means that the pattern `foo` will ignore the paths `foo/bar.js`, `bar/foo` etc.
+
 ## 5.4.0
 
  * **New Feature**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-core",
-  "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.4.0",
+  "description": "A compiler for writing next generation JavaScript",
+  "version": "5.4.4",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
@@ -41,6 +41,7 @@
     "esutils": "^2.0.0",
     "fs-readdir-recursive": "^0.1.0",
     "globals": "^6.4.0",
+    "home-or-tmp": "^1.0.0",
     "is-integer": "^1.0.4",
     "js-tokens": "1.0.0",
     "leven": "^1.0.1",
@@ -60,8 +61,7 @@
     "source-map-support": "^0.2.10",
     "strip-json-comments": "^1.0.2",
     "to-fast-properties": "^1.0.0",
-    "trim-right": "^1.0.0",
-    "user-home": "^1.1.1"
+    "trim-right": "^1.0.0"
   },
   "devDependencies": {
     "babel": "5.3.1",

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

@@ -14,7 +14,8 @@ module.exports = function (commander, filenames, opts) {
     var dest = path.join(commander.outDir, relative);
 
     var data = util.compile(src, {
-      sourceFileName: slash(path.relative(dest + "/..", src))
+      sourceFileName: slash(path.relative(dest + "/..", src)),
+      sourceMapTarget: path.basename(relative)
     });
     if (data.ignored) return;
 

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

@@ -16,7 +16,8 @@ module.exports = function (commander, filenames, opts) {
 
   var buildResult = function () {
     var map = new sourceMap.SourceMapGenerator({
-      file: slash(commander.outFile || "stdout")
+      file: path.basename(commander.outFile) || "stdout",
+      sourceRoot: opts.sourceRoot
     });
 
     var code = "";

packages/babel-cli/package.json

@@ -1,14 +1,14 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.3.3",
+  "version": "5.4.3",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
   "repository": "babel/babel",
   "preferGlobal": true,
   "dependencies": {
-    "babel-core": "^5.3.3",
+    "babel-core": "^5.4.3",
     "chokidar": "^1.0.0",
     "commander": "^2.6.0",
     "convert-source-map": "^1.1.0",
@@ -17,7 +17,8 @@
     "lodash": "^3.2.0",
     "output-file-sync": "^1.1.0",
     "path-is-absolute": "^1.0.0",
-    "source-map": "^0.4.0"
+    "source-map": "^0.4.0",
+    "slash": "^1.0.0"
   },
   "bin": {
     "babel": "./bin/babel/index.js",

packages/babel-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "5.3.3",
+  "version": "5.4.3",
   "license": "MIT",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",

src/babel/api/node.js

@@ -61,8 +61,8 @@ export function parse(code, opts = {}) {
   opts.sourceType = "module";
   opts.ecmaVersion = Infinity;
   opts.plugins = {
-    flow: true,
-    jsx:  true
+    jsx:  true,
+    flow: true
   };
   opts.features = {};
 

src/babel/api/register/cache.js

@@ -1,9 +1,9 @@
 import path from "path";
 import os from "os";
 import fs from "fs";
-import userHome from "user-home";
+import homeOrTmp from "home-or-tmp";
 
-const FILENAME = process.env.BABEL_CACHE_PATH || path.join(userHome || os.tmpdir(), ".babel.json");
+const FILENAME = process.env.BABEL_CACHE_PATH || path.join(homeOrTmp, ".babel.json");
 var data = {};
 
 export function save() {

src/babel/api/register/node.js

@@ -53,6 +53,9 @@ var compile = function (filename) {
 
   var cacheKey = `${filename}:${JSON.stringify(opts)}:${babel.version}`;
 
+  var env = process.env.BABEL_ENV || process.env.NODE_ENV;
+  if (env) cacheKey += `:${env}`;
+
   if (cache) {
     var cached = cache[cacheKey];
     if (cached && cached.mtime === mtime(filename)) {

src/babel/generation/buffer.js

@@ -117,8 +117,9 @@ export default class Buffer {
 
   _removeSpacesAfterLastNewline() {
     var lastNewlineIndex = this.buf.lastIndexOf("\n");
-    if (lastNewlineIndex === -1)
+    if (lastNewlineIndex === -1) {
       return;
+    }
 
     var index = this.buf.length - 1;
     while (index > lastNewlineIndex) {

src/babel/generation/generators/classes.js

@@ -3,7 +3,7 @@ export function ClassDeclaration(node, print) {
   this.push("class");
 
   if (node.id) {
-    this.space();
+    this.push(" ");
     print(node.id);
   }
 

src/babel/generation/generators/types.js

@@ -39,6 +39,12 @@ export function Property(node, print) {
       print(node.key);
       this.push("]");
     } else {
+      // print `({ foo: foo = 5 } = {})` as `({ foo = 5 } = {});`
+      if (t.isAssignmentPattern(node.value) && t.isIdentifier(node.key) && node.key.name === node.value.left.name) {
+        print(node.value);
+        return;
+      }
+
       print(node.key);
 
       // shorthand!

src/babel/generation/index.js

@@ -149,11 +149,12 @@ class CodeGenerator {
     return print;
   }
 
-  catchUp(node, parent) {
+  catchUp(node, parent, leftParenPrinted) {
     // catch up to this nodes newline if we're behind
     if (node.loc && this.format.retainLines && this.buffer.buf) {
       var needsParens = false;
-      if (parent && this.position.line < node.loc.start.line && t.isTerminatorless(parent)) {
+      if (!leftParenPrinted && parent &&
+          this.position.line < node.loc.start.line && t.isTerminatorless(parent)) {
         needsParens = true;
         this._push("(");
       }
@@ -216,7 +217,7 @@ class CodeGenerator {
 
       this.printLeadingComments(node, parent);
 
-      var needsParensFromCatchup = this.catchUp(node, parent);
+      var needsParensFromCatchup = this.catchUp(node, parent, needsParens);
 
       newline(true);
 
@@ -330,7 +331,6 @@ class CodeGenerator {
 
   _printComments(comments) {
     if (this.format.compact) return;
-
     if (!this.format.comments) return;
     if (!comments || !comments.length) return;
 

src/babel/generation/source-map.js

@@ -8,7 +8,7 @@ export default class SourceMap {
 
     if (opts.sourceMaps) {
       this.map = new sourceMap.SourceMapGenerator({
-        file: opts.sourceMapName,
+        file: opts.sourceMapTarget,
         sourceRoot: opts.sourceRoot
       });
 

src/babel/helpers/parse.js

@@ -27,7 +27,6 @@ export default function (code, opts = {}) {
   }
 
   var ast = acorn.parse(code, parseOpts);
-
   estraverse.attachComments(ast, comments, tokens);
   ast = normalizeAst(ast, comments, tokens);
   return ast;

src/babel/messages.js

@@ -22,6 +22,7 @@ export const MESSAGES = {
   missingTemplatesDirectory: "no templates directory - this is most likely the result of a broken `npm publish`. Please report to https://github.com/babel/babel/issues",
   unsupportedOutputType: "Unsupported output type $1",
   illegalMethodName: "Illegal method name $1",
+  lostTrackNodePath: "We lost track of this nodes position, likely because the AST was directly manipulated",
 
   traverseNeedsParent: "Must pass a scope and parentPath unless traversing a Program/File got a $1 node",
   traverseVerifyRootFunction: "You passed `traverse()` a function when it expected a visitor object, are you sure you didn't mean `{ enter: Function }`?",

src/babel/transformation/file/index.js

@@ -168,7 +168,7 @@ export default class File {
 
     defaults(opts, {
       sourceFileName: opts.filenameRelative,
-      sourceMapName:  opts.filenameRelative
+      sourceMapTarget:  opts.filenameRelative
     });
 
     //
@@ -463,7 +463,7 @@ export default class File {
   }
 
   _addAst(ast) {
-    this.path  = TraversalPath.get(null, null, ast, ast, "program", this);
+    this.path  = TraversalPath.get(null, ast, ast, "program", this).setContext(null, this);
     this.scope = this.path.scope;
     this.ast   = ast;
   }

src/babel/transformation/file/options.json

@@ -43,7 +43,7 @@
   "nonStandard": {
     "type": "boolean",
     "default": true,
-    "description": "enable support for JSX and Flow"
+    "description": "enable/disable support for JSX and Flow (on by default)"
   },
 
   "experimental": {
@@ -51,7 +51,7 @@
   },
 
   "highlightCode": {
-    "description": "ANSI syntax highlight code frames",
+    "description": "enable/disable ANSI syntax highlighting of code frames (on by default)",
     "type": "boolean",
     "default": true
   },
@@ -148,7 +148,7 @@
   "comments": {
     "type": "boolean",
     "default": true,
-    "description": "output comments in generated output"
+    "description": "strip/output comments in generated output (on by default)"
   },
 
   "compact": {
@@ -197,6 +197,11 @@
   },
 
   "sourceMapName": {
+    "alias": "sourceMapTarget",
+    "description": "DEPRECATED - Please use sourceMapTarget"
+  },
+
+  "sourceMapTarget": {
     "type": "string",
     "description": "set `file` on returned source map"
   },

src/babel/transformation/file/plugin-manager.js

@@ -35,7 +35,7 @@ export default class PluginManager {
     var match = name.match(/^(.*?):(after|before)$/);
     if (match) [, name, position] = match;
 
-    var loc = util.resolveRelative(name) || util.resolveRelative(`babel-plugin-${name}`);
+    var loc = util.resolveRelative(`babel-plugin-${name}`) || util.resolveRelative(name);
     if (loc) {
       return {
         position: position,

src/babel/transformation/modules/amd.js

@@ -6,8 +6,8 @@ import * as util from  "../../util";
 import * as t from "../../types";
 
 export default class AMDFormatter extends DefaultFormatter {
-  init() {
-    CommonFormatter.prototype._init.call(this, this.hasNonDefaultExports);
+  setup() {
+    CommonFormatter.prototype._setup.call(this, this.hasNonDefaultExports);
   }
 
   buildDependencyLiterals() {
@@ -92,9 +92,9 @@ export default class AMDFormatter extends DefaultFormatter {
       // import foo from "foo";
       var uid = this.scope.generateUidIdentifier(specifier.local.name);
       nodes.push(t.variableDeclaration("var", [
-        t.variableDeclarator(uid, t.callExpression(this.file.addHelper("interop-require"), [ref]))
+        t.variableDeclarator(uid, t.callExpression(this.file.addHelper("interop-require-default"), [ref]))
       ]));
-      ref = uid;
+      ref = t.memberExpression(uid, t.identifier("default"));
     } else {
       // import { foo } from "foo";
       var imported = specifier.imported;

src/babel/transformation/modules/common.js

@@ -4,11 +4,11 @@ import * as util from  "../../util";
 import * as t from "../../types";
 
 export default class CommonJSFormatter extends DefaultFormatter {
-  init() {
-    this._init(this.hasLocalExports);
+  setup() {
+    this._setup(this.hasLocalExports);
   }
 
-  _init(conditional) {
+  _setup(conditional) {
     var file  = this.file;
     var scope = file.scope;
 

src/babel/transformation/modules/system.js

@@ -8,41 +8,39 @@ import map from "lodash/collection/map";
 import * as t from "../../types";
 
 var hoistVariablesVisitor = {
-  enter(node, parent, scope, state) {
-    if (t.isFunction(node)) {
-      // nothing inside is accessible
-      return this.skip();
+  Function() {
+    // nothing inside is accessible
+    this.skip();
+  },
+
+  VariableDeclaration(node, parent, scope, state) {
+    if (node.kind !== "var" && !t.isProgram(parent)) { // let, const
+      // can't be accessed
+      return;
     }
 
-    if (t.isVariableDeclaration(node)) {
-      if (node.kind !== "var" && !t.isProgram(parent)) { // let, const
-        // can't be accessed
-        return;
+    // ignore block hoisted nodes as these can be left in
+    if (state.formatter._canHoist(node)) return;
+
+    var nodes = [];
+
+    for (var i = 0; i < node.declarations.length; i++) {
+      var declar = node.declarations[i];
+      state.hoistDeclarators.push(t.variableDeclarator(declar.id));
+      if (declar.init) {
+        // no initializer so we can just hoist it as-is
+        var assign = t.expressionStatement(t.assignmentExpression("=", declar.id, declar.init));
+        nodes.push(assign);
       }
-
-      // ignore block hoisted nodes as these can be left in
-      if (state.formatter._canHoist(node)) return;
-
-      var nodes = [];
-
-      for (var i = 0; i < node.declarations.length; i++) {
-        var declar = node.declarations[i];
-        state.hoistDeclarators.push(t.variableDeclarator(declar.id));
-        if (declar.init) {
-          // no initializer so we can just hoist it as-is
-          var assign = t.expressionStatement(t.assignmentExpression("=", declar.id, declar.init));
-          nodes.push(assign);
-        }
-      }
-
-      // for (var i in test)
-      // for (var i = 0;;)
-      if (t.isFor(parent) && parent.left === node) {
-        return node.declarations[0].id;
-      }
-
-      return nodes;
     }
+
+    // for (var i in test)
+    // for (var i = 0;;)
+    if (t.isFor(parent) && (parent.left === node || parent.init === node)) {
+      return node.declarations[0].id;
+    }
+
+    return nodes;
   }
 };
 

src/babel/transformation/transformers/es6/block-scoping.js

@@ -84,8 +84,6 @@ export function BlockStatement(block, parent, scope, file) {
 export { BlockStatement as Program };
 
 function replace(node, parent, scope, remaps) {
-  if (!t.isReferencedIdentifier(node, parent)) return;
-
   var remap = remaps[node.name];
   if (!remap) return;
 
@@ -100,11 +98,21 @@ function replace(node, parent, scope, remaps) {
 }
 
 var replaceVisitor = {
-  enter: replace
+  ReferencedIdentifier: replace,
+
+  AssignmentExpression(node, parent, scope, remaps) {
+    var ids = this.getBindingIdentifiers();
+    for (var name in ids) {
+      replace(ids[name], node, scope, remaps);
+    }
+  },
 };
 
 function traverseReplace(node, parent, scope, remaps) {
-  replace(node, parent, scope, remaps);
+  if (t.isIdentifier(node)) {
+    replace(node, parent, scope, remaps);
+  }
+
   scope.traverse(node, replaceVisitor, remaps);
 }
 

src/babel/transformation/transformers/es6/for-of.js

@@ -33,7 +33,7 @@ export function ForOfStatement(node, parent, scope, file) {
     this.parentPath.replaceWithMultiple(build.node);
     this.remove();
   } else {
-    this.replaceWithMultiple(build.node);
+    return build.node;
   }
 }
 

src/babel/transformation/transformers/es6/tail-call.js

@@ -44,12 +44,14 @@ var visitor = {
   },
 
   ThisExpression(node, parent, scope, state) {
-    state.needsThis = true;
-    state.thisPaths.push(this);
+    if (!state.isShadowed) {
+      state.needsThis = true;
+      state.thisPaths.push(this);
+    }
   },
 
   ReferencedIdentifier(node, parent, scope, state) {
-    if (node.name === "arguments") {
+    if (node.name === "arguments" && !state.isShadowed) {
       state.needsArguments = true;
       state.argumentsPaths.push(this);
     }
@@ -67,8 +69,9 @@ class TailCallTransformer {
     this.needsThis = false;
     this.thisPaths = [];
 
-    this.ownerId = path.node.id;
-    this.vars    = [];
+    this.isShadowed = path.isArrowFunctionExpression() || path.is("shadow");
+    this.ownerId    = path.node.id;
+    this.vars       = [];
 
     this.scope = scope;
     this.path  = path;

src/babel/transformation/transformers/internal/explode.js

@@ -5,9 +5,9 @@ export var metadata = {
   group: "builtin-setup"
 };
 
-function buildClone(bindingKey, refKey) {
+function buildClone(bindingKey, refKey, check?) {
   return function (node) {
-    if (node[bindingKey] === node[refKey]) {
+    if (node[bindingKey] === node[refKey] || (check && check(node))) {
       node[refKey] = t.removeComments(clone(node[refKey]));
     }
   };
@@ -25,6 +25,9 @@ function buildListClone(listKey, bindingKey, refKey) {
   };
 }
 
-export var Property = buildClone("value", "key");
+export var Property = buildClone("value", "key", function (node) {
+  return t.isAssignmentPattern(node.value) && node.value.left === node.key;
+});
+
 export var ExportDeclaration = buildListClone("specifiers", "local", "exported");
 export var ImportDeclaration = buildListClone("specifiers", "local", "imported");

src/babel/transformation/transformers/internal/modules.js

@@ -85,18 +85,28 @@ export function ExportNamedDeclaration(node, parent, scope) {
   }
 }
 
-export function Program(node) {
-  var imports = [];
-  var rest = [];
+export var Program = {
+  enter(node) {
+    var imports = [];
+    var rest = [];
 
-  for (var i = 0; i < node.body.length; i++) {
-    var bodyNode = node.body[i];
-    if (t.isImportDeclaration(bodyNode)) {
-      imports.push(bodyNode);
-    } else {
-      rest.push(bodyNode);
+    for (var i = 0; i < node.body.length; i++) {
+      var bodyNode = node.body[i];
+      if (t.isImportDeclaration(bodyNode)) {
+        imports.push(bodyNode);
+      } else {
+        rest.push(bodyNode);
+      }
+    }
+
+    node.body = imports.concat(rest);
+  },
+
+  exit(node, parent, scope, file) {
+    if (!file.transformers["es6.modules"].canTransform()) return;
+
+    if (file.moduleFormatter.setup) {
+      file.moduleFormatter.setup();
     }
   }
-
-  node.body = imports.concat(rest);
-}
+};

src/babel/transformation/transformers/minification/dead-code-elimination.js

@@ -33,6 +33,10 @@ export function ReferencedIdentifier(node, parent, scope) {
   }
   if (!replacement) return;
 
+  if (this.findParent((node) => replacement)) {
+    return;
+  }
+
   t.toExpression(replacement);
   scope.removeBinding(node.name);
   binding.path.remove();

src/babel/transformation/transformers/optimisation/react.constant-elements.js

@@ -35,7 +35,7 @@ export function JSXElement(node, parent, scope, file) {
   this.traverse(immutabilityVisitor, state);
 
   if (state.isImmutable) {
-    return this.hoist();
+    this.hoist();
   } else {
     node._hoisted = true;
   }

src/babel/traversal/context.js

@@ -16,7 +16,9 @@ export default class TraversalContext {
   }
 
   create(node, obj, key) {
-    return TraversalPath.get(this.parentPath, this, node, obj, key);
+    var path = TraversalPath.get(this.parentPath, node, obj, key);
+    path.unshiftContext(this);
+    return path;
   }
 
   visitMultiple(nodes, node, key) {
@@ -37,25 +39,32 @@ export default class TraversalContext {
     }
 
     // visit the queue
-    for (let i = 0; i < queue.length; i++) {
-      var path = queue[i];
+    for (let path of (queue: Array)) {
+      path.update();
+
       if (visited.indexOf(path.node) >= 0) continue;
       visited.push(path.node);
 
-      path.setContext(this.parentPath, this, path.key);
-
       if (path.visit()) {
         stop = true;
         break;
       }
     }
 
+    for (let path of (queue: Array)) {
+      path.shiftContext();
+    }
+
+    this.queue = null;
+
     return stop;
   }
 
   visitSingle(node, key) {
     if (this.shouldVisit(node[key])) {
-      return this.create(node, node, key).visit();
+      var path = this.create(node, node, key);
+      path.visit();
+      path.shiftContext();
     }
   }
 

src/babel/traversal/path/hoister.js

@@ -125,6 +125,6 @@ export default class PathHoister {
       uid = t.jSXExpressionContainer(uid);
     }
 
-    return uid;
+    this.path.replaceWith(uid);
   }
 }

src/babel/traversal/path/index.js

@@ -1,5 +1,6 @@
 import PathHoister from "./hoister";
 import * as virtualTypes from "./virtual-types";
+import * as messages from "../../messages";
 import isBoolean from "lodash/lang/isBoolean";
 import isNumber from "lodash/lang/isNumber";
 import isRegExp from "lodash/lang/isRegExp";
@@ -45,6 +46,7 @@ var hoistVariablesVisitor = explode({
 export default class TraversalPath {
   constructor(parent, container) {
     this.container = container;
+    this.contexts  = [];
     this.parent    = parent;
     this.data      = {};
   }
@@ -53,7 +55,7 @@ export default class TraversalPath {
    * Description
    */
 
-  static get(parentPath: TraversalPath, context?: TraversalContext, parent, container, key, file?: File) {
+  static get(parentPath: TraversalPath, parent, container, key) {
     var targetNode = container[key];
     var paths = container._paths = container._paths || [];
     var path;
@@ -71,7 +73,7 @@ export default class TraversalPath {
       paths.push(path);
     }
 
-    path.setContext(parentPath, context, key, file);
+    path.setup(parentPath, key);
 
     return path;
   }
@@ -178,8 +180,10 @@ export default class TraversalPath {
    */
 
   queueNode(path) {
-    if (this.context && this.context.queue) {
-      this.context.queue.push(path);
+    for (var context of (this.contexts: Array)) {
+      if (context.queue) {
+        context.queue.push(path);
+      }
     }
   }
 
@@ -201,7 +205,7 @@ export default class TraversalPath {
         this._containerInsertBefore(nodes);
       } else if (this.isStatementOrBlock()) {
         if (this.node) nodes.push(this.node);
-        this.container[this.key] = t.blockStatement(nodes);
+        this.node = this.container[this.key] = t.blockStatement(nodes);
       } else {
         throw new Error("We don't know what to do with this node type. We were previously a Statement but we can't fit in here?");
       }
@@ -225,7 +229,7 @@ export default class TraversalPath {
         paths.push(path);
         this.queueNode(path);
       } else {
-        paths.push(TraversalPath.get(this, null, node, this.container, to));
+        paths.push(TraversalPath.get(this, node, this.container, to));
       }
     }
 
@@ -256,10 +260,15 @@ export default class TraversalPath {
 
     do {
       var container = path.container;
+
+      if (path.isFunction()) {
+        return false;
+      }
+
       if (Array.isArray(container) && path.key !== container.length - 1) {
         return false;
       }
-    } while (path = path.parentPath && !path.isProgram());
+    } while ((path = path.parentPath) && !path.isProgram());
 
     return true;
   }
@@ -298,7 +307,7 @@ export default class TraversalPath {
         this._containerInsertAfter(nodes);
       } else if (this.isStatementOrBlock()) {
         if (this.node) nodes.unshift(this.node);
-        this.container[this.key] = t.blockStatement(nodes);
+        this.node = this.container[this.key] = t.blockStatement(nodes);
       } else {
         throw new Error("We don't know what to do with this node type. We were previously a Statement but we can't fit in here?");
       }
@@ -344,6 +353,8 @@ export default class TraversalPath {
    */
 
   setScope(file?) {
+    if (this.opts && this.opts.noScope) return;
+
     var target = this.context || this.parentPath;
     this.scope = TraversalPath.getScope(this, target && target.scope, file);
   }
@@ -352,34 +363,87 @@ export default class TraversalPath {
    * Description
    */
 
-  clearContext() {
-    this.context = null;
-  }
-
-  /**
-   * Description
-   */
-
-  setContext(parentPath, context, key, file?) {
+  setContext(context, file) {
     this.shouldSkip = false;
     this.shouldStop = false;
     this.removed    = false;
 
-    this.parentPath = parentPath || this.parentPath;
-    this.key        = key;
-
     if (context) {
       this.context = context;
       this.state   = context.state;
       this.opts    = context.opts;
     }
 
-    this.type = this.node && this.node.type;
-
     var log = file && this.type === "Program";
     if (log) file.log.debug("Start scope building");
     this.setScope(file);
     if (log) file.log.debug("End scope building");
+
+    return this;
+  }
+
+  /**
+   * Description
+   */
+
+  update() {
+    if (this.node === this.container[this.key]) return;
+
+    // grrr, path key is out of sync. this is likely due to a modification to the AST
+    // not through our path APIs
+
+    if (Array.isArray(this.container)) {
+      for (var i = 0; i < this.container.length; i++) {
+        if (this.container[i] === this.node) {
+          return this.setKey(i);
+        }
+      }
+    } else {
+      for (var key in this.container) {
+        if (this.container[key] === this.node) {
+          return this.setKey(key);
+        }
+      }
+    }
+
+    throw new Error(messages.get("lostTrackNodePath"));
+  }
+
+  /**
+   * Description
+   */
+
+  shiftContext() {
+    this.contexts.shift();
+    this.setContext(this.contexts[0]);
+  }
+
+  /**
+   * Description
+   */
+
+  unshiftContext(context) {
+    this.contexts.unshift(context);
+    this.setContext(context);
+  }
+
+  /**
+   * Description
+   */
+
+  setup(parentPath, key) {
+    this.parentPath = parentPath || this.parentPath;
+    this.setKey(key);
+  }
+
+  /**
+   * Description
+   */
+
+  setKey(key) {
+    this.key  = key;
+    this.node = this.container[this.key];
+    this.type = this.node && this.node.type;
   }
 
   /**
@@ -470,6 +534,7 @@ export default class TraversalPath {
     } else {
       this.container[this.key] = null;
     }
+    this.node = null;
   }
 
   /**
@@ -500,18 +565,6 @@ export default class TraversalPath {
     return err;
   }
 
-  get node() {
-    if (this.removed) {
-      return null;
-    } else {
-      return this.container[this.key];
-    }
-  }
-
-  set node(replacement) {
-    throw new Error("Don't use `path.node = newNode;`, use `path.replaceWith(newNode)` or `path.replaceWithMultiple([newNode])`");
-  }
-
   /**
    * Description
    */
@@ -564,7 +617,7 @@ export default class TraversalPath {
     // doesn't matter, our nodes will be inserted anyway
 
     var container = this.node[containerKey];
-    var path      = TraversalPath.get(this, null, this.node, container, 0);
+    var path      = TraversalPath.get(this, this.node, container, 0);
 
     return path.insertBefore(nodes);
   }
@@ -581,7 +634,7 @@ export default class TraversalPath {
 
     var container = this.node[containerKey];
     var i         = container.length;
-    var path      = TraversalPath.get(this, null, this.node, container, i);
+    var path      = TraversalPath.get(this, this.node, container, i);
 
     return path.replaceWith(nodes, true);
   }
@@ -593,7 +646,7 @@ export default class TraversalPath {
   replaceWithMultiple(nodes: Array<Object>) {
     nodes = this._verifyNodeList(nodes);
     t.inheritsComments(nodes[0], this.node);
-    this.container[this.key] = null;
+    this.node = this.container[this.key] = null;
     this.insertAfter(nodes);
     if (!this.node) this.remove();
   }
@@ -660,7 +713,7 @@ export default class TraversalPath {
     }
 
     // replacing a statement with an expression so wrap it in an expression statement
-    if (this.isPreviousType("Statement") && t.isExpression(replacement)) {
+    if (this.isPreviousType("Statement") && t.isExpression(replacement) && !this.canHaveVariableDeclarationOrExpression()) {
       replacement = t.expressionStatement(replacement);
     }
 
@@ -673,13 +726,27 @@ export default class TraversalPath {
     if (oldNode) t.inheritsComments(replacement, oldNode);
 
     // replace the node
-    this.container[this.key] = replacement;
+    this.node = this.container[this.key] = replacement;
     this.type = replacement.type;
 
     // potentially create new scope
     this.setScope();
   }
 
+  /**
+   * This checks whether or now we're in one of the following positions:
+   *
+   *   for (KEY in right);
+   *   for (KEY;;);
+   *
+   * This is because these spots allow VariableDeclarations AND normal expressions so we need to tell the
+   * path replacement that it's ok to replace this with an expression.
+   */
+
+   canHaveVariableDeclarationOrExpression() {
+      return (this.key === "init" || this.key === "left") && this.parentPath.isFor();
+   }
+
   /**
    * Description
    */
@@ -706,20 +773,22 @@ export default class TraversalPath {
    * Description
    */
 
-  getLastStatements(): Array<TraversalPath> {
+  getCompletionRecords(): Array<TraversalPath> {
     var paths = [];
 
     var add = function (path) {
-      if (path) paths = paths.concat(path.getLastStatements());
+      if (path) paths = paths.concat(path.getCompletionRecords());
     };
 
     if (this.isIfStatement()) {
       add(this.get("consequent"));
       add(this.get("alternate"));
-    } else if (this.isDoExpression()) {
+    } else if (this.isDoExpression() || this.isFor() || this.isWhile()) {
       add(this.get("body"));
     } else if (this.isProgram() || this.isBlockStatement()) {
       add(this.get("body").pop());
+    } else if (this.isFunction()) {
+      return this.get("body").getCompletionRecords();
     } else {
       paths.push(this);
     }
@@ -740,19 +809,27 @@ export default class TraversalPath {
       var container = t.functionExpression(null, [], t.blockStatement(nodes));
       container.shadow = true;
 
+      this.replaceWith(t.callExpression(container, []));
+      this.traverse(hoistVariablesVisitor);
+
       // add implicit returns to all ending expression statements
-      var last = this.getLastStatements();
+      var last = this.get("callee").getCompletionRecords();
       for (var i = 0; i < last.length; i++) {
         var lastNode = last[i];
         if (lastNode.isExpressionStatement()) {
-          lastNode.replaceWith(t.returnStatement(lastNode.node.expression));
+          var loop = lastNode.findParent((node, path) => path.isLoop());
+          if (loop) {
+            var uid = this.get("callee").scope.generateDeclaredUidIdentifier("ret");
+            this.get("callee.body").pushContainer("body", t.returnStatement(uid));
+            lastNode.get("expression").replaceWith(
+              t.assignmentExpression("=", uid, lastNode.node.expression)
+            );
+          } else {
+            lastNode.replaceWith(t.returnStatement(lastNode.node.expression));
+          }
         }
       }
 
-      this.replaceWith(t.callExpression(container, []));
-
-      this.traverse(hoistVariablesVisitor);
-
       return this.node;
     }
   }
@@ -777,9 +854,10 @@ export default class TraversalPath {
       var node = this.node;
       if (!node) return;
 
+      var previousType = this.type;
+
       // call the function with the params (node, parent, scope, state)
       var replacement = fn.call(this, node, this.parent, this.scope, this.state);
-      var previousType = this.type;
 
       if (replacement) {
         this.replaceWith(replacement, true);
@@ -787,7 +865,7 @@ export default class TraversalPath {
 
       if (this.shouldStop || this.shouldSkip || this.removed) return;
 
-      if (replacement && previousType !== this.type) {
+      if (previousType !== this.type) {
         this.queueNode(this);
         return;
       }
@@ -841,7 +919,7 @@ export default class TraversalPath {
    */
 
   getSibling(key) {
-    return TraversalPath.get(this.parentPath, null, this.parent, this.container, key, this.file);
+    return TraversalPath.get(this.parentPath, this.parent, this.container, key, this.file);
   }
 
   /**
@@ -868,10 +946,10 @@ export default class TraversalPath {
     if (Array.isArray(container)) {
       // requested a container so give them all the paths
       return container.map((_, i) => {
-        return TraversalPath.get(this, null, node, container, i);
+        return TraversalPath.get(this, node, container, i).setContext();
       });
     } else {
-      return TraversalPath.get(this, null, node, node, key);
+      return TraversalPath.get(this, node, node, key).setContext();
     }
   }
 
@@ -1105,6 +1183,7 @@ export default class TraversalPath {
    */
 
   traverse(visitor, state) {
+    if (!this.scope) console.log(this.contexts);
     traverse(this.node, visitor, this.scope, state, this);
   }
 

src/babel/traversal/scope/index.js

@@ -553,7 +553,7 @@ export default class Scope {
   isPure(node) {
     if (t.isIdentifier(node)) {
       var bindingInfo = this.getBinding(node.name);
-      return bindingInfo.constant;
+      return bindingInfo && bindingInfo.constant;
     } else {
       return t.isPure(node);
     }
@@ -599,8 +599,13 @@ export default class Scope {
 
     // Class
 
-    if (path.isClass() && path.has("id")) {
-      this.registerBinding("var", path.get("id"));
+    if (path.isClassDeclaration()) {
+      var name = path.node.id.name;
+      this.bindings[name] = this.parent.bindings[name];
+    }
+
+    if (path.isClassExpression() && path.has("id")) {
+      this.registerBinding("var", path);
     }
 
     // Function - params, rest

src/babel/util.js

@@ -1,7 +1,7 @@
 import "./patch";
 
 import escapeRegExp from "lodash/string/escapeRegExp";
-
+import startsWith from "lodash/string/startsWith";
 import cloneDeep from "lodash/lang/cloneDeep";
 import isBoolean from "lodash/lang/isBoolean";
 import * as messages from "./messages";
@@ -69,9 +69,23 @@ export function list(val: string): Array<string> {
 
 export function regexify(val: any): RegExp {
   if (!val) return new RegExp(/.^/);
+
   if (Array.isArray(val)) val = new RegExp(val.map(escapeRegExp).join("|"), "i");
-  if (isString(val)) return minimatch.makeRe(val, { nocase: true });
+
+  if (isString(val)) {
+    // normalise path separators
+    val = slash(val);
+
+    // remove starting wildcards or relative separator if present
+    if (startsWith(val, "./") || startsWith(val, "*/")) val = val.slice(2);
+    if (startsWith(val, "**/")) val = val.slice(3);
+
+    var regex = minimatch.makeRe(val, { nocase: true });
+    return new RegExp(regex.source.slice(1, -1), "i");
+  }
+
   if (isRegExp(val)) return val;
+
   throw new TypeError("illegal type for regexify");
 }
 
@@ -96,6 +110,7 @@ export function booleanify(val: any): boolean {
 
 export function shouldIgnore(filename, ignore, only) {
   filename = slash(filename);
+
   if (only.length) {
     for (var pattern of (only: Array)) {
       if (pattern.test(filename)) return false;

test/core/fixtures/generation/edgecase/return-with-retainlines-and-compact-option/actual.js

@@ -0,0 +1,6 @@
+function foo(l) {
+  return (
+    // hi
+    l
+  );
+}

test/core/fixtures/generation/edgecase/return-with-retainlines-and-compact-option/expected.js

@@ -0,0 +1,4 @@
+function foo(l){
+return (
+
+l);}

test/core/fixtures/generation/edgecase/return-with-retainlines-and-compact-option/options.json

@@ -0,0 +1,4 @@
+{
+  "retainLines": true,
+  "compact": true
+}

test/core/fixtures/transformation/es6.block-scoping/assignment-patterns/actual.js

@@ -0,0 +1,8 @@
+const foo = "foo";
+
+function foobar() {
+  for (let item of [1, 2, 3]) {
+    let foo = "bar";
+    [bar, foo] = [1, 2];
+  }
+}

test/core/fixtures/transformation/es6.block-scoping/assignment-patterns/expected.js

@@ -0,0 +1,14 @@
+"use strict";
+
+var foo = "foo";
+
+function foobar() {
+  var _arr = [1, 2, 3];
+
+  for (var _i = 0; _i < _arr.length; _i++) {
+    var item = _arr[_i];
+    var _foo = "bar";
+    bar = 1;
+    _foo = 2;
+  }
+}

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

@@ -1,10 +1,10 @@
 define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
-  var _foo2 = babelHelpers.interopRequire(_foo);
+  var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
-  var _foo22 = babelHelpers.interopRequire(_foo);
+  var _foo22 = babelHelpers.interopRequireDefault(_foo);
 
-  _foo2;
-  _foo22;
+  _foo2["default"];
+  _foo22["default"];
 });

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

@@ -1,8 +1,8 @@
 define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
-  var _foo2 = babelHelpers.interopRequire(_foo);
+  var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
-  _foo2;
+  _foo2["default"];
   _foo.baz;
 });

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

@@ -5,7 +5,7 @@ define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports,
     value: true
   });
 
-  var _foo2 = babelHelpers.interopRequire(_foo);
+  var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
   exports.test = test;
   var test2 = 5;
@@ -13,7 +13,7 @@ define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports,
   exports.test2 = test2;
   exports["default"] = test;
 
-  _foo2;
+  _foo2["default"];
   _foo;
   _foo.bar;
   _foo.foo;

test/core/fixtures/transformation/es6.modules-common/module-shadow/actual.js

@@ -0,0 +1,3 @@
+export function module() {
+  
+}

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

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.module = _module;
+
+function _module() {}

test/core/fixtures/transformation/es6.modules-system/hoist-function-exports/actual.js

@@ -6,6 +6,8 @@ export function nextOdd(n) {
 
 export var p = 5;
 
+for (var a in b) ;
+
 export var isOdd = (function (isEven) {
   return function (n) {
     return !isEven(n);

test/core/fixtures/transformation/es6.modules-system/hoist-function-exports/expected.js

@@ -1,7 +1,7 @@
 System.register(["./evens"], function (_export) {
   "use strict";
 
-  var isEven, p, isOdd;
+  var isEven, p, a, isOdd;
 
   _export("nextOdd", nextOdd);
 
@@ -18,6 +18,8 @@ System.register(["./evens"], function (_export) {
 
       _export("p", p);
 
+      for (a in b);
+
       isOdd = (function (isEven) {
         return function (n) {
           return !isEven(n);

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

@@ -13,10 +13,10 @@
 })(this, function (exports, _foo) {
   "use strict";
 
-  var _foo2 = babelHelpers.interopRequire(_foo);
+  var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
-  var _foo22 = babelHelpers.interopRequire(_foo);
+  var _foo22 = babelHelpers.interopRequireDefault(_foo);
 
-  _foo2;
-  _foo22;
+  _foo2["default"];
+  _foo22["default"];
 });

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

@@ -13,7 +13,7 @@
 })(this, function (exports, _foo) {
   "use strict";
 
-  var _foo2 = babelHelpers.interopRequire(_foo);
+  var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
   _foo.baz;
 });

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

@@ -17,7 +17,7 @@
     value: true
   });
 
-  var _foo2 = babelHelpers.interopRequire(_foo);
+  var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
   exports.test = test;
   var test2 = 5;

test/core/fixtures/transformation/es6.tail-call/shadow/actual.js

@@ -0,0 +1,8 @@
+(function(){
+  var foo = () => {
+    this;
+    arguments;
+    foo();
+  };
+  foo();
+});

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

@@ -0,0 +1,13 @@
+"use strict";
+
+(function () {
+  var _this = this,
+      _arguments = arguments;
+
+  var foo = function foo() {
+    _this;
+    _arguments;
+    foo();
+  };
+  foo();
+});

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1408/actual.js

@@ -0,0 +1,4 @@
+class A {
+  constructor() { this.value = 12345; }
+}
+export default new A();

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1408/exec.js

@@ -0,0 +1,3 @@
+import aInstance from './imported';
+
+assert.equal(aInstance.value, 12345);

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1408/expected.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var A = function A() {
+  babelHelpers.classCallCheck(this, A);
+  this.value = 12345;
+};
+
+exports["default"] = new A();
+module.exports = exports["default"];
+

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1408/imported.js

@@ -0,0 +1,4 @@
+class A {
+  constructor() { this.value = 12345; }
+}
+export default new A();

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1409/actual.js

@@ -0,0 +1,5 @@
+class A {
+  f() { return 1235; }
+}
+
+let a = new A();

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1409/exec.js

@@ -0,0 +1,5 @@
+class A {
+  k() { return 12345; }
+}
+
+assert.equal((new A()).k(), 12345);

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1409/expected.js

@@ -0,0 +1,17 @@
+"use strict";
+
+var A = (function () {
+  function A() {
+    babelHelpers.classCallCheck(this, A);
+  }
+
+  babelHelpers.createClass(A, [{
+    key: "f",
+    value: function f() {
+      return 1235;
+    }
+  }]);
+  return A;
+})();
+
+var a = new A();

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1520/actual.js

@@ -0,0 +1 @@
+import x from 'y';

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1520/expected.js

@@ -0,0 +1,6 @@
+'use strict';
+
+var _y = require('y');
+
+var _y2 = babelHelpers.interopRequireDefault(_y);
+

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1522/actual.js

@@ -0,0 +1,3 @@
+import x from 'y';
+
+x.foo = function (err) {};

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1522/exec.js

@@ -0,0 +1,5 @@
+import x from 'y';
+
+x.z = function (a) { return 1 + a; };
+
+assert(x.z(x.value), 43);

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1522/expected.js

@@ -0,0 +1,8 @@
+'use strict';
+
+var _y = require('y');
+
+var _y2 = babelHelpers.interopRequireDefault(_y);
+
+_y2['default'].foo = function (err) {};
+

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1522/y.js

@@ -0,0 +1,2 @@
+let y = { value: 42 };
+export default y;

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1523/actual.js

@@ -0,0 +1,5 @@
+function f(a) {
+  return !a;
+}
+
+export { f };

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1523/expected.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function f(a) {
+  return !a;
+}
+
+exports.f = f;
+

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1524/actual.js

@@ -0,0 +1,13 @@
+function* x() {
+  for (let a of []) {
+    for (let b of a) {
+      yield 1;
+    }
+  }
+}
+
+function y() {
+  return [...x()];
+}
+
+export { y };

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1524/expected.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function* x() {
+  var _arr = [];
+
+  for (var _i = 0; _i < _arr.length; _i++) {
+    var a = _arr[_i];var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = a[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var b = _step.value;
+
+        yield 1;
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator["return"]) {
+          _iterator["return"]();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+  }
+}
+
+function y() {
+  return [].concat(babelHelpers.toConsumableArray(x()));
+}
+
+exports.y = y;
+

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1546/actual.js

@@ -0,0 +1,7 @@
+class X {
+  Y() {
+    return new X();
+  }
+}
+
+export { X };

test/core/fixtures/transformation/minification.dead-code-elimination/issue-1546/expected.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var X = (function () {
+  function X() {
+    babelHelpers.classCallCheck(this, X);
+  }
+
+  babelHelpers.createClass(X, [{
+    key: "Y",
+    value: function Y() {
+      return new X();
+    }
+  }]);
+  return X;
+})();
+
+exports.X = X;
+

test/core/fixtures/transformation/minification.dead-code-elimination/options.json

@@ -0,0 +1,6 @@
+{
+  "externalHelpers": true,
+  "noCheckAst": true,
+  "blacklist": ["regenerator"],
+  "optional": ["minification.deadCodeElimination"]
+}

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

@@ -1,7 +1,7 @@
-define(["exports", "foo", "babel-runtime/helpers/interop-require"], function (exports, _foo, _babelRuntimeHelpersInteropRequire) {
+define(["exports", "foo", "babel-runtime/helpers/interop-require-default"], function (exports, _foo, _babelRuntimeHelpersInteropRequireDefault) {
   "use strict";
 
-  var _foo2 = (0, _babelRuntimeHelpersInteropRequire["default"])(_foo);
+  var _foo2 = (0, _babelRuntimeHelpersInteropRequireDefault["default"])(_foo);
 
-  _foo2;
-});
+  _foo2["default"];
+});

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

@@ -1,17 +1,17 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "foo", "babel-runtime/helpers/interop-require"], factory);
+    define(["exports", "foo", "babel-runtime/helpers/interop-require-default"], factory);
   } else if (typeof exports !== "undefined") {
-    factory(exports, require("foo"), require("babel-runtime/helpers/interop-require"));
+    factory(exports, require("foo"), require("babel-runtime/helpers/interop-require-default"));
   } else {
     var mod = {
       exports: {}
     };
-    factory(mod.exports, global.foo, global._interopRequire);
+    factory(mod.exports, global.foo, global._interopRequireDefault);
     global.actual = mod.exports;
   }
-})(this, function (exports, _foo, _babelRuntimeHelpersInteropRequire) {
+})(this, function (exports, _foo, _babelRuntimeHelpersInteropRequireDefault) {
   "use strict";
 
-  var _foo2 = (0, _babelRuntimeHelpersInteropRequire["default"])(_foo);
-});
+  var _foo2 = (0, _babelRuntimeHelpersInteropRequireDefault["default"])(_foo);
+});

test/core/fixtures/transformation/spec.function-name/shorthand-property/actual.js

@@ -9,3 +9,12 @@ var bar = {
     get(arg, "baz");
   }
 };
+
+var f = function ({ foo = "bar" }) {
+  var obj = {
+    // same name as parameter
+    foo: function () {
+      foo;
+    }
+  };
+};

test/core/fixtures/transformation/spec.function-name/shorthand-property/expected.js

@@ -11,3 +11,16 @@ var bar = {
     _get(arg, "baz");
   }
 };
+
+var f = function f(_ref) {
+  var _ref$foo = _ref.foo;
+
+  var _foo = _ref$foo === undefined ? "bar" : _ref$foo;
+
+  var obj = {
+    // same name as parameter
+    foo: function foo() {
+      _foo;
+    }
+  };
+};

test/core/traverse.js

@@ -52,6 +52,22 @@ suite("traverse", function () {
 
   var body = ast.body;
 
+  test("traverse replace", function () {
+    var replacement = {
+      type: "Literal",
+      value: "foo"
+    };
+    var ast2 = _.cloneDeep(ast);
+
+    traverse(ast2, {
+      enter: function (node) {
+        if (node.type === "ThisExpression") return replacement;
+      }
+    });
+
+    assert.equal(ast2.body[1].expression.left.object, replacement);
+  });
+
   test("traverse", function () {
     var expect = [
       body[0], body[0].declarations[0], body[0].declarations[0].id, body[0].declarations[0].init,
@@ -95,22 +111,6 @@ suite("traverse", function () {
     assert.deepEqual(actual, expect);
   });
 
-  test("traverse replace", function () {
-    var replacement = {
-      type: "Literal",
-      value: "foo"
-    };
-    var ast2 = _.cloneDeep(ast);
-
-    traverse(ast2, {
-      enter: function (node) {
-        if (node.type === "ThisExpression") return replacement;
-      }
-    });
-
-    assert.equal(ast2.body[1].expression.left.object, replacement);
-  });
-
   test("hasType", function () {
     assert.ok(traverse.hasType(ast, null, "ThisExpression"));
     assert.ok(!traverse.hasType(ast, null, "ThisExpression", ["AssignmentExpression"]));

test/core/util.js

@@ -80,9 +80,16 @@ suite("util", function () {
     assert.deepEqual(util.regexify(null), /.^/);
     assert.deepEqual(util.regexify(""), /.^/);
     assert.deepEqual(util.regexify(["foo", "bar"]), /foo|bar/i);
-    assert.deepEqual(util.regexify("foobar"), /^(?:(?=.)foobar)$/i);
+    assert.deepEqual(util.regexify("foobar"), /(?:(?=.)foobar)/i);
     assert.deepEqual(util.regexify(/foobar/), /foobar/);
 
+    assert.ok(util.regexify("foo/bar").test("bar/foo/bar"));
+    assert.ok(util.regexify("foo/*").test("foo/bar.js"));
+    assert.ok(util.regexify("*.js").test("bar.js"));
+    assert.ok(util.regexify("./foo").test("foo"));
+    assert.ok(util.regexify("./foo/bar.js").test("foo/bar.js"));
+    assert.ok(util.regexify("foobar").test("foobar"));
+
     assert.throws(function () {
       util.regexify({});
     }, /illegal type for regexify/);