merge conflicts

shuding · Sep 24, 2023 · e4730f8 · e4730f8
1 parent e7e5f97
commit e4730f8
Show file tree

Hide file tree

Showing 3 changed files with 763 additions and 678 deletions.
diff --git a/packages/nextra-theme-docs/src/schemas.ts b/packages/nextra-theme-docs/src/schemas.ts
@@ -106,6 +106,12 @@ export const themeSchema = /* @__PURE__ */ (() =>
         light: z.number()
       })
     ),
+    primarySaturation: z.number().or(
+      z.strictObject({
+        dark: z.number(),
+        light: z.number()
+      })
+    ),
     project: z.strictObject({
       icon: z.custom<ReactNode | FC>(...reactNode),
       link: z.string().startsWith('https://').optional()

diff --git a/packages/nextra/src/server/file-system.ts b/packages/nextra/src/server/file-system.ts
@@ -4,7 +4,7 @@ import { CWD } from './constants.js'
 export const { existsSync } = pkg
 
 export function findPagesDirectory(): string {
-  const { pagesDir } = pkg.findPagesDir(CWD, false)
+  const { pagesDir } = pkg.findPagesDir(CWD)
   if (!pagesDir) {
     throw new Error('Unable to find `pages` directory')
   }