@nuxtjs/seo 2.0.0-rc.7 → 2.0.0-rc.9

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "seo",
-  "version": "2.0.0-rc.6"
+  "version": "2.0.0-rc.8"
 }

package/dist/module.mjs

@@ -1,5 +1,5 @@
-import { defineNuxtModule, createResolver, useLogger, installModule, addPlugin, hasNuxtModule, addImports, addServerHandler } from '@nuxt/kit';
-import chalk from 'chalk';
+import { defineNuxtModule, createResolver, useLogger, installModule, hasNuxtModule, addPlugin, addImports, addServerHandler } from '@nuxt/kit';
+import { colors } from 'consola/utils';
 import { installNuxtSiteConfig } from 'nuxt-site-config-kit';
 import { readPackageJSON } from 'pkg-types';
 import { $fetch } from 'ofetch';
@@ -44,9 +44,20 @@ const module = defineNuxtModule({
     for (const module of Modules)
       await installModule(await resolvePath(module));
     if (config.automaticDefaults) {
-      addPlugin({
-        src: resolve("./runtime/nuxt/plugin/defaults")
-      });
+      if (hasNuxtModule("@nuxtjs/i18n")) {
+        addPlugin({
+          src: resolve(`./runtime/nuxt/plugin/defaultsWaitI18n.server`),
+          mode: "server"
+        });
+        addPlugin({
+          src: resolve(`./runtime/nuxt/plugin/defaults`),
+          mode: "client"
+        });
+      } else {
+        addPlugin({
+          src: resolve(`./runtime/nuxt/plugin/defaults`)
+        });
+      }
     }
     if (config.fallbackTitle) {
       addPlugin({
@@ -83,7 +94,7 @@ const module = defineNuxtModule({
         middleware: true
       });
     }
-    if (config.splash) {
+    if (config.splash && !version.includes("rc") && nuxt.options.dev) {
       logger.log("");
       let latestTag = `v${version}`;
       latestTag = (await $fetch("https://ungh.unjs.io/repos/harlan-zw/nuxt-seo/releases/latest", {
@@ -92,10 +103,10 @@ const module = defineNuxtModule({
         return { release: { tag: `v${version}` } };
       })).release.tag;
       const upToDate = latestTag === `v${version}`;
-      logger.log(`${chalk.green("Nuxt SEO")} ${chalk.yellow(`v${version}`)} ${chalk.gray(`by ${chalk.underline("@harlan_zw")}`)}`);
+      logger.log(`${colors.green("Nuxt SEO")} ${colors.yellow(`v${version}`)} ${colors.gray(`by ${colors.underline("@harlan_zw")}`)}`);
       if (!upToDate)
-        logger.log(`${chalk.gray("  \u251C\u2500 ")}\u{1F389} New version available!${chalk.gray(` Run ${chalk.underline(`npm i @nuxtjs/seo@${latestTag}`)} to update.`)}`);
-      logger.log(chalk.dim("  \u2514\u2500 \u{1F9EA} Help get Nuxt SEO stable by providing feedback https://github.com/harlan-zw/nuxt-seo/discussions/108"));
+        logger.log(`${colors.gray("  \u251C\u2500 ")}\u{1F389} New version available!${colors.gray(` Run ${colors.underline(`npm i @nuxtjs/seo@${latestTag}`)} to update.`)}`);
+      logger.log(colors.dim("  \u2514\u2500 \u{1F9EA} Help get Nuxt SEO stable by providing feedback https://github.com/harlan-zw/nuxt-seo/discussions/108"));
       logger.log("");
     }
   }

package/dist/runtime/nuxt/composables/useBreadcrumbItems.d.ts

@@ -70,7 +70,7 @@ export interface BreadcrumbItemProps extends NuxtUIBreadcrumbItem {
      * @default 'page'
      */
     ariaCurrent?: 'page' | 'step' | 'location' | 'date' | 'time' | boolean | 'true' | 'false';
-    to: string;
+    to?: string;
     ariaLabel?: string;
     separator?: boolean | string;
     class?: (string | string[] | undefined)[] | string;

package/dist/runtime/nuxt/composables/useBreadcrumbItems.mjs

@@ -3,6 +3,7 @@ import { defu } from "defu";
 import { pathBreadcrumbSegments } from "../../pure/breadcrumbs.mjs";
 import {
   computed,
+  createSitePathResolver,
   defineBreadcrumb,
   toValue,
   useI18n,
@@ -21,6 +22,10 @@ export function useBreadcrumbItems(options = {}) {
   const router = useRouter();
   const routes = router.getRoutes();
   const i18n = useI18n();
+  const siteResolver = createSitePathResolver({
+    canonical: true,
+    absolute: true
+  });
   const items = computed(() => {
     let rootNode = "/";
     if (i18n) {
@@ -50,7 +55,7 @@ export function useBreadcrumbItems(options = {}) {
       const routeName = route ? String(route.name || route.path) : item.to === "/" ? "index" : "unknown";
       let [name] = routeName.split("___");
       if (name === "unknown")
-        name = item.to.split("/").pop() || "";
+        name = (item.to || "").split("/").pop() || "";
       if (routeMeta.breadcrumb) {
         item = {
           ...item,
@@ -84,7 +89,7 @@ export function useBreadcrumbItems(options = {}) {
           id: `#${options.id || "breadcrumb"}`,
           itemListElement: items.value.map((item) => ({
             name: item.label || item.ariaLabel,
-            item: item.to
+            item: item.to ? siteResolver(item.to) : void 0
           }))
         };
       }))

package/dist/runtime/nuxt/logic/applyDefaults.d.ts

@@ -0,0 +1 @@
+export declare function applyDefaults(): void;

package/dist/runtime/nuxt/logic/applyDefaults.mjs

@@ -0,0 +1,46 @@
+import {
+  computed,
+  createSitePathResolver,
+  useHead,
+  useRoute,
+  useSeoMeta,
+  useServerHead,
+  useSiteConfig
+} from "#imports";
+export function applyDefaults() {
+  const siteConfig = useSiteConfig();
+  const route = useRoute();
+  const resolveUrl = createSitePathResolver({ withBase: true, absolute: true });
+  const canonicalUrl = computed(() => resolveUrl(route.path || "/").value || route.path);
+  const minimalPriority = {
+    // give nuxt.config values higher priority
+    tagPriority: 101
+  };
+  useHead({
+    link: [{ rel: "canonical", href: () => canonicalUrl.value }]
+  });
+  const locale = siteConfig.currentLocale || siteConfig.defaultLocale;
+  if (locale) {
+    useServerHead({
+      htmlAttrs: { lang: locale }
+    });
+  }
+  useHead({
+    templateParams: { site: siteConfig, siteName: siteConfig.name || "" },
+    titleTemplate: "%s %separator %siteName"
+  }, minimalPriority);
+  const seoMeta = {
+    ogType: "website",
+    ogUrl: () => canonicalUrl.value,
+    ogLocale: locale,
+    ogSiteName: siteConfig.name
+  };
+  if (siteConfig.description)
+    seoMeta.description = siteConfig.description;
+  if (siteConfig.twitter) {
+    const id = siteConfig.twitter.startsWith("@") ? siteConfig.twitter : `@${siteConfig.twitter}`;
+    seoMeta.twitterCreator = id;
+    seoMeta.twitterSite = id;
+  }
+  useSeoMeta(seoMeta, minimalPriority);
+}

package/dist/runtime/nuxt/plugin/defaults.mjs

@@ -1,50 +1,11 @@
+import { applyDefaults as setup } from "../logic/applyDefaults.mjs";
 import {
-  computed,
-  createSitePathResolver,
-  defineNuxtPlugin,
-  useHead,
-  useRoute,
-  useSeoMeta,
-  useServerHead,
-  useSiteConfig
+  defineNuxtPlugin
 } from "#imports";
 export default defineNuxtPlugin({
   name: "nuxt-seo:defaults",
-  setup() {
-    const siteConfig = useSiteConfig();
-    const route = useRoute();
-    const resolveUrl = createSitePathResolver({ withBase: true, absolute: true });
-    const canonicalUrl = computed(() => resolveUrl(route.path || "/").value || route.path);
-    const minimalPriority = {
-      // give nuxt.config values higher priority
-      tagPriority: 101
-    };
-    useHead({
-      link: [{ rel: "canonical", href: () => canonicalUrl.value }]
-    });
-    const locale = siteConfig.currentLocale || siteConfig.defaultLocale;
-    if (locale) {
-      useServerHead({
-        htmlAttrs: { lang: locale }
-      });
-    }
-    useHead({
-      templateParams: { site: siteConfig, siteName: siteConfig.name || "" },
-      titleTemplate: "%s %separator %siteName"
-    }, minimalPriority);
-    const seoMeta = {
-      ogType: "website",
-      ogUrl: () => canonicalUrl.value,
-      ogLocale: locale,
-      ogSiteName: siteConfig.name
-    };
-    if (siteConfig.description)
-      seoMeta.description = siteConfig.description;
-    if (siteConfig.twitter) {
-      const id = siteConfig.twitter.startsWith("@") ? siteConfig.twitter : `@${siteConfig.twitter}`;
-      seoMeta.twitterCreator = id;
-      seoMeta.twitterSite = id;
-    }
-    useSeoMeta(seoMeta, minimalPriority);
-  }
+  env: {
+    islands: false
+  },
+  setup
 });

package/dist/runtime/nuxt/plugin/defaultsWaitI18n.server.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/dist/runtime/nuxt/plugin/defaultsWaitI18n.server.mjs

@@ -0,0 +1,14 @@
+import { applyDefaults as setup } from "../logic/applyDefaults.mjs";
+import { defineNuxtPlugin } from "#imports";
+export default defineNuxtPlugin({
+  name: "nuxt-seo:defaults",
+  env: {
+    islands: false
+  },
+  // we need to wait for the i18n plugin to run first
+  dependsOn: [
+    // @ts-expect-error dynamic
+    "nuxt-site-config:i18n"
+  ],
+  setup
+});

package/dist/runtime/nuxt/plugin/titles.mjs

@@ -10,6 +10,9 @@ function titleCase(s) {
 }
 export default defineNuxtPlugin({
   name: "nuxt-seo:fallback-titles",
+  env: {
+    islands: false
+  },
   setup() {
     const route = useRoute();
     const title = computed(() => {

package/dist/runtime/nuxt/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../../../.nuxt/tsconfig.json"
+}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nuxtjs/seo",
   "type": "module",
-  "version": "2.0.0-rc.7",
-  "packageManager": "pnpm@8.15.1",
+  "version": "2.0.0-rc.9",
+  "packageManager": "pnpm@8.15.4",
   "description": "The all-in-one SEO layer for Nuxt 3.",
   "author": {
     "name": "Harlan Wilton",
@@ -32,47 +32,48 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "^3.10.0",
-    "@nuxtjs/sitemap": "^5.1.0",
-    "chalk": "^5.3.0",
+    "@nuxt/kit": "^3.10.3",
+    "@nuxtjs/sitemap": "^5.1.2",
     "defu": "^6.1.4",
-    "nuxt-link-checker": "^3.0.0-rc.6",
-    "nuxt-og-image": "^3.0.0-rc.37",
-    "nuxt-schema-org": "^3.3.4",
-    "nuxt-seo-experiments": "^4.0.0-rc.2",
+    "nuxt-link-checker": "^3.0.0-rc.7",
+    "nuxt-og-image": "^3.0.0-rc.42",
+    "nuxt-schema-org": "^3.3.6",
+    "nuxt-seo-experiments": "4.0.0-rc.5",
     "nuxt-simple-robots": "^4.0.0-rc.14",
-    "nuxt-site-config": "^2.2.9",
-    "nuxt-site-config-kit": "^2.2.9",
+    "nuxt-site-config": "^2.2.11",
+    "nuxt-site-config-kit": "^2.2.11",
     "pkg-types": "^1.0.3",
-    "ufo": "^1.3.2"
+    "ufo": "^1.4.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.6.3",
+    "@antfu/eslint-config": "^2.8.0",
     "@nuxt/module-builder": "^0.5.5",
-    "@nuxt/schema": "^3.10.0",
+    "@nuxt/schema": "^3.10.3",
     "@nuxt/test-utils": "3.11.0",
-    "@nuxt/ui": "^2.13.0",
-    "@nuxtjs/i18n": "8.0.1",
-    "bumpp": "^9.3.0",
-    "eslint": "^8.56.0",
+    "@nuxt/ui": "^2.14.2",
+    "@nuxtjs/i18n": "8.1.1",
+    "bumpp": "^9.4.0",
+    "eslint": "^8.57.0",
     "execa": "^8.0.1",
-    "nitropack": "^2.8.1",
-    "nuxt": "^3.10.0",
-    "nuxt-icon": "^0.6.8",
-    "typescript": "^5.3.3",
-    "vitest": "^1.2.2"
+    "nitropack": "^2.9.3",
+    "nuxt": "^3.10.3",
+    "nuxt-icon": "^0.6.9",
+    "typescript": "^5.4.2",
+    "vitest": "^1.3.1"
   },
   "build": {
     "externals": [
-      "ofetch"
+      "ofetch",
+      "consola/utils"
     ]
   },
   "scripts": {
     "build": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxt-module-build build",
     "dev": "nuxi dev .playground",
+    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare .playground",
     "lint": "eslint . --fix",
     "release": "pnpm build && bumpp && pnpm -r publish --access public",
     "test": "nuxi prepare .playground && vitest",
-    "typecheck": "tsc --noEmit --strict"
+    "typecheck": "npx vue-tsc --noEmit --strict"
   }
 }