simple-content-site 2.3.1 → 3.1.0

package/app/components/LanguageSelect.vue

@@ -42,7 +42,7 @@ function getEmojiFlag(locale: string): string {
 
 <template>
   <UPopover
-    mode="hover"
+    mode="click"
     :content="{ align: 'end' }"
   >
     <UButton

package/app/composables/useSiteI18n.ts

@@ -5,7 +5,6 @@ export const useSiteI18n = () => {
   const config = useRuntimeConfig().public
   const isEnabled = ref(!!config.i18n && config.i18n.locales?.length > 0)
   // todo: reading the strategy like this might cause issues in the future.
-  // @ts-expect-error Due to the above comment
   const strategy = ref(config.i18n?.strategy || 'prefix_except_default')
 
   if (!isEnabled.value) {
@@ -25,7 +24,7 @@ export const useSiteI18n = () => {
   }
 
   const { locale, t } = useI18n()
-  const filteredLocales = (config.Site as { filteredLocales: LocaleObject<string>[] })?.filteredLocales || []
+  const filteredLocales = (config.scs as { filteredLocales: LocaleObject<string>[] })?.filteredLocales || []
 
   return {
     isEnabled,

package/app/composables/useSitePage.ts

@@ -1,59 +1,36 @@
-import type { ContentNavigationItem, Collections, PagesCollectionItem } from '@nuxt/content'
-import { findPageHeadline } from '@nuxt/content/utils'
+import type { Collections, PagesCollectionItem } from '@nuxt/content'
 import { kebabCase } from 'scule'
+import { joinURL, withLeadingSlash } from 'ufo'
 
-type SitePageOptions = {
-  immediate?: boolean
-}
-export const useSitePage = async (opts?: SitePageOptions) => {
-  const route = useRoute()
+export const useSitePage = () => {
   const { locale, isEnabled, defaultLocale, strategy } = useSiteI18n()
-  const navigation = inject<Ref<ContentNavigationItem[]>>('navigation')
 
-  const collectionName = computed(() => {
-    if (!isEnabled.value || !defaultLocale.value) {
-      return 'pages'
+  const collectionName = computed<keyof Collections>(() => {
+    if (!isEnabled.value || !defaultLocale.value || !locale.value) {
+      return 'pages' as keyof Collections
     }
-    return `pages_${locale.value}`
+    return `pages_${locale.value}` as keyof Collections
   })
 
-  // const page = ref<PagesCollectionItem | undefined>()
+  const getKeyForPath = (path: string) => {
+    const prefix = toValue(collectionName.value).replaceAll('_', '-')
+    const suffix = kebabCase(withLeadingSlash(path).replaceAll('/', '--'))
+    return `${prefix}:${suffix}`
+  }
 
   const findByPath = async (path: string) => {
-    if (strategy.value === 'prefix_except_default' && locale.value === defaultLocale.value) {
-      const prefix = `/${locale.value}`
-      if (path !== prefix && !path.startsWith(`${prefix}/`)) {
-        // we need to inject a virtual path to find the page in the collection
-        path = `${prefix}${path}`
+    if (isEnabled.value && strategy.value === 'prefix_except_default' && locale.value === defaultLocale.value) {
+      const localePrefix = withLeadingSlash(locale.value)
+      if (path !== localePrefix && !path.startsWith(`${localePrefix}/`)) {
+        path = joinURL(localePrefix, path)
       }
     }
-    return await queryCollection(collectionName.value as keyof Collections).path(path).first() as PagesCollectionItem
+    return await queryCollection(collectionName.value).path(withLeadingSlash(path)).first() as PagesCollectionItem
   }
 
-  const { data: page, refresh } = await useAsyncData(() => kebabCase(route.path), async () => {
-    const match = await findByPath(route.path)
-    return match ? match : undefined
-  }, {
-    immediate: opts?.immediate,
-  })
-  // watch(() => route.path, async (path) => {
-  //   const match = await findByPath(path)
-  //   page.value = match ? match : undefined
-  // })
-
-  const title = computed(() => page.value?.seo?.title || page.value?.title || undefined)
-  const description = computed(() => page.value?.seo?.description || page.value?.description || undefined)
-  const headline = computed(() => findPageHeadline(navigation?.value, page.value?.path))
-  const exists = computed(() => page.value !== undefined)
-
   return {
-    page,
-    title,
-    description,
-    headline,
-    exists,
     collectionName,
     findByPath,
-    refresh,
+    getKeyForPath,
   }
 }

package/app/pages/[[lang]]/[...slug].vue

@@ -1,27 +1,36 @@
 <script setup lang="ts">
 import type { ContentNavigationItem } from '@nuxt/content'
 import { findPageHeadline } from '@nuxt/content/utils'
-import { addPrerenderPath } from '../../utils/prerender'
+// import { addPrerenderPath } from '../../utils/prerender'
 import { useSitePage } from '#imports'
+import { withLeadingSlash } from 'ufo'
 
 definePageMeta({
   layout: 'page',
 })
 
 const route = useRoute()
-const { page, collectionName } = await useSitePage()
-const navigation = inject<Ref<ContentNavigationItem[]>>('navigation')
+const { findByPath, getKeyForPath } = useSitePage()
+
+const { data: page } = await useAsyncData(() => getKeyForPath(route.path), async () => {
+  console.log('fetching page', route.path)
+  return await findByPath(withLeadingSlash(route.path) || '/')
+}, {
+  immediate: true,
+})
 
 if (!page.value) {
   throw createError({
-    statusCode: 404,
-    statusMessage: import.meta.dev ? `Page ${route.path} not found in ${collectionName.value}` : 'Pages not found',
+    status: 404,
+    message: 'Page not found',
     fatal: true,
   })
 }
 
+const navigation = inject<Ref<ContentNavigationItem[]>>('navigation')
+
 // Add the page path to the prerender list
-addPrerenderPath(`/raw${route.path}.md`)
+// addPrerenderPath(`/raw${route.path}.md`)
 
 const title = page.value.seo?.title || page.value.title
 const description = page.value.seo?.description || page.value.description

package/content.config.ts

@@ -1,10 +1,15 @@
+import { z } from 'zod/v4'
 import type { DefinedCollection } from '@nuxt/content'
-import { defineContentConfig, defineCollection, z } from '@nuxt/content'
+import { defineContentConfig, defineCollection, property } from '@nuxt/content'
 import { useNuxt } from '@nuxt/kit'
 import { joinURL } from 'ufo'
 
 const { options } = useNuxt()
 const cwd = joinURL(options.rootDir, 'content')
+
+// @ts-expect-error cannot be typed?
+const contentExcluded = options?.scs?.excludeContent || []
+
 // @ts-expect-error cannot be typed?
 const locales = options.i18n?.locales
 // todo: might be required for diff strategies for the collections
@@ -29,10 +34,10 @@ const createLinkSchema = () => z.object({
   class: z.string().optional(),
   label: z.string().nonempty(),
   to: z.string().nonempty(),
-  icon: z.string().optional().editor({ input: 'icon' }),
+  icon: property(z.string().optional()).editor({ input: 'icon' }),
   size: sizeEnum.optional(),
   trailing: z.boolean().optional(),
-  trailingIcon: z.string().optional().editor({ input: 'icon' }),
+  trailingIcon: property(z.string().optional()).editor({ input: 'icon' }),
   target: z.string().optional(),
   color: colorEnum.optional(),
   variant: variantEnum.optional(),
@@ -42,10 +47,10 @@ const createNavigationSchema = () => z.object({
   label: z.string().nonempty(),
   class: z.string().optional(),
   to: z.string().nonempty(),
-  icon: z.string().optional().editor({ input: 'icon' }),
+  icon: property(z.string().optional()).editor({ input: 'icon' }),
   size: sizeEnum.optional(),
   trailing: z.boolean().optional(),
-  trailingIcon: z.string().optional().editor({ input: 'icon' }),
+  trailingIcon: property(z.string().optional()).editor({ input: 'icon' }),
   target: z.string().optional(),
   color: colorEnum.optional(),
   variant: variantEnum.optional(),
@@ -96,11 +101,12 @@ const buildI18nCollections = () => {
       type: 'page',
       source: {
         cwd,
-        include: `${code}/**/*.{md,yml}`,
+        include: `${code}/**/**.{md,yml}`,
         prefix: `/${code}`,
         exclude: [
           `${code}/header.yml`,
           `${code}/footer.yml`,
+          ...contentExcluded,
         ],
       },
       schema: createPageSchema(),
@@ -132,10 +138,11 @@ const buildDefaultCollections = () => {
       type: 'page',
       source: {
         cwd,
-        include: '**',
+        include: '**/**.{md,yml}',
         exclude: [
           'header.yml',
           'footer.yml',
+          ...contentExcluded,
         ],
       },
       schema: createPageSchema(),

package/modules/config.ts

@@ -1,30 +1,30 @@
-import { createResolver, defineNuxtModule, addPlugin } from '@nuxt/kit'
+import { createResolver, defineNuxtModule, addPlugin, logger } from '@nuxt/kit'
 import { defu } from 'defu'
 import { existsSync } from 'node:fs'
 import { join } from 'node:path'
 import { inferSiteURL, getPackageJsonMetadata } from '../utils/meta'
 import { getGitBranch, getGitEnv, getLocalGitInfo } from '../utils/git'
 
-export default defineNuxtModule({
+interface SimpleContentSiteOptions {
+  excludeContent?: string[]
+}
+
+const log = logger.withTag('SimpleContentSite')
+
+export default defineNuxtModule<SimpleContentSiteOptions>({
   meta: {
-    name: 'config',
+    name: 'scs',
+  },
+  defaults: {
+    excludeContent: [],
   },
   async setup(_options, nuxt) {
+    const { resolve } = createResolver(import.meta.url)
     const dir = nuxt.options.rootDir
     const url = inferSiteURL()
     const meta = await getPackageJsonMetadata(dir)
     const gitInfo = await getLocalGitInfo(dir) || getGitEnv()
-    const siteName = nuxt.options?.site?.name || meta.name || gitInfo?.name || ''
-
-    // nuxt.options.llms = defu(nuxt.options.llms, {
-    //   domain: url,
-    //   title: siteName,
-    //   description: meta.description || '',
-    //   full: {
-    //     title: siteName,
-    //     description: meta.description || '',
-    //   },
-    // })
+    const siteName = (typeof nuxt.options.site === 'object' && nuxt.options.site?.name) || meta.name || gitInfo?.name || ''
 
     nuxt.options.site = defu(nuxt.options.site, {
       url,
@@ -49,12 +49,31 @@ export default defineNuxtModule({
       branch: getGitBranch(),
     })
 
-    /*
-        ** I18N
-        */
+    // ...
+    nuxt.options.i18n = defu(nuxt.options.i18n, {
+      strategy: 'prefix_except_default',
+    }) as typeof nuxt.options.i18n
+
+    // ensure we redirect from index if the strategy requires.
+
+    // todo: exposing the strategy like this might cause issues in the future.
+    //  So it will be better to expose the i18n redirect plugin instead from a module.
+    nuxt.options.runtimeConfig.public.i18n = defu(nuxt.options.runtimeConfig.public.i18n, {
+      strategy: (nuxt.options.i18n ? nuxt.options.i18n.strategy : undefined) || 'prefix_except_default',
+    })
+
+    const i18nStrategy = nuxt.options.runtimeConfig.public.i18n.strategy as string
+
+    if (i18nStrategy && !['prefix_except_default', 'no_prefix'].includes(i18nStrategy)) {
+      console.log(`[I18n] Adding redirect plugin for root since strategy is: ${i18nStrategy}`)
+      addPlugin({
+        src: resolve('../runtime/plugins/i18n-redirect'),
+        mode: 'client',
+      })
+    }
+
     if (nuxt.options.i18n && nuxt.options.i18n.locales) {
       const { resolve } = createResolver(import.meta.url)
-      const { resolve: resolveRoot } = createResolver(dir)
 
       // Filter locales to only include existing ones
       const filteredLocales = nuxt.options.i18n.locales.filter((locale) => {
@@ -69,63 +88,40 @@ export default defineNuxtModule({
         const hasContentFolder = existsSync(contentPath)
 
         if (!hasLocaleFile) {
-          console.warn(`[Site] Locale file not found: ${localeCode}.json - skipping locale "${localeCode}"`)
+          log.warn(`Locale file not found: ${localeCode}.json - skipping locale "${localeCode}"`)
         }
 
         if (!hasContentFolder) {
-          console.warn(`[Site] Content folder not found: content/${localeCode}/ - skipping locale "${localeCode}"`)
+          log.warn(`Content folder not found: content/${localeCode}/ - skipping locale "${localeCode}"`)
         }
 
         return hasLocaleFile && hasContentFolder
       })
 
-      //
-      nuxt.options.i18n = defu(nuxt.options.i18n, {
-        strategy: 'prefix_except_default',
-      }) as typeof nuxt.options.i18n
-
-      // todo: exposing the strategy like this might cause issues in the future.
-      //  So it will be better to expose the i18n redirect plugin instead from a module.
-      nuxt.options.runtimeConfig.public.i18n = defu(nuxt.options.runtimeConfig.public.i18n, {
-        strategy: nuxt.options.i18n.strategy,
-      })
-
       // Expose filtered locales
-      nuxt.options.runtimeConfig.public.Site = {
+      nuxt.options.runtimeConfig.public.scs = {
         filteredLocales,
       }
 
-      // ensure we redirect from index if the strategy requires.
-      if (nuxt.options.i18n.strategy && !['prefix_except_default', 'no_prefix'].includes(nuxt.options.i18n.strategy)) {
-        console.log(`[I18n] Adding redirect plugin for root since strategy is: ${nuxt.options.i18n.strategy}`)
-        addPlugin({
-          src: resolve('../runtime/plugins/i18n-redirect'),
-          mode: 'client',
-        })
-      }
-
-      nuxt.hook('i18n:registerModule', (register) => {
+      // @ts-expect-error This is messed up...
+      nuxt.hook('i18n:registerModule', (register: never) => {
         const langDir = resolve('../i18n/locales')
 
         const locales = filteredLocales?.map((locale) => {
-          // Possibly load custom translations.
-          const localeCode = typeof locale === 'string' ? locale : locale.code
-          const customLocalePath = resolveRoot('i18n/locales', `${localeCode}.json`)
-          const hasCustomLocale = existsSync(customLocalePath)
-          const files = hasCustomLocale ? [customLocalePath, `${localeCode}.json`] : [`${localeCode}.json`]
           return typeof locale === 'string'
             ? {
                 code: locale,
                 name: locale,
-                files,
+                file: `${locale}.json`,
               }
             : {
                 code: locale.code,
                 name: locale.name || locale.code,
-                files,
+                file: `${locale.code}.json`,
               }
         })
 
+        // @ts-expect-error This is amessed up too
         register({
           langDir,
           locales,

package/modules/content.ts

@@ -0,0 +1,13 @@
+import { defineNuxtModule } from '@nuxt/kit'
+
+// const { resolve } = createResolver(import.meta.url)
+
+export default defineNuxtModule({
+  meta: {
+    // todo: rename this module to fit it's purpose
+    name: 'routing',
+  },
+  async setup(_options) {
+    console.log('content module setup -> Should bootstrap content?! or can i make it work from a separate content.config.ts?')
+  },
+})

package/modules/css.ts

@@ -14,19 +14,24 @@ export default defineNuxtModule({
     const uiPath = resolveModulePath('@nuxt/ui', { from: import.meta.url, conditions: ['style'] })
     const tailwindPath = resolveModulePath('tailwindcss', { from: import.meta.url, conditions: ['style'] })
     const layerDir = resolver.resolve('../app')
+    // const assistantDir = resolver.resolve('../modules/assistant')
 
     const cssTemplate = addTemplate({
-      filename: 'website.css',
+      filename: 'simple-content-site.css',
       getContents: () => {
         return `@import ${JSON.stringify(tailwindPath)};
 @import ${JSON.stringify(uiPath)};
 
 @source "${contentDir.replace(/\\/g, '/')}/**/*";
 @source "${layerDir.replace(/\\/g, '/')}/**/*";
-@source "../../app.config.ts";`
+@source "../../app.config.ts";
+`
+        // @source "${assistantDir.replace(/\\/g, '/')}/**/*";
       },
     })
 
-    nuxt.options.css.unshift(cssTemplate.dst)
+    if (Array.isArray(nuxt.options.css)) {
+      nuxt.options.css.unshift(cssTemplate.dst)
+    }
   },
 })

package/modules/routing.ts

@@ -1,13 +1,12 @@
 import { defineNuxtModule, createResolver } from '@nuxt/kit'
 
+const { resolve } = createResolver(import.meta.url)
 export default defineNuxtModule({
   meta: {
     // todo: rename this module to fit it's purpose
     name: 'routing',
   },
   async setup(_options, nuxt) {
-    const { resolve } = createResolver(import.meta.url)
-
     // Ensure useSiteI18n is available in the app
     nuxt.hook('imports:extend', (imports) => {
       const loadComposableIfNotFound = (composableName: string) => {

package/nuxt.config.ts

@@ -48,14 +48,10 @@ export default defineNuxtConfig({
       },
     },
   },
+  // future: {
+  //   compatibilityVersion: 5,
+  // },
   compatibilityDate: '2025-07-22',
-  nitro: {
-    prerender: {
-      crawlLinks: true,
-      failOnError: false,
-      autoSubfolderIndex: false,
-    },
-  },
   hooks: {
     'nitro:config'(nitroConfig) {
       const nuxt = useNuxt()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "simple-content-site",
   "description": "Nuxt layer for simple website with basic functions.",
-  "version": "2.3.1",
+  "version": "3.1.0",
   "type": "module",
   "main": "./nuxt.config.ts",
   "repository": {
@@ -22,27 +22,30 @@
     "README.md"
   ],
   "dependencies": {
-    "@iconify-json/lucide": "^1.2.73",
-    "@iconify-json/simple-icons": "^1.2.59",
-    "@iconify-json/vscode-icons": "^1.2.35",
-    "@nuxt/content": "^3.10.0",
-    "@nuxt/image": "^1.11.0",
+    "@iconify-json/lucide": "^1.2.86",
+    "@iconify-json/simple-icons": "^1.2.67",
+    "@iconify-json/vscode-icons": "^1.2.40",
+    "@nuxt/content": "^3.11.0",
+    "@nuxt/image": "^2.0.0",
     "@nuxt/kit": "^4.2.2",
-    "@nuxt/ui": "^4.3.0",
+    "@nuxt/ui": "^4.4.0",
     "@nuxtjs/i18n": "^10.2.1",
-    "@nuxtjs/mdc": "^0.19.2",
+    "@nuxtjs/mdc": "^0.20.0",
     "@nuxtjs/robots": "^5.6.7",
-    "@vueuse/core": "^13.9.0",
+    "@vueuse/core": "^14.1.0",
+    "@nuxt/fonts": "^0.14.0",
     "defu": "^6.1.4",
     "exsolve": "^1.0.8",
     "git-url-parse": "^16.1.0",
     "minimark": "^0.2.0",
-    "motion-v": "^1.7.4",
+    "motion-v": "^1.9.0",
     "nuxt-og-image": "^5.1.13",
     "pkg-types": "^2.3.0",
     "scule": "^1.3.0",
-    "tailwindcss": "^4.1.17",
-    "ufo": "^1.6.1"
+    "tailwindcss": "^4.1.18",
+    "ufo": "^1.6.3",
+    "zod": "^4.3.5",
+    "zod-to-json-schema": "^3.25.1"
   },
   "peerDependencies": {
     "better-sqlite3": "12.x",

package/server/routes/raw/[...slug].md.get.ts

@@ -6,7 +6,7 @@ import type { Collections } from '@nuxt/content'
 export default eventHandler(async (event) => {
   const slug = getRouterParams(event)['slug.md']
   if (!slug?.endsWith('.md')) {
-    throw createError({ statusCode: 404, statusMessage: 'Page not found', fatal: true })
+    throw createError({ status: 404, message: 'Page not found', fatal: true })
   }
 
   const path = withLeadingSlash(slug.replace('.md', ''))
@@ -31,7 +31,7 @@ export default eventHandler(async (event) => {
 
   const page = await queryCollection(event, collectionName as keyof Omit<Collections, 'header' | 'footer'>).path(path).first()
   if (!page) {
-    throw createError({ statusCode: 404, statusMessage: 'Page not found', fatal: true })
+    throw createError({ status: 404, message: 'Page not found', fatal: true })
   }
 
   // Add title and description to the top of the page if missing