Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build_modules/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## 5.1.4

- Fix module_builder reading DDC modules for non-primary dart libraries.
- Allow Dart SDK 3.11.x and 3.12 prerelease.

## 5.1.3
Expand Down
24 changes: 13 additions & 11 deletions build_modules/lib/src/module_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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(
Expand Down