@eventcatalog/core 2.29.3 → 2.30.0

package/dist/eventcatalog.js

@@ -3,17 +3,18 @@ import {
 } from "./chunk-BLDONK5J.js";
 import {
   watch
-} from "./chunk-WUCY3QHK.js";
+} from "./chunk-UKJ7F5WR.js";
 import {
   log_build_default
-} from "./chunk-BA6XXQEM.js";
-import "./chunk-7LKTKQLT.js";
+} from "./chunk-MZLYNODU.js";
+import "./chunk-T2XS2ZVB.js";
 import {
-  catalogToAstro
-} from "./chunk-R2NILSWL.js";
+  catalogToAstro,
+  checkAndConvertMdToMdx
+} from "./chunk-DE2TXYKB.js";
 import {
   VERSION
-} from "./chunk-KCR7LC5R.js";
+} from "./chunk-4Q54XOED.js";
 import {
   isBackstagePluginEnabled
 } from "./chunk-XMDPVKIJ.js";
@@ -21,7 +22,7 @@ import {
   generate
 } from "./chunk-YEQVKHST.js";
 import "./chunk-E7TXTI7G.js";
-import "./chunk-FIY5JLSQ.js";
+import "./chunk-HAYFEAB4.js";
 
 // src/eventcatalog.ts
 import { Command } from "commander";
@@ -33,6 +34,7 @@ import { fileURLToPath } from "node:url";
 import concurrently from "concurrently";
 import boxen from "boxen";
 import updateNotifier from "update-notifier";
+import stream from "stream";
 var currentDir = path.dirname(fileURLToPath(import.meta.url));
 var program = new Command().version(VERSION);
 var dir = path.resolve(process.env.PROJECT_DIR || process.cwd());
@@ -106,24 +108,40 @@ program.command("dev").description("Run development server of EventCatalog").opt
   if (options.forceRecreate) clearCore();
   copyCore();
   await resolve_catalog_dependencies_default(dir, core);
+  await checkAndConvertMdToMdx(dir, core);
   await catalogToAstro(dir, core);
   const canEmbedPages = await isBackstagePluginEnabled();
   checkForUpdate();
   let watchUnsub;
   try {
     watchUnsub = await watch(dir, core);
-    const { result } = concurrently([
-      {
-        name: "astro",
-        command: `npx astro dev ${command.args.join(" ").trim()}`,
-        cwd: core,
-        env: {
-          PROJECT_DIR: dir,
-          CATALOG_DIR: core,
-          ENABLE_EMBED: canEmbedPages
+    const { result } = concurrently(
+      [
+        {
+          name: "astro",
+          // Ignore any "Empty collection" messages
+          command: process.platform === "win32" ? `npx astro dev ${command.args.join(" ").trim()} | findstr /V "The collection"` : `npx astro dev ${command.args.join(" ").trim()} 2>&1 | grep -v "The collection.*does not exist"`,
+          cwd: core,
+          env: {
+            PROJECT_DIR: dir,
+            CATALOG_DIR: core,
+            ENABLE_EMBED: canEmbedPages
+          }
         }
+      ],
+      {
+        raw: true,
+        outputStream: new stream.Writable({
+          write(chunk, encoding, callback) {
+            const text = chunk.toString();
+            if (!(text.includes("The collection") && text.includes("does not exist"))) {
+              process.stdout.write(chunk);
+            }
+            callback();
+          }
+        })
       }
-    ]);
+    );
     await result;
   } catch (err) {
     console.error(err);
@@ -136,16 +154,17 @@ program.command("build").description("Run build of EventCatalog").action(async (
   copyCore();
   await log_build_default(dir);
   await resolve_catalog_dependencies_default(dir, core);
+  await checkAndConvertMdToMdx(dir, core);
   await catalogToAstro(dir, core);
   const canEmbedPages = await isBackstagePluginEnabled();
   checkForUpdate();
-  execSync(
-    `cross-env PROJECT_DIR='${dir}' CATALOG_DIR='${core}' ENABLE_EMBED=${canEmbedPages} npx astro build ${command.args.join(" ").trim()}`,
-    {
-      cwd: core,
-      stdio: "inherit"
-    }
-  );
+  const windowsCommand = `npx astro build ${command.args.join(" ").trim()} | findstr /V "The collection"`;
+  const unixCommand = `npx astro build ${command.args.join(" ").trim()} 2>&1 | grep -v "The collection.*does not exist"`;
+  const buildCommand = process.platform === "win32" ? windowsCommand : unixCommand;
+  execSync(`cross-env PROJECT_DIR='${dir}' CATALOG_DIR='${core}' ENABLE_EMBED=${canEmbedPages} ${buildCommand}`, {
+    cwd: core,
+    stdio: "inherit"
+  });
 });
 var previewCatalog = ({ command, canEmbedPages = false }) => {
   execSync(

package/dist/map-catalog-to-astro.cjs

@@ -54,13 +54,7 @@ function mapCatalogToAstro({ filePath, astroDir, projectDir }) {
   }
   const baseTargetPaths = getBaseTargetPaths(relativeFilePath);
   const relativeTargetPath = getRelativeTargetPath(relativeFilePath);
-  return baseTargetPaths.map(
-    (base) => import_node_path.default.join(
-      astroDir,
-      base,
-      relativeTargetPath.replace("index.md", "index.mdx").replace("changelog.md", "changelog.mdx").replace("ubiquitous-language.md", "ubiquitous-language.mdx")
-    )
-  );
+  return baseTargetPaths.map((base) => import_node_path.default.join(astroDir, base, relativeTargetPath));
 }
 function removeBasePath(fullPath, basePath) {
   const relativePath = import_node_path.default.relative(basePath, fullPath);
@@ -89,20 +83,11 @@ function isCatalogRelated(filePath) {
 function getBaseTargetPaths(filePath) {
   const filePathArr = filePath.split(import_node_path.default.sep).filter(Boolean);
   if (isCollectionKey(filePathArr[0])) {
-    if (filePathArr[filePathArr.length - 1] == "changelog.md") {
-      return [import_node_path.default.join("src", "content", "changelogs")];
-    }
-    if (filePathArr[filePathArr.length - 1] == "ubiquitous-language.md") {
-      return [import_node_path.default.join("src", "content", "ubiquitousLanguages")];
-    }
-    if (filePathArr[filePathArr.length - 1].match(/\.md$/)) {
-      return [import_node_path.default.join("src", "content")];
-    }
     const hasExtension = (str) => /\.[a-zA-Z0-9]{2,}$/.test(str);
     if (hasExtension(filePath)) {
-      return [import_node_path.default.join("public", "generated"), import_node_path.default.join("src", "catalog-files")];
+      return [import_node_path.default.join("public", "generated")];
     }
-    return [import_node_path.default.join("public", "generated"), import_node_path.default.join("src", "catalog-files"), import_node_path.default.join("src", "content")];
+    return [import_node_path.default.join("public", "generated")];
   }
   if (filePathArr[0] == "components") {
     return [import_node_path.default.join("src", "custom-defined-components")];

package/dist/map-catalog-to-astro.js

@@ -1,6 +1,6 @@
 import {
   mapCatalogToAstro
-} from "./chunk-FIY5JLSQ.js";
+} from "./chunk-HAYFEAB4.js";
 export {
   mapCatalogToAstro
 };

package/dist/watcher.cjs

@@ -58,13 +58,7 @@ function mapCatalogToAstro({ filePath, astroDir, projectDir }) {
   }
   const baseTargetPaths = getBaseTargetPaths(relativeFilePath);
   const relativeTargetPath = getRelativeTargetPath(relativeFilePath);
-  return baseTargetPaths.map(
-    (base) => import_node_path.default.join(
-      astroDir,
-      base,
-      relativeTargetPath.replace("index.md", "index.mdx").replace("changelog.md", "changelog.mdx").replace("ubiquitous-language.md", "ubiquitous-language.mdx")
-    )
-  );
+  return baseTargetPaths.map((base) => import_node_path.default.join(astroDir, base, relativeTargetPath));
 }
 function removeBasePath(fullPath, basePath) {
   const relativePath = import_node_path.default.relative(basePath, fullPath);
@@ -93,20 +87,11 @@ function isCatalogRelated(filePath) {
 function getBaseTargetPaths(filePath) {
   const filePathArr = filePath.split(import_node_path.default.sep).filter(Boolean);
   if (isCollectionKey(filePathArr[0])) {
-    if (filePathArr[filePathArr.length - 1] == "changelog.md") {
-      return [import_node_path.default.join("src", "content", "changelogs")];
-    }
-    if (filePathArr[filePathArr.length - 1] == "ubiquitous-language.md") {
-      return [import_node_path.default.join("src", "content", "ubiquitousLanguages")];
-    }
-    if (filePathArr[filePathArr.length - 1].match(/\.md$/)) {
-      return [import_node_path.default.join("src", "content")];
-    }
     const hasExtension = (str) => /\.[a-zA-Z0-9]{2,}$/.test(str);
     if (hasExtension(filePath)) {
-      return [import_node_path.default.join("public", "generated"), import_node_path.default.join("src", "catalog-files")];
+      return [import_node_path.default.join("public", "generated")];
     }
-    return [import_node_path.default.join("public", "generated"), import_node_path.default.join("src", "catalog-files"), import_node_path.default.join("src", "content")];
+    return [import_node_path.default.join("public", "generated")];
   }
   if (filePathArr[0] == "components") {
     return [import_node_path.default.join("src", "custom-defined-components")];
@@ -139,10 +124,6 @@ var import_promises2 = require("fs/promises");
 var import_node_path2 = __toESM(require("path"), 1);
 var import_uuid = require("uuid");
 var import_gray_matter = __toESM(require("gray-matter"), 1);
-function addPropertyToFrontMatter(input, newProperty, newValue) {
-  const file = (0, import_gray_matter.default)(input);
-  return import_gray_matter.default.stringify(file.content, { ...file.data, [newProperty]: newValue });
-}
 
 // src/watcher.js
 var import_node_path3 = __toESM(require("path"), 1);
@@ -161,6 +142,9 @@ async function watch(projectDirectory, catalogDirectory, callback = void 0) {
         }
         for (let event of events) {
           const { path: filePath, type } = event;
+          if (filePath.endsWith(".mdx") || filePath.endsWith(".md")) {
+            continue;
+          }
           const astroPaths = mapCatalogToAstro({
             filePath,
             astroDir: catalogDirectory,
@@ -175,14 +159,6 @@ async function watch(projectDirectory, catalogDirectory, callback = void 0) {
                 } else {
                   retryEPERM(import_node_fs2.default.cpSync)(filePath, astroPath);
                 }
-                try {
-                  if (astroPath.endsWith(".mdx")) {
-                    const content = import_node_fs2.default.readFileSync(astroPath, "utf-8");
-                    const frontmatter = addPropertyToFrontMatter(content, "pathToFile", filePath);
-                    import_node_fs2.default.writeFileSync(astroPath, frontmatter);
-                  }
-                } catch (error) {
-                }
                 break;
               case "delete":
                 retryEPERM(import_rimraf.rimrafSync)(astroPath);

package/dist/watcher.js

@@ -1,8 +1,8 @@
 import {
   watch
-} from "./chunk-WUCY3QHK.js";
+} from "./chunk-UKJ7F5WR.js";
 import "./chunk-E7TXTI7G.js";
-import "./chunk-FIY5JLSQ.js";
+import "./chunk-HAYFEAB4.js";
 export {
   watch
 };

package/eventcatalog/astro.config.mjs

@@ -30,6 +30,11 @@ export default defineConfig({
   // https://docs.astro.build/en/reference/configuration-reference/#trailingslash
   trailingSlash: config.trailingSlash === true ? "always" : "ignore",
 
+  experimental: {
+    contentIntellisense: true,
+  },
+
+
   // just turn this off for all users (for now...)
   devToolbar: { enabled: false },
   integrations: [

package/eventcatalog/src/components/MDX/Schema.astro

@@ -9,15 +9,16 @@ interface Props {
     filePath: string;
   };
   title?: string;
+  filePath: string;
 }
 
-const { file = 'schema.json', catalog, title } = Astro.props;
+const { file = 'schema.json', catalog, title, filePath } = Astro.props;
 
 let code: string | null = null;
 
-const exists = fs.existsSync(path.join(catalog.filePath, file));
+const exists = fs.existsSync(path.join(path.dirname(filePath), file));
 if (exists) {
-  code = fs.readFileSync(path.join(catalog.filePath, file), 'utf-8');
+  code = fs.readFileSync(path.join(path.dirname(filePath), file), 'utf-8');
 }
 ---
 

package/eventcatalog/src/components/MDX/SchemaViewer/SchemaViewer.astro

@@ -1,5 +1,5 @@
 ---
-const { catalog, id } = Astro.props;
+const { catalog, id, filePath } = Astro.props;
 import fs from 'node:fs/promises';
 import { existsSync } from 'fs';
 import yaml from 'js-yaml';
@@ -37,12 +37,12 @@ function findSchemaViewers(document: string) {
 }
 
 try {
-  const file = await fs.readFile(catalog.astroContentFilePath, 'utf-8');
+  const file = await fs.readFile(filePath, 'utf-8');
   const schemaViewers = findSchemaViewers(file);
 
   // Loop around all the possible SchemaViewers in the file.
   const getAllComponents = schemaViewers.map(async (schemaViewerProps: any) => {
-    const schemaPath = path.join(catalog.filePath, schemaViewerProps.file);
+    const schemaPath = path.join(path.dirname(filePath), schemaViewerProps.file);
     const exists = existsSync(schemaPath);
     let schema;
     let render = true;

package/eventcatalog/src/components/SideBars/MessageSideBar.astro

@@ -91,6 +91,7 @@ const isRSSEnabled = config.rss?.enabled;
 
 // @ts-ignore
 const publicPath = message?.catalog?.publicPath;
+
 const schemaFilePath = message?.data?.schemaPath;
 const schemaURL = path.join(publicPath, schemaFilePath || '');
 ---

package/eventcatalog/src/components/SideNav/TreeView/getTreeView.ts

@@ -50,11 +50,11 @@ function buildTreeOfDir(directory: string, parentNode: TreeNode, options: { igno
 
   const resourceType = getResourceType(directory);
 
-  const markdownFiles = globSync(path.join(directory, '/*.md'), { windowsPathsNoEscape: os.platform() === 'win32' });
+  const markdownFiles = globSync(path.join(directory, '/*.mdx'), { windowsPathsNoEscape: os.platform() === 'win32' });
   const isResourceIgnored = options?.ignore && resourceType && options.ignore.includes(resourceType);
 
   if (markdownFiles.length > 0 && !isResourceIgnored) {
-    const resourceFilePath = markdownFiles.find((md) => md.endsWith('index.md'));
+    const resourceFilePath = markdownFiles.find((md) => md.endsWith('index.mdx'));
     if (resourceFilePath) {
       const resourceDef = gm.read(resourceFilePath);
       node = {

package/eventcatalog/src/content.config.ts

@@ -1,6 +1,14 @@
 import { z, defineCollection, reference } from 'astro:content';
 import { glob } from 'astro/loaders';
-import { join } from 'node:path';
+import { v4 as uuidv4 } from 'uuid';
+
+const projectDirBase = (() => {
+  if (process.platform === 'win32') {
+    const projectDirPath = process.env.PROJECT_DIR!.replace(/\\/g, '/');
+    return projectDirPath.startsWith('/') ? projectDirPath : `/${projectDirPath}`;
+  }
+  return process.env.PROJECT_DIR;
+})();
 
 const badge = z.object({
   content: z.string(),
@@ -10,9 +18,11 @@ const badge = z.object({
 
 const pages = defineCollection({
   type: 'content',
-  schema: z.object({
-    id: z.string(),
-  }),
+  schema: z
+    .object({
+      id: z.string(),
+    })
+    .optional(),
 });
 
 const pointer = z.object({
@@ -27,7 +37,10 @@ const channelPointer = z
   .merge(pointer);
 
 const changelogs = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: ['**/changelog.(md|mdx)'],
+    base: projectDirBase,
+  }),
   schema: z.object({
     createdAt: z.date().optional(),
     badges: z.array(badge).optional(),
@@ -95,7 +108,6 @@ const baseSchema = z.object({
   // Used by eventcatalog
   versions: z.array(z.string()).optional(),
   latestVersion: z.string().optional(),
-  pathToFile: z.string().optional(),
   catalog: z
     .object({
       path: z.string(),
@@ -121,7 +133,13 @@ const flowStep = z
   .optional();
 
 const flows = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: ['**/flows/*/index.(md|mdx)', '**/flows/*/versioned/*/index.(md|mdx)'],
+    base: projectDirBase,
+    generateId: ({ data }) => {
+      return `${data.id}-${data.version}`;
+    },
+  }),
   schema: z
     .object({
       steps: z.array(
@@ -165,7 +183,13 @@ const flows = defineCollection({
 });
 
 const events = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: ['**/events/*/index.(md|mdx)', '**/events/*/versioned/*/index.(md|mdx)'],
+    base: projectDirBase,
+    generateId: ({ data, ...rest }) => {
+      return `${data.id}-${data.version}`;
+    },
+  }),
   schema: z
     .object({
       producers: z.array(reference('services')).optional(),
@@ -178,7 +202,13 @@ const events = defineCollection({
 });
 
 const commands = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: ['**/commands/*/index.(md|mdx)', '**/commands/*/versioned/*/index.(md|mdx)'],
+    base: projectDirBase,
+    generateId: ({ data }) => {
+      return `${data.id}-${data.version}`;
+    },
+  }),
   schema: z
     .object({
       producers: z.array(reference('services')).optional(),
@@ -191,7 +221,13 @@ const commands = defineCollection({
 });
 
 const queries = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: ['**/queries/*/index.(md|mdx)', '**/queries/*/versioned/*/index.(md|mdx)'],
+    base: projectDirBase,
+    generateId: ({ data }) => {
+      return `${data.id}-${data.version}`;
+    },
+  }),
   schema: z
     .object({
       producers: z.array(reference('services')).optional(),
@@ -204,7 +240,18 @@ const queries = defineCollection({
 });
 
 const services = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: [
+      'domains/*/services/*/index.(md|mdx)',
+      'domains/*/services/*/versioned/*/index.(md|mdx)',
+      'services/*/index.(md|mdx)', // ✅ Capture only services markdown files
+      'services/*/versioned/*/index.(md|mdx)', // ✅ Capture versioned files inside services
+    ],
+    base: projectDirBase,
+    generateId: ({ data, ...rest }) => {
+      return `${data.id}-${data.version}`;
+    },
+  }),
   schema: z
     .object({
       sends: z.array(pointer).optional(),
@@ -213,8 +260,33 @@ const services = defineCollection({
     .merge(baseSchema),
 });
 
+const domains = defineCollection({
+  loader: glob({
+    pattern: [
+      // ✅ Strictly include only index.md at the expected levels
+      'domains/*/index.(md|mdx)',
+      'domains/*/versioned/*/index.(md|mdx)',
+    ],
+    base: projectDirBase,
+    generateId: ({ data, ...rest }) => {
+      return `${data.id}-${data.version}`;
+    },
+  }),
+  schema: z
+    .object({
+      services: z.array(pointer).optional(),
+    })
+    .merge(baseSchema),
+});
+
 const channels = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: ['**/channels/*/index.(md|mdx)', '**/channels/*/versioned/*/index.(md|mdx)'],
+    base: projectDirBase,
+    generateId: ({ data }) => {
+      return `${data.id}-${data.version}`;
+    },
+  }),
   schema: z
     .object({
       address: z.string().optional(),
@@ -234,17 +306,15 @@ const channels = defineCollection({
     .merge(baseSchema),
 });
 
-const domains = defineCollection({
-  type: 'content',
-  schema: z
-    .object({
-      services: z.array(pointer).optional(),
-    })
-    .merge(baseSchema),
-});
-
 const ubiquitousLanguages = defineCollection({
-  type: 'content',
+  loader: glob({
+    pattern: ['domains/*/ubiquitous-language.(md|mdx)'],
+    base: projectDirBase,
+    generateId: ({ data }) => {
+      // File has no id, so we need to generate one
+      return uuidv4();
+    },
+  }),
   schema: z.object({
     dictionary: z
       .array(
@@ -260,16 +330,8 @@ const ubiquitousLanguages = defineCollection({
   }),
 });
 
-const projectDirBase = (() => {
-  if (process.platform === 'win32') {
-    const projectDirPath = process.env.PROJECT_DIR!.replace(/\\/g, '/');
-    return projectDirPath.startsWith('/') ? projectDirPath : `/${projectDirPath}`;
-  }
-  return process.env.PROJECT_DIR;
-})();
-
 const users = defineCollection({
-  loader: glob({ pattern: 'users/*.md', base: projectDirBase, generateId: ({ data }) => data.id as string }),
+  loader: glob({ pattern: 'users/*.(md|mdx)', base: projectDirBase, generateId: ({ data }) => data.id as string }),
   schema: z.object({
     id: z.string(),
     name: z.string(),
@@ -285,12 +347,11 @@ const users = defineCollection({
     ownedCommands: z.array(reference('commands')).optional(),
     ownedQueries: z.array(reference('queries')).optional(),
     associatedTeams: z.array(reference('teams')).optional(),
-    pathToFile: z.string().optional(),
   }),
 });
 
 const teams = defineCollection({
-  loader: glob({ pattern: 'teams/*.md', base: projectDirBase, generateId: ({ data }) => data.id as string }),
+  loader: glob({ pattern: 'teams/*.(md|mdx)', base: projectDirBase, generateId: ({ data }) => data.id as string }),
   schema: z.object({
     id: z.string(),
     name: z.string(),
@@ -305,7 +366,6 @@ const teams = defineCollection({
     ownedDomains: z.array(reference('domains')).optional(),
     ownedServices: z.array(reference('services')).optional(),
     ownedEvents: z.array(reference('events')).optional(),
-    pathToFile: z.string().optional(),
   }),
 });
 

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/asyncapi/index.astro

@@ -1,10 +1,10 @@
 ---
 import path from 'path';
-import { readFileSync } from 'fs';
 import { createElement } from 'react';
 import { renderToString } from 'react-dom/server';
 import { Parser } from '@asyncapi/parser';
 import { AvroSchemaParser } from '@asyncapi/avro-schema-parser';
+import fs from 'fs';
 
 import type { CollectionTypes, PageTypes } from '@types';
 
@@ -39,15 +39,20 @@ export async function getStaticPaths() {
 }
 
 // @ts-ignore
-const { catalog, data } = Astro.props;
+const { catalog, data, filePath } = Astro.props;
 const fileName = data.specifications?.asyncapiPath || 'asyncapi.yaml';
-const pathToSpec = path.join(catalog.publicPath, fileName);
-const pathOnDisk = path.join(process.cwd(), 'public', pathToSpec);
-const fileContent = readFileSync(pathOnDisk, 'utf-8');
+const directory = path.dirname(filePath || '');
+const pathToSpec = path.join(directory, fileName);
+const fileExists = fs.existsSync(pathToSpec);
+let content = '';
+
+if (fileExists) {
+  content = fs.readFileSync(pathToSpec, 'utf8');
+}
 
 // AsyncAPI parser will parser schemas for users, they can turn this off.
 const parseSchemas = Config?.asyncAPI?.renderParsedSchemas ?? true;
-const parsed = await new Parser({ schemaParsers: [AvroSchemaParser()] }).parse(fileContent, { parseSchemas });
+const parsed = await new Parser({ schemaParsers: [AvroSchemaParser()] }).parse(content, { parseSchemas });
 const stringified = parsed.document?.json();
 const config: ConfigInterface = { show: { sidebar: true, errors: true } };
 

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/changelog/index.astro

@@ -5,6 +5,7 @@ import type { PageTypes } from '@types';
 import { getChangeLogs } from '@utils/collections/changelogs';
 import { RectangleGroupIcon, ServerIcon, BoltIcon, ChatBubbleLeftIcon, MagnifyingGlassIcon } from '@heroicons/react/24/outline';
 import { pageDataLoader } from '@utils/page-loaders/page-data-loader';
+import { render, getEntry } from 'astro:content';
 import 'diff2html/bundles/css/diff2html.min.css';
 
 import { buildUrl } from '@utils/url-builder';
@@ -38,11 +39,14 @@ const props = Astro.props;
 let collectionItem = props;
 const logs = await getChangeLogs(props);
 
+// console.log('logs', logs)
+
 const { data } = props;
 const latestVersion = data.latestVersion;
 
 const renderedLogs = await logs.map(async (log) => {
-  const { Content } = await log.render();
+  const logEntry = await getEntry('changelogs', log.id);
+  const { Content } = await render(logEntry as any);
   return {
     Content,
     ...log,
@@ -51,6 +55,8 @@ const renderedLogs = await logs.map(async (log) => {
 
 const logsToRender = await Promise.all(renderedLogs);
 
+// console.log('LOGS TO RENDER', logsToRender);
+
 const logListPromise = logsToRender.map(async (log, index) => {
   const currentLogVersion = log.data.version;
   const previousLogVersion = log.data.version ? getPreviousVersion(log.data.version, props.allVersionsForCollection) : '';

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/index.astro

@@ -19,6 +19,7 @@ import { buildUrl } from '@utils/url-builder';
 import { getFlows } from '@utils/collections/flows';
 import { pageDataLoader } from '@utils/page-loaders/page-data-loader';
 import { ClientRouter } from 'astro:transitions';
+import { render } from 'astro:content';
 import { ArrowsRightLeftIcon } from '@heroicons/react/20/solid';
 
 import config from '@config';
@@ -51,7 +52,8 @@ export async function getStaticPaths() {
 
 const props = Astro.props;
 
-const { Content } = await props.render();
+const { Content } = await render(props);
+// const { Content } = await props.render();
 
 // Capitalize the first letter of a string
 const pageTitle = `${props.collection} | ${props.data.name}`.replace(/^\w/, (c) => c.toUpperCase());
@@ -198,7 +200,7 @@ const badges = [getBadge(), ...contentBadges, ...getSpecificationBadges()];
         </div>
         <div>
           <!-- @ts-ignore -->
-          <SchemaViewer id={props.data.id} catalog={props.catalog} />
+          <SchemaViewer id={props.data.id} catalog={props.catalog} filePath={props.filePath} />
           <NodeGraph
             id={props.data.id}
             collection={props.collection}

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/spec/_OpenAPI.tsx

@@ -10,7 +10,7 @@ const OpenAPISpec = ({ spec }: { spec: string }) => {
       <ApiReferenceReact
         configuration={{
           spec: {
-            url: spec,
+            content: spec,
           },
           theme: 'fastify',
           hideClientButton: true,