vercel 50.25.3 → 50.25.4

package/dist/chunks/{chunk-AQ443YWV.js → chunk-7PX7XQE5.js}

@@ -23,7 +23,7 @@ import {
 } from "./chunk-KY2ZFZU3.js";
 import {
   CommandTimeout
-} from "./chunk-5H72X3JL.js";
+} from "./chunk-GEECDT5M.js";
 import {
   require_dist as require_dist3
 } from "./chunk-5UCDAO2E.js";

package/dist/chunks/{chunk-5H72X3JL.js → chunk-GEECDT5M.js}

@@ -2367,13 +2367,25 @@ var discoverSubcommand = {
   name: "discover",
   aliases: [],
   description: "Discover available marketplace integrations",
-  arguments: [],
+  arguments: [
+    {
+      name: "query",
+      required: false
+    }
+  ],
   options: [formatOption, jsonOption],
   examples: [
     {
       name: "Discover marketplace integrations",
       value: [`${packageName} integration discover`]
     },
+    {
+      name: "Search for integrations matching a query",
+      value: [
+        `${packageName} integration discover postgres`,
+        `${packageName} integration discover aws`
+      ]
+    },
     {
       name: "Discover marketplace integrations as JSON",
       value: [`${packageName} integration discover --format=json`]

package/dist/chunks/{chunk-VHQHLKWP.js → chunk-KH2E2YV4.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-XHZTNEED.js";
 import {
   loginCommand
-} from "./chunk-5H72X3JL.js";
+} from "./chunk-GEECDT5M.js";
 import {
   help
 } from "./chunk-JC42I36Q.js";

package/dist/commands/build/index.js

@@ -812,7 +812,7 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
     try {
       const { builder, pkg: builderPkg } = builderWithPkg;
       const service = hasDetectedServices ? servicesByBuilderSrc.get(build.src) : void 0;
-      const stripServiceRoutePrefix = !!service?.routePrefix && service?.routePrefix !== "/" && service?.routePrefixSource === "generated";
+      const stripServiceRoutePrefix = !!service?.routePrefix && service.routePrefix !== "/";
       let buildWorkPath = workPath;
       let buildEntrypoint = build.src;
       let buildFiles = filesMap;
@@ -1007,7 +1007,33 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
           allServices: detectedServices
         });
       }
-      buildResults.set(build, buildResult);
+      let mergedBuildResult = buildResult;
+      if ("buildOutputPath" in buildResult) {
+        const buildOutputConfigPath = join2(
+          buildResult.buildOutputPath,
+          "config.json"
+        );
+        const buildOutputConfig = await readJSONFile(
+          buildOutputConfigPath
+        );
+        if (buildOutputConfig instanceof CantParseJSONFile) {
+          throw buildOutputConfig;
+        }
+        if (buildOutputConfig) {
+          if (buildOutputConfig.overrides) {
+            overrides.push(buildOutputConfig.overrides);
+          }
+          if (hasDetectedServices && service && Array.isArray(buildOutputConfig.routes) && detectedServices) {
+            buildOutputConfig.routes = scopeRoutesToServiceOwnership({
+              routes: buildOutputConfig.routes,
+              owner: service,
+              allServices: detectedServices
+            });
+          }
+          mergedBuildResult = buildOutputConfig;
+        }
+      }
+      buildResults.set(build, mergedBuildResult);
       let buildOutputLength = 0;
       if ("output" in buildResult) {
         buildOutputLength = Array.isArray(buildResult.output) ? buildResult.output.length : 1;
@@ -1109,13 +1135,6 @@ async function doBuild(client, project, buildsJson, cwd, outputDir, span, standa
     if (existingConfig.overrides) {
       overrides.push(existingConfig.overrides);
     }
-    for (const [build, buildResult] of buildResults.entries()) {
-      if ("buildOutputPath" in buildResult) {
-        output_manager_default.debug(`Using "config.json" for "${build.use}`);
-        buildResults.set(build, existingConfig);
-        break;
-      }
-    }
   }
   const builderRoutes = Array.from(
     buildResults.entries()

package/dist/commands/deploy/index.js

@@ -13,7 +13,7 @@ import {
   purchaseDomainIfAvailable,
   require_cjs,
   setupDomain
-} from "../../chunks/chunk-AQ443YWV.js";
+} from "../../chunks/chunk-7PX7XQE5.js";
 import {
   readLocalConfig
 } from "../../chunks/chunk-XHZTNEED.js";
@@ -38,7 +38,7 @@ import {
   deprecatedArchiveSplitTgz,
   getCommandAliases,
   initSubcommand
-} from "../../chunks/chunk-5H72X3JL.js";
+} from "../../chunks/chunk-GEECDT5M.js";
 import "../../chunks/chunk-LTTGCN2M.js";
 import "../../chunks/chunk-VZ2TAK5O.js";
 import "../../chunks/chunk-CNPRAFKN.js";

package/dist/commands/dev/index.js

@@ -17611,15 +17611,16 @@ function createServiceLogger(serviceName, colorIndex, maxNameLength) {
   const color = SERVICE_COLORS[colorIndex % SERVICE_COLORS.length];
   const padding = " ".repeat(maxNameLength - serviceName.length);
   const prefix = color(`[${serviceName}]`) + padding;
-  const createTransform = () => {
+  const createTransform = (streamLabel) => {
     let buffer = "";
+    const labelPrefix = output_manager_default.debugEnabled ? `${prefix} ${import_chalk.default.gray(`(${streamLabel})`)}` : prefix;
     return new Transform({
       transform(chunk, _encoding, callback) {
         buffer += chunk.toString();
         const lines = buffer.split("\n");
         buffer = lines.pop() || "";
         if (lines.length > 0) {
-          const prefixed = lines.map((line) => `${prefix} ${line}`).join("\n");
+          const prefixed = lines.map((line) => `${labelPrefix} ${line}`).join("\n");
           callback(null, prefixed + "\n");
         } else {
           callback(null, "");
@@ -17627,7 +17628,7 @@ function createServiceLogger(serviceName, colorIndex, maxNameLength) {
       },
       flush(callback) {
         if (buffer) {
-          callback(null, `${prefix} ${buffer}
+          callback(null, `${labelPrefix} ${buffer}
 `);
         } else {
           callback(null, "");
@@ -17635,8 +17636,8 @@ function createServiceLogger(serviceName, colorIndex, maxNameLength) {
       }
     });
   };
-  const stdout = createTransform();
-  const stderr = createTransform();
+  const stdout = createTransform("stdout");
+  const stderr = createTransform("stderr");
   stdout.pipe(process.stdout);
   stderr.pipe(process.stderr);
   const cleanup = () => {
@@ -17778,9 +17779,7 @@ var ServicesOrchestrator = class {
     );
     if (service.routePrefix && service.routePrefix !== "/") {
       env.VERCEL_SERVICE_ROUTE_PREFIX = service.routePrefix;
-      if (service.routePrefixSource === "generated") {
-        env.VERCEL_SERVICE_ROUTE_PREFIX_STRIP = "1";
-      }
+      env.VERCEL_SERVICE_ROUTE_PREFIX_STRIP = "1";
     }
     const builderSpec = framework?.useRuntime?.use || service.builder?.use;
     if (builderSpec) {

package/dist/commands/env/index.js

@@ -28,7 +28,7 @@ import {
 } from "../../chunks/chunk-YPQSDAEW.js";
 import {
   getCommandAliases
-} from "../../chunks/chunk-5H72X3JL.js";
+} from "../../chunks/chunk-GEECDT5M.js";
 import "../../chunks/chunk-LTTGCN2M.js";
 import "../../chunks/chunk-VZ2TAK5O.js";
 import "../../chunks/chunk-CNPRAFKN.js";

package/dist/commands/link/index.js

@@ -11,7 +11,7 @@ import {
   addSubcommand6 as addSubcommand,
   getCommandAliases,
   linkCommand
-} from "../../chunks/chunk-5H72X3JL.js";
+} from "../../chunks/chunk-GEECDT5M.js";
 import "../../chunks/chunk-LTTGCN2M.js";
 import "../../chunks/chunk-VZ2TAK5O.js";
 import "../../chunks/chunk-CNPRAFKN.js";

package/dist/commands-bulk.js

@@ -52,7 +52,7 @@ import {
   did_you_mean_default,
   executeUpgrade,
   login
-} from "./chunks/chunk-VHQHLKWP.js";
+} from "./chunks/chunk-KH2E2YV4.js";
 import {
   getUpdateCommand,
   isGlobal
@@ -78,7 +78,7 @@ import {
   require_format,
   require_jsonlines,
   setupDomain
-} from "./chunks/chunk-AQ443YWV.js";
+} from "./chunks/chunk-7PX7XQE5.js";
 import {
   processRevocationResponse,
   require_open,
@@ -267,7 +267,7 @@ import {
   v0Subcommand,
   webhooksCommand,
   whoamiCommand
-} from "./chunks/chunk-5H72X3JL.js";
+} from "./chunks/chunk-GEECDT5M.js";
 import {
   addSubcommand as addSubcommand8,
   deleteSubcommand,
@@ -15549,6 +15549,14 @@ var IntegrationDiscoverTelemetryClient = class extends TelemetryClient {
       this.trackCliFlag("json");
     }
   }
+  trackCliArgumentQuery(v) {
+    if (v) {
+      this.trackCliArgument({
+        arg: "query",
+        value: this.redactedValue
+      });
+    }
+  }
 };
 
 // src/util/integration/fetch-marketplace-integrations-list.ts
@@ -15603,12 +15611,14 @@ async function discover(client, args) {
       store: client.telemetryEventStore
     }
   });
-  if (parsedArguments.args.length > 0) {
+  if (parsedArguments.args.length > 1) {
     output_manager_default.error(
-      "Invalid number of arguments. Usage: `vercel integration discover`"
+      "Invalid number of arguments. Usage: `vercel integration discover [query]`"
     );
     return 1;
   }
+  const query = parsedArguments.args[0] ?? "";
+  telemetry2.trackCliArgumentQuery(query);
   const formatResult = validateJsonOutput(parsedArguments.flags);
   if (!formatResult.valid) {
     output_manager_default.error(formatResult.error);
@@ -15676,11 +15686,12 @@ async function discover(client, args) {
     }
   }
   output_manager_default.stopSpinner();
+  const filtered = query ? results.filter((product) => matchesSearchTerm(product, query)) : results;
   if (asJson) {
     client.stdout.write(
       `${JSON.stringify(
         {
-          products: results
+          products: filtered
         },
         null,
         2
@@ -15689,12 +15700,16 @@ async function discover(client, args) {
     );
     return 0;
   }
-  if (results.length === 0) {
-    output_manager_default.log("No marketplace products found.");
+  if (filtered.length === 0) {
+    if (query) {
+      output_manager_default.log(`No marketplace products matching "${query}" found.`);
+    } else {
+      output_manager_default.log("No marketplace products found.");
+    }
     return 0;
   }
   const useCompactFormat = client.stderr.columns > 0 && client.stderr.columns < 120;
-  const formattedOutput = useCompactFormat ? formatCompactList(results) : formatTable2(results);
+  const formattedOutput = useCompactFormat ? formatCompactList(filtered) : formatTable2(filtered);
   output_manager_default.log("Available marketplace products:\n" + formattedOutput);
   return 0;
 }
@@ -15714,6 +15729,10 @@ function formatTable2(products) {
     { hsep: 4 }
   );
 }
+function matchesSearchTerm(product, term) {
+  const lower = term.toLowerCase();
+  return product.name.toLowerCase().includes(lower) || product.slug.toLowerCase().includes(lower) || product.provider.toLowerCase().includes(lower) || product.description.toLowerCase().includes(lower) || product.tags.some((tag) => tag.toLowerCase().includes(lower));
+}
 function formatCompactList(products) {
   return products.map((product) => {
     return [

package/dist/index.js

@@ -15,7 +15,7 @@ import {
   did_you_mean_default,
   executeUpgrade,
   login
-} from "./chunks/chunk-VHQHLKWP.js";
+} from "./chunks/chunk-KH2E2YV4.js";
 import {
   getUpdateCommand
 } from "./chunks/chunk-MRMQ6KI4.js";
@@ -37,7 +37,7 @@ import {
 import {
   commandNames,
   commands
-} from "./chunks/chunk-5H72X3JL.js";
+} from "./chunks/chunk-GEECDT5M.js";
 import "./chunks/chunk-LTTGCN2M.js";
 import "./chunks/chunk-VZ2TAK5O.js";
 import "./chunks/chunk-CNPRAFKN.js";

package/dist/version.mjs

@@ -1 +1 @@
-export const version = "50.25.3";
+export const version = "50.25.4";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "50.25.3",
+  "version": "50.25.4",
   "type": "module",
   "preferGlobal": true,
   "license": "Apache-2.0",
@@ -30,26 +30,26 @@
     "jose": "5.9.6",
     "luxon": "^3.4.0",
     "proxy-agent": "6.4.0",
+    "@vercel/build-utils": "13.6.1",
     "@vercel/detect-agent": "1.1.0",
     "@vercel/backends": "0.0.39",
-    "@vercel/build-utils": "13.6.1",
     "@vercel/express": "0.1.51",
+    "@vercel/elysia": "0.1.42",
     "@vercel/fastify": "0.1.45",
     "@vercel/go": "3.4.3",
     "@vercel/h3": "0.1.51",
     "@vercel/hono": "0.2.45",
     "@vercel/hydrogen": "1.3.5",
+    "@vercel/koa": "0.1.25",
     "@vercel/nestjs": "0.2.46",
     "@vercel/next": "4.15.36",
-    "@vercel/koa": "0.1.25",
     "@vercel/node": "5.6.9",
-    "@vercel/python": "6.18.1",
-    "@vercel/remix-builder": "5.6.0",
-    "@vercel/elysia": "0.1.42",
     "@vercel/redwood": "2.4.9",
+    "@vercel/python": "6.19.0",
+    "@vercel/remix-builder": "5.6.0",
     "@vercel/ruby": "2.3.2",
-    "@vercel/rust": "1.0.5",
-    "@vercel/static-build": "2.8.43"
+    "@vercel/static-build": "2.8.43",
+    "@vercel/rust": "1.0.5"
   },
   "devDependencies": {
     "@alex_neo/jest-expect-message": "1.0.5",
@@ -179,12 +179,12 @@
     "yauzl-promise": "2.1.3",
     "@vercel-internals/constants": "1.0.4",
     "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "3.0.6",
     "@vercel/client": "17.2.50",
     "@vercel/error-utils": "2.0.3",
     "@vercel/frameworks": "3.19.1",
-    "@vercel/fs-detectors": "5.8.13",
-    "@vercel/routing-utils": "6.0.1"
+    "@vercel-internals/types": "3.0.6",
+    "@vercel/routing-utils": "6.0.1",
+    "@vercel/fs-detectors": "5.8.13"
   },
   "scripts": {
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail",