Fix module_builder reading DDC modules for non-primary dart libraries.

build_modules/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.1.4
+- Fix module_builder reading DDC modules for non-primary dart libraries.
+
 ## 5.1.3
 
 - Allow `analyzer` 9.0.0.

build_modules/lib/src/module_builder.dart

@@ -55,18 +55,19 @@ class ModuleBuilder implements Builder {
     var outputModule = metaModule.modules.firstWhereOrNull(
       (m) => m.primarySource == buildStep.inputId,
     );
-    final serializedLibrary = await buildStep.readAsString(
-      buildStep.inputId.changeExtension(moduleLibraryExtension),
-    );
-    final libraryModule = ModuleLibrary.deserialize(
-      buildStep.inputId,
-      serializedLibrary,
-    );
-    final scratchSpace = await buildStep.fetchResource(scratchSpaceResource);
-    if (outputModule == null && libraryModule.hasMain) {
-      outputModule = metaModule.modules.firstWhere(
-        (m) => m.sources.contains(buildStep.inputId),
+    if (outputModule == null) {
+      final serializedLibrary = await buildStep.readAsString(
+        buildStep.inputId.changeExtension(moduleLibraryExtension),
+      );
+      final libraryModule = ModuleLibrary.deserialize(
+        buildStep.inputId,
+        serializedLibrary,
       );
+      if (libraryModule.hasMain) {
+        outputModule = metaModule.modules.firstWhere(
+          (m) => m.sources.contains(buildStep.inputId),
+        );
+      }
     }
     if (outputModule == null) return;
     final modules = await buildStep.fetchResource(moduleCache);
@@ -76,6 +77,7 @@ class ModuleBuilder implements Builder {
       outputModule,
     );
     if (usesWebHotReload) {
+      final scratchSpace = await buildStep.fetchResource(scratchSpaceResource);
       // All sources must be declared before the Frontend Server is invoked, as
       // it only accepts the main entrypoint as its compilation target.
       await buildStep.trackStage(

build_modules/pubspec.yaml

@@ -1,5 +1,5 @@
 name: build_modules
-version: 5.1.3
+version: 5.1.4
 description: >-
   Builders to analyze and split Dart code into individually compilable modules
   based on imports.