diff --git a/README.md b/README.md index e079864..8963093 100644 --- a/README.md +++ b/README.md @@ -580,13 +580,15 @@ app.use((req, res) => { Examples of use with other servers will follow here. -### Connect +### connect-next + +[connect-next](https://github.com/rstackjs/connect-next) is an actively maintained fork of Connect. ```js import { createServer } from "node:http"; import { rspack } from "@rspack/core"; import { devMiddleware } from "@rspack/dev-middleware"; -import connect from "connect"; +import { connect } from "connect-next"; import rspackConfig from "./rspack.config.js"; const compiler = rspack(rspackConfig); diff --git a/package.json b/package.json index 8536f58..ebb98f6 100644 --- a/package.json +++ b/package.json @@ -39,12 +39,11 @@ "@rslint/core": "^0.3.3", "@rspack/core": "2.0.0-beta.5", "@rstest/core": "0.9.2", - "@types/connect": "^3.4.35", "@types/express": "^5.0.2", "@types/node": "^22.3.0", "@types/on-finished": "^2.3.4", "@types/range-parser": "^1.2.7", - "connect": "^3.7.0", + "connect-next": "^4.0.0", "cspell": "^9.6.2", "deepmerge": "^4.2.2", "execa": "^5.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c10cfe7..ee6bfbf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,9 +26,6 @@ importers: '@rstest/core': specifier: 0.9.2 version: 0.9.2 - '@types/connect': - specifier: ^3.4.35 - version: 3.4.38 '@types/express': specifier: ^5.0.2 version: 5.0.6 @@ -41,9 +38,9 @@ importers: '@types/range-parser': specifier: ^1.2.7 version: 1.2.7 - connect: - specifier: ^3.7.0 - version: 3.7.0 + connect-next: + specifier: ^4.0.0 + version: 4.0.0 cspell: specifier: ^9.6.2 version: 9.7.0 @@ -986,9 +983,9 @@ packages: concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - connect@3.7.0: - resolution: {integrity: sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==} - engines: {node: '>= 0.10.0'} + connect-next@4.0.0: + resolution: {integrity: sha512-Kg/Ysjd0dsJ9Mw8oKCRfuCVc7BYSU6GSLNoOmwKd5S05bWsuIR/pjCZf/RaE5RiuRChGqW3nP2Z5YdwHhDfbKw==} + engines: {node: ^20.19.0 || >=22.12.0} content-disposition@1.0.1: resolution: {integrity: sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==} @@ -1074,14 +1071,6 @@ packages: resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==} engines: {node: '>= 0.4'} - debug@2.6.9: - resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - debug@4.4.3: resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} engines: {node: '>=6.0'} @@ -1135,10 +1124,6 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - encodeurl@1.0.2: - resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} - engines: {node: '>= 0.8'} - encodeurl@2.0.0: resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==} engines: {node: '>= 0.8'} @@ -1217,10 +1202,6 @@ packages: picomatch: optional: true - finalhandler@1.1.2: - resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==} - engines: {node: '>= 0.8'} - finalhandler@2.1.1: resolution: {integrity: sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==} engines: {node: '>= 18.0.0'} @@ -1573,9 +1554,6 @@ packages: resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==} engines: {node: '>=10'} - ms@2.0.0: - resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} - ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} @@ -1614,10 +1592,6 @@ packages: resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==} engines: {node: '>= 0.4'} - on-finished@2.3.0: - resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==} - engines: {node: '>= 0.8'} - on-finished@2.4.1: resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} engines: {node: '>= 0.8'} @@ -1971,10 +1945,6 @@ packages: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} - utils-merge@1.0.1: - resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} - engines: {node: '>= 0.4.0'} - validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} @@ -2953,12 +2923,11 @@ snapshots: concat-map@0.0.1: {} - connect@3.7.0: + connect-next@4.0.0: dependencies: - debug: 2.6.9 - finalhandler: 1.1.2 + debug: 4.4.3 + finalhandler: 2.1.1 parseurl: 1.3.3 - utils-merge: 1.0.1 transitivePeerDependencies: - supports-color @@ -3100,10 +3069,6 @@ snapshots: es-errors: 1.3.0 is-data-view: 1.0.2 - debug@2.6.9: - dependencies: - ms: 2.0.0 - debug@4.4.3: dependencies: ms: 2.1.3 @@ -3147,8 +3112,6 @@ snapshots: ee-first@1.1.1: {} - encodeurl@1.0.2: {} - encodeurl@2.0.0: {} env-paths@4.0.0: @@ -3300,18 +3263,6 @@ snapshots: optionalDependencies: picomatch: 4.0.3 - finalhandler@1.1.2: - dependencies: - debug: 2.6.9 - encodeurl: 1.0.2 - escape-html: 1.0.3 - on-finished: 2.3.0 - parseurl: 1.3.3 - statuses: 1.5.0 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color - finalhandler@2.1.1: dependencies: debug: 4.4.3 @@ -3682,8 +3633,6 @@ snapshots: mrmime@2.0.1: {} - ms@2.0.0: {} - ms@2.1.3: {} negotiator@0.6.3: {} @@ -3728,10 +3677,6 @@ snapshots: has-symbols: 1.1.0 object-keys: 1.1.1 - on-finished@2.3.0: - dependencies: - ee-first: 1.1.1 - on-finished@2.4.1: dependencies: ee-first: 1.1.1 @@ -4136,8 +4081,6 @@ snapshots: unpipe@1.0.0: {} - utils-merge@1.0.1: {} - validate-npm-package-license@3.0.4: dependencies: spdx-correct: 3.2.0 diff --git a/test/middleware.test.js b/test/middleware.test.js index 2b256a5..f2210a6 100644 --- a/test/middleware.test.js +++ b/test/middleware.test.js @@ -5,7 +5,7 @@ import path from "node:path"; import Hapi from "@hapi/hapi"; import { serve } from "@hono/node-server"; import { Stats } from "@rspack/core"; -import connect from "connect"; +import { connect } from "connect-next"; import express from "express"; import finalhandler from "finalhandler"; import { Hono } from "hono"; @@ -357,7 +357,7 @@ function parseHttpDate(date) { } describe.each([ - ["connect", connect], + ["connect-next", connect], ["express", express], ["router", router], ["koa", koa],