Skip to content

Commit 65b1bf4

Browse files
committed
feat(watch): retain valid requests beside changed dependencies
1 parent 6fd072c commit 65b1bf4

2 files changed

Lines changed: 50 additions & 11 deletions

File tree

‎lib/Compilation.js‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,15 +2066,29 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
20662066
* Process module dependencies.
20672067
* @param {Module} module to be processed for deps
20682068
* @param {ModuleCallback} callback callback to be triggered
2069+
* @param {Set<Dependency>=} processedDependencies retained dependencies already processed
20692070
* @param {boolean=} reuseDependencies whether retained connections can be reused
20702071
* @returns {void}
20712072
*/
2072-
_processModuleDependencies(module, callback, reuseDependencies = true) {
2073+
_processModuleDependencies(
2074+
module,
2075+
callback,
2076+
processedDependencies,
2077+
reuseDependencies = true
2078+
) {
20732079
if (reuseDependencies && this._incremental.canReuseDependencies(module)) {
2074-
return this._incremental.processDependencies(module, (err, reused) => {
2075-
if (err || reused) return callback(err);
2076-
this._processModuleDependencies(module, callback, false);
2077-
});
2080+
return this._incremental.processDependencies(
2081+
module,
2082+
(err, reused, processedDependencies) => {
2083+
if (err || reused) return callback(err);
2084+
this._processModuleDependencies(
2085+
module,
2086+
callback,
2087+
processedDependencies,
2088+
false
2089+
);
2090+
}
2091+
);
20782092
}
20792093
this._incremental.errorModules.delete(module);
20802094
/** @type {{ factory: ModuleFactory, dependencies: Dependency[], context: string | undefined, originModule: Module | null }[]} */
@@ -2212,6 +2226,12 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
22122226
*/
22132227
const processDependency = (dep, index) => {
22142228
this.moduleGraph.setParents(dep, currentBlock, module, index);
2229+
if (
2230+
processedDependencies !== undefined &&
2231+
processedDependencies.has(dep)
2232+
) {
2233+
return;
2234+
}
22152235
if (hasLazyBarrel && this._lazyBarrels.isLazy(dep)) {
22162236
if (this._incremental.rebuilding) {
22172237
this.moduleGraph._removeConnectionLoose(dep);

‎lib/watch/Incremental.js‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ class Incremental {
321321
/**
322322
* Follow retained connections without resolving unchanged requests again.
323323
* @param {Module} module retained importer
324-
* @param {(err?: WebpackError | null, reused?: boolean) => void} callback completion callback
324+
* @param {(err?: WebpackError | null, reused?: boolean, processedDependencies?: Set<Dependency>) => void} callback completion callback
325325
* @returns {void}
326326
*/
327327
processDependencies(module, callback) {
@@ -334,7 +334,8 @@ class Incremental {
334334
fileSystemInfo: compilation.fileSystemInfo,
335335
valueCacheVersions: compilation.valueCacheVersions
336336
};
337-
let needsFactory = false;
337+
/** @type {Set<Module> | undefined} */
338+
let changedModules;
338339
asyncLib.each(
339340
connections.keys(),
340341
(referencedModule, done) => {
@@ -345,23 +346,37 @@ class Incremental {
345346
return done();
346347
}
347348
this.needBuild(referencedModule, context, (err, need) => {
348-
if (need) needsFactory = true;
349+
if (need) {
350+
if (changedModules === undefined) changedModules = new Set();
351+
changedModules.add(referencedModule);
352+
}
349353
done(err);
350354
});
351355
},
352356
(err) => {
353357
if (err) return callback(err);
354-
if (needsFactory) return callback(null, false);
358+
/** @type {Set<Dependency> | undefined} */
359+
const processedDependencies =
360+
changedModules === undefined ? undefined : new Set();
355361
compilation.processDependenciesQueue.increaseParallelism();
356362
asyncLib.each(
357363
connections,
358364
([referencedModule, reasons], done) => {
359-
if (!referencedModule) return done();
365+
if (
366+
!referencedModule ||
367+
(changedModules !== undefined &&
368+
changedModules.has(referencedModule))
369+
) {
370+
return done();
371+
}
360372
/** @type {Dependency[]} */
361373
const dependencies = [];
362374
for (const connection of reasons) {
363375
if (connection.dependency) {
364376
dependencies.push(connection.dependency);
377+
if (processedDependencies !== undefined) {
378+
processedDependencies.add(connection.dependency);
379+
}
365380
}
366381
}
367382
this._processModule(
@@ -373,7 +388,11 @@ class Incremental {
373388
},
374389
(error) => {
375390
compilation.processDependenciesQueue.decreaseParallelism();
376-
callback(error, true);
391+
callback(
392+
error,
393+
changedModules === undefined,
394+
processedDependencies
395+
);
377396
}
378397
);
379398
}

0 commit comments

Comments
 (0)