@@ -650,7 +650,7 @@ const reduceAffectType = (connections) => {
650650 return affected ;
651651} ;
652652
653- /** @typedef {{ id: ModuleId, modules?: Map<Module, ModuleId >, blocks?: (ChunkId | null)[], sourceTypes?: SourceTypes } } References */
653+ /** @typedef {{ id: ModuleId, modules?: Map<Module, string >, blocks?: (ChunkId | null)[], sourceTypes?: SourceTypes } } References */
654654/** @typedef {Map<Module, WeakTupleMap<EXPECTED_ANY[], EXPECTED_ANY>> } ModuleMemCaches */
655655/** @typedef {{ chunk: Chunk, load: () => Promise<EXPECTED_ANY>, create: (loaded: EXPECTED_ANY) => RuntimeModule, chunkGraph: ChunkGraph } } PendingRuntimeModule */
656656
@@ -3126,23 +3126,40 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
31263126 let statUnchanged = 0 ;
31273127 let statChanged = 0 ;
31283128 let statNew = 0 ;
3129+ /**
3130+ * Include connection activity because optimizations can change it without changing module ids.
3131+ * @param {Module } module connected module
3132+ * @param {readonly ModuleGraphConnection[] } connections connections to it
3133+ * @returns {string } reference key
3134+ */
3135+ const referenceKey = ( module , connections ) => {
3136+ let key = `${ chunkGraph . getModuleId ( module ) } ` ;
3137+ for ( const connection of connections ) {
3138+ const state = connection . getActiveState ( undefined ) ;
3139+ key += state === true ? "T" : state === false ? "F" : "O" ;
3140+ }
3141+ return key ;
3142+ } ;
31293143 /**
31303144 * Compute references.
31313145 * @param {Module } module module
31323146 * @returns {References } references
31333147 */
31343148 const computeReferences = ( module ) => {
31353149 const id = /** @type {ModuleId } */ ( chunkGraph . getModuleId ( module ) ) ;
3136- /** @type {Map<Module, ModuleId > | undefined } */
3150+ /** @type {Map<Module, string > | undefined } */
31373151 let modules ;
31383152 /** @type {(ChunkId | null)[] | undefined } */
31393153 let blocks ;
31403154 const outgoing = moduleGraph . getOutgoingConnectionsByModule ( module ) ;
31413155 if ( outgoing !== undefined ) {
3142- for ( const m of outgoing . keys ( ) ) {
3143- if ( ! m ) continue ;
3156+ for ( const [ referencedModule , connections ] of outgoing ) {
3157+ if ( ! referencedModule ) continue ;
31443158 if ( modules === undefined ) modules = new Map ( ) ;
3145- modules . set ( m , /** @type {ModuleId } */ ( chunkGraph . getModuleId ( m ) ) ) ;
3159+ modules . set (
3160+ referencedModule ,
3161+ referenceKey ( referencedModule , connections )
3162+ ) ;
31463163 }
31473164 }
31483165 if ( module . blocks . length > 0 ) {
@@ -3173,7 +3190,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
31733190 * @param {Module } module module
31743191 * @param {object } references references
31753192 * @param {string | number } references.id id
3176- * @param {Map<Module, string | number | undefined >= } references.modules modules
3193+ * @param {Map<Module, string>= } references.modules modules
31773194 * @param {(string | number | null)[]= } references.blocks blocks
31783195 * @param {SourceTypes= } references.sourceTypes connection-dependent source types
31793196 * @returns {boolean } ok?
@@ -3184,8 +3201,15 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
31843201 ) => {
31853202 if ( id !== chunkGraph . getModuleId ( module ) ) return false ;
31863203 if ( modules !== undefined ) {
3187- for ( const [ module , id ] of modules ) {
3188- if ( chunkGraph . getModuleId ( module ) !== id ) return false ;
3204+ const outgoing = moduleGraph . getOutgoingConnectionsByModule ( module ) ;
3205+ for ( const [ referencedModule , key ] of modules ) {
3206+ const connections = outgoing && outgoing . get ( referencedModule ) ;
3207+ if (
3208+ connections === undefined ||
3209+ referenceKey ( referencedModule , connections ) !== key
3210+ ) {
3211+ return false ;
3212+ }
31893213 }
31903214 }
31913215 if ( blocks !== undefined ) {
0 commit comments