Merge remote-tracking branch 'upstream/main'

# Conflicts: # content/7.blog/20.v3-10.md
translation-gang · Dec 15, 2024 · c78fdb2 · c78fdb2
2 parents 48095c5 + 4a4ff80
commit c78fdb2
Show file tree

Hide file tree

Showing 36 changed files with 1,437 additions and 1,448 deletions.
diff --git a/app/app.vue b/app/app.vue
@@ -66,46 +66,28 @@ onMounted(() => {
     <NuxtLoadingIndicator />
 
     <AppBanner
-      id="black-friday-2024-nuxt-ui"
-      to="https://ui.nuxt.com/pro/pricing?utm_source=nuxt_website&utm_medium=banner"
+      id="vue-ams-2025"
+      to="https://eventix.shop/kb2j4ewn"
     >
       <div class="flex items-center gap-1 text-black">
         <UIcon
-          name="i-ri-discount-percent-fill"
-          class="w-5 h-5 flex-shrink-0 pointer-events-none"
+          name="i-ph-microphone-stage-duotone"
+          class="w-5 h-5 flex-shrink-0 pointer-events-none hidden md:inline-flex"
         />
         <span>
-          <span class="font-bold pr-1">Black Friday Week</span>
-          <span class="font-bold dark:bg-black dark:text-white bg-white text-black px-2 py-1 rounded text-xs">20% OFF</span> on <span class="font-semibold">Nuxt UI Pro</span> until <span class="font-semibold">Dec 2nd</span></span>
+          Don't miss <span class="font-semibold">Vue.js Amsterdam</span> <span class="lg:hidden">in March </span>2025!
+          <span class="hidden lg:inline">Join 1000+ Vue developers this March and <span class="font-semibold">save 10% with code NUXT</span>.</span>
+          <span class="lg:hidden">Save 10% with code NUXT.</span>
+        </span>
         <UButton
-          label="Shop now"
+          label="Get your ticket"
           color="white"
           trailing-icon="i-ph-arrow-right"
           size="2xs"
           class="rounded-full ml-1"
         />
       </div>
     </AppBanner>
-    <!-- <AppBanner
-      id="nuxt-certification-early-bird-launch"
-      to="https://certification.nuxt.com"
-    >
-      <div class="flex items-center gap-2">
-        <UIcon
-          name="i-ph-medal"
-          class="w-5 h-5 flex-shrink-0 pointer-events-none"
-        />
-        <span>The <span class="font-semibold">Nuxt Certification Program</span> by VueSchool is out!</span>
-        <UButton
-          color="white"
-          trailing-icon="i-ph-arrow-right"
-          size="2xs"
-          class="rounded-full"
-        >
-          Register
-        </UButton>
-      </div>
-    </AppBanner> -->
 
     <AppHeader :links="headerLinks" />
 

diff --git a/app/components/UInputCopy.vue b/app/components/UInputCopy.vue
@@ -4,6 +4,10 @@ defineProps({
     type: String,
     required: true
   },
+  label: {
+    type: String,
+    required: false
+  },
   size: {
     type: String as () => 'lg',
     default: 'lg'
@@ -14,7 +18,7 @@ const { copy, copied } = useClipboard()
 
 <template>
   <label>
-    <UInput :model-value="value" :size="size" disabled :ui="{ icon: { trailing: { pointer: '' } } }" icon="i-ph-terminal">
+    <UInput :model-value="label ? label : value" :size="size" disabled :ui="{ icon: { trailing: { pointer: '' } } }" icon="i-ph-terminal">
       <div class="absolute inset-0" :class="[copied ? 'cursor-default' : 'cursor-copy']" @click="copy(value)" />
       <template #trailing>
         <UButton

diff --git a/app/components/ads/AdsUIPro.vue b/app/components/ads/AdsUIPro.vue
@@ -8,18 +8,18 @@
       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" /> -->
-      <NuxtImg src="/assets/ads/nuxt-ui-pro-black-friday.png" width="168" height="105" alt="Nuxt UI Pro Black Friday" class="rounded" />
+      <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" />
+      <!-- <NuxtImg src="/assets/ads/nuxt-ui-pro-black-friday.png" width="168" height="105" alt="Nuxt UI Pro Black Friday" class="rounded" /> -->
     </template>
     <div class="inline-flex gap-1 my-2">
       <svg class="h-4 inline-block" viewBox="0 0 109 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path d="M30.4598 16.6748C30.6326 16.6748 30.7798 16.5315 30.7798 16.3548V8.9148C30.7798 8.9148 31.1798 9.6348 31.8998 10.8348L35.0198 16.1948C35.1626 16.494 35.4793 16.6748 35.7398 16.6748H37.8998V4.6748H35.7398C35.5959 4.6748 35.4198 4.79433 35.4198 4.9948V12.5148L33.9798 9.9548L31.0998 5.0748C30.9596 4.8261 30.6581 4.6748 30.3798 4.6748H28.2998V16.6748H30.4598Z" fill="white" />
-        <path d="M58.3798 8.0348H59.4198C59.6849 8.0348 59.8998 7.8199 59.8998 7.5548V5.4748H62.1398V8.0348H64.2998V9.9548H62.1398V13.3948C62.1398 14.2348 62.5444 14.5948 63.2598 14.5948H64.2998V16.6748H62.9398C61.0956 16.6748 59.8998 15.4805 59.8998 13.4748V9.9548H58.3798V8.0348Z" fill="white" />
-        <path d="M47.5798 8.0348V12.9948C47.5798 14.1151 47.1592 15.0595 46.5398 15.7148C45.9204 16.3701 45.0651 16.6748 43.8998 16.6748C42.7345 16.6748 41.7992 16.3701 41.1798 15.7148C40.5709 15.0595 40.1398 14.1151 40.1398 12.9948V8.0348H41.4198C41.6927 8.0348 41.9613 8.08456 42.1398 8.2748C42.3183 8.45447 42.3798 8.56001 42.3798 8.8348V12.9948C42.3798 13.6395 42.4163 14.0377 42.6998 14.3548C42.9832 14.6613 43.3329 14.7548 43.8998 14.7548C44.4772 14.7548 44.7363 14.6613 45.0198 14.3548C45.3032 14.0377 45.3398 13.6395 45.3398 12.9948V8.8348C45.3398 8.56001 45.4013 8.38504 45.5798 8.1948C45.7366 8.02766 45.902 8.0316 46.1398 8.0348C46.1726 8.03524 46.2667 8.0348 46.2998 8.0348H47.5798Z" fill="white" />
-        <path d="M54.3798 12.1948L57.0998 8.0348H55.0198C54.7576 8.0348 54.5247 8.12887 54.3798 8.3548L53.0998 10.2748L51.8998 8.4348C51.7548 8.20886 51.4419 8.0348 51.1798 8.0348H49.1798L51.8998 12.1148L48.9398 16.6748H51.0198C51.2798 16.6748 51.5144 16.4178 51.6598 16.1948L53.0998 14.0348L54.6198 16.2748C54.7652 16.4978 54.9998 16.6748 55.2598 16.6748H57.3398L54.3798 12.1948Z" fill="white" />
+        <path d="M30.4598 16.6748C30.6326 16.6748 30.7798 16.5315 30.7798 16.3548V8.9148C30.7798 8.9148 31.1798 9.6348 31.8998 10.8348L35.0198 16.1948C35.1626 16.494 35.4793 16.6748 35.7398 16.6748H37.8998V4.6748H35.7398C35.5959 4.6748 35.4198 4.79433 35.4198 4.9948V12.5148L33.9798 9.9548L31.0998 5.0748C30.9596 4.8261 30.6581 4.6748 30.3798 4.6748H28.2998V16.6748H30.4598Z" fill="currentColor" />
+        <path d="M58.3798 8.0348H59.4198C59.6849 8.0348 59.8998 7.8199 59.8998 7.5548V5.4748H62.1398V8.0348H64.2998V9.9548H62.1398V13.3948C62.1398 14.2348 62.5444 14.5948 63.2598 14.5948H64.2998V16.6748H62.9398C61.0956 16.6748 59.8998 15.4805 59.8998 13.4748V9.9548H58.3798V8.0348Z" fill="currentColor" />
+        <path d="M47.5798 8.0348V12.9948C47.5798 14.1151 47.1592 15.0595 46.5398 15.7148C45.9204 16.3701 45.0651 16.6748 43.8998 16.6748C42.7345 16.6748 41.7992 16.3701 41.1798 15.7148C40.5709 15.0595 40.1398 14.1151 40.1398 12.9948V8.0348H41.4198C41.6927 8.0348 41.9613 8.08456 42.1398 8.2748C42.3183 8.45447 42.3798 8.56001 42.3798 8.8348V12.9948C42.3798 13.6395 42.4163 14.0377 42.6998 14.3548C42.9832 14.6613 43.3329 14.7548 43.8998 14.7548C44.4772 14.7548 44.7363 14.6613 45.0198 14.3548C45.3032 14.0377 45.3398 13.6395 45.3398 12.9948V8.8348C45.3398 8.56001 45.4013 8.38504 45.5798 8.1948C45.7366 8.02766 45.902 8.0316 46.1398 8.0348C46.1726 8.03524 46.2667 8.0348 46.2998 8.0348H47.5798Z" fill="currentColor" />
+        <path d="M54.3798 12.1948L57.0998 8.0348H55.0198C54.7576 8.0348 54.5247 8.12887 54.3798 8.3548L53.0998 10.2748L51.8998 8.4348C51.7548 8.20886 51.4419 8.0348 51.1798 8.0348H49.1798L51.8998 12.1148L48.9398 16.6748H51.0198C51.2798 16.6748 51.5144 16.4178 51.6598 16.1948L53.0998 14.0348L54.6198 16.2748C54.7652 16.4978 54.9998 16.6748 55.2598 16.6748H57.3398L54.3798 12.1948Z" fill="currentColor" />
         <path d="M13.7398 16.6748H22.6198C22.9032 16.6748 23.1744 16.5752 23.4198 16.4348C23.6652 16.2944 23.9182 16.1181 24.0598 15.8748C24.2014 15.6315 24.2999 15.3556 24.2998 15.0747C24.2997 14.7939 24.2016 14.518 24.0598 14.2749L18.0598 3.9548C17.9182 3.7116 17.7451 3.53522 17.4998 3.3948C17.2544 3.25438 16.9031 3.1548 16.6198 3.1548C16.3365 3.1548 16.0651 3.25438 15.8198 3.3948C15.5744 3.53522 15.4014 3.7116 15.2598 3.9548L13.7398 6.5948L10.6998 1.47462C10.5581 1.23143 10.3852 0.975197 10.1398 0.834805C9.89438 0.694412 9.62316 0.674805 9.3398 0.674805C9.05643 0.674805 8.78522 0.694412 8.5398 0.834805C8.29438 0.975197 8.04154 1.23143 7.8998 1.47462L0.459805 14.2749C0.317963 14.518 0.299928 14.7939 0.299805 15.0747C0.299682 15.3556 0.318177 15.6315 0.459805 15.8748C0.601433 16.118 0.8544 16.2944 1.0998 16.4348C1.34521 16.5752 1.61643 16.6748 1.8998 16.6748H7.4998C9.71873 16.6748 11.3338 15.6794 12.4598 13.7948L15.1798 9.0748L16.6198 6.5948L21.0198 14.1148H15.1798L13.7398 16.6748ZM7.4198 14.1148H3.4998L9.3398 4.0348L12.2998 9.0748L10.3391 12.4928C9.59134 13.7156 8.73881 14.1148 7.4198 14.1148Z" fill="#00DC82" />
-        <path d="M76.94 5.4751H75.34C74.9819 5.4751 74.6941 5.47025 74.46 5.7151C74.2259 5.94634 74.3 6.08144 74.3 6.4351V11.9551C74.3 12.7848 74.1918 13.227 73.82 13.6351C73.4482 14.0296 72.9774 14.1951 72.22 14.1951C71.4764 14.1951 70.9118 14.0296 70.54 13.6351C70.1682 13.227 70.14 12.7848 70.14 11.9551V6.4351C70.14 6.08144 70.1341 5.94634 69.9 5.7151C69.6659 5.47026 69.378 5.4751 69.02 5.4751H67.5V11.9551C67.5 13.397 67.9013 14.5517 68.7 15.3951C69.5125 16.2384 70.6914 16.6751 72.22 16.6751C73.7486 16.6751 74.9275 16.2384 75.74 15.3951C76.5525 14.5517 76.94 13.3969 76.94 11.9551V5.4751Z" fill="white" />
-        <path fill-rule="evenodd" clip-rule="evenodd" d="M80.2997 5.47696L81.8996 5.4751V6.8351L81.8997 10.9151V13.1557L81.8997 15.1551L81.8997 15.7954C81.8997 16.1101 81.8984 16.2294 81.6597 16.4352C81.421 16.6531 81.0647 16.6751 80.6997 16.6751H79.1797V15.1556L79.1797 11.076V6.27682C79.1797 5.96771 79.181 5.83905 79.4197 5.63694C79.6452 5.44597 79.9346 5.47696 80.2997 5.47696Z" fill="white" />
+        <path d="M76.94 5.4751H75.34C74.9819 5.4751 74.6941 5.47025 74.46 5.7151C74.2259 5.94634 74.3 6.08144 74.3 6.4351V11.9551C74.3 12.7848 74.1918 13.227 73.82 13.6351C73.4482 14.0296 72.9774 14.1951 72.22 14.1951C71.4764 14.1951 70.9118 14.0296 70.54 13.6351C70.1682 13.227 70.14 12.7848 70.14 11.9551V6.4351C70.14 6.08144 70.1341 5.94634 69.9 5.7151C69.6659 5.47026 69.378 5.4751 69.02 5.4751H67.5V11.9551C67.5 13.397 67.9013 14.5517 68.7 15.3951C69.5125 16.2384 70.6914 16.6751 72.22 16.6751C73.7486 16.6751 74.9275 16.2384 75.74 15.3951C76.5525 14.5517 76.94 13.3969 76.94 11.9551V5.4751Z" fill="currentColor" />
+        <path fill-rule="evenodd" clip-rule="evenodd" d="M80.2997 5.47696L81.8996 5.4751V6.8351L81.8997 10.9151V13.1557L81.8997 15.1551L81.8997 15.7954C81.8997 16.1101 81.8984 16.2294 81.6597 16.4352C81.421 16.6531 81.0647 16.6751 80.6997 16.6751H79.1797V15.1556L79.1797 11.076V6.27682C79.1797 5.96771 79.181 5.83905 79.4197 5.63694C79.6452 5.44597 79.9346 5.47696 80.2997 5.47696Z" fill="currentColor" />
         <path d="M85.0996 16.6751V5.4751H89.6596C90.4335 5.4751 91.0977 5.57827 91.6596 5.8751C92.2321 6.17193 92.7228 6.62505 93.0196 7.1551C93.3164 7.68515 93.4196 8.30603 93.4196 8.99509C93.4196 9.67356 93.3164 10.305 93.0196 10.8351C92.7228 11.3651 92.2321 11.7277 91.6596 12.0351C91.0977 12.3319 90.4335 12.5151 89.6596 12.5151H87.4996V16.6751H85.0996ZM89.4996 10.5151C90.0297 10.5151 90.4346 10.4013 90.6996 10.1151C90.9646 9.81827 91.0996 9.42974 91.0996 8.99509C91.0996 8.56045 90.9646 8.16132 90.6996 7.8751C90.4346 7.57827 90.0297 7.4751 89.4996 7.4751H87.4996V10.5151H89.4996Z" fill="#00DC82" />
         <path d="M98.3796 10.5151C97.8495 10.5151 97.4446 10.6723 97.1796 11.0751C96.9146 11.4779 96.7796 12.0448 96.7796 12.7551V16.6751H94.5396V8.67509H96.2996C96.5647 8.67509 96.7796 8.89 96.7796 9.15509V9.95509C96.9916 9.46745 97.1922 9.19651 97.4996 8.99509C97.8176 8.79368 98.2813 8.67509 98.7796 8.67509H99.6596V10.5151H98.3796Z" fill="#00DC82" />
         <path d="M104.22 16.6751C103.414 16.6751 102.706 16.4649 102.06 16.1151C101.413 15.7547 100.9 15.3005 100.54 14.6751C100.179 14.039 99.9796 13.2996 99.9796 12.5151C99.9796 11.7306 100.179 11.0606 100.54 10.4351C100.9 9.79903 101.413 9.26493 102.06 8.91509C102.706 8.55466 103.414 8.4351 104.22 8.4351C105.025 8.4351 105.813 8.55466 106.46 8.91509C107.106 9.26493 107.539 9.79903 107.9 10.4351C108.26 11.0606 108.46 11.7306 108.46 12.5151C108.46 13.2996 108.26 14.039 107.9 14.6751C107.539 15.3005 107.106 15.7547 106.46 16.1151C105.813 16.4649 105.025 16.6751 104.22 16.6751ZM104.22 14.7551C104.813 14.7551 105.289 14.5285 105.66 14.1151C106.031 13.7017 106.22 13.1724 106.22 12.5151C106.22 11.8472 106.031 11.3285 105.66 10.9151C105.289 10.5017 104.813 10.2751 104.22 10.2751C103.626 10.2751 103.151 10.5017 102.78 10.9151C102.409 11.3285 102.22 11.8472 102.22 12.5151C102.22 13.1724 102.409 13.7017 102.78 14.1151C103.151 14.5285 103.626 14.7551 104.22 14.7551Z" fill="#00DC82" />

diff --git a/app/pages/index.vue b/app/pages/index.vue
@@ -80,7 +80,7 @@ useSeoMeta({
               Nuxt за 100 секунд
             </UButton>
           </div>
-          <UInputCopy value="npx nuxi@latest init <my-app>" class="w-full" />
+          <UInputCopy value="npx nuxi@latest init " label="npx nuxi@latest init <my-app>" class="w-full" />
         </div>
 
         <UModal v-model="videoModalOpen" :ui="{ width: 'sm:max-w-4xl lg:max-w-5xl aspect-[16/9]' }">

diff --git a/content/7.blog/20.v3-10.md b/content/7.blog/20.v3-10.md
@@ -66,9 +66,6 @@ const passwordId = useId()
 </template>
 ```
 
-::read-more{to="/docs/api/composables/use-id"}
-::
-
 ### ✍️ Расширение `app/router.options`
 
 Теперь авторы модулей могут добавлять свои собственные файлы `router.options` ([#24922](https://github.com/nuxt/nuxt/pull/24922)). Новый хук `pages:routerOptions` позволяет авторам модулей выполнять такие действия, как добавление пользовательского `scrollBehavior` или расширение маршрутов во время выполнения.

diff --git a/content/7.blog/27.v3-14.md b/content/7.blog/27.v3-14.md
@@ -22,7 +22,7 @@ Loading the nuxt config file, as well as modules and other build-time code, is n
 
 You should never import Vue app code in your nitro code (or the other way around). But this has meant a friction point when it comes to sharing types or utilities that _don't_ rely on the nitro/vue contexts.
 
-For this, we have a new `shared/` folder ([#28682](https://github.com/nuxt/nuxt/pull/28682)). You can't import Vue or nitro code _into_ files in this folder, but it produces auto-imports you can consume throughout the rest of your app.
+For this, we have a new `shared/` folder ([#28682](https://github.com/nuxt/nuxt/pull/28682)). You can't import Vue or nitro code _into_ files in this folder, but it produces auto-imports (if you're using `compatibilityVersion: 4`) which you can consume throughout the rest of your app.
 
 If needed you can use the new `#shared` alias which points to this folder.
 
@@ -46,7 +46,7 @@ We now have a new `addServerTemplate` utility ([#29320](https://github.com/nuxt/
 
 ### 🚧 v4 changes
 
-We've merged some changes which only take effect with `compatibilityVersion: 4`, but which you can opt-into earlier.
+We've merged some changes which only take effect with `compatibilityVersion: 4`, but which [you can opt-into earlier](/docs/getting-started/upgrade#testing-nuxt-4).
 
 1. previously, if you had a component like `~/components/App/Header.vue` this would be visible in your devtools as `<Header>`. From v4 we ensure this is `<AppHeader>`, but it's opt-in to avoid breaking any manual `<KeepAlive>` you might have implemented. ([#28745](https://github.com/nuxt/nuxt/pull/28745)).
 2. Nuxt scans page metadata from your files, before calling `pages:extend`. But this has led to some confusing behaviour, as pages added at this point do not end up having their page metadata respected. So we now do not scan metadata before calling `pages:extend`. Instead, we have a new `pages:resolved` hook, which is called after `pages:extend`, after all pages have been augmented with their metadata. I'd recommend opting into this by setting `experimental.scanPageMeta` to `after-resolve`, as it solves a number of bugs.