@brillout/docpress 0.10.7 → 0.10.9

package/Layout.tsx

@@ -58,7 +58,7 @@ function Layout({ children }: { children: React.ReactNode }) {
   return (
     <div
       style={{
-        ['--bg-color']: '#f5f5f7',
+        ['--bg-color']: '#f5f5f5',
         ['--block-margin']: `${blockMargin}px`,
         ['--icon-text-padding']: '8px',
         // ['--nav-head-height']: `${isLandingPage ? 70 : 60}px`,
@@ -484,9 +484,12 @@ function NavLogo({ className }: { className: string }) {
       href="/"
     >
       <img
-        src={pageContext.meta.faviconUrl}
-        height={iconSize}
-        width={iconSize}
+        src={pageContext.meta.logoUrl}
+        style={{
+          height: iconSize,
+          width: iconSize,
+          ...pageContext.config.navLogoStyle,
+        }}
         onContextMenu={(ev) => {
           if (!pageContext.config.pressKit) return // no /press page
           if (window.location.pathname === '/press') return

package/config/resolvePageContext.ts

@@ -24,7 +24,6 @@ function resolvePageContext(pageContext: PageContextOriginal) {
 
   const config = getConfig()
   const {
-    faviconUrl,
     algolia,
     tagline,
     twitterHandle,
@@ -32,11 +31,12 @@ function resolvePageContext(pageContext: PageContextOriginal) {
     websiteUrl,
     projectInfo: { projectName },
   } = config
+  const logoUrl = config.logoUrl ?? config.faviconUrl
   objectAssign(pageContextResolved, {
     urlPathname: pageContext.urlPathname, // TODO: remove
     meta: {
       projectName,
-      faviconUrl,
+      logoUrl,
       twitterHandle,
       bannerUrl,
       websiteUrl,

package/dist/config/resolvePageContext.d.ts

@@ -21,7 +21,7 @@ declare function resolvePageContext(pageContext: PageContextOriginal): {
     urlPathname: string;
     meta: {
         projectName: string;
-        faviconUrl: string;
+        logoUrl: string | undefined;
         twitterHandle: string;
         bannerUrl: string | undefined;
         websiteUrl: string;

package/dist/config/resolvePageContext.js

@@ -3,15 +3,17 @@ import { objectAssign } from '../utils/server';
 import { getConfig } from './getConfig';
 import { resolveHeadingsData } from './resolveHeadingsData';
 function resolvePageContext(pageContext) {
+    var _a;
     var pageContextResolved = {};
     objectAssign(pageContextResolved, resolveHeadingsData(pageContext));
     var config = getConfig();
-    var faviconUrl = config.faviconUrl, algolia = config.algolia, tagline = config.tagline, twitterHandle = config.twitterHandle, bannerUrl = config.bannerUrl, websiteUrl = config.websiteUrl, projectName = config.projectInfo.projectName;
+    var algolia = config.algolia, tagline = config.tagline, twitterHandle = config.twitterHandle, bannerUrl = config.bannerUrl, websiteUrl = config.websiteUrl, projectName = config.projectInfo.projectName;
+    var logoUrl = (_a = config.logoUrl) !== null && _a !== void 0 ? _a : config.faviconUrl;
     objectAssign(pageContextResolved, {
         urlPathname: pageContext.urlPathname, // TODO: remove
         meta: {
             projectName: projectName,
-            faviconUrl: faviconUrl,
+            logoUrl: logoUrl,
             twitterHandle: twitterHandle,
             bannerUrl: bannerUrl,
             websiteUrl: websiteUrl,

package/dist/types/Config.d.ts

@@ -10,7 +10,8 @@ type Config = {
         discordInvite?: string;
         twitterProfile: string;
     };
-    faviconUrl: string;
+    logoUrl?: string;
+    faviconUrl?: string;
     algolia: null | {
         appId: string;
         apiKey: string;
@@ -29,5 +30,6 @@ type Config = {
     sponsorGithubAccount?: string;
     navMaxWidth?: number;
     navLogoSize?: number;
+    navLogoStyle?: React.CSSProperties;
     navLogoTextStyle?: React.CSSProperties;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.10.7",
+  "version": "0.10.9",
   "type": "module",
   "dependencies": {
     "@brillout/picocolors": "^1.0.10",
@@ -10,7 +10,7 @@
     "@mdx-js/react": "3.0.1",
     "@mdx-js/rollup": "3.0.1",
     "@shikijs/transformers": "1.2.0",
-    "@vitejs/plugin-react-swc": "^3.3.2",
+    "@vitejs/plugin-react-swc": "^3.7.2",
     "rehype-pretty-code": "0.13.0",
     "remark-gfm": "4.0.0",
     "shiki": "1.2.0"

package/renderer/onRenderHtml.tsx

@@ -21,11 +21,13 @@ Promise<Awaited<ReturnType<OnRenderHtmlAsync>>> => {
 
   const pageHtml = ReactDOMServer.renderToString(page)
 
+  const faviconUrl = pageContextResolved.config.faviconUrl ?? pageContextResolved.config.logoUrl
+
   return escapeInject`<!DOCTYPE html>
     <html>
       <head>
         <meta charset="UTF-8" />
-        <link rel="icon" href="${pageContextResolved.meta.faviconUrl}" />
+        <link rel="icon" href="${faviconUrl}" />
         <title>${pageContextResolved.documentTitle}</title>
         ${descriptionTag}
         <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no" />

package/types/Config.ts

@@ -12,7 +12,8 @@ type Config = {
     discordInvite?: string
     twitterProfile: string
   }
-  faviconUrl: string
+  logoUrl?: string
+  faviconUrl?: string
   algolia: null | {
     appId: string
     apiKey: string
@@ -31,5 +32,6 @@ type Config = {
   sponsorGithubAccount?: string
   navMaxWidth?: number
   navLogoSize?: number
+  navLogoStyle?: React.CSSProperties
   navLogoTextStyle?: React.CSSProperties
 }