Provide an app entrypoint to DWDS (#2047)

dart-lang · Mar 30, 2023 · 652e040 · 652e040
1 parent 0afc9eb
commit 652e040
Show file tree

Hide file tree

Showing 15 changed files with 452 additions and 253 deletions.
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
@@ -1,4 +1,5 @@
-## 18.0.3-dev
+## 19.0.0-dev
+- Allow clients to specify the connected app's entrypoint file. - [#2047](https://github.com/dart-lang/webdev/pull/2047)
 
 ## 18.0.2
 

diff --git a/dwds/lib/src/debugging/libraries.dart b/dwds/lib/src/debugging/libraries.dart
@@ -32,8 +32,15 @@ class LibraryHelper extends Domain {
     // TODO: read entrypoint from app metadata.
     // Issue: https://github.com/dart-lang/webdev/issues/1290
     final libraries = await libraryRefs;
-    _rootLib = libraries
-        .firstWhereOrNull((lib) => lib.name?.contains('org-dartlang') ?? false);
+    if (globalLoadStrategy.appEntrypoint != null) {
+      _rootLib = libraries.firstWhereOrNull(
+        (lib) => Uri.parse(lib.uri ?? '') == globalLoadStrategy.appEntrypoint,
+      );
+    }
+    _rootLib = _rootLib ??
+        libraries.firstWhereOrNull(
+          (lib) => lib.name?.contains('org-dartlang') ?? false,
+        );
     _rootLib = _rootLib ??
         libraries
             .firstWhereOrNull((lib) => lib.name?.contains('main') ?? false);