@mastra/deployer 1.0.0-beta.9 → 1.0.4

package/dist/{chunk-TK2CCU7I.js → chunk-HWSYWSD7.js}

@@ -1,11 +1,12 @@
-import { slash, isDependencyPartOfPackage, getPackageRootPath, getPackageName, getCompiledDepCachePath, rollupSafeName } from './chunk-5CWPEG6R.js';
+import { slash, isDependencyPartOfPackage, isBuiltinModule, getPackageName, getCompiledDepCachePath, rollupSafeName } from './chunk-QAOUDKHK.js';
 import * as babel from '@babel/core';
 import babel__default from '@babel/core';
 import fs, { existsSync } from 'fs';
 import { readFile, writeFile } from 'fs/promises';
 import * as path2 from 'path';
-import path2__default, { dirname, join, normalize, basename as basename$1 } from 'path';
+import path2__default, { dirname, join, relative, normalize, basename as basename$1 } from 'path';
 import { spawn as spawn$1 } from 'child_process';
+import { pathToFileURL, fileURLToPath } from 'url';
 import { rollup } from 'rollup';
 import originalEsbuild from 'rollup-plugin-esbuild';
 import commonjs from '@rollup/plugin-commonjs';
@@ -14,17 +15,16 @@ import stripJsonComments from 'strip-json-comments';
 import { createHandler } from 'typescript-paths';
 import { optimizeLodashImports } from '@optimize-lodash/rollup-plugin';
 import json from '@rollup/plugin-json';
-import { fileURLToPath, pathToFileURL } from 'url';
 import * as pkg from 'empathic/package';
 import { createWorkspacesCache, findWorkspaces, findWorkspacesRoot } from 'find-workspaces';
 import { noopLogger } from '@mastra/core/logger';
 import virtual from '@rollup/plugin-virtual';
 import { builtinModules } from 'module';
+import { getPackageInfo } from 'local-pkg';
 import nodeResolve from '@rollup/plugin-node-resolve';
 import originalEsmShim from '@rollup/plugin-esm-shim';
 import { basename } from 'path/posix';
 import * as resolve from 'resolve.exports';
-import { getPackageInfo } from 'local-pkg';
 import { MastraBaseError, ErrorCategory, ErrorDomain, MastraError } from '@mastra/core/error';
 
 var ValidationError = class extends Error {
@@ -95,7 +95,7 @@ globalThis.__dirname = dirname(__filename);
       "--input-type=module",
       "--enable-source-maps",
       "-e",
-      `${prefixCode};import('file://${slash(file)}').catch(err => {
+      `${prefixCode};import('${pathToFileURL(file).href}').catch(err => {
         ${errorHandler.toString()}
         errorHandler(err);
       })`.replaceAll(/\n/g, "")
@@ -109,87 +109,6 @@ globalThis.__dirname = dirname(__filename);
     }
   );
 }
-function removeAllOptionsFromMastraExcept(result, option, logger) {
-  const t = babel__default.types;
-  return {
-    name: "remove-all-except-" + option + "-config",
-    visitor: {
-      ExportNamedDeclaration: {
-        // remove all exports
-        exit(path3) {
-          path3.remove();
-        }
-      },
-      NewExpression(path3, state) {
-        const varDeclaratorPath = path3.findParent((path4) => t.isVariableDeclarator(path4.node));
-        if (!varDeclaratorPath) {
-          return;
-        }
-        const parentNode = path3.parentPath.node;
-        if (!t.isVariableDeclarator(parentNode) || !t.isIdentifier(parentNode.id) || parentNode.id.name !== "mastra") {
-          return;
-        }
-        let mastraArgs = t.objectExpression([]);
-        if (t.isObjectExpression(path3.node.arguments[0])) {
-          mastraArgs = path3.node.arguments[0];
-        }
-        let configProperty = mastraArgs.properties.find(
-          // @ts-ignore
-          (prop) => prop.key.name === option
-        );
-        let configValue = t.objectExpression([]);
-        const programPath = path3.scope.getProgramParent().path;
-        if (!programPath) {
-          return;
-        }
-        if (configProperty && t.isObjectProperty(configProperty) && t.isExpression(configProperty.value)) {
-          result.hasCustomConfig = true;
-          configValue = configProperty.value;
-          if (t.isIdentifier(configProperty.value) && configProperty.value.name === option) {
-            const configBinding = state.file.scope.getBinding(option);
-            if (configBinding && t.isVariableDeclarator(configBinding.path.node)) {
-              const id = path3.scope.generateUidIdentifier(option);
-              configBinding.path.replaceWith(t.variableDeclarator(id, configBinding.path.node.init));
-              configValue = id;
-            }
-          }
-        }
-        const exportDeclaration = t.exportNamedDeclaration(
-          t.variableDeclaration("const", [t.variableDeclarator(t.identifier(option), configValue)]),
-          []
-        );
-        programPath.node.body.push(exportDeclaration);
-      },
-      Program: {
-        exit(path3) {
-          const hasExport = path3.node.body.some(
-            (node) => node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration"
-          );
-          if (!hasExport) {
-            if (logger) {
-              logger.warn(`Mastra ${option} config could not be extracted. Please make sure your entry file looks like this:
-export const mastra = new Mastra({
-  ${option}: <value>
-})
-
-`);
-            }
-            const fallbackExportDeclaration = t.exportNamedDeclaration(
-              t.variableDeclaration("const", [t.variableDeclarator(t.identifier(option), t.objectExpression([]))]),
-              []
-            );
-            path3.node.body.push(fallbackExportDeclaration);
-          }
-        }
-      }
-    }
-  };
-}
-
-// src/build/babel/remove-all-options-bundler.ts
-function removeAllOptionsExceptBundler(result, logger) {
-  return removeAllOptionsFromMastraExcept(result, "bundler", logger);
-}
 function esbuild(options = {}) {
   return originalEsbuild({
     target: "node20",
@@ -203,7 +122,7 @@ function hasPaths(tsConfigPath) {
   try {
     const content = fs.readFileSync(tsConfigPath, "utf8");
     const config = JSON.parse(stripJsonComments(content));
-    return !!(config.compilerOptions?.paths && Object.keys(config.compilerOptions.paths).length > 0);
+    return !!(config.compilerOptions?.paths && Object.keys(config.compilerOptions.paths).length > 0 || typeof config.extends === "string" && config.extends.length > 0 || Array.isArray(config.extends) && config.extends.length > 0);
   } catch {
     return false;
   }
@@ -407,7 +326,117 @@ function recursiveRemoveNonReferencedNodes(code) {
     );
   });
 }
-function extractMastraOptionBundler(name, entryFile, transformer, result, logger) {
+function removeAllOptionsFromMastraExcept(result, option, logger) {
+  const t = babel__default.types;
+  return {
+    name: "remove-all-except-" + option + "-config",
+    visitor: {
+      ExportNamedDeclaration: {
+        // remove all exports
+        exit(path3) {
+          path3.remove();
+        }
+      },
+      NewExpression(path3, state) {
+        const varDeclaratorPath = path3.findParent((path4) => t.isVariableDeclarator(path4.node));
+        if (!varDeclaratorPath) {
+          return;
+        }
+        const parentNode = path3.parentPath.node;
+        if (!t.isVariableDeclarator(parentNode) || !t.isIdentifier(parentNode.id) || parentNode.id.name !== "mastra") {
+          return;
+        }
+        let mastraArgs = t.objectExpression([]);
+        if (t.isObjectExpression(path3.node.arguments[0])) {
+          mastraArgs = path3.node.arguments[0];
+        }
+        let configProperty = mastraArgs.properties.find(
+          (prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key) && prop.key.name === option
+        );
+        let configValue = t.objectExpression([]);
+        const programPath = path3.scope.getProgramParent().path;
+        if (!programPath) {
+          return;
+        }
+        if (configProperty && t.isObjectProperty(configProperty) && t.isExpression(configProperty.value)) {
+          result.hasCustomConfig = true;
+          configValue = configProperty.value;
+          if (t.isIdentifier(configProperty.value) && configProperty.value.name === option) {
+            const configBinding = state.file.scope.getBinding(option);
+            if (configBinding && t.isVariableDeclarator(configBinding.path.node)) {
+              const id = path3.scope.generateUidIdentifier(option);
+              configBinding.path.replaceWith(t.variableDeclarator(id, configBinding.path.node.init));
+              configValue = id;
+            }
+          }
+        }
+        const exportDeclaration = t.exportNamedDeclaration(
+          t.variableDeclaration("const", [t.variableDeclarator(t.identifier(option), configValue)]),
+          []
+        );
+        programPath.node.body.push(exportDeclaration);
+      },
+      Program: {
+        exit(path3) {
+          const hasExport = path3.node.body.some(
+            (node) => node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration"
+          );
+          if (!hasExport) {
+            if (logger) {
+              logger.warn(`Mastra ${option} config could not be extracted. Please make sure your entry file looks like this:
+export const mastra = new Mastra({
+  ${option}: <value>
+})
+
+`);
+            }
+            const fallbackExportDeclaration = t.exportNamedDeclaration(
+              t.variableDeclaration("const", [t.variableDeclarator(t.identifier(option), t.objectExpression([]))]),
+              []
+            );
+            path3.node.body.push(fallbackExportDeclaration);
+          }
+        }
+      }
+    }
+  };
+}
+
+// src/build/plugins/remove-all-except.ts
+function removeAllOptionsFromMastraExceptPlugin(mastraEntry, name, result, options) {
+  return {
+    name: `remove-${name}`,
+    transform(code, id) {
+      if (id !== mastraEntry) {
+        return;
+      }
+      return new Promise((resolve2, reject) => {
+        babel.transform(
+          code,
+          {
+            babelrc: false,
+            configFile: false,
+            filename: id,
+            plugins: [removeAllOptionsFromMastraExcept(result, name, options?.logger)],
+            sourceMaps: options?.sourcemap
+          },
+          (err, result2) => {
+            if (err) {
+              return reject(err);
+            }
+            resolve2({
+              code: result2.code,
+              map: result2.map
+            });
+          }
+        );
+      });
+    }
+  };
+}
+
+// src/build/shared/extract-mastra-option.ts
+function extractMastraOptionBundler(name, entryFile, result, logger) {
   return rollup({
     logLevel: "silent",
     input: {
@@ -428,34 +457,7 @@ function extractMastraOptionBundler(name, entryFile, transformer, result, logger
         ignoreTryCatch: false
       }),
       json(),
-      {
-        name: `extract-${name}-config`,
-        transform(code, id) {
-          if (id !== entryFile) {
-            return;
-          }
-          return new Promise((resolve2, reject) => {
-            babel.transform(
-              code,
-              {
-                babelrc: false,
-                configFile: false,
-                filename: id,
-                plugins: [transformer(result, logger)]
-              },
-              (err, result2) => {
-                if (err) {
-                  return reject(err);
-                }
-                resolve2({
-                  code: result2.code,
-                  map: result2.map
-                });
-              }
-            );
-          });
-        }
-      },
+      removeAllOptionsFromMastraExceptPlugin(entryFile, name, result, { logger }),
       // let esbuild remove all unused imports
       esbuild(),
       {
@@ -472,11 +474,11 @@ function extractMastraOptionBundler(name, entryFile, transformer, result, logger
     ]
   });
 }
-async function extractMastraOption(name, entryFile, transformer, outputDir, logger) {
+async function extractMastraOption(name, entryFile, outputDir, logger) {
   const result = {
     hasCustomConfig: false
   };
-  const bundler = await extractMastraOptionBundler(name, entryFile, transformer, result, logger);
+  const bundler = await extractMastraOptionBundler(name, entryFile, result, logger);
   const output = await bundler.write({
     dir: outputDir,
     format: "es",
@@ -494,13 +496,7 @@ async function extractMastraOption(name, entryFile, transformer, outputDir, logg
 
 // src/build/bundlerOptions.ts
 async function getBundlerOptions(entryFile, outputDir, logger) {
-  const result = await extractMastraOption(
-    "bundler",
-    entryFile,
-    removeAllOptionsExceptBundler,
-    outputDir,
-    logger
-  );
+  const result = await extractMastraOption("bundler", entryFile, outputDir, logger);
   if (!result) {
     return null;
   }
@@ -569,8 +565,57 @@ function isNodeBuiltin(dep) {
   const [pkg2] = dep.split("/");
   return dep.startsWith("node:") || builtinModules.includes(dep) || builtinModules.includes(pkg2);
 }
+async function getPackageRootPath(packageName, parentPath) {
+  let rootPath;
+  try {
+    let options = void 0;
+    if (parentPath) {
+      if (!parentPath.startsWith("file://")) {
+        parentPath = pathToFileURL(parentPath).href;
+      }
+      options = {
+        paths: [parentPath]
+      };
+    }
+    const pkg2 = await getPackageInfo(packageName, options);
+    rootPath = pkg2?.rootPath ?? null;
+  } catch (e) {
+    rootPath = null;
+  }
+  return rootPath;
+}
+
+// src/build/analyze/constants.ts
+var DEPS_TO_IGNORE = ["#tools"];
+var GLOBAL_EXTERNALS = [
+  "pino",
+  "pino-pretty",
+  "@libsql/client",
+  "pg",
+  "libsql",
+  "#tools",
+  "typescript",
+  "undici",
+  "readable-stream"
+];
+var DEPRECATED_EXTERNALS = ["fastembed", "nodemailer", "jsdom", "sqlite3"];
 function removeDeployer() {
   const t = babel__default.types;
+  function removeDeployerFromObject(objectExpr, scope) {
+    const deployerProp = objectExpr.properties.find(
+      (prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key) && prop.key.name === "deployer"
+    );
+    if (deployerProp) {
+      objectExpr.properties = objectExpr.properties.filter((prop) => prop !== deployerProp);
+      if (t.isIdentifier(deployerProp.value)) {
+        const deployerBinding = scope.getBinding(deployerProp.value.name);
+        if (deployerBinding) {
+          deployerBinding.path?.parentPath?.remove();
+        }
+      }
+    }
+    return deployerProp;
+  }
   return {
     name: "remove-deployer",
     visitor: {
@@ -586,23 +631,30 @@ function removeDeployer() {
         if (!state.hasReplaced) {
           state.hasReplaced = true;
           const newMastraObj = t.cloneNode(path3.node);
-          if (t.isObjectExpression(newMastraObj.arguments[0]) && newMastraObj.arguments[0].properties?.[0]) {
-            const deployer = newMastraObj.arguments[0].properties.find(
-              (prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key) && prop.key.name === "deployer"
-            );
-            if (!deployer) {
-              return;
+          if (t.isObjectExpression(newMastraObj.arguments[0]) && newMastraObj.arguments[0].properties?.length) {
+            const objectArg = newMastraObj.arguments[0];
+            let foundDeployer = false;
+            const directDeployer = removeDeployerFromObject(objectArg, state.file.scope);
+            if (directDeployer) {
+              foundDeployer = true;
             }
-            newMastraObj.arguments[0].properties = newMastraObj.arguments[0].properties.filter(
-              (prop) => prop !== deployer
-            );
-            if (t.isObjectProperty(deployer) && t.isIdentifier(deployer.value)) {
-              const deployerBinding = state.file.scope.getBinding(deployer.value.name);
-              if (deployerBinding) {
-                deployerBinding?.path?.parentPath?.remove();
+            for (const prop of objectArg.properties) {
+              if (t.isSpreadElement(prop) && t.isIdentifier(prop.argument)) {
+                const spreadBinding = state.file.scope.getBinding(prop.argument.name);
+                if (spreadBinding?.path && t.isVariableDeclarator(spreadBinding.path.node)) {
+                  const init = spreadBinding.path.node.init;
+                  if (t.isObjectExpression(init)) {
+                    const spreadDeployer = removeDeployerFromObject(init, state.file.scope);
+                    if (spreadDeployer) {
+                      foundDeployer = true;
+                    }
+                  }
+                }
               }
             }
-            path3.replaceWith(newMastraObj);
+            if (foundDeployer) {
+              path3.replaceWith(newMastraObj);
+            }
           }
         }
       }
@@ -643,21 +695,6 @@ function removeDeployer2(mastraEntry, options) {
   };
 }
 
-// src/build/analyze/constants.ts
-var DEPS_TO_IGNORE = ["#tools"];
-var GLOBAL_EXTERNALS = [
-  "pino",
-  "pino-pretty",
-  "@libsql/client",
-  "pg",
-  "libsql",
-  "#tools",
-  "typescript",
-  "undici",
-  "readable-stream"
-];
-var DEPRECATED_EXTERNALS = ["fastembed", "nodemailer", "jsdom", "sqlite3"];
-
 // src/build/analyze/analyzeEntry.ts
 function getInputPlugins({ entry, isVirtualFile }, mastraEntry, { sourcemapEnabled }) {
   const normalizedMastraEntry = slash(mastraEntry);
@@ -697,7 +734,9 @@ function getInputPlugins({ entry, isVirtualFile }, mastraEntry, { sourcemapEnabl
         transformMixedEsModules: true,
         extensions: [".js", ".ts"]
       }),
-      removeDeployer2(mastraEntry, { sourcemap: sourcemapEnabled }),
+      removeDeployer2(mastraEntry, {
+        sourcemap: sourcemapEnabled
+      }),
       esbuild()
     ]
   );
@@ -987,7 +1026,7 @@ function createVirtualDependencies(depsToOptimize, {
   outputDir,
   bundlerOptions
 }) {
-  const { isDev = false } = bundlerOptions || {};
+  const { isDev = false, externalsPreset = false } = bundlerOptions || {};
   const fileNameToDependencyMap = /* @__PURE__ */ new Map();
   const optimizedDependencyEntries = /* @__PURE__ */ new Map();
   const rootDir = workspaceRoot || projectRoot;
@@ -1019,7 +1058,7 @@ function createVirtualDependencies(depsToOptimize, {
       virtual: virtualFile.join("\n")
     });
   }
-  if (isDev) {
+  if (isDev || externalsPreset) {
     for (const [dep, { isWorkspace, rootPath }] of depsToOptimize.entries()) {
       if (!isWorkspace || !rootPath || !workspaceRoot) {
         continue;
@@ -1076,7 +1115,7 @@ async function getInputPlugins2(virtualDependencies, {
         }
       })
     }) : null,
-    bundlerOptions.isDev ? {
+    bundlerOptions.noBundling ? {
       name: "alias-optimized-deps",
       async resolveId(id, importer, options) {
         if (!virtualDependencies.has(id)) {
@@ -1106,11 +1145,11 @@ async function getInputPlugins2(virtualDependencies, {
       transformMixedEsModules: true,
       ignoreTryCatch: false
     }),
-    bundlerOptions.isDev ? null : nodeResolve({
+    bundlerOptions.noBundling ? null : nodeResolve({
       preferBuiltins: true,
       exportConditions: ["node"]
     }),
-    bundlerOptions.isDev ? esmShim() : null,
+    bundlerOptions.noBundling ? esmShim() : null,
     // hono is imported from deployer, so we need to resolve from here instead of the project root
     aliasHono(),
     json(),
@@ -1163,6 +1202,16 @@ async function buildExternalDependencies(virtualDependencies, {
   if (virtualDependencies.size === 0) {
     return [];
   }
+  const noBundling = bundlerOptions.isDev || bundlerOptions.externalsPreset;
+  const plugins = await getInputPlugins2(virtualDependencies, {
+    transpilePackages: packagesToTranspile,
+    workspaceMap,
+    bundlerOptions: {
+      noBundling
+    },
+    rootDir,
+    externals
+  });
   const bundler = await rollup({
     logLevel: process.env.MASTRA_BUNDLER_DEBUG === "true" ? "debug" : "silent",
     input: Array.from(virtualDependencies.entries()).reduce(
@@ -1173,14 +1222,8 @@ async function buildExternalDependencies(virtualDependencies, {
       {}
     ),
     external: externals,
-    treeshake: bundlerOptions.isDev ? false : "safest",
-    plugins: getInputPlugins2(virtualDependencies, {
-      transpilePackages: packagesToTranspile,
-      workspaceMap,
-      bundlerOptions,
-      rootDir,
-      externals
-    })
+    treeshake: noBundling ? false : "safest",
+    plugins
   });
   const outputDirRelative = prepareEntryFileName(outputDir, rootDir);
   const { output } = await bundler.write({
@@ -1194,7 +1237,7 @@ async function buildExternalDependencies(virtualDependencies, {
      * So we want to write them to the `.mastra/output` folder as well.
      */
     chunkFileNames: (chunkInfo) => {
-      if (bundlerOptions.isDev) {
+      if (noBundling) {
         const importedFromPackages = /* @__PURE__ */ new Set();
         for (const moduleId of chunkInfo.moduleIds) {
           const normalized = slash(moduleId);
@@ -1256,19 +1299,31 @@ function findExternalImporter(module, external, allOutputs) {
 }
 async function bundleExternals(depsToOptimize, outputDir, options) {
   const { workspaceRoot = null, workspaceMap = /* @__PURE__ */ new Map(), projectRoot = outputDir, bundlerOptions = {} } = options;
-  const {
-    externals: customExternals = [],
-    transpilePackages = [],
-    isDev = false} = bundlerOptions || {};
-  const allExternals = [...GLOBAL_EXTERNALS, ...DEPRECATED_EXTERNALS, ...customExternals];
+  const { externals: customExternals = [], transpilePackages = [], isDev = false } = bundlerOptions || {};
+  let externalsPreset = false;
+  if (customExternals === true) {
+    externalsPreset = true;
+  }
+  const externalsList = Array.isArray(customExternals) ? customExternals : [];
+  const allExternals = [...GLOBAL_EXTERNALS, ...DEPRECATED_EXTERNALS, ...externalsList];
   const workspacePackagesNames = Array.from(workspaceMap.keys());
   const packagesToTranspile = /* @__PURE__ */ new Set([...transpilePackages, ...workspacePackagesNames]);
+  const extractedExternals = /* @__PURE__ */ new Map();
+  if (externalsPreset) {
+    for (const [dep, metadata] of depsToOptimize.entries()) {
+      if (!metadata.isWorkspace) {
+        extractedExternals.set(dep, metadata.rootPath ?? dep);
+        depsToOptimize.delete(dep);
+      }
+    }
+  }
   const { optimizedDependencyEntries, fileNameToDependencyMap } = createVirtualDependencies(depsToOptimize, {
     workspaceRoot,
     outputDir,
     projectRoot,
     bundlerOptions: {
-      isDev
+      isDev,
+      externalsPreset
     }
   });
   const output = await buildExternalDependencies(optimizedDependencyEntries, {
@@ -1278,7 +1333,8 @@ async function bundleExternals(depsToOptimize, outputDir, options) {
     rootDir: workspaceRoot || projectRoot,
     outputDir,
     bundlerOptions: {
-      isDev
+      isDev,
+      externalsPreset
     }
   });
   const moduleResolveMap2 = /* @__PURE__ */ new Map();
@@ -1313,6 +1369,14 @@ async function bundleExternals(depsToOptimize, outputDir, options) {
     }
     usedExternals[fullPath] = innerObj;
   }
+  if (extractedExternals.size > 0) {
+    const syntheticPath = path2.join(workspaceRoot || projectRoot, "__externals__");
+    const externalsObj = /* @__PURE__ */ Object.create(null);
+    for (const [dep, rootPath] of extractedExternals) {
+      externalsObj[dep] = rootPath;
+    }
+    usedExternals[syntheticPath] = externalsObj;
+  }
   return { output, fileNameToDependencyMap, usedExternals };
 }
 
@@ -1588,7 +1652,7 @@ async function analyzeBundle(entries, mastraEntry, {
   outputDir,
   projectRoot,
   isDev = false,
-  bundlerOptions: _bundlerOptions
+  bundlerOptions
 }, logger) {
   const mastraConfig = await readFile(mastraEntry, "utf-8");
   const mastraConfigResult = {
@@ -1607,28 +1671,30 @@ export const mastra = new Mastra({
   
 If you think your configuration is valid, please open an issue.`);
   }
-  const { enableEsmShim = true } = _bundlerOptions || {};
-  const bundlerOptions = await getBundlerOptions(mastraEntry, outputDir);
   const { workspaceMap, workspaceRoot } = await getWorkspaceInformation({ mastraEntryFile: mastraEntry });
+  let externalsPreset = false;
+  const userExternals = Array.isArray(bundlerOptions?.externals) ? bundlerOptions?.externals : [];
+  if (bundlerOptions?.externals === true) {
+    externalsPreset = true;
+  }
   let index = 0;
   const depsToOptimize = /* @__PURE__ */ new Map();
-  const { externals: customExternals = [] } = bundlerOptions || {};
-  const allExternals = [...GLOBAL_EXTERNALS, ...customExternals];
+  const allExternals = [...GLOBAL_EXTERNALS, ...userExternals].filter(Boolean);
   logger.info("Analyzing dependencies...");
   const allUsedExternals = /* @__PURE__ */ new Set();
   for (const entry of entries) {
     const isVirtualFile = entry.includes("\n") || !existsSync(entry);
     const analyzeResult = await analyzeEntry({ entry, isVirtualFile }, mastraEntry, {
       logger,
-      sourcemapEnabled: bundlerOptions?.sourcemap ?? false,
+      sourcemapEnabled: bundlerOptions?.enableSourcemap ?? false,
       workspaceMap,
       projectRoot,
-      shouldCheckTransitiveDependencies: isDev
+      shouldCheckTransitiveDependencies: isDev || externalsPreset
     });
     await writeFile(join(outputDir, `entry-${index++}.mjs`), analyzeResult.output.code);
     for (const [dep, metadata] of analyzeResult.dependencies.entries()) {
       const isPartOfExternals = allExternals.some((external) => isDependencyPartOfPackage(dep, external));
-      if (isPartOfExternals) {
+      if (isPartOfExternals || externalsPreset && !metadata.isWorkspace) {
         allUsedExternals.add(dep);
         continue;
       }
@@ -1643,7 +1709,7 @@ If you think your configuration is valid, please open an issue.`);
       }
     }
   }
-  if (isDev) {
+  if (isDev || externalsPreset) {
     for (const [dep, metadata] of depsToOptimize.entries()) {
       if (!metadata.isWorkspace) {
         depsToOptimize.delete(dep);
@@ -1656,14 +1722,36 @@ If you think your configuration is valid, please open an issue.`);
   const { output, fileNameToDependencyMap, usedExternals } = await bundleExternals(depsToOptimize, outputDir, {
     bundlerOptions: {
       ...bundlerOptions,
-      externals: allExternals,
-      enableEsmShim,
+      externals: bundlerOptions?.externals ?? allExternals,
       isDev
     },
     projectRoot,
     workspaceRoot,
     workspaceMap
   });
+  const relativeWorkspaceFolderPaths = Array.from(workspaceMap.values()).map(
+    (pkgInfo) => relative(workspaceRoot || projectRoot, pkgInfo.location)
+  );
+  for (const o of output) {
+    if (o.type === "asset") {
+      continue;
+    }
+    for (const i of o.imports) {
+      if (isBuiltinModule(i)) {
+        continue;
+      }
+      if (i.startsWith(".") || i.startsWith("/")) {
+        continue;
+      }
+      if (relativeWorkspaceFolderPaths.some((workspacePath) => i.startsWith(workspacePath))) {
+        continue;
+      }
+      const pkgName = getPackageName(i);
+      if (pkgName) {
+        allUsedExternals.add(pkgName);
+      }
+    }
+  }
   const result = await validateOutput(
     {
       output,
@@ -1681,6 +1769,6 @@ If you think your configuration is valid, please open an issue.`);
   };
 }
 
-export { aliasHono, analyzeBundle, esbuild, esmShim, extractMastraOption, getBundlerOptions, getWorkspaceInformation, removeAllOptionsFromMastraExcept, removeDeployer2 as removeDeployer, subpathExternalsResolver, tsConfigPaths };
-//# sourceMappingURL=chunk-TK2CCU7I.js.map
-//# sourceMappingURL=chunk-TK2CCU7I.js.map
+export { aliasHono, analyzeBundle, esbuild, esmShim, extractMastraOption, getBundlerOptions, getPackageRootPath, getWorkspaceInformation, removeDeployer2 as removeDeployer, subpathExternalsResolver, tsConfigPaths };
+//# sourceMappingURL=chunk-HWSYWSD7.js.map
+//# sourceMappingURL=chunk-HWSYWSD7.js.map