docus 4.2.0 → 5.0.1

package/app/app.config.ts

@@ -10,8 +10,6 @@ export default defineAppConfig({
         itemLeadingIcon: 'size-4 mx-0.5',
       },
     },
-  },
-  uiPro: {
     contentNavigation: {
       slots: {
         linkLeadingIcon: 'size-4 mr-1',

package/app/app.vue

@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import type { PageCollections } from '@nuxt/content'
-import * as nuxtUiProLocales from '@nuxt/ui-pro/locale'
+import * as nuxtUiLocales from '@nuxt/ui/locale'
 
 const { seo } = useAppConfig()
 const site = useSiteConfig()
 const { locale, locales, isEnabled, switchLocalePath } = useDocusI18n()
 
-const lang = computed(() => nuxtUiProLocales[locale.value as keyof typeof nuxtUiProLocales]?.code || 'en')
-const dir = computed(() => nuxtUiProLocales[locale.value as keyof typeof nuxtUiProLocales]?.dir || 'ltr')
+const lang = computed(() => nuxtUiLocales[locale.value as keyof typeof nuxtUiLocales]?.code || 'en')
+const dir = computed(() => nuxtUiLocales[locale.value as keyof typeof nuxtUiLocales]?.dir || 'ltr')
 const collectionName = computed(() => isEnabled.value ? `docs_${locale.value}` : 'docs')
 
 useHead({
@@ -58,7 +58,7 @@ provide('navigation', navigation)
 </script>
 
 <template>
-  <UApp :locale="nuxtUiProLocales[locale as keyof typeof nuxtUiProLocales]">
+  <UApp :locale="nuxtUiLocales[locale as keyof typeof nuxtUiLocales]">
     <NuxtLoadingIndicator color="var(--ui-primary)" />
 
     <NuxtLayout>

package/app/components/app/AppFooterRight.vue

@@ -8,7 +8,7 @@ const links = computed(() => [
     'target': '_blank',
     'aria-label': `${key} social link`,
   })),
-  appConfig.github?.url && {
+  appConfig.github && appConfig.github.url && {
     'icon': 'i-simple-icons-github',
     'to': appConfig.github.url,
     'target': '_blank',

package/app/components/app/AppHeader.vue

@@ -6,7 +6,7 @@ const site = useSiteConfig()
 
 const { localePath, isEnabled, locales } = useDocusI18n()
 
-const links = computed(() => appConfig.github?.url
+const links = computed(() => appConfig.github && appConfig.github.url
   ? [
       {
         'icon': 'i-simple-icons-github',

package/app/components/docs/DocsPageHeaderLinks.vue

@@ -42,7 +42,7 @@ async function copyPage() {
 </script>
 
 <template>
-  <UButtonGroup size="sm">
+  <UFieldGroup size="sm">
     <UButton
       :label="t('docs.copy.page')"
       :icon="copied ? 'i-lucide-check' : 'i-lucide-copy'"
@@ -70,5 +70,5 @@ async function copyPage() {
         class="border-l border-muted"
       />
     </UDropdownMenu>
-  </UButtonGroup>
+  </UFieldGroup>
 </template>

package/app/error.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { NuxtError } from '#app'
 import type { PageCollections } from '@nuxt/content'
-import * as nuxtUiProLocales from '@nuxt/ui-pro/locale'
+import * as nuxtUiLocales from '@nuxt/ui/locale'
 
 const props = defineProps<{
   error: NuxtError
@@ -9,8 +9,8 @@ const props = defineProps<{
 
 const { locale, locales, isEnabled, t, switchLocalePath } = useDocusI18n()
 
-const lang = computed(() => nuxtUiProLocales[locale.value as keyof typeof nuxtUiProLocales]?.code || 'en')
-const dir = computed(() => nuxtUiProLocales[locale.value as keyof typeof nuxtUiProLocales]?.dir || 'ltr')
+const lang = computed(() => nuxtUiLocales[locale.value as keyof typeof nuxtUiLocales]?.code || 'en')
+const dir = computed(() => nuxtUiLocales[locale.value as keyof typeof nuxtUiLocales]?.dir || 'ltr')
 useHead({
   htmlAttrs: {
     lang,

package/app/layouts/default.vue

@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import type { ContentNavigationItem } from '@nuxt/content'
+import { flattenNavigation } from '../utils/navigation'
 
 const route = useRoute()
 const docsNavigation = inject<Ref<ContentNavigationItem[]>>('navigation')
-const docsLink = computed(() => docsNavigation?.value.flatMap(item => item.children || [item]) || [])
+const docsLink = computed(() => flattenNavigation(docsNavigation?.value))
 const isDocs = computed(() => docsLink.value.findIndex(item => item.path === route.path) !== -1)
 </script>
 

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

@@ -46,16 +46,18 @@ defineOgImageComponent('Docs', {
   headline: headline.value,
 })
 
+const github = computed(() => appConfig.github ? appConfig.github : null)
+
 const editLink = computed(() => {
-  if (!appConfig.github) {
+  if (!github.value) {
     return
   }
 
   return [
-    appConfig.github.url,
+    github.value.url,
     'edit',
-    appConfig.github.branch,
-    appConfig.github.rootDir,
+    github.value.branch,
+    github.value.rootDir,
     'content',
     `${page.value?.stem}.${page.value?.extension}`,
   ].filter(Boolean).join('/')
@@ -92,7 +94,7 @@ const editLink = computed(() => {
 
       <USeparator>
         <div
-          v-if="editLink"
+          v-if="github"
           class="flex items-center gap-2 text-sm text-muted"
         >
           <UButton
@@ -109,7 +111,7 @@ const editLink = computed(() => {
           <UButton
             variant="link"
             color="neutral"
-            :to="`${appConfig.github.url}/issues/new/choose`"
+            :to="`${github.url}/issues/new/choose`"
             target="_blank"
             icon="i-lucide-alert-circle"
             :ui="{ leadingIcon: 'size-4' }"

package/app/types/index.d.ts

@@ -32,7 +32,7 @@ declare module 'nuxt/schema' {
       url: string
       branch: string
       rootDir?: string
-    }
+    } | false
   }
 }
 

package/app/utils/navigation.ts

@@ -0,0 +1,7 @@
+import type { ContentNavigationItem } from '@nuxt/content'
+
+export const flattenNavigation = (items?: ContentNavigationItem[]): ContentNavigationItem[] => items?.flatMap(
+  item => item.children
+    ? flattenNavigation(item.children)
+    : [item],
+) || []

package/modules/css.ts

@@ -11,7 +11,7 @@ export default defineNuxtModule({
     const resolver = createResolver(import.meta.url)
 
     const contentDir = joinURL(dir, 'content')
-    const uiProPath = resolveModulePath('@nuxt/ui-pro', { from: import.meta.url, conditions: ['style'] })
+    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')
 
@@ -19,7 +19,7 @@ export default defineNuxtModule({
       filename: 'docus.css',
       getContents: () => {
         return `@import ${JSON.stringify(tailwindPath)};
-@import ${JSON.stringify(uiProPath)};
+@import ${JSON.stringify(uiPath)};
 
 @source "${contentDir.replace(/\\/g, '/')}/**/*";
 @source "${layerDir.replace(/\\/g, '/')}/**/*";

package/nuxt.config.ts

@@ -7,7 +7,7 @@ export default defineNuxtConfig({
     resolve('./modules/config'),
     resolve('./modules/routing'),
     resolve('./modules/css'),
-    '@nuxt/ui-pro',
+    '@nuxt/ui',
     '@nuxt/content',
     '@nuxt/image',
     '@nuxtjs/robots',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docus",
   "description": "Nuxt layer for Docus documentation theme",
-  "version": "4.2.0",
+  "version": "5.0.1",
   "type": "module",
   "main": "./nuxt.config.ts",
   "repository": {
@@ -23,12 +23,12 @@
   ],
   "dependencies": {
     "@iconify-json/lucide": "^1.2.68",
-    "@iconify-json/simple-icons": "^1.2.52",
+    "@iconify-json/simple-icons": "^1.2.53",
     "@iconify-json/vscode-icons": "^1.2.30",
     "@nuxt/content": "^3.7.1",
     "@nuxt/image": "^1.11.0",
     "@nuxt/kit": "^4.1.2",
-    "@nuxt/ui-pro": "^3.3.4",
+    "@nuxt/ui": "^4.0.0",
     "@nuxtjs/i18n": "^10.1.0",
     "@nuxtjs/mdc": "^0.17.4",
     "@nuxtjs/robots": "^5.5.5",
@@ -37,7 +37,7 @@
     "exsolve": "^1.0.7",
     "git-url-parse": "^16.1.0",
     "minimark": "^0.2.0",
-    "motion-v": "^1.7.1",
+    "motion-v": "^1.7.2",
     "nuxt-llms": "^0.1.3",
     "nuxt-og-image": "^5.1.11",
     "pkg-types": "^2.3.0",