From 2533d68cabb5a38be891a9807c452ca802401d46 Mon Sep 17 00:00:00 2001
From: Coty <13724650+cotyhamilton@users.noreply.github.com>
Date: Mon, 2 Sep 2024 19:01:36 -0400
Subject: [PATCH] fix(cli/tools): correct `deno init --serve` template behavior
 (#25318)

---
 cli/tools/init/mod.rs           | 19 ++++++++++++++-----
 tests/integration/init_tests.rs |  4 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/cli/tools/init/mod.rs b/cli/tools/init/mod.rs
index b9ae803c73..2d6a894e13 100644
--- a/cli/tools/init/mod.rs
+++ b/cli/tools/init/mod.rs
@@ -37,7 +37,7 @@ const routes: Route[] = [
   },
   {
     pattern: new URLPattern({ pathname: "/static/*" }),
-    handler: (req) => serveDir(req, { urlRoot: "./" }),
+    handler: (req) => serveDir(req),
   },
 ];
 
@@ -52,7 +52,6 @@ export default {
     return handler(req);
   },
 } satisfies Deno.ServeDefaultExport;
- 
 "#,
     )?;
     create_file(
@@ -80,13 +79,23 @@ Deno.test(async function serverFetchUsers() {
 });
 
 Deno.test(async function serverFetchStatic() {
-  const req = new Request("https://deno.land/static/main.ts");
+  const req = new Request("https://deno.land/static/hello.js");
   const res = await server.fetch(req);
-  assertEquals(res.headers.get("content-type"), "text/plain;charset=UTF-8");
+  assertEquals(await res.text(), 'console.log("Hello, world!");\n');
+  assertEquals(res.headers.get("content-type"), "text/javascript; charset=UTF-8");
 });
 "#,
     )?;
 
+    let static_dir = dir.join("static");
+    std::fs::create_dir_all(&static_dir)?;
+    create_file(
+      &static_dir,
+      "hello.js",
+      r#"console.log("Hello, world!");
+"#,
+    )?;
+
     create_json_file(
       &dir,
       "deno.json",
@@ -203,7 +212,7 @@ Deno.test(function addTest() {
     info!("  deno task dev");
     info!("");
     info!("  {}", colors::gray("# Run the tests"));
-    info!("  deno -R test");
+    info!("  deno test -R");
   } else if init_flags.lib {
     info!("  {}", colors::gray("# Run the tests"));
     info!("  deno test");
diff --git a/tests/integration/init_tests.rs b/tests/integration/init_tests.rs
index 757dcb021e..a447e7bcef 100644
--- a/tests/integration/init_tests.rs
+++ b/tests/integration/init_tests.rs
@@ -188,7 +188,7 @@ async fn init_subcommand_serve() {
   assert_contains!(stderr, "Project initialized");
   assert_contains!(stderr, "deno serve -R main.ts");
   assert_contains!(stderr, "deno task dev");
-  assert_contains!(stderr, "deno -R test");
+  assert_contains!(stderr, "deno test -R");
 
   assert!(cwd.join("deno.json").exists());
 
@@ -209,7 +209,7 @@ async fn init_subcommand_serve() {
   let output = context
     .new_command()
     .env("NO_COLOR", "1")
-    .args("-R test")
+    .args("test -R")
     .split_output()
     .run();