vercel 58.4.4 → 58.7.0

package/dist/commands/build/index.js

@@ -6,37 +6,39 @@ const __filename = __fileURLToPath(import.meta.url);
 const __dirname = __dirname_(__filename);
 import {
   OUTPUT_DIR,
-  formatResolvedBuilders,
   getStaticServiceSchedules,
-  importBuilders,
   isLambda,
   staticFiles,
   writeBuildResult
-} from "../../chunks/chunk-ZGBBPJ6B.js";
+} from "../../chunks/chunk-4XKF7JOF.js";
+import {
+  formatResolvedBuilders,
+  importBuilders
+} from "../../chunks/chunk-LC5BYUUP.js";
 import {
   pullCommandLogic
-} from "../../chunks/chunk-2MAPZXVV.js";
+} from "../../chunks/chunk-62SBYAED.js";
 import {
   require_semver
 } from "../../chunks/chunk-IB5L4LKZ.js";
 import {
   pickOverrides,
   readProjectSettings
-} from "../../chunks/chunk-M5NOLAJ4.js";
+} from "../../chunks/chunk-BIGFTNW6.js";
 import "../../chunks/chunk-R6IGDGX3.js";
-import "../../chunks/chunk-NJUPUGOE.js";
+import "../../chunks/chunk-HT2XWSAJ.js";
 import {
   stamp_default
 } from "../../chunks/chunk-64IF634X.js";
 import "../../chunks/chunk-VXYGCOKL.js";
 import {
   ensureLink
-} from "../../chunks/chunk-2FMPLU44.js";
-import "../../chunks/chunk-UE3JUVUZ.js";
-import "../../chunks/chunk-CPFNFVCL.js";
+} from "../../chunks/chunk-7KUQ7BHI.js";
+import "../../chunks/chunk-74XVGG52.js";
+import "../../chunks/chunk-UME4MVFU.js";
 import {
   buildCommand
-} from "../../chunks/chunk-YCPUAG77.js";
+} from "../../chunks/chunk-CDYBV7YA.js";
 import {
   help
 } from "../../chunks/chunk-ZX2FSPWV.js";
@@ -64,7 +66,7 @@ import {
   resolveProjectCwd,
   ua_default,
   validateConfig
-} from "../../chunks/chunk-4CCY5OPH.js";
+} from "../../chunks/chunk-NZ6GDMPB.js";
 import {
   TelemetryClient
 } from "../../chunks/chunk-ECCWJHC6.js";
@@ -73,6 +75,7 @@ import {
   AGENT_STATUS,
   outputAgentError
 } from "../../chunks/chunk-TJJ562C5.js";
+import "../../chunks/chunk-GGP5R3FU.js";
 import {
   printError,
   toEnumerableError
@@ -99,7 +102,6 @@ import {
   output_manager_default,
   prependEmoji
 } from "../../chunks/chunk-OX7KI3LF.js";
-import "../../chunks/chunk-GGP5R3FU.js";
 import {
   require_source
 } from "../../chunks/chunk-S7KYDPEM.js";
@@ -319,11 +321,11 @@ async function detectFirstDeploymentFramework(options) {
     ...detected.detectedVersion && { version: detected.detectedVersion }
   };
 }
-async function detectAllFrameworks(workPath) {
+async function detectAllFrameworks(workPath, customFrameworkList) {
   logDebug(`Framework cross-check: detecting frameworks at "${workPath}"`);
   const frameworks = await (0, import_fs_detectors2.detectFrameworks)({
     fs: new import_fs_detectors2.LocalFileSystemDetector(workPath),
-    frameworkList: import_frameworks.frameworkList
+    frameworkList: customFrameworkList ?? import_frameworks.frameworkList
   });
   const slugs = frameworks.map((f) => f.slug).filter((slug) => Boolean(slug));
   logDebug(`Framework cross-check: detected [${slugs.join(", ") || "<none>"}]`);
@@ -3556,11 +3558,12 @@ async function writeManifests(packageManifests, diagnostics, ops, outputDir) {
     builderUse
   } of packageManifests) {
     const key = `${builderUse}:${workspace}`;
+    const framework = service?.framework ?? buildConfig.framework ?? manifest.framework;
     projectManifest[key] = {
       ...manifest,
       workspace,
       builder: builderUse,
-      framework: service?.framework ?? buildConfig.framework,
+      framework,
       serviceName: service?.name,
       serviceType: service && isExperimentalService(service) ? service.type : void 0,
       routePrefix: service && isExperimentalService(service) ? service.routePrefix : void 0
@@ -3568,6 +3571,7 @@ async function writeManifests(packageManifests, diagnostics, ops, outputDir) {
     const { version: _version, ...manifestWithoutVersion } = manifest;
     deployManifestBuilds[key] = {
       ...manifestWithoutVersion,
+      framework,
       root: workspace,
       builder: builderUse
     };
@@ -4318,6 +4322,7 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
   }
   const diagnostics = {};
   const packageManifests = [];
+  const apiDirFrameworkDetector = createApiDirFrameworkDetector();
   const getHasDetectedServices = () => detectedResolvedServices !== void 0 && detectedResolvedServices.length > 0;
   const synthesizedServiceCrons = [];
   const serviceByBuilder = /* @__PURE__ */ new Map();
@@ -4383,6 +4388,10 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
         }
         const isFrontendBuilder = build.config && "framework" in build.config;
         const builderFramework = build.config?.framework ?? projectSettings.framework;
+        const apiDirFramework = isZeroConfig && !service && !isFrontendBuilder ? await apiDirFrameworkDetector.detect(
+          build.use ?? "",
+          buildWorkPath
+        ) : void 0;
         let buildConfig;
         if (isZeroConfig) {
           if (service) {
@@ -4416,7 +4425,7 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
               installCommand: projectSettings.installCommand ?? void 0,
               devCommand: projectSettings.devCommand ?? void 0,
               buildCommand: projectSettings.buildCommand ?? void 0,
-              framework: projectSettings.framework,
+              framework: isFrontendBuilder ? projectSettings.framework : void 0,
               nodeVersion: projectSettings.nodeVersion,
               bunVersion: localConfig.bunVersion ?? void 0
             };
@@ -4545,14 +4554,22 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
                       );
                     } else {
                       const workspace = service && serviceWorkspace && serviceWorkspace !== "." ? serviceWorkspace : ".";
-                      packageManifests.push({
-                        workspace,
-                        key: fullKey,
-                        buildConfig,
-                        manifest: packageManifest,
-                        service,
-                        builderUse: builderPkg.name
-                      });
+                      const alreadyPushed = packageManifests.some(
+                        (m) => m.builderUse === builderPkg.name && m.workspace === workspace
+                      );
+                      if (!alreadyPushed) {
+                        packageManifests.push({
+                          workspace,
+                          key: fullKey,
+                          buildConfig,
+                          manifest: {
+                            ...packageManifest,
+                            framework: packageManifest.framework ?? apiDirFramework
+                          },
+                          service,
+                          builderUse: builderPkg.name
+                        });
+                      }
                     }
                   } catch (e) {
                     output_manager_default.debug(
@@ -5578,6 +5595,30 @@ async function writeFlagsJSON(buildResults, outputDir) {
     await import_fs_extra3.default.writeJSON(flagsFilePath, flags, { spaces: 2 });
   }
 }
+function createApiDirFrameworkDetector() {
+  const cache = /* @__PURE__ */ new Map();
+  return {
+    detect(builderUse, workPath) {
+      const cacheKey = `${builderUse}:${workPath}`;
+      let cached = cache.get(cacheKey);
+      if (!cached) {
+        cached = detectApiDirFramework(builderUse, workPath);
+        cache.set(cacheKey, cached);
+      }
+      return cached;
+    }
+  };
+}
+async function detectApiDirFramework(builderUse, workPath) {
+  const runtimeFrameworks = import_fs_detectors3.builderToFrameworks.get(builderUse) ?? [];
+  if (runtimeFrameworks.length === 0)
+    return void 0;
+  const detectedSlugs = await detectAllFrameworks(
+    workPath,
+    runtimeFrameworks
+  ).catch(() => []);
+  return detectedSlugs.length === 1 ? detectedSlugs[0] : void 0;
+}
 async function writeBuildJson(buildsJson, outputDir) {
   await import_fs_extra3.default.writeJSON(join5(outputDir, "builds.json"), buildsJson, { spaces: 2 });
 }

package/dist/commands/deploy/index.js

@@ -13,11 +13,12 @@ import {
   purchaseDomainIfAvailable,
   require_cjs,
   setupDomain
-} from "../../chunks/chunk-IEDUCUDV.js";
+} from "../../chunks/chunk-UAVZOOOL.js";
 import "../../chunks/chunk-PRWJUY5U.js";
+import "../../chunks/chunk-I2XE3GMB.js";
 import {
   readLocalConfig
-} from "../../chunks/chunk-SJYAUEZR.js";
+} from "../../chunks/chunk-MNZUPMZZ.js";
 import {
   highlight
 } from "../../chunks/chunk-V5P25P7F.js";
@@ -37,7 +38,7 @@ import {
   deprecatedArchiveSplitTgz,
   getCommandAliases,
   initSubcommand
-} from "../../chunks/chunk-3QAUXPIR.js";
+} from "../../chunks/chunk-ZZZEJXHD.js";
 import "../../chunks/chunk-AW5YINX6.js";
 import "../../chunks/chunk-A5KP5HAI.js";
 import "../../chunks/chunk-J6LK45HT.js";
@@ -46,27 +47,27 @@ import "../../chunks/chunk-CSJBZKC5.js";
 import "../../chunks/chunk-M22O6CYY.js";
 import "../../chunks/chunk-4LDQIDRM.js";
 import "../../chunks/chunk-3KNPVXJ3.js";
-import "../../chunks/chunk-MAHXF73X.js";
-import "../../chunks/chunk-4UYKSYKQ.js";
+import "../../chunks/chunk-3L2YLLHC.js";
+import "../../chunks/chunk-UMA66MKW.js";
 import "../../chunks/chunk-7QVJTI5H.js";
 import "../../chunks/chunk-O5GNPPTU.js";
 import {
   pickOverrides
-} from "../../chunks/chunk-M5NOLAJ4.js";
-import "../../chunks/chunk-NJUPUGOE.js";
+} from "../../chunks/chunk-BIGFTNW6.js";
+import "../../chunks/chunk-HT2XWSAJ.js";
 import {
   stamp_default
 } from "../../chunks/chunk-64IF634X.js";
 import "../../chunks/chunk-VXYGCOKL.js";
 import {
   ensureLink
-} from "../../chunks/chunk-2FMPLU44.js";
+} from "../../chunks/chunk-7KUQ7BHI.js";
 import {
   validatePaths,
   validateRootDirectory
-} from "../../chunks/chunk-UE3JUVUZ.js";
-import "../../chunks/chunk-CPFNFVCL.js";
-import "../../chunks/chunk-YCPUAG77.js";
+} from "../../chunks/chunk-74XVGG52.js";
+import "../../chunks/chunk-UME4MVFU.js";
+import "../../chunks/chunk-CDYBV7YA.js";
 import {
   help
 } from "../../chunks/chunk-ZX2FSPWV.js";
@@ -86,7 +87,7 @@ import {
   require_dist as require_dist2,
   require_frameworks,
   require_lib
-} from "../../chunks/chunk-4CCY5OPH.js";
+} from "../../chunks/chunk-NZ6GDMPB.js";
 import {
   TelemetryClient
 } from "../../chunks/chunk-ECCWJHC6.js";
@@ -95,6 +96,9 @@ import {
   outputAgentError,
   withGlobalFlags
 } from "../../chunks/chunk-TJJ562C5.js";
+import {
+  require_ms
+} from "../../chunks/chunk-GGP5R3FU.js";
 import {
   printError
 } from "../../chunks/chunk-KBEX5MYS.js";
@@ -138,9 +142,6 @@ import {
   prependEmoji,
   require_dist
 } from "../../chunks/chunk-OX7KI3LF.js";
-import {
-  require_ms
-} from "../../chunks/chunk-GGP5R3FU.js";
 import {
   require_source
 } from "../../chunks/chunk-S7KYDPEM.js";
@@ -768,7 +769,10 @@ async function handleInitDeployment(client, telemetryClient) {
     }
   }
   const meta = Object.assign({}, parseMeta(localConfig.meta), cliMeta);
-  const gitMetadata = await createGitMeta(cwd, project);
+  const gitMetadata = await createGitMeta(
+    join2(cwd, project.rootDirectory || ""),
+    project
+  );
   const deploymentEnv = Object.assign(
     {},
     parseEnv(localConfig.env),
@@ -1539,7 +1543,10 @@ async function handleDefaultDeploy(client, telemetryClient) {
     }
   }
   const meta = Object.assign({}, parseMeta(localConfig.meta), cliMeta);
-  const gitMetadata = await createGitMeta(cwd, project);
+  const gitMetadata = await createGitMeta(
+    join2(cwd, project.rootDirectory || ""),
+    project
+  );
   const deploymentEnv = Object.assign(
     {},
     parseEnv(localConfig.env),

package/dist/commands/dev/index.js

@@ -9,7 +9,7 @@ import {
 } from "../../chunks/chunk-2HSQ7YUK.js";
 import {
   getUpdateCommand
-} from "../../chunks/chunk-NJ6QXKQD.js";
+} from "../../chunks/chunk-H3KETQAA.js";
 import {
   highlight
 } from "../../chunks/chunk-V5P25P7F.js";
@@ -22,24 +22,26 @@ import {
 import {
   OUTPUT_DIR,
   getStaticServiceSchedules,
-  importBuilders,
   require_mime_types,
-  require_npa,
   staticFiles
-} from "../../chunks/chunk-ZGBBPJ6B.js";
+} from "../../chunks/chunk-4XKF7JOF.js";
+import {
+  importBuilders,
+  require_npa
+} from "../../chunks/chunk-LC5BYUUP.js";
 import "../../chunks/chunk-IB5L4LKZ.js";
 import {
   pickOverrides
-} from "../../chunks/chunk-M5NOLAJ4.js";
+} from "../../chunks/chunk-BIGFTNW6.js";
 import "../../chunks/chunk-R6IGDGX3.js";
 import {
   displayDetectedServices,
   readConfig,
   setupAndLink
-} from "../../chunks/chunk-UE3JUVUZ.js";
+} from "../../chunks/chunk-74XVGG52.js";
 import {
   getLocalPathConfig
-} from "../../chunks/chunk-CPFNFVCL.js";
+} from "../../chunks/chunk-UME4MVFU.js";
 import {
   help
 } from "../../chunks/chunk-ZX2FSPWV.js";
@@ -70,7 +72,7 @@ import {
   resolveProjectCwd,
   tryDetectServices,
   validateConfig
-} from "../../chunks/chunk-4CCY5OPH.js";
+} from "../../chunks/chunk-NZ6GDMPB.js";
 import {
   TelemetryClient
 } from "../../chunks/chunk-ECCWJHC6.js";
@@ -78,6 +80,9 @@ import {
   buildCommandWithYes,
   outputActionRequired
 } from "../../chunks/chunk-TJJ562C5.js";
+import {
+  require_ms
+} from "../../chunks/chunk-GGP5R3FU.js";
 import {
   printError
 } from "../../chunks/chunk-KBEX5MYS.js";
@@ -107,9 +112,6 @@ import {
   output_manager_default,
   require_dist
 } from "../../chunks/chunk-OX7KI3LF.js";
-import {
-  require_ms
-} from "../../chunks/chunk-GGP5R3FU.js";
 import {
   require_source,
   require_supports_color
@@ -18636,7 +18638,6 @@ var ServicesOrchestrator = class {
       env.VERCEL_QUEUE_BASE_URL = `${this.proxyOrigin}/_svc/_queues`;
       env.VERCEL_QUEUE_TOKEN = "vc-dev-token";
       env.VERCEL_REGION = "dev1";
-      env.VERCEL_DEPLOYMENT_ID = "dpl_dev";
     }
     if (service.routePrefix && service.routePrefix !== "/") {
       env.VERCEL_SERVICE_ROUTE_PREFIX = service.routePrefix;
@@ -18700,7 +18701,6 @@ var ServicesOrchestrator = class {
       env.VERCEL_QUEUE_BASE_URL = `${this.proxyOrigin}/_svc/_queues`;
       env.VERCEL_QUEUE_TOKEN = "vc-dev-token";
       env.VERCEL_REGION = "dev1";
-      env.VERCEL_DEPLOYMENT_ID = "dpl_dev";
     }
     const root = service.root || ".";
     return {
@@ -20661,8 +20661,7 @@ Please ensure that ${cmd(err.path)} is properly installed`;
       VERCEL_HAS_WORKER_SERVICES: "1",
       VERCEL_QUEUE_BASE_URL: `${this.address.origin}/_svc/_queues`,
       VERCEL_QUEUE_TOKEN: "vc-dev-token",
-      VERCEL_REGION: "dev1",
-      VERCEL_DEPLOYMENT_ID: "dpl_dev"
+      VERCEL_REGION: "dev1"
     };
   }
   getSidecarDevMeta(match) {
@@ -20981,7 +20980,7 @@ Please ensure that ${cmd(err.path)} is properly installed`;
     return void 0;
   }
   async _getVercelConfig() {
-    const { compileVercelConfig } = await import("../../chunks/compile-vercel-config-U5NRIMZ2.js");
+    const { compileVercelConfig } = await import("../../chunks/compile-vercel-config-PM5ID4CV.js");
     await compileVercelConfig(this.cwd);
     const configPath = getLocalPathConfig(this.cwd);
     const [
@@ -21764,9 +21763,12 @@ ${error_code}
       ...requestTransforms ?? []
     ];
     let responseTransformsToApply = responseTransforms;
+    const lookupUrl = `${lookupPath}${parsed.search || ""}`;
+    let rewrittenUrl;
+    let externalDestUrl;
     if (serviceRoutes.length > 0) {
       const serviceResult = await devRouter(
-        `${lookupPath}${parsed.search || ""}`,
+        lookupUrl,
         req.method,
         serviceRoutes,
         this,
@@ -21797,6 +21799,21 @@ ${error_code}
           res.setHeader(name, value);
         }
       }
+      if (serviceResult.dest) {
+        const destParsed = url3.parse(serviceResult.dest);
+        const destQuery = parseQueryString(destParsed.search);
+        Object.assign(destQuery, serviceResult.query);
+        destParsed.search = formatQueryString(destQuery);
+        const resolvedDest = url3.format(destParsed);
+        if (serviceResult.isDestUrl) {
+          externalDestUrl = resolvedDest;
+        } else if (resolvedDest !== lookupUrl) {
+          rewrittenUrl = resolvedDest;
+        }
+      }
+    }
+    if (rewrittenUrl !== void 0) {
+      req.url = rewrittenUrl;
     }
     for (const [name, value] of Object.entries(proxyHeaders)) {
       req.headers[name] = value;
@@ -21807,7 +21824,13 @@ ${error_code}
       responseTransformsToApply
     );
     this.setResponseHeaders(res, requestId);
-    debug(`Delegating to service "${serviceName}": ${origin}`);
+    if (externalDestUrl) {
+      debug(
+        `Service "${serviceName}" rewrite to external URL: ${externalDestUrl}`
+      );
+      return proxyPass(req, res, externalDestUrl, this, requestId);
+    }
+    debug(`Delegating to service "${serviceName}": ${origin}${req.url}`);
     return proxyPass(req, res, origin, this, requestId, false);
   }
   async triggerBuild(match, requestPath, req, vercelConfig, previousBuildResult, filesChanged, filesRemoved) {