Skip to content

Commit 4174521

Browse files
sokrasokra
committed
remove unnecessary module arguments from module attached errors
1 parent e9db83c commit 4174521

11 files changed

+17
-42
lines changed

‎lib/CommentCompilationWarning.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,19 @@
88
const WebpackError = require("./WebpackError");
99
const makeSerializable = require("./util/makeSerializable");
1010

11-
/** @typedef {import("./Module")} Module */
12-
1311
/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
1412

1513
class CommentCompilationWarning extends WebpackError {
1614
/**
1715
*
1816
* @param {string} message warning message
19-
* @param {Module} module affected module
2017
* @param {DependencyLocation} loc affected lines of code
2118
*/
22-
constructor(message, module, loc) {
19+
constructor(message, loc) {
2320
super(message);
2421

2522
this.name = "CommentCompilationWarning";
2623

27-
this.module = module;
2824
this.loc = loc;
2925

3026
Error.captureStackTrace(this, this.constructor);

‎lib/JavascriptParserHelpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ exports.expressionIsUnsupported = (parser, message) => {
7272
parser.state.current.addDependency(dep);
7373
if (!parser.state.module) return;
7474
parser.state.module.warnings.push(
75-
new UnsupportedFeatureWarning(parser.state.module, message, expr.loc)
75+
new UnsupportedFeatureWarning(message, expr.loc)
7676
);
7777
return true;
7878
};

‎lib/ModuleBuildError.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const WebpackError = require("./WebpackError");
1010
const makeSerializable = require("./util/makeSerializable");
1111

1212
class ModuleBuildError extends WebpackError {
13-
constructor(module, err, { from = null } = {}) {
13+
constructor(err, { from = null } = {}) {
1414
let message = "Module build failed";
1515
let details = undefined;
1616

@@ -48,7 +48,6 @@ class ModuleBuildError extends WebpackError {
4848

4949
this.name = "ModuleBuildError";
5050
this.details = details;
51-
this.module = module;
5251
this.error = err;
5352

5453
Error.captureStackTrace(this, this.constructor);

‎lib/ModuleError.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const WebpackError = require("./WebpackError");
1010
const makeSerializable = require("./util/makeSerializable");
1111

1212
class ModuleError extends WebpackError {
13-
constructor(module, err, { from = null } = {}) {
13+
constructor(err, { from = null } = {}) {
1414
let message = "Module Error";
1515

1616
if (from) {
@@ -28,7 +28,6 @@ class ModuleError extends WebpackError {
2828
super(message);
2929

3030
this.name = "ModuleError";
31-
this.module = module;
3231
this.error = err;
3332
this.details =
3433
err && typeof err === "object" && err.stack

‎lib/ModuleParseError.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,19 @@
88
const WebpackError = require("./WebpackError");
99
const makeSerializable = require("./util/makeSerializable");
1010

11-
/** @typedef {import("./Module")} Module */
12-
1311
class ModuleParseError extends WebpackError {
1412
/**
15-
* @param {Module} module the errored module
1613
* @param {string} source source code
1714
* @param {Error&any} err the parse error
1815
*/
19-
constructor(module, source, err) {
20-
let message = "Module parse failed: " + err.message;
16+
constructor(source, err) {
17+
let message = "Module parse failed: " + (err && err.message);
2118
let loc = undefined;
2219

2320
message += "\nYou may need an appropriate loader to handle this file type.";
2421

2522
if (
23+
err &&
2624
err.loc &&
2725
typeof err.loc === "object" &&
2826
typeof err.loc.line === "number"
@@ -46,14 +44,13 @@ class ModuleParseError extends WebpackError {
4644
}
4745

4846
loc = { start: err.loc };
49-
} else {
47+
} else if (err && err.stack) {
5048
message += "\n" + err.stack;
5149
}
5250

5351
super(message);
5452

5553
this.name = "ModuleParseError";
56-
this.module = module;
5754
this.loc = loc;
5855
this.error = err;
5956

‎lib/ModuleWarning.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const WebpackError = require("./WebpackError");
1010
const makeSerializable = require("./util/makeSerializable");
1111

1212
class ModuleWarning extends WebpackError {
13-
constructor(module, warning, { from = null } = {}) {
13+
constructor(warning, { from = null } = {}) {
1414
let message = "Module Warning";
1515

1616
if (from) {
@@ -28,7 +28,6 @@ class ModuleWarning extends WebpackError {
2828
super(message);
2929

3030
this.name = "ModuleWarning";
31-
this.module = module;
3231
this.warning = warning;
3332
this.details =
3433
warning && typeof warning === "object" && warning.stack

‎lib/NormalModule.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class NormalModule extends Module {
200200
}
201201
const currentLoader = this.getCurrentLoader(loaderContext);
202202
this.warnings.push(
203-
new ModuleWarning(this, warning, {
203+
new ModuleWarning(warning, {
204204
from: requestShortener.shorten(currentLoader.loader)
205205
})
206206
);
@@ -211,7 +211,7 @@ class NormalModule extends Module {
211211
}
212212
const currentLoader = this.getCurrentLoader(loaderContext);
213213
this.errors.push(
214-
new ModuleError(this, error, {
214+
new ModuleError(error, {
215215
from: requestShortener.shorten(currentLoader.loader)
216216
})
217217
);
@@ -318,7 +318,7 @@ class NormalModule extends Module {
318318
err = new NonErrorEmittedError(err);
319319
}
320320
const currentLoader = this.getCurrentLoader(loaderContext);
321-
const error = new ModuleBuildError(this, err, {
321+
const error = new ModuleBuildError(err, {
322322
from:
323323
currentLoader &&
324324
compilation.runtimeTemplate.requestShortener.shorten(
@@ -344,7 +344,7 @@ class NormalModule extends Module {
344344
: "unknown"
345345
}) didn't return a Buffer or String`
346346
);
347-
const error = new ModuleBuildError(this, err);
347+
const error = new ModuleBuildError(err);
348348
return callback(error);
349349
}
350350

@@ -474,7 +474,7 @@ class NormalModule extends Module {
474474

475475
const handleParseError = e => {
476476
const source = this._source.source();
477-
const error = new ModuleParseError(this, source, e);
477+
const error = new ModuleParseError(source, e);
478478
this.markModuleAsErrored(error);
479479
this._initBuildHash(compilation);
480480
return callback();

‎lib/UnsupportedFeatureWarning.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,16 @@ const WebpackError = require("./WebpackError");
99
const makeSerializable = require("./util/makeSerializable");
1010

1111
/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
12-
/** @typedef {import("./Module")} Module */
1312

1413
class UnsupportedFeatureWarning extends WebpackError {
1514
/**
16-
* @param {Module} module module relevant to warning
1715
* @param {string} message description of warning
1816
* @param {DependencyLocation} loc ___location start and end positions of the module
1917
*/
20-
constructor(module, message, loc) {
18+
constructor(message, loc) {
2119
super(message);
2220

2321
this.name = "UnsupportedFeatureWarning";
24-
this.module = module;
2522
this.loc = loc;
2623
this.hideStack = true;
2724

‎lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ class AMDRequireDependenciesBlockParserPlugin {
214214
if (parser.state.module) {
215215
parser.state.module.errors.push(
216216
new UnsupportedFeatureWarning(
217-
parser.state.module,
218217
"Cannot statically analyse 'require(…, …)' in line " +
219218
expr.loc.start.line,
220219
expr.loc

‎lib/dependencies/ImportParserPlugin.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class ImportParserPlugin {
4848
`Compilation error while processing magic comment(-s): /*${
4949
comment.value
5050
}*/: ${e.message}`,
51-
parser.state.module,
5251
comment.loc
5352
)
5453
);
@@ -60,7 +59,6 @@ class ImportParserPlugin {
6059
if (typeof importOptions.webpackIgnore !== "boolean") {
6160
parser.state.module.warnings.push(
6261
new UnsupportedFeatureWarning(
63-
parser.state.module,
6462
`\`webpackIgnore\` expected a boolean, but received: ${
6563
importOptions.webpackIgnore
6664
}.`,
@@ -78,7 +76,6 @@ class ImportParserPlugin {
7876
if (typeof importOptions.webpackChunkName !== "string") {
7977
parser.state.module.warnings.push(
8078
new UnsupportedFeatureWarning(
81-
parser.state.module,
8279
`\`webpackChunkName\` expected a string, but received: ${
8380
importOptions.webpackChunkName
8481
}.`,
@@ -93,7 +90,6 @@ class ImportParserPlugin {
9390
if (typeof importOptions.webpackMode !== "string") {
9491
parser.state.module.warnings.push(
9592
new UnsupportedFeatureWarning(
96-
parser.state.module,
9793
`\`webpackMode\` expected a string, but received: ${
9894
importOptions.webpackMode
9995
}.`,
@@ -112,7 +108,6 @@ class ImportParserPlugin {
112108
} else {
113109
parser.state.module.warnings.push(
114110
new UnsupportedFeatureWarning(
115-
parser.state.module,
116111
`\`webpackPrefetch\` expected true or a number, but received: ${
117112
importOptions.webpackPrefetch
118113
}.`,
@@ -129,7 +124,6 @@ class ImportParserPlugin {
129124
} else {
130125
parser.state.module.warnings.push(
131126
new UnsupportedFeatureWarning(
132-
parser.state.module,
133127
`\`webpackPreload\` expected true or a number, but received: ${
134128
importOptions.webpackPreload
135129
}.`,
@@ -145,7 +139,6 @@ class ImportParserPlugin {
145139
) {
146140
parser.state.module.warnings.push(
147141
new UnsupportedFeatureWarning(
148-
parser.state.module,
149142
`\`webpackInclude\` expected a regular expression, but received: ${
150143
importOptions.webpackInclude
151144
}.`,
@@ -163,7 +156,6 @@ class ImportParserPlugin {
163156
) {
164157
parser.state.module.warnings.push(
165158
new UnsupportedFeatureWarning(
166-
parser.state.module,
167159
`\`webpackExclude\` expected a regular expression, but received: ${
168160
importOptions.webpackExclude
169161
}.`,
@@ -180,7 +172,6 @@ class ImportParserPlugin {
180172
if (mode !== "lazy" && mode !== "eager" && mode !== "weak") {
181173
parser.state.module.warnings.push(
182174
new UnsupportedFeatureWarning(
183-
parser.state.module,
184175
`\`webpackMode\` expected 'lazy', 'eager' or 'weak', but received: ${mode}.`,
185176
expr.loc
186177
)
@@ -217,7 +208,6 @@ class ImportParserPlugin {
217208
) {
218209
parser.state.module.warnings.push(
219210
new UnsupportedFeatureWarning(
220-
parser.state.module,
221211
`\`webpackMode\` expected 'lazy', 'lazy-once', 'eager' or 'weak', but received: ${mode}.`,
222212
expr.loc
223213
)

0 commit comments

Comments
 (0)