erudit 3.0.0-dev.13 → 3.0.0-dev.15

package/app/components/aside/AsideMinor.vue

@@ -1,12 +1,12 @@
 <script lang="ts" setup>
-import type { AsideMinorData } from '@shared/asideMinor';
+import type { AsideMinorData } from '@shared/aside/minor';
+import { trailingSlash } from '@erudit/utils/slash';
 import { asideMinorKey } from '@app/scripts/aside/minor/state';
 
 import {
     LazyAsideMinorNews,
     LazyAsideMinorTopic,
     LazyAsideMinorContent,
-    LazyAsideMinorContributor,
 } from '#components';
 
 let setupI = 0;
@@ -19,7 +19,7 @@ const AsideMinorPane = shallowRef<Component>();
 
 async function setupAsideMinorData() {
     const currentSetupI = ++setupI;
-    const path = route.path;
+    const dataKey = trailingSlash(route.path, false);
     const payloadKey = 'aside-minor';
     const asideMinorPayload =
         (nuxtApp.static.data[payloadKey] ||=
@@ -28,8 +28,8 @@ async function setupAsideMinorData() {
 
     const data: AsideMinorData = await (async () => {
         const payloadKeyValue: AsideMinorData | 'news' = (asideMinorPayload[
-            path
-        ] ||= await $fetch(`/api/aside/minor/path`, { query: { path } }));
+            dataKey
+        ] ||= await $fetch(`/api/aside/minor/path`, { query: { path: dataKey } }));
 
         if (payloadKeyValue === 'news') {
             // We do not save news in the payload as it will always have the same content.

package/app/components/aside/minor/Contribute.vue

@@ -16,7 +16,7 @@ const paneVisible = defineModel<boolean>('pane');
 const issueLink = computed(() => {
     const ghRepositorty = eruditConfig.repository;
     return ghRepositorty
-        ? `https://github.com/${ghRepositorty.name}/issues/`
+        ? `https://github.com/${ghRepositorty.name}/issues/new/choose`
         : null;
 });
 

package/app/composables/contentData.ts

@@ -1,3 +1,4 @@
+import { trailingSlash } from '@erudit/utils/slash';
 import type { ContentData } from '@shared/content/data';
 
 export function useContentData<T extends ContentData>() {
@@ -21,12 +22,13 @@ export function useContentData<T extends ContentData>() {
                 return;
             }
 
-            const contentId = contentRoute.value.contentId;
+            const dataKey = trailingSlash(contentRoute.value.contentId, false);
 
-            const payloadValue = (payload[contentId] ||= await $fetch(
+            const payloadValue = (payload[dataKey] ||= await $fetch(
                 '/api/content/data',
-                { query: { contentId } },
+                { query: { contentId: dataKey } },
             ));
+
             data.value = payloadValue as T;
             return data;
         })();

package/module/restart.ts

@@ -15,9 +15,9 @@ const watchTargets: string[] = [
     // Erudit Nuxt module non-runtime files
     ...globSync(eruditPath('module/**/*')),
     // Erudit config in project root
-    ...globSync(projectPath('erudit.{js,ts}')),
+    ...globSync(projectPath('erudit.config.{js,ts}')),
     // Erudit Bitran config in project root
-    ...globSync(projectPath('bitran.{js,ts}')),
+    ...globSync(projectPath('bitran.{app,server}.{js,ts}')),
 ];
 
 const ignoreTargets: string[] = [

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "erudit",
-    "version": "3.0.0-dev.13",
+    "version": "3.0.0-dev.15",
     "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.13",
-        "@erudit-js/cli": "3.0.0-dev.13",
-        "@erudit-js/bitran-elements": "3.0.0-dev.13"
+        "@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"
     },
     "dependencies": {
         "@bitran-js/core": "1.0.0-dev.13",
@@ -30,8 +30,8 @@
         "glob": "^11.0.1",
         "image-size": "^2.0.2",
         "jiti": "^2.4.2",
-        "nuxt": "3.17.0",
-        "nuxt-my-icons": "1.0.2",
+        "nuxt": "3.17.2",
+        "nuxt-my-icons": "1.1.1",
         "sass": "^1.86.2",
         "sqlite3": "^5.1.7",
         "typeorm": "^0.3.22",

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

@@ -7,10 +7,7 @@ import {
     getPreviousNext,
 } from '@server/repository/content';
 import { getTopicPartsLinks } from '@server/repository/topic';
-import {
-    getFullContentId,
-    getShortContentId,
-} from '@server/repository/contentId';
+import { getFullContentId } from '@server/repository/contentId';
 
 export default defineEventHandler(async (event) => {
     const query = getQuery<{ path: string }>(event);
@@ -72,7 +69,7 @@ async function createContentData(
     path: string,
 ): Promise<AsideMinorContent> {
     const rawContentId = path.split('/').slice(1).join('/');
-    const contentId = (await getFullContentId(rawContentId))!;
+    const contentId = getFullContentId(rawContentId);
     const previousNext = await getPreviousNext(contentId);
     const contributors = await getContentContributors(contentId);
 

package/server/plugin/bitran/content.ts

@@ -140,7 +140,12 @@ async function createBitranContent(
                     mergeAliases(context.aliases, node.parseData);
                     break;
                 case node instanceof IncludeNode:
-                    await resolveInclude(node, context);
+                    const includeNode = await resolveInclude(node, context);
+                    await walkDown(includeNode, async (child) => {
+                        if (child instanceof ElementNode) {
+                            await makePreRender(child);
+                        }
+                    });
                     break;
                 case node instanceof BlockErrorNode:
                 case node instanceof InlinerErrorNode:
@@ -149,16 +154,6 @@ async function createBitranContent(
             }
 
             await makePreRender(node);
-
-            if (node instanceof IncludeNode) {
-                for (const block of node.parseData.blocks?.children || []) {
-                    await walkDown(block, async (child) => {
-                        if (child instanceof ElementNode) {
-                            await makePreRender(child);
-                        }
-                    });
-                }
-            }
         },
     });
 

package/server/plugin/build/jobs/nav.ts

@@ -15,17 +15,18 @@ import {
     type NavNode,
     type RootNavNode,
 } from '@server/nav/node';
-import { ERUDIT_SERVER } from '../../global';
+import { ERUDIT_SERVER } from '@server/global';
+import { readFileSync } from 'fs';
 
 type Ids = Record<string, string>;
 let ids: Ids;
 
-const contentTargets = ERUDIT_SERVER.CONFIG?.contentTargets || [];
-
 const nodePathRegexp = new RegExp(
     `(?<pos>\\d+)(?<sep>-|\\+)(?<id>[\\w-]+)\\/(?<type>${contentTypes.join('|')})\\..*`,
 );
 
+const contentFilter = createContentFilter();
+
 export async function buildNav() {
     debug.start('Building navigation tree...');
 
@@ -88,8 +89,6 @@ async function scanChildNodes(
             continue;
         }
 
-        if (!satisfiesContentTargets(nodePath)) continue; // Not a content target
-
         const parentId = isRootNode(parent)
             ? ''
             : parent.skip
@@ -129,6 +128,30 @@ async function scanChildNodes(
                   return ids.join('/');
               })();
 
+        const shouldSkip = (() => {
+            const targets = [
+                ...contentFilter.cliContentTargets,
+                ...(ERUDIT_SERVER.CONFIG?.contentTargets || []),
+            ];
+
+            // If there are no filters, allow all nodes
+            if (targets.length === 0) {
+                return false;
+            }
+
+            // If the node passes at least one filter, keep it
+            for (const target of targets) {
+                if (contentFilter.strFilter(fullId, target)) {
+                    return false;
+                }
+            }
+
+            // Node failed all filters, skip it
+            return true;
+        })();
+
+        if (shouldSkip) continue;
+
         const skip = pathParts.sep === '+';
 
         const childNode: NavNode = {
@@ -177,14 +200,29 @@ async function scanChildNodes(
     };
 }
 
-function satisfiesContentTargets(nodePath: string): boolean {
-    if (contentTargets.length === 0) return true;
+function createContentFilter() {
+    const cliContentTargets = (() => {
+        try {
+            return JSON.parse(
+                readFileSync(PROJECT_DIR + '/.erudit/targets.json', 'utf-8'),
+            );
+        } catch (error) {}
 
-    for (const target of contentTargets)
-        if (nodePath.startsWith(target) || target.search(nodePath) === 0)
+        return [];
+    })();
+
+    const strFilter = (fullId: string, filterItem: string) => {
+        if (fullId.startsWith(filterItem) || filterItem.search(fullId) === 0) {
             return true;
+        }
 
-    return false;
+        return false;
+    };
+
+    return {
+        cliContentTargets,
+        strFilter,
+    };
 }
 
 function validNode(node: NavNode): boolean {

package/server/plugin/build/process.ts

@@ -1,3 +1,5 @@
+import { resetDatabase } from '@server/db/reset';
+import { ERUDIT_SERVER } from '@server/global';
 import { debug, logger } from '@server/logger';
 
 import { setup } from './setup';
@@ -5,11 +7,10 @@ import { setupLanguage } from './jobs/language';
 import { buildContributors } from './jobs/contributors';
 import { buildNav } from './jobs/nav';
 import { buildContent } from './jobs/content/generic';
-import { resetDatabase } from '../db/reset';
 
 let initial = true;
 
-export async function build() {
+async function _build() {
     debug.start('Building data...');
 
     if (initial) {
@@ -25,3 +26,7 @@ export async function build() {
 
     logger.success('Build successful!');
 }
+
+export async function build() {
+    ERUDIT_SERVER.BUILD_PROMISE = _build();
+}

package/server/plugin/db/setup.ts

@@ -3,7 +3,7 @@ import { DataSource } from 'typeorm';
 
 import { PROJECT_DIR } from '#erudit/globalPaths';
 import { ERUDIT_SERVER } from '@server/global';
-import { logger } from '../logger';
+import { logger } from '@server/logger';
 
 // Database Entities
 import { DbContributor } from './entities/Contributor';

package/server/plugin/index.ts

@@ -1,9 +1,9 @@
-import { ERUDIT_SERVER } from './global';
-import { build } from './build/process';
-import { close } from './build/close';
+import { ERUDIT_SERVER } from '@server/global';
+import { build } from '@server/build/process';
+import { close } from '@server/build/close';
 
 export default defineNitroPlugin((_nitro) => {
-    ERUDIT_SERVER.BUILD_PROMISE = build();
+    build();
     _nitro.hooks.hook('request', async () => await ERUDIT_SERVER.BUILD_PROMISE);
     _nitro.hooks.hook('close', close);
 });

package/utils/slash.ts

@@ -0,0 +1,11 @@
+export function trailingSlash(path: string, add: boolean): string {
+    if (path === '/') {
+        return '/';
+    }
+
+    if (add) {
+        return path.endsWith('/') ? path : `${path}/`;
+    }
+
+    return path.endsWith('/') ? path.slice(0, -1) : path;
+}