bump version to 0.42.0 and update routing logic

Author: modelorona

k8s/config/nginx-default.conf

@@ -21,7 +21,7 @@ server {
     location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
-        try_files $uri /index.html;                 
+        try_files $uri $uri/ /index.html;
     }
 
     error_page   500 502 503 504  /50x.html;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@clidey/dory",
   "private": false,
-  "version": "0.41.0",
+  "version": "0.42.0",
   "type": "module",
   "description": "A CLI tool for building and previewing documentation sites",
   "keywords": [

src/components/hooks.tsx

@@ -2,11 +2,29 @@ import { useEffect, useState } from 'preact/hooks';
 import { useLocation } from 'wouter-preact';
 
 /**
- * Custom hook to get the current pathname
+ * Strips trailing slash from a pathname (except root "/").
+ */
+function normalizePathname(pathname: string): string {
+  if (pathname !== '/' && pathname.endsWith('/')) {
+    return pathname.slice(0, -1);
+  }
+  return pathname;
+}
+
+/**
+ * Custom hook to get the current pathname, normalized to strip trailing slashes.
  */
 export const usePathname = () => {
   const [pathname] = useLocation();
-  return pathname;
+  const normalized = normalizePathname(pathname);
+
+  useEffect(() => {
+    if (pathname !== normalized) {
+      window.history.replaceState(null, '', normalized + window.location.search + window.location.hash);
+    }
+  }, [pathname, normalized]);
+
+  return normalized;
 };
 
 /**

src/mdx/mdx.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'preact/hooks';
 import { lazy, Suspense } from 'preact/compat';
-import { usePathname } from 'wouter-preact/use-browser-location';
+import { usePathname } from '../components/hooks';
 import { completeFrontMatter } from '../components/store';
 import { Loading } from '../components/loading';
 

src/ui/header.tsx

@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { useEffect, useMemo, useState } from 'preact/hooks';
 import { Link } from 'wouter-preact';
-import { usePathname } from 'wouter-preact/use-browser-location';
+import { usePathname } from '../components/hooks';
 import docsConfig from '../../docs/dory.json' with { type: 'json' };
 import type { DoryConfig } from '../types/config';
 import { MobileSearch, Search } from '../components/search';

src/ui/layout.tsx

@@ -1,8 +1,8 @@
 import type { ComponentChildren } from 'preact';
 import { useCallback, useEffect, useMemo, useState } from 'preact/hooks';
-import { useLocation } from 'wouter-preact';
 import { Navigation } from '../components/navigation';
 import { ALL_NAVIGATION, ALL_OPENAPI, completeFrontMatter, loadMDXFrontMatterForPath, loadAllMDXFrontMatter, ALL_PAGES, pathFromFilename, preloadFrontmatter, ALL_ASYNCAPI } from '../components/store';
+import { usePathname } from '../components/hooks';
 import { OpenAPI } from '../mdx/open-api';
 import { AsyncAPI } from '../mdx/async-api';
 import { Header } from './header';
@@ -26,7 +26,7 @@ const prompt = (pathname: string) => `Please read and analyze the content from t
 
 export default function Layout({ children }: LayoutProps) {
   const [loading, setLoading] = useState(true);
-  const [pathname] = useLocation();
+  const pathname = usePathname();
   const { showNotification } = useNotification();
   const isEmbedded = useIsEmbedded();