v5.1.12

Fix ignore/only on Windows

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-core",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.1.11",
+  "version": "5.1.12",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",
@@ -29,8 +29,8 @@
   "dependencies": {
     "ast-types": "~0.7.0",
     "chalk": "^1.0.0",
-    "convert-source-map": "^1.0.0",
-    "core-js": "^0.8.3",
+    "convert-source-map": "^1.1.0",
+    "core-js": "^0.9.0",
     "debug": "^2.1.1",
     "detect-indent": "^3.0.0",
     "estraverse": "^3.0.0",

packages/babel-cli/package.json

@@ -1,19 +1,19 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.1.10",
+  "version": "5.1.11",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",
   "preferGlobal": true,
   "dependencies": {
-    "babel-core": "^5.1.10",
+    "babel-core": "^5.1.11",
     "chokidar": "^1.0.0",
     "commander": "^2.6.0",
     "fs-readdir-recursive": "^0.1.0",
     "output-file-sync": "^1.1.0",
     "lodash": "^3.2.0",
-    "convert-source-map": "^0.5.0",
+    "convert-source-map": "^1.1.0",
     "source-map": "^0.4.0",
     "path-is-absolute": "^1.0.0"
   },
@@ -22,4 +22,4 @@
     "babel-node": "./bin/babel-node",
     "babel-external-helpers": "./bin/babel-external-helpers"
   }
-}
+}

packages/babel-runtime/package.json

@@ -1,10 +1,10 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "5.1.10",
+  "version": "5.1.11",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "dependencies": {
-    "core-js": "^0.8.0"
+    "core-js": "^0.9.0"
   }
-}
+}

src/acorn/src/lval.js

@@ -21,6 +21,7 @@ pp.toAssignable = function(node, isBinding) {
       node.type = "ObjectPattern"
       for (let i = 0; i < node.properties.length; i++) {
         let prop = node.properties[i]
+        if (prop.type === "SpreadProperty") continue;
         if (prop.kind !== "init") this.raise(prop.key.start, "Object pattern can't contain getter or setter")
         this.toAssignable(prop.value, isBinding)
       }

src/babel/api/register/node.js

@@ -7,6 +7,7 @@ import * as babel from "../node";
 import each from "lodash/collection/each";
 import * as util from  "../../util";
 import fs from "fs";
+import slash from "slash";
 
 sourceMapSupport.install({
   handleUncaughtExceptions: false,
@@ -76,6 +77,7 @@ var compile = function (filename) {
 };
 
 var shouldIgnore = function (filename) {
+  filename = slash(filename);
   return (ignoreRegex && ignoreRegex.test(filename)) || (onlyRegex && !onlyRegex.test(filename));
 };
 

src/babel/generation/generators/jsx.js

@@ -45,7 +45,7 @@ export function JSXElement(node, print) {
   this.indent();
   each(node.children, (child) => {
     if (t.isLiteral(child)) {
-      this.push(child.value);
+      this.push(child.value, true);
     } else {
       print(child);
     }

src/babel/tools/resolve-rc.js

@@ -17,9 +17,17 @@ function exists(filename) {
 export default function (loc, opts = {}) {
   var rel = ".babelrc";
 
+  if (!opts.babelrc) {
+    opts.babelrc = [];
+  }
+
   function find(start, rel) {
     var file = path.join(start, rel);
 
+    if (opts.babelrc.indexOf(file) >= 0) {
+      return;
+    }
+
     if (exists(file)) {
       var content = fs.readFileSync(file, "utf8");
       var json;
@@ -31,10 +39,18 @@ export default function (loc, opts = {}) {
         throw err;
       }
 
+      opts.babelrc.push(file);
+
       if (json.breakConfig) return;
       merge(opts, json, function(a, b) {
         if (Array.isArray(a)) {
-          return a.concat(b);
+          var c = a.slice(0);
+          for (var v of b) {
+            if (a.indexOf(v) < 0) {
+              c.push(v); 
+            }
+          }
+          return c;
         }
       });
     }
@@ -45,7 +61,7 @@ export default function (loc, opts = {}) {
     }
   }
 
-  if (opts.breakConfig !== true) {
+  if (opts.babelrc.indexOf(loc) < 0 && opts.breakConfig !== true) {
     find(loc, rel);
   }
 

src/babel/transformation/file/index.js

@@ -60,9 +60,9 @@ export default class File {
     "create-class",
     "create-decorated-class",
     "create-decorated-object",
+    "define-decorated-property-descriptor",
     "tagged-template-literal",
     "tagged-template-literal-loose",
-    "interop-require",
     "to-array",
     "to-consumable-array",
     "sliced-to-array",
@@ -74,6 +74,7 @@ export default class File {
     "define-property",
     "async-to-generator",
     "interop-require-wildcard",
+    "interop-require-default",
     "typeof",
     "extends",
     "get",
@@ -83,7 +84,10 @@ export default class File {
     "temporal-undefined",
     "temporal-assert-defined",
     "self-global",
-    "default-props"
+    "default-props",
+
+    // legacy
+    "interop-require",
   ];
 
   static soloHelpers = [
@@ -243,7 +247,7 @@ export default class File {
     if (name) {
       if (typeof name === "object" && name.transformer) {
         plugin = name.transformer;
-        position ||= name.position;
+        position = name.position || position;
       } else if (typeof name === "string") {
         // this is a plugin in the form of "foobar" or "foobar:after"
         // where the optional colon is the delimiter for plugin position in the transformer stack

src/babel/transformation/file/options.json

@@ -157,7 +157,7 @@
   },
 
   "externalHelpers": {
-    "type": "string",
+    "type": "boolean",
     "default": false,
     "shorthand": "r",
     "description": "uses a reference to `babelHelpers` instead of placing helpers at the top of your code."
@@ -206,6 +206,11 @@
     "default": false,
     "hidden": true,
     "description": "stop trying to load .babelrc files"
+  },
+
+  "babelrc": {
+    "hidden": true,
+    "description": "do not load the same .babelrc file twice"
   }
 
 }

src/babel/transformation/modules/common.js

@@ -55,7 +55,7 @@ export default class CommonJSFormatter extends DefaultFormatter {
         var uid = this.scope.generateUidBasedOnNode(node, "import");
 
         nodes.push(t.variableDeclaration("var", [
-          t.variableDeclarator(uid, t.callExpression(this.file.addHelper("interop-require-wildcard"), [ref]))
+          t.variableDeclarator(uid, t.callExpression(this.file.addHelper("interop-require-default"), [ref]))
         ]));
 
         this.internalRemap[variableName.name] = t.memberExpression(uid, t.identifier("default"));

src/babel/transformation/templates/call-instance-decorator.js

@@ -1 +0,0 @@
-this.KEY = INITIALIZERS.KEY.call(this);

src/babel/transformation/templates/call-static-decorator.js

@@ -1 +0,0 @@
-CONSTRUCTOR.KEY = INITIALIZERS.KEY.call(CONSTRUCTOR);

src/babel/transformation/templates/helper-create-decorated-class.js

@@ -23,7 +23,11 @@
             throw new TypeError("The decorator for method " + descriptor.key + " is of the invalid type " + typeof decorator);
           }
         }
-        if (initializers) initializers[key] = descriptor.initializer;
+
+        if (descriptor.initializer) {
+          initializers[key] = descriptor;
+          continue;
+        }
       }
 
       Object.defineProperty(target, key, descriptor);

src/babel/transformation/templates/helper-create-decorated-object.js

@@ -13,7 +13,7 @@
 
     descriptor.enumerable = true;
     descriptor.configurable = true;
-    if ("value" in descriptor) descriptor.writable = true;
+    descriptor.writable = true;
 
     if (decorators) {
       for (var f = 0; f < decorators.length; f++) {
@@ -26,6 +26,8 @@
       }
     }
 
+    descriptor.value = descriptor.initializer();
+
     Object.defineProperty(target, key, descriptor);
   }
 

src/babel/transformation/templates/helper-define-decorated-property-descriptor.js

@@ -0,0 +1,12 @@
+(function (target, key, descriptors) {
+  var _descriptor = descriptors[key];
+
+  // clone it
+  var descriptor = {};
+  for (var _key in _descriptor) descriptor[_key] = _descriptor[_key];
+
+  // initialize it
+  descriptor.value = descriptor.initializer();
+
+  Object.defineProperty(target, key, descriptor);
+})

src/babel/transformation/templates/helper-interop-require-default.js

@@ -0,0 +1,3 @@
+(function (obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+})

src/babel/transformation/templates/helper-interop-require-wildcard.js

@@ -1,3 +1,14 @@
 (function (obj) {
-  return obj && obj.__esModule ? obj : { default: obj };
+  if (obj && obj.__esModule) {
+    return obj;
+  } else {
+    var newObj = {};
+    if (typeof obj === "object" && obj !== null) {
+      for (var key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+      }
+    }
+    newObj.default = obj;
+    return newObj;
+  }
 })

src/babel/transformation/transformers/es6/classes.js

@@ -37,6 +37,22 @@ var collectPropertyReferencesVisitor = {
   }
 };
 
+var constructorVisitor = traverse.explode({
+  ThisExpression: {
+    enter(node, parent, scope, ref) {
+      return ref;
+    }
+  },
+
+  Function: {
+    enter(node) {
+      if (!node.shadow) {
+        this.skip();
+      }
+    }
+  }
+});
+
 var verifyConstructorVisitor = traverse.explode({
   MethodDefinition: {
     enter() {
@@ -538,35 +554,39 @@ class ClassTransformer {
       node.value = t.functionExpression(null, [], t.blockStatement(body));
       this.pushToMap(node, true, "initializer");
 
+      var initializers;
+      var body;
+      var target;
       if (node.static) {
-        this.staticPropBody.push(util.template("call-static-decorator", {
-          INITIALIZERS: this.staticInitializersId ||= this.scope.generateUidIdentifier("staticInitializers"),
-          CONSTRUCTOR:  this.classRef,
-          KEY:          node.key,
-        }, true));
+        initializers = this.staticInitializersId ||= this.scope.generateUidIdentifier("staticInitializers");
+        body = this.staticPropBody;
+        target = this.classRef;
       } else {
-        this.instancePropBody.push(util.template("call-instance-decorator", {
-          INITIALIZERS: this.instanceInitializersId ||= this.scope.generateUidIdentifier("instanceInitializers"),
-          KEY:          node.key
-        }, true));
+        initializers = this.instanceInitializersId ||= this.scope.generateUidIdentifier("instanceInitializers");
+        body = this.instancePropBody;
+        target = t.thisExpression();
       }
+
+      body.push(t.expressionStatement(
+        t.callExpression(this.file.addHelper("define-decorated-property-descriptor"), [
+          target,
+          t.literal(node.key.name),
+          initializers
+        ])
+      ));
     } else {
-      if (!node.static && node.value) {
+      node.value ||= t.identifier("undefined");
+
+      if (node.static) {
+        // can just be added to the static map
+        this.pushToMap(node, true);
+      } else if (node.value) {
         // add this to the instancePropBody which will be added after the super call in a derived constructor
         // or at the start of a constructor for a non-derived constructor
         this.instancePropBody.push(t.expressionStatement(
           t.assignmentExpression("=", t.memberExpression(t.thisExpression(), node.key), node.value)
         ));
-
-        node.value = null;
       }
-
-      if (!node.value) {
-        node.value = t.identifier("undefined");
-      }
-
-      // can just be added to the static map
-      this.pushToMap(node, true);
     }
   }
 
@@ -581,6 +601,10 @@ class ClassTransformer {
       fnPath.scope.rename(this.classRef.name);
     }
 
+    if (this.isNativeSuper) {
+      fnPath.traverse(constructorVisitor, this.nativeSuperRef);
+    }
+
     var construct = this.constructor;
     var fn        = method.value;
 

src/babel/transformation/transformers/es7/decorators.js

@@ -27,7 +27,16 @@ export function ObjectExpression(node, parent, scope, file) {
   for (var i = 0; i < node.properties.length; i++) {
     var prop = node.properties[i];
     if (prop.decorators) memoiseDecorators(prop.decorators, scope);
-    defineMap.push(mutatorMap, prop, null, file);
+
+
+    if (prop.kind === "init") {
+      prop.kind = "";
+      prop.value = t.functionExpression(null, [], t.blockStatement([
+        t.returnStatement(prop.value)
+      ]));
+    }
+
+    defineMap.push(mutatorMap, prop, "initializer", file);
   }
 
   var obj = defineMap.toClassObject(mutatorMap);

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

@@ -16,6 +16,8 @@ export function ImportDeclaration(node, parent, scope, file) {
   }
 }
 
+export { ImportDeclaration as ExportAllDeclaration };
+
 export function ExportDefaultDeclaration(node, parent, scope) {
   ImportDeclaration.apply(this, arguments);
 

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

@@ -33,9 +33,11 @@ export function JSXElement(node, parent, scope, file) {
 
   var state = { isImmutable: true };
   this.traverse(immutabilityVisitor, state);
-  this.skip();
 
-  if (state.isImmutable) this.hoist();
+  if (state.isImmutable) {
+    this.hoist();
+    this.skip();
+  }
 
   node._hoisted = true;
 }

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

@@ -57,7 +57,7 @@ export function JSXElement(node, parent, scope, file) {
     if (isJSXAttributeOfName(attr, "key")) {
       key = attr.value;
     } else {
-      pushProp(props.properties, attr.name, attr.value);
+      pushProp(props.properties, attr.name, attr.value || t.identifier("true"));
     }
   }
 

src/babel/transformation/transformers/other/runtime/definitions.json

@@ -45,7 +45,10 @@
     "Object": {
       "assign": "object/assign",
       "classof": "object/classof",
+      "create": "object/create",
       "define": "object/define",
+      "defineProperties": "object/define-properties",
+      "defineProperty": "object/define-property",
       "entries": "object/entries",
       "freeze": "object/freeze",
       "getOwnPropertyDescriptor": "object/get-own-property-descriptor",

src/babel/traversal/path/hoister.js

@@ -109,6 +109,14 @@ export default class PathHoister {
       ])
     ]);
 
+    var parent = this.path.parentPath;
+
+    if (parent.isJSXElement() && this.path.container === parent.node.children) {
+      // turning the `span` in `<div><span /></div>` to an expression so we need to wrap it with
+      // an expression container
+      uid = t.jSXExpressionContainer(uid);
+    }
+
     this.path.replaceWith(uid);
   }
 }

src/babel/util.js

@@ -18,6 +18,7 @@ import each from "lodash/collection/each";
 import has from "lodash/object/has";
 import fs from "fs";
 import * as t from "./types";
+import slash from "slash";
 
 export { inherits, inspect } from "util";
 
@@ -94,6 +95,7 @@ export function booleanify(val: any): boolean {
 }
 
 export function shouldIgnore(filename, ignore, only) {
+  filename = slash(filename);
   if (only.length) {
     for (var i = 0; i < only.length; i++) {
       if (only[i].test(filename)) return false;

test/core/bin.js

@@ -111,6 +111,7 @@ var buildTest = function (binName, testName, opts) {
 };
 
 var clear = function () {
+  process.chdir(__dirname);
   if (fs.existsSync(tmpLoc)) rimraf.sync(tmpLoc);
   fs.mkdirSync(tmpLoc);
   process.chdir(tmpLoc);

test/core/fixtures/transformation/es6.classes/native-constructors/actual.js

@@ -8,3 +8,10 @@ class Bar extends Array {
     this.foo = "bar";
   }
 }
+
+class Baz extends Array {
+  constructor() {
+    super();
+    (() => this)
+  }
+}

test/core/fixtures/transformation/es6.classes/native-constructors/expected.js

@@ -33,3 +33,21 @@ var Bar = (function (_Array2) {
   babelHelpers.inherits(Bar, _Array2);
   return Bar;
 })(Array);
+
+var Baz = (function (_Array3) {
+  function Baz() {
+    babelHelpers.classCallCheck(this, Baz);
+
+    var _this3 = new _Array3();
+
+    _this3.__proto__ = Baz.prototype;
+
+    (function () {
+      return _this3;
+    });
+    return _this3;
+  }
+
+  babelHelpers.inherits(Baz, _Array3);
+  return Baz;
+})(Array);

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

@@ -1,7 +1,7 @@
 define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
-  var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
+  var _interopRequireWildcard = function (obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (typeof obj === "object" && obj !== null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } };
 
   var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; };
 

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

@@ -1,6 +1,6 @@
 "use strict";
 
-var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
+var _interopRequireWildcard = function (obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (typeof obj === "object" && obj !== null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } };
 
 var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; };
 

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

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

test/core/fixtures/transformation/es6.modules-common/imports-default/options.json

@@ -0,0 +1,3 @@
+{
+  "externalHelpers": true
+}

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

@@ -1,7 +1,7 @@
 "use strict";
 
-var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
+var _interopRequireWildcard = function (obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (typeof obj === "object" && obj !== null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } };
 
 var _import = require("foo");
 
-var foo = _interopRequireWildcard(_import);
+var foo = _interopRequireWildcard(_import);

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

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

test/core/fixtures/transformation/es6.modules-common/imports-mixing/options.json

@@ -0,0 +1,3 @@
+{
+  "externalHelpers": true
+}

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

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -14,11 +12,11 @@ require("./directory/foo-bar");
 
 var _foo = require("foo2");
 
-var _foo2 = _interopRequireWildcard(_foo);
+var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
 var _import = require("foo3");
 
-var foo2 = _interopRequireWildcard(_import);
+var foo2 = babelHelpers.interopRequireWildcard(_import);
 
 var _bar = require("foo4");
 

test/core/fixtures/transformation/es6.modules-common/overview/options.json

@@ -0,0 +1,3 @@
+{
+  "externalHelpers": true
+}

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

@@ -13,7 +13,7 @@
 })(this, function (exports, _foo) {
   "use strict";
 
-  var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; };
+  var _interopRequireWildcard = function (obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (typeof obj === "object" && obj !== null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj["default"] = obj; return newObj; } };
 
   var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; };
 

test/core/fixtures/transformation/es7.class-properties/constructor-collision/expected.js

@@ -12,14 +12,10 @@ var Foo = (function () {
   }
 
   babelHelpers.createClass(Foo, [{
-    key: "bar",
-    value: undefined,
-    enumerable: true
-  }, {
     key: "__initializeProperties",
     value: function __initializeProperties() {
       this.bar = foo;
     }
   }]);
   return Foo;
-})();
+})();

test/core/fixtures/transformation/es7.class-properties/derived/expected.js

@@ -12,10 +12,5 @@ var Foo = (function (_Bar) {
   }
 
   babelHelpers.inherits(Foo, _Bar);
-  babelHelpers.createClass(Foo, [{
-    key: "bar",
-    value: undefined,
-    enumerable: true
-  }]);
   return Foo;
-})(Bar);
+})(Bar);

test/core/fixtures/transformation/es7.class-properties/instance-undefined/expected.js

@@ -1,14 +1,6 @@
 "use strict";
 
-var Foo = (function () {
-  function Foo() {
-    babelHelpers.classCallCheck(this, Foo);
-  }
-
-  babelHelpers.createClass(Foo, [{
-    key: "bar",
-    value: undefined,
-    enumerable: true
-  }]);
-  return Foo;
-})();
+var Foo = function Foo() {
+  babelHelpers.classCallCheck(this, Foo);
+  this.bar = undefined;
+};

test/core/fixtures/transformation/es7.class-properties/instance/expected.js

@@ -1,15 +1,6 @@
 "use strict";
 
-var Foo = (function () {
-  function Foo() {
-    babelHelpers.classCallCheck(this, Foo);
-    this.bar = "foo";
-  }
-
-  babelHelpers.createClass(Foo, [{
-    key: "bar",
-    value: undefined,
-    enumerable: true
-  }]);
-  return Foo;
-})();
+var Foo = function Foo() {
+  babelHelpers.classCallCheck(this, Foo);
+  this.bar = "foo";
+};

test/core/fixtures/transformation/es7.class-properties/super-expression/expected.js

@@ -10,10 +10,5 @@ var Foo = (function (_Bar) {
   }
 
   babelHelpers.inherits(Foo, _Bar);
-  babelHelpers.createClass(Foo, [{
-    key: "bar",
-    value: undefined,
-    enumerable: true
-  }]);
   return Foo;
 })(Bar);

test/core/fixtures/transformation/es7.class-properties/super-statement/expected.js

@@ -9,10 +9,5 @@ var Foo = (function (_Bar) {
   }
 
   babelHelpers.inherits(Foo, _Bar);
-  babelHelpers.createClass(Foo, [{
-    key: "bar",
-    value: undefined,
-    enumerable: true
-  }]);
   return Foo;
 })(Bar);

test/core/fixtures/transformation/es7.decorators/class-init-instance-props/exec.js

@@ -0,0 +1,14 @@
+function noop() {}
+
+class Foo {
+  @noop
+  bar = "foobar";
+
+  @noop
+  foo() {
+    return "bar";
+  }
+}
+
+assert.equal(new Foo().bar, "foobar");
+assert.equal(new Foo().foo(), "bar");

test/core/fixtures/transformation/es7.decorators/class-init-instance-props/expected.js

@@ -5,7 +5,7 @@ var Foo = (function () {
 
   function Foo() {
     babelHelpers.classCallCheck(this, Foo);
-    this.foo = _instanceInitializers.foo.call(this);
+    babelHelpers.defineDecoratedPropertyDescriptor(this, "foo", _instanceInitializers);
   }
 
   babelHelpers.createDecoratedClass(Foo, [{
@@ -17,4 +17,4 @@ var Foo = (function () {
     enumerable: true
   }], null, _instanceInitializers);
   return Foo;
-})();
+})();

test/core/fixtures/transformation/es7.decorators/class-init-static-props/exec.js

@@ -0,0 +1,14 @@
+function noop() {}
+
+class Foo {
+  @noop
+  static bar = "foobar";
+
+  @noop
+  static foo() {
+    return "bar";
+  }
+}
+
+assert.equal(Foo.bar, "foobar");
+assert.equal(Foo.foo(), "bar");

test/core/fixtures/transformation/es7.decorators/class-init-static-props/expected.js

@@ -15,6 +15,6 @@ var Foo = (function () {
     },
     enumerable: true
   }], null, _staticInitializers);
-  Foo.foo = _staticInitializers.foo.call(Foo);
+  babelHelpers.defineDecoratedPropertyDescriptor(Foo, "foo", _staticInitializers);
   return Foo;
-})();
+})();

test/core/fixtures/transformation/es7.decorators/class-modules/expected.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 
 var _foo = require("foo");
 
-var _foo2 = babelHelpers.interopRequireWildcard(_foo);
+var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
 var Foo = (function () {
   function Foo() {

test/core/fixtures/transformation/es7.decorators/class-no-init-instance-props/expected.js

@@ -5,7 +5,7 @@ var Foo = (function () {
 
   function Foo() {
     babelHelpers.classCallCheck(this, Foo);
-    this.foo = _instanceInitializers.foo.call(this);
+    babelHelpers.defineDecoratedPropertyDescriptor(this, "foo", _instanceInitializers);
   }
 
   babelHelpers.createDecoratedClass(Foo, [{
@@ -15,4 +15,4 @@ var Foo = (function () {
     enumerable: true
   }], null, _instanceInitializers);
   return Foo;
-})();
+})();

test/core/fixtures/transformation/es7.decorators/class-no-init-static-props/expected.js

@@ -13,6 +13,6 @@ var Foo = (function () {
     initializer: function () {},
     enumerable: true
   }], null, _staticInitializers);
-  Foo.foo = _staticInitializers.foo.call(Foo);
+  babelHelpers.defineDecoratedPropertyDescriptor(Foo, "foo", _staticInitializers);
   return Foo;
 })();

test/core/fixtures/transformation/es7.decorators/object/exec.js

@@ -0,0 +1,15 @@
+function override(target, key, descriptor) {
+  descriptor.initializer = function () {
+    return "lol";
+  };
+}
+
+var obj = {
+  @override
+  foo: "bar",
+
+  bar: "heh"
+};
+
+assert.equal(obj.foo, "lol");
+assert.equal(obj.bar, "heh");

test/core/fixtures/transformation/es7.decorators/object/expected.js

@@ -3,12 +3,18 @@
 var obj = babelHelpers.createDecoratedObject([{
   key: "bar",
   decorators: [foo],
-  value: function value() {}
+  initializer: function initializer() {
+    return function () {};
+  }
 }, {
   key: "foo",
   decorators: [bar],
-  value: "lol"
+  initializer: function initializer() {
+    return "lol";
+  }
 }, {
   key: "yes",
-  value: "wow"
-}]);
+  initializer: function initializer() {
+    return "wow";
+  }
+}]);

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

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 
 var _foo2 = require("bar");
 
-var _foo3 = babelHelpers.interopRequireWildcard(_foo2);
+var _foo3 = babelHelpers.interopRequireDefault(_foo2);
 
-exports.foo = _foo3["default"];
+exports.foo = _foo3["default"];

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

@@ -2,6 +2,6 @@
 
 var _toString = require("foo");
 
-var _toString2 = babelHelpers.interopRequireWildcard(_toString);
+var _toString2 = babelHelpers.interopRequireDefault(_toString);
 
 _toString2["default"];

test/core/fixtures/transformation/optimisation.react.constant-elements/children/actual.js

@@ -0,0 +1,7 @@
+var Foo = React.createClass({
+  render: function() {
+    return <div className={this.props.className}>
+      <span />
+    </div>;
+  }
+});

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

@@ -0,0 +1,11 @@
+"use strict";
+
+var _ref = <span />;
+
+var Foo = React.createClass({
+  render: function render() {
+    return <div className={this.props.className}>
+      {_ref}
+    </div>;
+  }
+});

test/core/fixtures/transformation/optimisation.react.inline-elements/shorthand-attributes/actual.js

@@ -0,0 +1 @@
+<Foo bar />;

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

@@ -0,0 +1,10 @@
+"use strict";
+
+({
+  type: Foo,
+  ref: null,
+  props: babelHelpers.defaultProps(Foo.defaultProps, {
+    bar: true
+  }),
+  key: null
+});

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

@@ -1,20 +1,25 @@
 "use strict";
 
+var _Object$defineProperty = require("babel-runtime/core-js/object/define-property")["default"];
+
 var _Symbol = require("babel-runtime/core-js/symbol")["default"];
 
 var _regeneratorRuntime = require("babel-runtime/regenerator")["default"];
 
+var _interopRequireDefault = require("babel-runtime/helpers/interop-require-default")["default"];
+
 var _interopRequireWildcard = require("babel-runtime/helpers/interop-require-wildcard")["default"];
 
-Object.defineProperty(exports, "__esModule", {
+_Object$defineProperty(exports, "__esModule", {
   value: true
 });
+
 exports.giveWord = giveWord;
 var marked0$0 = [giveWord].map(_regeneratorRuntime.mark);
 
 var _foo = require("someModule");
 
-var _foo2 = _interopRequireWildcard(_foo);
+var _foo2 = _interopRequireDefault(_foo);
 
 var bar = _interopRequireWildcard(_foo);
 
@@ -36,4 +41,4 @@ function giveWord() {
 }
 
 _foo2["default"];
-bar;
+bar;

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

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

test/core/fixtures/transformation/spec.function-name/modules-2/expected.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 
 var _last2 = require("lodash/array/last");
 
-var _last3 = babelHelpers.interopRequireWildcard(_last2);
+var _last3 = babelHelpers.interopRequireDefault(_last2);
 
 var Container = (function () {
   function Container() {

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

@@ -2,7 +2,7 @@
 
 var _events2 = require("events");
 
-var _events3 = babelHelpers.interopRequireWildcard(_events2);
+var _events3 = babelHelpers.interopRequireDefault(_events2);
 
 var Template = (function () {
   function Template() {