erudit 3.0.0-dev.1 → 3.0.0-dev.3

package/app/components/aside/major/SiteInfo.vue

@@ -20,9 +20,9 @@ const siteInfo = computed<SiteInfo>(() => {
         };
 
     return {
-        logotype: eruditConfig.site?.logotype,
+        logotype: eruditConfig.site?.logotype || eruditAsset('logotype.svg'),
         title: eruditConfig.site?.title || phrase.site_info_title,
-        slogan: eruditConfig.site?.slogan,
+        slogan: eruditConfig.site?.slogan || phrase.site_info_slogan,
     };
 });
 </script>

package/app/composables/bitranContent.ts

@@ -28,7 +28,9 @@ export async function useBitranContent(
         nuxtApp.runWithContext(() => prerenderRoutes(apiRoute));
         // @ts-ignore
         contentPromise = (async () => {
-            content.value = (await $fetch(apiRoute)) as BitranContent;
+            content.value = (await $fetch(apiRoute, {
+                responseType: 'json',
+            })) as BitranContent;
             return content;
         })();
     });

package/app/scripts/preview/data/unique.ts

@@ -28,6 +28,7 @@ export async function buildUnique(
 
     const serverData = (await $fetch(
         `/api/preview/unique/${encodeBitranLocation(linkTarget._absoluteStrLocation!)}`,
+        { responseType: 'json' },
     )) as any;
     const productName = serverData.bitran.productName;
     const customTitle = serverData.productTitle;

package/nuxt.config.ts

@@ -43,6 +43,7 @@ export default defineNuxtConfig({
         ),
     ],
     nitro: {
+        preset: 'github-pages',
         plugins: [eruditPath('server/plugin')],
         prerender: {
             failOnError: false,
@@ -84,7 +85,7 @@ export default defineNuxtConfig({
     },
     vite: {
         optimizeDeps: {
-            noDiscovery: true,
+            //noDiscovery: true,
             include: [
                 '@bitran-js/core',
                 '@bitran-js/transpiler',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "erudit",
-    "version": "3.0.0-dev.1",
+    "version": "3.0.0-dev.3",
     "type": "module",
     "description": "🤓 CMS for perfect educational sites.",
     "license": "MIT",
@@ -11,8 +11,8 @@
         "directory": "packages/erudit"
     },
     "dependencies": {
-        "erudit-cli": "3.0.0-dev.1",
-        "erudit-cog": "3.0.0-dev.1",
+        "erudit-cli": "3.0.0-dev.3",
+        "erudit-cog": "3.0.0-dev.3",
         "@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",

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

@@ -2,6 +2,7 @@ import { parseUrlLocation } 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 = parseUrlLocation(getRouterParam(event, 'location') || '');
     return await getBitranContent(location);
 });

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

@@ -2,12 +2,12 @@ import type { EruditPhraseId } from '@shared/types/language';
 import { ERUDIT_SERVER } from '@server/global';
 
 export default defineEventHandler((event) => {
+    setResponseHeader(event, 'Content-Type', 'text/plain; charset=utf-8');
+
     const phraseId = getRouterParam(event, 'phraseId');
     const phrase =
         ERUDIT_SERVER.LANGUAGE?.phrases?.[phraseId as EruditPhraseId];
 
-    setResponseHeader(event, 'content-type', 'text/plain');
-
     if (typeof phrase === 'string') return phrase;
     else if (typeof phrase === 'function')
         return '~!~FUNC~!~' + 'return ' + phrase.toString();

package/server/api/preview/unique/[location].ts

@@ -1,4 +1,4 @@
-import type { BitranContent } from 'bitran';
+import type { BitranContent } from '@bitran-js/renderer-vue';
 
 import { parseUrlLocation } from '@server/bitran/location';
 import { getLocationContext } from '@server/content/context';
@@ -21,6 +21,8 @@ interface ReturnType {
 }
 
 export default defineEventHandler<Promise<ReturnType>>(async (event) => {
+    setResponseHeader(event, 'Content-Type', 'application/json; charset=utf-8');
+
     const location = parseUrlLocation(getRouterParam(event, 'location') || '');
 
     const context = await getLocationContext(location);

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

@@ -116,6 +116,7 @@ async function scanChildNodes(
         const skip = pathParts.sep === '+';
 
         const childNode: NavNode = {
+            parent,
             type: pathParts.type,
             path: nodePath,
             id,

package/server/tsconfig.json

@@ -1,7 +1,9 @@
 {
     "extends": "../../../playground/.erudit/nuxt/.nuxt/tsconfig.server.json",
     "compilerOptions": {
-        "verbatimModuleSyntax": true
+        "verbatimModuleSyntax": true,
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true
     },
     "exclude": ["../module/**/*", "../globalPath.ts"]
 }