refactor: use http-proxy-3 (#20402)

Author: sapphi-red

docs/config/preview-options.md

@@ -80,7 +80,7 @@ Automatically open the app in the browser on server start. When the value is a s
 
 Configure custom proxy rules for the preview server. Expects an object of `{ key: options }` pairs. If the key starts with `^`, it will be interpreted as a `RegExp`. The `configure` option can be used to access the proxy instance.
 
-Uses [`http-proxy`](https://github.com/http-party/node-http-proxy). Full options [here](https://github.com/http-party/node-http-proxy#options).
+Uses [`http-proxy-3`](https://github.com/sagemathinc/http-proxy-3). Full options [here](https://github.com/sagemathinc/http-proxy-3#options).
 
 ## preview.cors
 

docs/config/server-options.md

@@ -122,7 +122,7 @@ Configure custom proxy rules for the dev server. Expects an object of `{ key: op
 
 Note that if you are using non-relative [`base`](/config/shared-options.md#base), you must prefix each key with that `base`.
 
-Extends [`http-proxy`](https://github.com/http-party/node-http-proxy#options). Additional options are [here](https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/proxy.ts#L13).
+Extends [`http-proxy-3`](https://github.com/sagemathinc/http-proxy-3#options). Additional options are [here](https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/proxy.ts#L13).
 
 In some cases, you might also want to configure the underlying dev server (e.g. to add custom middlewares to the internal [connect](https://github.com/senchalabs/connect) app). In order to do that, you need to write your own [plugin](/guide/using-plugins.html) and use [configureServer](/guide/api-plugin.html#configureserver) function.
 

packages/vite/LICENSE.md

@@ -1059,35 +1059,6 @@ Repository: jshttp/etag
 
 ---------------------------------------
 
-## eventemitter3
-License: MIT
-By: Arnout Kazemier
-Repository: git://github.com/primus/eventemitter3.git
-
-> The MIT License (MIT)
-> 
-> Copyright (c) 2014 Arnout Kazemier
-> 
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
-> 
-> The above copyright notice and this permission notice shall be included in all
-> copies or substantial portions of the Software.
-> 
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-> SOFTWARE.
-
----------------------------------------
-
 ## finalhandler
 License: MIT
 By: Douglas Christopher Wilson
@@ -1225,33 +1196,33 @@ Repository: git+https://github.com/sapphi-red/host-validation-middleware.git
 
 ---------------------------------------
 
-## http-proxy
+## http-proxy-3
 License: MIT
-By: Charlie Robbins, jcrugzz <jcrugzz@gmail.com>
-Repository: https://github.com/http-party/node-http-proxy.git
+By: William Stein, Charlie Robbins, Jimb Esser, jcrugzz
+Repository: https://github.com/sagemathinc/http-proxy-3.git
 
-> node-http-proxy
+> node-http-3
 > 
->   Copyright (c) 2010-2016 Charlie Robbins, Jarrett Cruger & the Contributors.
+> Copyright (c) 2010-2025 William Stein, Charlie Robbins, Jarrett Cruger & the Contributors.
 > 
->   Permission is hereby granted, free of charge, to any person obtaining
->   a copy of this software and associated documentation files (the
->   "Software"), to deal in the Software without restriction, including
->   without limitation the rights to use, copy, modify, merge, publish,
->   distribute, sublicense, and/or sell copies of the Software, and to
->   permit persons to whom the Software is furnished to do so, subject to
->   the following conditions:
+> Permission is hereby granted, free of charge, to any person obtaining
+> a copy of this software and associated documentation files (the
+> "Software"), to deal in the Software without restriction, including
+> without limitation the rights to use, copy, modify, merge, publish,
+> distribute, sublicense, and/or sell copies of the Software, and to
+> permit persons to whom the Software is furnished to do so, subject to
+> the following conditions:
 > 
->   The above copyright notice and this permission notice shall be
->   included in all copies or substantial portions of the Software.
+> The above copyright notice and this permission notice shall be
+> included in all copies or substantial portions of the Software.
 > 
->   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
->   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
->   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
->   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
->   LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
->   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
->   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+> NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+> LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+> OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+> WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------------
 
@@ -2089,35 +2060,6 @@ Repository: git://github.com/paulmillr/readdirp.git
 
 ---------------------------------------
 
-## requires-port
-License: MIT
-By: Arnout Kazemier
-Repository: https://github.com/unshiftio/requires-port
-
-> The MIT License (MIT)
-> 
-> Copyright (c) 2015 Unshift.io, Arnout Kazemier,  the Contributors.
-> 
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
-> 
-> The above copyright notice and this permission notice shall be included in all
-> copies or substantial portions of the Software.
-> 
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-> SOFTWARE.
-
----------------------------------------
-
 ## resolve.exports, totalist
 License: MIT
 By: Luke Edwards

packages/vite/package.json

@@ -121,7 +121,7 @@
     "estree-walker": "^3.0.3",
     "etag": "^1.8.1",
     "host-validation-middleware": "^0.1.1",
-    "http-proxy": "^1.18.1",
+    "http-proxy-3": "^1.20.10",
     "launch-editor-middleware": "^2.10.0",
     "lightningcss": "^1.30.1",
     "magic-string": "^0.30.17",

packages/vite/rolldown.dts.config.ts

@@ -1,5 +1,6 @@
 import { readFileSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
+import { builtinModules } from 'node:module'
 import { defineConfig } from 'rolldown'
 import type {
   OutputChunk,
@@ -30,7 +31,6 @@ const external = [
   'rollup/parseAst',
   ...Object.keys(pkg.dependencies),
   ...Object.keys(pkg.peerDependencies),
-  ...Object.keys(pkg.devDependencies),
 ]
 
 export default defineConfig({
@@ -48,7 +48,12 @@ export default defineConfig({
   external,
   plugins: [
     patchTypes(),
-    dts({ tsconfig: './src/node/tsconfig.build.json', emitDtsOnly: true }),
+    addNodePrefix(),
+    dts({
+      tsconfig: './src/node/tsconfig.build.json',
+      emitDtsOnly: true,
+      resolve: true,
+    }),
   ],
 })
 
@@ -80,6 +85,9 @@ const identifierReplacements: Record<string, Record<string, string>> = {
     Server$2: 'HttpsServer',
     ServerOptions$2: 'HttpsServerOptions',
   },
+  'node:url': {
+    URL$1: 'url_URL',
+  },
   'vite/module-runner': {
     FetchResult$1: 'moduleRunner_FetchResult',
   },
@@ -100,6 +108,7 @@ const ignoreConfusingTypeNames = [
   'Plugin$1',
   'MinimalPluginContext$1',
   'ServerOptions$1',
+  'ServerOptions$3',
 ]
 
 /**
@@ -412,3 +421,18 @@ function escapeRegex(str: string): string {
 function unique<T>(arr: T[]): T[] {
   return Array.from(new Set(arr))
 }
+
+function addNodePrefix(): Plugin {
+  return {
+    name: 'add-node-prefix',
+    resolveId: {
+      order: 'pre',
+      filter: {
+        id: new RegExp(`^(?:${builtinModules.join('|')})$`),
+      },
+      handler(id) {
+        return { id: `node:${id}`, external: true }
+      },
+    },
+  }
+}

packages/vite/src/node/http.ts

@@ -48,8 +48,8 @@ export interface CommonServerOptions {
   /**
    * Configure custom proxy rules for the dev server. Expects an object
    * of `{ key: options }` pairs.
-   * Uses [`http-proxy`](https://github.com/http-party/node-http-proxy).
-   * Full options [here](https://github.com/http-party/node-http-proxy#options).
+   * Uses [`http-proxy-3`](https://github.com/sagemathinc/http-proxy-3).
+   * Full options [here](https://github.com/sagemathinc/http-proxy-3#options).
    *
    * Example `vite.config.js`:
    * ``` js

packages/vite/src/node/index.ts

@@ -251,7 +251,7 @@ export type {
 } from 'dep-types/alias'
 export type { Connect } from 'dep-types/connect'
 export type { WebSocket, WebSocketAlias } from 'dep-types/ws'
-export type { HttpProxy } from 'dep-types/http-proxy'
+export type * as HttpProxy from 'http-proxy-3'
 export type { FSWatcher, WatchOptions } from 'dep-types/chokidar'
 export type { Terser } from 'types/internal/terserOptions'
 export type { RollupCommonJSOptions } from 'dep-types/commonjs'

packages/vite/src/node/server/middlewares/proxy.ts

@@ -1,24 +1,22 @@
 import type * as http from 'node:http'
-import type * as net from 'node:net'
-import httpProxy from 'http-proxy'
+import * as httpProxy from 'http-proxy-3'
 import type { Connect } from 'dep-types/connect'
-import type { HttpProxy } from 'dep-types/http-proxy'
 import colors from 'picocolors'
 import { createDebugger } from '../../utils'
 import type { CommonServerOptions, ResolvedConfig } from '../..'
 import type { HttpServer } from '..'
 
 const debug = createDebugger('vite:proxy')
 
-export interface ProxyOptions extends HttpProxy.ServerOptions {
+export interface ProxyOptions extends httpProxy.ServerOptions {
   /**
    * rewrite path
    */
   rewrite?: (path: string) => string
   /**
    * configure the proxy server (e.g. listen to events)
    */
-  configure?: (proxy: HttpProxy.Server, options: ProxyOptions) => void
+  configure?: (proxy: httpProxy.ProxyServer, options: ProxyOptions) => void
   /**
    * webpack-dev-server style bypass function
    */
@@ -66,7 +64,7 @@ const rewriteOriginHeader = (
     if (proxyReq.getHeader('origin') && target) {
       const changedOrigin =
         typeof target === 'object'
-          ? `${target.protocol}//${target.host}`
+          ? `${target.protocol ?? 'http:'}//${target.host}`
           : target
 
       proxyReq.setHeader('origin', changedOrigin)
@@ -80,39 +78,27 @@ export function proxyMiddleware(
   config: ResolvedConfig,
 ): Connect.NextHandleFunction {
   // lazy require only when proxy is used
-  const proxies: Record<string, [HttpProxy.Server, ProxyOptions]> = {}
+  const proxies: Record<string, [httpProxy.ProxyServer, ProxyOptions]> = {}
 
   Object.keys(options).forEach((context) => {
     let opts = options[context]
     if (!opts) {
       return
     }
     if (typeof opts === 'string') {
-      opts = { target: opts, changeOrigin: true } as ProxyOptions
+      opts = { target: opts, changeOrigin: true }
     }
-    const proxy = httpProxy.createProxyServer(opts) as HttpProxy.Server
+    const proxy = httpProxy.createProxyServer(opts)
 
     if (opts.configure) {
       opts.configure(proxy, opts)
     }
 
-    proxy.on('error', (err, _req, originalRes) => {
+    proxy.on('error', (err, _req, res) => {
       // When it is ws proxy, res is net.Socket
-      // originalRes can be falsy if the proxy itself errored
-      const res = originalRes as http.ServerResponse | net.Socket | undefined
-      if (!res) {
+      if ('req' in res) {
         config.logger.error(
-          `${colors.red(`http proxy error: ${err.message}`)}\n${err.stack}`,
-          {
-            timestamp: true,
-            error: err,
-          },
-        )
-      } else if ('req' in res) {
-        config.logger.error(
-          `${colors.red(`http proxy error: ${originalRes.req.url}`)}\n${
-            err.stack
-          }`,
+          `${colors.red(`http proxy error: ${res.req.url}`)}\n${err.stack}`,
           {
             timestamp: true,
             error: err,
@@ -148,17 +134,6 @@ export function proxyMiddleware(
       })
     })
 
-    // https://github.com/http-party/node-http-proxy/issues/1520#issue-877626125
-    // https://github.com/chimurai/http-proxy-middleware/blob/cd58f962aec22c925b7df5140502978da8f87d5f/src/plugins/default/debug-proxy-errors-plugin.ts#L25-L37
-    proxy.on('proxyRes', (proxyRes, _req, res) => {
-      res.on('close', () => {
-        if (!res.writableEnded) {
-          debug?.('destroying proxyRes in proxyRes close event')
-          proxyRes.destroy()
-        }
-      })
-    })
-
     // clone before saving because http-proxy mutates the options
     proxies[context] = [proxy, { ...opts }]
   })
@@ -217,7 +192,7 @@ export function proxyMiddleware(
     for (const context in proxies) {
       if (doesProxyContextMatchUrl(context, url)) {
         const [proxy, opts] = proxies[context]
-        const options: HttpProxy.ServerOptions = {}
+        const options: httpProxy.ServerOptions = {}
 
         if (opts.bypass) {
           try {