update deps

cfworker · Aug 19, 2024 · ab11822 · ab11822
1 parent e4fbe56
commit ab11822
Show file tree

Hide file tree

Showing 12 changed files with 445 additions and 2,456 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,9 +35,9 @@
     "*.{ts,js,json,yml,html,xml}": "prettier --write"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.27.1",
-    "husky": "^9.0.11",
-    "lint-staged": "15.2.2",
-    "prettier": "3.2.5"
+    "@changesets/cli": "^2.27.7",
+    "husky": "^9.1.4",
+    "lint-staged": "15.2.9",
+    "prettier": "3.3.3"
   }
 }
diff --git a/packages/cosmos/package.json b/packages/cosmos/package.json
@@ -40,10 +40,10 @@
     "rfc4648": "^1.5.3"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.13",
-    "@types/mocha": "^10.0.6",
-    "chai": "^5.1.0",
-    "mocha": "^10.3.0",
-    "typescript": "^5.4.2"
+    "@types/chai": "^4.3.17",
+    "@types/mocha": "^10.0.7",
+    "chai": "^5.1.1",
+    "mocha": "^10.7.3",
+    "typescript": "^5.5.4"
   }
 }
diff --git a/packages/csv/package.json b/packages/csv/package.json
@@ -27,10 +27,10 @@
     "test": "cfworker test test/**/*.spec.ts"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.13",
-    "@types/mocha": "^10.0.6",
-    "chai": "^5.1.0",
-    "mocha": "^10.3.0",
-    "typescript": "^5.4.2"
+    "@types/chai": "^4.3.17",
+    "@types/mocha": "^10.0.7",
+    "chai": "^5.1.1",
+    "mocha": "^10.7.3",
+    "typescript": "^5.5.4"
   }
 }
diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -33,6 +33,6 @@
     "@cfworker/web": "^1.14.0"
   },
   "devDependencies": {
-    "typescript": "^5.4.2"
+    "typescript": "^5.5.4"
   }
 }
diff --git a/packages/json-schema/package.json b/packages/json-schema/package.json
@@ -38,11 +38,11 @@
     "test": "cfworker test test/**/*.spec.ts --nocheck"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.13",
-    "@types/mocha": "^10.0.6",
-    "chai": "^5.1.0",
+    "@types/chai": "^4.3.17",
+    "@types/mocha": "^10.0.7",
+    "chai": "^5.1.1",
     "json-schema-test-suite": "git+https://github.com/json-schema-org/JSON-Schema-Test-Suite#76b529f",
-    "mocha": "^10.3.0",
-    "typescript": "^5.4.2"
+    "mocha": "^10.7.3",
+    "typescript": "^5.5.4"
   }
 }
diff --git a/packages/jwt/package.json b/packages/jwt/package.json
@@ -37,10 +37,10 @@
     "rfc4648": "^1.5.3"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.13",
-    "@types/mocha": "^10.0.6",
-    "chai": "^5.1.0",
-    "mocha": "^10.3.0",
-    "typescript": "^5.4.2"
+    "@types/chai": "^4.3.17",
+    "@types/mocha": "^10.0.7",
+    "chai": "^5.1.1",
+    "mocha": "^10.7.3",
+    "typescript": "^5.5.4"
   }
 }
diff --git a/packages/sentry/package.json b/packages/sentry/package.json
@@ -35,6 +35,6 @@
     "test": "cfworker test test/**/*.spec.ts"
   },
   "devDependencies": {
-    "typescript": "^5.4.2"
+    "typescript": "^5.5.4"
   }
 }
diff --git a/packages/site/package.json b/packages/site/package.json
@@ -21,9 +21,9 @@
   },
   "dependencies": {
     "@cfworker/web": "^1.14.0",
-    "@cloudflare/workers-types": "^4.20240314.0"
+    "@cloudflare/workers-types": "^4.20240815.0"
   },
   "devDependencies": {
-    "typescript": "^5.4.2"
+    "typescript": "^5.5.4"
   }
 }
diff --git a/packages/uuid/package.json b/packages/uuid/package.json
@@ -36,10 +36,10 @@
     "test": "cfworker test test/**/*.spec.ts"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.13",
-    "@types/mocha": "^10.0.6",
-    "chai": "^5.1.0",
-    "mocha": "^10.3.0",
-    "typescript": "^5.4.2"
+    "@types/chai": "^4.3.17",
+    "@types/mocha": "^10.0.7",
+    "chai": "^5.1.1",
+    "mocha": "^10.7.3",
+    "typescript": "^5.5.4"
   }
 }
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -41,16 +41,16 @@
     "cookie": "^0.6.0",
     "html-escaper": "^3.0.3",
     "negotiator": "^0.6.3",
-    "path-to-regexp": "^6.2.1",
+    "path-to-regexp": "^7.1.0",
     "secure-json-parse": "^2.7.0",
     "statuses": "^2.0.1"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.13",
-    "@types/mocha": "^10.0.6",
-    "chai": "^5.1.0",
+    "@types/chai": "^4.3.17",
+    "@types/mocha": "^10.0.7",
+    "chai": "^5.1.1",
     "jsonpointer": "^5.0.1",
-    "mocha": "^10.3.0",
-    "typescript": "^5.4.2"
+    "mocha": "^10.7.3",
+    "typescript": "^5.5.4"
   }
 }
diff --git a/packages/web/src/router.ts b/packages/web/src/router.ts
@@ -1,14 +1,7 @@
-import {
-  Key,
-  ParseOptions,
-  pathToRegexp,
-  TokensToRegexpOptions
-} from 'path-to-regexp';
+import { Key, pathToRegexp, PathToRegexpOptions } from 'path-to-regexp';
 import { Context } from './context.js';
 import { composeMiddleware, Middleware } from './middleware.js';
 
-export type PathToRegExpOptions = TokensToRegexpOptions & ParseOptions;
-
 export const Method = (method: string) => {
   method = method.toUpperCase();
   return ({ req }: Context) => req.method === method;
@@ -28,16 +21,15 @@ export const Header = (header: string, value: string) => {
 export const Host = (host: string) => Header('host', host);
 export const Referer = (host: string) => Header('referer', host);
 
-export const Path = (pattern: string, options?: PathToRegExpOptions) => {
-  const keys: Key[] = [];
-  const regExp = pathToRegexp(pattern, keys, options);
+export const Path = (pattern: string, options?: PathToRegexpOptions) => {
+  const regExp = pathToRegexp(pattern, options);
 
   return ({ req: { url, params } }: Context) => {
     const match = url.pathname.match(regExp);
     if (!match) {
       return false;
     }
-    collectParameters(keys, match, params);
+    collectParameters(regExp.keys, match, params);
     return true;
   };
 };
@@ -50,7 +42,7 @@ export interface Route {
 }
 
 export interface RouterOptions {
-  pathToRegExpOptions?: PathToRegExpOptions;
+  pathToRegExpOptions?: PathToRegexpOptions;
 }
 
 export const defaultRouterOptions: RouterOptions = {