erudit 3.0.0-dev.13 → 3.0.0-dev.14

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "erudit",
-    "version": "3.0.0-dev.13",
+    "version": "3.0.0-dev.14",
     "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.14",
+        "@erudit-js/cli": "3.0.0-dev.14",
+        "@erudit-js/bitran-elements": "3.0.0-dev.14"
     },
     "dependencies": {
         "@bitran-js/core": "1.0.0-dev.13",

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/repository/content.ts

@@ -8,6 +8,7 @@ import { getContentContext } from '@server/content/context';
 import { DbContributor } from '@server/db/entities/Contributor';
 import { getIdsUp, getPreviousNextNav } from '@server/nav/utils';
 import {
+    getFullContentId,
     getShortContentId,
     resolveClientContentId,
 } from '@server/repository/contentId';
@@ -238,3 +239,11 @@ export async function getContentContributors(contentId: string) {
 
     return contentContributors.length ? contentContributors : undefined;
 }
+
+export async function getContentFsPath(contentId: string) {
+    const fullContentId = getFullContentId(contentId);
+    const dbContent = await ERUDIT_SERVER.DB.manager.findOne(DbContent, {
+        select: ['type'],
+        where: { contentId: fullContentId },
+    });
+}