Merge remote-tracking branch 'upstream/main'

app/app.vue

@@ -65,25 +65,21 @@ onMounted(() => {
   <div>
     <NuxtLoadingIndicator />
 
-    <!-- <AppBanner
-      id="nuxt-nation-2024"
-      to="https://vi.to/hubs/nuxtnation/pages/stream"
+    <AppBanner
+      id="black-friday-2024-mn"
+      to="https://masteringnuxt.com/#plans"
     >
-      <div class="flex items-center gap-1">
-        <UIcon
-          name="i-ph-microphone-stage-duotone"
-          class="w-5 h-5 flex-shrink-0 pointer-events-none hidden sm:inline-block"
-        />
-        <span><span class="font-semibold">Nuxt Nation</span> conference is live.</span>
+      <div class="flex items-center gap-1 text-black">
+        <span><span class="font-bold dark:bg-black dark:text-white bg-white text-black px-2 py-1 rounded text-xs">37% OFF</span> during <span class="font-semibold">Black Friday</span> at <span class="font-semibold">Mastering Nuxt</span>.</span>
         <UButton
-          label="Watch now"
+          label="Shop now"
           color="white"
           trailing-icon="i-ph-arrow-right"
           size="2xs"
           class="rounded-full ml-1"
         />
       </div>
-    </AppBanner> -->
+    </AppBanner>
     <!-- <AppBanner
       id="nuxt-certification-early-bird-launch"
       to="https://certification.nuxt.com"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt.com",
   "version": "0.3.11",
-  "packageManager": "pnpm@9.13.2",
+  "packageManager": "pnpm@9.14.2",
   "scripts": {
     "dev": "nuxi dev",
     "build": "nuxi build",
@@ -17,7 +17,7 @@
     "@iconify-json/logos": "^1.2.3",
     "@iconify-json/octicon": "^1.2.1",
     "@iconify-json/ph": "^1.2.1",
-    "@iconify-json/simple-icons": "^1.2.11",
+    "@iconify-json/simple-icons": "^1.2.12",
     "@iconify-json/uil": "^1.2.1",
     "@nuxt/content": "^2.13.4",
     "@nuxt/fonts": "^0.10.2",
@@ -26,13 +26,13 @@
     "@nuxt/ui-pro": "^1.5.0",
     "@nuxthq/studio": "^2.2.1",
     "@nuxtjs/html-validator": "^1.8.2",
-    "@nuxtjs/plausible": "^1.0.3",
-    "@vueuse/components": "^11.2.0",
-    "@vueuse/core": "^11.2.0",
-    "@vueuse/nuxt": "^11.2.0",
+    "@nuxtjs/plausible": "^1.1.1",
+    "@vueuse/components": "^11.3.0",
+    "@vueuse/core": "^11.3.0",
+    "@vueuse/nuxt": "^11.3.0",
     "feed": "^4.2.2",
     "floating-vue": "^5.2.2",
-    "nuxt": "^3.14.159",
+    "nuxt": "^3.14.1592",
     "nuxt-og-image": "^3.0.8",
     "ofetch": "^1.4.1",
     "perfect-debounce": "^1.0.0",
@@ -42,18 +42,18 @@
     "ufo": "^1.5.4"
   },
   "devDependencies": {
-    "@nuxt/eslint": "^0.6.1",
+    "@nuxt/eslint": "^0.7.1",
     "@nuxt/test-utils": "^3.14.4",
     "@nuxtjs/turnstile": "^0.9.11",
     "@testing-library/vue": "^8.1.0",
     "capture-website": "^4.1.0",
-    "eslint": "^9.14.0",
+    "eslint": "^9.15.0",
     "nuxt-content-twoslash": "0.1.1",
-    "shiki": "^1.23.0",
+    "shiki": "^1.23.1",
     "twoslash": "^0.2.12",
     "typescript": "^5.6.3",
     "vitest": "^2.1.5",
-    "vue": "^3.5.12",
+    "vue": "^3.5.13",
     "vue-tsc": "^2.1.10"
   },
   "resolutions": {