npm - jamdesk - Versions diffs - 1.1.49 → 1.1.50 - Mend

jamdesk 1.1.49 → 1.1.50

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/dist/__tests__/unit/deps-sync.test.js +9 -5
package/dist/__tests__/unit/deps-sync.test.js.map +1 -1
package/package.json +1 -1
package/vendored/app/(unlock)/layout.tsx +43 -0
package/vendored/app/[[...slug]]/layout.tsx +119 -0
package/vendored/app/[[...slug]]/page.tsx +56 -751
package/vendored/app/layout.tsx +11 -606
package/vendored/app/not-found.tsx +27 -43
package/vendored/components/AIActionsMenu.tsx +1 -1
package/vendored/components/FontAwesomeLoader.tsx +7 -11
package/vendored/components/HtmlLangSync.tsx +1 -1
package/vendored/components/errors/NotFoundContent.tsx +5 -1
package/vendored/components/layout/LayoutWrapper.tsx +5 -21
package/vendored/components/layout/PageColumns.tsx +24 -1
package/vendored/components/navigation/Header.tsx +1 -1
package/vendored/components/navigation/LanguageSelector.tsx +2 -2
package/vendored/components/navigation/Sidebar.tsx +38 -9
package/vendored/components/navigation/TabsNav.tsx +1 -1
package/vendored/components/search/SearchModal.tsx +1 -1
package/vendored/lib/layout-helpers.tsx +464 -0
package/vendored/lib/middleware-helpers.ts +0 -78
package/vendored/lib/page-isr-helpers.ts +16 -0
package/vendored/lib/project-resolver.ts +28 -1
package/vendored/lib/r2-content.ts +8 -0
package/vendored/lib/render-doc-page.tsx +595 -0
package/vendored/lib/seo.ts +21 -0
package/vendored/workspace-package-lock.json +7 -7

package/vendored/app/not-found.tsx CHANGED Viewed

@@ -1,47 +1,31 @@
-import { headers } from 'next/headers';
-import { getDocsConfig } from '@/lib/docs';
-import { getDocsConfig as getIsrDocsConfig } from '@/lib/docs-isr';
-import { isIsrMode, getProjectFromRequest } from '@/lib/page-isr-helpers';
-import { NotFoundContent } from '@/components/errors/NotFoundContent';
-import type { DocsConfig } from '@/lib/docs-types';
+// Bare 404 for unresolved-project requests (wild hostname, deleted R2
+// project). Renders WITHOUT docs chrome — no theme, no fonts, no
+// providers — because there's no project context to read chrome from.
+// In-project 404s (real project, missing slug) are returned by
+// app/[[...slug]]/page.tsx via Next's notFound() and inherit the docs
+// layout and chrome from the catch-all segment.
 export const metadata = {
-  title: 'Page Not Found',
+  title: 'Site not found',
 };
-export default async function NotFound() {
-  // Get config - from R2 in ISR mode, from filesystem in static mode
-  let config: DocsConfig;
-  if (isIsrMode()) {
-    const headersList = await headers();
-    const projectSlug = getProjectFromRequest(headersList);
-    if (projectSlug) {
-      try {
-        config = await getIsrDocsConfig(projectSlug);
-      } catch {
-        // Project not found - use minimal fallback config
-        config = {
-          name: 'Documentation',
-          theme: 'jam',
-          colors: { primary: '#0ea5e9' },
-          navigation: { groups: [] },
-        };
-      }
-    } else {
-      // No project slug - use minimal fallback
-      config = {
-        name: 'Documentation',
-        theme: 'jam',
-        colors: { primary: '#0ea5e9' },
-        navigation: { groups: [] },
-      };
-    }
-  } else {
-    config = getDocsConfig();
-  }
-  // Note: LayoutWrapper is already provided by the root layout (layout.tsx)
-  // so we only render the content here
-  return <NotFoundContent config={config} />;
+export default function RootNotFound() {
+  return (
+    <html lang="en">
+      <body
+        style={{
+          margin: 0,
+          fontFamily: 'system-ui, -apple-system, BlinkMacSystemFont, sans-serif',
+          padding: '4rem 2rem',
+          maxWidth: '40rem',
+          marginInline: 'auto',
+          color: '#111',
+        }}
+      >
+        <h1 style={{ fontSize: '2rem', fontWeight: 600 }}>Site not found</h1>
+        <p style={{ marginTop: '1rem', color: '#666' }}>
+          This Jamdesk project does not exist or has been removed.
+        </p>
+      </body>
+    </html>
+  );
 }

package/vendored/components/AIActionsMenu.tsx CHANGED Viewed

@@ -298,7 +298,7 @@ export function AIActionsMenu({ options, projectName }: AIActionsMenuProps) {
   const menuRef = useRef<HTMLDivElement>(null);
   const triggerRef = useRef<HTMLButtonElement>(null);
   const itemsRef = useRef<(HTMLButtonElement | HTMLAnchorElement | null)[]>([]);
-  const pathname = usePathname();
+  const pathname = usePathname() ?? '';
   const linkPrefix = useLinkPrefix();
   // Compute URLs client-side to survive SPA navigation

package/vendored/components/FontAwesomeLoader.tsx CHANGED Viewed

@@ -8,20 +8,15 @@ export { FA_CSS_HREF };
 /**
  * Ensures Font Awesome CSS is loaded in the document head.
  *
- * On normal pages, the inline script in layout.tsx's <head> loads the
- * stylesheet during initial HTML parsing. But on 404 pages, Next.js renders
- * a minimal error shell (<html id="__next_error__">) that omits the root
- * layout's <head> content. The RSC payload later adds the script tag via
- * React hydration, but inline scripts injected by React after initial load
- * don't execute. This component acts as a fallback, injecting the stylesheet
- * link via useEffect so icons render on 404 pages too.
+ * On normal pages, layout-helpers calls preinit(FA_CSS_HREF, { as: 'style' })
+ * and React 19 hoists the <link rel="stylesheet"> into <head> at SSR time. But
+ * on 404 pages Next.js renders a minimal error shell (<html id="__next_error__">)
+ * that omits the root layout's <head> content. This component runs in
+ * useEffect as a client-side fallback so icons still render on 404 pages.
  */
 export function FontAwesomeLoader() {
   useEffect(() => {
-    // Inline script in <head> sets this flag — skip DOM query on normal pages
-    if ((window as Window & { __FA_CSS_LOADED__?: boolean }).__FA_CSS_LOADED__) return;
-    // 404 error shell path: check if stylesheet exists (handles browser-normalized absolute URLs)
+    // querySelector handles browser-normalized absolute href values.
     const existing = document.querySelector(
       `link[rel="stylesheet"][href$="${FA_CSS_HREF}"]`
     );
@@ -31,6 +26,7 @@ export function FontAwesomeLoader() {
     link.rel = 'stylesheet';
     link.href = FA_CSS_HREF;
     document.head.appendChild(link);
+    return () => link.remove();
   }, []);
   return null;

package/vendored/components/HtmlLangSync.tsx CHANGED Viewed

@@ -20,7 +20,7 @@ interface HtmlLangSyncProps {
  * `lang` pointing at the previous language until a hard refresh.
  */
 export function HtmlLangSync({ defaultLanguage }: HtmlLangSyncProps) {
-  const pathname = usePathname();
+  const pathname = usePathname() ?? '';
   useEffect(() => {
     const lang = extractLanguageFromPath(pathname || '/') ?? defaultLanguage;

package/vendored/components/errors/NotFoundContent.tsx CHANGED Viewed

@@ -81,7 +81,11 @@ export function NotFoundContent({ config }: NotFoundContentProps) {
       }
     }
-    return `${linkPrefix}/index`;
+    // No matched page — go to the project home (`/docs` for hostAtDocs,
+    // `/` otherwise). FALLBACK_CONFIG with empty groups hits this branch
+    // and previously produced `/index` (404 on click) or `/docs/index`
+    // (also 404). The bare prefix is the reachable project root.
+    return linkPrefix || '/';
   };
   return (

package/vendored/components/layout/LayoutWrapper.tsx CHANGED Viewed

@@ -47,27 +47,11 @@ export function LayoutWrapper({ config, children }: LayoutWrapperProps) {
   // Handle hash navigation for three-column independent scroll layout
   useHashNavigation();
-  // Toggle 'scrolled' class on body when user scrolls past 500px
-  // Used by Jam theme to hide gradient and make header solid
-  // The gradient extends 500px from top, so we hide it after scrolling past that point
-  useEffect(() => {
-    const contentScroll = document.getElementById('content-scroll-container');
-    const scrollTarget = contentScroll || window;
-    const handleScroll = () => {
-      const scrollY = contentScroll ? contentScroll.scrollTop : window.scrollY;
-      if (scrollY > 500) {
-        document.body.classList.add('scrolled');
-      } else {
-        document.body.classList.remove('scrolled');
-      }
-    };
-    scrollTarget.addEventListener('scroll', handleScroll, { passive: true });
-    handleScroll(); // Check initial position
-    return () => scrollTarget.removeEventListener('scroll', handleScroll);
-  }, []);
+  // The body.scrolled toggle used to live here, but #content-scroll-container
+  // is rendered by PageColumns (in page.tsx) and remounts on every navigation.
+  // The listener attached once at LayoutWrapper mount referenced a detached
+  // node after the first nav, so .scrolled never updated again. The effect
+  // now lives in PageColumns so it re-binds on each container instance.
   // Get theme config to determine layout
   const themeConfig = getTheme(config.theme as ThemeName | undefined);

package/vendored/components/layout/PageColumns.tsx CHANGED Viewed

@@ -1,6 +1,6 @@
 'use client';
-import { type ReactNode } from 'react';
+import { useEffect, useRef, type ReactNode } from 'react';
 import { useChatPanel } from '@/hooks/useChatPanel';
 interface PageColumnsProps {
@@ -16,11 +16,34 @@ interface PageColumnsProps {
  */
 export function PageColumns({ children, toc, isWideMode }: PageColumnsProps) {
   const { isChatOpen } = useChatPanel();
+  const scrollRef = useRef<HTMLDivElement>(null);
+  // Toggle body.scrolled when the user scrolls past 500px in the content
+  // column. Lives here (not in LayoutWrapper) because the scroll container is
+  // rendered by this component and is replaced on every page navigation —
+  // attaching the listener at the layout level left it bound to a detached
+  // node after the first nav. Used by the Jam theme to hide the top gradient
+  // and make the header solid (themes/jam/variables.css).
+  useEffect(() => {
+    const contentScroll = scrollRef.current;
+    const scrollTarget: HTMLElement | Window = contentScroll ?? window;
+    const handleScroll = () => {
+      const scrollY = contentScroll ? contentScroll.scrollTop : window.scrollY;
+      document.body.classList.toggle('scrolled', scrollY > 500);
+    };
+    scrollTarget.addEventListener('scroll', handleScroll, { passive: true });
+    handleScroll();
+    return () => scrollTarget.removeEventListener('scroll', handleScroll);
+  }, []);
   return (
     <div className="flex h-full">
       {/* Content column - scrolls independently */}
       <div
+        ref={scrollRef}
         id="content-scroll-container"
         className="flex-1 min-w-0 lg:overflow-y-auto lg:h-full content-scroll"
       >

package/vendored/components/navigation/Header.tsx CHANGED Viewed

@@ -44,7 +44,7 @@ export function Header({ config, layout = 'header-logo', tabsPosition: tabsPosit
   const [isDark, setIsDark] = useState(false);
   const [isTabsDropdownOpen, setIsTabsDropdownOpen] = useState(false);
   const tabsDropdownRef = useRef<HTMLDivElement>(null);
-  const pathname = usePathname();
+  const pathname = usePathname() ?? '';
   const linkPrefix = useLinkPrefix();
   const currentLang = extractLanguageFromPath(pathname || '/');
   const ui = getUiStrings(currentLang);

package/vendored/components/navigation/LanguageSelector.tsx CHANGED Viewed

@@ -2,7 +2,7 @@
 import { useState, useEffect, useRef, useCallback } from 'react';
 import { useOnClickOutside } from '@/hooks/useOnClickOutside';
-import { useRouter, usePathname } from 'next/navigation';
+import { usePathname, useRouter } from 'next/navigation';
 import type { ResolvedLanguage } from '@/lib/navigation-resolver';
 import type { LanguageCode } from '@/lib/docs-types';
 import {
@@ -33,7 +33,7 @@ export function LanguageSelector({
 }: LanguageSelectorProps) {
   const router = useRouter();
   const linkPrefix = useLinkPrefix();
-  const pathname = usePathname();
+  const pathname = usePathname() ?? '';
   const ui = getUiStrings(extractLanguageFromPath(pathname || '/'));
   const [isOpen, setIsOpen] = useState(false);
   const [focusedIndex, setFocusedIndex] = useState(-1);

package/vendored/components/navigation/Sidebar.tsx CHANGED Viewed

@@ -134,7 +134,7 @@ function findGroupsContainingPath(groups: ResolvedGroup[], currentPath: string,
 }
 export function Sidebar({ config, layout = 'header-logo', tabsPosition: tabsPositionProp, isOpen = false, onClose }: SidebarProps) {
-  const pathname = usePathname();
+  const pathname = usePathname() ?? '';
   const router = useRouter();
   const [expandedGroups, setExpandedGroups] = useState<Set<string>>(new Set());
   const [logoError, setLogoError] = useState(false);
@@ -149,9 +149,19 @@ export function Sidebar({ config, layout = 'header-logo', tabsPosition: tabsPosi
   // Two-stage feedback for nav clicks:
   //   pendingPathname → optimistic active highlight (instant)
   //   spinnerPathname → small spinner on the row (after 500ms, only if nav is slow)
-  const { pendingPathname, spinnerPathname, onNavigate: handleNavigate } =
+  const { pendingPathname, spinnerPathname, onNavigate: rawNavigate } =
     useDelayedNavigationSpinner(pathname);
+  // Suppresses the auto-scroll-to-active-link effect for user-initiated nav.
+  // The user just clicked a link they could see — moving it under their cursor
+  // is jarring (see the navigation shift recordings from 2026-04-29). We still
+  // auto-scroll for back/forward, deep links, and initial mount.
+  const userInitiatedNavRef = useRef(false);
+  const handleNavigate = useCallback((url: string) => {
+    userInitiatedNavRef.current = true;
+    rawNavigate(url);
+  }, [rawNavigate]);
   const effectivePathname = pendingPathname || pathname;
   // Determine effective tabsPosition:
@@ -253,9 +263,22 @@ export function Sidebar({ config, layout = 'header-logo', tabsPosition: tabsPosi
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [pathname]); // Intentionally excluding onClose - we only want to trigger on pathname changes
-  // Scroll the active navigation link into view when pathname changes
+  // Scroll the active navigation link into view when pathname changes.
+  //
+  // Skipped for user-initiated nav: the user just clicked a sidebar link they
+  // could see, so moving it under their cursor is a jarring shift. For
+  // back/forward, deep links, and initial mount we still auto-scroll, but only
+  // when the active link is meaningfully off-screen (<80% visible) — being
+  // partially clipped by 1px shouldn't trigger a centering jump.
+  //
+  // Uses scrollTop math instead of scrollIntoView() so it only moves the
+  // sidebar's own scroll container; scrollIntoView walks all scrollable
+  // ancestors and was also tugging the document.
   useEffect(() => {
-    // Double RAF ensures DOM is painted before measuring
+    if (userInitiatedNavRef.current) {
+      userInitiatedNavRef.current = false;
+      return;
+    }
     let rafId = requestAnimationFrame(() => {
       rafId = requestAnimationFrame(() => {
         const scrollContainer = sidebarRef.current?.querySelector('.sidebar-scroll');
@@ -264,11 +287,17 @@ export function Sidebar({ config, layout = 'header-logo', tabsPosition: tabsPosi
         const containerRect = scrollContainer.getBoundingClientRect();
         const linkRect = activeLink.getBoundingClientRect();
-        const isVisible = linkRect.top >= containerRect.top && linkRect.bottom <= containerRect.bottom;
-        if (!isVisible) {
-          activeLink.scrollIntoView({ block: 'center', behavior: 'instant' });
-        }
+        const linkHeight = linkRect.bottom - linkRect.top;
+        const visibleTop = Math.max(linkRect.top, containerRect.top);
+        const visibleBottom = Math.min(linkRect.bottom, containerRect.bottom);
+        const visibleHeight = Math.max(0, visibleBottom - visibleTop);
+        const visibleFraction = linkHeight > 0 ? visibleHeight / linkHeight : 1;
+        if (visibleFraction >= 0.8) return;
+        const desiredCenter = containerRect.top + containerRect.height / 2;
+        const linkCenter = linkRect.top + linkHeight / 2;
+        const delta = linkCenter - desiredCenter;
+        (scrollContainer as HTMLElement).scrollTop += delta;
       });
     });

package/vendored/components/navigation/TabsNav.tsx CHANGED Viewed

@@ -17,7 +17,7 @@ interface TabsNavProps {
 }
 export function TabsNav({ config, className = '' }: TabsNavProps) {
-  const pathname = usePathname();
+  const pathname = usePathname() ?? '';
   const linkPrefix = useLinkPrefix();
   // Determine effective tabsPosition

package/vendored/components/search/SearchModal.tsx CHANGED Viewed

@@ -1,7 +1,7 @@
 'use client';
 import { useEffect, useState, useRef, type ReactElement } from 'react';
-import { useRouter, usePathname } from 'next/navigation';
+import { usePathname, useRouter } from 'next/navigation';
 import { getRecentSearches, addRecentSearch, clearRecentSearches } from '@/lib/recent-searches';
 import { useFocusTrap } from '@/hooks/useFocusTrap';
 import { useBodyScrollLock } from '@/hooks/useBodyScrollLock';