Skip to content

Commit 19fdca5

Browse files
liuxingbaoyuliuxingbaoyu
authored
Reduce the use of class names (#16326)
Use the return value of the createClass helper
1 parent 4dd88ea commit 19fdca5

264 files changed

Lines changed: 415 additions & 634 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/babel-core/test/fixtures/transformation/source-maps/class/output.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ var Test = /*#__PURE__*/function () {
44
function Test() {
55
babelHelpers.classCallCheck(this, Test);
66
}
7-
babelHelpers.createClass(Test, [{
7+
return babelHelpers.createClass(Test, [{
88
key: "bar",
99
get: function () {
1010
throw new Error("wow");
1111
}
1212
}]);
13-
return Test;
1413
}();
1514
var test = new Test();
1615
test.bar;

‎packages/babel-core/test/fixtures/transformation/source-maps/class/source-map-visual.txt‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,25 @@
3737
(1:10-12) Test { <-- (6:2-3) }
3838
^^ ^
3939

40-
(1:10-12) Test { <-- (7:2-14) babelHelpers.cre
41-
^^ ^^^^^^^^^^^^
40+
(1:10-12) Test { <-- (7:2-9) return babe
41+
^^ ^^^^^^^
4242

43-
(1:10-12) Test { <-- (7:14-15) pers.crea
43+
(1:10-12) Test { <-- (7:9-21) urn babelHelpers.cre
44+
^^ ^^^^^^^^^^^^
45+
46+
(1:10-12) Test { <-- (7:21-22) pers.crea
4447
^^ ^
4548

46-
(1:10-12) Test { <-- (7:15-26) ers.createClass(Tes
49+
(1:10-12) Test { <-- (7:22-33) ers.createClass(Tes
4750
^^ ^^^^^^^^^^^
4851

49-
(1:10-12) Test { <-- (7:26-27) lass(Test
52+
(1:10-12) Test { <-- (7:33-34) lass(Test
5053
^^ ^
5154

52-
(1:10-12) Test { <-- (7:27-31) ass(Test, [{
55+
(1:10-12) Test { <-- (7:34-38) ass(Test, [{
5356
^^ ^^^^
5457

55-
(1:10-12) Test { <-- (7:31-35) Test, [{
58+
(1:10-12) Test { <-- (7:38-42) Test, [{
5659
^^ ^^^^
5760

5861
(1:10-12) Test { <-- (8:4-7) key: "b
@@ -106,50 +109,41 @@
106109
(4:3-3) } <-- (12:2-6) }]);
107110
>< ^^^^
108111

109-
(4:3-3) } <-- (13:2-9) return Test
110-
>< ^^^^^^^
111-
112-
(4:3-3) } <-- (13:9-13) urn Test;
113-
>< ^^^^
114-
115-
(4:3-3) } <-- (13:13-14) Test;
116-
>< ^
117-
118-
(4:3-3) } <-- (14:0-4) }();
112+
(4:3-3) } <-- (13:0-4) }();
119113
>< ^^^^
120114

121-
(7:0-4) var test <-- (15:0-4) var test
115+
(7:0-4) var test <-- (14:0-4) var test
122116
^^^^ ^^^^
123117

124-
(7:4-8) var test = n <-- (15:4-8) var test = n
118+
(7:4-8) var test = n <-- (14:4-8) var test = n
125119
^^^^ ^^^^
126120

127-
(7:8-11) test = new <-- (15:8-11) test = new
121+
(7:8-11) test = new <-- (14:8-11) test = new
128122
^^^ ^^^
129123

130-
(7:11-15) t = new Test <-- (15:11-15) t = new Test
124+
(7:11-15) t = new Test <-- (14:11-15) t = new Test
131125
^^^^ ^^^^
132126

133-
(7:15-19) new Test; <-- (15:15-19) new Test();
127+
(7:15-19) new Test; <-- (14:15-19) new Test();
134128
^^^^ ^^^^
135129

136-
(7:19-19) Test; <-- (15:19-20) Test();
130+
(7:19-19) Test; <-- (14:19-20) Test();
137131
>< ^
138132

139-
(7:18-19) Test; <-- (15:20-21) est();
133+
(7:18-19) Test; <-- (14:20-21) est();
140134
^ ^
141135

142-
(7:19-20) Test; <-- (15:21-22) st();
136+
(7:19-20) Test; <-- (14:21-22) st();
143137
^ ^
144138

145-
(8:0-4) test.bar <-- (16:0-4) test.bar
139+
(8:0-4) test.bar <-- (15:0-4) test.bar
146140
^^^^ ^^^^
147141

148-
(8:4-5) test.bar; <-- (16:4-5) test.bar;
142+
(8:4-5) test.bar; <-- (15:4-5) test.bar;
149143
^ ^
150144

151-
(8:5-8) est.bar; <-- (16:5-8) est.bar;
145+
(8:5-8) est.bar; <-- (15:5-8) est.bar;
152146
^^^ ^^^
153147

154-
(8:8-9) .bar; <-- (16:8-9) .bar;
148+
(8:8-9) .bar; <-- (15:8-9) .bar;
155149
^ ^

‎packages/babel-core/test/fixtures/transformation/source-maps/class/source-map.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"sourcesContent": [
1818
"class Test {\n get bar() {\n throw new Error(\"wow\");\n }\n}\n\nvar test = new Test;\ntest.bar;"
1919
],
20-
"mappings": "IAAMA,IAAI;EAAA;;EAAA,SAAAA,KAAA;IAAAC,YAAA,CAAAC,cAAA,OAAAF,IAAA;EAAA;EAAAC,YAAA,CAAAE,WAAA,CAAAH,IAAA;IAAAI,GAAA;IAAAC,GAAA,EACR,SAAAA,CAAA,EAAU;MACR,MAAM,IAAIC,KAAK,CAAC,KAAK,CAAC;IACxB;EAAC;EAAA,OAAAN,IAAA;AAAA;AAGH,IAAIO,IAAI,GAAG,IAAIP,IAAI,CAAD,CAAC;AACnBO,IAAI,CAACC,GAAG",
20+
"mappings": "IAAMA,IAAI;EAAA;;EAAA,SAAAA,KAAA;IAAAC,YAAA,CAAAC,cAAA,OAAAF,IAAA;EAAA;EAAA,OAAAC,YAAA,CAAAE,WAAA,CAAAH,IAAA;IAAAI,GAAA;IAAAC,GAAA,EACR,SAAAA,CAAA,EAAU;MACR,MAAM,IAAIC,KAAK,CAAC,KAAK,CAAC;IACxB;EAAC;AAAA;AAGH,IAAIC,IAAI,GAAG,IAAIP,IAAI,CAAD,CAAC;AACnBO,IAAI,CAACC,GAAG",
2121
"ignoreList": []
2222
}

‎packages/babel-plugin-external-helpers/test/fixtures/opts/whitelist/output.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ let Foo = /*#__PURE__*/function () {
55
function Foo() {
66
_classCallCheck(this, Foo);
77
}
8-
babelHelpers.createClass(Foo, [{
8+
return babelHelpers.createClass(Foo, [{
99
key: "method",
1010
value: function method() {}
1111
}]);
12-
return Foo;
1312
}();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ function generateAsyncAction(type) {
1212
var A = /*#__PURE__*/function (_B) {
1313
"use strict";
1414

15-
babelHelpers.inherits(A, _B);
1615
function A(timestamp) {
1716
var _this;
1817
babelHelpers.classCallCheck(this, A);
@@ -21,5 +20,6 @@ var A = /*#__PURE__*/function (_B) {
2120
_this.moment = moment(timestamp);
2221
return _this;
2322
}
23+
babelHelpers.inherits(A, _B);
2424
return babelHelpers.createClass(A);
2525
}(B);

‎packages/babel-plugin-proposal-function-bind/test/fixtures/regression/T6984/output.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let Test1 = /*#__PURE__*/function () {
66
function Test1() {
77
babelHelpers.classCallCheck(this, Test1);
88
}
9-
babelHelpers.createClass(Test1, [{
9+
return babelHelpers.createClass(Test1, [{
1010
key: "one",
1111
value: function one() {
1212
_two.call(_one, 1, 2);
@@ -17,5 +17,4 @@ let Test1 = /*#__PURE__*/function () {
1717
_two.call(_one, 1, 2);
1818
}
1919
}]);
20-
return Test1;
2120
}();

‎packages/babel-plugin-transform-class-properties/test/fixtures/assumption-setPublicClassFields/foobar/output.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
var Child = /*#__PURE__*/function (_Parent) {
22
"use strict";
33

4-
babelHelpers.inherits(Child, _Parent);
54
function Child() {
65
var _this;
76
babelHelpers.classCallCheck(this, Child);
@@ -11,5 +10,6 @@ var Child = /*#__PURE__*/function (_Parent) {
1110
};
1211
return _this;
1312
}
13+
babelHelpers.inherits(Child, _Parent);
1414
return babelHelpers.createClass(Child);
1515
}(Parent);

‎packages/babel-plugin-transform-class-properties/test/fixtures/class-name-tdz/decorator-interop/output.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ let A = (_class = (_Symbol$search = Symbol.search, /*#__PURE__*/function () {
88
babelHelpers.classCallCheck(this, A);
99
babelHelpers.initializerDefineProperty(this, "a", _descriptor, this);
1010
}
11-
babelHelpers.createClass(A, [{
11+
return babelHelpers.createClass(A, [{
1212
key: _Symbol$search,
1313
value: function () {}
1414
}]);
15-
return A;
1615
}()), (_descriptor = babelHelpers.applyDecoratedDescriptor(_class.prototype, "a", [dec], {
1716
configurable: true,
1817
enumerable: true,

‎packages/babel-plugin-transform-class-properties/test/fixtures/nested-class/super-call-in-decorator/output.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ let Hello = /*#__PURE__*/babelHelpers.createClass(function Hello() {
55
return () => () => "hello";
66
});
77
let Outer = /*#__PURE__*/function (_Hello) {
8-
babelHelpers.inherits(Outer, _Hello);
98
function Outer() {
109
let _ref;
1110
var _helloDecs, _init_hello, _init_extra_hello, _Inner;
@@ -21,6 +20,7 @@ let Outer = /*#__PURE__*/function (_Hello) {
2120
[_init_hello, _init_extra_hello] = babelHelpers.applyDecs2311(_Inner, [], [[_helloDecs, 0, "hello"]]).e;
2221
return babelHelpers.possibleConstructorReturn(_this, new Inner());
2322
}
23+
babelHelpers.inherits(Outer, _Hello);
2424
return babelHelpers.createClass(Outer);
2525
}(Hello);
2626
expect(new Outer().hello).toBe('hello');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ let Hello = /*#__PURE__*/babelHelpers.createClass(function Hello() {
99
};
1010
});
1111
let Outer = /*#__PURE__*/function (_Hello) {
12-
babelHelpers.inherits(Outer, _Hello);
1312
function Outer() {
1413
var _this;
1514
babelHelpers.classCallCheck(this, Outer);
@@ -20,6 +19,7 @@ let Outer = /*#__PURE__*/function (_Hello) {
2019
});
2120
return babelHelpers.possibleConstructorReturn(_this, new Inner());
2221
}
22+
babelHelpers.inherits(Outer, _Hello);
2323
return babelHelpers.createClass(Outer);
2424
}(Hello);
2525
expect(new Outer().hello).toBe('hello');

0 commit comments

Comments
 (0)