Merge remote-tracking branch 'upstream/main'

# Conflicts: # pages/deploy/[slug].vue
translation-gang · Sep 28, 2024 · 44920b7 · 44920b7
2 parents 8043865 + d4ba5cc
commit 44920b7
Show file tree

Hide file tree

Showing 9 changed files with 435 additions and 350 deletions.
diff --git a/components/AppHeader.vue b/components/AppHeader.vue
@@ -93,7 +93,18 @@ defineProps<{
     </template>
 
     <template #center>
-      <UHeaderLinks :links="links" :ui="{ default: { popover: { popper: { strategy: 'absolute' }, ui: { width: 'w-[256px]' } } } }" class="hidden lg:flex" />
+      <UHeaderLinks
+        :links="links"
+        :ui="{
+          default: {
+            popover: {
+              popper: { strategy: 'absolute' },
+              ui: { width: 'w-[256px]' }
+            }
+          }
+        }"
+        class="hidden lg:flex"
+      />
     </template>
 
     <template #right>

diff --git a/components/UInputCopy.vue b/components/UInputCopy.vue
@@ -5,7 +5,7 @@ defineProps({
     required: true
   },
   size: {
-    type: String,
+    type: String as () => 'lg',
     default: 'lg'
   }
 })

diff --git a/components/ads/AdsUIPro.vue b/components/ads/AdsUIPro.vue
@@ -1,5 +1,12 @@
 <template>
-  <UPageCard to="https://ui.nuxt.com/pro?utm_source=nuxt_website&utm_medium=banner" target="_blank" :ui="{ header: { padding: 'p-0 sm:p-0' }, rounded: 'rounded', body: { padding: 'p-2 sm:p-2', base: 'text-center' } }">
+  <UPageCard
+    to="https://ui.nuxt.com/pro?utm_source=nuxt_website&utm_medium=banner"
+    target="_blank"
+    :ui="{
+      header: { padding: 'p-0 sm:p-0' },
+      rounded: 'rounded',
+      body: { padding: 'p-2 sm:p-2', base: 'text-center' } }"
+  >
     <template #header>
       <UColorModeImage dark="https://ui.nuxt.com/_ipx/s_1152x720/templates/dashboard3.png" light="https://ui.nuxt.com/_ipx/s_1152x720/templates/dashboard2.png" alt="Nuxt UI Pro" />
     </template>

diff --git a/components/content/enterprise/support/EnterpriseSupportFormSection.vue b/components/content/enterprise/support/EnterpriseSupportFormSection.vue
@@ -100,7 +100,7 @@ async function onSubmit(event: FormSubmitEvent<any>) {
         </UFormGroup>
 
         <ClientOnly>
-          <NuxtTurnstile v-if="showTurnstile" ref="turnstile" v-model="token" :options="{ theme: $colorMode.value }" />
+          <NuxtTurnstile v-if="showTurnstile" ref="turnstile" v-model="token" :options="{ theme: $colorMode.value as 'auto' | 'light' | 'dark' }" />
         </ClientOnly>
 
         <UButton

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nuxt.com",
   "version": "0.3.11",
-  "packageManager": "pnpm@9.10.0",
+  "packageManager": "pnpm@9.11.0",
   "scripts": {
     "dev": "nuxi dev",
     "build": "nuxi build",
@@ -17,24 +17,24 @@
     "@iconify-json/logos": "^1.2.0",
     "@iconify-json/octicon": "^1.2.0",
     "@iconify-json/ph": "^1.2.0",
-    "@iconify-json/simple-icons": "^1.2.3",
+    "@iconify-json/simple-icons": "^1.2.4",
     "@iconify-json/uil": "^1.2.0",
     "@nuxt/content": "^2.13.2",
     "@nuxt/fonts": "^0.8.0",
     "@nuxt/image": "^1.8.0",
     "@nuxt/scripts": "^0.9.2",
-    "@nuxt/ui-pro": "^1.4.2",
+    "@nuxt/ui-pro": "^1.4.3",
     "@nuxthq/studio": "^2.1.1",
     "@nuxtjs/html-validator": "^1.8.2",
     "@nuxtjs/plausible": "^1.0.2",
-    "@vueuse/core": "^11.1.0",
     "@vueuse/components": "^11.1.0",
+    "@vueuse/core": "^11.1.0",
     "@vueuse/nuxt": "^11.1.0",
     "feed": "^4.2.2",
     "floating-vue": "^5.2.2",
     "nuxt": "^3.13.2",
     "nuxt-og-image": "^3.0.2",
-    "ofetch": "^1.3.4",
+    "ofetch": "^1.4.0",
     "perfect-debounce": "^1.0.0",
     "scule": "^1.3.0",
     "sitemap": "^8.0.0",
@@ -44,16 +44,16 @@
   "devDependencies": {
     "@nuxt/eslint": "^0.5.7",
     "@nuxt/test-utils": "^3.14.2",
-    "@nuxtjs/turnstile": "^0.9.6",
+    "@nuxtjs/turnstile": "^0.9.9",
     "@testing-library/vue": "^8.1.0",
     "capture-website": "^4.1.0",
-    "eslint": "^9.10.0",
+    "eslint": "^9.11.0",
     "nuxt-build-cache": "^0.1.1",
     "nuxt-content-twoslash": "0.1.1",
-    "shiki": "^1.17.7",
+    "shiki": "^1.18.0",
     "twoslash": "^0.2.11",
     "vitest": "^2.1.1",
-    "vue": "^3.5.6",
+    "vue": "^3.5.8",
     "vue-tsc": "^2.1.6"
   }
 }
diff --git a/pages/deploy/[slug].vue b/pages/deploy/[slug].vue
@@ -63,7 +63,13 @@ links.push({
 <template>
   <UContainer>
     <UPage>
-      <UPageHeader :description="provider.description" headline="Развернуть" :ui="{ icon: { base: 'text-black dark:text-white' } }">
+      <UPageHeader
+        :description="provider.description"
+        headline="Развернуть"
+        :ui="{
+          icon: { base: 'text-black dark:text-white' }
+        }"
+      >
         <template #title>
           <div class="flex items-center gap-4">
             <UIcon v-if="provider.logoIcon" :name="provider.logoIcon" class="w-10 text-black dark:text-white" />

diff --git a/pages/modules/index.vue b/pages/modules/index.vue
@@ -162,7 +162,10 @@ const { copy } = useCopyToClipboard()
             :to="`/modules/${module.name}`"
             :title="module.name"
             class="flex flex-col overflow-hidden group"
-            :ui="{ body: { base: 'flex-1' }, footer: { base: 'bg-gray-100/50 dark:bg-gray-800/50' } }"
+            :ui="{
+              body: { base: 'flex-1' },
+              footer: { base: 'bg-gray-100/50 dark:bg-gray-800/50' }
+            }"
           >
             <template #icon>
               <UAvatar

diff --git a/pages/showcase.vue b/pages/showcase.vue
@@ -41,7 +41,10 @@ await fetchList()
             target="_blank"
             :title="showcase.title || showcase.hostname"
             :description="showcase.hostname"
-            :ui="{ header: { base: 'aspect-w-4 aspect-h-2', padding: '' }, body: { padding: '!p-4' } }"
+            :ui="{
+              header: { base: 'aspect-w-4 aspect-h-2', padding: '' },
+              body: { padding: '!p-4' }
+            }"
             class="overflow-hidden"
           >
             <template #header>