erudit 3.0.0-dev.15 → 3.0.0-dev.17

package/nuxt.config.ts

@@ -1,134 +1,131 @@
-import {
-    PUBLIC_CONTENT_ASSET,
-    PUBLIC_CONTRIBUTOR_ASSET,
-    PUBLIC_ERUDIT_ASSET,
-    PUBLIC_USER_ASSET,
-} from './const';
-import { eruditPath, projectPath } from './globalPath';
-
-export default defineNuxtConfig({
-    compatibilityDate: '2025-01-01',
-    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'),
-        //
-        '#project': projectPath(),
-        '#content': projectPath('content'),
-    },
-    modules: [eruditPath('module'), 'nuxt-my-icons'],
-    myicons: {
-        iconsDir: eruditPath('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}`),
-        ),
-    ],
-    nitro: {
-        preset: 'github-pages',
-        plugins: [eruditPath('server/plugin')],
-        prerender: {
-            crawlLinks: true,
-            failOnError: false,
-            concurrency: 10,
-            ignore: [
-                (path: string) => {
-                    const regexps = [/\?element=/gm, /#/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,
-            },
-            {
-                baseURL: PUBLIC_CONTRIBUTOR_ASSET,
-                dir: projectPath('contributors'),
-                maxAge: 60 * 60 * 24 * 30,
-            },
-        ],
-        esbuild: {
-            options: {
-                charset: 'utf8',
-                tsconfigRaw: {
-                    compilerOptions: {
-                        experimentalDecorators: true, // Make TypeORM work with Nuxt,
-                    },
-                },
-            },
-        },
-    },
-    vite: {
-        optimizeDeps: {
-            include: [
-                'yaml',
-                'photoswipe',
-                '@floating-ui/vue',
-                '@bitran-js/core',
-                '@bitran-js/transpiler',
-                '@bitran-js/renderer-vue',
-                '@erudit-js/bitran-elements',
-            ],
-        },
-        server: {
-            fs: { strict: false },
-        },
-        css: {
-            preprocessorOptions: {
-                scss: {
-                    api: 'modern-compiler',
-                    additionalData: `@use '$/utils' as *;`,
-                },
-            },
-        },
-    },
-});
+import {
+    PUBLIC_CONTENT_ASSET,
+    PUBLIC_CONTRIBUTOR_ASSET,
+    PUBLIC_ERUDIT_ASSET,
+    PUBLIC_USER_ASSET,
+} from './const';
+import { eruditPath, projectPath } from './globalPath';
+
+export default defineNuxtConfig({
+    compatibilityDate: '2025-01-01',
+    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'],
+    myicons: {
+        iconsDir: eruditPath('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}`),
+        ),
+    ],
+    nitro: {
+        preset: 'github-pages',
+        plugins: [eruditPath('server/plugin')],
+        prerender: {
+            crawlLinks: true,
+            failOnError: false,
+            concurrency: 10,
+            ignore: [
+                (path: string) => {
+                    const regexps = [/\?element=/gm, /#/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,
+            },
+            {
+                baseURL: PUBLIC_CONTRIBUTOR_ASSET,
+                dir: projectPath('contributors'),
+                maxAge: 60 * 60 * 24 * 30,
+            },
+        ],
+        esbuild: {
+            options: {
+                charset: 'utf8',
+                tsconfigRaw: {
+                    compilerOptions: {
+                        experimentalDecorators: true, // Make TypeORM work with Nuxt,
+                    },
+                },
+            },
+        },
+    },
+    vite: {
+        optimizeDeps: {
+            include: [
+                'yaml',
+                'photoswipe',
+                '@floating-ui/vue',
+                '@bitran-js/core',
+                '@bitran-js/transpiler',
+                '@bitran-js/renderer-vue',
+                '@erudit-js/bitran-elements',
+            ],
+        },
+        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.15",
+    "version": "3.0.0-dev.17",
     "type": "module",
     "description": "🤓 CMS for perfect educational sites.",
     "license": "MIT",
@@ -15,9 +15,9 @@
         "erudit": "bin/erudit.mjs"
     },
     "peerDependencies": {
-        "@erudit-js/cog": "3.0.0-dev.15",
-        "@erudit-js/cli": "3.0.0-dev.15",
-        "@erudit-js/bitran-elements": "3.0.0-dev.15"
+        "@erudit-js/cog": "3.0.0-dev.17",
+        "@erudit-js/cli": "3.0.0-dev.17",
+        "@erudit-js/bitran-elements": "3.0.0-dev.17"
     },
     "dependencies": {
         "@bitran-js/core": "1.0.0-dev.13",
@@ -27,14 +27,15 @@
         "chalk": "^5.4.1",
         "chokidar": "^4.0.3",
         "consola": "^3.4.2",
-        "glob": "^11.0.1",
+        "esbuild": "^0.25.4",
+        "glob": "^11.0.2",
         "image-size": "^2.0.2",
         "jiti": "^2.4.2",
         "nuxt": "3.17.2",
         "nuxt-my-icons": "1.1.1",
-        "sass": "^1.86.2",
+        "sass": "^1.87.0",
         "sqlite3": "^5.1.7",
-        "typeorm": "^0.3.22",
+        "typeorm": "^0.3.23",
         "vue": "latest",
         "vue-router": "latest"
     }

package/server/api/aside/major/nav/bookIds.ts

@@ -1,5 +1,5 @@
-import { getNavBookIds } from '@server/nav/utils';
-
-export default defineEventHandler(() => {
-    return getNavBookIds('short');
-});
+import { getNavBookIds } from '@server/nav/utils';
+
+export default defineEventHandler(() => {
+    return getNavBookIds('short');
+});

package/server/api/aside/major/nav/bookNav/[...bookId].ts

@@ -1,20 +1,20 @@
-import { ERUDIT_SERVER } from '@server/global';
-import { createBookFrontNav } from '@server/repository/frontNav';
-
-export default defineEventHandler(async (event) => {
-    const bookId = getRouterParam(event, 'bookId');
-
-    if (
-        !bookId ||
-        !ERUDIT_SERVER.NAV_BOOKS ||
-        !(bookId in ERUDIT_SERVER.NAV_BOOKS)
-    )
-        throw createError({
-            statusCode: 400,
-            statusText: `Unknown book id "${bookId}"!`,
-        });
-
-    const bookNode = ERUDIT_SERVER.NAV_BOOKS[bookId]!;
-
-    return await createBookFrontNav(bookNode);
-});
+import { ERUDIT_SERVER } from '@server/global';
+import { createBookFrontNav } from '@server/repository/frontNav';
+
+export default defineEventHandler(async (event) => {
+    const bookId = getRouterParam(event, 'bookId');
+
+    if (
+        !bookId ||
+        !ERUDIT_SERVER.NAV_BOOKS ||
+        !(bookId in ERUDIT_SERVER.NAV_BOOKS)
+    )
+        throw createError({
+            statusCode: 400,
+            statusText: `Unknown book id "${bookId}"!`,
+        });
+
+    const bookNode = ERUDIT_SERVER.NAV_BOOKS[bookId]!;
+
+    return await createBookFrontNav(bookNode);
+});

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

@@ -1,7 +1,7 @@
-import type { FrontNav } from '@erudit/shared/frontNav';
-import { ERUDIT_SERVER } from '@server/global';
-import { createGlobalFrontNav } from '@server/repository/frontNav';
-
-export default defineEventHandler(async () => {
-    return (await createGlobalFrontNav(ERUDIT_SERVER.NAV)) as FrontNav;
-});
+import type { FrontNav } from '@erudit/shared/frontNav';
+import { ERUDIT_SERVER } from '@server/global';
+import { createGlobalFrontNav } from '@server/repository/frontNav';
+
+export default defineEventHandler(async () => {
+    return (await createGlobalFrontNav(ERUDIT_SERVER.NAV)) as FrontNav;
+});

package/server/api/aside/minor/news.ts

@@ -1,7 +1,7 @@
-import type { AsideMinorNews } from '@shared/aside/minor';
-
-export default defineEventHandler(async () => {
-    return <AsideMinorNews>{
-        type: 'news',
-    };
-});
+import type { AsideMinorNews } from '@shared/aside/minor';
+
+export default defineEventHandler(async () => {
+    return <AsideMinorNews>{
+        type: 'news',
+    };
+});

package/server/api/aside/minor/path.ts

@@ -1,82 +1,82 @@
-import { isTopicPart, locationFromPath } from '@erudit-js/cog/schema';
-
-import type { AsideMinorContent, AsideMinorTopic } from '@shared/aside/minor';
-import { getBitranToc } from '@server/bitran/toc';
-import {
-    getContentContributors,
-    getPreviousNext,
-} from '@server/repository/content';
-import { getTopicPartsLinks } from '@server/repository/topic';
-import { getFullContentId } from '@server/repository/contentId';
-
-export default defineEventHandler(async (event) => {
-    const query = getQuery<{ path: string }>(event);
-
-    if (!query.path) {
-        throw createError({
-            statusCode: 400,
-            statusText: 'Missing "path" query parameter!',
-        });
-    }
-
-    const path = query.path.substring(1);
-    const pathStart = path.split('/')[0];
-
-    if (isTopicPart(pathStart)) return await createTopicData(path);
-
-    if (['book', 'group'].includes(pathStart))
-        return await createContentData(pathStart, path);
-
-    return 'news';
-});
-
-async function createTopicData(path: string): Promise<AsideMinorTopic> {
-    const location = locationFromPath(path);
-
-    if (!location) {
-        throw createError({
-            statusCode: 400,
-            statusText: `Provided path "${path}" is not a valid topic location!`,
-        });
-    }
-
-    if (location.path) {
-        location.path = await getFullContentId(location.path);
-    }
-
-    const contentId = location.path;
-
-    const toc = await getBitranToc(location);
-    const previousNext = await getPreviousNext(contentId);
-    const topicPartsLinks = await getTopicPartsLinks(contentId);
-    const contributors = await getContentContributors(contentId);
-
-    return {
-        type: 'topic',
-        topicId: contentId,
-        location,
-        toc,
-        nav: {
-            ...previousNext,
-            ...topicPartsLinks,
-        },
-        contributors,
-    };
-}
-
-async function createContentData(
-    type: string,
-    path: string,
-): Promise<AsideMinorContent> {
-    const rawContentId = path.split('/').slice(1).join('/');
-    const contentId = getFullContentId(rawContentId);
-    const previousNext = await getPreviousNext(contentId);
-    const contributors = await getContentContributors(contentId);
-
-    return {
-        type: type as any,
-        contentId,
-        nav: previousNext,
-        contributors,
-    };
-}
+import { isTopicPart, locationFromPath } from '@erudit-js/cog/schema';
+
+import type { AsideMinorContent, AsideMinorTopic } from '@shared/aside/minor';
+import { getBitranToc } from '@server/bitran/toc';
+import {
+    getContentContributors,
+    getPreviousNext,
+} from '@server/repository/content';
+import { getTopicPartsLinks } from '@server/repository/topic';
+import { getFullContentId } from '@server/repository/contentId';
+
+export default defineEventHandler(async (event) => {
+    const query = getQuery<{ path: string }>(event);
+
+    if (!query.path) {
+        throw createError({
+            statusCode: 400,
+            statusText: 'Missing "path" query parameter!',
+        });
+    }
+
+    const path = query.path.substring(1);
+    const pathStart = path.split('/')[0];
+
+    if (isTopicPart(pathStart)) return await createTopicData(path);
+
+    if (['book', 'group'].includes(pathStart))
+        return await createContentData(pathStart, path);
+
+    return 'news';
+});
+
+async function createTopicData(path: string): Promise<AsideMinorTopic> {
+    const location = locationFromPath(path);
+
+    if (!location) {
+        throw createError({
+            statusCode: 400,
+            statusText: `Provided path "${path}" is not a valid topic location!`,
+        });
+    }
+
+    if (location.path) {
+        location.path = await getFullContentId(location.path);
+    }
+
+    const contentId = location.path;
+
+    const toc = await getBitranToc(location);
+    const previousNext = await getPreviousNext(contentId);
+    const topicPartsLinks = await getTopicPartsLinks(contentId);
+    const contributors = await getContentContributors(contentId);
+
+    return {
+        type: 'topic',
+        topicId: contentId,
+        location,
+        toc,
+        nav: {
+            ...previousNext,
+            ...topicPartsLinks,
+        },
+        contributors,
+    };
+}
+
+async function createContentData(
+    type: string,
+    path: string,
+): Promise<AsideMinorContent> {
+    const rawContentId = path.split('/').slice(1).join('/');
+    const contentId = getFullContentId(rawContentId);
+    const previousNext = await getPreviousNext(contentId);
+    const contributors = await getContentContributors(contentId);
+
+    return {
+        type: type as any,
+        contentId,
+        nav: previousNext,
+        contributors,
+    };
+}

package/server/api/bitran/content/[...location].ts

@@ -1,10 +1,10 @@
-import { parseClientBitranLocation } from '@server/bitran/location';
-import { getBitranContent } from '@server/bitran/content';
-
-export default defineEventHandler(async (event) => {
-    setResponseHeader(event, 'Content-Type', 'application/json; charset=utf-8');
-    const location = await parseClientBitranLocation(
-        event.context.params!.location,
-    );
-    return await getBitranContent(location);
-});
+import { parseClientBitranLocation } from '@server/bitran/location';
+import { getBitranContent } from '@server/bitran/content';
+
+export default defineEventHandler(async (event) => {
+    setResponseHeader(event, 'Content-Type', 'application/json; charset=utf-8');
+    const location = await parseClientBitranLocation(
+        event.context.params!.location,
+    );
+    return await getBitranContent(location);
+});

package/server/api/bitran/toc/[...location].ts

@@ -1,9 +1,9 @@
-import { parseClientBitranLocation } from '@server/bitran/location';
-import { getBitranToc } from '@server/bitran/toc';
-
-export default defineEventHandler(async (event) => {
-    const location = await parseClientBitranLocation(
-        event.context.params!.location,
-    );
-    return await getBitranToc(location);
-});
+import { parseClientBitranLocation } from '@server/bitran/location';
+import { getBitranToc } from '@server/bitran/toc';
+
+export default defineEventHandler(async (event) => {
+    const location = await parseClientBitranLocation(
+        event.context.params!.location,
+    );
+    return await getBitranToc(location);
+});