simple-content-site 2.1.1 → 2.2.0

package/app/components/app/AppFooter.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useSiteFooter } from '../../composables/useSiteFooter'
+import { useSiteFooter } from '#imports'
 
 const { data: footer } = await useSiteFooter()
 </script>

package/app/components/app/AppHeader.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { useSiteI18n } from '../../composables/useSiteI18n'
-import { useSiteHeader } from '../../composables/useSiteHeader'
+import { useSiteHeader, useSiteI18n } from '#imports'
 
 const { data: header } = await useSiteHeader()
 

package/app/components/app/AppHeaderBody.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ContentNavigationItem } from '@nuxt/content'
-import { useSiteHeader } from '../../composables/useSiteHeader'
+import { useSiteHeader } from '#imports'
 
 const { data: header } = await useSiteHeader()
 

package/app/composables/useSiteFooter.ts

@@ -1,5 +1,5 @@
 import type { Collections, FooterCollectionItem } from '@nuxt/content'
-import { useSiteI18n } from './useSiteI18n'
+import { useSiteI18n } from '#imports'
 
 export const useSiteFooter = () => {
   const { locale, isEnabled, defaultLocale } = useSiteI18n()

package/app/composables/useSiteHeader.ts

@@ -1,5 +1,5 @@
 import type { Collections, HeaderCollectionItem } from '@nuxt/content'
-import { useSiteI18n } from './useSiteI18n'
+import { useSiteI18n } from '#imports'
 
 export const useSiteHeader = () => {
   const config = useAppConfig()

package/modules/routing.ts

@@ -11,12 +11,18 @@ export default defineNuxtModule({
 
     // Ensure useSiteI18n is available in the app
     nuxt.hook('imports:extend', (imports) => {
-      if (imports.some(i => i.name === 'useSiteI18n')) return
+      const loadComposableIfNotFound = (composableName: string) => {
+        if (imports.some(i => i.name === composableName)) return
 
-      imports.push({
-        name: 'useSiteI18n',
-        from: resolve('../app/composables/useSiteI18n'),
-      })
+        imports.push({
+          name: composableName,
+          from: resolve(`../app/composables/${composableName}`),
+        })
+      }
+
+      loadComposableIfNotFound('useSiteI18n')
+      loadComposableIfNotFound('useSiteHeader')
+      loadComposableIfNotFound('useSiteFooter')
     })
 
     // might want to know about this stuff.
@@ -27,6 +33,10 @@ export default defineNuxtModule({
     extendPages((pages) => {
       const landingTemplate = resolve('../app/templates/landing.vue')
 
+      if (pages.some(p => p.name === (isI18nEnabled ? 'lang-index' : 'index'))) {
+        if (import.meta.dev) console.warn('[Site] Duplicate landing page detected - skipping')
+        return
+      }
       if (isI18nEnabled) {
         pages.push({
           name: 'lang-index',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "simple-content-site",
   "description": "Nuxt layer for simple website with basic functions.",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "type": "module",
   "main": "./nuxt.config.ts",
   "repository": {