@eventcatalog/core 3.0.0-beta.19 → 3.0.0-beta.20

package/dist/analytics/analytics.cjs

@@ -37,7 +37,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "3.0.0-beta.19";
+var version = "3.0.0-beta.20";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-R6WYYOD5.js";
-import "../chunk-FHSD3KUQ.js";
+} from "../chunk-7ANM33NO.js";
+import "../chunk-BLIEWBVS.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -106,7 +106,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "3.0.0-beta.19";
+var version = "3.0.0-beta.20";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-ZK4S7XBB.js";
-import "../chunk-R6WYYOD5.js";
-import "../chunk-FHSD3KUQ.js";
+} from "../chunk-IZGKMOOO.js";
+import "../chunk-7ANM33NO.js";
+import "../chunk-BLIEWBVS.js";
 import "../chunk-UPONRQSN.js";
 export {
   log_build_default as default

package/dist/{chunk-R6WYYOD5.js → chunk-7ANM33NO.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-FHSD3KUQ.js";
+} from "./chunk-BLIEWBVS.js";
 
 // src/analytics/analytics.js
 import axios from "axios";

package/dist/{chunk-FHSD3KUQ.js → chunk-BLIEWBVS.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "3.0.0-beta.19";
+var version = "3.0.0-beta.20";
 
 // src/constants.ts
 var VERSION = version;

package/dist/{chunk-ZK4S7XBB.js → chunk-IZGKMOOO.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-R6WYYOD5.js";
+} from "./chunk-7ANM33NO.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-E7QOZU4L.js → chunk-SUPFYBDY.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-FHSD3KUQ.js";
+} from "./chunk-BLIEWBVS.js";
 
 // src/utils/cli-logger.ts
 import pc from "picocolors";

package/dist/{chunk-FQUOTAQT.js → chunk-VDAAJC4X.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-E7QOZU4L.js";
+} from "./chunk-SUPFYBDY.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/constants.cjs

@@ -25,7 +25,7 @@ __export(constants_exports, {
 module.exports = __toCommonJS(constants_exports);
 
 // package.json
-var version = "3.0.0-beta.19";
+var version = "3.0.0-beta.20";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-FHSD3KUQ.js";
+} from "./chunk-BLIEWBVS.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -109,7 +109,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.0.0-beta.19";
+var version = "3.0.0-beta.20";
 
 // src/constants.ts
 var VERSION = version;
@@ -547,11 +547,6 @@ var isOutputServer = async () => {
   const config = await getEventCatalogConfigFile(process.env.PROJECT_DIR || "");
   return config?.output === "server";
 };
-var isAuthEnabled = async () => {
-  const directory = process.env.PROJECT_DIR || process.cwd();
-  const hasAuthConfig = import_node_fs4.default.existsSync((0, import_node_path5.join)(directory, "eventcatalog.auth.js"));
-  return hasAuthConfig;
-};
 
 // src/eventcatalog.ts
 var import_update_notifier = __toESM(require("update-notifier"), 1);
@@ -702,41 +697,6 @@ var copyCore = () => {
     }
   });
 };
-var copyServerFiles = async () => {
-  const isServerOutput = await isOutputServer();
-  if (import_fs2.default.existsSync((0, import_node_path7.join)(core, "src/pages/api/server"))) {
-    import_fs2.default.rmSync((0, import_node_path7.join)(core, "src/pages/api/server"), { recursive: true });
-  }
-  if (!isServerOutput) {
-    if (import_fs2.default.existsSync((0, import_node_path7.join)(core, "src/pages/api/chat.ts"))) {
-      import_fs2.default.rmSync((0, import_node_path7.join)(core, "src/pages/api/chat.ts"));
-    }
-    if (import_fs2.default.existsSync((0, import_node_path7.join)(core, "src/pages/api/[...auth].ts"))) {
-      import_fs2.default.rmSync((0, import_node_path7.join)(core, "src/pages/api/[...auth].ts"));
-    }
-    return;
-  }
-  import_fs2.default.cpSync((0, import_node_path7.join)(eventCatalogDir, "src/enterprise/eventcatalog-chat/pages/api"), (0, import_node_path7.join)(core, "src/pages/api"), {
-    recursive: true
-  });
-};
-var createAuthFileIfNotExists = async (hasRequiredLicense) => {
-  const authEnabled = await isAuthEnabled();
-  const isSRR = await isOutputServer();
-  try {
-    if (authEnabled && hasRequiredLicense && isSRR) {
-      logger.info("Creating auth file", "auth");
-      import_fs2.default.writeFileSync(
-        (0, import_node_path7.join)(core, "src/pages/api/[...auth].ts"),
-        `import { AstroAuth } from 'auth-astro/server';
-export const prerender = false;
-export const { GET, POST } = AstroAuth();
-`
-      );
-    }
-  } catch (error) {
-  }
-};
 var clearCore = () => {
   if (import_fs2.default.existsSync(core)) import_fs2.default.rmSync(core, { recursive: true });
 };
@@ -806,14 +766,12 @@ program.command("dev").description("Run development server of EventCatalog").opt
   await checkAndConvertMdToMdx(dir, core);
   await runMigrations(dir);
   await catalogToAstro(dir, core);
-  await copyServerFiles();
   const canEmbedPages = await (0, import_license.isFeatureEnabled)(
     "@eventcatalog/backstage-plugin-eventcatalog",
     process.env.EVENTCATALOG_LICENSE_KEY_BACKSTAGE
   );
   const isEventCatalogStarter = await (0, import_license.isEventCatalogStarterEnabled)();
   const isEventCatalogScale = await (0, import_license.isEventCatalogScaleEnabled)();
-  await createAuthFileIfNotExists(isEventCatalogScale);
   checkForUpdate();
   let watchUnsub;
   try {
@@ -854,7 +812,6 @@ program.command("build").description("Run build of EventCatalog").action(async (
     import_dotenv.default.config({ path: import_node_path8.default.join(dir, ".env") });
   }
   copyCore();
-  await copyServerFiles();
   const isBackstagePluginEnabled = await (0, import_license.isFeatureEnabled)(
     "@eventcatalog/backstage-plugin-eventcatalog",
     process.env.EVENTCATALOG_LICENSE_KEY_BACKSTAGE
@@ -862,7 +819,6 @@ program.command("build").description("Run build of EventCatalog").action(async (
   const isEventCatalogStarter = await (0, import_license.isEventCatalogStarterEnabled)();
   const isEventCatalogScale = await (0, import_license.isEventCatalogScaleEnabled)();
   const canEmbedPages = isBackstagePluginEnabled || isEventCatalogScale;
-  await createAuthFileIfNotExists(isEventCatalogScale);
   await log_build_default(dir, {
     isEventCatalogStarterEnabled: isEventCatalogStarter,
     isEventCatalogScaleEnabled: isEventCatalogScale,
@@ -924,8 +880,6 @@ program.command("preview").description("Serves the contents of your eventcatalog
   );
   const isEventCatalogStarter = await (0, import_license.isEventCatalogStarterEnabled)();
   const isEventCatalogScale = await (0, import_license.isEventCatalogScaleEnabled)();
-  await copyServerFiles();
-  await createAuthFileIfNotExists(isEventCatalogScale);
   previewCatalog({ command, canEmbedPages: canEmbedPages || isEventCatalogScale, isEventCatalogStarter, isEventCatalogScale });
 });
 program.command("start").description("Serves the contents of your eventcatalog build directory").action(async (options, command) => {
@@ -940,7 +894,6 @@ program.command("start").description("Serves the contents of your eventcatalog b
   );
   const isEventCatalogStarter = await (0, import_license.isEventCatalogStarterEnabled)();
   const isEventCatalogScale = await (0, import_license.isEventCatalogScaleEnabled)();
-  await copyServerFiles();
   const isServerOutput = await isOutputServer();
   if (isServerOutput) {
     startServerCatalog({

package/dist/eventcatalog.js

@@ -6,8 +6,8 @@ import {
 } from "./chunk-PLNJC7NZ.js";
 import {
   log_build_default
-} from "./chunk-ZK4S7XBB.js";
-import "./chunk-R6WYYOD5.js";
+} from "./chunk-IZGKMOOO.js";
+import "./chunk-7ANM33NO.js";
 import {
   runMigrations
 } from "./chunk-BH3JMNAV.js";
@@ -18,18 +18,17 @@ import {
 } from "./chunk-R2BJ7MJG.js";
 import "./chunk-55D645EH.js";
 import {
-  isAuthEnabled,
   isOutputServer
 } from "./chunk-5VBIXL6C.js";
 import {
   generate
-} from "./chunk-FQUOTAQT.js";
+} from "./chunk-VDAAJC4X.js";
 import {
   logger
-} from "./chunk-E7QOZU4L.js";
+} from "./chunk-SUPFYBDY.js";
 import {
   VERSION
-} from "./chunk-FHSD3KUQ.js";
+} from "./chunk-BLIEWBVS.js";
 import "./chunk-UPONRQSN.js";
 
 // src/eventcatalog.ts
@@ -76,41 +75,6 @@ var copyCore = () => {
     }
   });
 };
-var copyServerFiles = async () => {
-  const isServerOutput = await isOutputServer();
-  if (fs.existsSync(join(core, "src/pages/api/server"))) {
-    fs.rmSync(join(core, "src/pages/api/server"), { recursive: true });
-  }
-  if (!isServerOutput) {
-    if (fs.existsSync(join(core, "src/pages/api/chat.ts"))) {
-      fs.rmSync(join(core, "src/pages/api/chat.ts"));
-    }
-    if (fs.existsSync(join(core, "src/pages/api/[...auth].ts"))) {
-      fs.rmSync(join(core, "src/pages/api/[...auth].ts"));
-    }
-    return;
-  }
-  fs.cpSync(join(eventCatalogDir, "src/enterprise/eventcatalog-chat/pages/api"), join(core, "src/pages/api"), {
-    recursive: true
-  });
-};
-var createAuthFileIfNotExists = async (hasRequiredLicense) => {
-  const authEnabled = await isAuthEnabled();
-  const isSRR = await isOutputServer();
-  try {
-    if (authEnabled && hasRequiredLicense && isSRR) {
-      logger.info("Creating auth file", "auth");
-      fs.writeFileSync(
-        join(core, "src/pages/api/[...auth].ts"),
-        `import { AstroAuth } from 'auth-astro/server';
-export const prerender = false;
-export const { GET, POST } = AstroAuth();
-`
-      );
-    }
-  } catch (error) {
-  }
-};
 var clearCore = () => {
   if (fs.existsSync(core)) fs.rmSync(core, { recursive: true });
 };
@@ -180,14 +144,12 @@ program.command("dev").description("Run development server of EventCatalog").opt
   await checkAndConvertMdToMdx(dir, core);
   await runMigrations(dir);
   await catalogToAstro(dir, core);
-  await copyServerFiles();
   const canEmbedPages = await isFeatureEnabled(
     "@eventcatalog/backstage-plugin-eventcatalog",
     process.env.EVENTCATALOG_LICENSE_KEY_BACKSTAGE
   );
   const isEventCatalogStarter = await isEventCatalogStarterEnabled();
   const isEventCatalogScale = await isEventCatalogScaleEnabled();
-  await createAuthFileIfNotExists(isEventCatalogScale);
   checkForUpdate();
   let watchUnsub;
   try {
@@ -228,7 +190,6 @@ program.command("build").description("Run build of EventCatalog").action(async (
     dotenv.config({ path: path.join(dir, ".env") });
   }
   copyCore();
-  await copyServerFiles();
   const isBackstagePluginEnabled = await isFeatureEnabled(
     "@eventcatalog/backstage-plugin-eventcatalog",
     process.env.EVENTCATALOG_LICENSE_KEY_BACKSTAGE
@@ -236,7 +197,6 @@ program.command("build").description("Run build of EventCatalog").action(async (
   const isEventCatalogStarter = await isEventCatalogStarterEnabled();
   const isEventCatalogScale = await isEventCatalogScaleEnabled();
   const canEmbedPages = isBackstagePluginEnabled || isEventCatalogScale;
-  await createAuthFileIfNotExists(isEventCatalogScale);
   await log_build_default(dir, {
     isEventCatalogStarterEnabled: isEventCatalogStarter,
     isEventCatalogScaleEnabled: isEventCatalogScale,
@@ -298,8 +258,6 @@ program.command("preview").description("Serves the contents of your eventcatalog
   );
   const isEventCatalogStarter = await isEventCatalogStarterEnabled();
   const isEventCatalogScale = await isEventCatalogScaleEnabled();
-  await copyServerFiles();
-  await createAuthFileIfNotExists(isEventCatalogScale);
   previewCatalog({ command, canEmbedPages: canEmbedPages || isEventCatalogScale, isEventCatalogStarter, isEventCatalogScale });
 });
 program.command("start").description("Serves the contents of your eventcatalog build directory").action(async (options, command) => {
@@ -314,7 +272,6 @@ program.command("start").description("Serves the contents of your eventcatalog b
   );
   const isEventCatalogStarter = await isEventCatalogStarterEnabled();
   const isEventCatalogScale = await isEventCatalogScaleEnabled();
-  await copyServerFiles();
   const isServerOutput = await isOutputServer();
   if (isServerOutput) {
     startServerCatalog({

package/dist/generate.cjs

@@ -73,7 +73,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.0.0-beta.19";
+var version = "3.0.0-beta.20";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-FQUOTAQT.js";
-import "./chunk-E7QOZU4L.js";
-import "./chunk-FHSD3KUQ.js";
+} from "./chunk-VDAAJC4X.js";
+import "./chunk-SUPFYBDY.js";
+import "./chunk-BLIEWBVS.js";
 import "./chunk-UPONRQSN.js";
 export {
   generate

package/dist/utils/cli-logger.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(cli_logger_exports);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.0.0-beta.19";
+var version = "3.0.0-beta.20";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-E7QOZU4L.js";
-import "../chunk-FHSD3KUQ.js";
+} from "../chunk-SUPFYBDY.js";
+import "../chunk-BLIEWBVS.js";
 export {
   logger
 };

package/eventcatalog/astro.config.mjs

@@ -20,12 +20,14 @@ import rehypeExpressiveCode from 'rehype-expressive-code'
 import config from './eventcatalog.config';
 import expressiveCode from 'astro-expressive-code';
 import ecstudioWatcher from './integrations/ecstudio-watcher.mjs';
+import eventCatalogIntegration from './integrations/eventcatalog-features.ts';
 
 const projectDirectory = process.env.PROJECT_DIR || process.cwd();
 const base = config.base || '/';
 const host = config.host || false;
 const compress = config.compress ?? false;
 
+
 const expressiveCodeConfig = {
   themes: ['andromeeda'],
   defaultProps: {
@@ -89,6 +91,7 @@ export default defineConfig({
       CSS: false,
     }),
     ecstudioWatcher(),
+    eventCatalogIntegration(),
   ].filter(Boolean),
   vite: {
     define: {

package/eventcatalog/integrations/eventcatalog-features.ts

@@ -0,0 +1,69 @@
+import type { AstroIntegration } from 'astro';
+import path from 'path';
+import {
+  isEventCatalogChatEnabled,
+  isAuthEnabled,
+  isEventCatalogScaleEnabled,
+  isEventCatalogStarterEnabled,
+} from '../src/utils/feature';
+
+const catalogDirectory = process.env.CATALOG_DIR || process.cwd();
+
+const configureAuthentication = (params: {
+  injectRoute: (route: { pattern: string; entrypoint: string }) => void;
+  addMiddleware: (middleware: { entrypoint: string; order: 'pre' }) => void;
+}) => {
+  params.injectRoute({
+    pattern: '/api/[...auth]',
+    entrypoint: path.join(catalogDirectory, 'src/enterprise/auth/[...auth].ts'),
+  });
+  params.injectRoute({
+    pattern: '/auth/login',
+    entrypoint: path.join(catalogDirectory, 'src/enterprise/auth/login.astro'),
+  });
+  params.injectRoute({
+    pattern: '/auth/error',
+    entrypoint: path.join(catalogDirectory, 'src/enterprise/auth/error.astro'),
+  });
+
+  params.injectRoute({
+    pattern: '/unauthorized',
+    entrypoint: path.join(catalogDirectory, 'src/enterprise/auth/unauthorized.astro'),
+  });
+
+  // Add the authentication middleware
+  params.addMiddleware({
+    entrypoint: path.join(catalogDirectory, 'src/enterprise/auth/middleware/middleware.ts'),
+    order: 'pre',
+  });
+};
+
+export default function eventCatalogIntegration(): AstroIntegration {
+  return {
+    name: 'eventcatalog',
+    hooks: {
+      'astro:config:setup': (params) => {
+        // Handle routes for AI features
+        if (isEventCatalogChatEnabled()) {
+          params.injectRoute({
+            pattern: '/api/chat',
+            entrypoint: path.join(catalogDirectory, 'src/enterprise/ai/chat-api.ts'),
+          });
+        }
+
+        // Handle routes for authentication
+        if (isAuthEnabled()) {
+          configureAuthentication(params);
+        }
+
+        // If non paying user, add the plans route into the project
+        if (!isEventCatalogStarterEnabled() && !isEventCatalogScaleEnabled()) {
+          params.injectRoute({
+            pattern: '/plans',
+            entrypoint: path.join(catalogDirectory, 'src/enterprise/plans/index.astro'),
+          });
+        }
+      },
+    },
+  };
+}

package/eventcatalog/src/components/ChatPanel/ChatPanel.tsx

@@ -217,12 +217,12 @@ const ChatPanel = ({ isOpen, onClose }: ChatPanelProps) => {
     (p) => p.type === 'text' && (p as { type: 'text'; text: string }).text.length > 0
   );
 
-  // Clear waiting state once assistant starts outputting
+  // Clear waiting state once assistant starts outputting or on error
   useEffect(() => {
-    if (assistantHasContent) {
+    if (assistantHasContent || status === 'error') {
       setIsWaitingForResponse(false);
     }
-  }, [assistantHasContent]);
+  }, [assistantHasContent, status]);
 
   const isStreaming = status === 'streaming' && assistantHasContent;
   const isThinking = isWaitingForResponse || ((status === 'submitted' || status === 'streaming') && !assistantHasContent);
@@ -523,11 +523,14 @@ const ChatPanel = ({ isOpen, onClose }: ChatPanelProps) => {
                     </div>
                   )}
 
-                  {/* Error message */}
+                  {/* Error message as chat bubble */}
                   {status === 'error' && (
-                    <div className="flex justify-center">
-                      <div className="bg-red-50 text-red-600 rounded-lg px-4 py-2 text-sm">
-                        Something went wrong. Please try again.
+                    <div className="flex justify-start">
+                      <div className="w-full">
+                        <div className="flex items-start gap-2 text-red-600 text-sm">
+                          <span className="shrink-0">⚠️</span>
+                          <span>Something went wrong. Please try again.</span>
+                        </div>
                       </div>
                     </div>
                   )}
@@ -747,10 +750,14 @@ const ChatPanel = ({ isOpen, onClose }: ChatPanelProps) => {
                     </div>
                   )}
 
+                  {/* Error message as chat bubble */}
                   {status === 'error' && (
-                    <div className="flex justify-center">
-                      <div className="bg-red-50 text-red-600 rounded-lg px-4 py-2 text-sm">
-                        Something went wrong. Please try again.
+                    <div className="flex justify-start">
+                      <div className="w-full">
+                        <div className="flex items-start gap-2 text-red-600 text-sm">
+                          <span className="shrink-0">⚠️</span>
+                          <span>Something went wrong. Please try again.</span>
+                        </div>
                       </div>
                     </div>
                   )}

package/eventcatalog/src/content.config.ts

@@ -7,7 +7,7 @@ import fs from 'fs';
 import path from 'path';
 
 // Enterprise Collections
-import { chatPromptsSchema, customPagesSchema } from './enterprise/collections';
+import { customPagesSchema } from './enterprise/collections';
 
 export const projectDirBase = (() => {
   if (process.platform === 'win32') {
@@ -469,14 +469,6 @@ const customPages = defineCollection({
   schema: customPagesSchema,
 });
 
-const chatPrompts = defineCollection({
-  loader: glob({
-    pattern: ['chat-prompts/*.(md|mdx)', 'chat-prompts/**/*.@(md|mdx)'],
-    base: projectDirBase,
-  }),
-  schema: chatPromptsSchema,
-});
-
 const domains = defineCollection({
   loader: glob({
     pattern: [
@@ -722,7 +714,6 @@ export const collections = {
 
   // EventCatalog Pro Collections
   customPages,
-  chatPrompts,
 
   // EventCatalog Studio Collections
   designs,

package/eventcatalog/src/enterprise/auth/[...auth].ts

@@ -0,0 +1,3 @@
+import { AstroAuth } from 'auth-astro/server';
+export const prerender = false;
+export const { GET, POST } = AstroAuth();