erudit 3.0.0-dev.2 → 3.0.0-dev.4

package/app/components/aside/major/panes/nav/Nav.vue

@@ -13,13 +13,13 @@ import NavBook from './NavBook.vue';
 const contentRoute = useContentRoute();
 const asideMajorNav = getAsideMajorNavPayload();
 
-asideMajorNav.booksIds ||= (await $fetch(
-    '/api/aside/major/nav/bookIds',
-)) as string[];
+asideMajorNav.booksIds ||= (await $fetch('/api/aside/major/nav/bookIds', {
+    responseType: 'json',
+})) as string[];
 
-asideMajorNav.globalNav ||= (await $fetch(
-    '/api/aside/major/nav/global',
-)) as FrontNav;
+asideMajorNav.globalNav ||= (await $fetch('/api/aside/major/nav/global', {
+    responseType: 'json',
+})) as FrontNav;
 
 //
 // Check if inside book from start

package/app/components/aside/major/panes/nav/NavBook.vue

@@ -23,6 +23,7 @@ async function setupNavBook() {
     );
     book.value = await $fetch(
         `/api/aside/major/nav/bookNav/${navBookId.value}`,
+        { responseType: 'json' },
     );
 
     loading.value = false;

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/composables/phrases.ts

@@ -40,6 +40,7 @@ export function usePhrases<T extends EruditPhraseId[]>(
             const apiRoute = phraseApiRoute(phraseId);
             const strPhrase = (payload.strPhrases[phraseId] ||= (await $fetch(
                 apiRoute,
+                { responseType: 'text' },
             )) as string);
 
             if (strPhrase.startsWith('~!~FUNC~!~')) {

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

@@ -16,5 +16,7 @@ export async function buildPageLink(
 
     if (linkTarget.type !== 'page') return;
 
-    return await $fetch(`/api/preview/page${linkTarget._href}`);
+    return await $fetch(`/api/preview/page${linkTarget._href}`, {
+        responseType: 'json',
+    });
 }

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,7 +43,7 @@ export default defineNuxtConfig({
         ),
     ],
     nitro: {
-        preset: 'static',
+        preset: 'github-pages',
         plugins: [eruditPath('server/plugin')],
         prerender: {
             failOnError: false,

package/package.json

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