nuxt-seo-utils 8.6.1 → 9.0.0

package/dist/runtime/app/composables/polyfills.d.ts

@@ -1,8 +1,8 @@
 import type { ComputedRef } from 'vue';
-export declare function useSchemaOrg(): void;
+export declare function useSchemaOrg(_input?: unknown): void;
 export declare function defineWebSite(): void;
 export declare function defineWebPage(): void;
-export declare function defineBreadcrumb(): void;
+export declare function defineBreadcrumb(_input?: unknown): void;
 export declare function useI18n(): {
     t: (_: string, fallback: string, _options: any) => string;
     te: (_: string) => boolean;

package/dist/runtime/app/composables/polyfills.js

@@ -1,12 +1,12 @@
 import { computed, toValue } from "vue";
 import { useSiteConfig } from "#site-config/app/composables/useSiteConfig";
-export function useSchemaOrg() {
+export function useSchemaOrg(_input) {
 }
 export function defineWebSite() {
 }
 export function defineWebPage() {
 }
-export function defineBreadcrumb() {
+export function defineBreadcrumb(_input) {
 }
 export function useI18n() {
   const siteConfig = useSiteConfig({

package/dist/runtime/app/index.d.ts

@@ -0,0 +1,5 @@
+export type { BreadcrumbItemProps, BreadcrumbProps, ResolvedBreadcrumbProps } from './composables/useBreadcrumbItems.js';
+export { useBreadcrumbItems } from './composables/useBreadcrumbItems.js';
+export { useFallbackTitle } from './composables/useFallbackTitle.js';
+export type { ShareLinks, ShareLinksOptions, ShareLinkUtmParams, SharePlatform } from './composables/useShareLinks.js';
+export { useShareLinks } from './composables/useShareLinks.js';

package/dist/runtime/app/index.js

@@ -0,0 +1,3 @@
+export { useBreadcrumbItems } from "./composables/useBreadcrumbItems.js";
+export { useFallbackTitle } from "./composables/useFallbackTitle.js";
+export { useShareLinks } from "./composables/useShareLinks.js";

package/dist/runtime/app/logic/syncDerivedTags.js

@@ -20,24 +20,34 @@ export function ogImageEntryIds(entryTags) {
   return ids;
 }
 export function syncDerivedTags(tags, entriesWithOgImage) {
-  const winningOgImageEntries = new Set(tags.filter(isOgImage).map(entryOf));
-  const canonicalHref = tags.find((tag) => tag.tag === "link" && tag.props.rel === "canonical")?.props.href;
+  const winningOgImageEntries = /* @__PURE__ */ new Set();
+  let canonicalTag;
+  for (const tag of tags) {
+    if (isOgImage(tag))
+      winningOgImageEntries.add(entryOf(tag));
+    if (!canonicalTag && tag.tag === "link" && tag.props.rel === "canonical")
+      canonicalTag = tag;
+  }
+  const canonicalHref = canonicalTag?.props.href;
   const lostOgImage = (tag) => {
     const entry = entryOf(tag);
     return entry !== void 0 && entriesWithOgImage.has(entry) && !winningOgImageEntries.has(entry);
   };
-  return tags.flatMap((tag) => {
-    if (tag.tag !== "meta")
-      return [tag];
-    if (metaKey(tag)?.startsWith("og:image:") && lostOgImage(tag))
-      return [];
-    if (tag.key?.startsWith(TWITTER_IMAGE_FALLBACK_KEY) && lostOgImage(tag))
-      return [];
-    if (tag.key === OG_URL_KEY) {
-      if (typeof canonicalHref !== "string" || !canonicalHref)
-        return [];
-      return [{ ...tag, props: { ...tag.props, content: canonicalHref } }];
+  const result = [];
+  for (const tag of tags) {
+    if (tag.tag === "meta") {
+      if (metaKey(tag)?.startsWith("og:image:") && lostOgImage(tag))
+        continue;
+      if (tag.key?.startsWith(TWITTER_IMAGE_FALLBACK_KEY) && lostOgImage(tag))
+        continue;
+      if (tag.key === OG_URL_KEY) {
+        if (typeof canonicalHref !== "string" || !canonicalHref)
+          continue;
+        result.push({ ...tag, props: { ...tag.props, content: canonicalHref } });
+        continue;
+      }
     }
-    return [tag];
-  });
+    result.push(tag);
+  }
+  return result;
 }

package/dist/runtime/app/plugins/inferSeoMetaPlugin.js

@@ -1,6 +1,5 @@
 import { InferSeoMetaPlugin, TemplateParamsPlugin } from "@unhead/vue/plugins";
 import { defineNuxtPlugin, injectHead, useRuntimeConfig } from "nuxt/app";
-const disabledTwitterCard = "x-nuxt-seo-utils-disabled-twitter-card";
 export default defineNuxtPlugin(() => {
   const head = injectHead();
   if (!head)
@@ -8,19 +7,7 @@ export default defineNuxtPlugin(() => {
   const { automaticTwitterTags } = useRuntimeConfig().public["seo-utils"];
   head.use(TemplateParamsPlugin);
   if (automaticTwitterTags === false) {
-    head.use(InferSeoMetaPlugin({ twitterCard: disabledTwitterCard }));
-    head.use({
-      key: "nuxt-seo-utils:twitter-card-suppression",
-      hooks: {
-        "tags:beforeResolve": ({ tags }) => {
-          for (let i = tags.length - 1; i >= 0; i--) {
-            const tag = tags[i];
-            if (tag.tag === "meta" && tag.props.name === "twitter:card" && tag.props.content === disabledTwitterCard)
-              tags.splice(i, 1);
-          }
-        }
-      }
-    });
+    head.use(InferSeoMetaPlugin({ twitterCard: false }));
   } else {
     head.use(InferSeoMetaPlugin());
   }

package/dist/runtime/app/plugins/minifyScripts.server.js

@@ -1,5 +1,5 @@
 import { defineNuxtPlugin, injectHead } from "nuxt/app";
-import { JSON_TYPES, minifyCSS, minifyJS, minifyJSON, SKIP_JS_TYPES } from "../../shared/minify.js";
+import { JSON_TYPES, minifyCSS, minifyJSON } from "../../shared/minify.js";
 export default defineNuxtPlugin({
   enforce: "post",
   setup() {
@@ -25,14 +25,6 @@ export default defineNuxtPlugin({
                 }
                 continue;
               }
-              if (type && SKIP_JS_TYPES.has(type))
-                continue;
-              try {
-                const minified = minifyJS(content);
-                if (minified.length < content.length)
-                  tag.innerHTML = minified;
-              } catch {
-              }
             } else if (tag.tag === "style") {
               try {
                 const minified = minifyCSS(content);

package/dist/runtime/server/middleware/redirectCanonical.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("nuxt/server").EventHandler<string | undefined>;
 export default _default;

package/dist/runtime/server/middleware/redirectCanonical.js

@@ -1,11 +1,11 @@
+import { defineEventHandler, getRequestHost, sendRedirect } from "nuxt/server";
 import { joinURL } from "ufo";
-import { defineEventHandler, getRequestHost, sendRedirect, setHeader } from "#nuxtseo/h3";
 import { getSiteConfig } from "#site-config/server/composables/getSiteConfig";
 export default defineEventHandler((e) => {
   if (import.meta.prerender) {
     return;
   }
-  const path = e.path;
+  const path = e.url.pathname;
   if (path.startsWith("/_nuxt") || path.startsWith("/api")) {
     return;
   }
@@ -16,13 +16,13 @@ export default defineEventHandler((e) => {
   if (!siteConfig.url || siteConfig.env !== "production") {
     return;
   }
-  const siteConfigHostName = new URL(e.path, siteConfig.url).host;
+  const siteConfigHostName = new URL(e.url.pathname, siteConfig.url).host;
   const host = getRequestHost(e, { xForwardedHost: true });
-  if (e.headers.get("x-nuxt-seo-redirected") || host.includes("http") || host.replace("https://", "").includes(":")) {
+  if (e.req.headers.get("x-nuxt-seo-redirected") || host.includes("http") || host.replace("https://", "").includes(":")) {
     return;
   }
   if (host.split(":")[0] !== siteConfigHostName.split(":")[0]) {
-    setHeader(e, "x-nuxt-seo-redirected", "true");
-    return sendRedirect(e, joinURL(siteConfig.url, e.path), 301);
+    e.res.headers.set("x-nuxt-seo-redirected", "true");
+    return sendRedirect(e, joinURL(siteConfig.url, e.url.pathname + e.url.search), 301);
   }
 });

package/dist/runtime/server/middleware/redirects.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("nuxt/server").EventHandler<string | undefined>;
+export default _default;

package/dist/runtime/server/middleware/redirects.js

@@ -0,0 +1,21 @@
+import { createError, defineEventHandler, sendRedirect, useRuntimeConfig } from "nuxt/server";
+import { decodePath, joinURL, withoutBase } from "ufo";
+import { appendSearch, createRedirectMatcher, isAbsoluteUrl, REDIRECT_CACHE_CONTROL, resolveTarget } from "../../shared/redirects.js";
+let match;
+export default defineEventHandler((e) => {
+  const config = useRuntimeConfig();
+  match ||= createRedirectMatcher(config["seo-utils-redirects"]);
+  const baseURL = config.app.baseURL;
+  const path = decodePath(withoutBase(e.url.pathname, baseURL));
+  const rule = match(path);
+  if (!rule)
+    return;
+  if (rule._tag === "Gone") {
+    throw createError({ status: rule.statusCode, statusText: rule.statusCode === 410 ? "Gone" : "Not Found" });
+  }
+  const target = resolveTarget(rule, path);
+  const location = isAbsoluteUrl(target) ? target : joinURL(baseURL, target);
+  if (!e.res.headers.has("cache-control"))
+    e.res.headers.set("cache-control", REDIRECT_CACHE_CONTROL);
+  return sendRedirect(e, appendSearch(location, e.url.search), rule.statusCode);
+});

package/dist/runtime/server/middleware/resolveImagesInPagesDir.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("nuxt/server").EventHandler<Promise<NonSharedBuffer | undefined>>;
 export default _default;

package/dist/runtime/server/middleware/resolveImagesInPagesDir.js

@@ -1,16 +1,15 @@
 import fs from "node:fs";
-import { parseURL } from "ufo";
-import { defineEventHandler, setHeader } from "#nuxtseo/h3";
+import { defineEventHandler } from "nuxt/server";
 import { fileMapping } from "#seo-utils-virtual/pageDirImages";
 export default defineEventHandler(async (e) => {
-  const path = parseURL(e.path).pathname;
+  const path = e.url.pathname;
   if (fileMapping[path]) {
     if (path.endsWith(".svg"))
-      setHeader(e, "Content-Type", "image/svg+xml");
+      e.res.headers.set("Content-Type", "image/svg+xml");
     else if (path.endsWith(".png"))
-      setHeader(e, "Content-Type", "image/png");
+      e.res.headers.set("Content-Type", "image/png");
     else if (path.endsWith(".jpg") || path.endsWith(".jpeg"))
-      setHeader(e, "Content-Type", "image/jpeg");
+      e.res.headers.set("Content-Type", "image/jpeg");
     return fs.readFileSync(fileMapping[path]);
   }
 });

package/dist/runtime/server/plugins/minifyHtml.js

@@ -1,5 +1,5 @@
 import { defineNitroPlugin } from "#nuxtseo/nitro";
-import { JSON_TYPES, minifyCSS, minifyJS, minifyJSON, SKIP_JS_TYPES } from "../../shared/minify.js";
+import { JSON_TYPES, minifyCSS, minifyJSON } from "../../shared/minify.js";
 const INLINE_SCRIPT_RE = /<script(?![^>]+\bsrc\b)([^>]*)>([\s\S]*?)<\/script\s*>/gi;
 const INLINE_STYLE_RE = /<style([^>]*)>([\s\S]*?)<\/style\s*>/gi;
 const TYPE_ATTR_RE = /\btype\s*=\s*["']([^"']*)["']/i;
@@ -16,14 +16,7 @@ function minifyChunk(chunk) {
         return full;
       }
     }
-    if (type && SKIP_JS_TYPES.has(type))
-      return full;
-    try {
-      const m = minifyJS(content);
-      return m.length < content.length ? `<script${attrs}>${m}<\/script>` : full;
-    } catch {
-      return full;
-    }
+    return full;
   });
   out = out.replace(INLINE_STYLE_RE, (full, attrs, content) => {
     if (!content)

package/dist/runtime/server/routes/__nuxt-seo-utils/debug.d.ts

@@ -1,2 +1,28 @@
-declare const _default: any;
+declare const _default: import("nuxt/server").EventHandler<{
+    runtimeConfig: {
+        canonicalQueryWhitelist: string[];
+        canonicalLowercase: boolean;
+        automaticTwitterTags: boolean;
+        tagPriority: import("@unhead/vue").UseHeadOptions["tagPriority"];
+        separator?: string;
+        titleSeparator?: string;
+        colorModeIcons?: import("../../../types.js").ColorModeIconLinks;
+        version: {};
+        appBaseURL: string;
+    };
+    siteConfig: {
+        url: string;
+        name: any;
+        description: any;
+        env: any;
+        indexable: any;
+        trailingSlash: any;
+        titleSeparator: any;
+        defaultLocale: any;
+        currentLocale: any;
+        twitter: any;
+    };
+    headConfig: {};
+    path: string | string[];
+}>;
 export default _default;

package/dist/runtime/server/routes/__nuxt-seo-utils/debug.js

@@ -1,9 +1,8 @@
-import { defineEventHandler, getQuery } from "#nuxtseo/h3";
-import { useRuntimeConfig } from "#nuxtseo/nitro";
+import { defineEventHandler, getQuery, useRuntimeConfig } from "nuxt/server";
 import { getSiteConfig } from "#site-config/server/composables";
 export default defineEventHandler((e) => {
   const siteConfig = getSiteConfig(e);
-  const runtimeConfig = useRuntimeConfig(e);
+  const runtimeConfig = useRuntimeConfig();
   const seoUtils = runtimeConfig.public?.["seo-utils"] || {};
   const headConfig = runtimeConfig["seo-utils-head"] || { link: [], meta: [] };
   const query = getQuery(e);

package/dist/runtime/shared/minify.d.ts

@@ -1,10 +1,4 @@
 export declare const JSON_TYPES: Set<string>;
-export declare const SKIP_JS_TYPES: Set<string>;
-/**
- * Lightweight JS minifier in pure JS (no native deps).
- * Strips comments and collapses whitespace while preserving string literals.
- */
-export declare function minifyJS(code: string): string;
 /**
  * Lightweight CSS minifier in pure JS (no native deps).
  * Strips comments and collapses whitespace while preserving string literals.

package/dist/runtime/shared/minify.js

@@ -1,62 +1,5 @@
 export const JSON_TYPES = /* @__PURE__ */ new Set(["application/json", "application/ld+json"]);
-export const SKIP_JS_TYPES = /* @__PURE__ */ new Set(["application/json", "application/ld+json", "speculationrules", "importmap"]);
-const JS_MINIFY_CANDIDATE_RE = /[\s/]/;
 const CSS_MINIFY_CANDIDATE_RE = /[\s/]|;\}|0\.\d/;
-export function minifyJS(code) {
-  if (!JS_MINIFY_CANDIDATE_RE.test(code))
-    return code;
-  let result = "";
-  let last = "";
-  let i = 0;
-  const len = code.length;
-  const append = (value) => {
-    result += value;
-    last = value;
-  };
-  while (i < len) {
-    const ch = code[i];
-    if (ch === "'" || ch === '"' || ch === "`") {
-      const quote = ch;
-      append(ch);
-      i++;
-      while (i < len && code[i] !== quote) {
-        if (code[i] === "\\") {
-          append(code[i++]);
-        }
-        append(code[i++]);
-      }
-      if (i < len)
-        append(code[i++]);
-    } else if (ch === "/" && code[i + 1] === "/") {
-      i += 2;
-      while (i < len && code[i] !== "\n")
-        i++;
-    } else if (ch === "/" && code[i + 1] === "*") {
-      i += 2;
-      while (i < len && !(code[i] === "*" && code[i + 1] === "/"))
-        i++;
-      i += 2;
-    } else if (ch === " " || ch === "	" || ch === "\n" || ch === "\r") {
-      let hasNewline = false;
-      while (i < len && (code[i] === " " || code[i] === "	" || code[i] === "\n" || code[i] === "\r")) {
-        if (code[i] === "\n")
-          hasNewline = true;
-        i++;
-      }
-      const next = code[i];
-      if (hasNewline && last && next && last !== "{" && last !== "}" && last !== ";" && next !== "}" && next !== ";")
-        append("\n");
-      else if (last && next && isIdentChar(last) && isIdentChar(next))
-        append(" ");
-      else if (last && next && (last === "+" && next === "+" || last === "-" && next === "-"))
-        append(" ");
-    } else {
-      append(ch);
-      i++;
-    }
-  }
-  return result.trim();
-}
 export function minifyCSS(code) {
   if (!CSS_MINIFY_CANDIDATE_RE.test(code))
     return code;
@@ -132,9 +75,6 @@ export function minifyCSS(code) {
   }
   return result.trim();
 }
-function isIdentChar(ch) {
-  return ch >= "a" && ch <= "z" || ch >= "A" && ch <= "Z" || ch >= "0" && ch <= "9" || ch === "_" || ch === "$";
-}
 function isCSSBasePunctuation(ch) {
   return ch === "{" || ch === "}" || ch === ";" || ch === ":" || ch === ",";
 }

package/dist/runtime/shared/redirects.d.ts

@@ -0,0 +1,40 @@
+/** How an entry key matches request paths. `/old/**` matches `/old` and every path below it. */
+export type SourcePattern = {
+    _tag: 'Exact';
+    path: string;
+} | {
+    _tag: 'Prefix';
+    prefix: string;
+};
+/** The part of an entry the server needs to answer a request. */
+export type RedirectRule = {
+    _tag: 'Moved';
+    pattern: SourcePattern;
+    to: string;
+    statusCode: 301 | 308;
+} | {
+    _tag: 'Gone';
+    pattern: SourcePattern;
+    statusCode: 410 | 404;
+};
+export type MovedRule = Extract<RedirectRule, {
+    _tag: 'Moved';
+}>;
+/** Without a max-age, Chromium caches a 301 or 308 forever, so a later fix or removal never reaches returning visitors. */
+export declare const REDIRECT_CACHE_CONTROL = "public, max-age=3600";
+export declare function normalizePath(path: string): string;
+export declare function isAbsoluteUrl(to: string): boolean;
+/** Parse an entry key into a pattern, or return why the key is invalid. */
+export declare function parseSourcePattern(source: string): SourcePattern | string;
+export declare function matchesSource(pattern: SourcePattern, path: string): boolean;
+/**
+ * Index entries for lookup. An exact entry wins, then the longest matching prefix.
+ * The path must not include `app.baseURL`, the query string, or the hash.
+ */
+export declare function createRedirectMatcher<T extends {
+    pattern: SourcePattern;
+}>(entries: readonly T[]): (path: string) => T | undefined;
+/** The target for a request path. A target ending in `/**` gets the path below the source prefix. */
+export declare function resolveTarget(rule: MovedRule, path: string): string;
+/** Keep the request query string. A query on the target comes first. */
+export declare function appendSearch(target: string, search: string): string;

package/dist/runtime/shared/redirects.js

@@ -0,0 +1,59 @@
+import { joinURL, withoutTrailingSlash } from "ufo";
+export const REDIRECT_CACHE_CONTROL = "public, max-age=3600";
+export function normalizePath(path) {
+  return path === "/" ? path : withoutTrailingSlash(path);
+}
+export function isAbsoluteUrl(to) {
+  return /^https?:\/\//i.test(to);
+}
+export function parseSourcePattern(source) {
+  if (!source.startsWith("/") || source.startsWith("//"))
+    return "it must be a path that starts with `/`";
+  if (/[?#]/.test(source))
+    return "route matching ignores the query string and hash, so remove them";
+  const wildcard = source.endsWith("/**");
+  const base = wildcard ? source.slice(0, -3) : source;
+  if (/\*|\/:/.test(base))
+    return "only a trailing `/**` is supported";
+  if (wildcard) {
+    const prefix = normalizePath(base || "/");
+    return { _tag: "Prefix", prefix: prefix === "/" ? "" : prefix };
+  }
+  return { _tag: "Exact", path: normalizePath(base) };
+}
+export function matchesSource(pattern, path) {
+  const normalized = normalizePath(path);
+  if (pattern._tag === "Exact")
+    return pattern.path === normalized;
+  return normalized === (pattern.prefix || "/") || normalized.startsWith(`${pattern.prefix}/`);
+}
+export function createRedirectMatcher(entries) {
+  const exact = /* @__PURE__ */ new Map();
+  const prefixes = [];
+  for (const entry of entries) {
+    if (entry.pattern._tag === "Exact")
+      exact.set(entry.pattern.path, entry);
+    else
+      prefixes.push(entry);
+  }
+  const prefixLength = (entry) => entry.pattern._tag === "Prefix" ? entry.pattern.prefix.length : 0;
+  prefixes.sort((a, b) => prefixLength(b) - prefixLength(a));
+  return (path) => {
+    const normalized = normalizePath(path);
+    return exact.get(normalized) ?? prefixes.find((entry) => matchesSource(entry.pattern, normalized));
+  };
+}
+export function resolveTarget(rule, path) {
+  if (!rule.to.endsWith("/**"))
+    return rule.to;
+  const rest = rule.pattern._tag === "Prefix" ? normalizePath(path).slice(rule.pattern.prefix.length) : "";
+  return joinURL(rule.to.slice(0, -3) || "/", rest);
+}
+export function appendSearch(target, search) {
+  if (!search || search === "?")
+    return target;
+  const hashIndex = target.indexOf("#");
+  const base = hashIndex === -1 ? target : target.slice(0, hashIndex);
+  const hash = hashIndex === -1 ? "" : target.slice(hashIndex);
+  return `${base}${base.includes("?") ? "&" : "?"}${search.replace(/^\?/, "")}${hash}`;
+}

package/dist/runtime/types.d.ts

@@ -1,4 +1,19 @@
+import type { UseHeadOptions } from '@unhead/vue';
 import type { Head, Link, MetaFlat, RawInput } from '@unhead/vue/types';
+export interface SeoUtilsRuntimeConfig {
+    canonicalQueryWhitelist: string[];
+    canonicalLowercase: boolean;
+    automaticTwitterTags: boolean;
+    tagPriority: UseHeadOptions['tagPriority'];
+    separator?: string;
+    titleSeparator?: string;
+    colorModeIcons?: ColorModeIconLinks;
+}
+declare module 'nuxt/schema' {
+    interface PublicRuntimeConfig {
+        'seo-utils': SeoUtilsRuntimeConfig;
+    }
+}
 export interface ColorModeIconLinks {
     dark: Link[];
     light: Link[];

package/dist/types.d.mts

@@ -1,3 +1,3 @@
 export { default } from './module.mjs'
 
-export { type ModuleOptions } from './module.mjs'
+export { type GoneUrl, type ModuleOptions, type MovedUrl, type RedirectDate, type RedirectInput, type Redirects } from './module.mjs'