@@ -657,7 +657,7 @@ const reduceAffectType = (connections) => {
657657 return affected ;
658658} ;
659659
660- /** @typedef {{ id: ModuleId, modules?: Map<Module, string>, blocks?: (ChunkId | null)[], sourceTypes?: SourceTypes } } References */
660+ /** @typedef {{ id: ModuleId, modules?: Map<Module, string>, blocks?: (ChunkId | null)[], sourceTypes?: SourceTypes, chunkSourceTypes?: string } } References */
661661/** @typedef {Map<Module, WeakTupleMap<EXPECTED_ANY[], EXPECTED_ANY>> } ModuleMemCaches */
662662/** @typedef {{ chunk: Chunk, load: () => Promise<EXPECTED_ANY>, create: (loaded: EXPECTED_ANY) => RuntimeModule, chunkGraph: ChunkGraph } } PendingRuntimeModule */
663663
@@ -3193,6 +3193,17 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
31933193 }
31943194 return key ;
31953195 } ;
3196+ /**
3197+ * Key the source types the chunk graph overrides for the module, which module concatenation narrows for an inner module that keeps other source types.
3198+ * @param {Module } module module
3199+ * @returns {string | undefined } key, undefined when the module's own source types stand
3200+ */
3201+ const chunkSourceTypesKey = ( module ) => {
3202+ const sourceTypes = chunkGraph . getModuleSourceTypes ( module ) ;
3203+ return sourceTypes === module . getSourceTypes ( )
3204+ ? undefined
3205+ : [ ...sourceTypes ] . join ( ) ;
3206+ } ;
31963207 /**
31973208 * Compute references.
31983209 * @param {Module } module module
@@ -3235,7 +3246,8 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
32353246 id,
32363247 modules,
32373248 blocks,
3238- sourceTypes : module . getReferencedSourceTypes ( )
3249+ sourceTypes : module . getReferencedSourceTypes ( ) ,
3250+ chunkSourceTypes : chunkSourceTypesKey ( module )
32393251 } ;
32403252 } ;
32413253 /**
@@ -3246,11 +3258,12 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
32463258 * @param {Map<Module, string>= } references.modules modules
32473259 * @param {(string | number | null)[]= } references.blocks blocks
32483260 * @param {SourceTypes= } references.sourceTypes connection-dependent source types
3261+ * @param {string= } references.chunkSourceTypes key of the source types the chunk graph overrides
32493262 * @returns {boolean } ok?
32503263 */
32513264 const compareReferences = (
32523265 module ,
3253- { id, modules, blocks, sourceTypes }
3266+ { id, modules, blocks, sourceTypes, chunkSourceTypes }
32543267 ) => {
32553268 if ( id !== chunkGraph . getModuleId ( module ) ) return false ;
32563269 if ( modules !== undefined ) {
@@ -3289,6 +3302,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
32893302 ) {
32903303 return false ;
32913304 }
3305+ if ( chunkSourceTypesKey ( module ) !== chunkSourceTypes ) return false ;
32923306 return true ;
32933307 } ;
32943308
0 commit comments