Skip to content

Commit fc2c712

Browse files
committed
fix(resolve): preserve regexp restrictions in resolver cache keys
1 parent 52996d7 commit fc2c712

8 files changed

Lines changed: 73 additions & 1 deletion

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+
Keep regular expression restrictions distinct in the resolver cache.

‎lib/cache/ResolverCachePlugin.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ const addAllToSet = (set, otherSet) => {
9999
* @returns {string} stringified version
100100
*/
101101
const objectToString = (object, excludeContext) => {
102+
if (object instanceof RegExp) return object.toString();
102103
let str = "";
103104
for (const key in object) {
104105
if (excludeContext && key === "context") continue;

‎lib/resolve/ResolverFactory.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,11 @@ module.exports = class ResolverFactory {
112112
if (cachedResolver) {
113113
return cachedResolver;
114114
}
115-
const ident = JSON.stringify(resolveOptions);
115+
const ident = JSON.stringify(
116+
resolveOptions,
117+
(_key, /** @type {unknown} */ value) =>
118+
value instanceof RegExp ? { regexp: value.toString() } : value
119+
);
116120
const resolver = typedCaches.stringified.get(ident);
117121
if (resolver) {
118122
typedCaches.direct.set(resolveOptions, resolver);
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import results from "./loader!./loader";
2+
3+
it("should distinguish regular expression restrictions", () => {
4+
expect(results.javascript).toBe("module.js");
5+
expect(results.json).toBe("module.json");
6+
});
7+
8+
it("should distinguish regular expression flags", () => {
9+
expect(results.caseSensitive).toBe(false);
10+
expect(results.caseInsensitive).toBe("module.js");
11+
});
12+
13+
it("should preserve equivalent restrictions and distinguish strings", () => {
14+
expect(results.equivalent).toBe("module.js");
15+
expect(results.string).toBe(false);
16+
});
17+
18+
it("should distinguish restrictions nested in byDependency", () => {
19+
expect(results.nestedJavascript).toBe("module.js");
20+
expect(results.nestedJson).toBe("module.json");
21+
});
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
"use strict";
2+
3+
const path = require("path");
4+
5+
/** @type {import("../../../../").LoaderDefinition} */
6+
module.exports = async function () {
7+
/** @type {[string, import("../../../../").ResolveOptions][]} */
8+
const cases = [
9+
["javascript", { restrictions: [/\.js$/] }],
10+
["json", { restrictions: [/\.json$/] }],
11+
["caseSensitive", { restrictions: [/\.JS$/] }],
12+
["caseInsensitive", { restrictions: [/\.JS$/i] }],
13+
["equivalent", { restrictions: [new RegExp("\\.js$")] }],
14+
["string", { restrictions: [String(/\.js$/)] }],
15+
[
16+
"nestedJavascript",
17+
{ byDependency: { esm: { restrictions: [/\.js$/] } } }
18+
],
19+
["nestedJson", { byDependency: { esm: { restrictions: [/\.json$/] } } }]
20+
];
21+
/** @type {Record<string, string | false>} */
22+
const results = {};
23+
for (const [name, options] of cases) {
24+
const resolve = this.getResolve({
25+
dependencyType: "esm",
26+
extensions: [".js", ".json"],
27+
...options
28+
});
29+
const resolved = await resolve(this.context, "./module").catch(error => {
30+
expect(error.message).toContain("Can't resolve './module'");
31+
return false;
32+
});
33+
results[name] = typeof resolved === "string" ? path.basename(resolved) : false;
34+
}
35+
return `export default ${JSON.stringify(results)};`;
36+
};
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default "javascript";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"json"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
"use strict";
2+
3+
module.exports = {};

0 commit comments

Comments
 (0)