@@ -259,31 +259,31 @@ async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
259259 continue ;
260260 }
261261
262- if matches ! ( module_type, ModuleType :: ConsumeShared ) {
263- if let Some ( ( pkg, required) ) = parse_consume_shared_identifier ( & identifier) {
264- let mut target_ids: Vec < ModuleIdentifier > = Vec :: new ( ) ;
265- if let Some ( issuer_module) = module_graph. get_issuer ( & module_identifier) {
266- target_ids. push ( issuer_module. identifier ( ) ) ;
267- }
268- if target_ids. is_empty ( ) {
269- target_ids. push ( module_identifier) ;
270- }
271- consume_module_ids
272- . entry ( pkg. clone ( ) )
273- . or_default ( )
274- . extend ( target_ids) ;
275- let entry = ensure_shared_entry ( & mut shared_map, & container_name, & pkg) ;
276- if entry. requiredVersion . is_none ( ) && required. is_some ( ) {
277- entry. requiredVersion = required;
278- }
279- record_shared_usage (
280- & mut shared_usage_links,
281- & pkg,
282- & module_identifier,
283- & module_graph,
284- compilation,
285- ) ;
262+ if matches ! ( module_type, ModuleType :: ConsumeShared )
263+ && let Some ( ( pkg, required) ) = parse_consume_shared_identifier ( & identifier)
264+ {
265+ let mut target_ids: Vec < ModuleIdentifier > = Vec :: new ( ) ;
266+ if let Some ( issuer_module) = module_graph. get_issuer ( & module_identifier) {
267+ target_ids. push ( issuer_module. identifier ( ) ) ;
268+ }
269+ if target_ids. is_empty ( ) {
270+ target_ids. push ( module_identifier) ;
286271 }
272+ consume_module_ids
273+ . entry ( pkg. clone ( ) )
274+ . or_default ( )
275+ . extend ( target_ids) ;
276+ let entry = ensure_shared_entry ( & mut shared_map, & container_name, & pkg) ;
277+ if entry. requiredVersion . is_none ( ) && required. is_some ( ) {
278+ entry. requiredVersion = required;
279+ }
280+ record_shared_usage (
281+ & mut shared_usage_links,
282+ & pkg,
283+ & module_identifier,
284+ & module_graph,
285+ compilation,
286+ ) ;
287287 }
288288 }
289289
@@ -324,20 +324,19 @@ async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
324324 }
325325 }
326326
327- if let Some ( module_id) = container_entry_module {
328- if let Some ( mut entry_assets) =
327+ if let Some ( module_id) = container_entry_module
328+ && let Some ( mut entry_assets) =
329329 collect_assets_for_module ( compilation, & module_id, & entry_point_names)
330- {
331- remove_assets ( & mut entry_assets, & shared_asset_files) ;
332- promote_primary_assets_to_sync ( & mut entry_assets) ;
333- for expose in exposes_map. values_mut ( ) {
334- let is_empty = expose. assets . js . sync . is_empty ( )
335- && expose. assets . js . r#async . is_empty ( )
336- && expose. assets . css . sync . is_empty ( )
337- && expose. assets . css . r#async . is_empty ( ) ;
338- if is_empty {
339- expose. assets = entry_assets. clone ( ) ;
340- }
330+ {
331+ remove_assets ( & mut entry_assets, & shared_asset_files) ;
332+ promote_primary_assets_to_sync ( & mut entry_assets) ;
333+ for expose in exposes_map. values_mut ( ) {
334+ let is_empty = expose. assets . js . sync . is_empty ( )
335+ && expose. assets . js . r#async . is_empty ( )
336+ && expose. assets . css . sync . is_empty ( )
337+ && expose. assets . css . r#async . is_empty ( ) ;
338+ if is_empty {
339+ expose. assets = entry_assets. clone ( ) ;
341340 }
342341 }
343342 }
@@ -389,8 +388,8 @@ async fn process_assets(&self, compilation: &mut Compilation) -> Result<()> {
389388
390389 let exposes = exposes_map. values ( ) . cloned ( ) . collect :: < Vec < _ > > ( ) ;
391390 let shared = shared_map
392- . into_iter ( )
393- . map ( |( _k , mut v) | {
391+ . into_values ( )
392+ . map ( |mut v| {
394393 v. usedIn . sort ( ) ;
395394 v. usedIn . dedup ( ) ;
396395 v
0 commit comments