Fix useSimpleNavigation for catch-all routes. (#89)

* Fix useSimpleNavigation for catch-all routes.

* bump version

Author: markbrocato

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-storefront",
-  "version": "8.3.2",
+  "version": "8.3.3",
   "description": "Build and deploy e-commerce progressive web apps (PWAs) in record time.",
   "module": "./index.js",
   "license": "Apache-2.0",
@@ -44,7 +44,6 @@
     "formidable": "^1.2.1",
     "isomorphic-unfetch": "^3.0.0",
     "next-offline": "^5.0.0",
-    "path-to-regexp": "^3.1.0",
     "qs": "^6.9.0",
     "react-image-magnify": "^2.7.4",
     "react-swipeable-views": "0.13.3",

package.json

@@ -63,7 +63,7 @@ function fetchRouteManifest() {
 
 function getRoute(href, routes) {
   for (let pattern in routes) {
-    if (new RegExp(pattern).test(href)) {
+    if (new RegExp(pattern, 'i').test(href)) {
       return routes[pattern].as
     }
   }

src/router/useSimpleNavigation.js

@@ -1,11 +1,12 @@
-const pathToRegexp = require('path-to-regexp')
+import { getRouteRegex } from 'next/dist/next-server/lib/router/utils/route-regex'
 
 export default function routes(pagesManifest) {
   const routes = {}
 
   for (let as in pagesManifest) {
     const component = pagesManifest[as]
-    const route = pathToRegexp(as.replace(/\[([^\]]+)\]/g, ':$1')).source
+    const route = getRouteRegex(as).re.source
+
     routes[route] = {
       component,
       as,

src/server/getRoutes.js

@@ -11,7 +11,7 @@ describe('getRoutes', () => {
 
     expect(routes).toStrictEqual({
       '^\\/_app(?:\\/)?$': { component: 'static/development/pages/_app.js', as: '/_app' },
-      '^\\/p\\/([^\\/]+?)(?:\\/)?$': {
+      '^\\/p\\/([^/]+?)(?:\\/)?$': {
         component: 'static/development/pages/p/[productId].js',
         as: '/p/[productId]',
       },