Merge branch 'master' into code-generator
Conflicts: lib/6to5/transformers/classes.js test/fixtures/transformation/source-maps/class/expected.js test/fixtures/transformation/source-maps/class/source-mappings.json
This commit is contained in:
@@ -1,7 +1,11 @@
|
||||
"use strict";
|
||||
var _classProps = function (child, staticProps, instanceProps) {
|
||||
if (staticProps) Object.defineProperties(child, staticProps);
|
||||
if (instanceProps) Object.defineProperties(child.prototype, instanceProps);
|
||||
};
|
||||
var Test = (function () {
|
||||
var Test = function Test() {};
|
||||
Object.defineProperties(Test.prototype, { bar: { get: function () {
|
||||
_classProps(Test, null, { bar: { get: function () {
|
||||
throw new Error("wow");
|
||||
} } });
|
||||
return Test;
|
||||
|
||||
Reference in New Issue
Block a user