Skip to content

Commit 1a468f5

Browse files
committed
fix(commonjs): handle trailing commas in require.resolve calls
1 parent 52996d7 commit 1a468f5

7 files changed

Lines changed: 69 additions & 12 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"webpack": patch
3+
---
4+
5+
Fix trailing commas in `require.resolve()` and `require.resolveWeak()` calls.

‎lib/dependencies/commonjs/CommonJsImportsParserPlugin.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,18 @@ const createProcessResolveHandler = (parser, options, getContext) => {
434434

435435
if (expr.arguments.length !== 1) return;
436436
const param = parser.evaluateExpression(expr.arguments[0]);
437+
const range = /** @type {Range} */ (expr.range);
438+
const argumentRange = /** @type {Range} */ (expr.arguments[0].range);
439+
const header = new RequireResolveHeaderDependency([
440+
range[0],
441+
argumentRange[0]
442+
]);
443+
header.loc = parser.getLocation(expr);
444+
parser.state.module.addPresentationalDependency(header);
445+
// A parenthesized expression cannot retain the call's trailing comma.
446+
const closing = new ConstDependency(")", [argumentRange[1], range[1]]);
447+
closing.loc = parser.getLocation(expr);
448+
parser.state.module.addPresentationalDependency(closing);
437449
if (param.isConditional()) {
438450
for (const option of /** @type {BasicEvaluatedExpression[]} */ (
439451
param.options
@@ -443,22 +455,12 @@ const createProcessResolveHandler = (parser, options, getContext) => {
443455
processResolveContext(expr, option, weak);
444456
}
445457
}
446-
const dep = new RequireResolveHeaderDependency(
447-
/** @type {Range} */ (expr.callee.range)
448-
);
449-
dep.loc = parser.getLocation(expr);
450-
parser.state.module.addPresentationalDependency(dep);
451458
return true;
452459
}
453460
const result = processResolveItem(expr, param, weak);
454461
if (result === undefined) {
455462
processResolveContext(expr, param, weak);
456463
}
457-
const dep = new RequireResolveHeaderDependency(
458-
/** @type {Range} */ (expr.callee.range)
459-
);
460-
dep.loc = parser.getLocation(expr);
461-
parser.state.module.addPresentationalDependency(dep);
462464
return true;
463465
};
464466
};

‎lib/dependencies/commonjs/RequireResolveHeaderDependency.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ RequireResolveHeaderDependency.Template = class RequireResolveHeaderDependencyTe
6868
*/
6969
apply(dependency, source, templateContext) {
7070
const dep = /** @type {RequireResolveHeaderDependency} */ (dependency);
71-
source.replace(dep.range[0], dep.range[1] - 1, "/*require.resolve*/");
71+
source.replace(dep.range[0], dep.range[1] - 1, "/*require.resolve*/(");
7272
}
7373

7474
/**
@@ -78,7 +78,7 @@ RequireResolveHeaderDependency.Template = class RequireResolveHeaderDependencyTe
7878
* @param {ReplaceSource} source source
7979
*/
8080
applyAsTemplateArgument(name, dep, source) {
81-
source.replace(dep.range[0], dep.range[1] - 1, "/*require.resolve*/");
81+
source.replace(dep.range[0], dep.range[1] - 1, "/*require.resolve*/(");
8282
}
8383
};
8484

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = "a";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = "b";
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
it("should resolve a literal with a trailing comma", () => {
2+
const id = require.resolve("./dir/a.js",);
3+
expect(id).toBe(require.resolve("./dir/a.js"));
4+
});
5+
6+
it("should weakly resolve a literal with a trailing comma", () => {
7+
const id = require.resolveWeak("./dir/a.js",);
8+
expect(id).toBe(require.resolve("./dir/a.js"));
9+
});
10+
11+
it("should resolve a conditional argument with a trailing comma", () => {
12+
for (const useA of [true, false]) {
13+
const id = require.resolve(useA ? "./dir/a.js" : "./dir/b.js",);
14+
const weakId = require.resolveWeak(useA ? "./dir/a.js" : "./dir/b.js",);
15+
const expected = useA
16+
? require.resolve("./dir/a.js")
17+
: require.resolve("./dir/b.js");
18+
expect(id).toBe(expected);
19+
expect(weakId).toBe(expected);
20+
}
21+
});
22+
23+
it("should resolve a context argument with a trailing comma", () => {
24+
for (const name of ["a", "b"]) {
25+
const id = require.resolve("./dir/" + name + ".js",);
26+
const weakId = require.resolveWeak("./dir/" + name + ".js",);
27+
const expected = name === "a"
28+
? require.resolve("./dir/a.js")
29+
: require.resolve("./dir/b.js");
30+
expect(id).toBe(expected);
31+
expect(weakId).toBe(expected);
32+
}
33+
});
34+
35+
it("should handle parentheses and comments around the argument", () => {
36+
const id = require.resolve(("./dir/a.js" /* inner, ) */) /* before, ) */, /* after, ) */);
37+
const weakId = require.resolveWeak(("./dir/a.js"), // after, )
38+
);
39+
expect(id).toBe(require.resolve("./dir/a.js"));
40+
expect(weakId).toBe(require.resolve("./dir/a.js"));
41+
});
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"use strict";
2+
3+
/** @type {import("../../../../").Configuration[]} */
4+
module.exports = [false, true].map((minimize) => ({
5+
mode: "production",
6+
optimization: { minimize }
7+
}));

0 commit comments

Comments
 (0)