diff --git a/src/babel/transformation/transformers/es6/classes.js b/src/babel/transformation/transformers/es6/classes.js index 294fb79394..4af1e12c32 100644 --- a/src/babel/transformation/transformers/es6/classes.js +++ b/src/babel/transformation/transformers/es6/classes.js @@ -185,7 +185,7 @@ class ClassTransformer { this.classRef = this.scope.generateUidIdentifier(classRef); // this is so super calls and the decorators have access to the raw function - body.unshift(t.variableDeclaration("var", [ + body.push(t.variableDeclaration("var", [ t.variableDeclarator(this.classRef, classRef) ])); } diff --git a/test/core/fixtures/transformation/es7.decorators/class-modules/expected.js b/test/core/fixtures/transformation/es7.decorators/class-modules/expected.js index 67dac7e982..a061a0b3de 100644 --- a/test/core/fixtures/transformation/es7.decorators/class-modules/expected.js +++ b/test/core/fixtures/transformation/es7.decorators/class-modules/expected.js @@ -9,12 +9,11 @@ var _foo = require("foo"); var _foo2 = babelHelpers.interopRequireWildcard(_foo); var Foo = (function () { - var _Foo = Foo; - function Foo() { babelHelpers.classCallCheck(this, _Foo); } + var _Foo = Foo; Foo = _foo2["default"](Foo) || Foo; return Foo; })(); diff --git a/test/core/fixtures/transformation/es7.decorators/class-super/expected.js b/test/core/fixtures/transformation/es7.decorators/class-super/expected.js index b5c10fd6d1..fc587a7e25 100644 --- a/test/core/fixtures/transformation/es7.decorators/class-super/expected.js +++ b/test/core/fixtures/transformation/es7.decorators/class-super/expected.js @@ -1,8 +1,6 @@ "use strict"; var Foo = (function (_Bar) { - var _Foo = Foo; - function Foo() { babelHelpers.classCallCheck(this, _Foo); @@ -10,6 +8,7 @@ var Foo = (function (_Bar) { } babelHelpers.inherits(Foo, _Bar); + var _Foo = Foo; Foo = bar(Foo) || Foo; return Foo; })(Bar); @@ -21,8 +20,8 @@ var Foo2 = (function (_Bar2) { babelHelpers.get(Object.getPrototypeOf(_class2.prototype), "constructor", this).call(this); }; - var _class2 = _class; babelHelpers.inherits(_class, _Bar2); + var _class2 = _class; _class = bar(_class) || _class; return _class; })(Bar); diff --git a/test/core/fixtures/transformation/es7.decorators/class/expected.js b/test/core/fixtures/transformation/es7.decorators/class/expected.js index 1ae24bcda1..96ff2b4054 100644 --- a/test/core/fixtures/transformation/es7.decorators/class/expected.js +++ b/test/core/fixtures/transformation/es7.decorators/class/expected.js @@ -1,60 +1,55 @@ "use strict"; var Foo = (function () { - var _Foo = Foo; - function Foo() { babelHelpers.classCallCheck(this, _Foo); } + var _Foo = Foo; Foo = foo(Foo) || Foo; return Foo; })(); var Bar = (function () { - var _Bar = Bar; - function Bar() { babelHelpers.classCallCheck(this, _Bar); } + var _Bar = Bar; Bar = bar(Bar) || Bar; Bar = foo(Bar) || Bar; return Bar; })(); var Foo2 = (function () { - var _Foo2 = Foo; - function Foo() { babelHelpers.classCallCheck(this, _Foo2); } + var _Foo2 = Foo; Foo = bar(Foo) || Foo; return Foo; })(); var Bar2 = (function () { - var _Bar2 = Bar; - function Bar() { babelHelpers.classCallCheck(this, _Bar2); } + var _Bar2 = Bar; Bar = bar(Bar) || Bar; Bar = foo(Bar) || Bar; return Bar; })(); var Baz = (function () { - var _Baz = Baz; - function Baz(baz) { babelHelpers.classCallCheck(this, _Baz); this.baz = baz; } + var _Baz = Baz; Baz = foo(Baz) || Baz; return Baz; })();