erudit 4.0.0-dev.3 → 4.0.0-dev.5

package/modules/erudit/watcher.ts

@@ -1,27 +1,20 @@
-import { type FSWatcher, watch } from 'chokidar';
-import { type Nuxt } from 'nuxt/schema';
-
-import { type EruditRuntimeConfig } from '../../shared/types/runtimeConfig';
-
-export let ERUDIT_PROJECT_WATCHER: FSWatcher | undefined;
-export let ERUDIT_PACKAGE_WATCHER: FSWatcher | undefined;
-
-export async function setupWatchers(
-    nuxt: Nuxt,
-    runtimeConfig: EruditRuntimeConfig,
-) {
-    if (nuxt.options.dev === false) {
-        return;
-    }
-
-    const projectDir = runtimeConfig.paths.project;
-    const packageDir = runtimeConfig.paths.package;
-
-    ERUDIT_PROJECT_WATCHER = watch(projectDir, {
-        ignoreInitial: true,
-    });
-
-    ERUDIT_PACKAGE_WATCHER = watch(packageDir, {
-        ignoreInitial: true,
-    });
-}
+import { type FSWatcher, watch } from 'chokidar';
+import { type Nuxt } from 'nuxt/schema';
+import { ERUDIT_PATH, PROJECT_PATH } from './env';
+
+export let ERUDIT_PROJECT_WATCHER: FSWatcher | undefined;
+export let ERUDIT_PACKAGE_WATCHER: FSWatcher | undefined;
+
+export async function setupWatchers(nuxt: Nuxt) {
+  if (nuxt.options.dev === false) {
+    return;
+  }
+
+  ERUDIT_PROJECT_WATCHER = watch(PROJECT_PATH, {
+    ignoreInitial: true,
+  });
+
+  ERUDIT_PACKAGE_WATCHER = watch(ERUDIT_PATH, {
+    ignoreInitial: true,
+  });
+}

package/nuxt.config.ts

@@ -1,84 +1,102 @@
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-import tailwindcss from '@tailwindcss/vite';
-
-const currentDir = dirname(fileURLToPath(import.meta.url));
-
-/**
- * This is context-unaware or "static" Nuxt configuration.
- * The only thing that works here are aliases.
- * If you need to use context (e.g. paths to package/project or Erudit project config), use `./modules/erudit/setup/nuxtConfig.ts` file.
- */
-export default defineNuxtConfig({
-    compatibilityDate: '2025-07-20',
-    devtools: { enabled: true },
-    $meta: { name: 'erudit' },
-    modules: [currentDir + '/modules/erudit', 'nuxt-my-icons'],
-    css: ['@erudit/app/styles/main.css'],
-    myicons: {
-        iconsDir: '@erudit/app/assets/icons',
-    },
-    plugins: ['@erudit/app/plugins/appSetup'],
-    nitro: {
-        plugins: ['@erudit/server'],
-        esbuild: {
-            options: {
-                charset: 'utf8',
-            },
-        },
-        typescript: {
-            tsConfig: {
-                compilerOptions: {
-                    verbatimModuleSyntax: true,
-                },
-            },
-        },
-        rollupConfig: {
-            // Prevent inlining some packages to avoid singleton and Symbol duplication issues
-            external(source) {
-                const ignore = ['jiti', '@jsprose'];
-
-                for (const ignoreItem of ignore) {
-                    if (source.includes(ignoreItem)) {
-                        return true;
-                    }
-                }
-            },
-        },
-    },
-    vite: {
-        plugins: [
-            tailwindcss(),
-            {
-                // Remove when this is fixed: https://github.com/tailwindlabs/tailwindcss/discussions/16119
-                apply: 'build',
-                name: 'vite-plugin-ignore-sourcemap-warnings',
-                configResolved(config) {
-                    const originalOnWarn = config.build.rollupOptions.onwarn;
-                    config.build.rollupOptions.onwarn = (warning, warn) => {
-                        if (
-                            warning.code === 'SOURCEMAP_BROKEN' &&
-                            warning.plugin ===
-                                '@tailwindcss/vite:generate:build'
-                        ) {
-                            return;
-                        }
-
-                        if (originalOnWarn) {
-                            originalOnWarn(warning, warn);
-                        } else {
-                            warn(warning);
-                        }
-                    };
-                },
-            },
-        ],
-        optimizeDeps: {
-            noDiscovery: true,
-        },
-        server: {
-            fs: { strict: false },
-        },
-    },
-});
+import tailwindcss from '@tailwindcss/vite';
+import { sn } from 'unslash';
+
+import { BASE_URL, ERUDIT_COMMAND, PROJECT_PATH } from './modules/erudit/env';
+
+/**
+ * This is context-unaware or "static" Nuxt configuration.
+ * The only thing that works here are aliases.
+ * If you need to use context (e.g. paths to package/project or Erudit project config), use `./modules/erudit/setup/nuxtConfig.ts` file.
+ */
+export default defineNuxtConfig({
+  compatibilityDate: '2026-01-01',
+  devtools: { enabled: true },
+  $meta: { name: 'erudit' },
+  modules: ['#layers/erudit/modules/erudit', 'nuxt-my-icons'],
+  css: ['#layers/erudit/app/styles/main.css'],
+  myicons: {
+    iconsDir: '#layers/erudit/app/assets/icons',
+  },
+  plugins: ['#layers/erudit/app/plugins/appSetup'],
+  runtimeConfig: {
+    eruditPath: '',
+    projectPath: '',
+    contentTargets: '',
+    public: {
+      eruditVersion: '',
+      eruditMode: '',
+      siteUrl: '',
+    },
+  },
+  nitro: {
+    plugins: ['#layers/erudit/server/erudit'],
+    prerender:
+      ERUDIT_COMMAND === 'build'
+        ? undefined
+        : {
+            crawlLinks: false,
+            routes: ['/'],
+          },
+    esbuild: {
+      options: {
+        charset: 'utf8',
+      },
+    },
+    typescript: {
+      tsConfig: {
+        compilerOptions: {
+          verbatimModuleSyntax: true,
+        },
+      },
+    },
+    rollupConfig: {
+      // Prevent inlining some packages to avoid singleton and Symbol duplication issues
+      external(source) {
+        const ignore = ['jiti', '@jsprose'];
+
+        for (const ignoreItem of ignore) {
+          if (source.includes(ignoreItem)) {
+            return true;
+          }
+        }
+      },
+    },
+    output: {
+      dir: sn(PROJECT_PATH, '.output'),
+      publicDir: sn(PROJECT_PATH, '.output/public', BASE_URL || ''),
+    },
+  },
+  vite: {
+    plugins: [
+      tailwindcss(),
+      {
+        // Remove when this is fixed: https://github.com/tailwindlabs/tailwindcss/discussions/16119
+        apply: 'build',
+        name: 'vite-plugin-ignore-sourcemap-warnings',
+        configResolved(config) {
+          const originalOnWarn = config.build.rollupOptions.onwarn;
+          config.build.rollupOptions.onwarn = (warning, warn) => {
+            if (
+              warning.code === 'SOURCEMAP_BROKEN' &&
+              warning.plugin === '@tailwindcss/vite:generate:build'
+            ) {
+              return;
+            }
+
+            if (originalOnWarn) {
+              originalOnWarn(warning, warn);
+            } else {
+              warn(warning);
+            }
+          };
+        },
+      },
+    ],
+    optimizeDeps: {
+      noDiscovery: true,
+    },
+    server: {
+      fs: { strict: false },
+    },
+  },
+});

package/package.json

@@ -1,60 +1,56 @@
 {
-    "name": "erudit",
-    "version": "4.0.0-dev.3",
-    "type": "module",
-    "description": "🤓 CMS for perfect educational sites.",
-    "license": "MIT",
-    "main": "./nuxt.config.ts",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/erudit-js/erudit.git",
-        "directory": "packages/erudit"
+  "name": "erudit",
+  "version": "4.0.0-dev.5",
+  "type": "module",
+  "description": "🤓 CMS for perfect educational sites.",
+  "license": "MIT",
+  "main": "./nuxt.config.ts",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/erudit-js/erudit.git",
+    "directory": "packages/erudit"
+  },
+  "bin": {
+    "erudit": "bin/erudit.js"
+  },
+  "exports": {
+    ".": {
+      "import": "./nuxt.config.ts"
     },
-    "bin": {
-        "erudit-cli": "bin/erudit.mjs",
-        "erudit": "bin/erudit.mjs"
+    "./prose": {
+      "import": "./proxy/prose.ts"
     },
-    "exports": {
-        ".": {
-            "import": "./nuxt.config.ts"
-        },
-        "./prose": {
-            "import": "./proxy/prose.ts"
-        },
-        "./prose/app": {
-            "import": "./proxy/prose.app.ts"
-        }
-    },
-    "scripts": {
-        "test": "bun vitest run"
-    },
-    "dependencies": {
-        "@erudit-js/cli": "4.0.0-dev.3",
-        "@erudit-js/core": "4.0.0-dev.3",
-        "@erudit-js/prose": "4.0.0-dev.3",
-        "@floating-ui/vue": "^1.1.9",
-        "@jsprose/core": "^1.0.0",
-        "@tailwindcss/vite": "^4.1.17",
-        "better-sqlite3": "^12.4.1",
-        "chalk": "^5.6.2",
-        "chokidar": "^4.0.3",
-        "consola": "^3.4.2",
-        "defu": "^6.1.4",
-        "drizzle-kit": "^0.31.7",
-        "drizzle-orm": "^0.44.7",
-        "esbuild": "^0.25.12",
-        "flexsearch": "^0.8.212",
-        "glob": "^11.1.0",
-        "image-size": "^2.0.2",
-        "jiti": "^2.6.1",
-        "nuxt": "4.2.2",
-        "nuxt-my-icons": "1.2.2",
-        "perfect-debounce": "^2.0.0",
-        "tailwindcss": "^4.1.17",
-        "vue": "latest",
-        "vue-router": "latest"
-    },
-    "devDependencies": {
-        "@types/better-sqlite3": "^7.6.13"
+    "./prose/app": {
+      "import": "./proxy/prose.app.ts"
     }
+  },
+  "dependencies": {
+    "@erudit-js/cli": "4.0.0-dev.5",
+    "@erudit-js/core": "4.0.0-dev.5",
+    "@erudit-js/prose": "4.0.0-dev.5",
+    "unslash": "^2.0.0",
+    "@floating-ui/vue": "^1.1.10",
+    "@jsprose/core": "^1.0.0",
+    "@tailwindcss/vite": "^4.1.18",
+    "better-sqlite3": "^12.6.2",
+    "chalk": "^5.6.2",
+    "chokidar": "^5.0.0",
+    "consola": "^3.4.2",
+    "drizzle-kit": "^0.31.8",
+    "drizzle-orm": "^0.45.1",
+    "esbuild": "^0.27.2",
+    "flexsearch": "^0.8.212",
+    "glob": "^13.0.0",
+    "image-size": "^2.0.2",
+    "jiti": "^2.6.1",
+    "nuxt": "4.3.0",
+    "nuxt-my-icons": "1.2.2",
+    "perfect-debounce": "^2.1.0",
+    "tailwindcss": "^4.1.18",
+    "vue": "^3.5.27",
+    "vue-router": "^5.0.1"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.13"
+  }
 }

package/server/api/aside/major/frontNav/book/[...shortId].ts

@@ -1,10 +1,10 @@
-import { getBookFrontContentNav } from '@erudit/server/content/nav/front';
-
-export default defineEventHandler<Promise<FrontContentNavBook>>(
-    async (event) => {
-        const shortId = event.context.params!.shortId;
-        const bookNavNode = ERUDIT.contentNav.getNodeOrThrow(shortId);
-
-        return await getBookFrontContentNav(bookNavNode);
-    },
-);
+import { getBookFrontContentNav } from '#layers/erudit/server/erudit/content/nav/front';
+
+export default defineEventHandler<Promise<FrontContentNavBook>>(
+  async (event) => {
+    const shortId = event.context.params!.shortId;
+    const bookNavNode = ERUDIT.contentNav.getNodeOrThrow(shortId);
+
+    return await getBookFrontContentNav(bookNavNode);
+  },
+);

package/server/api/aside/major/frontNav/global.ts

@@ -1,5 +1,5 @@
-import { getGlobalFrontContentNav } from '@erudit/server/content/nav/front';
-
-export default defineEventHandler<Promise<FrontGlobalContentNav>>(async () => {
-    return await getGlobalFrontContentNav();
-});
+import { getGlobalFrontContentNav } from '#layers/erudit/server/erudit/content/nav/front';
+
+export default defineEventHandler<Promise<FrontGlobalContentNav>>(async () => {
+  return await getGlobalFrontContentNav();
+});

package/server/api/aside/major/pages.ts

@@ -1,6 +1,6 @@
-export default defineEventHandler<Promise<AsideMajorPagesData>>(async () => {
-    return {
-        contributorsCount: ERUDIT.repository.contributors.count(),
-        sponsorsCount: await ERUDIT.repository.sponsors.count(),
-    };
-});
+export default defineEventHandler<Promise<AsideMajorPagesData>>(async () => {
+  return {
+    contributorsCount: ERUDIT.repository.contributors.count(),
+    sponsorsCount: await ERUDIT.repository.sponsors.count(),
+  };
+});

package/server/api/contributor/list.ts

@@ -1,61 +1,60 @@
-import type { ListContributor } from '@erudit-js/core/contributor';
-
-export default defineEventHandler<Promise<ListContributor[]>>(async () => {
-    const listContributors: ListContributor[] = [];
-    const dbContributors = await ERUDIT.db.query.contributors.findMany();
-
-    for (const dbContributor of dbContributors) {
-        const contributions =
-            await ERUDIT.repository.contributors.countContributions(
-                dbContributor.contributorId,
-            );
-
-        const listContributor: ListContributor = {
-            id: dbContributor.contributorId,
-        };
-
-        if (dbContributor.displayName) {
-            listContributor.displayName = dbContributor.displayName;
-        }
-
-        if (dbContributor.short) {
-            listContributor.short = dbContributor.short;
-        }
-
-        if (dbContributor.avatarExtension) {
-            listContributor.avatarUrl =
-                ERUDIT.repository.contributors.avatarUrl(
-                    dbContributor.contributorId,
-                    dbContributor.avatarExtension,
-                );
-        }
-
-        if (contributions > 0) {
-            listContributor.contributions = contributions;
-        }
-
-        if (dbContributor.editor) {
-            listContributor.editor = dbContributor.editor;
-        }
-
-        listContributors.push(listContributor);
-    }
-
-    listContributors.sort((a, b) => {
-        // Sort by contributions first (desc)
-        const aContributions = a.contributions ?? 0;
-        const bContributions = b.contributions ?? 0;
-
-        if (aContributions !== bContributions) {
-            return bContributions - aContributions;
-        }
-
-        // Then sort alphabetically by displayName or id
-        const aName = a.displayName ?? a.id;
-        const bName = b.displayName ?? b.id;
-
-        return aName.localeCompare(bName);
-    });
-
-    return listContributors;
-});
+import type { ListContributor } from '@erudit-js/core/contributor';
+
+export default defineEventHandler<Promise<ListContributor[]>>(async () => {
+  const listContributors: ListContributor[] = [];
+  const dbContributors = await ERUDIT.db.query.contributors.findMany();
+
+  for (const dbContributor of dbContributors) {
+    const contributions =
+      await ERUDIT.repository.contributors.countContributions(
+        dbContributor.contributorId,
+      );
+
+    const listContributor: ListContributor = {
+      id: dbContributor.contributorId,
+    };
+
+    if (dbContributor.displayName) {
+      listContributor.displayName = dbContributor.displayName;
+    }
+
+    if (dbContributor.short) {
+      listContributor.short = dbContributor.short;
+    }
+
+    if (dbContributor.avatarExtension) {
+      listContributor.avatarUrl = ERUDIT.repository.contributors.avatarUrl(
+        dbContributor.contributorId,
+        dbContributor.avatarExtension,
+      );
+    }
+
+    if (contributions > 0) {
+      listContributor.contributions = contributions;
+    }
+
+    if (dbContributor.editor) {
+      listContributor.editor = dbContributor.editor;
+    }
+
+    listContributors.push(listContributor);
+  }
+
+  listContributors.sort((a, b) => {
+    // Sort by contributions first (desc)
+    const aContributions = a.contributions ?? 0;
+    const bContributions = b.contributions ?? 0;
+
+    if (aContributions !== bContributions) {
+      return bContributions - aContributions;
+    }
+
+    // Then sort alphabetically by displayName or id
+    const aName = a.displayName ?? a.id;
+    const bName = b.displayName ?? b.id;
+
+    return aName.localeCompare(bName);
+  });
+
+  return listContributors;
+});

package/server/api/contributor/page/[contributorId].ts

@@ -1,68 +1,68 @@
-import { eq } from 'drizzle-orm';
-import type { PageContributor } from '@erudit-js/core/contributor';
-
-export default defineEventHandler<Promise<PageContributor>>(async (event) => {
-    const contributorId = event.context.params?.contributorId;
-
-    if (!contributorId) {
-        throw createError({
-            statusCode: 400,
-            message: 'Contributor ID is required!',
-        });
-    }
-
-    const dbContributor = await ERUDIT.db.query.contributors.findFirst({
-        where: eq(ERUDIT.db.schema.contributors.contributorId, contributorId),
-    });
-
-    if (!dbContributor) {
-        throw createError({
-            statusCode: 404,
-            message: `Failed to find contributor with ID "${contributorId}"!`,
-        });
-    }
-
-    const pageContributor: PageContributor = {
-        id: dbContributor.contributorId,
-    };
-
-    if (dbContributor.displayName) {
-        pageContributor.displayName = dbContributor.displayName;
-    }
-
-    if (dbContributor.short) {
-        pageContributor.short = dbContributor.short;
-    }
-
-    if (dbContributor.links) {
-        pageContributor.links = dbContributor.links;
-    }
-
-    if (dbContributor.avatarExtension) {
-        pageContributor.avatarUrl = ERUDIT.repository.contributors.avatarUrl(
-            dbContributor.contributorId,
-            dbContributor.avatarExtension,
-        );
-    }
-
-    if (dbContributor.editor) {
-        pageContributor.editor = dbContributor.editor;
-    }
-
-    if (dbContributor.description) {
-        pageContributor.description = await ERUDIT.repository.prose.finalize(
-            dbContributor.description,
-        );
-    }
-
-    const contributions =
-        await ERUDIT.repository.contributors.contributorContributions(
-            contributorId,
-        );
-
-    if (contributions) {
-        pageContributor.contributions = contributions;
-    }
-
-    return pageContributor;
-});
+import { eq } from 'drizzle-orm';
+import type { PageContributor } from '@erudit-js/core/contributor';
+
+export default defineEventHandler<Promise<PageContributor>>(async (event) => {
+  const contributorId = event.context.params?.contributorId;
+
+  if (!contributorId) {
+    throw createError({
+      statusCode: 400,
+      message: 'Contributor ID is required!',
+    });
+  }
+
+  const dbContributor = await ERUDIT.db.query.contributors.findFirst({
+    where: eq(ERUDIT.db.schema.contributors.contributorId, contributorId),
+  });
+
+  if (!dbContributor) {
+    throw createError({
+      statusCode: 404,
+      message: `Failed to find contributor with ID "${contributorId}"!`,
+    });
+  }
+
+  const pageContributor: PageContributor = {
+    id: dbContributor.contributorId,
+  };
+
+  if (dbContributor.displayName) {
+    pageContributor.displayName = dbContributor.displayName;
+  }
+
+  if (dbContributor.short) {
+    pageContributor.short = dbContributor.short;
+  }
+
+  if (dbContributor.links) {
+    pageContributor.links = dbContributor.links;
+  }
+
+  if (dbContributor.avatarExtension) {
+    pageContributor.avatarUrl = ERUDIT.repository.contributors.avatarUrl(
+      dbContributor.contributorId,
+      dbContributor.avatarExtension,
+    );
+  }
+
+  if (dbContributor.editor) {
+    pageContributor.editor = dbContributor.editor;
+  }
+
+  if (dbContributor.description) {
+    pageContributor.description = await ERUDIT.repository.prose.finalize(
+      dbContributor.description,
+    );
+  }
+
+  const contributions =
+    await ERUDIT.repository.contributors.contributorContributions(
+      contributorId,
+    );
+
+  if (contributions) {
+    pageContributor.contributions = contributions;
+  }
+
+  return pageContributor;
+});