Revert module tracking cleanup, address review comments, and clean up a TODO to remove a test

Author: srujzs

dwds/test/common/chrome_proxy_service_common.dart

@@ -2225,27 +2225,6 @@ void runTests({
       );
     });
 
-    test('reloadSources', () async {
-      final service = context.service;
-      final vm = await service.getVM();
-      final isolateId = vm.isolates!.first.id!;
-      final report = await service.reloadSources(isolateId);
-      // TODO(srujzs): This naturally fails regardless of the module format
-      // because we didn't set up prerequisite state (the reload scripts). We
-      // should create new tests for hot reload within DWDS and remove this
-      // test.
-      expect(report.success, false);
-      // Make sure that a notice was provided in the expected format.
-      final notices = report.json?['notices'];
-      expect(notices, isNotNull);
-      expect(notices is List, isTrue);
-      final noticeList = (notices as List).cast<Map>();
-      expect(noticeList, isNotEmpty);
-      final message = noticeList[0]['message'];
-      expect(message, isNotNull);
-      expect(message is String && message.isNotEmpty, isTrue);
-    });
-
     test('setIsolatePauseMode', () async {
       final service = context.service;
       final vm = await service.getVM();

dwds/test/fixtures/context.dart

@@ -342,9 +342,6 @@ class TestContext {
               hostname: _hostname,
               port: assetServerPort,
               index: filePathToServe,
-              initialCompile: true,
-              fullRestart: false,
-              fileServerUri: null,
             );
 
             if (testSettings.enableExpressionEvaluation) {
@@ -436,8 +433,8 @@ class TestContext {
 
       // TODO(srujzs): In the case of the frontend server, it doesn't make sense
       // that we initialize a new HTTP server instead of reusing the one in
-      // `TestAssetServer`. Why not just use that one? That seems to match with
-      // what Flutter tools is doing.
+      // `TestAssetServer`. We should instead use that one to align with Flutter
+      // tools.
       _testServer = await TestServer.start(
         debugSettings: debugSettings.copyWith(
           expressionCompiler: expressionCompiler,
@@ -595,9 +592,7 @@ class TestContext {
   }
 
   Future<void> recompile({required bool fullRestart}) async {
-    await webRunner.run(
-      frontendServerFileSystem,
-      initialCompile: false,
+    await webRunner.rerun(
       fullRestart: fullRestart,
       fileServerUri: Uri.parse('http://${testServer.host}:${testServer.port}'),
     );

frontend_server_common/lib/src/bootstrap.dart

@@ -504,6 +504,14 @@ $_simpleLoaderScript
               var script = scripts[i];
               if (script.id == null) continue;
               var src = script.src.toString();
+              var oldSrc = window.\$dartLoader.moduleIdToUrl.get(script.id);
+
+              // We might actually load from a different uri, delete the old one
+              // just to be sure.
+              window.\$dartLoader.urlToModuleId.delete(oldSrc);
+
+              window.\$dartLoader.moduleIdToUrl.set(script.id, src);
+              window.\$dartLoader.urlToModuleId.set(src, script.id);
 
               numToLoad++;
 

frontend_server_common/lib/src/devfs.dart

@@ -78,8 +78,8 @@ class WebDevFS {
     required bool initialCompile,
     required bool fullRestart,
     // The uri of the `HttpServer` that handles file requests.
-    // TODO(srujzs): This should be the same as the uri of the AssetServer, but
-    // currently is not. Delete when that's fixed.
+    // TODO(srujzs): This should be the same as the uri of the AssetServer to
+    // align with Flutter tools, but currently is not. Delete when that's fixed.
     required Uri? fileServerUri,
   }) async {
     final mainPath = mainUri.toFilePath();

frontend_server_common/lib/src/resident_runner.dart

@@ -66,44 +66,50 @@ class ResidentWebRunner {
   ProjectFileInvalidator? _projectFileInvalidator;
   WebDevFS? devFS;
   Uri? uri;
-  late Iterable<String> modules;
 
   Future<int> run(
     FileSystem fileSystem, {
     String? hostname,
-    int? port,
-    String? index,
-    required bool initialCompile,
-    required bool fullRestart,
-    // The uri of the `HttpServer` that handles file requests.
-    // TODO(srujzs): This should be the same as the uri of the AssetServer, but
-    // currently is not. Delete when that's fixed.
-    required Uri? fileServerUri,
+    required int port,
+    required String index,
   }) async {
     _projectFileInvalidator ??= ProjectFileInvalidator(fileSystem: fileSystem);
     devFS ??= WebDevFS(
       fileSystem: fileSystem,
       hostname: hostname ?? 'localhost',
-      port: port!,
+      port: port,
       projectDirectory: projectDirectory,
       packageUriMapper: packageUriMapper,
-      index: index!,
+      index: index,
       urlTunneler: urlTunneler,
       sdkLayout: sdkLayout,
       compilerOptions: compilerOptions,
     );
     uri ??= await devFS!.create();
 
     final report = await _updateDevFS(
-        initialCompile: initialCompile,
-        fullRestart: fullRestart,
-        fileServerUri: fileServerUri);
+        initialCompile: true, fullRestart: false, fileServerUri: null);
     if (!report.success) {
       _logger.severe('Failed to compile application.');
       return 1;
     }
 
-    modules = report.invalidatedModules!;
+    generator.accept();
+    return 0;
+  }
+
+  Future<int> rerun(
+      {required bool fullRestart,
+      // The uri of the `HttpServer` that handles file requests.
+      // TODO(srujzs): This should be the same as the uri of the AssetServer to
+      // align with Flutter tools, but currently is not. Delete when that's fixed.
+      required Uri fileServerUri}) async {
+    final report = await _updateDevFS(
+        initialCompile: false, fullRestart: fullRestart, fileServerUri: null);
+    if (!report.success) {
+      _logger.severe('Failed to compile application.');
+      return 1;
+    }
 
     generator.accept();
     return 0;
@@ -113,8 +119,8 @@ class ResidentWebRunner {
     required bool initialCompile,
     required bool fullRestart,
     // The uri of the `TestServer` that handles file requests.
-    // TODO(srujzs): This should be the same as the uri of the AssetServer, but
-    // currently is not. Delete when that's fixed.
+    // TODO(srujzs): This should be the same as the uri of the AssetServer to
+    // align with Flutter tools, but currently is not. Delete when that's fixed.
     required Uri? fileServerUri,
   }) async {
     final invalidationResult = await _projectFileInvalidator!.findInvalidated(