Merge pull request #39 from qubyte/dependabot/npm_and_yarn/path-to-re…

…gexp-7.0.0 Bump path-to-regexp from 6.2.2 to 7.0.0
qubyte · Sep 16, 2024 · ee03726 · ee03726
2 parents a3ee61d + 0c4311e
commit ee03726
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node_version: [18, 20]
+        node_version: [18, 20, 22]
     steps:
     - name: checkout
       uses: actions/checkout@main

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/router/lib/router.js b/packages/router/lib/router.js
@@ -7,16 +7,15 @@ function makeRoute(path, preNormalizedHandlers, options) {
   const handlers = normalizeHandlers(preNormalizedHandlers);
   const allowedMethods = Object.keys(handlers);
   const allow = allowedMethods.sort().join(', ');
-  const keys = [];
-  const regex = pathToRegexp(path, keys, options);
+  const { keys, regexp } = pathToRegexp(path, options);
 
   function notAllowed(_req, res) {
     res.writeHead(405, { allow }).end();
   }
 
   return function match(req) {
     const { pathname } = new URL(req.url, 'http://none');
-    const paramList = regex.exec(pathname);
+    const paramList = regexp.exec(pathname);
 
     if (paramList) {
       return {

diff --git a/packages/router/package.json b/packages/router/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@toisu/middleware-runner": "^4.0.0",
-    "path-to-regexp": "^6.2.1"
+    "path-to-regexp": "^8.1.0"
   },
   "publishConfig": {
     "access": "public"