erudit 3.0.0-dev.7 → 3.0.0-dev.8

package/app/composables/bitran.ts

@@ -9,23 +9,17 @@ import {
     type BitranTranspiler,
     type ElementTranspilers,
 } from '@bitran-js/transpiler';
-import type { BitranElements } from '@erudit-js/cog/schema';
-import { eruditDefaultElements } from '@erudit-js/bitran-elements/default';
+import { eruditDefaultTranspilers } from '@erudit-js/bitran-elements/defaultTranspilers';
+import { eruditDefaultRenderers } from '@erudit-js/bitran-elements/defaultRenderers';
 
 import eruditConfig from '#erudit/config';
 import bitranConfig from '#erudit/client/bitran';
 
-let defaultElements!: BitranElements;
 let bitranTranspiler!: BitranTranspiler;
 let bitranRenderers!: ElementVueRenderers;
 
 globalThis.useEruditConfig = () => eruditConfig;
 
-export function getDefaultElements() {
-    if (!defaultElements) defaultElements = eruditDefaultElements();
-    return defaultElements;
-}
-
 //
 // Transpiler
 //
@@ -34,11 +28,10 @@ export async function useBitranTranspiler() {
     if (bitranTranspiler) return bitranTranspiler;
 
     const projectTranspilers = await getProjectTranspilers();
-    const defaultTranspilers = await getDefaultTranspilers();
 
     bitranTranspiler = defineBitranTranspiler({
         ...projectTranspilers,
-        ...defaultTranspilers,
+        ...eruditDefaultTranspilers,
     });
 
     return bitranTranspiler;
@@ -56,16 +49,6 @@ async function getProjectTranspilers(): Promise<ElementTranspilers> {
     return projectTranspilers;
 }
 
-async function getDefaultTranspilers(): Promise<ElementTranspilers> {
-    const defaultElements = getDefaultElements();
-    const defaultTranspilers: ElementTranspilers = {};
-
-    for (const [name, bitranElement] of Object.entries(defaultElements))
-        defaultTranspilers[name] = await bitranElement.transpiler();
-
-    return defaultTranspilers;
-}
-
 //
 // Renderers
 //
@@ -74,12 +57,11 @@ export async function useBitranRenderers() {
     if (bitranRenderers) return bitranRenderers;
 
     const projectRenderers = await getProjectRenderers();
-    const defaultRenderers = await getDefaultRenderers();
 
     // @ts-ignore
     bitranRenderers = {
         ...projectRenderers,
-        ...defaultRenderers,
+        ...eruditDefaultRenderers,
     };
 
     return bitranRenderers!;
@@ -97,16 +79,6 @@ async function getProjectRenderers() {
     return projectRenderers;
 }
 
-async function getDefaultRenderers() {
-    const defaultElements = getDefaultElements();
-    const defaultRenderers: ElementVueRenderers = {};
-
-    for (const [name, bitranElement] of Object.entries(defaultElements))
-        defaultRenderers[name] = await bitranElement.renderer();
-
-    return defaultRenderers;
-}
-
 //
 // Utils
 //

package/module/bitran.ts

@@ -7,9 +7,10 @@ import { logger } from '@erudit/module/logger';
 
 export async function setupBitranConfig(_nuxt: Nuxt) {
     let config: Partial<EruditBitranConfig>;
+    const configPath = projectPath('bitran.config');
 
     try {
-        const projectConfig = (await import(projectPath('bitran'))).default;
+        const projectConfig = (await import(configPath)).default;
         if (!projectConfig) throw new Error('Falsy Bitran config!');
         config = projectConfig;
     } catch (error) {
@@ -23,7 +24,7 @@ export async function setupBitranConfig(_nuxt: Nuxt) {
         write: true,
         getContents: () => `
             import type { EruditBitranConfig } from '@erudit-js/cog/schema';
-            ${config ? `import bitranConfig from '${projectPath('bitran')}';` : ''}
+            ${config ? `import bitranConfig from '${configPath}';` : ''}
             export default ${config ? 'bitranConfig' : '{}'} as Partial<EruditBitranConfig>;
         `,
     });

package/module/config.ts

@@ -7,9 +7,10 @@ import { logger } from '@erudit/module/logger';
 
 export async function setupEruditConfig(_nuxt: Nuxt) {
     let config: Partial<EruditConfig> = {};
+    const configPath = projectPath('erudit.config');
 
     try {
-        const projectConfig = (await import(projectPath('erudit'))).default;
+        const projectConfig = (await import(configPath)).default;
         if (!projectConfig) throw new Error('Falsy Erudit config!');
         config = projectConfig;
     } catch (error) {

package/module/index.ts

@@ -32,10 +32,11 @@ export default defineNuxtModule({
             const optimizeDeps = _nuxt.options.vite.optimizeDeps || {};
             const optimizeDepsInclude = (optimizeDeps.include ||= []);
 
-            transpile.push(...(eruditConfig.nuxt?.transpile || []));
-            optimizeDepsInclude.push(
-                ...(eruditConfig.nuxt?.optimizeDeps || []),
-            );
+            const deps = eruditConfig.dependencies || {};
+            for (const [dep, options] of Object.entries(deps)) {
+                if (options?.transpile) transpile.push(dep);
+                if (options?.optimize) optimizeDepsInclude.push(dep);
+            }
         }
 
         // TODO: Watch for contributors folder and create/update template with their IDs

package/nuxt.config.ts

@@ -83,8 +83,14 @@ export default defineNuxtConfig({
     },
     vite: {
         optimizeDeps: {
-            noDiscovery: true,
-            include: ['yaml', '@floating-ui/vue'],
+            include: [
+                'yaml',
+                '@floating-ui/vue',
+                '@bitran-js/core',
+                '@bitran-js/transpiler',
+                '@bitran-js/renderer-vue',
+                '@erudit-js/bitran-elements',
+            ],
         },
         server: { fs: { strict: false } },
         css: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "erudit",
-    "version": "3.0.0-dev.7",
+    "version": "3.0.0-dev.8",
     "type": "module",
     "description": "🤓 CMS for perfect educational sites.",
     "license": "MIT",
@@ -15,14 +15,14 @@
         "erudit": "bin/erudit.mjs"
     },
     "peerDependencies": {
-        "@erudit-js/bitran-elements": "3.0.0-dev.7"
+        "@erudit-js/cog": "3.0.0-dev.8",
+        "@erudit-js/cli": "3.0.0-dev.8",
+        "@erudit-js/bitran-elements": "3.0.0-dev.8"
     },
     "dependencies": {
         "@bitran-js/core": "1.0.0-dev.10",
         "@bitran-js/renderer-vue": "1.0.0-dev.10",
         "@bitran-js/transpiler": "1.0.0-dev.10",
-        "@erudit-js/cli": "3.0.0-dev.7",
-        "@erudit-js/cog": "3.0.0-dev.7",
         "@floating-ui/vue": "^1.1.6",
         "chalk": "^5.4.1",
         "chokidar": "^4.0.3",
@@ -30,9 +30,9 @@
         "glob": "^11.0.1",
         "image-size": "^1.2.0",
         "jiti": "^2.4.2",
-        "nuxt": "3.15.4",
+        "nuxt": "3.16.1",
         "nuxt-my-icons": "1.0.2",
-        "sass": "^1.85.1",
+        "sass": ">=1.85.1",
         "sqlite3": "^5.1.7",
         "typeorm": "^0.3.21",
         "vue": "latest",

package/server/plugin/bitran/setup.ts

@@ -5,7 +5,7 @@ import { ERUDIT_SERVER } from '@server/global';
 export async function setupBitranConfig() {
     try {
         ERUDIT_SERVER.BITRAN_CONFIG = (
-            await IMPORT(PROJECT_DIR + '/bitran.ts')
+            await IMPORT(PROJECT_DIR + '/bitran.config')
         ).default;
     } catch {}
 }

package/server/plugin/bitran/transpiler.ts

@@ -2,35 +2,21 @@ import {
     defineBitranTranspiler,
     type ElementTranspilers,
 } from '@bitran-js/transpiler';
+import { eruditDefaultTranspilers } from '@erudit-js/bitran-elements/defaultTranspilers';
 
 import { ERUDIT_SERVER } from '@server/global';
 
 export async function createBitranTranspiler() {
     const projectTranspilers = await getProjectTranspilers();
-    const defaultTranspilers = await getDefaultTranspilers();
 
     const bitranTranspiler = defineBitranTranspiler({
         ...projectTranspilers,
-        ...defaultTranspilers,
+        ...eruditDefaultTranspilers,
     });
 
     return bitranTranspiler;
 }
 
-async function getDefaultTranspilers(): Promise<ElementTranspilers> {
-    const getDefaultElements = (
-        await import('@erudit-js/bitran-elements/default')
-    ).eruditDefaultElements;
-
-    const defaultElements = getDefaultElements();
-    const defaultTranspilers: ElementTranspilers = {};
-
-    for (const [name, bitranElement] of Object.entries(defaultElements))
-        defaultTranspilers[name] = await bitranElement.transpiler();
-
-    return defaultTranspilers;
-}
-
 async function getProjectTranspilers(): Promise<ElementTranspilers> {
     const bitranElements = ERUDIT_SERVER?.BITRAN_CONFIG?.elements;
 

package/server/plugin/db/entities/Content.ts

@@ -30,7 +30,7 @@ export class DbContent {
     description?: string;
 
     @Column('simple-json', { nullable: true })
-    flags?: Record<ContentFlag, boolean>;
+    flags?: Partial<Record<ContentFlag, boolean>>;
 
     @Column('varchar', { nullable: true })
     decoration?: string;