Skip to content

Commit 6a8e201

Browse files
committed
fixup WebpackErrors
1 parent 62d4ede commit 6a8e201

9 files changed

+25
-80
lines changed

lib/CommentCompilationWarning.js

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,6 @@ class CommentCompilationWarning extends WebpackError {
2929

3030
Error.captureStackTrace(this, this.constructor);
3131
}
32-
33-
serialize(context) {
34-
const { write } = context;
35-
36-
write(this.name);
37-
write(this.module);
38-
write(this.loc);
39-
40-
super.serialize(context);
41-
}
42-
43-
deserialize(context) {
44-
const { read } = context;
45-
46-
this.name = read();
47-
this.module = read();
48-
this.loc = read();
49-
50-
super.serialize(context);
51-
}
5232
}
5333

5434
makeSerializable(

lib/ModuleBuildError.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ class ModuleBuildError extends WebpackError {
5757
serialize(context) {
5858
const { write } = context;
5959

60-
write(this.name);
61-
write(this.details);
62-
write(this.module);
6360
write(this.error);
6461

6562
super.serialize(context);
@@ -68,9 +65,6 @@ class ModuleBuildError extends WebpackError {
6865
deserialize(context) {
6966
const { read } = context;
7067

71-
this.name = read();
72-
this.details = read();
73-
this.module = read();
7468
this.error = read();
7569

7670
super.deserialize(context);

lib/ModuleError.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,15 @@ class ModuleError extends WebpackError {
4141
serialize(context) {
4242
const { write } = context;
4343

44-
write(this.name);
45-
write(this.module);
4644
write(this.error);
47-
write(this.details);
4845

4946
super.serialize(context);
5047
}
5148

5249
deserialize(context) {
5350
const { read } = context;
5451

55-
this.name = read();
56-
this.module = read();
5752
this.error = read();
58-
this.details = read();
5953

6054
super.deserialize(context);
6155
}

lib/ModuleParseError.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ class ModuleParseError extends WebpackError {
6363
serialize(context) {
6464
const { write } = context;
6565

66-
write(this.name);
67-
write(this.module);
68-
write(this.loc);
6966
write(this.error);
7067

7168
super.serialize(context);
@@ -74,15 +71,12 @@ class ModuleParseError extends WebpackError {
7471
deserialize(context) {
7572
const { read } = context;
7673

77-
this.name = read();
78-
this.module = read();
79-
this.loc = read();
8074
this.error = read();
8175

8276
super.deserialize(context);
8377
}
8478
}
8579

86-
makeSerializable(ModuleParseError, "webpack/lib/dependencies/ModuleParseError");
80+
makeSerializable(ModuleParseError, "webpack/lib/ModuleParseError");
8781

8882
module.exports = ModuleParseError;

lib/ModuleWarning.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,15 @@ class ModuleWarning extends WebpackError {
4141
serialize(context) {
4242
const { write } = context;
4343

44-
write(this.name);
45-
write(this.module);
4644
write(this.warning);
47-
write(this.details);
4845

4946
super.serialize(context);
5047
}
5148

5249
deserialize(context) {
5350
const { read } = context;
5451

55-
this.name = read();
56-
this.module = read();
5752
this.warning = read();
58-
this.details = read();
5953

6054
super.deserialize(context);
6155
}

lib/NormalModule.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ const makeSerializable = require("./util/makeSerializable");
3939
/** @typedef {import("./Module").SourceContext} SourceContext */
4040
/** @typedef {import("./RequestShortener")} RequestShortener */
4141
/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
42-
/** @typedef {import("./WebpackError")} WebpackError */
4342
/** @typedef {import("./util/createHash").Hash} Hash */
4443

4544
const EARLY_RETURN_ERROR = new Error("flags early return is not an error");
@@ -69,6 +68,12 @@ class NonErrorEmittedError extends WebpackError {
6968
}
7069
}
7170

71+
makeSerializable(
72+
NonErrorEmittedError,
73+
"webpack/lib/NormalModule",
74+
"NonErrorEmittedError"
75+
);
76+
7277
/**
7378
* @typedef {Object} CachedSourceEntry
7479
* @property {TODO} source the generated source

lib/UnsupportedFeatureWarning.js

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,6 @@ class UnsupportedFeatureWarning extends WebpackError {
2727

2828
Error.captureStackTrace(this, this.constructor);
2929
}
30-
31-
serialize(context) {
32-
const { write } = context;
33-
34-
write(this.name);
35-
write(this.module);
36-
write(this.loc);
37-
write(this.hideStack);
38-
39-
super.serialize(context);
40-
}
41-
42-
deserialize(context) {
43-
const { read } = context;
44-
45-
this.name = read();
46-
this.module = read();
47-
this.loc = read();
48-
this.hideStack = read();
49-
50-
super.deserialize(context);
51-
}
5230
}
5331

5432
makeSerializable(

lib/WebpackError.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ class WebpackError extends Error {
2222
this.module = undefined;
2323
/** @type {DependencyLocation} */
2424
this.loc = undefined;
25+
/** @type {boolean} */
26+
this.hideStack = undefined;
2527

2628
Error.captureStackTrace(this, this.constructor);
2729
}
@@ -30,26 +32,24 @@ class WebpackError extends Error {
3032
return this.stack + (this.details ? `\n${this.details}` : "");
3133
}
3234

33-
serialize(context) {
34-
const { write } = context;
35-
35+
serialize({ write }) {
36+
write(this.name);
37+
write(this.message);
38+
write(this.stack);
3639
write(this.details);
3740
write(this.missing);
38-
write(this.module);
3941
write(this.loc);
40-
41-
super.serialize(context);
42+
write(this.hideStack);
4243
}
4344

44-
deserialize(context) {
45-
const { read } = context;
46-
45+
deserialize({ read }) {
46+
this.name = read();
47+
this.message = read();
48+
this.stack = read();
4749
this.details = read();
4850
this.missing = read();
49-
this.module = read();
5051
this.loc = read();
51-
52-
super.deserialize(context);
52+
this.hideStack = read();
5353
}
5454
}
5555

lib/dependencies/CriticalDependencyWarning.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"use strict";
77

88
const WebpackError = require("../WebpackError");
9+
const makeSerializable = require("../util/makeSerializable");
910

1011
class CriticalDependencyWarning extends WebpackError {
1112
constructor(message) {
@@ -18,4 +19,9 @@ class CriticalDependencyWarning extends WebpackError {
1819
}
1920
}
2021

22+
makeSerializable(
23+
CriticalDependencyWarning,
24+
"webpack/lib/dependencies/CriticalDependencyWarning"
25+
);
26+
2127
module.exports = CriticalDependencyWarning;

0 commit comments

Comments
 (0)