@brillout/docpress 0.6.21-commit-74553e7 → 0.6.21-commit-f22016e

package/+config.ts

@@ -12,7 +12,7 @@ export default {
   passToClient: ['pageContextResolved'],
   meta: {
     NavHeader: {
-      env: { client: true, server: true }
+      env: { client: true, server: true },
     },
   },
 } satisfies Config

package/dist/+config.js

@@ -9,7 +9,7 @@ export default {
     passToClient: ['pageContextResolved'],
     meta: {
         NavHeader: {
-            env: { client: true, server: true }
+            env: { client: true, server: true },
         },
     },
 };

package/dist/navigation/Navigation.js

@@ -22,11 +22,12 @@ function Navigation(_a) {
     return (React.createElement(React.Fragment, null,
         React.createElement("div", { id: "navigation-container" },
             React.createElement(NavigationHeader, null),
-            isDetachedPage && (React.createElement(React.Fragment, null,
-                navItems.length > 1 && (React.createElement(NavigationContent, { id: "navigation-content-detached", navItems: navItems, currentUrl: currentUrl })),
-                React.createElement(DetachedPageNote, null))),
-            React.createElement(NavigationContent, { id: "navigation-content-main", navItems: navItemsAll, currentUrl: currentUrl }),
-            React.createElement(NavigationFullscreenClose, null))));
+            React.createElement("div", { id: "navigation-body" },
+                isDetachedPage && (React.createElement(React.Fragment, null,
+                    navItems.length > 1 && (React.createElement(NavigationContent, { id: "navigation-content-detached", navItems: navItems, currentUrl: currentUrl })),
+                    React.createElement(DetachedPageNote, null))),
+                React.createElement(NavigationContent, { id: "navigation-content-main", navItems: navItemsAll, currentUrl: currentUrl }),
+                React.createElement(NavigationFullscreenClose, null)))));
 }
 function NavigationMask() {
     return React.createElement("div", { id: "mobile-navigation-mask" });

package/dist/vite.config.js

@@ -5,7 +5,6 @@ import { parsePageSections } from './parsePageSections.js';
 import rehypePrettyCode from 'rehype-pretty-code';
 import remarkGfm from 'remark-gfm';
 import { transformerNotationDiff } from '@shikijs/transformers';
-import { cjsInterop } from 'vite-plugin-cjs-interop';
 var root = process.cwd();
 var prettyCode = [rehypePrettyCode, { theme: 'github-light', transformers: [transformerNotationDiff()] }];
 var rehypePlugins = [prettyCode];
@@ -23,15 +22,13 @@ var config = {
             },
             includeAssetsImportedByServer: true,
         }),
-        cjsInterop({
-            dependencies: ['@docsearch/react'],
-        }),
     ],
     optimizeDeps: {
-        include: ['react-dom/client', '@docsearch/react'],
+        include: ['react', 'react-dom', 'react-dom/client', '@docsearch/react', 'vike-contributors'],
+        exclude: ['@brillout/docpress'],
     },
     ssr: {
-        noExternal: ['@brillout/docpress'],
+        noExternal: ['@brillout/docpress', '@docsearch/react'],
     },
     clearScreen: false,
 };

package/installSectionUrlHashs.ts

@@ -26,7 +26,7 @@ function installSectionUrlHashs() {
 }
 
 function assertNavLink(urlHash: string, heading: HTMLHeadingElement) {
-  const navigationEl = getNavigationEl()
+  const navigationEl = document.querySelector('#navigation-body')!
   {
     const { pathname } = window.location
     const parentNavLinkMatch = Array.from(navigationEl.querySelectorAll(`a[href="${pathname}"]`))
@@ -53,10 +53,3 @@ function jumpToSection() {
   }
   target.scrollIntoView()
 }
-
-function getNavigationEl() {
-  const elems: HTMLElement[] = Array.from(document.querySelectorAll('#navigation-container'))
-  assert(elems.length === 1)
-  const navigationEl = elems[0]!
-  return navigationEl
-}

package/navigation/Navigation.tsx

@@ -27,17 +27,19 @@ function Navigation({
     <>
       <div id="navigation-container">
         <NavigationHeader />
-        {isDetachedPage && (
-          <>
-            {navItems.length > 1 && (
-              <NavigationContent id="navigation-content-detached" navItems={navItems} currentUrl={currentUrl} />
-            )}
-            <DetachedPageNote />
-          </>
-        )}
-        <NavigationContent id="navigation-content-main" navItems={navItemsAll} currentUrl={currentUrl} />
-        {/* <ScrollOverlay /> */}
-        <NavigationFullscreenClose />
+        <div id="navigation-body">
+          {isDetachedPage && (
+            <>
+              {navItems.length > 1 && (
+                <NavigationContent id="navigation-content-detached" navItems={navItems} currentUrl={currentUrl} />
+              )}
+              <DetachedPageNote />
+            </>
+          )}
+          <NavigationContent id="navigation-content-main" navItems={navItemsAll} currentUrl={currentUrl} />
+          {/* <ScrollOverlay /> */}
+          <NavigationFullscreenClose />
+        </div>
       </div>
     </>
   )

package/navigation/initMobileNavigation.ts

@@ -1,9 +1,10 @@
 export { initMobileNavigation }
 
+hideNavigationOnLinkClick()
+
 function initMobileNavigation() {
   activateMobileShowNavigationToggle()
   activateMobileNavigationMask()
-  autoHideNavigationOverlayOnLinkClick()
 }
 
 function activateMobileShowNavigationToggle() {
@@ -15,14 +16,23 @@ function activateMobileNavigationMask() {
   navigationMask.onclick = toggleNavigation
 }
 
-function autoHideNavigationOverlayOnLinkClick() {
-  document.addEventListener('click', (ev: any) => {
-    const el = ev.target
-    if (!el || !('classList' in el)) return
-    if (!el.classList.contains('nav-item')) return
+function hideNavigationOnLinkClick() {
+  document.addEventListener('click', (ev) => {
+    const linkTag = findLinkTag(ev.target as HTMLElement)
+    if (!linkTag) return
     hideNavigation()
   })
 }
+function findLinkTag(target: HTMLElement): null | HTMLElement {
+  while (target.tagName !== 'A') {
+    const { parentNode } = target
+    if (!parentNode) {
+      return null
+    }
+    target = parentNode as HTMLElement
+  }
+  return target
+}
 
 function toggleNavigation() {
   document.body.classList.toggle('mobile-show-navigation')

package/navigation/initPressKit.ts

@@ -1,5 +1,7 @@
 export { initPressKit }
 
+import { navigate } from 'vike/client/router'
+
 function initPressKit() {
   // Right click navigation header => show /press
   navigationHeaderRightClickInterceptor()
@@ -12,6 +14,6 @@ function navigationHeaderRightClickInterceptor() {
   const navHeaderImg = document.querySelector('#navigation-header-logo img') as HTMLElement
   navHeaderImg.oncontextmenu = (ev) => {
     ev.preventDefault()
-    window.location.href = '/press'
+    navigate('/press')
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.6.21-commit-74553e7",
+  "version": "0.6.21-commit-f22016e",
   "type": "module",
   "scripts": {
     "// Build vite.config.ts and +config.ts": "",
@@ -27,8 +27,7 @@
     "rehype-pretty-code": "0.13.0",
     "remark-gfm": "4.0.0",
     "shiki": "1.2.0",
-    "vike-contributors": "^0.0.9",
-    "vite-plugin-cjs-interop": "^2.1.4"
+    "vike-contributors": "^0.0.9"
   },
   "peerDependencies": {
     "@types/node": "*",

package/vite.config.ts

@@ -6,7 +6,6 @@ import { parsePageSections } from './parsePageSections.js'
 import rehypePrettyCode from 'rehype-pretty-code'
 import remarkGfm from 'remark-gfm'
 import { transformerNotationDiff } from '@shikijs/transformers'
-import { cjsInterop } from 'vite-plugin-cjs-interop'
 
 const root = process.cwd()
 const prettyCode = [rehypePrettyCode, { theme: 'github-light', transformers: [transformerNotationDiff()] }]
@@ -26,15 +25,13 @@ const config: UserConfig = {
       },
       includeAssetsImportedByServer: true,
     }),
-    cjsInterop({
-      dependencies: ['@docsearch/react'],
-    }),
   ],
   optimizeDeps: {
-    include: ['react-dom/client', '@docsearch/react'],
+    include: ['react', 'react-dom', 'react-dom/client', '@docsearch/react', 'vike-contributors'],
+    exclude: ['@brillout/docpress'],
   },
   ssr: {
-    noExternal: ['@brillout/docpress'],
+    noExternal: ['@brillout/docpress', '@docsearch/react'],
   },
   clearScreen: false,
 }