Skip to content

Commit 3132030

Browse files
committed
fix: apply cached resolveOptions from the factory instead of the pack
1 parent f6b470a commit 3132030

18 files changed

Lines changed: 91 additions & 4 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+
Refresh a cached module's `resolveOptions` from the factory instead of the persistent cache pack.

‎lib/ContextModule.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ class ContextModule extends Module {
213213
* @returns {void}
214214
*/
215215
updateCacheModule(module) {
216+
super.updateCacheModule(module);
216217
const m = /** @type {ContextModule} */ (module);
217218
this.resolveDependencies = m.resolveDependencies;
218219
this.options = m.options;

‎lib/Module.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,6 @@ class Module extends DependenciesBlock {
13101310
write(this.type);
13111311
write(this.layer);
13121312
write(this.context);
1313-
write(this.resolveOptions);
13141313
write(this.factoryMeta);
13151314
write(this.useSourceMap);
13161315
write(this.useSimpleSourceMap);
@@ -1340,7 +1339,6 @@ class Module extends DependenciesBlock {
13401339
this.type = read();
13411340
this.layer = read();
13421341
this.context = read();
1343-
this.resolveOptions = read();
13441342
this.factoryMeta = read();
13451343
this.useSourceMap = read();
13461344
this.useSimpleSourceMap = read();

‎lib/NormalModule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2167,7 +2167,7 @@ class NormalModule extends Module {
21672167
parserOptions: /** @type {EXPECTED_ANY} */ (null),
21682168
generator: /** @type {EXPECTED_ANY} */ (null),
21692169
generatorOptions: /** @type {EXPECTED_ANY} */ (null),
2170-
resolveOptions: /** @type {EXPECTED_ANY} */ (null),
2170+
resolveOptions: undefined,
21712171
extractSourceMap: /** @type {EXPECTED_ANY} */ (null)
21722172
});
21732173
obj.deserialize(context);

‎lib/css/CssModule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ class CssModule extends NormalModule {
197197
parserOptions: /** @type {EXPECTED_ANY} */ (null),
198198
generator: /** @type {EXPECTED_ANY} */ (null),
199199
generatorOptions: /** @type {EXPECTED_ANY} */ (null),
200-
resolveOptions: /** @type {EXPECTED_ANY} */ (null),
200+
resolveOptions: undefined,
201201
cssLayer: /** @type {EXPECTED_ANY} */ (null),
202202
supports: /** @type {EXPECTED_ANY} */ (null),
203203
media: /** @type {EXPECTED_ANY} */ (null),
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = "a-alt";
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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const context = require.context("./dir", false, /^\.\/[ab]\.js$/);
2+
3+
it("should apply the issuer's rule-level resolver plugin to the context's children", () => {
4+
expect(context.keys().map(context)).toEqual(["a-alt", "b"]);
5+
});
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
"use strict";
2+
3+
/** @typedef {import("enhanced-resolve").Resolver} Resolver */
4+
5+
class RedirectResolverPlugin {
6+
/**
7+
* @param {Resolver} resolver resolver
8+
*/
9+
apply(resolver) {
10+
const target = resolver.ensureHook("resolve");
11+
resolver
12+
.getHook("resolve")
13+
.tapAsync(
14+
"RedirectResolverPlugin",
15+
(request, resolveContext, callback) => {
16+
if (request.request !== "./a.js") return callback();
17+
resolver.doResolve(
18+
target,
19+
{ ...request, request: "./a-alt.js" },
20+
"redirect ./a.js",
21+
resolveContext,
22+
callback
23+
);
24+
}
25+
);
26+
}
27+
}
28+
29+
/** @type {import("../../../../").Configuration} */
30+
module.exports = {
31+
module: {
32+
rules: [
33+
{
34+
// a plugin instance has no serializer; it must not keep the module out of the persistent cache
35+
test: /index\.js$/,
36+
resolve: {
37+
plugins: [new RedirectResolverPlugin()]
38+
}
39+
}
40+
]
41+
}
42+
};

0 commit comments

Comments
 (0)