simple-content-site 3.0.0 → 3.1.0

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,5 +1,6 @@
 import type { Collections, PagesCollectionItem } from '@nuxt/content'
 import { kebabCase } from 'scule'
+import { joinURL, withLeadingSlash } from 'ufo'
 
 export const useSitePage = () => {
   const { locale, isEnabled, defaultLocale, strategy } = useSiteI18n()
@@ -13,28 +14,20 @@ export const useSitePage = () => {
 
   const getKeyForPath = (path: string) => {
     const prefix = toValue(collectionName.value).replaceAll('_', '-')
-    const suffix = kebabCase(path.replaceAll('/', '--'))
+    const suffix = kebabCase(withLeadingSlash(path).replaceAll('/', '--'))
     return `${prefix}:${suffix}`
   }
 
-  // const page = ref<PagesCollectionItem | undefined>()
-
   const findByPath = async (path: string) => {
     if (isEnabled.value && 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}`
+      const localePrefix = withLeadingSlash(locale.value)
+      if (path !== localePrefix && !path.startsWith(`${localePrefix}/`)) {
+        path = joinURL(localePrefix, path)
       }
     }
-    return await queryCollection(collectionName.value).path(path).first() as PagesCollectionItem
+    return await queryCollection(collectionName.value).path(withLeadingSlash(path)).first() as PagesCollectionItem
   }
 
-  // watch(() => route.path, async (path) => {
-  //   const match = await findByPath(path)
-  //   page.value = match ? match : undefined
-  // })
-
   return {
     collectionName,
     findByPath,

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

@@ -3,6 +3,7 @@ import type { ContentNavigationItem } from '@nuxt/content'
 import { findPageHeadline } from '@nuxt/content/utils'
 // import { addPrerenderPath } from '../../utils/prerender'
 import { useSitePage } from '#imports'
+import { withLeadingSlash } from 'ufo'
 
 definePageMeta({
   layout: 'page',
@@ -12,7 +13,8 @@ const route = useRoute()
 const { findByPath, getKeyForPath } = useSitePage()
 
 const { data: page } = await useAsyncData(() => getKeyForPath(route.path), async () => {
-  return await findByPath(route.path)
+  console.log('fetching page', route.path)
+  return await findByPath(withLeadingSlash(route.path) || '/')
 }, {
   immediate: true,
 })

package/modules/config.ts

@@ -1,4 +1,4 @@
-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'
@@ -9,7 +9,7 @@ interface SimpleContentSiteOptions {
   excludeContent?: string[]
 }
 
-const { resolve } = createResolver(import.meta.url)
+const log = logger.withTag('SimpleContentSite')
 
 export default defineNuxtModule<SimpleContentSiteOptions>({
   meta: {
@@ -19,22 +19,12 @@ export default defineNuxtModule<SimpleContentSiteOptions>({
     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()
-    // @ts-expect-error This is not typed.
-    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,
@@ -59,11 +49,31 @@ export default defineNuxtModule<SimpleContentSiteOptions>({
       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: resolveRoot } = createResolver(dir)
+      const { resolve } = createResolver(import.meta.url)
 
       // Filter locales to only include existing ones
       const filteredLocales = nuxt.options.i18n.locales.filter((locale) => {
@@ -78,64 +88,40 @@ export default defineNuxtModule<SimpleContentSiteOptions>({
         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',
-        })
-      }
-
-      // @ts-expect-error This is not properly typed after updates.
-      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

@@ -2,32 +2,36 @@ import { defineNuxtModule, addTemplate, createResolver } from '@nuxt/kit'
 import { joinURL } from 'ufo'
 import { resolveModulePath } from 'exsolve'
 
-const resolver = createResolver(import.meta.url)
 export default defineNuxtModule({
   meta: {
     name: 'css',
   },
   async setup(_options, nuxt) {
     const dir = nuxt.options.rootDir
+    const resolver = createResolver(import.meta.url)
 
     const contentDir = joinURL(dir, 'content')
     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 ||= []
-    nuxt.options.css.unshift(cssTemplate.dst)
+    if (Array.isArray(nuxt.options.css)) {
+      nuxt.options.css.unshift(cssTemplate.dst)
+    }
   },
 })

package/nuxt.config.ts

@@ -52,13 +52,6 @@ export default defineNuxtConfig({
   //   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": "3.0.0",
+  "version": "3.1.0",
   "type": "module",
   "main": "./nuxt.config.ts",
   "repository": {
@@ -33,6 +33,7 @@
     "@nuxtjs/mdc": "^0.20.0",
     "@nuxtjs/robots": "^5.6.7",
     "@vueuse/core": "^14.1.0",
+    "@nuxt/fonts": "^0.14.0",
     "defu": "^6.1.4",
     "exsolve": "^1.0.8",
     "git-url-parse": "^16.1.0",

package/README.md

@@ -1,103 +0,0 @@
-# simple-content-site layer
-
-A simple layer for setting up a simple website using Nuxt, Nuxt UI and Nuxt Content.
-
-## Installation
-> You can add the layer to an existing project, or create a fresh one following the methods below.
-
-### Create a new project
-
-Minimal version
-
-```bash
-npx nuxi init -t gh:hareland/simple-content-site/.starters/minimal
-```
-
-I18n version
-```bash
-npx nuxi init -t gh:hareland/simple-content-site/.starters/i18n
-```
-
-### Add to existing nuxt app
-> This should be done inside a nuxt app.
-
-```bash
-npm i simple-content-site
-```
-or
-
-```bash
-pnpm add simple-content-site
-```
-
-### Extend the layer
-
-```ts nuxt.config.ts
-export default defineNuxtConfig({
-    extends: ['simple-content-site'],
-})
-```
-
-### Running with the layer
-
-```bash
-pnpm dev
-```
-
-### Adding pages
-
-There are two types of pages, `landing` and `page`, in a future version they will be the same.
-
-#### Landing page
-
-This only covers the front page, either with i18n or without, see examples in the [./playground](./playground) folder.
-This is always the `content/index.md` or `content/[lang]/index.md`.
-
-Supports full MDC syntax, and you can implement custom components.
-
-#### Page
-
-Can more or less do exactly the same as a landing page.
-
-
-## 🛠️ Development
-
-### Local Development
-
-To contribute to the CLI tool:
-
-```bash
-# Clone this repository...
-
-# Install dependencies
-pnpm install
-
-# Run the dev server
-pnpm run dev
-```
-
-### Package Structure
-
-This is a monorepo containing:
-
-- [**`/layer`**](./layer) - Content Site Nuxt layer (`simple-content-site`)
-- [**`/playground/minimal`**](./playground/minimal) - Minimal example project.
-- [**`/playground/i18n`**](./playground/i18n) - I18n example project
-
-## TODO's
-
-- [X] Base structure and functionality
-- [X] Support i18n
-- [ ] Find a shared setup for landing and page
-
-## Contributions
-
-Contributions are welcome.
-
-## 📄 License
-
-Published under the [MIT](LICENSE) license.
-
----
-
-Heavily inspired by [Docus](https://docus.dev)