From 605973159442440cea29fef4c634eac8b3c620f5 Mon Sep 17 00:00:00 2001
From: Asher Gomez <ashersaupingomez@gmail.com>
Date: Tue, 23 Jan 2024 12:19:49 +1100
Subject: refactor: set removal version for `Deno.Server` (#22024)

This change sets the removal version for the deprecated `Deno.Server`
interface for Deno 2.0.

Towards #22021
---
 cli/tests/unit/serve_test.ts | 2 +-
 cli/tsc/dts/lib.deno.ns.d.ts | 4 +++-
 ext/node/polyfills/http.ts   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cli/tests/unit/serve_test.ts b/cli/tests/unit/serve_test.ts
index e188932ac..9d06860e0 100644
--- a/cli/tests/unit/serve_test.ts
+++ b/cli/tests/unit/serve_test.ts
@@ -3815,7 +3815,7 @@ async function curlRequestWithStdErr(args: string[]) {
   return [new TextDecoder().decode(stdout), new TextDecoder().decode(stderr)];
 }
 
-Deno.test("Deno.Server is not thenable", async () => {
+Deno.test("Deno.HttpServer is not thenable", async () => {
   // deno-lint-ignore require-await
   async function serveTest() {
     const server = Deno.serve({ port: servePort }, (_) => new Response(""));
diff --git a/cli/tsc/dts/lib.deno.ns.d.ts b/cli/tsc/dts/lib.deno.ns.d.ts
index 8a7abd0e1..b25ee4acd 100644
--- a/cli/tsc/dts/lib.deno.ns.d.ts
+++ b/cli/tsc/dts/lib.deno.ns.d.ts
@@ -6043,7 +6043,9 @@ declare namespace Deno {
 
   /**
    * @category HTTP Server
-   * @deprecated Use {@linkcode HttpServer} instead.
+   *
+   * @deprecated Use {@linkcode Deno.HttpServer} instead.
+   * {@linkcode Deno.Server} will be removed in Deno 2.0.
    */
   export type Server = HttpServer;
 
diff --git a/ext/node/polyfills/http.ts b/ext/node/polyfills/http.ts
index 2da19f7f5..92368b74f 100644
--- a/ext/node/polyfills/http.ts
+++ b/ext/node/polyfills/http.ts
@@ -1575,7 +1575,7 @@ export class ServerImpl extends EventEmitter {
 
   #addr: Deno.NetAddr;
   #hasClosed = false;
-  #server: Deno.Server;
+  #server: Deno.HttpServer;
   #unref = false;
   #ac?: AbortController;
   #serveDeferred: ReturnType<typeof Promise.withResolvers<void>>;
-- 
cgit v1.2.3