@xingwangzhe/stalux 1.24.3 → 1.24.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xingwangzhe/stalux",
-    "version": "1.24.3",
+    "version": "1.24.5",
     "description": "A powerful, modern Astro blog theme — use as template or install as plugin",
     "keywords": [
         "astro",

package/src/components/stalux/footer/FooterBadges.astro

@@ -18,7 +18,7 @@ function badgeImg(opts: Record<string, any>) {
     const src = svgToDataUrl(generateBadge(opts));
     const alt = opts.alt || `${opts.label}: ${opts.message}`;
     if (opts.href) {
-        return `<a href="${opts.href}" target="_blank" rel="noopener noreferrer"><img src="${src}" alt="${alt}" class="badge" /></a>`;
+        return `<a href="${opts.href}" target="_blank" rel="${opts.rel ?? "noopener"}"><img src="${src}" alt="${alt}" class="badge" /></a>`;
     }
     return `<img src="${src}" alt="${alt}" class="badge" />`;
 }

package/src/components/stalux/layout/head.astro

@@ -43,8 +43,6 @@ interface Props {
 }
 
 const props = Astro.props as Props;
-const effectiveTitle = siteConfig.seoTitle || props.title;
-const effectiveDescription = props.description;
 const isArticle = props.isArticle ?? false;
 
 const canonicalBase = siteConfig.canonical || siteConfig.url;
@@ -68,12 +66,20 @@ const isNotFoundPage =
   Astro.url.pathname === "/404" || Astro.url.pathname === "/404/";
 const routeKind = getRouteKind(Astro.url.pathname);
 const isCollectionPage = routeKind.endsWith("-index") || routeKind.endsWith("-detail");
+// seoTitle 是首页的搜索标题，不应覆盖文章/分类等内页标题。
+const effectiveTitle = routeKind === "home" && siteConfig.seoTitle ? siteConfig.seoTitle : props.title;
+const effectiveDescription = props.description;
+const siteTitleSuffix = siteConfig.title ? ` | ${siteConfig.title}` : "";
+const contentTitle =
+  siteTitleSuffix && effectiveTitle.endsWith(siteTitleSuffix)
+    ? effectiveTitle.slice(0, -siteTitleSuffix.length)
+    : effectiveTitle;
 const resolvedNoindex = Boolean(siteConfig.noindex) || isNotFoundPage || Boolean(props.noindex);
 const resolvedNofollow = Boolean(siteConfig.nofollow) || isNotFoundPage;
 
 const openGraphConfig: Record<string, unknown> = {
   basic: {
-    title: effectiveTitle,
+    title: contentTitle,
     type: isArticle ? "article" : "website",
     image: ogImagePath,
     url: canonicalUrl,
@@ -85,7 +91,7 @@ const openGraphConfig: Record<string, unknown> = {
   },
   image: {
     url: ogImagePath,
-    alt: effectiveTitle,
+    alt: contentTitle,
   },
 };
 
@@ -101,11 +107,11 @@ if (isArticle) {
 }
 
 const twitterConfig = {
-  card: "summary_large_image" as TwitterCardType,
-  title: effectiveTitle,
+  card: (props.cover ? "summary_large_image" : "summary") as TwitterCardType,
+  title: contentTitle,
   description: effectiveDescription,
   image: ogImagePath,
-  imageAlt: effectiveTitle,
+  imageAlt: contentTitle,
   ...(siteConfig.twitterSite ? { site: siteConfig.twitterSite } : {}),
 };
 
@@ -140,6 +146,14 @@ const extendedLink = [
 const extendedMeta = [
   { name: "viewport", content: "width=device-width, initial-scale=1" },
   { name: "color-scheme", content: "dark" },
+  ...(!resolvedNoindex
+    ? [
+        {
+          name: "googlebot",
+          content: "max-image-preview:large, max-snippet:-1, max-video-preview:-1",
+        },
+      ]
+    : []),
 ];
 
 let schema: Record<string, unknown>;
@@ -148,55 +162,111 @@ const sameAs = mediaLinksConfig?.items
   .filter((link) => /^https?:\/\//i.test(link));
 const authorEntity = {
   "@type": "Person",
+  "@id": `${siteUrl}/#author`,
   name: authorConfig.name,
+  url: `${siteUrl}/about/`,
   ...(toAbsolute(authorConfig.avatar) ? { image: toAbsolute(authorConfig.avatar) } : {}),
   ...(sameAs.length ? { sameAs } : {}),
 };
 const publisher = {
   "@type": "Organization",
+  "@id": `${siteUrl}/#publisher`,
   name: siteName,
   url: siteUrl,
   ...(authorConfig.avatar ? { logo: toAbsolute(authorConfig.avatar) } : {}),
 };
+const websiteEntity = {
+  "@type": "WebSite",
+  "@id": `${siteUrl}/#website`,
+  url: `${siteUrl}/`,
+  name: siteName,
+  description: siteConfig.description,
+  inLanguage: siteConfig.lang || "zh-CN",
+  publisher: { "@id": `${siteUrl}/#publisher` },
+};
+const breadcrumbItems: Record<string, unknown>[] = [
+  {
+    "@type": "ListItem",
+    position: 1,
+    name: siteName,
+    item: `${siteUrl}/`,
+  },
+];
+if (isArticle && props.categories?.[0]) {
+  breadcrumbItems.push({
+    "@type": "ListItem",
+    position: breadcrumbItems.length + 1,
+    name: props.categories[0],
+    item: `${siteUrl}/categories/${encodeURIComponent(props.categories[0])}/`,
+  });
+}
+if (routeKind !== "home") {
+  breadcrumbItems.push({
+    "@type": "ListItem",
+    position: breadcrumbItems.length + 1,
+    name: contentTitle,
+    item: canonicalUrl,
+  });
+}
+const breadcrumbEntity = {
+  "@type": "BreadcrumbList",
+  "@id": `${canonicalUrl}#breadcrumb`,
+  itemListElement: breadcrumbItems,
+};
 if (isArticle) {
   schema = {
     "@context": "https://schema.org",
-    "@type": "BlogPosting",
-    headline: effectiveTitle,
-    description: effectiveDescription,
-    url: canonicalUrl,
-    ...(ogImagePath ? { image: ogImagePath } : {}),
-    ...(props.date ? { datePublished: props.date } : {}),
-    ...(props.updated || props.date ? { dateModified: props.updated || props.date } : {}),
-    ...(props.tags?.length ? { keywords: props.tags.join(", ") } : {}),
-    author: props.author ? { ...authorEntity, name: props.author } : authorEntity,
-    publisher,
-    inLanguage: siteConfig.lang || "zh-CN",
-    mainEntityOfPage: {
-      "@type": "WebPage",
-      "@id": canonicalUrl,
-    },
+    "@graph": [
+      websiteEntity,
+      authorEntity,
+      publisher,
+      breadcrumbEntity,
+      {
+        "@type": "BlogPosting",
+        "@id": `${canonicalUrl}#article`,
+        headline: contentTitle,
+        description: effectiveDescription,
+        url: canonicalUrl,
+        ...(ogImagePath ? { image: ogImagePath } : {}),
+        ...(props.date ? { datePublished: props.date } : {}),
+        ...(props.updated || props.date ? { dateModified: props.updated || props.date } : {}),
+        ...(props.tags?.length ? { keywords: props.tags.join(", ") } : {}),
+        ...(props.categories?.length ? { articleSection: props.categories } : {}),
+        author: { "@id": `${siteUrl}/#author`, ...(props.author ? { name: props.author } : {}) },
+        publisher: { "@id": `${siteUrl}/#publisher` },
+        isPartOf: { "@id": `${siteUrl}/#website` },
+        inLanguage: siteConfig.lang || "zh-CN",
+        mainEntityOfPage: {
+          "@type": "WebPage",
+          "@id": canonicalUrl,
+        },
+      },
+    ],
   };
 } else if (routeKind === "home") {
   schema = {
     "@context": "https://schema.org",
-    "@type": "WebSite",
-    url: canonicalUrl,
-    name: effectiveTitle,
-    description: effectiveDescription,
-    inLanguage: siteConfig.lang || "zh-CN",
-    publisher,
-    author: authorEntity,
+    "@graph": [websiteEntity, authorEntity, publisher],
   };
 } else {
   schema = {
     "@context": "https://schema.org",
-    "@type": isCollectionPage ? "CollectionPage" : routeKind === "about" ? "AboutPage" : "WebPage",
-    url: canonicalUrl,
-    name: effectiveTitle,
-    description: effectiveDescription,
-    inLanguage: siteConfig.lang || "zh-CN",
-    isPartOf: { "@type": "WebSite", url: siteUrl, name: siteName },
+    "@graph": [
+      websiteEntity,
+      authorEntity,
+      publisher,
+      breadcrumbEntity,
+      {
+        "@type": isCollectionPage ? "CollectionPage" : routeKind === "about" ? "AboutPage" : "WebPage",
+        "@id": canonicalUrl,
+        url: canonicalUrl,
+        name: contentTitle,
+        description: effectiveDescription,
+        inLanguage: siteConfig.lang || "zh-CN",
+        isPartOf: { "@id": `${siteUrl}/#website` },
+        breadcrumb: { "@id": `${canonicalUrl}#breadcrumb` },
+      },
+    ],
   };
 }
 const ldJson = JSON.stringify(schema, null, 2).replace(/<\//g, "<\\/");
@@ -233,4 +303,3 @@ const ldJson = JSON.stringify(schema, null, 2).replace(/<\//g, "<\\/");
   <script type="application/ld+json" set:html={ldJson} />
   <VerCount />
 </head>
-

package/src/components/stalux/links/linkCard.astro

@@ -32,7 +32,7 @@ const icon = link.icon ?? link.avatar ?? "/favicon.ico";
     class={styles.card + " a-none"}
     href={href}
     target="_blank"
-    rel="noopener noreferrer"
+    rel="noopener"
 >
     <div class={styles.avatar}>
         <img

package/src/pages/links.astro

@@ -7,17 +7,16 @@ import { getSiteData, getLinksData } from "@utils/config-utils";
 const configEntries = await getCollection("config");
 const siteConfig = getSiteData(configEntries);
 const linksConfig = getLinksData(configEntries)!;
-const siteTitle = siteConfig.title;
 const siteDescription = siteConfig.description;
 const linksTitle = linksConfig.title;
 const linksDescription = linksConfig.description;
 ---
 
-		<ListPage
-			    title={siteTitle}
-			    description={siteDescription}
-			    heading={linksTitle}
-			    subheading={linksDescription}
-			>
+<ListPage
+    title={linksTitle}
+    description={linksDescription || siteDescription}
+    heading={linksTitle}
+    subheading={linksDescription}
+>
     <LinkList />
 </ListPage>

package/src/schemas/config.ts

@@ -92,6 +92,7 @@ const badgeFlatSchema = z.object({
     style: z.string().optional(),
     alt: z.string().optional(),
     href: z.string().optional(),
+    rel: z.string().optional(),
 });
 
 const badgeGroupSchema = z.object({

package/src/utils/badge-generator.ts

@@ -14,6 +14,7 @@ export interface BadgeOptions {
     logoWidth?: number;
     alt?: string;
     href?: string;
+    rel?: string;
 }
 
 export interface BadgeGroup {