@apollo/client-ai-apps 0.5.4 → 0.6.0

package/src/vite/__tests__/utilities/build.ts

@@ -33,7 +33,6 @@ export async function buildApp(
     ...config,
     build: {
       emptyOutDir: false,
-      outDir: "dist",
       ...config.build,
       rollupOptions: {
         input: config.build?.rollupOptions?.input ?? "virtual:entry",

package/src/vite/apolloClientAiApps.ts

@@ -38,6 +38,7 @@ export declare namespace apolloClientAiApps {
   export interface Options {
     targets: Target[];
     devTarget?: Target | undefined;
+    appsOutDir: string;
   }
 }
 
@@ -74,10 +75,12 @@ export function apolloClientAiApps(
   options: apolloClientAiApps.Options
 ): Plugin {
   const targets = Array.from(new Set(options.targets));
-  const { devTarget = targets.length === 1 ? targets[0] : undefined } = options;
+  const {
+    devTarget = targets.length === 1 ? targets[0] : undefined,
+    appsOutDir,
+  } = options;
   const cache = new Map<string, FileCache>();
 
-  let packageJson!: Record<string, any>;
   let config!: ResolvedConfig;
 
   const fragments = createFragmentRegistry();
@@ -92,6 +95,11 @@ export function apolloClientAiApps(
     `All targets must be one of: ${VALID_TARGETS.join(", ")}`
   );
 
+  invariant(
+    path.basename(path.normalize(appsOutDir)) === "apps",
+    "`appsOutDir` must end with `apps` as the final path segment (e.g. `path/to/apps`)."
+  );
+
   const client = new ApolloClient({
     cache: new InMemoryCache({ fragments }),
     link: processQueryLink,
@@ -193,6 +201,14 @@ export function apolloClientAiApps(
       ) as { mcp?: string; openai?: string };
     }
 
+    const packageJson = readPackageJson();
+    const appName = appsConfig.name ?? packageJson.name;
+
+    invariant(
+      appName,
+      "Error generating application manifest. Could not determine app name. Set `name` in your apollo-client-ai-apps config or `package.json`."
+    );
+
     const manifest: ApplicationManifest = {
       format: "apollo-ai-app-manifest",
       version: "1",
@@ -203,6 +219,7 @@ export function apolloClientAiApps(
       operations,
       resource,
       csp: {
+        baseUriDomains: appsConfig.csp?.baseUriDomains ?? [],
         connectDomains: appsConfig.csp?.connectDomains ?? [],
         frameDomains: appsConfig.csp?.frameDomains ?? [],
         redirectDomains: appsConfig.csp?.redirectDomains ?? [],
@@ -218,14 +235,7 @@ export function apolloClientAiApps(
       manifest.labels = appsConfig.labels;
     }
 
-    // We create mcp and openai environments in order to write to
-    // subdirectories, but we want the manifest to be in the root outDir. If we
-    // are running in a different environment, we'll put it in the configured
-    // outDir directly instead.
-    const outDir =
-      environment?.name === "mcp" || environment?.name === "openai" ?
-        path.resolve(config.build.outDir, "../")
-      : config.build.outDir;
+    const outDir = path.join(appsOutDir, appName);
 
     // Always write to build directory so the MCP server picks it up
     const dest = path.resolve(root, outDir, ".application-manifest.json");
@@ -239,9 +249,6 @@ export function apolloClientAiApps(
   return {
     name: "@apollo/client-ai-apps/vite",
     async buildStart() {
-      // Read package.json on start
-      packageJson = JSON.parse(fs.readFileSync("package.json", "utf-8"));
-
       // Scan all files on startup
       const files = await glob("./src/**/*.{ts,tsx,js,jsx}", { fs });
 
@@ -258,19 +265,27 @@ export function apolloClientAiApps(
     configResolved(resolvedConfig) {
       config = resolvedConfig;
     },
-    configEnvironment(name, { build }) {
+    async configEnvironment(name, { build }) {
       if (!targets.includes(name as any)) return;
 
+      const appsConfig = await getAppsConfig();
+      const appName = appsConfig.name ?? readPackageJson().name;
+
+      invariant(
+        appName,
+        "Could not determine app name. Set `name` in your apollo-client-ai-apps config or `package.json`."
+      );
+
       return {
         build: {
-          outDir: path.join(build?.outDir ?? "dist", name),
+          outDir: path.join(appsOutDir, appName, name),
         },
       };
     },
     configureServer(server) {
       server.watcher.on("change", async (file) => {
         if (file.endsWith("package.json")) {
-          packageJson = JSON.parse(fs.readFileSync("package.json", "utf-8"));
+          readPackageJson.resetCache();
           await generateManifest();
         } else if (file.match(/\.?apollo-client-ai-apps\.config\.\w+$/)) {
           explorer.clearCaches();
@@ -282,7 +297,14 @@ export function apolloClientAiApps(
       });
     },
 
-    config(_, { command }) {
+    config(userConfig, { command }) {
+      if (userConfig.build?.outDir) {
+        console.warn(
+          "[@apollo/client-ai-apps/vite] `build.outDir` is set in your Vite config but will be " +
+            "ignored. Use `appsOutDir` in the plugin options to control the output location."
+        );
+      }
+
       if (command === "serve") {
         invariant(
           isValidTarget(devTarget) || targets.length === 1,
@@ -503,6 +525,21 @@ function getResourceFromConfig(
   return typeof config === "string" ? config : config[target];
 }
 
+function readPackageJson(): Record<string, any> {
+  if (readPackageJson.cache) {
+    return readPackageJson.cache;
+  }
+
+  return (readPackageJson.cache = JSON.parse(
+    fs.readFileSync("package.json", "utf-8")
+  ));
+}
+
+readPackageJson.cache = undefined as Record<string, any> | undefined;
+readPackageJson.resetCache = () => {
+  readPackageJson.cache = undefined;
+};
+
 const ToolDirectiveSchema = z.strictObject({
   name: z.stringFormat("toolName", (value) => value.indexOf(" ") === -1, {
     error: (iss) => `Tool with name "${iss.input}" must not contain spaces`,