@mastra/deployer-netlify 0.0.1-alpha.30 → 0.0.1-alpha.32

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @mastra/deployer-netlify
 
+## 0.0.1-alpha.32
+
+### Patch Changes
+
+- e27fe69: Add dir to deployer
+- Updated dependencies [e27fe69]
+  - @mastra/deployer@0.0.1-alpha.30
+
+## 0.0.1-alpha.31
+
+### 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.30
 
 ### Patch Changes

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,6 +1,8 @@
-import { MastraDeployer } from '@mastra/core/deployer';
+import { Deployer } from '@mastra/deployer';
+import { getBundler } from '@mastra/deployer/build';
+import virtual from '@rollup/plugin-virtual';
 import { execa } from 'execa';
-import { existsSync, mkdirSync, writeFileSync, renameSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
 
 // src/index.ts
@@ -60,9 +62,15 @@ async function getOrCreateSite({ token, name, scope }) {
 }
 
 // src/index.ts
-var NetlifyDeployer = class extends MastraDeployer {
-  constructor({ scope, env, projectName }) {
-    super({ scope, env, projectName });
+var NetlifyDeployer = class extends Deployer {
+  scope;
+  projectName;
+  token;
+  constructor({ scope, projectName, token }) {
+    super({ name: "NETLIFY" });
+    this.scope = scope;
+    this.projectName = projectName;
+    this.token = token;
   }
   writeFiles({ dir }) {
     if (!existsSync(join(dir, "netlify/functions/api"))) {
@@ -70,49 +78,70 @@ var NetlifyDeployer = class extends MastraDeployer {
     }
     writeFileSync(
       join(dir, "netlify.toml"),
-      `
-              [functions]
-              node_bundler = "esbuild"            
-              directory = "/netlify/functions"
+      `[functions]
+node_bundler = "esbuild"            
+directory = "netlify/functions"
 
-              [[redirects]]
-              force = true
-              from = "/*"
-              status = 200
-              to = "/.netlify/functions/api/:splat"
-              `
+[[redirects]]
+force = true
+from = "/*"
+status = 200
+to = "/.netlify/functions/api/:splat"
+`
     );
-    this.writeIndex({ dir });
   }
-  async deploy({ dir, token }) {
-    const site = await getOrCreateSite({ token, name: this.projectName || `mastra`, scope: this.scope });
+  async deploy(outputDirectory) {
+    const site = await getOrCreateSite({ token: this.token, name: this.projectName || `mastra`, scope: this.scope });
     const p2 = execa(
-      "netlify",
-      ["deploy", "--site", site.id, "--auth", token, "--dir", ".", "--functions", "./netlify/functions"],
+      "npx",
+      [
+        "netlify-cli",
+        "deploy",
+        "--site",
+        site.id,
+        "--auth",
+        this.token,
+        "--dir",
+        ".",
+        "--functions",
+        "./netlify/functions"
+      ],
       {
-        cwd: dir
+        cwd: outputDirectory
       }
     );
     p2.stdout.pipe(process.stdout);
     await p2;
   }
-  writeIndex({ dir }) {
-    ["mastra.mjs", "hono.mjs", "server.mjs"].forEach((file) => {
-      renameSync(join(dir, file), join(dir, `netlify/functions/api/${file}`));
+  async prepare(outputDirectory) {
+    await super.prepare(outputDirectory);
+    if (!existsSync(join(outputDirectory, "netlify/functions/api"))) {
+      mkdirSync(join(outputDirectory, "netlify/functions/api"), { recursive: true });
+    }
+    this.writeFiles({ dir: outputDirectory });
+  }
+  async bundle(mastraDir, outputDirectory) {
+    const bundler = await getBundler({
+      input: "#entry",
+      external: [/^@opentelemetry\//],
+      plugins: [virtual({ "#entry": this.getEntry() })]
     });
-    writeFileSync(
-      join(dir, "netlify/functions/api/api.mts"),
-      `                
-             export default async (req, context) => {
-                const { app } = await import('./hono.mjs');
-                    // Pass the request directly to Hono
-                    return app.fetch(req, {
-                        // Optional context passing if needed
-                        env: { context }
-                    })
-                }
-            `
-    );
+    await bundler.write({
+      inlineDynamicImports: true,
+      file: join(outputDirectory, "netlify", "functions", "api", "index.mjs"),
+      format: "es"
+    });
+  }
+  getEntry() {
+    return `
+import { handle } from 'hono/netlify'
+import { mastra } from '#mastra';
+import { createHonoServer } from '#server';
+
+const app = await createHonoServer(mastra);
+
+export default handle(app)
+`;
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/deployer-netlify",
-  "version": "0.0.1-alpha.30",
+  "version": "0.0.1-alpha.32",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -16,13 +16,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@rollup/plugin-virtual": "^3.0.2",
     "date-fns": "^4.1.0",
     "dotenv": "^16.3.1",
     "execa": "^9.3.1",
     "netlify-cli": "^18.0.1",
     "zod": "^3.24.1",
-    "@mastra/core": "0.2.0-alpha.83",
-    "@mastra/deployer": "0.0.1-alpha.28"
+    "@mastra/core": "0.2.0-alpha.84",
+    "@mastra/deployer": "0.0.1-alpha.30"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.26.0",

package/src/index.ts

@@ -1,13 +1,23 @@
-import { MastraDeployer } from '@mastra/core/deployer';
+import { Deployer } from '@mastra/deployer';
+import { getBundler } from '@mastra/deployer/build';
+import virtual from '@rollup/plugin-virtual';
 import { execa } from 'execa';
-import { existsSync, mkdirSync, renameSync, writeFileSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
 
 import { getOrCreateSite } from './helpers.js';
 
-export class NetlifyDeployer extends MastraDeployer {
-  constructor({ scope, env, projectName }: { projectName: string; env?: Record<string, any>; scope: string }) {
-    super({ scope, env, projectName });
+export class NetlifyDeployer extends Deployer {
+  protected scope: string;
+  protected projectName: string;
+  protected token: string;
+
+  constructor({ scope, projectName, token }: { scope: string; projectName: string; token: string }) {
+    super({ name: 'NETLIFY' });
+
+    this.scope = scope;
+    this.projectName = projectName;
+    this.token = token;
   }
 
   writeFiles({ dir }: { dir: string }): void {
@@ -18,30 +28,38 @@ export class NetlifyDeployer extends MastraDeployer {
     // TODO ENV KEYS
     writeFileSync(
       join(dir, 'netlify.toml'),
-      `
-              [functions]
-              node_bundler = "esbuild"            
-              directory = "/netlify/functions"
-
-              [[redirects]]
-              force = true
-              from = "/*"
-              status = 200
-              to = "/.netlify/functions/api/:splat"
-              `,
-    );
+      `[functions]
+node_bundler = "esbuild"            
+directory = "netlify/functions"
 
-    this.writeIndex({ dir });
+[[redirects]]
+force = true
+from = "/*"
+status = 200
+to = "/.netlify/functions/api/:splat"
+`,
+    );
   }
 
-  async deploy({ dir, token }: { dir: string; token: string }): Promise<void> {
-    const site = await getOrCreateSite({ token, name: this.projectName || `mastra`, scope: this.scope });
+  async deploy(outputDirectory: string): Promise<void> {
+    const site = await getOrCreateSite({ token: this.token, name: this.projectName || `mastra`, scope: this.scope });
 
     const p2 = execa(
-      'netlify',
-      ['deploy', '--site', site.id, '--auth', token, '--dir', '.', '--functions', './netlify/functions'],
+      'npx',
+      [
+        'netlify-cli',
+        'deploy',
+        '--site',
+        site.id,
+        '--auth',
+        this.token,
+        '--dir',
+        '.',
+        '--functions',
+        './netlify/functions',
+      ],
       {
-        cwd: dir,
+        cwd: outputDirectory,
       },
     );
 
@@ -49,23 +67,39 @@ export class NetlifyDeployer extends MastraDeployer {
     await p2;
   }
 
-  writeIndex({ dir }: { dir: string }): void {
-    ['mastra.mjs', 'hono.mjs', 'server.mjs'].forEach(file => {
-      renameSync(join(dir, file), join(dir, `netlify/functions/api/${file}`));
+  async prepare(outputDirectory: string): Promise<void> {
+    await super.prepare(outputDirectory);
+
+    // Prepare the deployment directory
+    if (!existsSync(join(outputDirectory, 'netlify/functions/api'))) {
+      mkdirSync(join(outputDirectory, 'netlify/functions/api'), { recursive: true });
+    }
+    this.writeFiles({ dir: outputDirectory });
+  }
+
+  async bundle(mastraDir: string, outputDirectory: string): Promise<void> {
+    const bundler = await getBundler({
+      input: '#entry',
+      external: [/^@opentelemetry\//],
+      plugins: [virtual({ '#entry': this.getEntry() })],
     });
 
-    writeFileSync(
-      join(dir, 'netlify/functions/api/api.mts'),
-      `                
-             export default async (req, context) => {
-                const { app } = await import('./hono.mjs');
-                    // Pass the request directly to Hono
-                    return app.fetch(req, {
-                        // Optional context passing if needed
-                        env: { context }
-                    })
-                }
-            `,
-    );
+    await bundler.write({
+      inlineDynamicImports: true,
+      file: join(outputDirectory, 'netlify', 'functions', 'api', 'index.mjs'),
+      format: 'es',
+    });
+  }
+
+  private getEntry(): string {
+    return `
+import { handle } from 'hono/netlify'
+import { mastra } from '#mastra';
+import { createHonoServer } from '#server';
+
+const app = await createHonoServer(mastra);
+
+export default handle(app)
+`;
   }
 }