From 696b849ddb68bbb42ff481f67787783df0a873df Mon Sep 17 00:00:00 2001
From: iacore <noreply+gpg-stub@1a-insec.net>
Date: Fri, 22 Mar 2024 16:23:00 +0000
Subject: [PATCH] replace serve-handler with serve-static

---
 package.json                                  |  1 -
 packages/reporters/dev-server/package.json    |  1 -
 packages/reporters/dev-server/src/Server.js   | 21 ++++++-------------
 .../utils/node-resolver-core/package.json     |  1 -
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index eb187133bd7..a9abbb2f998 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,6 @@
     "mocha-junit-reporter": "^2.0.0",
     "mocha-multi-reporters": "^1.5.1",
     "prettier": "2.4.1",
-    "punycode": "^1.4.1",
     "rimraf": "^5.0.5",
     "semver": "^7.5.2",
     "sinon": "^7.3.1"
diff --git a/packages/reporters/dev-server/package.json b/packages/reporters/dev-server/package.json
index a12aa670014..bd2087f1a22 100644
--- a/packages/reporters/dev-server/package.json
+++ b/packages/reporters/dev-server/package.json
@@ -42,7 +42,6 @@
     "launch-editor": "^2.3.0",
     "mime-types": "2.1.18",
     "nullthrows": "^1.1.1",
-    "serve-handler": "^6.0.0",
     "ws": "^7.0.0"
   }
 }
diff --git a/packages/reporters/dev-server/src/Server.js b/packages/reporters/dev-server/src/Server.js
index 26227f53d0d..5535c1fce76 100644
--- a/packages/reporters/dev-server/src/Server.js
+++ b/packages/reporters/dev-server/src/Server.js
@@ -27,7 +27,7 @@ import serverErrors from './serverErrors';
 import fs from 'fs';
 import ejs from 'ejs';
 import connect from 'connect';
-import serveHandler from 'serve-handler';
+import serveStatic from 'serve-static';
 import {createProxyMiddleware} from 'http-proxy-middleware';
 import {URL, URLSearchParams} from 'url';
 import launchEditor from 'launch-editor';
@@ -362,20 +362,11 @@ export default class Server {
       return;
     }
 
-    return serveHandler(
-      req,
-      res,
-      {
-        public: root,
-        cleanUrls: false,
-      },
-      {
-        lstat: path => fs.stat(path),
-        realpath: path => fs.realpath(path),
-        createReadStream: (path, options) => fs.createReadStream(path, options),
-        readdir: path => fs.readdir(path),
-      },
-    );
+      // Serve up public/ftp folder
+      const serve = serveStatic(root, {
+        index: false,
+      })
+      return serve(req, res, next);
   }
 
   sendError(res: Response, statusCode: number) {
diff --git a/packages/utils/node-resolver-core/package.json b/packages/utils/node-resolver-core/package.json
index de213c5e3a9..c2ac1f69404 100644
--- a/packages/utils/node-resolver-core/package.json
+++ b/packages/utils/node-resolver-core/package.json
@@ -46,7 +46,6 @@
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.0",
     "process": "^0.11.10",
-    "punycode": "^1.4.1",
     "querystring-es3": "^0.2.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.1.0",