Fix class inheritance in IE10 (#7969)

* Revert "Move subclass inheritance to end (#7772)"

This reverts commit f8ab9466d331871a90f458af40b14e8d831e0c29.

* Only use getPrototypeOf if setPrototypeOf is implemented

* Update fixtures

* Helpers updates

* Update fixtures

* Fall back to getPrototypeOf

* Update fixtures

packages/babel-core/test/fixtures/transformation/misc/regression-1155/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo(options) {
     babelHelpers.classCallCheck(this, Foo);
     var parentOptions = {};
@@ -14,6 +16,5 @@ function (_Bar) {
     return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this, parentOptions));
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);

packages/babel-helpers/src/helpers.js

@@ -399,22 +399,31 @@ helpers.inherits = () => template.program.ast`
     if (typeof superClass !== "function" && superClass !== null) {
       throw new TypeError("Super expression must either be null or a function");
     }
-    setPrototypeOf(subClass.prototype, superClass && superClass.prototype);
+    subClass.prototype = Object.create(superClass && superClass.prototype, {
+      constructor: {
+        value: subClass,
+        writable: true,
+        configurable: true
+      }
+    });
     if (superClass) setPrototypeOf(subClass, superClass);
   }
 `;
 
 helpers.inheritsLoose = () => template.program.ast`
   export default function _inheritsLoose(subClass, superClass) {
-    subClass.prototype.__proto__ = superClass && superClass.prototype;
+    subClass.prototype = Object.create(superClass.prototype);
+    subClass.prototype.constructor = subClass;
     subClass.__proto__ = superClass;
   }
 `;
 
 helpers.getPrototypeOf = () => template.program.ast`
   export default function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) {
-      return o.__proto__;
+    _getPrototypeOf = Object.setPrototypeOf
+      ? Object.getPrototypeOf
+      : function _getPrototypeOf(o) {
+          return o.__proto__ || Object.getPrototypeOf(o);
         };
     return _getPrototypeOf(o);
   }

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-call-in-key/output.js

@@ -13,6 +13,8 @@ let Hello = function Hello() {
 let Outer =
 /*#__PURE__*/
 function (_Hello) {
+  babelHelpers.inherits(Outer, _Hello);
+
   function Outer() {
     var _this;
 
@@ -28,7 +30,6 @@ function (_Hello) {
     return babelHelpers.possibleConstructorReturn(_this, new Inner());
   }
 
-  babelHelpers.inherits(Outer, _Hello);
   return Outer;
 }(Hello);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-key/output.js

@@ -19,6 +19,8 @@ function () {
 let Outer =
 /*#__PURE__*/
 function (_Hello) {
+  babelHelpers.inherits(Outer, _Hello);
+
   function Outer() {
     var _this;
 
@@ -35,7 +37,6 @@ function (_Hello) {
     return babelHelpers.possibleConstructorReturn(_this, new Inner());
   }
 
-  babelHelpers.inherits(Outer, _Hello);
   return Outer;
 }(Hello);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _this;
 
@@ -25,7 +27,6 @@ function (_Bar) {
     return babelHelpers.possibleConstructorReturn(_this);
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js

@@ -15,6 +15,8 @@ var Bar =
 function (_Foo) {
   "use strict";
 
+  babelHelpers.inherits(Bar, _Foo);
+
   function Bar(...args) {
     var _temp, _this;
 
@@ -25,7 +27,6 @@ function (_Foo) {
     }), _temp));
   }
 
-  babelHelpers.inherits(Bar, _Foo);
   return Bar;
 }(Foo);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js

@@ -3,6 +3,8 @@ var Child =
 function (_Parent) {
   "use strict";
 
+  babelHelpers.inherits(Child, _Parent);
+
   function Child() {
     var _this;
 
@@ -17,7 +19,6 @@ function (_Parent) {
     return _this;
   }
 
-  babelHelpers.inherits(Child, _Parent);
   return Child;
 }(Parent);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/private-in-derived/output.js

@@ -10,12 +10,13 @@ var Outer = function Outer() {
   var Test =
   /*#__PURE__*/
   function (_babelHelpers$classPr) {
+    babelHelpers.inherits(Test, _babelHelpers$classPr);
+
     function Test() {
       babelHelpers.classCallCheck(this, Test);
       return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Test).apply(this, arguments));
     }
 
-    babelHelpers.inherits(Test, _babelHelpers$classPr);
     return Test;
   }(babelHelpers.classPrivateFieldLooseBase(this, _outer)[_outer]);
 };

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _temp, _this;
 
@@ -14,7 +16,6 @@ function (_Bar) {
     return _this;
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _this;
 
@@ -15,7 +17,6 @@ function (_Bar) {
     return _this;
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _this;
 
@@ -21,7 +23,6 @@ function (_Bar) {
     return babelHelpers.possibleConstructorReturn(_this);
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived/output.js

@@ -13,6 +13,8 @@ var Bar =
 function (_Foo) {
   "use strict";
 
+  babelHelpers.inherits(Bar, _Foo);
+
   function Bar(...args) {
     var _temp, _this;
 
@@ -20,7 +22,6 @@ function (_Foo) {
     return babelHelpers.possibleConstructorReturn(_this, (_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Bar).call(this, ...args)), _prop2.set(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), "bar"), _temp));
   }
 
-  babelHelpers.inherits(Bar, _Foo);
   return Bar;
 }(Foo);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private/foobar/output.js

@@ -3,6 +3,8 @@ var Child =
 function (_Parent) {
   "use strict";
 
+  babelHelpers.inherits(Child, _Parent);
+
   function Child() {
     var _this;
 
@@ -16,7 +18,6 @@ function (_Parent) {
     return _this;
   }
 
-  babelHelpers.inherits(Child, _Parent);
   return Child;
 }(Parent);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private/private-in-derived/output.js

@@ -8,12 +8,13 @@ var Outer = function Outer() {
   var Test =
   /*#__PURE__*/
   function (_babelHelpers$classPr) {
+    babelHelpers.inherits(Test, _babelHelpers$classPr);
+
     function Test() {
       babelHelpers.classCallCheck(this, Test);
       return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Test).apply(this, arguments));
     }
 
-    babelHelpers.inherits(Test, _babelHelpers$classPr);
     return Test;
   }(babelHelpers.classPrivateFieldGet(this, _outer));
 };

packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-call/output.js

@@ -21,6 +21,8 @@ var B =
 function (_A) {
   "use strict";
 
+  babelHelpers.inherits(B, _A);
+
   function B(...args) {
     var _temp, _this;
 
@@ -28,7 +30,6 @@ function (_A) {
     return babelHelpers.possibleConstructorReturn(_this, (_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(B).call(this, ...args)), _foo.set(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), babelHelpers.get(babelHelpers.getPrototypeOf(B.prototype), "foo", babelHelpers.assertThisInitialized(_this)).call(babelHelpers.assertThisInitialized(_this))), _temp));
   }
 
-  babelHelpers.inherits(B, _A);
   return B;
 }(A);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _temp, _this;
 
@@ -11,7 +13,6 @@ function (_Bar) {
     return _this;
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _this;
 
@@ -14,7 +16,6 @@ function (_Bar) {
     return _this;
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/derived/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo(...args) {
     var _temp, _this;
 
@@ -10,6 +12,5 @@ function (_Bar) {
     return babelHelpers.possibleConstructorReturn(_this, (_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this, ...args)), _this.bar = "foo", _temp));
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);

packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/output.js

@@ -3,6 +3,8 @@ var Child =
 function (_Parent) {
   "use strict";
 
+  babelHelpers.inherits(Child, _Parent);
+
   function Child() {
     var _this;
 
@@ -16,6 +18,5 @@ function (_Parent) {
     return _this;
   }
 
-  babelHelpers.inherits(Child, _Parent);
   return Child;
 }(Parent);

packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T6719/output.js

@@ -6,12 +6,13 @@ function withContext(ComposedComponent) {
   function (_Component) {
     "use strict";
 
+    babelHelpers.inherits(WithContext, _Component);
+
     function WithContext() {
       babelHelpers.classCallCheck(this, WithContext);
       return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(WithContext).apply(this, arguments));
     }
 
-    babelHelpers.inherits(WithContext, _Component);
     return WithContext;
   }(Component), _class.propTypes = {
     context: PropTypes.shape({

packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-call/output.js

@@ -21,6 +21,8 @@ var B =
 function (_A) {
   "use strict";
 
+  babelHelpers.inherits(B, _A);
+
   function B(...args) {
     var _temp, _this;
 
@@ -28,6 +30,5 @@ function (_A) {
     return babelHelpers.possibleConstructorReturn(_this, (_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(B).call(this, ...args)), _this.foo = babelHelpers.get(babelHelpers.getPrototypeOf(B.prototype), "foo", babelHelpers.assertThisInitialized(_this)).call(babelHelpers.assertThisInitialized(_this)), _temp));
   }
 
-  babelHelpers.inherits(B, _A);
   return B;
 }(A);

packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-expression/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _temp, _this;
 
@@ -11,6 +13,5 @@ function (_Bar) {
     return _this;
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);

packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/super-statement/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _this;
 
@@ -12,6 +14,5 @@ function (_Bar) {
     return _this;
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);

packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-multiple-supers/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _this;
 
@@ -19,6 +21,5 @@ function (_Bar) {
     return babelHelpers.possibleConstructorReturn(_this);
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);

packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo(...args) {
     var _temp, _this;
 
@@ -10,6 +12,5 @@ function (_Bar) {
     return babelHelpers.possibleConstructorReturn(_this, (_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this, ...args)), babelHelpers.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), "bar", "foo"), _temp));
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);

packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js

@@ -3,6 +3,8 @@ var Child =
 function (_Parent) {
   "use strict";
 
+  babelHelpers.inherits(Child, _Parent);
+
   function Child() {
     var _this;
 
@@ -14,6 +16,5 @@ function (_Parent) {
     return _this;
   }
 
-  babelHelpers.inherits(Child, _Parent);
   return Child;
 }(Parent);

packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T6719/output.js

@@ -6,12 +6,13 @@ function withContext(ComposedComponent) {
   function (_Component) {
     "use strict";
 
+    babelHelpers.inherits(WithContext, _Component);
+
     function WithContext() {
       babelHelpers.classCallCheck(this, WithContext);
       return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(WithContext).apply(this, arguments));
     }
 
-    babelHelpers.inherits(WithContext, _Component);
     return WithContext;
   }(Component), babelHelpers.defineProperty(_class, "propTypes", {
     context: PropTypes.shape({

packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-call/output.js

@@ -21,6 +21,8 @@ var B =
 function (_A) {
   "use strict";
 
+  babelHelpers.inherits(B, _A);
+
   function B(...args) {
     var _temp, _this;
 
@@ -28,6 +30,5 @@ function (_A) {
     return babelHelpers.possibleConstructorReturn(_this, (_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(B).call(this, ...args)), babelHelpers.defineProperty(babelHelpers.assertThisInitialized(babelHelpers.assertThisInitialized(_this)), "foo", babelHelpers.get(babelHelpers.getPrototypeOf(B.prototype), "foo", babelHelpers.assertThisInitialized(_this)).call(babelHelpers.assertThisInitialized(_this))), _temp));
   }
 
-  babelHelpers.inherits(B, _A);
   return B;
 }(A);

packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-expression/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _temp, _this;
 
@@ -11,6 +13,5 @@ function (_Bar) {
     return _this;
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);

packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-statement/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _this;
 
@@ -12,6 +14,5 @@ function (_Bar) {
     return _this;
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);

packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6154/output.js

@@ -2,12 +2,12 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
 
 function _instanceof(left, right) { if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) { return right[Symbol.hasInstance](left); } else { return left instanceof right; } }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -18,7 +18,7 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 var Test = function Test() {
   "use strict";
@@ -30,6 +30,8 @@ var Test = function Test() {
   var Other =
   /*#__PURE__*/
   function (_Test) {
+    _inherits(Other, _Test);
+
     function Other() {
       var _getPrototypeOf2;
 
@@ -46,8 +48,6 @@ var Test = function Test() {
       }), _temp));
     }
 
-    _inherits(Other, _Test);
-
     return Other;
   }(Test);
 

packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T6719/output.js

@@ -6,12 +6,13 @@ function withContext(ComposedComponent) {
   function (_Component) {
     "use strict";
 
+    babelHelpers.inherits(WithContext, _Component);
+
     function WithContext() {
       babelHelpers.classCallCheck(this, WithContext);
       return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(WithContext).apply(this, arguments));
     }
 
-    babelHelpers.inherits(WithContext, _Component);
     return WithContext;
   }(Component), _class.propTypes = {
     context: PropTypes.shape({

packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/output.js

@@ -4,15 +4,15 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
 
 function _classCallCheck(instance, Constructor) { if (!_instanceof(instance, Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function generateAsyncAction(type) {
   type = type.toUpperCase();
@@ -32,6 +32,8 @@ var A =
 function (_B) {
   "use strict";
 
+  _inherits(A, _B);
+
   function A(timestamp) {
     var _this;
 
@@ -43,7 +45,5 @@ function (_B) {
     return _this;
   }
 
-  _inherits(A, _B);
-
   return A;
 }(B);

packages/babel-plugin-transform-classes/src/transformClass.js

@@ -179,7 +179,6 @@ export default function transformClass(
     }
 
     pushDescriptors();
-    pushInheritsToBody();
   }
 
   function pushBody() {
@@ -263,6 +262,8 @@ export default function transformClass(
   }
 
   function pushDescriptors() {
+    pushInheritsToBody();
+
     const { body } = classState;
 
     let instanceProps;
@@ -572,6 +573,8 @@ export default function transformClass(
     }
 
     classState.body.push(classState.construct);
+
+    pushInheritsToBody();
   }
 
   /**
@@ -582,9 +585,9 @@ export default function transformClass(
 
     setState({ pushedInherits: true });
 
-    // Push to ensure that the constructor inheritance is set up after
+    // Unshift to ensure that the constructor inheritance is set up before
     // any properties can be assigned to the prototype.
-    classState.body.push(
+    classState.body.unshift(
       t.expressionStatement(
         t.callExpression(
           classState.file.addHelper(

packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/loose/output.js

@@ -1,4 +1,4 @@
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null) return null; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
 
@@ -8,18 +8,18 @@ function _construct(Parent, args, Class) { if (isNativeReflectConstruct()) { _co
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 var List =
 /*#__PURE__*/
 function (_Array) {
   "use strict";
 
+  _inheritsLoose(List, _Array);
+
   function List() {
     return _Array.apply(this, arguments) || this;
   }
 
-  _inheritsLoose(List, _Array);
-
   return List;
 }(_wrapNativeSuper(Array));

packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/shadowed/output.js

@@ -9,11 +9,12 @@ let List =
 function (_Array) {
   "use strict";
 
+  babelHelpers.inherits(List, _Array);
+
   function List() {
     babelHelpers.classCallCheck(this, List);
     return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(List).apply(this, arguments));
   }
 
-  babelHelpers.inherits(List, _Array);
   return List;
 }(Array);

packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/spec/output.js

@@ -1,11 +1,11 @@
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
 function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
 function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null) return null; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
 
 function isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
@@ -14,20 +14,20 @@ function _construct(Parent, args, Class) { if (isNativeReflectConstruct()) { _co
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 var List =
 /*#__PURE__*/
 function (_Array) {
   "use strict";
 
+  _inherits(List, _Array);
+
   function List() {
     _classCallCheck(this, List);
 
     return _possibleConstructorReturn(this, _getPrototypeOf(List).apply(this, arguments));
   }
 
-  _inherits(List, _Array);
-
   return List;
 }(_wrapNativeSuper(Array));

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-data-defined-on-parent/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 let Base =
 /*#__PURE__*/
@@ -21,6 +21,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -41,8 +43,6 @@ function (_Base) {
     throw new Error("called");
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-getter-defined-on-parent/exec.js

@@ -20,11 +20,14 @@ class Obj extends Base {
     super.test(...[1, 2, 3]);
     return super.test(...arguments);
   }
-
-  test() {
+}
+Object.defineProperty(Obj.prototype, 'test', {
+  writable: true,
+  configurable: true,
+  value() {
     throw new Error("called");
   }
-}
+});
 
 const obj = new Obj();
 expect(obj.call(1, 2, 3)).toBe(1);

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-getter-defined-on-parent/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
@@ -31,6 +31,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -51,8 +53,6 @@ function (_Base) {
     throw new Error("called");
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-not-defined-on-parent/output.js

@@ -1,12 +1,14 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 let Base = function Base() {};
 
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -21,8 +23,6 @@ function (_Base) {
     throw new Error("gobbledygook");
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-setter-defined-on-parent/exec.js

@@ -9,11 +9,14 @@ class Obj extends Base {
   call() {
     return super.test();
   }
-
-  test() {
+}
+Object.defineProperty(Obj.prototype, 'test', {
+  writable: true,
+  configurable: true,
+  value() {
     throw new Error("gobbledygook");
   }
-}
+});
 
 const obj = new Obj();
 expect(() => {

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-setter-defined-on-parent/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
@@ -24,6 +24,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -38,8 +40,6 @@ function (_Base) {
     throw new Error("gobbledygook");
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-data-defined-on-parent/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 let Base = function Base() {};
 
@@ -9,6 +9,8 @@ Base.prototype.test = 1;
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -19,8 +21,6 @@ function (_Base) {
     return _Base.prototype.test;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-getter-defined-on-parent/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
@@ -27,6 +27,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -37,8 +39,6 @@ function (_Base) {
     return _Base.prototype.test;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-not-defined-on-parent/output.js

@@ -1,12 +1,14 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 let Base = function Base() {};
 
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -17,8 +19,6 @@ function (_Base) {
     return _Base.prototype.test;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-setter-defined-on-parent/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
@@ -24,6 +24,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -34,8 +36,6 @@ function (_Base) {
     return _Base.prototype.test;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/memoized-assign/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 let Base = function Base() {};
 
@@ -25,6 +25,8 @@ const proper = {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -43,8 +45,6 @@ function (_Base) {
     this[_i = i] = _Base.prototype[_i] + 1;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/memoized-update/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 let Base = function Base() {};
 
@@ -25,6 +25,8 @@ const proper = {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -43,8 +45,6 @@ function (_Base) {
     this[_i = i] = (_super$i = +_Base.prototype[_i]) + 1, _super$i;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-data-defined-on-parent/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 let Base = function Base() {};
 
@@ -13,6 +13,8 @@ Object.defineProperty(Base.prototype, 'test', {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -23,8 +25,6 @@ function (_Base) {
     return this.test = 3;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-getter-defined-on-parent/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
@@ -29,6 +29,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -39,8 +41,6 @@ function (_Base) {
     return this.test = 3;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-data-on-obj/output.js

@@ -1,12 +1,14 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 let Base = function Base() {};
 
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -17,8 +19,6 @@ function (_Base) {
     return this.test = 3;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-getter-on-obj/output.js

@@ -1,11 +1,11 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
+
 let Base = function Base() {};
 
 let called = false;
@@ -13,6 +13,8 @@ let called = false;
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -30,8 +32,6 @@ function (_Base) {
     }
   }]);
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-not-on-obj/output.js

@@ -1,12 +1,14 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 let Base = function Base() {};
 
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -17,8 +19,6 @@ function (_Base) {
     return this.test = 3;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-setter-on-obj/output.js

@@ -1,11 +1,11 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
+
 let Base = function Base() {};
 
 let value = 2;
@@ -13,6 +13,8 @@ let value = 2;
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -30,8 +32,6 @@ function (_Base) {
     }
   }]);
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-setter-defined-on-parent/output.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
@@ -26,6 +26,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inheritsLoose(Obj, _Base);
+
   function Obj() {
     return _Base.apply(this, arguments) || this;
   }
@@ -36,8 +38,6 @@ function (_Base) {
     return this.test = 3;
   };
 
-  _inheritsLoose(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-data-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
@@ -12,7 +8,11 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -42,6 +42,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -66,8 +68,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-getter-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
@@ -12,7 +8,11 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -45,6 +45,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -69,8 +71,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-not-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -16,7 +12,11 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -27,6 +27,8 @@ let Base = function Base() {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -45,8 +47,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-setter-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
@@ -12,7 +8,11 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -40,6 +40,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -58,8 +60,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-data-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -16,7 +12,11 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -29,6 +29,8 @@ Base.prototype.test = 1;
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -42,8 +44,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-getter-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
@@ -12,7 +8,11 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -41,6 +41,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -54,8 +56,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-not-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -16,7 +12,11 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -27,6 +27,8 @@ let Base = function Base() {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -40,8 +42,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-setter-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
@@ -12,7 +8,11 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -40,6 +40,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -53,8 +55,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/memoized-assign/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -22,7 +18,11 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -51,6 +51,8 @@ const proper = {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -73,8 +75,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/memoized-update/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -22,7 +18,11 @@ function _get(target, property, receiver) { if (typeof Reflect !== "undefined" &
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -51,6 +51,8 @@ const proper = {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -73,8 +75,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-data-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -20,7 +16,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -37,6 +37,8 @@ Object.defineProperty(Base.prototype, 'test', {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -50,8 +52,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-getter-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
@@ -16,7 +12,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -46,6 +46,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -59,8 +61,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-on-obj/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -20,7 +16,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -31,6 +31,8 @@ let Base = function Base() {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -44,8 +46,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-getter-on-obj/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -20,7 +16,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -31,6 +31,8 @@ let Base = function Base() {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -47,8 +49,6 @@ function (_Base) {
     get: function () {}
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-not-on-obj/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -20,7 +16,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -31,6 +31,8 @@ let Base = function Base() {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -44,8 +46,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-setter-on-obj/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
@@ -20,7 +16,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -33,6 +33,8 @@ let value = 2;
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -52,8 +54,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-setter-defined-on-parent/output.js

@@ -1,9 +1,5 @@
 "use strict";
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
@@ -16,7 +12,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -46,6 +46,8 @@ function () {
 let Obj =
 /*#__PURE__*/
 function (_Base) {
+  _inherits(Obj, _Base);
+
   function Obj() {
     _classCallCheck(this, Obj);
 
@@ -59,8 +61,6 @@ function (_Base) {
     }
   }]);
 
-  _inherits(Obj, _Base);
-
   return Obj;
 }(Base);
 

packages/babel-plugin-transform-classes/test/fixtures/loose-classCallCheck/with-superClass/output.js

@@ -1,7 +1,7 @@
-function _inheritsLoose(subClass, superClass) { subClass.prototype.__proto__ = superClass && superClass.prototype; subClass.__proto__ = superClass; }
-
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; subClass.__proto__ = superClass; }
+
 let B = function B() {
   "use strict";
 };
@@ -11,6 +11,8 @@ let A =
 function (_B) {
   "use strict";
 
+  _inheritsLoose(A, _B);
+
   function A(track) {
     var _this;
 
@@ -18,7 +20,5 @@ function (_B) {
     return _assertThisInitialized(_this);
   }
 
-  _inheritsLoose(A, _B);
-
   return A;
 }(B);

packages/babel-plugin-transform-classes/test/fixtures/loose/accessing-super-class/output.js

@@ -3,6 +3,8 @@ var Test =
 function (_Foo) {
   "use strict";
 
+  babelHelpers.inheritsLoose(Test, _Foo);
+
   function Test() {
     var _Foo$prototype$test;
 
@@ -23,6 +25,5 @@ function (_Foo) {
     return _this;
   }
 
-  babelHelpers.inheritsLoose(Test, _Foo);
   return Test;
 }(Foo);

packages/babel-plugin-transform-classes/test/fixtures/loose/accessing-super-properties/output.js

@@ -3,6 +3,8 @@ var Test =
 function (_Foo) {
   "use strict";
 
+  babelHelpers.inheritsLoose(Test, _Foo);
+
   function Test() {
     var _this;
 
@@ -12,6 +14,5 @@ function (_Foo) {
     return _this;
   }
 
-  babelHelpers.inheritsLoose(Test, _Foo);
   return Test;
 }(Foo);

packages/babel-plugin-transform-classes/test/fixtures/loose/calling-super-properties/output.js

@@ -3,6 +3,8 @@ var Test =
 function (_Foo) {
   "use strict";
 
+  babelHelpers.inheritsLoose(Test, _Foo);
+
   function Test() {
     var _this;
 
@@ -19,6 +21,5 @@ function (_Foo) {
     return _Foo.wow.call(this);
   };
 
-  babelHelpers.inheritsLoose(Test, _Foo);
   return Test;
 }(Foo);

packages/babel-plugin-transform-classes/test/fixtures/loose/derived-constructor-must-call-super/output.js

@@ -3,12 +3,13 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inheritsLoose(Foo, _Bar);
+
   function Foo() {
     var _this;
 
     return babelHelpers.assertThisInitialized(_this);
   }
 
-  babelHelpers.inheritsLoose(Foo, _Bar);
   return Foo;
 }(Bar);

packages/babel-plugin-transform-classes/test/fixtures/loose/derived-constructor-no-super-return-falsey/output.js

@@ -3,12 +3,13 @@ var Child =
 function (_Base) {
   "use strict";
 
+  babelHelpers.inheritsLoose(Child, _Base);
+
   function Child() {
     var _this;
 
     return false || babelHelpers.assertThisInitialized(_this);
   }
 
-  babelHelpers.inheritsLoose(Child, _Base);
   return Child;
 }(Base);

packages/babel-plugin-transform-classes/test/fixtures/loose/derived-constructor-no-super-return-object/output.js

@@ -3,12 +3,13 @@ var Child =
 function (_Base) {
   "use strict";
 
+  babelHelpers.inheritsLoose(Child, _Base);
+
   function Child() {
     var _this;
 
     return {} || babelHelpers.assertThisInitialized(_this);
   }
 
-  babelHelpers.inheritsLoose(Child, _Base);
   return Child;
 }(Base);

packages/babel-plugin-transform-classes/test/fixtures/loose/redefining-getter-method-in-subclass/exec.js

@@ -1,14 +0,0 @@
-class Base {
-  get test() {
-  }
-}
-
-class Sub extends Base {
-  // Redefining method here
-  test() {
-    return 1;
-  }
-}
-
-expect(new Sub().test()).toBe(1);
-

packages/babel-plugin-transform-classes/test/fixtures/loose/redefining-getter-method-in-subclass/input.js

@@ -1,14 +0,0 @@
-class Base {
-  get test() {
-  }
-}
-
-class Sub extends Base {
-  // Redefining method here
-  test() {
-    return 1;
-  }
-}
-
-expect(new Sub().test()).toBe(1);
-

packages/babel-plugin-transform-classes/test/fixtures/loose/redefining-getter-method-in-subclass/output.js

@@ -1,35 +0,0 @@
-var Base =
-/*#__PURE__*/
-function () {
-  "use strict";
-
-  function Base() {}
-
-  babelHelpers.createClass(Base, [{
-    key: "test",
-    get: function get() {}
-  }]);
-  return Base;
-}();
-
-var Sub =
-/*#__PURE__*/
-function (_Base) {
-  "use strict";
-
-  function Sub() {
-    return _Base.apply(this, arguments) || this;
-  }
-
-  var _proto = Sub.prototype;
-
-  // Redefining method here
-  _proto.test = function test() {
-    return 1;
-  };
-
-  babelHelpers.inheritsLoose(Sub, _Base);
-  return Sub;
-}(Base);
-
-expect(new Sub().test()).toBe(1);

packages/babel-plugin-transform-classes/test/fixtures/loose/super-class-id-member-expression/output.js

@@ -3,11 +3,12 @@ var BaseController =
 function (_Chaplin$Controller) {
   "use strict";
 
+  babelHelpers.inheritsLoose(BaseController, _Chaplin$Controller);
+
   function BaseController() {
     return _Chaplin$Controller.apply(this, arguments) || this;
   }
 
-  babelHelpers.inheritsLoose(BaseController, _Chaplin$Controller);
   return BaseController;
 }(Chaplin.Controller);
 
@@ -16,10 +17,11 @@ var BaseController2 =
 function (_Chaplin$Controller$A) {
   "use strict";
 
+  babelHelpers.inheritsLoose(BaseController2, _Chaplin$Controller$A);
+
   function BaseController2() {
     return _Chaplin$Controller$A.apply(this, arguments) || this;
   }
 
-  babelHelpers.inheritsLoose(BaseController2, _Chaplin$Controller$A);
   return BaseController2;
 }(Chaplin.Controller.Another);

packages/babel-plugin-transform-classes/test/fixtures/loose/super-class/output.js

@@ -3,10 +3,11 @@ var Test =
 function (_Foo) {
   "use strict";
 
+  babelHelpers.inheritsLoose(Test, _Foo);
+
   function Test() {
     return _Foo.apply(this, arguments) || this;
   }
 
-  babelHelpers.inheritsLoose(Test, _Foo);
   return Test;
 }(Foo);

packages/babel-plugin-transform-classes/test/fixtures/regression/2663/output.js

@@ -15,6 +15,8 @@ var _binarySerializer = babelHelpers.interopRequireDefault(require("./helpers/bi
 var Connection =
 /*#__PURE__*/
 function (_EventEmitter) {
+  babelHelpers.inherits(Connection, _EventEmitter);
+
   function Connection(endpoint, joinKey, joinData, roomId) {
     var _this;
 
@@ -37,7 +39,6 @@ function (_EventEmitter) {
       this.sock.close();
     }
   }]);
-  babelHelpers.inherits(Connection, _EventEmitter);
   return Connection;
 }(_events.EventEmitter);
 

packages/babel-plugin-transform-classes/test/fixtures/regression/2694/output.js

@@ -10,6 +10,8 @@ var _BaseFoo2 = babelHelpers.interopRequireDefault(require("./BaseFoo"));
 var SubFoo =
 /*#__PURE__*/
 function (_BaseFoo) {
+  babelHelpers.inherits(SubFoo, _BaseFoo);
+
   function SubFoo() {
     babelHelpers.classCallCheck(this, SubFoo);
     return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(SubFoo).apply(this, arguments));
@@ -22,7 +24,6 @@ function (_BaseFoo) {
       console.log('SubFoo.talk');
     }
   }]);
-  babelHelpers.inherits(SubFoo, _BaseFoo);
   return SubFoo;
 }(_BaseFoo2.default);
 

packages/babel-plugin-transform-classes/test/fixtures/regression/2775/output.js

@@ -10,6 +10,8 @@ var _react = babelHelpers.interopRequireDefault(require("react"));
 var RandomComponent =
 /*#__PURE__*/
 function (_Component) {
+  babelHelpers.inherits(RandomComponent, _Component);
+
   function RandomComponent() {
     babelHelpers.classCallCheck(this, RandomComponent);
     return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(RandomComponent).call(this));
@@ -23,7 +25,6 @@ function (_Component) {
       }, _react.default.createElement("h2", null, "Hi there!"));
     }
   }]);
-  babelHelpers.inherits(RandomComponent, _Component);
   return RandomComponent;
 }(_react.Component);
 

packages/babel-plugin-transform-classes/test/fixtures/regression/3028/output.js

@@ -12,6 +12,8 @@ var b = function b() {
 var a1 =
 /*#__PURE__*/
 function (_b) {
+  babelHelpers.inherits(a1, _b);
+
   function a1() {
     var _this;
 
@@ -25,13 +27,14 @@ function (_b) {
     return _this;
   }
 
-  babelHelpers.inherits(a1, _b);
   return a1;
 }(b);
 
 var a2 =
 /*#__PURE__*/
 function (_b2) {
+  babelHelpers.inherits(a2, _b2);
+
   function a2() {
     var _this2;
 
@@ -45,7 +48,6 @@ function (_b2) {
     return _this2;
   }
 
-  babelHelpers.inherits(a2, _b2);
   return a2;
 }(b);
 

packages/babel-plugin-transform-classes/test/fixtures/regression/5769/output.js

@@ -21,6 +21,8 @@ var ColorPoint =
 function (_Point) {
   "use strict";
 
+  babelHelpers.inherits(ColorPoint, _Point);
+
   function ColorPoint() {
     var _this;
 
@@ -41,7 +43,6 @@ function (_Point) {
       this.getX();
     }
   }]);
-  babelHelpers.inherits(ColorPoint, _Point);
   return ColorPoint;
 }(Point);
 

packages/babel-plugin-transform-classes/test/fixtures/regression/5817/output.js

@@ -3,6 +3,8 @@ var A =
 function (_B) {
   "use strict";
 
+  babelHelpers.inherits(A, _B);
+
   function A() {
     var _this;
 
@@ -20,6 +22,5 @@ function (_B) {
     return _this;
   }
 
-  babelHelpers.inherits(A, _B);
   return A;
 }(B);

packages/babel-plugin-transform-classes/test/fixtures/regression/T2494/output.js

@@ -4,12 +4,13 @@ var x = {
   function (_Foo) {
     "use strict";
 
+    babelHelpers.inherits(_class, _Foo);
+
     function _class() {
       babelHelpers.classCallCheck(this, _class);
       return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(_class).apply(this, arguments));
     }
 
-    babelHelpers.inherits(_class, _Foo);
     return _class;
   }(Foo)
 };

packages/babel-plugin-transform-classes/test/fixtures/regression/T2997/output.js

@@ -9,6 +9,8 @@ var B =
 function (_A) {
   "use strict";
 
+  babelHelpers.inherits(B, _A);
+
   function B() {
     var _this;
 
@@ -16,6 +18,5 @@ function (_A) {
     return babelHelpers.possibleConstructorReturn(_this, _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(B).call(this)));
   }
 
-  babelHelpers.inherits(B, _A);
   return B;
 }(A);

packages/babel-plugin-transform-classes/test/fixtures/regression/T7537/output.js

@@ -1,14 +1,14 @@
 function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } _setPrototypeOf(subClass.prototype, superClass && superClass.prototype); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.getPrototypeOf || function _getPrototypeOf(o) { return o.__proto__; }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _instanceof(left, right) { if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) { return right[Symbol.hasInstance](left); } else { return left instanceof right; } }
 
@@ -25,6 +25,8 @@ var A =
 function (_B) {
   "use strict";
 
+  _inherits(A, _B);
+
   function A(track) {
     var _this;
 
@@ -34,7 +36,5 @@ function (_B) {
     return _possibleConstructorReturn(_this);
   }
 
-  _inherits(A, _B);
-
   return A;
 }(B);

packages/babel-plugin-transform-classes/test/fixtures/spec/accessing-super-class/output.js

@@ -3,6 +3,8 @@ var Test =
 function (_Foo) {
   "use strict";
 
+  babelHelpers.inherits(Test, _Foo);
+
   function Test() {
     var _babelHelpers$getProt, _babelHelpers$get;
 
@@ -42,6 +44,5 @@ function (_Foo) {
       (_babelHelpers$get3 = babelHelpers.get(babelHelpers.getPrototypeOf(Test), "foo", this)).call.apply(_babelHelpers$get3, [this, "test"].concat(Array.prototype.slice.call(arguments)));
     }
   }]);
-  babelHelpers.inherits(Test, _Foo);
   return Test;
 }(Foo);

packages/babel-plugin-transform-classes/test/fixtures/spec/accessing-super-properties/output.js

@@ -3,6 +3,8 @@ var Test =
 function (_Foo) {
   "use strict";
 
+  babelHelpers.inherits(Test, _Foo);
+
   function Test() {
     var _this;
 
@@ -13,6 +15,5 @@ function (_Foo) {
     return _this;
   }
 
-  babelHelpers.inherits(Test, _Foo);
   return Test;
 }(Foo);

packages/babel-plugin-transform-classes/test/fixtures/spec/calling-super-properties/output.js

@@ -3,6 +3,8 @@ var Test =
 function (_Foo) {
   "use strict";
 
+  babelHelpers.inherits(Test, _Foo);
+
   function Test() {
     var _this;
 
@@ -19,6 +21,5 @@ function (_Foo) {
       return babelHelpers.get(babelHelpers.getPrototypeOf(Test), "wow", this).call(this);
     }
   }]);
-  babelHelpers.inherits(Test, _Foo);
   return Test;
 }(Foo);

packages/babel-plugin-transform-classes/test/fixtures/spec/constructor/output.js

@@ -10,6 +10,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _this;
 
@@ -19,7 +21,6 @@ function (_Bar) {
     return _this;
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);
 

packages/babel-plugin-transform-classes/test/fixtures/spec/delay-arrow-function-for-bare-super-derived/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _this;
 
@@ -12,6 +14,5 @@ function (_Bar) {
     }));
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);

packages/babel-plugin-transform-classes/test/fixtures/spec/derived-constructor-must-call-super-2/output.js

@@ -3,6 +3,8 @@ var Foo =
 function (_Bar) {
   "use strict";
 
+  babelHelpers.inherits(Foo, _Bar);
+
   function Foo() {
     var _this;
 
@@ -11,6 +13,5 @@ function (_Bar) {
     return babelHelpers.possibleConstructorReturn(_this);
   }
 
-  babelHelpers.inherits(Foo, _Bar);
   return Foo;
 }(Bar);