Upgrade to newer wouter with simpler ssr support

Author: airhorns

packages/fastify-renderer/package.json

@@ -68,7 +68,7 @@
     "sanitize-filename": "^1.6.3",
     "stream-template": "^0.0.10",
     "vite": "^2.9.15",
-    "wouter": "^2.7.5"
+    "wouter": "^2.12.1"
   },
   "peerDependencies": {
     "fastify": "^4.24.2",

packages/fastify-renderer/src/client/react/matcher.ts

@@ -1,5 +1,7 @@
 import { Key, pathToRegexp } from 'path-to-regexp'
-import { MatcherFn } from 'wouter'
+import type { Match, Path } from 'wouter'
+
+export type MatcherFn = (pattern: Path, path: Path) => Match
 
 /*
  * This function specifies how strings like /app/:users/:items* are transformed into regular expressions to pass into path-to-regexp.

packages/fastify-renderer/src/client/react/wouter-extension.d.ts

@@ -1,7 +1,7 @@
 import 'wouter'
 
 declare module 'wouter' {
-  export interface RouterProps {
+  export interface RouterObject {
     navigationHistory?: NavigationHistory
   }
 

packages/fastify-renderer/src/node/renderers/react/ReactRenderer.tsx

@@ -20,22 +20,6 @@ export interface ReactRendererOptions {
   mode: 'sync' | 'streaming'
 }
 
-const staticLocationHook = (path = '/', { record = false } = {}) => {
-  // eslint-disable-next-line prefer-const
-  let hook
-  const navigate = (to, { replace }: { replace?: boolean } = {}) => {
-    if (record) {
-      if (replace) {
-        hook.history.pop()
-      }
-      hook.history.push(to)
-    }
-  }
-  hook = () => [path, navigate]
-  hook.history = [path]
-  return hook
-}
-
 export class ReactRenderer implements Renderer {
   static ROUTE_TABLE_ID = '/@fstr!route-table.js'
 
@@ -99,7 +83,7 @@ export class ReactRenderer implements Renderer {
           Router,
           {
             base: render.base,
-            hook: staticLocationHook(destination),
+            ssrPath: destination,
           },
           React.createElement(
             Layout,

packages/test-apps/simple-react/package.json

@@ -13,7 +13,7 @@
     "fastify-renderer": "*",
     "react": "*",
     "react-dom": "*",
-    "wouter": "^2.7.5",
+    "wouter": "^2.12.1",
     "path-to-regexp": "^6.2.1"
   },
   "devDependencies": {