Renaming "legacy" paths and DDC modules to "DDC" paths and modules.

dwds/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 23.4.0-wip
 
 - Adding tests for constants in DDC after a hot restart - [#2349](https://github.com/dart-lang/webdev/pull/2349)
+- Renaming `dart_library.js` to `ddc_module_loader.js` to match SDK naming changes - [#2360](https://github.com/dart-lang/webdev/pull/2360)
 
 ## 23.3.0
 

dwds/lib/dwds.dart

@@ -19,11 +19,11 @@ export 'src/handlers/dev_handler.dart' show AppConnectionException;
 export 'src/handlers/socket_connections.dart';
 export 'src/loaders/build_runner_require.dart'
     show BuildRunnerRequireStrategyProvider;
-export 'src/loaders/frontend_server_legacy.dart'
-    show FrontendServerLegacyStrategyProvider;
+export 'src/loaders/ddc.dart' show DdcStrategy;
+export 'src/loaders/frontend_server_ddc.dart'
+    show FrontendServerDdcStrategyProvider;
 export 'src/loaders/frontend_server_require.dart'
     show FrontendServerRequireStrategyProvider;
-export 'src/loaders/legacy.dart' show LegacyStrategy;
 export 'src/loaders/require.dart' show RequireStrategy;
 export 'src/loaders/strategy.dart'
     show LoadStrategy, ReloadConfiguration, BuildSettings;

dwds/lib/src/loaders/legacy.dart → dwds/lib/src/loaders/ddc.dart

@@ -42,8 +42,8 @@ var baseUrl = (function () {
 }());
 ''';
 
-/// A load strategy for the legacy module system.
-class LegacyStrategy extends LoadStrategy {
+/// A load strategy for the DDC module system.
+class DdcStrategy extends LoadStrategy {
   @override
   final ReloadConfiguration reloadConfiguration;
 
@@ -129,7 +129,7 @@ class LegacyStrategy extends LoadStrategy {
 
   final BuildSettings _buildSettings;
 
-  LegacyStrategy(
+  DdcStrategy(
     this.reloadConfiguration,
     this._moduleProvider,
     this._digestsProvider,
@@ -152,26 +152,26 @@ class LegacyStrategy extends LoadStrategy {
       };
 
   @override
-  String get id => 'legacy';
+  String get id => 'ddc';
 
   @override
   String get moduleFormat => 'ddc';
 
   @override
-  String get loadLibrariesModule => 'dart_library.ddk.js';
+  String get loadLibrariesModule => 'ddc_module_loader.ddk.js';
 
   @override
   String get loadModuleSnippet => 'dart_library.import';
 
   @override
   Future<String> bootstrapFor(String entrypoint) async =>
-      await _legacyLoaderSetup(entrypoint);
+      await _ddcLoaderSetup(entrypoint);
 
   @override
   String loadClientSnippet(String clientScript) =>
       'window.\$dartLoader.forceLoadModule("$clientScript");\n';
 
-  Future<String> _legacyLoaderSetup(String entrypoint) async {
+  Future<String> _ddcLoaderSetup(String entrypoint) async {
     final metadataProvider = metadataProviderFor(entrypoint);
     final modulePaths = await _moduleProvider(metadataProvider);
     final scripts = <Map<String, String?>>[];

dwds/lib/src/loaders/frontend_server_legacy.dart → dwds/lib/src/loaders/frontend_server_ddc.dart

@@ -3,22 +3,22 @@
 // found in the LICENSE file.
 
 import 'package:dwds/src/debugging/metadata/provider.dart';
-import 'package:dwds/src/loaders/legacy.dart';
+import 'package:dwds/src/loaders/ddc.dart';
 import 'package:dwds/src/loaders/strategy.dart';
 import 'package:dwds/src/readers/asset_reader.dart';
 import 'package:dwds/src/services/expression_compiler.dart';
 import 'package:path/path.dart' as p;
 
-/// Provides a [LegacyStrategy] suitable for use with Frontend Server.
-class FrontendServerLegacyStrategyProvider {
+/// Provides a [DdcStrategy] suitable for use with Frontend Server.
+class FrontendServerDdcStrategyProvider {
   final ReloadConfiguration _configuration;
   final AssetReader _assetReader;
   final PackageUriMapper _packageUriMapper;
   final Future<Map<String, String>> Function() _digestsProvider;
   final String _basePath;
   final BuildSettings _buildSettings;
 
-  late final LegacyStrategy _legacyStrategy = LegacyStrategy(
+  late final DdcStrategy _ddcStrategy = DdcStrategy(
     _configuration,
     _moduleProvider,
     (_) => _digestsProvider(),
@@ -33,15 +33,15 @@ class FrontendServerLegacyStrategyProvider {
     null,
   );
 
-  FrontendServerLegacyStrategyProvider(
+  FrontendServerDdcStrategyProvider(
     this._configuration,
     this._assetReader,
     this._packageUriMapper,
     this._digestsProvider,
     this._buildSettings,
   ) : _basePath = _assetReader.basePath;
 
-  LegacyStrategy get strategy => _legacyStrategy;
+  DdcStrategy get strategy => _ddcStrategy;
 
   String _removeBasePath(String path) {
     if (_basePath.isEmpty) return path;

dwds/test/fixtures/context.dart

@@ -14,7 +14,7 @@ import 'package:dwds/src/connections/app_connection.dart';
 import 'package:dwds/src/connections/debug_connection.dart';
 import 'package:dwds/src/debugging/webkit_debugger.dart';
 import 'package:dwds/src/loaders/build_runner_require.dart';
-import 'package:dwds/src/loaders/frontend_server_legacy.dart';
+import 'package:dwds/src/loaders/frontend_server_ddc.dart';
 import 'package:dwds/src/loaders/frontend_server_require.dart';
 import 'package:dwds/src/loaders/strategy.dart';
 import 'package:dwds/src/readers/proxy_server_asset_reader.dart';
@@ -343,7 +343,7 @@ class TestContext {
                   () async => {},
                   buildSettings,
                 ).strategy,
-              ModuleFormat.ddc => FrontendServerLegacyStrategyProvider(
+              ModuleFormat.ddc => FrontendServerDdcStrategyProvider(
                   testSettings.reloadConfiguration,
                   assetReader,
                   packageUriMapper,

dwds/web/client.dart

@@ -29,7 +29,7 @@ import 'package:uuid/uuid.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
 import 'promise.dart';
-import 'reloader/legacy_restarter.dart';
+import 'reloader/ddc_restarter.dart';
 import 'reloader/manager.dart';
 import 'reloader/require_restarter.dart';
 import 'reloader/restarter.dart';
@@ -54,8 +54,8 @@ Future<void>? main() {
     Restarter restarter;
     if (dartModuleStrategy == 'require-js') {
       restarter = await RequireRestarter.create();
-    } else if (dartModuleStrategy == 'legacy') {
-      restarter = LegacyRestarter();
+    } else if (dartModuleStrategy == 'ddc' || dartModuleStrategy == 'legacy') {
+      restarter = DdcRestarter();
     } else {
       throw StateError('Unknown module strategy: $dartModuleStrategy');
     }

dwds/web/reloader/legacy_restarter.dart → dwds/web/reloader/ddc_restarter.dart

@@ -8,7 +8,7 @@ import 'dart:js';
 
 import 'restarter.dart';
 
-class LegacyRestarter implements Restarter {
+class DdcRestarter implements Restarter {
   @override
   Future<bool> restart({String? runId}) async {
     final dartLibrary = context['dart_library'] as JsObject;