erudit 4.3.1 → 4.3.3

package/app/app.vue

@@ -2,6 +2,7 @@
 initFavicon();
 initOgImage();
 initOgSiteName();
+initWebSiteJsonLd();
 initAnalytics();
 initScrollUpWatcher();
 

package/app/components/aside/major/PaneHolder.vue

@@ -71,9 +71,9 @@ await usePhrases(
   'no_content',
   'to_index',
   'about_textbook',
-  'flag_title_dev',
-  'flag_title_advanced',
-  'flag_title_secondary',
+  'flag_dev',
+  'flag_advanced',
+  'flag_secondary',
 );
 </script>
 

package/app/components/aside/major/contentNav/items/Flags.vue

@@ -5,28 +5,24 @@ import type { MyIconName } from '#my-icons';
 
 defineProps<{ flags: ContentFlags }>();
 
-const phrase = await usePhrases(
-  'flag_title_dev',
-  'flag_title_advanced',
-  'flag_title_secondary',
-);
+const phrase = await usePhrases('flag_dev', 'flag_advanced', 'flag_secondary');
 
 const flagData = ((flagType: ContentFlag) => {
   switch (flagType) {
     case 'dev':
       return {
         icon: 'construction',
-        title: phrase.flag_title_dev,
+        title: phrase.flag_dev,
       };
     case 'advanced':
       return {
         icon: 'asterisk',
-        title: phrase.flag_title_advanced,
+        title: phrase.flag_advanced,
       };
     case 'secondary':
       return {
         icon: 'puzzle',
-        title: phrase.flag_title_secondary,
+        title: phrase.flag_secondary,
       };
   }
 }) as (flagType: ContentFlag) => { icon: MyIconName; title: string };

package/app/components/main/MainTopicPartPage.vue

@@ -24,7 +24,7 @@ const phrase = await usePhrases(
   'summary_seo_description',
   'practice_seo_description',
 );
-const lastChangedDate = useLastChanged(() => mainContent.contentRelativePath);
+const lastChangedDate = useLastChanged(() => mainContent.lastmod);
 
 await useContentSeo({
   title: mainContent.title,
@@ -47,6 +47,8 @@ await useContentSeo({
           : undefined,
   seo: mainContent.seo,
   snippets: mainContent.snippets,
+  breadcrumbs: mainContent.breadcrumbs,
+  lastmod: mainContent.lastmod,
 });
 </script>
 

package/app/composables/analytics.ts

@@ -73,17 +73,24 @@ function yandexAnalytics(analytics: YandexAnalytics) {
 (function(m,e,t,r,i,k,a){
     m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
     m[i].l=1*new Date();
-    k=e.createElement(t),a=e.getElementsByTagName(t)[0],
-    k.async=1,k.src=r,a.parentNode.insertBefore(k,a)
-})(window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+    for (var j = 0; j < document.scripts.length; j++) {if (document.scripts[j].src === r) { return; }}
+    k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)
+})(window, document,'script','https://mc.yandex.ru/metrika/tag.js?id=${analytics.metricsId}', 'ym');
 
-ym(${analytics.metricsId}, "init", {
+ym(
+  ${analytics.metricsId},
+  'init',
+  {
+    ssr:true,
+    webvisor:true,
     clickmap:true,
-    trackLinks:true,
+    referrer: document.referrer,
+    url: location.href,
     accurateTrackBounce:true,
-    webvisor:true
-});
-                    `.trim(),
+    trackLinks:true
+  }
+);
+`.trim(),
         },
       ],
     });

package/app/composables/favicon.ts

@@ -1,18 +1,41 @@
 import { isTopicPart, type TopicPart } from '@erudit-js/core/content/topic';
 import { isContentType, type ContentType } from '@erudit-js/core/content/type';
 
-const fallbackFaviconHref = eruditPublic('favicons/default.svg');
+const FALLBACK_FAVICON_EXT = '.svg';
 
-export const useFaviconHref = () => {
-  return useState<string>('favicon-href', () => fallbackFaviconHref);
+const mimeByExt: Record<string, string> = {
+  '.svg': 'image/svg+xml',
+  '.png': 'image/png',
+  '.ico': 'image/x-icon',
+  '.jpg': 'image/jpeg',
+  '.jpeg': 'image/jpeg',
+  '.gif': 'image/gif',
+  '.webp': 'image/webp',
+  '.bmp': 'image/bmp',
 };
 
+function extFromConfigHref(key: string): string {
+  const href =
+    (ERUDIT.config.favicon as Record<string, string> | undefined)?.[key] ||
+    ERUDIT.config.favicon?.default;
+  if (!href) return FALLBACK_FAVICON_EXT;
+  const path = href.split(/[?#]/)[0] ?? '';
+  const dot = path.lastIndexOf('.');
+  return dot === -1 ? '' : path.slice(dot).toLowerCase();
+}
+
+function mimeFromConfigHref(key: string): string | undefined {
+  return mimeByExt[extFromConfigHref(key)];
+}
+
+export const useFaviconKey = () =>
+  useState<string>('favicon-key', () => 'default');
+
 export function useFavicon() {
-  const faviconHref = useFaviconHref();
+  const faviconKey = useFaviconKey();
 
   function showDefaultFavicon() {
-    const defaultFaviconHref = ERUDIT.config.favicon?.default;
-    faviconHref.value = defaultFaviconHref || fallbackFaviconHref;
+    faviconKey.value = 'default';
   }
 
   function showContentFavicon(
@@ -21,15 +44,13 @@ export function useFavicon() {
       | { type: 'topic'; part: TopicPart },
   ) {
     if (args.type === 'topic') {
-      const topicPartHref = ERUDIT.config.favicon?.[args.part];
-      if (topicPartHref) {
-        faviconHref.value = topicPartHref;
+      if (ERUDIT.config.favicon?.[args.part]) {
+        faviconKey.value = args.part;
         return;
       }
     } else {
-      const typeHref = ERUDIT.config.favicon?.[args.type];
-      if (typeHref) {
-        faviconHref.value = typeHref;
+      if (ERUDIT.config.favicon?.[args.type]) {
+        faviconKey.value = args.type;
         return;
       }
     }
@@ -45,16 +66,42 @@ export function useFavicon() {
 
 export function initFavicon() {
   const withBaseUrl = useBaseUrl();
-  const faviconHref = useFaviconHref();
+  const faviconKey = useFaviconKey();
   const { showDefaultFavicon, showContentFavicon } = useFavicon();
   showDefaultFavicon();
 
   useHead({
     link: [
+      computed(() => {
+        const key = faviconKey.value;
+        const ext = extFromConfigHref(key);
+        const mime = mimeFromConfigHref(key);
+        return {
+          key: 'favicon',
+          rel: 'icon',
+          href: withBaseUrl(`/favicon/${key}/source${ext}`),
+          ...(mime && { type: mime }),
+        };
+      }),
       computed(() => ({
-        key: 'favicon',
+        key: 'favicon-png-48',
         rel: 'icon',
-        href: withBaseUrl(faviconHref.value),
+        type: 'image/png',
+        sizes: '48x48',
+        href: withBaseUrl(`/favicon/${faviconKey.value}/48.png`),
+      })),
+      computed(() => ({
+        key: 'favicon-png-32',
+        rel: 'icon',
+        type: 'image/png',
+        sizes: '32x32',
+        href: withBaseUrl(`/favicon/${faviconKey.value}/32.png`),
+      })),
+      computed(() => ({
+        key: 'apple-touch-icon',
+        rel: 'apple-touch-icon',
+        sizes: '180x180',
+        href: withBaseUrl(`/favicon/${faviconKey.value}/180.png`),
       })),
     ],
   });

package/app/composables/formatText.ts

@@ -1,9 +1,9 @@
-import type { FormatText } from '@erudit-js/core/formatText';
-import { createFormatTextFn } from '../../shared/utils/formatText';
-
-export let formatText: FormatText;
-
-export async function initFormatText() {
-  const languageCode = ERUDIT.config.language.current;
-  formatText = createFormatTextFn(languageCode);
-}
+import type { FormatText } from '@erudit-js/core/formatText';
+import { createFormatTextFn } from '../../shared/utils/formatText';
+
+export let formatText: FormatText;
+
+export async function initFormatText() {
+  const languageCode = ERUDIT.config.language.current;
+  formatText = createFormatTextFn(languageCode);
+}

package/app/composables/jsonLd.ts

@@ -0,0 +1,101 @@
+import type { Breadcrumbs } from '../../shared/types/breadcrumbs';
+
+export function useJsonLd(key: string, data: Record<string, unknown>) {
+  useHead({
+    script: [
+      {
+        key,
+        type: 'application/ld+json',
+        innerHTML: JSON.stringify(data),
+      },
+    ],
+  });
+}
+
+export function initWebSiteJsonLd() {
+  const siteTitle =
+    ERUDIT.config.seo?.siteTitle || ERUDIT.config.asideMajor?.siteInfo?.title;
+
+  if (!siteTitle) {
+    return;
+  }
+
+  const runtimeConfig = useRuntimeConfig();
+  const siteUrl = runtimeConfig.public.siteUrl as string;
+
+  if (!siteUrl) {
+    return;
+  }
+
+  useJsonLd('jsonld-website', {
+    '@context': 'https://schema.org',
+    '@type': 'WebSite',
+    name: siteTitle,
+    url: siteUrl,
+  });
+}
+
+export function useContentBreadcrumbsJsonLd(breadcrumbs?: Breadcrumbs) {
+  if (!breadcrumbs || breadcrumbs.length === 0) {
+    return;
+  }
+
+  const withSiteUrl = useSiteUrl();
+
+  useJsonLd('jsonld-breadcrumbs', {
+    '@context': 'https://schema.org',
+    '@type': 'BreadcrumbList',
+    itemListElement: breadcrumbs.map((item, index) => ({
+      '@type': 'ListItem',
+      position: index + 1,
+      name: formatText(item.title),
+      item: withSiteUrl(item.link),
+    })),
+  });
+}
+
+export function useContentArticleJsonLd(args: {
+  title: string;
+  description?: string;
+  urlPath: string;
+  contentType: string;
+  lastmod?: string;
+}) {
+  const withSiteUrl = useSiteUrl();
+
+  const siteTitle =
+    ERUDIT.config.seo?.siteTitle || ERUDIT.config.asideMajor?.siteInfo?.title;
+
+  const schemaType =
+    args.contentType === 'book'
+      ? 'Book'
+      : args.contentType === 'group'
+        ? 'Course'
+        : 'Article';
+
+  const data: Record<string, unknown> = {
+    '@context': 'https://schema.org',
+    '@type': schemaType,
+    ...(schemaType === 'Article'
+      ? { headline: formatText(args.title) }
+      : { name: formatText(args.title) }),
+    url: withSiteUrl(args.urlPath),
+  };
+
+  if (args.description) {
+    data.description = formatText(args.description);
+  }
+
+  if (args.lastmod) {
+    data.dateModified = args.lastmod;
+  }
+
+  if (siteTitle) {
+    data.isPartOf = {
+      '@type': 'WebSite',
+      name: siteTitle,
+    };
+  }
+
+  useJsonLd('jsonld-content', data);
+}

package/app/composables/lastmod.ts

@@ -0,0 +1,6 @@
+export function useLastChanged(lastmod: MaybeRefOrGetter<string | undefined>) {
+  return computed(() => {
+    const val = toValue(lastmod);
+    return val ? new Date(val) : undefined;
+  });
+}

package/app/composables/og.ts

@@ -1,6 +1,8 @@
 import type { ContentSeo } from '@erudit-js/core/content/seo';
 import { toSeoSnippet } from '@erudit-js/prose';
 
+import type { Breadcrumbs } from '../../shared/types/breadcrumbs';
+
 export function initOgSiteName() {
   const siteTitle =
     ERUDIT.config.seo?.siteTitle || ERUDIT.config.asideMajor?.siteInfo?.title;
@@ -91,6 +93,8 @@ export async function useContentSeo(args: {
   description?: string;
   seo?: ContentSeo;
   snippets?: ElementSnippet[];
+  breadcrumbs?: Breadcrumbs;
+  lastmod?: string;
 }) {
   const canUseBookTitle = ERUDIT.config.seo?.useBookSiteTitle;
 
@@ -142,6 +146,23 @@ export async function useContentSeo(args: {
     });
   }
 
+  //
+  // JSON-LD structured data
+  //
+
+  useContentBreadcrumbsJsonLd(args.breadcrumbs);
+
+  useContentArticleJsonLd({
+    title: args.seo?.title || args.title,
+    description: args.seo?.description || args.description,
+    urlPath: canonicalPath,
+    contentType:
+      args.contentTypePath.type === 'topic'
+        ? 'article'
+        : args.contentTypePath.type,
+    lastmod: args.lastmod,
+  });
+
   //
   // SEO snippets
   //

package/app/pages/book/[...bookId].vue

@@ -19,7 +19,7 @@ if (ERUDIT.config.contributors?.enabled) {
 }
 
 const phrase = await usePhrases('begin_learning');
-const lastChangedDate = useLastChanged(() => mainContent.contentRelativePath);
+const lastChangedDate = useLastChanged(() => mainContent.lastmod);
 
 await useContentSeo({
   title: mainContent.title,
@@ -29,6 +29,8 @@ await useContentSeo({
     contentId: mainContent.shortId,
   },
   seo: mainContent.seo,
+  breadcrumbs: mainContent.breadcrumbs,
+  lastmod: mainContent.lastmod,
 });
 </script>
 

package/app/pages/group/[...groupId].vue

@@ -19,7 +19,7 @@ if (ERUDIT.config.contributors?.enabled) {
 }
 
 const phrase = await usePhrases('group', 'begin_learning');
-const lastChangedDate = useLastChanged(() => mainContent.contentRelativePath);
+const lastChangedDate = useLastChanged(() => mainContent.lastmod);
 
 await useContentSeo({
   title: mainContent.title,
@@ -31,6 +31,8 @@ await useContentSeo({
     contentId: mainContent.shortId,
   },
   seo: mainContent.seo,
+  breadcrumbs: mainContent.breadcrumbs,
+  lastmod: mainContent.lastmod,
 });
 </script>
 

package/app/pages/page/[...pageId].vue

@@ -17,7 +17,7 @@ async function proseMounted() {
   );
 }
 
-const lastChangedDate = useLastChanged(() => mainContent.contentRelativePath);
+const lastChangedDate = useLastChanged(() => mainContent.lastmod);
 
 await useContentSeo({
   title: mainContent.title,
@@ -29,6 +29,8 @@ await useContentSeo({
   },
   seo: mainContent.seo,
   snippets: mainContent.snippets,
+  breadcrumbs: mainContent.breadcrumbs,
+  lastmod: mainContent.lastmod,
 });
 </script>
 

package/app/plugins/prerender.server.ts

@@ -26,6 +26,7 @@ export default defineNuxtPlugin({
       '/api/prerender/quotes',
       '/api/prerender/news',
       '/api/prerender/ogImages',
+      '/api/prerender/favicons',
     ];
 
     for (const provider of routeProviders) {

package/modules/erudit/setup/runtimeConfig.ts

@@ -1,6 +1,7 @@
 import { existsSync } from 'node:fs';
 import type { Nuxt } from '@nuxt/schema';
 import { sn } from 'unslash';
+import { findPath } from 'nuxt/kit';
 import type { EruditConfig } from '@erudit-js/core/eruditConfig/config';
 import { isDevLikeMode } from '@erudit-js/core/mode';
 
@@ -31,6 +32,7 @@ export async function setupEruditRuntimeConfig(nuxt: Nuxt) {
     elements: eruditConfig.elements || [],
     countElements: eruditConfig.countElements || [],
     indexPage: eruditConfig.indexPage,
+    lastmod: await resolveLastmodConfig(eruditConfig),
   }) satisfies EruditRuntimeConfig;
 
   //
@@ -46,9 +48,6 @@ export async function setupEruditRuntimeConfig(nuxt: Nuxt) {
         repository:
           eruditConfig.debug?.fakeApi?.repository ??
           (nuxt.options.dev || isDevLikeMode(ERUDIT_MODE)),
-        lastChanged:
-          eruditConfig.debug?.fakeApi?.lastChanged ??
-          (nuxt.options.dev || isDevLikeMode(ERUDIT_MODE)),
       },
       analytics: eruditConfig.debug?.analytics,
     },
@@ -106,3 +105,40 @@ export async function setupEruditRuntimeConfig(nuxt: Nuxt) {
     nuxtAugmentations: eruditConfig.nuxtAugmentations,
   };
 }
+
+async function resolveLastmodConfig(
+  eruditConfig: EruditConfig,
+): Promise<EruditRuntimeConfig['lastmod']> {
+  const lastmod = eruditConfig.lastmod;
+
+  if (!lastmod || lastmod.enabled === false) {
+    return undefined;
+  }
+
+  if (lastmod.type === 'git') {
+    return { type: 'git' };
+  }
+
+  if (lastmod.type === 'custom') {
+    if (!lastmod.scriptPath) {
+      throw new Error(
+        'Lastmod config with type "custom" requires a "scriptPath"!',
+      );
+    }
+
+    const absPath = await findPath(lastmod.scriptPath, {
+      cwd: PROJECT_PATH,
+      extensions: ['.ts', '.js'],
+    });
+
+    if (!absPath) {
+      throw new Error(
+        `Failed to resolve lastmod provider path "${lastmod.scriptPath}"!`,
+      );
+    }
+
+    return { type: 'custom', scriptPath: absPath };
+  }
+
+  return undefined;
+}

package/nuxt.config.ts

@@ -53,7 +53,7 @@ export default defineNuxtConfig({
     rollupConfig: {
       // Prevent inlining some packages
       external(source) {
-        const ignore = ['jiti', 'tsprose', '@resvg/resvg-js'];
+        const ignore = ['jiti', 'tsprose', '@resvg/resvg-js', 'sharp'];
 
         for (const ignoreItem of ignore) {
           if (source.includes(ignoreItem)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "erudit",
-  "version": "4.3.1",
+  "version": "4.3.3",
   "type": "module",
   "description": "🤓 CMS for perfect educational sites.",
   "license": "MIT",
@@ -24,32 +24,33 @@
     }
   },
   "dependencies": {
-    "@erudit-js/cli": "4.3.1",
-    "@erudit-js/core": "4.3.1",
-    "@erudit-js/prose": "4.3.1",
-    "unslash": "^2.0.0",
+    "@erudit-js/cli": "4.3.3",
+    "@erudit-js/core": "4.3.3",
+    "@erudit-js/prose": "4.3.3",
     "@floating-ui/vue": "^1.1.11",
-    "tsprose": "^1.0.1",
+    "@resvg/resvg-js": "^2.6.2",
     "@tailwindcss/vite": "^4.2.1",
     "better-sqlite3": "^12.8.0",
     "chokidar": "^5.0.0",
     "consola": "^3.4.2",
-    "drizzle-kit": "^0.31.9",
+    "drizzle-kit": "^0.31.10",
     "drizzle-orm": "^0.45.1",
     "esbuild": "^0.27.4",
     "flexsearch": "^0.8.212",
     "glob": "^13.0.6",
     "image-size": "^2.0.2",
-    "@resvg/resvg-js": "^2.6.2",
-    "satori": "^0.25.0",
     "jiti": "^2.6.1",
     "nuxt": "4.4.2",
     "nuxt-my-icons": "1.2.2",
     "perfect-debounce": "^2.1.0",
+    "satori": "^0.25.0",
+    "sharp": "^0.34.5",
     "tailwindcss": "^4.2.1",
+    "ts-xor": "^1.3.0",
+    "tsprose": "^1.0.1",
+    "unslash": "^2.0.0",
     "vue": "latest",
-    "vue-router": "latest",
-    "ts-xor": "^1.3.0"
+    "vue-router": "latest"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13"

package/server/api/main/content/[...contentTypePath].ts

@@ -20,6 +20,7 @@ export default defineEventHandler<Promise<MainContent>>(async (event) => {
     ['topic', 'page'].includes(contentTypePath.type),
   );
   const seo = await ERUDIT.repository.content.seo(fullId);
+  const lastmod = await ERUDIT.repository.content.lastmod(fullId);
 
   const bookNode = ERUDIT.contentNav.getBookFor(fullId);
   const bookTitle = bookNode
@@ -37,6 +38,7 @@ export default defineEventHandler<Promise<MainContent>>(async (event) => {
     bookTitle,
     breadcrumbs: await ERUDIT.repository.content.breadcrumbs(fullId),
     seo,
+    lastmod,
   };
 
   if (description) {

package/server/api/prerender/favicons.ts

@@ -0,0 +1,31 @@
+import { loadFaviconSource } from '#layers/erudit/server/erudit/favicon/loadSource';
+import {
+  FAVICON_KEYS,
+  FAVICON_SIZES,
+  getFaviconHref,
+  extFromHref,
+} from '#layers/erudit/server/erudit/favicon/shared';
+
+export default defineEventHandler(async () => {
+  const routes: string[] = [];
+
+  for (const key of FAVICON_KEYS) {
+    const href = getFaviconHref(key);
+    if (!href) continue;
+
+    const source = await loadFaviconSource(href);
+    if (!source) continue;
+
+    const ext = extFromHref(href);
+    if (ext) {
+      routes.push(`/favicon/${key}/source${ext}`);
+    }
+
+    for (const size of FAVICON_SIZES) {
+      if (source.width !== undefined && source.width < size) continue;
+      routes.push(`/favicon/${key}/${size}.png`);
+    }
+  }
+
+  return routes;
+});

package/server/erudit/build.ts

@@ -9,6 +9,7 @@ import { buildSponsors } from './sponsors/build';
 import { buildCameos } from './cameos/build';
 import { buildContentNav } from './content/nav/build';
 import { requestFullContentResolve, resolveContent } from './content/resolve';
+import { buildContentLastmod } from './content/lastmod';
 import { buildGlobalContent } from './content/global/build';
 import { buildNews } from './news/build';
 import { triggerReload } from './reloadSignal';
@@ -29,6 +30,7 @@ export async function buildServerErudit() {
       await buildContentNav();
       await buildGlobalContent();
       await resolveContent();
+      await buildContentLastmod();
       ERUDIT.log.success(styleText('green', 'Build Complete!'));
     } catch (buildError) {
       requestFullContentResolve();