mordoc 1.5.0 → 1.5.1

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/shiva-varanasi/mordoc.git"
   },
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "A modern documentation site generator powered by Vite, React, and Markdoc.",
   "type": "module",
   "files": [

package/src/app/content/Content.tsx

@@ -5,7 +5,7 @@ import Markdoc from '@markdoc/markdoc';
 import { useMordocData } from '../data-context.js';
 import { Toc } from '../toc/Toc.js';
 import { Footer } from '../footer/Footer.js';
-import { detectCurrentLang, buildLangPrefix, stripLangPrefix, resolveLabel } from '../lang-utils.js';
+import { detectCurrentLang, buildLangPrefix, stripLangPrefix, resolveLabel, applyLangToSidenav } from '../lang-utils.js';
 import type { PageData } from '../../types/content.js';
 import type { SidenavConfig } from '../../types/navigation.js';
 import { CodeBlock } from './code-block/CodeBlock.js';
@@ -71,23 +71,6 @@ function resolveActiveSidenavRaw(
   };
 }
 
-function applyLangToSidenav(
-  items: SidenavConfig,
-  prefix: string,
-  lang: string,
-  defaultLanguage: string,
-  translations: Record<string, Record<string, string>>,
-): SidenavConfig {
-  return items.map((item) => ({
-    ...item,
-    label: resolveLabel(item.label, lang, defaultLanguage, translations),
-    path: item.path !== undefined ? `${prefix}${item.path}` : undefined,
-    children: item.children
-      ? applyLangToSidenav(item.children, prefix, lang, defaultLanguage, translations)
-      : undefined,
-  }));
-}
-
 function estimateReadTime(renderable: unknown): number {
   const text = JSON.stringify(renderable);
   const wordCount = text.split(/\s+/).length;

package/src/app/footer/Footer.tsx

@@ -12,7 +12,7 @@ export function Footer() {
           © {year} {site.name}
         </span>
         <span className={styles.built}>
-          Built with{' '}
+          Powered by{' '}
           <a
             href="https://mordoc.dev"
             target="_blank"

package/src/app/header/Header.tsx

@@ -277,7 +277,7 @@ export function Header({ sidenavOpen, onMenuToggle, onSearchOpen, showMenu = tru
               {sidenavOpen ? <CloseIcon /> : <HamburgerIcon />}
             </button>
           )}
-          <Link to="/" className={styles.logo}>
+          <Link to={buildLangPrefix(currentLang, site.defaultLanguage) || '/'} className={styles.logo}>
             {logo ? (
               <img src={logo} alt={site.name} className={styles.logoImage} />
             ) : (

package/src/app/header/SearchModal.tsx

@@ -206,7 +206,7 @@ export function SearchModal({ open, onClose }: SearchModalProps) {
 
         {isDev && (
           <div className={styles.notice}>
-            Search is only available after running <code>mordoc build</code>.
+            Build your site to enable search.
           </div>
         )}
 

package/src/app/lang-utils.ts

@@ -1,4 +1,5 @@
 import type { LanguageConfig } from '../types/language.js';
+import type { SidenavConfig } from '../types/navigation.js';
 
 /**
  * Lang utilities for the React app. Self-contained so that src/app/ has no
@@ -42,3 +43,20 @@ export function resolveLabel(
   if (lang === defaultLanguage) return defaultLabel;
   return translations[lang]?.[defaultLabel] ?? defaultLabel;
 }
+
+export function applyLangToSidenav(
+  items: SidenavConfig,
+  prefix: string,
+  lang: string,
+  defaultLanguage: string,
+  translations: Record<string, Record<string, string>>,
+): SidenavConfig {
+  return items.map((item) => ({
+    ...item,
+    label: resolveLabel(item.label, lang, defaultLanguage, translations),
+    path: item.path !== undefined ? `${prefix}${item.path}` : undefined,
+    children: item.children
+      ? applyLangToSidenav(item.children, prefix, lang, defaultLanguage, translations)
+      : undefined,
+  }));
+}

package/src/app/main.tsx

@@ -24,8 +24,7 @@ import 'virtual:mordoc/theme';
  * component reads them via `useMordocData()`. Keeping the imports
  * pinned here is what guarantees CSR/SSR symmetry: the server entry
  * doesn't need any virtual imports because its `render(request, data)`
- * receives the same `ShellData` from the dev middleware (or, later,
- * from the SSG runner).
+ * receives the same `ShellData` directly from the SSG runner at build time.
  *
  * `createBrowserRouter` is given `hydrationData` from the
  * `<script>window.__staticRouterHydrationData = ...</script>` tag that

package/src/app/routes.tsx

@@ -21,17 +21,15 @@ import { NotFound } from './not-found/NotFound.js';
  * `page-loaders` map. The map is what lets Vite statically code-split:
  * every specifier inside it is a literal `import("...")` string.
  *
- * The same loader function runs in three contexts; only the runtime
+ * The same loader function runs in two contexts; only the runtime
  * resolving the dynamic `import('virtual:mordoc/page/...')` differs:
  *   - Browser (CSR / post-hydration): native `import()` fetches the
  *     lazy chunk over HTTP (Vite-served virtual in dev, hashed JS in
  *     prod).
- *   - Dev SSR: Vite's `ssrLoadModule` resolves it through the plugin's
- *     `load` hook — the generated JS source is evaluated in Node.
- *   - SSG (later step): the bundled SSR output's module map resolves
- *     it at build time.
+ *   - SSG (build time): the bundled SSR output's module map resolves
+ *     it directly.
  * The component code (`useLoaderData()`) and the data shape (`PageData`)
- * are identical in all three; only the resolution mechanism changes.
+ * are identical in both; only the resolution mechanism changes.
  *
  * Kept as its own module so the SSR entry reuses the same route list
  * against `createStaticHandler`/`createStaticRouter` without duplicating
@@ -53,7 +51,7 @@ export function buildRoutes(): RouteObject[] {
     const common = {
       loader: async () => (await pageLoader()).default,
       Component: pageIndex.layout === 'landing' ? LandingPage : Content,
-      handle: { language: pageIndex.language, routePath: pageIndex.routePath, layout: pageIndex.layout ?? 'content' },
+      handle: { layout: pageIndex.layout ?? 'content' },
     };
     return pageIndex.routePath === '/'
       ? { index: true, ...common }

package/src/app/sidenav/Sidenav.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { NavLink, useLocation, useNavigate } from 'react-router';
 import { useMordocData } from '../data-context.js';
-import { detectCurrentLang, buildLangPrefix, stripLangPrefix, resolveLabel } from '../lang-utils.js';
+import { detectCurrentLang, buildLangPrefix, stripLangPrefix, resolveLabel, applyLangToSidenav } from '../lang-utils.js';
 import type { SidenavConfig, SidenavItem } from '../../types/navigation.js';
 import styles from './Sidenav.module.css';
 
@@ -127,23 +127,6 @@ function SidenavNode({ item, depth }: { item: SidenavItem; depth: number }) {
   );
 }
 
-function applyLangToSidenav(
-  items: SidenavConfig,
-  prefix: string,
-  lang: string,
-  defaultLanguage: string,
-  translations: Record<string, Record<string, string>>,
-): SidenavConfig {
-  return items.map((item) => ({
-    ...item,
-    label: resolveLabel(item.label, lang, defaultLanguage, translations),
-    path: item.path !== undefined ? `${prefix}${item.path}` : undefined,
-    children: item.children
-      ? applyLangToSidenav(item.children, prefix, lang, defaultLanguage, translations)
-      : undefined,
-  }));
-}
-
 function resolveActiveSidenav(
   navigation: ReturnType<typeof useMordocData>['navigation'],
   contentPath: string,

package/src/app/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />