Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cli/tools): correct deno init --serve template behavior #25318

Merged
merged 2 commits into from
Sep 2, 2024
Merged

fix(cli/tools): correct deno init --serve template behavior #25318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c051e4f
Update deno init --serve template
cotyhamilton Aug 30, 2024
3e6a84b
tweak
iuioiua Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions cli/tools/init/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const routes: Route[] = [
},
{
pattern: new URLPattern({ pathname: "/static/*" }),
handler: (req) => serveDir(req, { urlRoot: "./" }),
handler: (req) => serveDir(req),
},
];

Expand All @@ -52,7 +52,6 @@ export default {
return handler(req);
},
} satisfies Deno.ServeDefaultExport;

"#,
)?;
create_file(
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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");
iuioiua marked this conversation as resolved.
Show resolved Hide resolved
} else if init_flags.lib {
info!(" {}", colors::gray("# Run the tests"));
info!(" deno test");
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/init_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand All @@ -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();

Expand Down