erudit 3.0.0-dev.23 → 3.0.0-dev.26

package/nuxt.config.ts

@@ -1,126 +1,90 @@
-import {
-    PUBLIC_CONTENT_ASSET,
-    PUBLIC_ERUDIT_ASSET,
-    PUBLIC_USER_ASSET,
-} from './const';
-import { eruditPath, projectPath } from './globalPath';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
+import tailwindcss from '@tailwindcss/vite';
+
+const currentDir = dirname(fileURLToPath(import.meta.url));
+
+/**
+ * This is context-unaware or "static" Nuxt configuration.
+ * The only thing that works here are aliases.
+ * If you need to use context (e.g. paths to package/project or Erudit project config), use `./modules/erudit/setup/nuxtConfig.ts` file.
+ */
 export default defineNuxtConfig({
-    compatibilityDate: '2025-01-01',
+    compatibilityDate: '2025-07-20',
     devtools: { enabled: true },
-    future: { compatibilityVersion: 4 },
-    ssr: true,
-    alias: {
-        '@erudit': eruditPath(),
-        '@module': eruditPath('module'),
-        '@server': eruditPath('server/plugin'),
-        '@shared': eruditPath('shared'),
-        '@app': eruditPath('app'),
-        $: eruditPath('app/styles'),
-    },
-    modules: [eruditPath('module'), 'nuxt-my-icons'],
+    $meta: { name: 'erudit' },
+    modules: [currentDir + '/modules/erudit', 'nuxt-my-icons'],
+    css: ['@erudit/app/styles/main.css'],
     myicons: {
-        iconsDir: eruditPath('app/assets/icons'),
+        iconsDir: '@erudit/app/assets/icons',
     },
-    features: {
-        inlineStyles: false,
-    },
-    typescript: {
-        tsConfig: {
-            include: [eruditPath('**/*'), projectPath('**/*')],
-        },
-    },
-    build: {
-        transpile: [
-            'yaml',
-            'photoswipe',
-            '@bitran-js/renderer-vue',
-            '@erudit-js/bitran-elements',
-        ],
-    },
-    ignore: [
-        // Content assets
-        ...[
-            '**/{book,group,topic}.{js,ts}',
-            '**/{article,summary,practice,content}.bi',
-        ].map((pattern) => projectPath(`content/${pattern}`)),
-        // Contributors assets
-        ...['*/contributor.{js,ts}', '*/description.bi'].map((pattern) =>
-            projectPath(`contributors/${pattern}`),
-        ),
-    ],
+    plugins: ['@erudit/app/plugins/appSetup'],
     nitro: {
-        preset: 'github-pages',
-        plugins: [eruditPath('server/plugin')],
-        prerender: {
-            crawlLinks: true,
-            failOnError: false,
-            concurrency: 10,
-            routes: ['/robots.txt', '/sitemap.xml'],
-            ignore: [
-                (path: string) => {
-                    const regexps = [/#/gm, /\.json\?/gm];
-                    const shouldIgnore = regexps.some((re) => re.test(path));
-                    return shouldIgnore;
-                },
-            ],
-        },
-        output: {
-            publicDir: projectPath('dist'),
-        },
-        externals: {
-            inline: [/bitran-elements/],
-        },
-        publicAssets: [
-            {
-                baseURL: PUBLIC_ERUDIT_ASSET,
-                dir: eruditPath('app/public'),
-                maxAge: 60 * 60 * 24 * 30,
-            },
-            {
-                baseURL: PUBLIC_USER_ASSET,
-                dir: projectPath('public'),
-                maxAge: 60 * 60 * 24 * 30,
-            },
-            {
-                baseURL: PUBLIC_CONTENT_ASSET,
-                dir: projectPath('content'),
-                maxAge: 60 * 60 * 24 * 30,
-            },
-        ],
+        plugins: ['@erudit/server'],
         esbuild: {
             options: {
                 charset: 'utf8',
-                tsconfigRaw: {
-                    compilerOptions: {
-                        experimentalDecorators: true, // Make TypeORM work with Nuxt,
-                    },
+            },
+        },
+        typescript: {
+            tsConfig: {
+                compilerOptions: {
+                    verbatimModuleSyntax: true,
                 },
             },
         },
+        rollupConfig: {
+            // Prevent inlining some packages to avoid singleton and Symbol duplication issues
+            external(source) {
+                const ignore = ['jiti', '@jsprose'];
+
+                for (const ignoreItem of ignore) {
+                    if (source.includes(ignoreItem)) {
+                        return true;
+                    }
+                }
+            },
+        },
     },
     vite: {
+        plugins: [
+            tailwindcss(),
+            {
+                // Remove when this is fixed: https://github.com/tailwindlabs/tailwindcss/discussions/16119
+                apply: 'build',
+                name: 'vite-plugin-ignore-sourcemap-warnings',
+                configResolved(config) {
+                    const originalOnWarn = config.build.rollupOptions.onwarn;
+                    config.build.rollupOptions.onwarn = (warning, warn) => {
+                        if (
+                            warning.code === 'SOURCEMAP_BROKEN' &&
+                            warning.plugin ===
+                                '@tailwindcss/vite:generate:build'
+                        ) {
+                            return;
+                        }
+
+                        if (originalOnWarn) {
+                            originalOnWarn(warning, warn);
+                        } else {
+                            warn(warning);
+                        }
+                    };
+                },
+            },
+        ],
         optimizeDeps: {
             include: [
-                'yaml',
-                'photoswipe',
+                '@vue/devtools-core',
+                '@vue/devtools-kit',
                 '@floating-ui/vue',
-                '@bitran-js/core',
-                '@bitran-js/transpiler',
-                '@bitran-js/renderer-vue',
-                '@erudit-js/bitran-elements',
+                'perfect-debounce',
+                'flexsearch',
             ],
         },
         server: {
             fs: { strict: false },
         },
-        css: {
-            preprocessorOptions: {
-                scss: {
-                    api: 'modern-compiler',
-                    additionalData: `@use '$/utils' as *;`,
-                },
-            },
-        },
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "erudit",
-    "version": "3.0.0-dev.23",
+    "version": "3.0.0-dev.26",
     "type": "module",
     "description": "🤓 CMS for perfect educational sites.",
     "license": "MIT",
@@ -14,29 +14,47 @@
         "erudit-cli": "bin/erudit.mjs",
         "erudit": "bin/erudit.mjs"
     },
-    "peerDependencies": {
-        "@erudit-js/cog": "3.0.0-dev.23",
-        "@erudit-js/cli": "3.0.0-dev.23",
-        "@erudit-js/bitran-elements": "3.0.0-dev.23"
+    "exports": {
+        ".": {
+            "import": "./nuxt.config.ts"
+        },
+        "./prose": {
+            "import": "./proxy/prose.ts"
+        },
+        "./prose/app": {
+            "import": "./proxy/prose.app.ts"
+        }
+    },
+    "scripts": {
+        "test": "bun vitest run"
     },
     "dependencies": {
-        "@bitran-js/core": "1.0.0-dev.13",
-        "@bitran-js/renderer-vue": "1.0.0-dev.13",
-        "@bitran-js/transpiler": "1.0.0-dev.13",
-        "@floating-ui/vue": "^1.1.6",
-        "chalk": "^5.4.1",
+        "@erudit-js/cli": "workspace:3.0.0-dev.26",
+        "@erudit-js/core": "workspace:3.0.0-dev.26",
+        "@erudit-js/prose": "workspace:3.0.0-dev.26",
+        "@floating-ui/vue": "^1.1.9",
+        "@jsprose/core": "^1.0.0",
+        "@tailwindcss/vite": "^4.1.17",
+        "better-sqlite3": "^12.4.1",
+        "chalk": "^5.6.2",
         "chokidar": "^4.0.3",
         "consola": "^3.4.2",
-        "esbuild": "^0.25.4",
-        "glob": "^11.0.2",
+        "defu": "^6.1.4",
+        "drizzle-kit": "^0.31.7",
+        "drizzle-orm": "^0.44.7",
+        "esbuild": "^0.25.12",
+        "flexsearch": "^0.8.212",
+        "glob": "^11.1.0",
         "image-size": "^2.0.2",
-        "jiti": "^2.4.2",
-        "nuxt": "3.17.3",
-        "nuxt-my-icons": "1.1.1",
-        "sass": "^1.87.0",
-        "sqlite3": "^5.1.7",
-        "typeorm": "^0.3.23",
+        "jiti": "^2.6.1",
+        "nuxt": "4.2.2",
+        "nuxt-my-icons": "1.2.2",
+        "perfect-debounce": "^2.0.0",
+        "tailwindcss": "^4.1.17",
         "vue": "latest",
         "vue-router": "latest"
+    },
+    "devDependencies": {
+        "@types/better-sqlite3": "^7.6.13"
     }
 }

package/proxy/prose.app.ts

@@ -0,0 +1 @@
+export * from '@erudit-js/prose/app';

package/proxy/prose.ts

@@ -0,0 +1 @@
+export * from '@erudit-js/prose';

package/public/favicons/default.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512"><defs><linearGradient id="b" x1="9.93" y1="9.93" x2="521.93" y2="521.93" gradientTransform="translate(0 512) rotate(-90)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4aa44c"/><stop offset="1" stop-color="#1278b9"/></linearGradient></defs><path d="M127.95,34.28L0,0l34.28,127.95C12.48,165.62,0,209.35,0,256s12.48,90.38,34.28,128.05L0,512l127.95-34.28c37.67,21.8,81.4,34.28,128.05,34.28s90.38-12.48,128.05-34.28l127.95,34.28-34.28-127.95c21.8-37.67,34.28-81.4,34.28-128.05s-12.48-90.38-34.28-128.05L512,0l-127.95,34.28C346.38,12.48,302.65,0,256,0s-90.38,12.48-128.05,34.28Z" fill="url(#b)"/><path d="M385.2,317.4v-91.1l-122.9,61.9c-5.5,2.8-11.4,4.3-17.5,4.3s-12-1.4-17.4-4.3l-126.5-63.9c-3.3-1.7-5.9-4.1-7.9-7s-2.9-6.1-2.9-9.6,1-6.6,2.9-9.6c2-3,4.6-5.4,7.9-7.2l126.5-63.9c2.8-1.5,5.7-2.6,8.6-3.3,2.9-.7,5.9-1,8.9-1s5.9.4,8.9,1c2.9.7,5.8,1.8,8.6,3.3l149.2,75.2c3.1,1.7,5.6,4,7.6,6.9,1.9,2.9,2.9,6.1,2.9,9.8v98.7c0,5-1.8,9.3-5.4,12.9s-7.8,5.4-12.9,5.4-9.3-1.8-13-5.4c-3.6-3.6-5.5-7.9-5.5-13h0l-.1-.1ZM235.8,388.5c3,.5,5.9.8,8.9.8s5.9-.3,8.9-.8c2.9-.5,5.9-1.6,8.6-3.1l67.9-34.1c6.2-3.1,11.2-7.7,14.9-13.7,3.8-6.1,5.6-12.6,5.6-19.6v-37.9l-88.4,44.6c-5.4,2.9-11.3,4.3-17.4,4.3s-12-1.5-17.5-4.3l-88.4-44.6v37.9c0,7,1.9,13.6,5.6,19.6,3.8,6,8.7,10.6,14.9,13.7l67.9,34.1h0c2.8,1.5,5.7,2.6,8.6,3.1h-.1Z" fill="#fff"/></svg>

package/{app/public → public}/logotype.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 135 135">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 135 135" width="50px" height="50px">
   <defs>
     <linearGradient id="gradient" x1="19.77" y1="115.23" x2="115.23" y2="19.77" gradientUnits="userSpaceOnUse">
       <stop offset="0" stop-color="#4aa44c"/>

package/server/api/aside/major/frontNav/book/[...shortId].ts

@@ -0,0 +1,10 @@
+import { getBookFrontContentNav } from '@erudit/server/content/nav/front';
+
+export default defineEventHandler<Promise<FrontContentNavBook>>(
+    async (event) => {
+        const shortId = event.context.params!.shortId;
+        const bookNavNode = ERUDIT.contentNav.getNodeOrThrow(shortId);
+
+        return await getBookFrontContentNav(bookNavNode);
+    },
+);

package/server/api/aside/major/frontNav/global.ts

@@ -0,0 +1,5 @@
+import { getGlobalFrontContentNav } from '@erudit/server/content/nav/front';
+
+export default defineEventHandler<Promise<FrontGlobalContentNav>>(async () => {
+    return await getGlobalFrontContentNav();
+});

package/server/api/aside/major/pages.ts

@@ -0,0 +1,6 @@
+export default defineEventHandler<Promise<AsideMajorPagesData>>(async () => {
+    return {
+        contributorsCount: ERUDIT.repository.contributors.count(),
+        sponsorsCount: await ERUDIT.repository.sponsors.count(),
+    };
+});

package/server/api/contributor/list.ts

@@ -1,44 +1,45 @@
-import { DbContribution } from '@server/db/entities/Contribution';
-import { DbContributor } from '@server/db/entities/Contributor';
-import { ERUDIT_SERVER } from '@server/global';
+import type { ListContributor } from '@erudit-js/core/contributor';
 
-import { type ContributorListItem } from '@shared/contributor';
+export default defineEventHandler<Promise<ListContributor[]>>(async (event) => {
+    const listContributors: ListContributor[] = [];
+    const dbContributors = await ERUDIT.db.query.contributors.findMany();
 
-export default defineEventHandler<Promise<ContributorListItem[]>>(async () => {
-    const dbContributors = await ERUDIT_SERVER.DB.manager.find(DbContributor, {
-        select: ['contributorId', 'displayName', 'isEditor', 'avatar'],
-    });
+    for (const dbContributor of dbContributors) {
+        const contributions =
+            await ERUDIT.repository.contributors.countContributions(
+                dbContributor.contributorId,
+            );
 
-    if (dbContributors.length === 0) {
-        return [];
-    }
+        const listContributor: ListContributor = {
+            id: dbContributor.contributorId,
+        };
 
-    const contributors: ContributorListItem[] = await Promise.all(
-        dbContributors.map(async (dbContributor) => {
-            const contributions = await ERUDIT_SERVER.DB.manager.count(
-                DbContribution,
-                {
-                    where: { contributorId: dbContributor.contributorId },
-                },
-            );
+        if (dbContributor.displayName) {
+            listContributor.displayName = dbContributor.displayName;
+        }
+
+        if (dbContributor.short) {
+            listContributor.short = dbContributor.short;
+        }
 
-            return {
-                contributorId: dbContributor.contributorId,
-                displayName: dbContributor.displayName,
-                isEditor: dbContributor.isEditor,
-                avatar: dbContributor.avatar,
-                contributions,
-            };
-        }),
-    );
-
-    contributors.sort((a, b) => {
-        if (a.isEditor !== b.isEditor) {
-            return a.isEditor ? -1 : 1;
+        if (dbContributor.avatarExtension) {
+            listContributor.avatarUrl =
+                ERUDIT.repository.contributors.avatarUrl(
+                    dbContributor.contributorId,
+                    dbContributor.avatarExtension,
+                );
         }
 
-        return b.contributions - a.contributions;
-    });
+        if (contributions > 0) {
+            listContributor.contributions = contributions;
+        }
+
+        if (dbContributor.editor) {
+            listContributor.editor = dbContributor.editor;
+        }
+
+        listContributors.push(listContributor);
+    }
 
-    return contributors;
+    return listContributors;
 });

package/server/api/contributor/page/[contributorId].ts

@@ -1,14 +1,68 @@
-import { getContributorPageData } from '@server/repository/contributor';
+import { eq } from 'drizzle-orm';
+import type { PageContributor } from '@erudit-js/core/contributor';
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler<Promise<PageContributor>>(async (event) => {
     const contributorId = event.context.params?.contributorId;
 
     if (!contributorId) {
         throw createError({
             statusCode: 400,
-            message: 'Missing contributor ID!',
+            message: 'Contributor ID is required!',
         });
     }
 
-    return await getContributorPageData(contributorId);
+    const dbContributor = await ERUDIT.db.query.contributors.findFirst({
+        where: eq(ERUDIT.db.schema.contributors.contributorId, contributorId),
+    });
+
+    if (!dbContributor) {
+        throw createError({
+            statusCode: 404,
+            message: `Failed to find contributor with ID "${contributorId}"!`,
+        });
+    }
+
+    const pageContributor: PageContributor = {
+        id: dbContributor.contributorId,
+    };
+
+    if (dbContributor.displayName) {
+        pageContributor.displayName = dbContributor.displayName;
+    }
+
+    if (dbContributor.short) {
+        pageContributor.short = dbContributor.short;
+    }
+
+    if (dbContributor.links) {
+        pageContributor.links = dbContributor.links;
+    }
+
+    if (dbContributor.avatarExtension) {
+        pageContributor.avatarUrl = ERUDIT.repository.contributors.avatarUrl(
+            dbContributor.contributorId,
+            dbContributor.avatarExtension,
+        );
+    }
+
+    if (dbContributor.editor) {
+        pageContributor.editor = dbContributor.editor;
+    }
+
+    if (dbContributor.description) {
+        pageContributor.description = await ERUDIT.repository.prose.finalize(
+            dbContributor.description,
+        );
+    }
+
+    const contributions =
+        await ERUDIT.repository.contributors.contributorContributions(
+            contributorId,
+        );
+
+    if (contributions) {
+        pageContributor.contributions = contributions;
+    }
+
+    return pageContributor;
 });

package/server/api/indexPage.ts

@@ -0,0 +1,81 @@
+export default defineEventHandler<Promise<IndexPage>>(async () => {
+    const title =
+        ERUDIT.config.project.indexPage?.title ||
+        ERUDIT.language.phrases.default_index_title;
+
+    const short =
+        ERUDIT.config.project.indexPage?.short ||
+        ERUDIT.language.phrases.default_index_short;
+
+    const indexPage: IndexPage = {
+        title,
+        short,
+    };
+
+    const descritpion = ERUDIT.config.project.indexPage?.description;
+
+    if (descritpion) {
+        indexPage.description = descritpion;
+    }
+
+    const logoytpe = ERUDIT.config.project.indexPage?.logotype;
+
+    if (logoytpe) {
+        indexPage.logotype = logoytpe;
+    }
+
+    const rootChildren = await ERUDIT.repository.content.children();
+
+    if (rootChildren.length > 0) {
+        indexPage.children = rootChildren;
+    }
+
+    const stats = await ERUDIT.repository.content.stats();
+
+    if (stats) {
+        indexPage.stats = stats;
+    }
+
+    const seo = ERUDIT.config.project.indexPage?.seo;
+    if (seo) {
+        indexPage.seo = seo;
+    }
+
+    {
+        const dbContributors = await ERUDIT.db.query.contributors.findMany({
+            columns: {
+                contributorId: true,
+                avatarExtension: true,
+            },
+        });
+
+        if (dbContributors.length > 0) {
+            indexPage.contributors = Object.fromEntries(
+                dbContributors.map((contributor) => [
+                    contributor.contributorId,
+                    contributor.avatarExtension || 0,
+                ]),
+            );
+        }
+    }
+
+    {
+        const dbSponsors = await ERUDIT.db.query.sponsors.findMany({
+            columns: {
+                sponsorId: true,
+                avatarExtension: true,
+            },
+        });
+
+        if (dbSponsors.length > 0) {
+            indexPage.sponsors = Object.fromEntries(
+                dbSponsors.map((sponsor) => [
+                    sponsor.sponsorId,
+                    sponsor.avatarExtension || 0,
+                ]),
+            );
+        }
+    }
+
+    return indexPage;
+});

package/server/api/language/functions.ts

@@ -1,12 +1,11 @@
-import { ERUDIT_SERVER } from '@server/global';
-
-export default defineEventHandler(() => {
+export default defineEventHandler(async () => {
     const strFunctions: Record<string, string> = {};
 
-    for (const [key, func] of Object.entries(
-        ERUDIT_SERVER.LANGUAGE?.functions || {},
-    ))
-        strFunctions[key] = 'return ' + func.toString();
+    for (const [funcName, funcStr] of Object.entries(
+        ERUDIT.language.functions,
+    )) {
+        strFunctions[funcName] = funcStr.toString();
+    }
 
     return strFunctions;
 });

package/server/api/language/phrase/[phraseKey].ts

@@ -0,0 +1,32 @@
+export default defineEventHandler<Promise<PayloadLanguagePhraseValue>>(
+    async (event) => {
+        const phraseKey = event.context.params?.phraseKey;
+
+        if (!phraseKey) {
+            throw createError({
+                statusCode: 400,
+                message: 'Phrase key is required!',
+            });
+        }
+
+        let phraseValue = ERUDIT.language.phrases[phraseKey];
+
+        if (phraseValue) {
+            if (typeof phraseValue === 'string') {
+                return {
+                    type: 'string',
+                    value: phraseValue,
+                };
+            } else {
+                return {
+                    type: 'function',
+                    value: phraseValue.toString(),
+                };
+            }
+        }
+
+        return {
+            type: 'missing',
+        };
+    },
+);