@mastra/deployer-vercel 0.0.1-alpha.33 → 0.0.1-alpha.34

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @mastra/deployer-vercel
 
+## 0.0.1-alpha.34
+
+### Patch Changes
+
+- 38b7f66: Update deployer logic
+- Updated dependencies [2f17a5f]
+- Updated dependencies [0696eeb]
+- Updated dependencies [cb290ee]
+- Updated dependencies [b4d7416]
+- Updated dependencies [38b7f66]
+  - @mastra/core@0.2.0-alpha.84
+  - @mastra/deployer@0.0.1-alpha.29
+
 ## 0.0.1-alpha.33
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,27 +1,21 @@
-import { MastraDeployer } from '@mastra/core/deployer';
+import { Deployer } from '@mastra/deployer';
 
-declare class VercelDeployer extends MastraDeployer {
-    constructor({ scope, env, projectName }: {
-        env?: Record<string, any>;
-        scope: string;
+declare class VercelDeployer extends Deployer {
+    private teamId;
+    private projectName;
+    private token;
+    constructor({ teamId, projectName, token }: {
+        teamId: string;
         projectName: string;
+        token: string;
     });
-    writeFiles({ dir }: {
-        dir: string;
-    }): void;
+    writeFiles(outputDirectory: string): void;
     private getProjectId;
-    syncEnv({ scope, dir, token }: {
-        token: string;
-        dir: string;
-        scope: string;
-    }): Promise<void>;
-    deploy({ dir, token }: {
-        dir: string;
-        token: string;
-    }): Promise<void>;
-    writeIndex({ dir }: {
-        dir: string;
-    }): void;
+    private syncEnv;
+    prepare(outputDirectory: string): Promise<void>;
+    private getEntry;
+    bundle(mastraDir: string, outputDirectory: string): Promise<void>;
+    deploy(outputDirectory: string): Promise<void>;
 }
 
 export { VercelDeployer };

package/dist/index.js

@@ -1,17 +1,25 @@
-import { MastraDeployer } from '@mastra/core/deployer';
+import { Deployer } from '@mastra/deployer';
+import { getBundler } from '@mastra/deployer/build';
+import virtual from '@rollup/plugin-virtual';
 import * as child_process from 'child_process';
 import { writeFileSync, readFileSync } from 'fs';
 import { join } from 'path';
+import process from 'process';
 
 // src/index.ts
-var VercelDeployer = class extends MastraDeployer {
-  constructor({ scope, env, projectName }) {
-    super({ scope, env, projectName });
+var VercelDeployer = class extends Deployer {
+  teamId;
+  projectName;
+  token;
+  constructor({ teamId, projectName, token }) {
+    super({ name: "VERCEL" });
+    this.teamId = teamId;
+    this.projectName = projectName;
+    this.token = token;
   }
-  writeFiles({ dir }) {
-    this.writeIndex({ dir });
+  writeFiles(outputDirectory) {
     writeFileSync(
-      join(dir, "vercel.json"),
+      join(outputDirectory, "vercel.json"),
       JSON.stringify(
         {
           version: 2,
@@ -44,18 +52,11 @@ var VercelDeployer = class extends MastraDeployer {
       throw new Error("Could not find project ID. Make sure the project has been deployed first.");
     }
   }
-  async syncEnv({ scope, dir, token }) {
-    const envFiles = this.getEnvFiles();
-    const envVars = [];
-    for (const file of envFiles) {
-      const vars = this.parseEnvFile(file);
-      envVars.push(...vars);
-    }
+  async syncEnv(envVars) {
     console.log("Syncing environment variables...");
-    const vercelEnvVars = envVars.map((envVar) => {
-      const [key, value] = envVar.split("=");
+    const vercelEnvVars = Array.from(envVars.entries()).map(([key, value]) => {
       if (!key || !value) {
-        throw new Error(`Invalid environment variable format: ${envVar}`);
+        throw new Error(`Invalid environment variable format: ${key || value}`);
       }
       return {
         key,
@@ -65,15 +66,18 @@ var VercelDeployer = class extends MastraDeployer {
       };
     });
     try {
-      const projectId = this.getProjectId({ dir });
-      const response = await fetch(`https://api.vercel.com/v10/projects/${projectId}/env?teamId=${scope}&upsert=true`, {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${token}`,
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(vercelEnvVars)
-      });
+      const projectId = this.getProjectId({ dir: process.cwd() });
+      const response = await fetch(
+        `https://api.vercel.com/v10/projects/${projectId}/env?teamId=${this.teamId}&upsert=true`,
+        {
+          method: "POST",
+          headers: {
+            Authorization: `Bearer ${this.token}`,
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify(vercelEnvVars)
+        }
+      );
       if (!response.ok) {
         const error = await response.json();
         throw new Error(`Failed to sync environment variables: ${error.message}`);
@@ -88,53 +92,61 @@ var VercelDeployer = class extends MastraDeployer {
       throw error;
     }
   }
-  async deploy({ dir, token }) {
-    const envFiles = this.getEnvFiles();
-    const envVars = [];
-    for (const file of envFiles) {
-      const vars = this.parseEnvFile(file);
-      envVars.push(...vars);
-    }
+  async prepare(outputDirectory) {
+    await super.prepare(outputDirectory);
+    await this.writeFiles(outputDirectory);
+  }
+  getEntry() {
+    return `
+import { handle } from 'hono/vercel'
+import { mastra } from '#mastra';
+import { createHonoServer } from '#server';
+
+const app = await createHonoServer(mastra);
+
+export const GET = handle(app);
+export const POST = handle(app);
+`;
+  }
+  async bundle(mastraDir, outputDirectory) {
+    const bundler = await getBundler({
+      input: "#entry",
+      plugins: [virtual({ "#entry": this.getEntry() })]
+    });
+    await bundler.write({
+      inlineDynamicImports: true,
+      file: `${outputDirectory}/index.mjs`,
+      format: "es"
+    });
+  }
+  async deploy(outputDirectory) {
+    const envVars = await this.loadEnvVars();
     const commandArgs = [
       "--scope",
-      this.scope,
+      this.teamId,
       "--cwd",
-      dir,
-      "deploy",
+      outputDirectory,
       "--token",
-      token,
+      this.token,
+      "deploy",
       "--yes",
       ...this.projectName ? ["--name", this.projectName] : []
     ];
-    for (const envVar of envVars) {
-      commandArgs.push("--env", envVar);
-    }
-    child_process.execSync(`vercel ${commandArgs.join(" ")}`, {
-      cwd: dir,
+    child_process.execSync(`npx vercel ${commandArgs.join(" ")}`, {
+      cwd: outputDirectory,
       env: {
-        ...this.env,
+        // ...this.env,
         PATH: process.env.PATH
       },
       stdio: "inherit"
     });
-    console.log("Deployment started on Vercel. You can wait for it to finish or exit this command.");
-    if (envVars.length > 0) {
-      await this.syncEnv({ scope: this.scope, dir, token });
+    this.logger.info("Deployment started on Vercel. You can wait for it to finish or exit this command.");
+    if (envVars.size > 0) {
+      await this.syncEnv(envVars);
     } else {
-      console.log("\nAdd your ENV vars to .env or your vercel dashboard.\n");
+      this.logger.info("\nAdd your ENV vars to .env or your vercel dashboard.\n");
     }
   }
-  writeIndex({ dir }) {
-    writeFileSync(
-      join(dir, "index.mjs"),
-      `
-                import { handle } from 'hono/vercel'
-                import { app } from './hono.mjs';
-                export const GET = handle(app);
-                export const POST = handle(app);
-            `
-    );
-  }
 };
 
 export { VercelDeployer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/deployer-vercel",
-  "version": "0.0.1-alpha.33",
+  "version": "0.0.1-alpha.34",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -16,8 +16,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@mastra/core": "0.2.0-alpha.83",
-    "@mastra/deployer": "0.0.1-alpha.28"
+    "@rollup/plugin-virtual": "^3.0.2",
+    "fs-extra": "^11.2.0",
+    "@mastra/core": "0.2.0-alpha.84",
+    "@mastra/deployer": "0.0.1-alpha.29"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.26.0",

package/src/index.ts

@@ -1,7 +1,10 @@
-import { MastraDeployer } from '@mastra/core/deployer';
+import { Deployer } from '@mastra/deployer';
+import { getBundler } from '@mastra/deployer/build';
+import virtual from '@rollup/plugin-virtual';
 import * as child_process from 'child_process';
 import { readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
+import process from 'process';
 
 interface EnvVar {
   key: string;
@@ -15,16 +18,22 @@ interface VercelError {
   code: string;
 }
 
-export class VercelDeployer extends MastraDeployer {
-  constructor({ scope, env, projectName }: { env?: Record<string, any>; scope: string; projectName: string }) {
-    super({ scope, env, projectName });
-  }
+export class VercelDeployer extends Deployer {
+  private teamId: string;
+  private projectName: string;
+  private token: string;
+
+  constructor({ teamId, projectName, token }: { teamId: string; projectName: string; token: string }) {
+    super({ name: 'VERCEL' });
 
-  writeFiles({ dir }: { dir: string }): void {
-    this.writeIndex({ dir });
+    this.teamId = teamId;
+    this.projectName = projectName;
+    this.token = token;
+  }
 
+  writeFiles(outputDirectory: string): void {
     writeFileSync(
-      join(dir, 'vercel.json'),
+      join(outputDirectory, 'vercel.json'),
       JSON.stringify(
         {
           version: 2,
@@ -59,23 +68,15 @@ export class VercelDeployer extends MastraDeployer {
     }
   }
 
-  async syncEnv({ scope, dir, token }: { token: string; dir: string; scope: string }) {
-    const envFiles = this.getEnvFiles();
-    const envVars: string[] = [];
-
-    for (const file of envFiles) {
-      const vars = this.parseEnvFile(file);
-      envVars.push(...vars);
-    }
-
+  private async syncEnv(envVars: Map<string, string>) {
     console.log('Syncing environment variables...');
 
     // Transform env vars into the format expected by Vercel API
-    const vercelEnvVars: EnvVar[] = envVars.map(envVar => {
-      const [key, value] = envVar.split('=');
+    const vercelEnvVars: EnvVar[] = Array.from(envVars.entries()).map(([key, value]) => {
       if (!key || !value) {
-        throw new Error(`Invalid environment variable format: ${envVar}`);
+        throw new Error(`Invalid environment variable format: ${key || value}`);
       }
+
       return {
         key,
         value,
@@ -85,16 +86,19 @@ export class VercelDeployer extends MastraDeployer {
     });
 
     try {
-      const projectId = this.getProjectId({ dir });
+      const projectId = this.getProjectId({ dir: process.cwd() });
 
-      const response = await fetch(`https://api.vercel.com/v10/projects/${projectId}/env?teamId=${scope}&upsert=true`, {
-        method: 'POST',
-        headers: {
-          Authorization: `Bearer ${token}`,
-          'Content-Type': 'application/json',
+      const response = await fetch(
+        `https://api.vercel.com/v10/projects/${projectId}/env?teamId=${this.teamId}&upsert=true`,
+        {
+          method: 'POST',
+          headers: {
+            Authorization: `Bearer ${this.token}`,
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(vercelEnvVars),
         },
-        body: JSON.stringify(vercelEnvVars),
-      });
+      );
 
       if (!response.ok) {
         const error = (await response.json()) as VercelError;
@@ -112,63 +116,70 @@ export class VercelDeployer extends MastraDeployer {
     }
   }
 
-  async deploy({ dir, token }: { dir: string; token: string }): Promise<void> {
-    // Get env vars for initial deployment
-    const envFiles = this.getEnvFiles();
-    const envVars: string[] = [];
+  async prepare(outputDirectory: string): Promise<void> {
+    await super.prepare(outputDirectory);
+    await this.writeFiles(outputDirectory);
+  }
+
+  private getEntry(): string {
+    return `
+import { handle } from 'hono/vercel'
+import { mastra } from '#mastra';
+import { createHonoServer } from '#server';
 
-    for (const file of envFiles) {
-      const vars = this.parseEnvFile(file);
-      envVars.push(...vars);
-    }
+const app = await createHonoServer(mastra);
+
+export const GET = handle(app);
+export const POST = handle(app);
+`;
+  }
+
+  async bundle(mastraDir: string, outputDirectory: string): Promise<void> {
+    const bundler = await getBundler({
+      input: '#entry',
+      plugins: [virtual({ '#entry': this.getEntry() })],
+    });
+
+    await bundler.write({
+      inlineDynamicImports: true,
+      file: `${outputDirectory}/index.mjs`,
+      format: 'es',
+    });
+  }
+
+  async deploy(outputDirectory: string): Promise<void> {
+    const envVars = await this.loadEnvVars();
 
     // Create the command array with base arguments
     const commandArgs = [
       '--scope',
-      this.scope as string,
+      this.teamId as string,
       '--cwd',
-      dir,
-      'deploy',
+      outputDirectory,
       '--token',
-      token,
+      this.token,
+      'deploy',
       '--yes',
       ...(this.projectName ? ['--name', this.projectName] : []),
     ];
 
-    // Add env vars to initial deployment
-    for (const envVar of envVars) {
-      commandArgs.push('--env', envVar);
-    }
-
     // Run the Vercel deploy command
-    child_process.execSync(`vercel ${commandArgs.join(' ')}`, {
-      cwd: dir,
+    child_process.execSync(`npx vercel ${commandArgs.join(' ')}`, {
+      cwd: outputDirectory,
       env: {
-        ...this.env,
+        // ...this.env,
         PATH: process.env.PATH,
       },
       stdio: 'inherit',
     });
 
-    console.log('Deployment started on Vercel. You can wait for it to finish or exit this command.');
+    this.logger.info('Deployment started on Vercel. You can wait for it to finish or exit this command.');
 
-    if (envVars.length > 0) {
+    if (envVars.size > 0) {
       // Sync environment variables for future deployments
-      await this.syncEnv({ scope: this.scope, dir, token });
+      await this.syncEnv(envVars);
     } else {
-      console.log('\nAdd your ENV vars to .env or your vercel dashboard.\n');
+      this.logger.info('\nAdd your ENV vars to .env or your vercel dashboard.\n');
     }
   }
-
-  writeIndex({ dir }: { dir: string }): void {
-    writeFileSync(
-      join(dir, 'index.mjs'),
-      `
-                import { handle } from 'hono/vercel'
-                import { app } from './hono.mjs';
-                export const GET = handle(app);
-                export const POST = handle(app);
-            `,
-    );
-  }
 }