Move wsl_distro

josevalim · josevalim · commit 0d9aba7e5b09 · 2026-07-22T12:05:51.000+02:00
diff --git a/lib/tidewave.rb b/lib/tidewave.rb
@@ -236,8 +236,7 @@ def config_data(request)
       "team" => @options[:team] || {},
       "tidewave_version" => VERSION,
       "local_port" => local_port(request),
-      "tmp_dir" => TMP_DIR,
-      "wsl_distro" => ENV["WSL_DISTRO_NAME"]
+      "tmp_dir" => TMP_DIR
     }
   end
 
@@ -291,7 +290,9 @@ def toolbar_html(request)
     client_url = @options[:client_url].to_s.sub(%r{/\z}, "")
     payload = {
       "tidewave" => config_data(request),
-      "root" => @root.to_s
+      "root" => @root.to_s,
+      "wsl_distro" => ENV["WSL_DISTRO_NAME"],
+      "framework" => {}
     }
 
     <<~HTML
diff --git a/test/tidewave_test.rb b/test/tidewave_test.rb
@@ -95,15 +95,20 @@ def test_injects_toolbar_into_html_responses
     assert_equal "demo-app", payload.dig("tidewave", "project_name")
     assert_equal 5000, payload.dig("tidewave", "local_port")
     assert_equal @tmpdir, payload["root"]
+    assert_equal({}, payload["framework"])
   end
 
-  def test_config_includes_the_wsl_distribution
+  def test_toolbar_config_includes_the_wsl_distribution_at_the_top_level
     previous_wsl_distro = ENV["WSL_DISTRO_NAME"]
     ENV["WSL_DISTRO_NAME"] = "Ubuntu-24.04"
-    app = Tidewave.new(@downstream_app, allow_remote_access: true, project_name: "demo-app")
+    downstream = ->(_env) { [ 200, { "content-type" => "text/html" }, [ "<head></head>" ] ] }
+    app = Tidewave.new(downstream, allow_remote_access: true, project_name: "demo-app")
 
-    _status, _headers, body = perform_request(app, path: "/tidewave/config")
-    assert_equal "Ubuntu-24.04", JSON.parse(body)["wsl_distro"]
+    _status, _headers, body = perform_request(app, path: "/")
+    payload = JSON.parse(CGI.unescapeHTML(body[/name="tidewave:config" content="([^"]+)"/, 1]))
+
+    assert_equal "Ubuntu-24.04", payload["wsl_distro"]
+    refute payload["tidewave"].key?("wsl_distro")
   ensure
     ENV["WSL_DISTRO_NAME"] = previous_wsl_distro
   end
