jamdesk 1.1.38 → 1.1.40

package/vendored/app/layout.tsx

@@ -1,6 +1,7 @@
 import type { Metadata } from 'next';
 import { Inter, JetBrains_Mono } from 'next/font/google';
 import { headers } from 'next/headers';
+import Script from 'next/script';
 import './globals.css';
 import { ThemeProvider } from '@/components/theme/ThemeProvider';
 import { LayoutWrapper } from '@/components/layout/LayoutWrapper';
@@ -411,10 +412,9 @@ export default async function RootLayout({
         {/* Preload FA font files to avoid waterfall: CSS → font discovery → download */}
         <link rel="preload" href="/_jd/fonts/fontawesome/webfonts/fa-light-300.woff2" as="font" type="font/woff2" crossOrigin="anonymous" />
         <link rel="preload" href="/_jd/fonts/fontawesome/webfonts/fa-brands-400.woff2" as="font" type="font/woff2" crossOrigin="anonymous" />
-        <script
-          // eslint-disable-next-line react/no-danger -- static trusted content, no user input
-          dangerouslySetInnerHTML={{ __html: `var l=document.createElement('link');l.rel='stylesheet';l.href='${FA_CSS_HREF}';document.head.appendChild(l);window.__FA_CSS_LOADED__=true;` }}
-        />
+        <Script id="fa-css-async-loader" strategy="beforeInteractive">
+          {`var l=document.createElement('link');l.rel='stylesheet';l.href='${FA_CSS_HREF}';document.head.appendChild(l);window.__FA_CSS_LOADED__=true;`}
+        </Script>
         <noscript>
           <link rel="stylesheet" href={FA_CSS_HREF} />
         </noscript>

package/vendored/components/navigation/Sidebar.tsx

@@ -278,20 +278,25 @@ export function Sidebar({ config, layout = 'header-logo', tabsPosition: tabsPosi
   // Prevent body scroll when sidebar is open on mobile
   useBodyScrollLock(isOpen);
 
-  // Toggle group expansion; if expanding, navigate to first page
+  // Toggle group expansion; if expanding, navigate to first page.
+  // The router.push must run AFTER the setState commits — calling it inside the
+  // updater triggers "Cannot update a component (Router) while rendering Sidebar".
   const handleGroupClick = useCallback((group: ResolvedGroup) => {
+    const willExpand = !expandedGroups.has(group.name);
     setExpandedGroups(prev => {
       const newSet = new Set(prev);
       if (prev.has(group.name)) {
         newSet.delete(group.name);
       } else {
-        const firstPagePath = findFirstPageInGroups([group]);
-        if (firstPagePath) router.push(`${linkPrefix}/${firstPagePath}`);
         newSet.add(group.name);
       }
       return newSet;
     });
-  }, [router, linkPrefix]);
+    if (willExpand) {
+      const firstPagePath = findFirstPageInGroups([group]);
+      if (firstPagePath) router.push(`${linkPrefix}/${firstPagePath}`);
+    }
+  }, [router, linkPrefix, expandedGroups]);
 
   // Render a navigation group (supports nesting)
   function renderGroup(group: ResolvedGroup, level: number = 0) {

package/vendored/components/search/SearchModal.tsx

@@ -74,7 +74,7 @@ function NoResultsState({ query, onSuggestionClick }: { query: string; onSuggest
               <button
                 key={suggestion}
                 onClick={() => onSuggestionClick(suggestion)}
-                className="px-2.5 py-1 text-xs bg-[var(--color-bg-secondary)] hover:bg-[var(--color-bg-tertiary)] text-[var(--color-text-primary)] rounded-full transition-colors focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--color-accent)]"
+                className="px-2.5 py-1 text-xs cursor-pointer bg-[var(--color-bg-secondary)] hover:bg-[var(--color-bg-tertiary)] text-[var(--color-text-primary)] rounded-full transition-colors focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--color-accent)]"
               >
                 {suggestion}
               </button>
@@ -410,7 +410,7 @@ export function SearchModal({ isOpen, onClose, popularPages, onNavigate }: Searc
             />
             <button
               onClick={onClose}
-              className="p-1.5 hover:bg-[var(--color-bg-tertiary)] rounded-lg transition-colors focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--color-accent)]"
+              className="p-1.5 cursor-pointer hover:bg-[var(--color-bg-tertiary)] rounded-lg transition-colors focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--color-accent)]"
               aria-label="Close search"
             >
               <i className="fa-solid fa-xmark h-4 w-4 text-[var(--color-text-muted)]" aria-hidden="true" />
@@ -448,7 +448,7 @@ export function SearchModal({ isOpen, onClose, popularPages, onNavigate }: Searc
                     onClick={() => handleResultClick(result, index)}
                     role="option"
                     aria-selected={index === selectedIndex}
-                    className={`w-full px-4 py-2.5 flex items-start gap-3 transition-colors outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)] focus-visible:ring-inset ${
+                    className={`w-full px-4 py-2.5 flex items-start gap-3 cursor-pointer transition-colors outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)] focus-visible:ring-inset ${
                       index === selectedIndex
                         ? 'bg-[var(--color-bg-secondary)]'
                         : 'hover:bg-[var(--color-bg-secondary)]'
@@ -490,7 +490,7 @@ export function SearchModal({ isOpen, onClose, popularPages, onNavigate }: Searc
                   </span>
                   <button
                     onClick={handleClearRecentSearches}
-                    className="text-xs text-[var(--color-text-muted)] hover:text-[var(--color-text-primary)] transition-colors focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--color-accent)]"
+                    className="text-xs cursor-pointer text-[var(--color-text-muted)] hover:text-[var(--color-text-primary)] transition-colors focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--color-accent)]"
                   >
                     Clear
                   </button>
@@ -499,7 +499,7 @@ export function SearchModal({ isOpen, onClose, popularPages, onNavigate }: Searc
                   <button
                     key={term}
                     onClick={() => handleRecentSearchClick(term)}
-                    className="w-full px-4 py-2 flex items-center gap-3 hover:bg-[var(--color-bg-secondary)] transition-colors group focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--color-accent)]"
+                    className="w-full px-4 py-2 flex items-center gap-3 cursor-pointer hover:bg-[var(--color-bg-secondary)] transition-colors group focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--color-accent)]"
                   >
                     {/* Keyboard shortcut badge */}
                     <kbd className="w-4 h-4 flex items-center justify-center bg-[var(--color-bg-tertiary)] border border-[var(--color-border)] rounded text-[9px] font-medium text-[var(--color-text-muted)] group-hover:border-[var(--color-accent)] transition-colors">
@@ -532,7 +532,7 @@ export function SearchModal({ isOpen, onClose, popularPages, onNavigate }: Searc
                             router.push(url);
                             onClose();
                           }}
-                          className={`w-full px-4 py-2.5 flex items-center gap-3 transition-colors outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)] focus-visible:ring-inset ${
+                          className={`w-full px-4 py-2.5 flex items-center gap-3 cursor-pointer transition-colors outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)] focus-visible:ring-inset ${
                             index === popularIndex
                               ? 'bg-[var(--color-bg-secondary)]'
                               : 'hover:bg-[var(--color-bg-secondary)]'

package/vendored/lib/language-utils.ts

@@ -15,6 +15,12 @@ import LANGUAGE_CODES_JSON from './language-codes.json';
  */
 export const LANGUAGE_CODES = LANGUAGE_CODES_JSON as readonly LanguageCode[];
 
+/** BCP-47 syntax check (2-3 letter primary tag + optional 2-4 letter
+ *  region/script). Shared by the chat and docs-search REST endpoints to
+ *  keep their request-validation contracts identical. Limitation:
+ *  3-segment tags like `zh-Hant-HK` are rejected. */
+export const BCP47_LANGUAGE_RE = /^[a-zA-Z]{2,3}(?:[-_][a-zA-Z]{2,4})?$/;
+
 /**
  * Display names for each supported language code
  * Uses native language names where appropriate

package/vendored/lib/search-client.ts

@@ -1,6 +1,12 @@
 // Client-side search with Orama (BM25 ranking)
 import { create, insertMultiple, search as oramaSearch, type Orama } from '@orama/orama';
-import { resolveLocaleWithLoweredSet } from './language-utils';
+import { LANGUAGE_CODES, resolveLocaleWithLoweredSet } from './language-utils';
+
+// Lowercased canonical language codes — used to detect slug-prefix locales when
+// the search-data.json predates the locale field (legacy fallback).
+const KNOWN_LANGUAGE_CODES_LOWERED: ReadonlySet<string> = new Set(
+  LANGUAGE_CODES.map((c) => c.toLowerCase()),
+);
 
 export interface SearchResult {
   id: string;
@@ -38,16 +44,17 @@ let lastEtag = '';
 let lastParsedData: SearchResult[] | null = null;
 
 /**
- * Non-empty locale values present in the currently-committed index.
- * Empty Set means either (a) the index has zero translated docs (single-
- * language project) or (b) the index is a legacy build that predates the
- * locale field. In either case the language filter is a no-op.
+ * Locales the URL-resolver treats as real translations for the current
+ * project. Populated from the index's `locale` field when present, falling
+ * back to slug-prefix derivation for legacy (pre-feature) search-data.json
+ * so French pages don't leak English results while customers rebuild.
  *
- * `projectLocalesLowered` mirrors the same set lowercased — kept around so
- * `resolveActiveLocale` doesn't re-lowercase per keystroke.
+ * `indexHasLocaleField` is the separate gate that controls whether the Orama
+ * `where` clause is used — set only when the new index format is detected.
+ * Slug-prefix fallback runs in `search()` whenever the where clause is off.
  */
-let projectLocales: Set<string> = new Set();
 let projectLocalesLowered: ReadonlySet<string> = new Set();
+let indexHasLocaleField = false;
 
 /**
  * Cheap fingerprint: count + first/last IDs + a sample of content lengths.
@@ -80,13 +87,26 @@ async function buildIndex(data: SearchResult[], etag: string): Promise<void> {
     },
   });
 
-  // Detect a legacy (pre-feature) index by inspecting the RAW input — once the
-  // ?? '' fallback runs in the map below, we can't tell "doc had locale=''" from
-  // "doc was missing the locale field entirely".
+  // Distinguish new-format docs (have a `locale` field, possibly '') from
+  // legacy ones (field missing entirely). Once the `?? ''` fallback runs in
+  // the map below the two are indistinguishable, so check the raw input first.
+  // A single doc with the field is enough — the build script always emits the
+  // field for every doc when it emits any.
+  indexHasLocaleField = data.some(
+    (d) => typeof (d as { locale?: unknown }).locale === 'string',
+  );
+
   const seenLocales = new Set<string>();
+  const slugPrefixLocales = new Set<string>();
   const normalizedData = data.map(item => {
     const raw = item.locale;
     if (typeof raw === 'string' && raw.length > 0) seenLocales.add(raw);
+    // Track first-segment slug prefixes that match a known language code,
+    // used as the URL-to-locale whitelist when the index lacks the field.
+    const firstSeg = item.slug.split('/', 1)[0]?.toLowerCase();
+    if (firstSeg && KNOWN_LANGUAGE_CODES_LOWERED.has(firstSeg)) {
+      slugPrefixLocales.add(firstSeg);
+    }
     return {
       id: item.id,
       title: item.title,
@@ -101,8 +121,13 @@ async function buildIndex(data: SearchResult[], etag: string): Promise<void> {
 
   await insertMultiple(db, normalizedData);
 
-  projectLocales = seenLocales;
-  projectLocalesLowered = new Set(Array.from(seenLocales, (l) => l.toLowerCase()));
+  // Trust the index's own locale set when present (handles the dodo case
+  // where `de/` is a directory, not a translation — `seenLocales` won't
+  // include `de`). Fall back to slug-prefix derivation for legacy indexes so
+  // the URL still maps to a sensible locale during the rebuild window.
+  projectLocalesLowered = indexHasLocaleField
+    ? new Set(Array.from(seenLocales, (l) => l.toLowerCase()))
+    : slugPrefixLocales;
 
   committedFingerprint = buildingFingerprint;
   lastParsedData = data;
@@ -148,15 +173,15 @@ export async function search(
     return [];
   }
 
-  // Legacy-index safety: if the committed index has zero translated docs
-  // (single-language project OR pre-feature search-data.json), skip the where
-  // clause so un-rebuilt R2 files behave identically to before this feature.
-  const useFilter = projectLocales.size > 0;
   const targetLocale = language ?? '';
 
+  // Fetch extra when post-filtering by slug prefix so we can still reach
+  // `limit` after dropping cross-locale hits.
+  const fetchLimit = indexHasLocaleField ? limit : Math.min(limit * 5, 50);
+
   const results = await oramaSearch(db, {
     term: query,
-    limit,
+    limit: fetchLimit,
     tolerance: 1, // Allow 1 typo for fuzzy matching
     boost: {
       title: 2,
@@ -164,10 +189,32 @@ export async function search(
       description: 1,
       content: 0.5,
     },
-    ...(useFilter ? { where: { locale: { eq: targetLocale } } } : {}),
+    ...(indexHasLocaleField ? { where: { locale: { eq: targetLocale } } } : {}),
   });
 
-  return results.hits.map(hit => hit.document as unknown as SearchResult);
+  const docs = results.hits.map(hit => hit.document as unknown as SearchResult);
+
+  // Slug-prefix fallback for un-rebuilt indexes: the index has no locale
+  // field, so the where clause was skipped above. Filter by slug prefix
+  // instead so French pages don't see English results during the rebuild
+  // window. Inverted on default-language pages: drop slugs whose prefix
+  // matches any known project locale.
+  if (!indexHasLocaleField) {
+    if (targetLocale) {
+      const prefix = `${targetLocale}/`;
+      return docs.filter(d => d.slug.startsWith(prefix)).slice(0, limit);
+    }
+    if (projectLocalesLowered.size > 0) {
+      return docs
+        .filter(d => {
+          const firstSeg = d.slug.split('/', 1)[0]?.toLowerCase();
+          return !firstSeg || !projectLocalesLowered.has(firstSeg);
+        })
+        .slice(0, limit);
+    }
+  }
+
+  return docs.slice(0, limit);
 }
 
 /** @internal Used by tests only */
@@ -177,12 +224,13 @@ export function isInitialized(): boolean {
 
 /**
  * Resolve the locale that the search filter should target for a given pathname,
- * gated by the locales actually present in the currently-committed index.
+ * gated by the locales actually present in the currently-committed index
+ * (or, in legacy mode, by slug-prefix derivation).
  *
  * Returns:
- *   - `''` when there is no committed index yet, OR no translations exist, OR
- *     the pathname's prefix is not a translated locale.
- *   - The canonical language code when the prefix matches an indexed locale.
+ *   - `''` when there is no committed index yet, OR the pathname has no
+ *     language prefix, OR the prefix is not a known project locale.
+ *   - The canonical language code when the prefix matches.
  *
  * Caller (SearchModal) should pass the result to `search()`. Empty string and
  * undefined are equivalent — both target the default-language doc set.

package/vendored/lib/static-file-route.ts

@@ -6,6 +6,9 @@
  * duplication across 12 route files (6 at root + 6 at /docs).
  */
 
+import fs from 'fs';
+import path from 'path';
+
 import { NextRequest, NextResponse } from 'next/server';
 
 import { log } from '@/lib/logger';
@@ -55,6 +58,16 @@ export function createStaticFileHandler(
 
   return async function GET(request: NextRequest): Promise<NextResponse> {
     if (!isIsrMode()) {
+      // Dev fallback: `dev-project.cjs` writes static artifacts (search-data.json,
+      // sitemap.xml, ...) into `public/`. Next.js prefers route handlers over
+      // public/ files when both exist, so without this branch the dev server
+      // 404s on these paths and breaks the SearchModal init.
+      const localPath = path.join(process.cwd(), 'public', filename);
+      if (fs.existsSync(localPath)) {
+        return new NextResponse(fs.readFileSync(localPath), {
+          headers: { 'Content-Type': contentType, 'Cache-Control': 'no-cache' },
+        });
+      }
       return new NextResponse('Not found', { status: 404 });
     }
 

package/vendored/scripts/build-search-index.cjs

@@ -310,32 +310,40 @@ async function buildSearchIndex() {
   async function processFile({ filePath, slug }) {
     await semaphore.acquire();
     try {
-      const fileContents = await fsPromises.readFile(filePath, 'utf8');
-      const { data, content } = parseFrontmatterLenient(fileContents);
-      // Filter for="agents" content out of the search index.
-      const visibleContent = filterVisibility(content, 'humans');
-      const sections = extractSections(visibleContent);
-
-      const docs = [];
-      const normalizedSlug = slug.replace(/\\/g, '/');
-      const pageType = inferPageType(normalizedSlug);
-      const locale = resolveLocaleFromPath(normalizedSlug, projectLanguages);
-      sections.forEach((section, idx) => {
-        const cleanContent = stripMarkdown(section.content);
-        if (cleanContent.trim()) {
-          docs.push({
-            id: `${slug}-${idx}`,
-            title: data.title || slug.split('/').pop() || '',
-            description: data.description,
-            content: cleanContent.substring(0, 300),
-            slug: normalizedSlug,
-            section: section.heading || undefined,
-            type: pageType,
-            locale,
-          });
-        }
-      });
-      return docs;
+      try {
+        const fileContents = await fsPromises.readFile(filePath, 'utf8');
+        const { data, content } = parseFrontmatterLenient(fileContents);
+        // Filter for="agents" content out of the search index.
+        const visibleContent = filterVisibility(content, 'humans');
+        const sections = extractSections(visibleContent);
+
+        const docs = [];
+        const normalizedSlug = slug.replace(/\\/g, '/');
+        const pageType = inferPageType(normalizedSlug);
+        const locale = resolveLocaleFromPath(normalizedSlug, projectLanguages);
+        sections.forEach((section, idx) => {
+          const cleanContent = stripMarkdown(section.content);
+          if (cleanContent.trim()) {
+            docs.push({
+              id: `${slug}-${idx}`,
+              title: data.title || slug.split('/').pop() || '',
+              description: data.description,
+              content: cleanContent.substring(0, 300),
+              slug: normalizedSlug,
+              section: section.heading || undefined,
+              type: pageType,
+              locale,
+            });
+          }
+        });
+        return docs;
+      } catch (err) {
+        // One malformed MDX file (bad YAML, etc.) used to abort the entire index
+        // build — leaving the project searchless. Skip the file with a warning
+        // so the rest of the docs remain searchable.
+        console.warn(`⚠ Skipping ${filePath} in search index: ${err.message}`);
+        return [];
+      }
     } finally {
       semaphore.release();
     }