erudit 3.0.0-dev.6 → 3.0.0-dev.8

package/app/components/SiteMain.vue

@@ -11,7 +11,6 @@
 
 <style lang="scss" module>
 @use '$/def/bp';
-@use '@bitran-js/renderer-vue/scss/def' as bitranDef;
 
 .main {
     --_pMainBase: var(--gapBig);
@@ -24,8 +23,8 @@
     font-size: 18px;
 
     @include bp.below('mobile') {
-        --_pMainBase: #{bitranDef.$asideWidth};
-        font-size: 15px;
+        --_pMainBase: var(--_bitran_asideWidth);
+        font-size: 14px;
     }
 
     .mainInner {

package/app/components/aside/minor/topic/TopicToc.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { headingName } from '@erudit-js/bitran-elements/heading/shared';
 
-import { stringifyBitranLocation } from '@shared/bitran/location';
+import { stringifyBitranLocation } from '@erudit-js/cog/schema';
 import type { TocItem } from '@erudit/shared/bitran/toc';
 import { topicLocation } from '@app/scripts/aside/minor/topic';
 import { injectAsideData } from '@app/scripts/aside/minor/state';

package/app/components/bitran/BitranContent.vue

@@ -1,7 +1,8 @@
 <script lang="ts" setup>
 import { Bitran, type BitranContent } from '@bitran-js/renderer-vue';
+import type { BitranContext } from '@erudit-js/cog/schema';
 
-import type { BitranContext } from '@shared/bitran/context';
+import eruditConfig from '#erudit/config';
 
 import RenderWrapper from './RenderWrapper.vue';
 
@@ -36,15 +37,16 @@ const isServer = import.meta.server;
         :RenderWrapper
         :isDev
         :isServer
+        :language="eruditConfig.language"
     />
 </template>
 
 <style lang="scss" module>
-@use '@bitran-js/renderer-vue/scss/def' as bitranDef;
+@use '$/def/bp';
 
 .eruditBitranContainer {
     padding: var(--_pMainY) var(--_pMainX);
-    padding-left: calc(var(--_pMainX) - #{bitranDef.$asideWidth});
+    padding-left: calc(var(--_pMainX) - var(--_bitran_asideWidth));
 
     // Setting up Bitran
 
@@ -64,7 +66,12 @@ const isServer = import.meta.server;
     --bitran_textMuted: var(--textMuted);
     --bitran_textDimmed: var(--textDimmed);
     --bitran_textDisabled: var(--textDisabled);
+    --bitran_textDeep: var(--textDeep);
 
     --bitran_colorBrand: var(--brand);
+
+    @include bp.below('mobile') {
+        --bitran_gapBlocks: calc(22px);
+    }
 }
 </style>

package/app/components/main/topic/MainTopic.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
-import type { TopicPart } from '@erudit-js/cog/schema';
-import { NO_ALIASES } from '@erudit-js/bitran-elements/aliases/shared';
+import { NO_ALIASES, type TopicPart } from '@erudit-js/cog/schema';
 
 import eruditConfig from '#erudit/config';
 

package/app/components/main/utils/Breadcrumb.vue

@@ -56,18 +56,13 @@ function getIcon(contextIcon: string) {
 
         @include transition(color);
 
-        // [my-icon]
-        // {
-        //     position: relative;
-        //     top: .6px;
-        // }
-
         &:hover {
             color: var(--textMuted);
         }
     }
 
     .sep {
+        flex-shrink: 0;
         position: relative;
         top: 0.5px;
     }

package/app/components/main/utils/ContentPopovers.vue

@@ -24,7 +24,7 @@ const phrase = await usePhrases(
 
 const flagData: Record<ContentFlag, PopoverData> = {
     dev: {
-        icon: <MyIconName>'alert',
+        icon: <MyIconName>'construction',
         color: 'var(--warn)',
         title: phrase.flag_dev,
         description: phrase.flag_dev_description,
@@ -70,6 +70,7 @@ const hasPopovers = computed(() => {
         <ContentPopover v-if="generic?.dependencies" :data="dependenciesData">
             <ul :class="$style.dependenciesList">
                 <li v-for="(value, key) in generic.dependencies">
+                    <MyIcon :name="'arrow-left'" wrapper="span" />
                     <NuxtLink :prefetch="false" :to="key">{{ value }}</NuxtLink>
                 </li>
             </ul>
@@ -87,18 +88,23 @@ const hasPopovers = computed(() => {
 
 .dependenciesList {
     margin-top: var(--gapSmall);
-    list-style-type: square;
+    list-style-type: none;
     list-style-position: inside;
     padding-inline-start: 0;
 
     li {
-        &::marker {
-            content: '↪';
+        display: flex;
+        gap: var(--gapSmall);
+        align-items: center;
+
+        [my-icon] {
+            flex-shrink: 0;
+            font-size: 0.95em;
+            transform: scaleX(-1);
         }
 
         a {
             color: inherit;
-            padding-left: var(--gapSmall);
         }
     }
 }

package/app/components/preview/display/Unique.vue

@@ -5,6 +5,9 @@ import type { PreviewDataUnique } from '@app/scripts/preview/data/unique';
 import type { PreviewDisplayProps } from '@app/scripts/preview/display';
 
 const { data } = defineProps<PreviewDisplayProps<PreviewDataUnique>>();
+
+const bitranTranspiler = await useBitranTranspiler();
+const root = await bitranTranspiler.parser.parse(data.bitran.content.biCode);
 </script>
 
 <template>
@@ -16,7 +19,10 @@ const { data } = defineProps<PreviewDisplayProps<PreviewDataUnique>>();
             ]"
         >
             <BitranContent
-                :content="data.bitran.content"
+                :content="{
+                    root,
+                    preRenderData: data.bitran.content.preRenderData,
+                }"
                 :context="data.bitran.context"
             />
         </div>

package/app/composables/bitran.ts

@@ -1,9 +1,6 @@
-import eruditConfig from '#erudit/config';
-import bitranConfig from '#erudit/client/bitran';
-
 import {
     createPhraseCaller,
-    getDefaultRenderers,
+    getDefaultRenderers as getDefaultBitranRenderers,
     getElementIcon,
     type ElementVueRenderers,
 } from '@bitran-js/renderer-vue';
@@ -12,22 +9,17 @@ import {
     type BitranTranspiler,
     type ElementTranspilers,
 } from '@bitran-js/transpiler';
-import { aliasesName } from '@erudit-js/bitran-elements/aliases/shared';
-import { aliasesTranspiler } from '@erudit-js/bitran-elements/aliases/transpiler';
-import { headingName } from '@erudit-js/bitran-elements/heading/shared';
-import { defineHeadingTranspiler } from '@erudit-js/bitran-elements/heading/transpiler';
-import { includeName } from '@erudit-js/bitran-elements/include/shared';
-import { includeTranspiler } from '@erudit-js/bitran-elements/include/transpiler';
-import { linkName } from '@erudit/shared/bitran/link/shared';
-import { linkTranspiler } from '@erudit/shared/bitran/link/transpiler';
-import { aliasesRenderer } from '@erudit-js/bitran-elements/aliases/renderer';
-import { headingRenderer } from '@erudit-js/bitran-elements/heading/renderer';
-import { includeRenderer } from '@erudit-js/bitran-elements/include/renderer';
-import { linkRenderer } from '@erudit/shared/bitran/link/renderer';
+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 bitranTranspiler!: BitranTranspiler;
 let bitranRenderers!: ElementVueRenderers;
 
+globalThis.useEruditConfig = () => eruditConfig;
+
 //
 // Transpiler
 //
@@ -37,18 +29,9 @@ export async function useBitranTranspiler() {
 
     const projectTranspilers = await getProjectTranspilers();
 
-    const defaultTranspilers = {
-        [aliasesName]: aliasesTranspiler,
-        [includeName]: includeTranspiler,
-        [headingName]: defineHeadingTranspiler({
-            language: eruditConfig?.language,
-        }),
-        [linkName]: linkTranspiler,
-    };
-
     bitranTranspiler = defineBitranTranspiler({
         ...projectTranspilers,
-        ...defaultTranspilers,
+        ...eruditDefaultTranspilers,
     });
 
     return bitranTranspiler;
@@ -75,17 +58,10 @@ export async function useBitranRenderers() {
 
     const projectRenderers = await getProjectRenderers();
 
-    const defaultRenderers = {
-        [aliasesName]: aliasesRenderer,
-        [includeName]: includeRenderer,
-        [headingName]: headingRenderer,
-        [linkName]: linkRenderer,
-    };
-
     // @ts-ignore
     bitranRenderers = {
         ...projectRenderers,
-        ...defaultRenderers,
+        ...eruditDefaultRenderers,
     };
 
     return bitranRenderers!;
@@ -110,7 +86,7 @@ async function getProjectRenderers() {
 export async function useBitranElementRenderer(productName: string) {
     const renderer =
         (await useBitranRenderers())[productName] ||
-        getDefaultRenderers()[productName];
+        getDefaultBitranRenderers()[productName];
 
     if (!renderer)
         throw new Error(`Missing Bitran product render "${productName}"!`);

package/app/composables/bitranContent.ts

@@ -1,11 +1,11 @@
 import type { ShallowRef } from 'vue';
 import type { BitranContent } from '@bitran-js/renderer-vue';
-
 import {
     encodeBitranLocation,
     stringifyBitranLocation,
     type BitranLocation,
-} from '@erudit/shared/bitran/location';
+} from '@erudit-js/cog/schema';
+import type { StringBitranContent } from '@erudit/shared/bitran/stringContent';
 
 export async function useBitranContent(
     location: Ref<BitranLocation | undefined>,
@@ -26,11 +26,23 @@ export async function useBitranContent(
 
         const apiRoute = `/api/bitran/content/${encodeBitranLocation(stringifyBitranLocation(location.value!))}`;
         nuxtApp.runWithContext(() => prerenderRoutes(apiRoute));
+
         // @ts-ignore
         contentPromise = (async () => {
-            content.value = (await $fetch(apiRoute, {
+            const stringContent = (await $fetch(apiRoute, {
                 responseType: 'json',
-            })) as BitranContent;
+            })) as StringBitranContent;
+
+            const bitranTranspiler = await useBitranTranspiler();
+            const root = await bitranTranspiler.parser.parse(
+                stringContent.biCode,
+            );
+
+            content.value = {
+                root,
+                preRenderData: stringContent.preRenderData,
+            };
+
             return content;
         })();
     });

package/app/composables/bitranLocation.ts

@@ -1,4 +1,4 @@
-import { locationFromPath, type BitranLocation } from '@shared/bitran/location';
+import { locationFromPath, type BitranLocation } from '@erudit-js/cog/schema';
 
 export function useBitranLocation(): ComputedRef<BitranLocation | undefined> {
     const route = useRoute();

package/app/pages/group/[...groupId].vue

@@ -1,16 +1,15 @@
 <script lang="ts" setup>
-import { NO_ALIASES } from '@erudit-js/bitran-elements/aliases/shared';
-
-import { type ContentGroupData } from '@shared/content/data/type/group';
+import { NO_ALIASES } from '@erudit-js/cog/schema';
 import eruditConfig from '#erudit/config';
 
+import { type ContentGroupData } from '@shared/content/data/type/group';
+import { locationIcon } from '@erudit/shared/icons';
 import ContentDecoration from '@app/components/main/utils/ContentDecoration.vue';
 import Breadcrumb from '@app/components/main/utils/Breadcrumb.vue';
 import ContentTitle from '@app/components/main/utils/ContentTitle.vue';
 import ContentDescription from '@app/components/main/utils/ContentDescription.vue';
 import ContentPopovers from '@app/components/main/utils/ContentPopovers.vue';
 import ContentSection from '@app/components/main/utils/ContentSection.vue';
-import { locationIcon } from '@erudit/shared/icons';
 
 const location = useBitranLocation();
 

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

@@ -1,18 +1,19 @@
-import type { BitranContent } from 'bitran';
-
-import type { BitranContext } from '@erudit/shared/bitran/context';
+import {
+    encodeBitranLocation,
+    type BitranContext,
+} from '@erudit-js/cog/schema';
 
 import { PreviewDataType, type PreviewDataBase } from '../data';
 import type { PreviewFooter } from '../footer';
 import { PreviewRequestType, type PreviewRequest } from '../request';
-import { encodeBitranLocation } from '@erudit/shared/bitran/location';
+import type { StringBitranContent } from '@erudit/shared/bitran/stringContent';
 
 export interface PreviewDataUnique extends PreviewDataBase {
     type: PreviewDataType.Unique;
     productName: string;
     bitran: {
         context: BitranContext;
-        content: BitranContent;
+        content: StringBitranContent;
     };
     footer: PreviewFooter;
 }

package/bin/erudit.mjs

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '@erudit-js/cli/cli';

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

@@ -28,15 +28,15 @@ export default defineNuxtModule({
         }
 
         {
-            // Handle sub dependencies
-            const subDeps = eruditConfig.subDeps || [];
-
             const transpile = (_nuxt.options.build.transpile ||= []);
             const optimizeDeps = _nuxt.options.vite.optimizeDeps || {};
             const optimizeDepsInclude = (optimizeDeps.include ||= []);
 
-            transpile.push(...subDeps);
-            optimizeDepsInclude.push(...subDeps);
+            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.6",
+    "version": "3.0.0-dev.8",
     "type": "module",
     "description": "🤓 CMS for perfect educational sites.",
     "license": "MIT",
@@ -10,15 +10,19 @@
         "url": "git+https://github.com/erudit-js/erudit.git",
         "directory": "packages/erudit"
     },
+    "bin": {
+        "erudit-cli": "bin/erudit.mjs",
+        "erudit": "bin/erudit.mjs"
+    },
     "peerDependencies": {
-        "@erudit-js/bitran-elements": "3.0.0-dev.6"
+        "@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.8",
-        "@bitran-js/renderer-vue": "1.0.0-dev.8",
-        "@bitran-js/transpiler": "1.0.0-dev.8",
-        "@erudit-js/cli": "3.0.0-dev.6",
-        "@erudit-js/cog": "3.0.0-dev.6",
+        "@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",
         "@floating-ui/vue": "^1.1.6",
         "chalk": "^5.4.1",
         "chokidar": "^4.0.3",
@@ -26,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/api/aside/major/nav/global.ts

@@ -3,5 +3,5 @@ import { ERUDIT_SERVER } from '@server/global';
 import { createGlobalFrontNav } from '@server/repository/frontNav';
 
 export default defineEventHandler(async () => {
-    return (await createGlobalFrontNav(ERUDIT_SERVER.NAV, false)) as FrontNav;
+    return (await createGlobalFrontNav(ERUDIT_SERVER.NAV)) as FrontNav;
 });

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

@@ -1,4 +1,4 @@
-import { isTopicPart } from '@erudit-js/cog/schema';
+import { isTopicPart, locationFromPath } from '@erudit-js/cog/schema';
 
 import type { AsideMinorContent, AsideMinorTopic } from '@shared/aside/minor';
 import { getBitranToc } from '@erudit/server/plugin/bitran/toc';
@@ -8,7 +8,6 @@ import {
     getPreviousNext,
 } from '@erudit/server/plugin/repository/content';
 import { getTopicPartsLinks } from '@erudit/server/plugin/repository/topic';
-import { locationFromPath } from '@erudit/shared/bitran/location';
 
 export default defineEventHandler(async (event) => {
     const query = getQuery<{ path: string }>(event);

package/server/api/preview/page/[...parts].ts

@@ -4,8 +4,9 @@ import {
     getContributorContext,
 } from '@erudit/server/plugin/content/context';
 
+import type { LinkTargetPageType } from '@erudit-js/bitran-elements/link/target';
+
 import type { PreviewDataPageLink } from '@app/scripts/preview/data/pageLink';
-import type { LinkTargetPageType } from '@erudit/shared/bitran/link/target';
 import type { Context, ContextItem } from '@erudit/shared/content/context';
 
 export default defineEventHandler<Promise<PreviewDataPageLink>>(
@@ -27,7 +28,7 @@ export default defineEventHandler<Promise<PreviewDataPageLink>>(
                     return await getContributorContext(contentId);
             }
 
-            throw createError(`Can't handle "${pageType}" page type!`);
+            throw createError(`Can't handle "${pageType as any}" page type!`);
         })();
 
         const lastContextItem = context.pop() as ContextItem;

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

@@ -1,3 +1,7 @@
+import {
+    stringifyBitranLocation,
+    type BitranContext,
+} from '@erudit-js/cog/schema';
 import type { BitranContent } from '@bitran-js/renderer-vue';
 
 import { parseUrlLocation } from '@server/bitran/location';
@@ -7,8 +11,7 @@ import { DbUnique } from '@server/db/entities/Unique';
 import { getBitranContent } from '@server/bitran/content';
 
 import type { Context } from '@shared/content/context';
-import type { BitranContext } from '@shared/bitran/context';
-import { stringifyBitranLocation } from '@shared/bitran/location';
+import type { StringBitranContent } from '@erudit/shared/bitran/stringContent';
 
 interface ReturnType {
     context: Context;
@@ -16,7 +19,7 @@ interface ReturnType {
     bitran: {
         productName: string;
         context: BitranContext;
-        content: BitranContent;
+        content: StringBitranContent;
     };
 }