update path-to-regexp

packages/inferno-router/package.json

@@ -50,7 +50,7 @@
   "dependencies": {
     "history": "^5.3.0",
     "inferno": "9.0.10",
-    "path-to-regexp": "^1.9.0"
+    "path-to-regexp": "^8.3.0"
   },
   "devDependencies": {
     "inferno-server": "9.0.10",

packages/inferno-router/src/matchPath.ts

@@ -1,31 +1,25 @@
-import pathToRegexp from 'path-to-regexp';
+import { pathToRegexp, Keys } from 'path-to-regexp';
 import { type Match } from './Route';
 
 const patternCache = {};
 const cacheLimit = 10000;
 let cacheCount = 0;
 
-interface pathToRegexKey {
-  name: string | number;
-  prefix: string;
-  delimiter: string;
-  optional: boolean;
-  repeat: boolean;
-  pattern: string;
-  partial: boolean;
-  asterisk: boolean;
-}
-
-const compilePath = (pattern, options): { re: any; keys: pathToRegexKey[] } => {
+const compilePath = (pattern, options): { re: any; keys: Keys } => {
   const cacheKey = `${options.end}${options.strict}${options.sensitive}`;
   const cache = patternCache[cacheKey] || (patternCache[cacheKey] = {});
 
   if (cache[pattern]) {
     return cache[pattern];
   }
 
-  const keys = [];
-  const re = pathToRegexp(pattern, keys, options);
+  options.trailing = options.end && !options.strict;
+  pattern = pattern.replace(/\?/, '{.:optqspunct}');
+  if (!options.exact && !options.strict) {
+    pattern = pattern.replace(/\/$/, '{.:optendslash}');
+  }
+
+  const { regexp: re, keys } = pathToRegexp(pattern, options)
   const compiledPattern = { re, keys };
 
   if (cacheCount < cacheLimit) {
@@ -52,15 +46,27 @@ export function matchPath(pathname, options: any): Match<any> | null {
     loader,
     initialData = {},
   } = options;
+
+  const loaderData = initialData[path];
+
+  if (path === '*' || path === '/*') {
+    return {
+      isExact: false,
+      loader,
+      loaderData,
+      params: [],
+      path,
+      url: '/'
+    };
+  }
+
   const { re, keys } = compilePath(path, { end: exact, strict, sensitive });
   const match = re.exec(pathname);
 
   if (!match) {
     return null;
   }
 
-  const loaderData = initialData[path];
-
   const [url, ...values] = match;
   const isExact = pathname === url;
 
@@ -73,10 +79,11 @@ export function matchPath(pathname, options: any): Match<any> | null {
     loader,
     loaderData,
     params: keys.reduce((memo, key, index) => {
-      memo[key.name] = values[index];
+      if (values[index] !== undefined)
+        memo[key.name] = values[index];
       return memo;
     }, {}),
     path, // the path pattern used to match
     url: path === '/' && url === '' ? '/' : url, // the matched portion of the URL
   };
-}
+}