Moves the ?compiler= query param to the expected place for legacy URLs

Author: elliette

packages/devtools_app/lib/src/shared/primitives/url_utils.dart

@@ -14,6 +14,9 @@ String extractCurrentPageFromUrl(String url) {
       : uri.path.substring(1);
 }
 
+const _jsCompilerParam = '?compiler=js';
+const _wasmCompilerParam = '?compiler=wasm';
+
 /// Maps DevTools URLs in the original fragment format onto the equivalent URLs
 /// in the new URL format.
 ///
@@ -25,16 +28,26 @@ String? mapLegacyUrl(String url) {
   //   http://localhost:123/#/?page=inspector&uri=ws://...
   final isRootRequest = uri.path == '/' || uri.path.endsWith('/devtools/');
   if (isRootRequest && uri.fragment.isNotEmpty) {
+    final hasJsParam = url.contains(_jsCompilerParam);
+    final hasWasmParam = url.contains(_wasmCompilerParam) && !hasJsParam;
     final basePath = uri.path;
     // Convert the URL by removing the fragment separator.
     final newUrl = url
+        .replaceAll(_wasmCompilerParam, '')
+        .replaceAll(_jsCompilerParam, '')
         // Handle localhost:123/#/inspector?uri=xxx
         .replaceFirst('/#/', '/')
         // Handle localhost:123/#?page=inspector&uri=xxx
         .replaceFirst('/#', '');
 
     // Move page names from the querystring into the path.
     var newUri = Uri.parse(newUrl);
+    final queryParams = {
+      ...newUri.queryParameters,
+      if (hasWasmParam) 'compiler': 'wasm',
+      if (hasJsParam) 'compiler': 'js',
+    };
+    newUri = newUri.replace(queryParameters: queryParams);
     final page = newUri.queryParameters['page'];
     if (newUri.path == basePath && page != null) {
       final newParams = {...newUri.queryParameters}..remove('page');

packages/devtools_app/test/shared/primitives/url_utils_test.dart

@@ -65,6 +65,44 @@ void main() {
           test('maps legacy URIs with no page names', () {
             expect(mapLegacyUrl('$prefix/#/?foo=bar'), '$prefix/?foo=bar');
           });
+
+          for (final compilerValue in ['js', 'wasm']) {
+            group('with ?compiler=$compilerValue query param', () {
+              test(
+                'moves ?compiler=$compilerValue from before hash to after path',
+                () {
+                  final newUrl = '$prefix/inspector?compiler=$compilerValue';
+                  expect(
+                    mapLegacyUrl('$prefix/?compiler=$compilerValue#/inspector'),
+                    newUrl,
+                  );
+                  expect(
+                    mapLegacyUrl(
+                      '$prefix/?compiler=$compilerValue#/?page=inspector',
+                    ),
+                    newUrl,
+                  );
+                },
+              );
+
+              test('handles additional query parameters', () {
+                final newUrl =
+                    '$prefix/inspector?foo=bar&compiler=$compilerValue';
+                expect(
+                  mapLegacyUrl(
+                    '$prefix/?compiler=$compilerValue#/inspector?foo=bar',
+                  ),
+                  newUrl,
+                );
+                expect(
+                  mapLegacyUrl(
+                    '$prefix/?compiler=$compilerValue#/?page=inspector&foo=bar',
+                  ),
+                  newUrl,
+                );
+              });
+            });
+          }
         });
       }
     });

packages/devtools_app/web/flutter_bootstrap.js

@@ -84,6 +84,9 @@ async function shouldUseSkwasm() {
 
 // Sets or removes the 'wasm' query parameter based on whether DevTools should
 // be loaded with the skwasm renderer.
+//
+// Note: In the case of the legacy-formatted URL, this adds the query parameter
+// in the wrong place. We fix this in the Dart mapLegacyUrl function.
 function updateWasmQueryParameter(useSkwasm) {
   const url = new URL(window.location.href);
   if (useSkwasm) {