erudit 2.0.0-dev.7 → 2.0.0-dev.9

package/module/logger.ts

@@ -1,10 +1,10 @@
-import { createConsola } from 'consola';
-import { brandColorTitle } from 'erudit-cog/utils/brand';
-
-const tag = brandColorTitle + ' Module';
-
-export const logger = createConsola({
-    defaults: {
-        tag,
-    },
-});
+import { createConsola } from 'consola';
+import { brandColorTitle } from 'erudit-cog/utils/brand';
+
+const tag = brandColorTitle + ' Module';
+
+export const logger = createConsola({
+    defaults: {
+        tag,
+    },
+});

package/module/restart.ts

@@ -1,61 +1,61 @@
-import { exit } from 'node:process';
-import { globSync } from 'glob';
-import chokidar, { type FSWatcher } from 'chokidar';
-import type { Nuxt } from 'nuxt/schema';
-
-import { eruditPath, projectPath } from '@erudit/globalPath';
-import { logger } from '@erudit/module/logger';
-import { stress } from '@erudit/utils/stress';
-
-const watchTargets: string[] = [
-    // Erudit Nuxt config file
-    eruditPath('nuxt.config.ts'),
-    // Erudit Globals
-    eruditPath('globals'),
-    // Erudit Nuxt module non-runtime files
-    ...globSync(eruditPath('module/**/*')),
-    // Erudit config in project root
-    ...globSync(projectPath('erudit.{js,ts}')),
-    // Erudit Bitran config in project root
-    ...globSync(projectPath('bitran.{js,ts}')),
-];
-
-const ignoreTargets: string[] = [
-    // Erudit Nuxt module runtime files
-    ...globSync(eruditPath('module/runtime/**/*')),
-];
-
-const restartDelay = 300;
-
-//
-//
-//
-
-let watcher: FSWatcher;
-let restartTimeout: any;
-let nuxt: Nuxt;
-
-export function setupRestartWatcher(_nuxt: Nuxt) {
-    nuxt = _nuxt;
-
-    if (watcher) return;
-
-    watcher = chokidar.watch(watchTargets, {
-        ignored: ignoreTargets,
-        ignoreInitial: true,
-    });
-
-    watcher.on('all', (event, path) => {
-        clearTimeout(restartTimeout);
-        restartTimeout = setTimeout(() => {
-            console.log('\n');
-            logger.info(
-                `Restarting due to critical file change: ${stress(path)}\n\n`,
-            );
-            // Nuxt Restart Hook won't work when unhandled Node exception is thrown!
-            // nuxt.callHook('restart', { hard: true, });
-            // So we kill the process and restart it in Erudit CLI instead.
-            exit(1337);
-        }, restartDelay);
-    });
-}
+import { exit } from 'node:process';
+import { globSync } from 'glob';
+import chokidar, { type FSWatcher } from 'chokidar';
+import type { Nuxt } from 'nuxt/schema';
+
+import { eruditPath, projectPath } from '@erudit/globalPath';
+import { logger } from '@erudit/module/logger';
+import { stress } from '@erudit/utils/stress';
+
+const watchTargets: string[] = [
+    // Erudit Nuxt config file
+    eruditPath('nuxt.config.ts'),
+    // Erudit Globals
+    eruditPath('globals'),
+    // Erudit Nuxt module non-runtime files
+    ...globSync(eruditPath('module/**/*')),
+    // Erudit config in project root
+    ...globSync(projectPath('erudit.{js,ts}')),
+    // Erudit Bitran config in project root
+    ...globSync(projectPath('bitran.{js,ts}')),
+];
+
+const ignoreTargets: string[] = [
+    // Erudit Nuxt module runtime files
+    ...globSync(eruditPath('module/runtime/**/*')),
+];
+
+const restartDelay = 300;
+
+//
+//
+//
+
+let watcher: FSWatcher;
+let restartTimeout: any;
+let nuxt: Nuxt;
+
+export function setupRestartWatcher(_nuxt: Nuxt) {
+    nuxt = _nuxt;
+
+    if (watcher) return;
+
+    watcher = chokidar.watch(watchTargets, {
+        ignored: ignoreTargets,
+        ignoreInitial: true,
+    });
+
+    watcher.on('all', (event, path) => {
+        clearTimeout(restartTimeout);
+        restartTimeout = setTimeout(() => {
+            console.log('\n');
+            logger.info(
+                `Restarting due to critical file change: ${stress(path)}\n\n`,
+            );
+            // Nuxt Restart Hook won't work when unhandled Node exception is thrown!
+            // nuxt.callHook('restart', { hard: true, });
+            // So we kill the process and restart it in Erudit CLI instead.
+            exit(1337);
+        }, restartDelay);
+    });
+}

package/nuxt.config.ts

@@ -1,96 +1,107 @@
-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'),
-    },
-    typescript: {
-        tsConfig: {
-            include: [eruditPath('**/*'), projectPath('**/*')],
-        },
-    },
-    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: {
-        plugins: [eruditPath('server/plugin')],
-        prerender: {
-            failOnError: false,
-        },
-        output: {
-            publicDir: projectPath('dist'),
-        },
-        publicAssets: [
-            {
-                baseURL: '/_erudit-asset/',
-                dir: eruditPath('app/public'),
-                maxAge: 60 * 60 * 24 * 30,
-            },
-            {
-                baseURL: '/_user-asset/public/',
-                dir: projectPath('public'),
-                maxAge: 60 * 60 * 24 * 30,
-            },
-            {
-                baseURL: '/_user-asset/content/',
-                dir: projectPath('content'),
-                maxAge: 60 * 60 * 24 * 30,
-            },
-            {
-                baseURL: '/_user-asset/contributor/',
-                dir: projectPath('contributors'),
-                maxAge: 60 * 60 * 24 * 30,
-            },
-        ],
-        esbuild: {
-            options: {
-                tsconfigRaw: {
-                    compilerOptions: {
-                        experimentalDecorators: true, // Make TypeORM work with Nuxt
-                    },
-                },
-            },
-        },
-    },
-    vite: {
-        optimizeDeps: {
-            include: [
-                '@floating-ui/vue',
-                'bitran',
-                'bitran/core',
-                'bitran/render',
-                'yaml',
-                'slugify',
-            ],
-        },
-        css: {
-            preprocessorOptions: {
-                scss: {
-                    api: 'modern-compiler',
-                    additionalData: `@use '$/utils' as *;`,
-                },
-            },
-        },
-    },
-});
+import { elementPackages } from '@erudit-js/bitran-elements';
+
+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'),
+    },
+    typescript: {
+        tsConfig: {
+            include: [eruditPath('**/*'), projectPath('**/*')],
+        },
+    },
+    build: {
+        transpile: ['@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: {
+        plugins: [eruditPath('server/plugin')],
+        prerender: {
+            failOnError: false,
+        },
+        output: {
+            publicDir: projectPath('dist'),
+        },
+        publicAssets: [
+            {
+                baseURL: '/_erudit-asset/',
+                dir: eruditPath('app/public'),
+                maxAge: 60 * 60 * 24 * 30,
+            },
+            {
+                baseURL: '/_user-asset/public/',
+                dir: projectPath('public'),
+                maxAge: 60 * 60 * 24 * 30,
+            },
+            {
+                baseURL: '/_user-asset/content/',
+                dir: projectPath('content'),
+                maxAge: 60 * 60 * 24 * 30,
+            },
+            {
+                baseURL: '/_user-asset/contributor/',
+                dir: projectPath('contributors'),
+                maxAge: 60 * 60 * 24 * 30,
+            },
+        ],
+        esbuild: {
+            options: {
+                tsconfigRaw: {
+                    compilerOptions: {
+                        experimentalDecorators: true, // Make TypeORM work with Nuxt,
+                    },
+                },
+            },
+        },
+    },
+    vite: {
+        optimizeDeps: {
+            noDiscovery: true,
+            include: [
+                '@bitran-js/core',
+                '@bitran-js/transpiler',
+                // '@bitran-js/renderer-vue',
+                // '@erudit-js/bitran-elements',
+                //
+                ...elementPackages,
+                //
+                'gradient-string',
+                '@floating-ui/vue',
+                'yaml',
+            ],
+        },
+        server: { fs: { strict: false } },
+        css: {
+            preprocessorOptions: {
+                scss: {
+                    api: 'modern-compiler',
+                    additionalData: `@use '$/utils' as *;`,
+                },
+            },
+        },
+    },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "erudit",
-    "version": "2.0.0-dev.7",
+    "version": "2.0.0-dev.9",
     "type": "module",
     "description": "🤓 CMS for perfect educational sites.",
     "license": "MIT",
@@ -11,21 +11,24 @@
         "directory": "packages/erudit"
     },
     "dependencies": {
+        "@bitran-js/core": "1.0.0-dev.7",
+        "@bitran-js/transpiler": "1.0.0-dev.7",
+        "@bitran-js/renderer-vue": "1.0.0-dev.7",
+        "@erudit-js/bitran-elements": "1.0.0-dev.5",
+        "erudit-cli": "1.0.0-dev.7",
+        "erudit-cog": "1.0.0-dev.3",
         "@floating-ui/vue": "^1.1.6",
-        "bitran": "^3.0.0-dev.3",
         "chalk": "^5.4.1",
         "chokidar": "^4.0.3",
         "consola": "^3.4.0",
-        "erudit-cli": "1.0.0-dev.6",
-        "erudit-cog": "1.0.0-dev.3",
         "glob": "^11.0.1",
         "image-size": "^1.2.0",
         "nuxt": "3.15.4",
         "nuxt-my-icons": "1.0.2",
-        "sass": "^1.84.0",
+        "sass": "^1.85.1",
         "slugify": "^1.6.6",
         "sqlite3": "^5.1.7",
-        "typeorm": "^0.3.20",
+        "typeorm": "^0.3.21",
         "vue": "latest",
         "vue-router": "latest"
     }

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

@@ -1,5 +1,5 @@
-import { ERUDIT_SERVER } from '@server/global';
-
-export default defineEventHandler(() => {
-    return Object.keys(ERUDIT_SERVER.NAV_BOOKS || {});
-});
+import { ERUDIT_SERVER } from '@server/global';
+
+export default defineEventHandler(() => {
+    return Object.keys(ERUDIT_SERVER.NAV_BOOKS || {});
+});

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, false)) 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, false)) 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,78 +1,78 @@
-import { isTopicPart } from 'erudit-cog/schema';
-
-import type { AsideMinorContent, AsideMinorTopic } from '@shared/aside/minor';
-import { getBitranToc } from '@erudit/server/plugin/bitran/toc';
-import {
-    getContentContributors,
-    getFullContentId,
-    getPreviousNext,
-} from '@erudit/server/plugin/repository/content';
-import { getTopicPartsLinks } from '@erudit/server/plugin/repository/topic';
-import { locationFromPath } from '@erudit/shared/bitran/location';
-
-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!`,
-        });
-
-    const contentId = location.path;
-    const fullContentId = (await getFullContentId(contentId))!;
-
-    const toc = await getBitranToc(location);
-    const previousNext = await getPreviousNext(contentId);
-    const topicPartsLinks = await getTopicPartsLinks(contentId);
-    const contributors = await getContentContributors(contentId);
-
-    return {
-        type: 'topic',
-        fullContentId,
-        location,
-        toc,
-        nav: {
-            ...previousNext,
-            ...topicPartsLinks,
-        },
-        contributors,
-    };
-}
-
-async function createContentData(
-    type: string,
-    path: string,
-): Promise<AsideMinorContent> {
-    const contentId = path.split('/').slice(1).join('/');
-    const fullContentId = (await getFullContentId(contentId))!;
-    const previousNext = await getPreviousNext(contentId);
-    const contributors = await getContentContributors(contentId);
-
-    return {
-        type: type as any,
-        fullContentId,
-        nav: previousNext,
-        contributors,
-    };
-}
+import { isTopicPart } from 'erudit-cog/schema';
+
+import type { AsideMinorContent, AsideMinorTopic } from '@shared/aside/minor';
+import { getBitranToc } from '@erudit/server/plugin/bitran/toc';
+import {
+    getContentContributors,
+    getFullContentId,
+    getPreviousNext,
+} from '@erudit/server/plugin/repository/content';
+import { getTopicPartsLinks } from '@erudit/server/plugin/repository/topic';
+import { locationFromPath } from '@erudit/shared/bitran/location';
+
+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!`,
+        });
+
+    const contentId = location.path;
+    const fullContentId = (await getFullContentId(contentId))!;
+
+    const toc = await getBitranToc(location);
+    const previousNext = await getPreviousNext(contentId);
+    const topicPartsLinks = await getTopicPartsLinks(contentId);
+    const contributors = await getContentContributors(contentId);
+
+    return {
+        type: 'topic',
+        fullContentId,
+        location,
+        toc,
+        nav: {
+            ...previousNext,
+            ...topicPartsLinks,
+        },
+        contributors,
+    };
+}
+
+async function createContentData(
+    type: string,
+    path: string,
+): Promise<AsideMinorContent> {
+    const contentId = path.split('/').slice(1).join('/');
+    const fullContentId = (await getFullContentId(contentId))!;
+    const previousNext = await getPreviousNext(contentId);
+    const contributors = await getContentContributors(contentId);
+
+    return {
+        type: type as any,
+        fullContentId,
+        nav: previousNext,
+        contributors,
+    };
+}

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

@@ -1,7 +1,7 @@
-import { parseUrlLocation } from '@server/bitran/location';
-import { getBitranContent } from '@server/bitran/content';
-
-export default defineEventHandler(async (event) => {
-    const location = parseUrlLocation(getRouterParam(event, 'location') || '');
-    return await getBitranContent(location);
-});
+import { parseUrlLocation } from '@server/bitran/location';
+import { getBitranContent } from '@server/bitran/content';
+
+export default defineEventHandler(async (event) => {
+    const location = parseUrlLocation(getRouterParam(event, 'location') || '');
+    return await getBitranContent(location);
+});

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

@@ -1,7 +1,7 @@
-import { parseUrlLocation } from '@server/bitran/location';
-import { getBitranToc } from '@server/bitran/toc';
-
-export default defineEventHandler(async (event) => {
-    const location = parseUrlLocation(getRouterParam(event, 'location') || '');
-    return await getBitranToc(location);
-});
+import { parseUrlLocation } from '@server/bitran/location';
+import { getBitranToc } from '@server/bitran/toc';
+
+export default defineEventHandler(async (event) => {
+    const location = parseUrlLocation(getRouterParam(event, 'location') || '');
+    return await getBitranToc(location);
+});