@mastra/deployer 0.2.4-alpha.0 → 0.2.4

package/dist/build/analyze.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var chunkQVHMDKNM_cjs = require('../chunk-QVHMDKNM.cjs');
+var chunkNWERLYTR_cjs = require('../chunk-NWERLYTR.cjs');
 
 
 
 Object.defineProperty(exports, "analyzeBundle", {
   enumerable: true,
-  get: function () { return chunkQVHMDKNM_cjs.analyzeBundle; }
+  get: function () { return chunkNWERLYTR_cjs.analyzeBundle; }
 });

package/dist/build/analyze.js

@@ -1 +1 @@
-export { analyzeBundle } from '../chunk-ARY7G5XC.js';
+export { analyzeBundle } from '../chunk-UTZ3434D.js';

package/dist/build/index.cjs

@@ -1,31 +1,31 @@
 'use strict';
 
-var chunkAXUXJ2OU_cjs = require('../chunk-AXUXJ2OU.cjs');
+var chunk7GYBZLVN_cjs = require('../chunk-7GYBZLVN.cjs');
 var chunkKFOGAPGX_cjs = require('../chunk-KFOGAPGX.cjs');
-var chunkQVHMDKNM_cjs = require('../chunk-QVHMDKNM.cjs');
+var chunkNWERLYTR_cjs = require('../chunk-NWERLYTR.cjs');
 var chunkOT6UKL2S_cjs = require('../chunk-OT6UKL2S.cjs');
 
 
 
 Object.defineProperty(exports, "FileService", {
   enumerable: true,
-  get: function () { return chunkAXUXJ2OU_cjs.FileService; }
+  get: function () { return chunk7GYBZLVN_cjs.FileService; }
 });
 Object.defineProperty(exports, "createWatcher", {
   enumerable: true,
-  get: function () { return chunkAXUXJ2OU_cjs.createWatcher; }
+  get: function () { return chunk7GYBZLVN_cjs.createWatcher; }
 });
 Object.defineProperty(exports, "getBundler", {
   enumerable: true,
-  get: function () { return chunkAXUXJ2OU_cjs.getBundler; }
+  get: function () { return chunk7GYBZLVN_cjs.getBundler; }
 });
 Object.defineProperty(exports, "getWatcher", {
   enumerable: true,
-  get: function () { return chunkAXUXJ2OU_cjs.getWatcher; }
+  get: function () { return chunk7GYBZLVN_cjs.getWatcher; }
 });
 Object.defineProperty(exports, "getWatcherInputOptions", {
   enumerable: true,
-  get: function () { return chunkAXUXJ2OU_cjs.getInputOptions; }
+  get: function () { return chunk7GYBZLVN_cjs.getInputOptions; }
 });
 Object.defineProperty(exports, "Deps", {
   enumerable: true,
@@ -37,7 +37,7 @@ Object.defineProperty(exports, "writeTelemetryConfig", {
 });
 Object.defineProperty(exports, "analyzeBundle", {
   enumerable: true,
-  get: function () { return chunkQVHMDKNM_cjs.analyzeBundle; }
+  get: function () { return chunkNWERLYTR_cjs.analyzeBundle; }
 });
 Object.defineProperty(exports, "createBundler", {
   enumerable: true,

package/dist/build/index.js

@@ -1,4 +1,4 @@
-export { FileService, createWatcher, getBundler, getWatcher, getInputOptions as getWatcherInputOptions } from '../chunk-YE3YSKC6.js';
+export { FileService, createWatcher, getBundler, getWatcher, getInputOptions as getWatcherInputOptions } from '../chunk-PUX2FDGX.js';
 export { Deps, writeTelemetryConfig } from '../chunk-ZAXXMFXX.js';
-export { analyzeBundle } from '../chunk-ARY7G5XC.js';
+export { analyzeBundle } from '../chunk-UTZ3434D.js';
 export { createBundler, getInputOptions as getBundlerInputOptions } from '../chunk-XEFBJH3T.js';

package/dist/bundler/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var chunkHBJIG6EL_cjs = require('../chunk-HBJIG6EL.cjs');
+var chunkWUF7W23E_cjs = require('../chunk-WUF7W23E.cjs');
 
 
 
 Object.defineProperty(exports, "Bundler", {
   enumerable: true,
-  get: function () { return chunkHBJIG6EL_cjs.Bundler; }
+  get: function () { return chunkWUF7W23E_cjs.Bundler; }
 });

package/dist/bundler/index.js

@@ -1 +1 @@
-export { Bundler } from '../chunk-7J2ZTGHM.js';
+export { Bundler } from '../chunk-CS5NGTWK.js';

package/dist/{chunk-AXUXJ2OU.cjs → chunk-7GYBZLVN.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkQVHMDKNM_cjs = require('./chunk-QVHMDKNM.cjs');
+var chunkNWERLYTR_cjs = require('./chunk-NWERLYTR.cjs');
 var chunkOT6UKL2S_cjs = require('./chunk-OT6UKL2S.cjs');
 var chunk54KOF3NB_cjs = require('./chunk-54KOF3NB.cjs');
 var alias = require('@rollup/plugin-alias');
@@ -116,7 +116,7 @@ var FileService = class {
    * @returns
    */
   async copyStarterFile(inputFile, outputFilePath, replaceIfExists) {
-    const __filename = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-AXUXJ2OU.cjs', document.baseURI).href)));
+    const __filename = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-7GYBZLVN.cjs', document.baseURI).href)));
     const __dirname = path__default.default.dirname(__filename);
     const filePath = path__default.default.resolve(__dirname, "..", "starter-files", inputFile);
     const fileString = fs2__namespace.default.readFileSync(filePath, "utf8");
@@ -262,7 +262,7 @@ async function getInputOptions2(entryFile, platform) {
       // @ts-ignore
       (plugin) => !plugin || !plugin?.name || plugin.name !== "node-resolve"
     );
-    inputOptions.plugins.push(chunkQVHMDKNM_cjs.aliasHono());
+    inputOptions.plugins.push(chunkNWERLYTR_cjs.aliasHono());
   }
   return inputOptions;
 }

package/dist/{chunk-7J2ZTGHM.js → chunk-CS5NGTWK.js}

@@ -1,5 +1,5 @@
 import { Deps, writeTelemetryConfig } from './chunk-ZAXXMFXX.js';
-import { analyzeBundle } from './chunk-ARY7G5XC.js';
+import { analyzeBundle } from './chunk-UTZ3434D.js';
 import { createBundler, getInputOptions } from './chunk-XEFBJH3T.js';
 import { existsSync } from 'node:fs';
 import { writeFile, stat } from 'node:fs/promises';

package/dist/{chunk-QVHMDKNM.cjs → chunk-NWERLYTR.cjs}

@@ -90,7 +90,10 @@ function findExternalImporter(module, external, allOutputs) {
   for (const file of capturedFiles) {
     const nextModule = allOutputs.find((o) => o.fileName === file);
     if (nextModule) {
-      return findExternalImporter(nextModule, external, allOutputs);
+      const importer = findExternalImporter(nextModule, external, allOutputs);
+      if (importer) {
+        return importer;
+      }
     }
   }
   return null;
@@ -173,7 +176,7 @@ async function bundleExternals(depsToOptimize, outputDir, logger) {
       if (local === "*") {
         virtualFile.push(`export * from '${dep}';`);
       } else if (local === "default") {
-        virtualFile.push(`export * from '${dep}';`);
+        virtualFile.push(`export { default } from '${dep}';`);
       } else {
         exportStringBuilder.push(local);
       }
@@ -239,8 +242,10 @@ async function bundleExternals(depsToOptimize, outputDir, logger) {
       if (importer) {
         const fullPath = path.join(outputDir, importer.fileName);
         moduleResolveMap[fullPath] = moduleResolveMap[fullPath] || {};
-        if (importer.moduleIds.length > 1) {
-          moduleResolveMap[fullPath][external] = importer.moduleIds.slice(-2, -1)[0];
+        if (importer.moduleIds.length) {
+          moduleResolveMap[fullPath][external] = importer.moduleIds[importer.moduleIds.length - 1]?.startsWith(
+            "\0virtual:#virtual"
+          ) ? importer.moduleIds[importer.moduleIds.length - 2] : importer.moduleIds[importer.moduleIds.length - 1];
         }
       }
     }

package/dist/{chunk-YE3YSKC6.js → chunk-PUX2FDGX.js}

@@ -1,4 +1,4 @@
-import { aliasHono } from './chunk-ARY7G5XC.js';
+import { aliasHono } from './chunk-UTZ3434D.js';
 import { getInputOptions } from './chunk-XEFBJH3T.js';
 import { removeDeployer } from './chunk-WVBUOQT6.js';
 import alias from '@rollup/plugin-alias';

package/dist/{chunk-ARY7G5XC.js → chunk-UTZ3434D.js}

@@ -80,7 +80,10 @@ function findExternalImporter(module, external, allOutputs) {
   for (const file of capturedFiles) {
     const nextModule = allOutputs.find((o) => o.fileName === file);
     if (nextModule) {
-      return findExternalImporter(nextModule, external, allOutputs);
+      const importer = findExternalImporter(nextModule, external, allOutputs);
+      if (importer) {
+        return importer;
+      }
     }
   }
   return null;
@@ -163,7 +166,7 @@ async function bundleExternals(depsToOptimize, outputDir, logger) {
       if (local === "*") {
         virtualFile.push(`export * from '${dep}';`);
       } else if (local === "default") {
-        virtualFile.push(`export * from '${dep}';`);
+        virtualFile.push(`export { default } from '${dep}';`);
       } else {
         exportStringBuilder.push(local);
       }
@@ -229,8 +232,10 @@ async function bundleExternals(depsToOptimize, outputDir, logger) {
       if (importer) {
         const fullPath = join(outputDir, importer.fileName);
         moduleResolveMap[fullPath] = moduleResolveMap[fullPath] || {};
-        if (importer.moduleIds.length > 1) {
-          moduleResolveMap[fullPath][external] = importer.moduleIds.slice(-2, -1)[0];
+        if (importer.moduleIds.length) {
+          moduleResolveMap[fullPath][external] = importer.moduleIds[importer.moduleIds.length - 1]?.startsWith(
+            "\0virtual:#virtual"
+          ) ? importer.moduleIds[importer.moduleIds.length - 2] : importer.moduleIds[importer.moduleIds.length - 1];
         }
       }
     }

package/dist/{chunk-HBJIG6EL.cjs → chunk-WUF7W23E.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var chunkKFOGAPGX_cjs = require('./chunk-KFOGAPGX.cjs');
-var chunkQVHMDKNM_cjs = require('./chunk-QVHMDKNM.cjs');
+var chunkNWERLYTR_cjs = require('./chunk-NWERLYTR.cjs');
 var chunkOT6UKL2S_cjs = require('./chunk-OT6UKL2S.cjs');
 var fs = require('fs');
 var promises = require('fs/promises');
@@ -31,7 +31,7 @@ var Bundler = class extends bundler.MastraBundler {
   }
   async writeInstrumentationFile(outputDirectory) {
     const instrumentationFile = path.join(outputDirectory, "instrumentation.mjs");
-    const __dirname = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-HBJIG6EL.cjs', document.baseURI).href))));
+    const __dirname = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-WUF7W23E.cjs', document.baseURI).href))));
     await esm.copy(path.join(__dirname, "templates", "instrumentation-template.js"), instrumentationFile);
   }
   async writePackageJson(outputDirectory, dependencies) {
@@ -73,7 +73,7 @@ var Bundler = class extends bundler.MastraBundler {
     return chunkOT6UKL2S_cjs.createBundler(inputOptions, outputOptions);
   }
   async analyze(entry, mastraFile, outputDirectory) {
-    return await chunkQVHMDKNM_cjs.analyzeBundle(entry, mastraFile, path.join(outputDirectory, this.analyzeOutputDir), "node", this.logger);
+    return await chunkNWERLYTR_cjs.analyzeBundle(entry, mastraFile, path.join(outputDirectory, this.analyzeOutputDir), "node", this.logger);
   }
   async installDependencies(outputDirectory, rootDir = process.cwd()) {
     const deps = new chunkKFOGAPGX_cjs.Deps(rootDir);
@@ -92,7 +92,7 @@ var Bundler = class extends bundler.MastraBundler {
   async _bundle(serverFile, mastraEntryFile, outputDirectory, bundleLocation = path.join(outputDirectory, this.outputDir)) {
     this.logger.info("Start bundling Mastra");
     const isVirtual = serverFile.includes("\n") || fs.existsSync(serverFile);
-    const analyzedBundleInfo = await chunkQVHMDKNM_cjs.analyzeBundle(
+    const analyzedBundleInfo = await chunkNWERLYTR_cjs.analyzeBundle(
       serverFile,
       mastraEntryFile,
       path.join(outputDirectory, this.analyzeOutputDir),

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkAXUXJ2OU_cjs = require('./chunk-AXUXJ2OU.cjs');
-var chunkHBJIG6EL_cjs = require('./chunk-HBJIG6EL.cjs');
+var chunk7GYBZLVN_cjs = require('./chunk-7GYBZLVN.cjs');
+var chunkWUF7W23E_cjs = require('./chunk-WUF7W23E.cjs');
 var chunkKFOGAPGX_cjs = require('./chunk-KFOGAPGX.cjs');
 var babel = require('@babel/core');
 var rollup = require('rollup');
@@ -33,7 +33,7 @@ var esbuild__default = /*#__PURE__*/_interopDefault(esbuild);
 var commonjs__default = /*#__PURE__*/_interopDefault(commonjs);
 
 // src/deploy/base.ts
-var Deployer = class extends chunkHBJIG6EL_cjs.Bundler {
+var Deployer = class extends chunkWUF7W23E_cjs.Bundler {
   deps = new chunkKFOGAPGX_cjs.Deps();
   constructor(args) {
     super(args.name, "DEPLOYER");
@@ -42,7 +42,7 @@ var Deployer = class extends chunkHBJIG6EL_cjs.Bundler {
   getEnvFiles() {
     const possibleFiles = [".env.production", ".env.local", ".env"];
     try {
-      const fileService = new chunkAXUXJ2OU_cjs.FileService();
+      const fileService = new chunk7GYBZLVN_cjs.FileService();
       const envFile = fileService.getFirstExistingFile(possibleFiles);
       return Promise.resolve([envFile]);
     } catch {
@@ -95,18 +95,18 @@ function getDeployerBundler(entryFile) {
     },
     treeshake: "smallest",
     plugins: [
-      commonjs__default.default({
-        extensions: [".js", ".ts"],
-        strictRequires: "strict",
-        transformMixedEsModules: true,
-        ignoreTryCatch: false
-      }),
       // transpile typescript to something we understand
       esbuild__default.default({
         target: "node20",
         platform: "node",
         minify: false
       }),
+      commonjs__default.default({
+        extensions: [".js", ".ts"],
+        strictRequires: "strict",
+        transformMixedEsModules: true,
+        ignoreTryCatch: false
+      }),
       {
         name: "get-deployer",
         transform(code, id) {
@@ -160,6 +160,7 @@ function getDeployerBundler(entryFile) {
   });
 }
 async function getDeployer(entryFile, outputDir) {
+  console.log("entryFile", entryFile);
   const bundle = await getDeployerBundler(entryFile);
   await bundle.write({
     dir: outputDir,
@@ -171,7 +172,7 @@ async function getDeployer(entryFile, outputDir) {
 
 Object.defineProperty(exports, "FileService", {
   enumerable: true,
-  get: function () { return chunkAXUXJ2OU_cjs.FileService; }
+  get: function () { return chunk7GYBZLVN_cjs.FileService; }
 });
 Object.defineProperty(exports, "Deps", {
   enumerable: true,

package/dist/index.js

@@ -1,6 +1,6 @@
-import { FileService } from './chunk-YE3YSKC6.js';
-export { FileService } from './chunk-YE3YSKC6.js';
-import { Bundler } from './chunk-7J2ZTGHM.js';
+import { FileService } from './chunk-PUX2FDGX.js';
+export { FileService } from './chunk-PUX2FDGX.js';
+import { Bundler } from './chunk-CS5NGTWK.js';
 import { Deps, recursiveRemoveNonReferencedNodes } from './chunk-ZAXXMFXX.js';
 export { Deps, createChildProcessLogger, createPinoStream } from './chunk-ZAXXMFXX.js';
 import * as babel from '@babel/core';
@@ -72,18 +72,18 @@ function getDeployerBundler(entryFile) {
     },
     treeshake: "smallest",
     plugins: [
-      commonjs({
-        extensions: [".js", ".ts"],
-        strictRequires: "strict",
-        transformMixedEsModules: true,
-        ignoreTryCatch: false
-      }),
       // transpile typescript to something we understand
       esbuild({
         target: "node20",
         platform: "node",
         minify: false
       }),
+      commonjs({
+        extensions: [".js", ".ts"],
+        strictRequires: "strict",
+        transformMixedEsModules: true,
+        ignoreTryCatch: false
+      }),
       {
         name: "get-deployer",
         transform(code, id) {
@@ -137,6 +137,7 @@ function getDeployerBundler(entryFile) {
   });
 }
 async function getDeployer(entryFile, outputDir) {
+  console.log("entryFile", entryFile);
   const bundle = await getDeployerBundler(entryFile);
   await bundle.write({
     dir: outputDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/deployer",
-  "version": "0.2.4-alpha.0",
+  "version": "0.2.4",
   "description": "",
   "type": "module",
   "files": [
@@ -95,7 +95,7 @@
     "rollup-plugin-node-externals": "^8.0.0",
     "typescript-paths": "^1.5.1",
     "zod": "^3.24.2",
-    "@mastra/core": "^0.6.4-alpha.0"
+    "@mastra/core": "^0.6.4"
   },
   "devDependencies": {
     "@hono/node-server": "^1.13.8",