erudit 3.0.0-dev.5 → 3.0.0-dev.6

package/app/app.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { brandLogotype, brandColors } from 'erudit-cog/utils/brand';
+import { brandLogotype, brandColors } from '@erudit-js/cog/utils/brand';
 
 import eruditConfig from '#erudit/config';
 import { version } from '@erudit/package.json';

package/app/components/aside/major/panes/nav/fnav/FNavFlags.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { ContentFlag } from 'erudit-cog/schema';
+import type { ContentFlag } from '@erudit-js/cog/schema';
 import { flagsData } from '@app/scripts/flag';
 
 defineProps<{ flags: Record<ContentFlag, boolean> }>();

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

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { topicParts, type TopicPart } from 'erudit-cog/schema';
+import { topicParts, type TopicPart } from '@erudit-js/cog/schema';
 
 import { injectAsideData } from '@app/scripts/aside/minor/state';
 import type { AsideMinorTopic } from '@shared/aside/minor';

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

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

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

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { topicParts, type TopicPart } from 'erudit-cog/schema';
+import { topicParts, type TopicPart } from '@erudit-js/cog/schema';
 
 import type { TopicPartLinks } from '@erudit/shared/content/data/type/topic';
 import { TOPIC_PART_ICON } from '@erudit/shared/icons';

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

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { ContentFlag } from 'erudit-cog/schema';
+import type { ContentFlag } from '@erudit-js/cog/schema';
 
 import type { ContentGenericData } from '@shared/content/data/base';
 

package/app/composables/contentRoute.ts

@@ -1,4 +1,4 @@
-import type { ContentType, TopicPart } from 'erudit-cog/schema';
+import type { ContentType, TopicPart } from '@erudit-js/cog/schema';
 
 interface ContentRouteBase {
     type: ContentType;

package/app/composables/externalApi.ts

@@ -1,4 +1,4 @@
-import type { EruditConfigDebug } from 'erudit-cog/schema';
+import type { EruditConfigDebug } from '@erudit-js/cog/schema';
 
 import eruditConfig from '#erudit/config';
 

package/app/public/favicon/article.svg

@@ -1,10 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-  <defs>
-    <linearGradient id="gradient" x1="75" y1="423" x2="437" y2="61" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#4aa44c"/>
-      <stop offset="1" stop-color="#1278b9"/>
-    </linearGradient>
-  </defs>
-  <circle fill="url(#gradient)" cx="256" cy="256" r="256"/>
-  <path fill="white" d="M372.4,179.3h-232.8c-6.6,0-12-5.4-12-12v-26.3c0-6.6,5.4-12,12-12h232.8c6.6,0,12,5.4,12,12v26.3c0,6.6-5.4,12-12,12ZM384.4,269.2v-26.3c0-6.6-5.4-12-12-12h-232.8c-6.6,0-12,5.4-12,12v26.3c0,6.6,5.4,12,12,12h232.8c6.6,0,12-5.4,12-12ZM384.4,371v-26.3c0-6.6-5.4-12-12-12h-232.8c-6.6,0-12,5.4-12,12v26.3c0,6.6,5.4,12,12,12h232.8c6.6,0,12-5.4,12-12Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+  <defs>
+    <linearGradient id="gradient" x1="75" y1="423" x2="437" y2="61" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#4aa44c"/>
+      <stop offset="1" stop-color="#1278b9"/>
+    </linearGradient>
+  </defs>
+  <circle fill="url(#gradient)" cx="256" cy="256" r="256"/>
+  <path fill="white" d="M372.4,179.3h-232.8c-6.6,0-12-5.4-12-12v-26.3c0-6.6,5.4-12,12-12h232.8c6.6,0,12,5.4,12,12v26.3c0,6.6-5.4,12-12,12ZM384.4,269.2v-26.3c0-6.6-5.4-12-12-12h-232.8c-6.6,0-12,5.4-12,12v26.3c0,6.6,5.4,12,12,12h232.8c6.6,0,12-5.4,12-12ZM384.4,371v-26.3c0-6.6-5.4-12-12-12h-232.8c-6.6,0-12,5.4-12,12v26.3c0,6.6,5.4,12,12,12h232.8c6.6,0,12-5.4,12-12Z"/>
 </svg>

package/app/scripts/flag.ts

@@ -1,5 +1,5 @@
 import type { MyIconName } from '#my-icons';
-import type { ContentFlag } from 'erudit-cog/schema';
+import type { ContentFlag } from '@erudit-js/cog/schema';
 
 interface FlagData {
     icon: MyIconName;

package/globalPath.ts

@@ -1,5 +1,5 @@
 import { fileURLToPath } from 'node:url';
-import { resolvePaths } from 'erudit-cog/kit';
+import { resolvePaths } from '@erudit-js/cog/kit';
 
 export const ERUDIT_DIR = resolvePaths(fileURLToPath(import.meta.url), '..');
 export const PROJECT_DIR = process.env.ERUDIT_PROJECT_DIR as string;

package/globals/bitran.ts

@@ -1,2 +1,2 @@
-import { defineBitranConfig, defineBitranElement } from 'erudit-cog/schema';
+import { defineBitranConfig, defineBitranElement } from '@erudit-js/cog/schema';
 export { defineBitranConfig, defineBitranElement };

package/globals/content.ts

@@ -3,7 +3,7 @@ import type {
     ContentReferences,
     GroupConfig,
     TopicConfig,
-} from 'erudit-cog/schema';
+} from '@erudit-js/cog/schema';
 
 export function defineBook(book: Partial<BookConfig>) {
     return book;

package/globals/contributor.ts

@@ -1,4 +1,4 @@
-import type { ContributorConfig } from 'erudit-cog/schema';
+import type { ContributorConfig } from '@erudit-js/cog/schema';
 
 export function defineContributor(contributor: Partial<ContributorConfig>) {
     return contributor;

package/globals/erudit.ts

@@ -1,4 +1,4 @@
-import type { EruditConfig } from 'erudit-cog/schema';
+import type { EruditConfig } from '@erudit-js/cog/schema';
 
 export function defineEruditConfig(eruditConfig: Partial<EruditConfig>) {
     return eruditConfig;

package/module/bitran.ts

@@ -1,6 +1,6 @@
 import { addTemplate } from 'nuxt/kit';
 import type { Nuxt } from 'nuxt/schema';
-import type { EruditBitranConfig } from 'erudit-cog/schema';
+import type { EruditBitranConfig } from '@erudit-js/cog/schema';
 
 import { eruditEndNuxtPath, projectPath } from '@erudit/globalPath';
 import { logger } from '@erudit/module/logger';
@@ -22,7 +22,7 @@ export async function setupBitranConfig(_nuxt: Nuxt) {
         filename: templateFilename,
         write: true,
         getContents: () => `
-            import type { EruditBitranConfig } from 'erudit-cog/schema';
+            import type { EruditBitranConfig } from '@erudit-js/cog/schema';
             ${config ? `import bitranConfig from '${projectPath('bitran')}';` : ''}
             export default ${config ? 'bitranConfig' : '{}'} as Partial<EruditBitranConfig>;
         `,

package/module/config.ts

@@ -1,6 +1,6 @@
 import { addTemplate } from 'nuxt/kit';
 import type { Nuxt } from 'nuxt/schema';
-import type { EruditConfig } from 'erudit-cog/schema';
+import type { EruditConfig } from '@erudit-js/cog/schema';
 
 import { eruditEndNuxtPath, projectPath } from '@erudit/globalPath';
 import { logger } from '@erudit/module/logger';
@@ -22,7 +22,7 @@ export async function setupEruditConfig(_nuxt: Nuxt) {
         filename: templateFilename,
         write: true,
         getContents: () => `
-            import type { EruditConfig } from 'erudit-cog/schema';
+            import type { EruditConfig } from '@erudit-js/cog/schema';
             export default ${JSON.stringify(config, null, '    ')} as Partial<EruditConfig>;
         `,
     });

package/module/logger.ts

@@ -1,5 +1,5 @@
 import { createConsola } from 'consola';
-import { brandColorTitle } from 'erudit-cog/utils/brandNode';
+import { brandColorTitle } from '@erudit-js/cog/utils/brandNode';
 
 const tag = brandColorTitle + ' Module';
 

package/nuxt.config.ts

@@ -1,5 +1,3 @@
-//import { elementPackages } from '@erudit-js/bitran-elements';
-
 import { eruditPath, projectPath } from './globalPath';
 
 export default defineNuxtConfig({
@@ -24,29 +22,11 @@ export default defineNuxtConfig({
             include: [eruditPath('**/*'), projectPath('**/*')],
         },
     },
-    // modulesDir: [
-    //     'D:/code/erudit-js/erudit/node_modules',
-    //     'D:/code/erudit-js/bitran-elements/node_modules',
-    // ],
     build: {
         transpile: [
             'yaml',
             '@bitran-js/renderer-vue',
             '@erudit-js/bitran-elements',
-            // '@bitran-js/renderer-vue',
-            // // '@erudit-js/bitran-elements',
-            // // '@erudit-js/bitran-elements/heading/renderer',
-            // 'yaml',
-            //...elementPackages,
-            // (ctx) => (ctx.isClient ? 'slugify' : false),
-            // 'katex',
-            // '@bitran-js/core',
-            // '@bitran-js/transpiler',
-            // '@bitran-js/renderer-vue',
-            // '@erudit-js/bitran-elements',
-            // '@erudit-js/bitran-elements/heading/shared',
-            // '@erudit-js/bitran-elements/heading/transpiler',
-            // '@erudit-js/bitran-elements/heading/renderer',
         ],
     },
     ignore: [
@@ -104,26 +84,7 @@ export default defineNuxtConfig({
     vite: {
         optimizeDeps: {
             noDiscovery: true,
-            include: [
-                'yaml',
-                '@floating-ui/vue',
-                // '@bitran-js/core',
-                // '@bitran-js/transpiler',
-                // // '@bitran-js/renderer-vue',
-                // // '@erudit-js/bitran-elements',
-                // 'gradient-string',
-                // '@floating-ui/vue',
-                // 'yaml',
-                // //
-                //...elementPackages,
-                // '@bitran-js/core',
-                // '@bitran-js/transpiler',
-                // '@bitran-js/renderer-vue',
-                // '@erudit-js/bitran-elements',
-                // '@erudit-js/bitran-elements/heading/shared',
-                // '@erudit-js/bitran-elements/heading/transpiler',
-                // '@erudit-js/bitran-elements/heading/renderer',
-            ],
+            include: ['yaml', '@floating-ui/vue'],
         },
         server: { fs: { strict: false } },
         css: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "erudit",
-    "version": "3.0.0-dev.5",
+    "version": "3.0.0-dev.6",
     "type": "module",
     "description": "🤓 CMS for perfect educational sites.",
     "license": "MIT",
@@ -10,19 +10,22 @@
         "url": "git+https://github.com/erudit-js/erudit.git",
         "directory": "packages/erudit"
     },
+    "peerDependencies": {
+        "@erudit-js/bitran-elements": "3.0.0-dev.6"
+    },
     "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/bitran-elements": "1.0.0-dev.6",
+        "@erudit-js/cli": "3.0.0-dev.6",
+        "@erudit-js/cog": "3.0.0-dev.6",
         "@floating-ui/vue": "^1.1.6",
         "chalk": "^5.4.1",
         "chokidar": "^4.0.3",
         "consola": "^3.4.0",
-        "erudit-cli": "3.0.0-dev.5",
-        "erudit-cog": "3.0.0-dev.5",
         "glob": "^11.0.1",
         "image-size": "^1.2.0",
+        "jiti": "^2.4.2",
         "nuxt": "3.15.4",
         "nuxt-my-icons": "1.0.2",
         "sass": "^1.85.1",

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

@@ -1,4 +1,4 @@
-import { isTopicPart } from 'erudit-cog/schema';
+import { isTopicPart } from '@erudit-js/cog/schema';
 
 import type { AsideMinorContent, AsideMinorTopic } from '@shared/aside/minor';
 import { getBitranToc } from '@erudit/server/plugin/bitran/toc';

package/server/plugin/bitran/content.ts

@@ -1,4 +1,4 @@
-import { isTopicPart, type TopicPart } from 'erudit-cog/schema';
+import { isTopicPart, type TopicPart } from '@erudit-js/cog/schema';
 import { createPreRenderData, type PreRenderData } from '@bitran-js/transpiler';
 import { BlockNode, BlocksNode } from '@bitran-js/core';
 import { type BitranContent } from '@bitran-js/renderer-vue';

package/server/plugin/bitran/products/link.ts

@@ -1,4 +1,4 @@
-import { isTopicPart } from 'erudit-cog/schema';
+import { isTopicPart } from '@erudit-js/cog/schema';
 
 import { DbUnique } from '@server/db/entities/Unique';
 import { ERUDIT_SERVER } from '@server/global';

package/server/plugin/build/jobs/content/generic.ts

@@ -7,8 +7,8 @@ import {
     type ContentConfig,
     type ContentReferences,
     type ContentType,
-} from 'erudit-cog/schema';
-import { resolvePaths } from 'erudit-cog/kit';
+} from '@erudit-js/cog/schema';
+import { resolvePaths } from '@erudit-js/cog/kit';
 
 import { PROJECT_DIR } from '#erudit/globalPaths';
 import { stress } from '@erudit/utils/stress';

package/server/plugin/build/jobs/content/type/group.ts

@@ -1,5 +1,5 @@
 import { readFileSync } from 'node:fs';
-import type { GroupConfig } from 'erudit-cog/schema';
+import type { GroupConfig } from '@erudit-js/cog/schema';
 
 import { DbGroup } from '@server/db/entities/Group';
 import { ERUDIT_SERVER } from '@erudit/server/plugin/global';

package/server/plugin/build/jobs/content/type/topic.ts

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs';
-import { topicParts, type TopicPart } from 'erudit-cog/schema';
+import { topicParts, type TopicPart } from '@erudit-js/cog/schema';
 
 import { ERUDIT_SERVER } from '@server/global';
 import { DbTopic } from '@server/db/entities/Topic';

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

@@ -2,8 +2,8 @@ import { readFileSync } from 'node:fs';
 import { globSync } from 'glob';
 import path from 'node:path';
 import chalk from 'chalk';
-import { resolvePaths } from 'erudit-cog/kit';
-import type { ContributorConfig } from 'erudit-cog/schema';
+import { resolvePaths } from '@erudit-js/cog/kit';
+import type { ContributorConfig } from '@erudit-js/cog/schema';
 
 import { PROJECT_DIR } from '#erudit/globalPaths';
 import { stress } from '@erudit/utils/stress';

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

@@ -1,7 +1,11 @@
 import { globSync } from 'glob';
 import chalk from 'chalk';
-import { resolvePaths } from 'erudit-cog/kit';
-import { contentTypes, topicParts, type ContentType } from 'erudit-cog/schema';
+import { resolvePaths } from '@erudit-js/cog/kit';
+import {
+    contentTypes,
+    topicParts,
+    type ContentType,
+} from '@erudit-js/cog/schema';
 
 import { PROJECT_DIR } from '#erudit/globalPaths';
 import { stress } from '@erudit/utils/stress';

package/server/plugin/content/absoluteId.ts

@@ -1,4 +1,4 @@
-import { isTopicPart } from 'erudit-cog/schema';
+import { isTopicPart } from '@erudit-js/cog/schema';
 
 import {
     parseBitranLocation,

package/server/plugin/content/context.ts

@@ -1,4 +1,8 @@
-import { isContentType, isTopicPart, type TopicPart } from 'erudit-cog/schema';
+import {
+    isContentType,
+    isTopicPart,
+    type TopicPart,
+} from '@erudit-js/cog/schema';
 
 import { ERUDIT_SERVER } from '@server/global';
 import { getIdsUp, isSkipId } from '@server/nav/utils';

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

@@ -4,7 +4,7 @@ import type {
     ContentReferences,
     ContentSeo,
     ContentType,
-} from 'erudit-cog/schema';
+} from '@erudit-js/cog/schema';
 
 import type { ImageData } from '@erudit/shared/image';
 

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

@@ -1,5 +1,5 @@
 import { Column, Entity, PrimaryColumn } from 'typeorm';
-import type { GroupType } from 'erudit-cog/schema';
+import type { GroupType } from '@erudit-js/cog/schema';
 
 @Entity('group')
 export class DbGroup {

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

@@ -1,5 +1,5 @@
 import { Column, Entity, PrimaryColumn } from 'typeorm';
-import type { TopicPart } from 'erudit-cog/schema';
+import type { TopicPart } from '@erudit-js/cog/schema';
 
 @Entity('topic')
 export class DbTopic {

package/server/plugin/global.ts

@@ -1,5 +1,5 @@
 import type { DataSource } from 'typeorm';
-import type { EruditBitranConfig, EruditConfig } from 'erudit-cog/schema';
+import type { EruditBitranConfig, EruditConfig } from '@erudit-js/cog/schema';
 
 import type { EruditPhrases } from '@shared/types/language';
 import type { NavNode, RootNavNode } from '@server/nav/node';

package/server/plugin/logger.ts

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import { createConsola } from 'consola';
-import { brandColorTitle } from 'erudit-cog/utils/brandNode';
+import { brandColorTitle } from '@erudit-js/cog/utils/brandNode';
 
 import eruditConfig from '#erudit/config';
 

package/server/plugin/nav/node.ts

@@ -1,4 +1,4 @@
-import type { ContentType } from 'erudit-cog/schema';
+import type { ContentType } from '@erudit-js/cog/schema';
 
 export interface NavNode {
     type: ContentType;

package/server/plugin/repository/content.ts

@@ -1,4 +1,4 @@
-import type { ContentType } from 'erudit-cog/schema';
+import type { ContentType } from '@erudit-js/cog/schema';
 import { Like } from 'typeorm';
 
 import { ERUDIT_SERVER } from '@server/global';

package/server/plugin/repository/topic.ts

@@ -1,4 +1,4 @@
-import type { TopicPart } from 'erudit-cog/schema';
+import type { TopicPart } from '@erudit-js/cog/schema';
 
 import { ERUDIT_SERVER } from '@server/global';
 import { DbTopic } from '@server/db/entities/Topic';

package/shared/bitran/link/Link.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { ElementProps } from '@bitran-js/renderer-vue';
-import { isContentType, isTopicPart } from 'erudit-cog/schema';
+import { isContentType, isTopicPart } from '@erudit-js/cog/schema';
 
 import { CONTENT_TYPE_ICON, ICON, TOPIC_PART_ICON } from '@erudit/shared/icons';
 import type { LinkSchema } from './shared';

package/shared/bitran/link/target.ts

@@ -1,4 +1,4 @@
-import { isTopicPart } from 'erudit-cog/schema';
+import { isTopicPart } from '@erudit-js/cog/schema';
 import { tryReplaceAlias } from '@erudit-js/bitran-elements/aliases/shared';
 
 import type { BitranContext } from '@shared/bitran/context';

package/shared/bitran/location.ts

@@ -1,4 +1,4 @@
-import { isTopicPart } from 'erudit-cog/schema';
+import { isTopicPart } from '@erudit-js/cog/schema';
 
 export const bitranLocationTypes = {
     article: true,

package/shared/content/data/base.ts

@@ -4,7 +4,7 @@ import type {
     ContentSeo,
     ContentType,
     TopicPart,
-} from 'erudit-cog/schema';
+} from '@erudit-js/cog/schema';
 
 import type { Context } from '@shared/content/context';
 import type { PreviousNext } from '@shared/content/previousNext';

package/shared/content/data/type/topic.ts

@@ -1,4 +1,4 @@
-import type { TopicPart } from 'erudit-cog/schema';
+import type { TopicPart } from '@erudit-js/cog/schema';
 
 import type { ContentBaseData } from '../base';
 

package/shared/frontNav.ts

@@ -1,4 +1,4 @@
-import type { ContentFlag, TopicPart } from 'erudit-cog/schema';
+import type { ContentFlag, TopicPart } from '@erudit-js/cog/schema';
 
 export type FrontNavType = 'book' | 'topic' | 'separator' | 'folder';
 

package/shared/icons.ts

@@ -3,7 +3,7 @@ import {
     isTopicPart,
     type ContentType,
     type TopicPart,
-} from 'erudit-cog/schema';
+} from '@erudit-js/cog/schema';
 
 import type { MyIconName } from '#my-icons';
 import type { BitranLocation } from './bitran/location';

package/shared/link.ts

@@ -1,4 +1,4 @@
-import type { ContentType, TopicPart } from 'erudit-cog/schema';
+import type { ContentType, TopicPart } from '@erudit-js/cog/schema';
 import type { BitranLocation } from './bitran/location';
 
 export function createBitranLocationLink(location: BitranLocation) {