Skip to content

Commit dd59094

Browse files
authored
[hooks_runner] Automatically add recorded uses to hook dependencies (dart-lang#3169)
1 parent dbcba1d commit dd59094

4 files changed

Lines changed: 80 additions & 7 deletions

File tree

‎pkgs/hooks_runner/lib/src/build_runner/build_runner.dart‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,10 @@ class NativeAssetsBuildRunner {
523523
' in ${buildDirUri.toFilePath()}.'
524524
' Last build on ${output.timestamp}.',
525525
);
526-
return Success((output, hookHashes.fileSystemEntities));
526+
return Success((
527+
output,
528+
[...hookHashes.fileSystemEntities, ?resources],
529+
));
527530
}
528531
}
529532
}
@@ -552,14 +555,17 @@ class NativeAssetsBuildRunner {
552555
} else {
553556
final success = result.success;
554557
final modifiedDuringBuild = await dependenciesHashes.hashDependencies(
555-
[...success.dependencies],
558+
[...success.dependencies, ?resources],
556559
lastModifiedCutoffTime,
557560
hookEnvironment,
558561
);
559562
if (modifiedDuringBuild != null) {
560563
logger.severe('File modified during build. Build must be rerun.');
561564
}
562-
return Success((success, hookHashes.fileSystemEntities));
565+
return Success((
566+
success,
567+
[...hookHashes.fileSystemEntities, ?resources],
568+
));
563569
}
564570
},
565571
),

‎pkgs/hooks_runner/test/build_runner/resources_test.dart‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,77 @@ void main() async {
116116
);
117117
});
118118
});
119+
120+
test('record_use_filtering caching', timeout: longTimeout, () async {
121+
await inTempDir((tempUri) async {
122+
await copyTestProjects(targetUri: tempUri);
123+
final packageUri = tempUri.resolve('pirate_adventure/');
124+
125+
final resourcesUri = tempUri.resolve('treeshaking_info.json');
126+
await File.fromUri(
127+
resourcesUri,
128+
).writeAsString(jsonEncode(_pirateAdventureRecordings.toJson()));
129+
130+
// First, run `pub get`, we need pub to resolve our dependencies.
131+
await runPubGet(workingDirectory: packageUri, logger: logger);
132+
133+
final buildResult = (await buildDataAssets(
134+
packageUri,
135+
linkingEnabled: true,
136+
)).success;
137+
138+
final logMessages = <String>[];
139+
Future<void> runLink() async {
140+
logMessages.clear();
141+
await link(
142+
packageUri,
143+
logger,
144+
dartExecutable,
145+
buildResult: buildResult,
146+
resourceIdentifiers: resourcesUri,
147+
buildAssetTypes: [BuildAssetType.data],
148+
capturedLogs: logMessages,
149+
);
150+
}
151+
152+
// Initial run: should run hooks.
153+
await runLink();
154+
expect(
155+
logMessages.join('\n'),
156+
stringContainsInOrder(['pirate_speak', 'hook.dill']),
157+
);
158+
159+
// Second run: should be cached.
160+
await runLink();
161+
expect(
162+
logMessages.join('\n'),
163+
contains('Skipping link for pirate_speak'),
164+
);
165+
166+
// Change resources: should re-run hooks.
167+
final newRecordings = Recordings(
168+
metadata: Metadata(version: Version(1, 0, 0), comment: 'Changed'),
169+
calls: _pirateAdventureRecordings.calls,
170+
instances: {},
171+
);
172+
await File.fromUri(
173+
resourcesUri,
174+
).writeAsString(jsonEncode(newRecordings.toJson()));
175+
176+
await runLink();
177+
expect(
178+
logMessages.join('\n'),
179+
stringContainsInOrder(['pirate_speak', 'hook.dill']),
180+
);
181+
182+
// Run again: should be cached again.
183+
await runLink();
184+
expect(
185+
logMessages.join('\n'),
186+
contains('Skipping link for pirate_speak'),
187+
);
188+
});
189+
});
119190
}
120191

121192
/// Expected result of the compiler when running from pirate_adventure

‎pkgs/record_use/test_data/drop_data_asset/hook/link.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ void main(List<String> arguments) async {
9393

9494
print('Keeping only ${neededCodeAssets.map((e) => e.id).join(', ')}.');
9595
output.assets.data.addAll(neededCodeAssets);
96-
97-
output.dependencies.add(recordedUsagesFile);
9896
});
9997
}
10098

‎pkgs/record_use/test_data/drop_dylib_recording/hook/link.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ void main(List<String> arguments) async {
108108

109109
print('Keeping only ${neededCodeAssets.map((e) => e.id).join(', ')}.');
110110
output.assets.code.addAll(neededCodeAssets);
111-
112-
output.dependencies.add(recordedUsagesFile);
113111
});
114112
}
115113

0 commit comments

Comments
 (0)