vercel 35.0.3 → 35.2.0

package/dist/index.js

@@ -96,7 +96,7 @@ var require_dist2 = __commonJS2({
     __export4(src_exports2, {
       errorToString: () => errorToString13,
       isErrnoException: () => isErrnoException21,
-      isError: () => isError14,
+      isError: () => isError15,
       isErrorLike: () => isErrorLike,
       isObject: () => isObject,
       isSpawnError: () => isSpawnError2,
@@ -105,22 +105,22 @@ var require_dist2 = __commonJS2({
     module2.exports = __toCommonJS4(src_exports2);
     var import_node_util = __toESM4(require("util"));
     var isObject = (obj) => typeof obj === "object" && obj !== null;
-    var isError14 = (error4) => {
+    var isError15 = (error4) => {
       return import_node_util.default.types.isNativeError(error4);
     };
     var isErrnoException21 = (error4) => {
-      return isError14(error4) && "code" in error4;
+      return isError15(error4) && "code" in error4;
     };
     var isErrorLike = (error4) => isObject(error4) && "message" in error4;
     var errorToString13 = (error4, fallback) => {
-      if (isError14(error4) || isErrorLike(error4))
+      if (isError15(error4) || isErrorLike(error4))
         return error4.message;
       if (typeof error4 === "string")
         return error4;
       return fallback ?? "An unknown error has ocurred.";
     };
     var normalizeError3 = (error4) => {
-      if (isError14(error4))
+      if (isError15(error4))
         return error4;
       const errorMessage = errorToString13(error4);
       return isErrorLike(error4) ? Object.assign(new Error(errorMessage), error4) : new Error(errorMessage);
@@ -6204,7 +6204,7 @@ var require_error = __commonJS2({
 var require_is = __commonJS2({
   "../../node_modules/.pnpm/@sentry+utils@5.5.0/node_modules/@sentry/utils/dist/is.js"(exports2) {
     Object.defineProperty(exports2, "__esModule", { value: true });
-    function isError14(wat) {
+    function isError15(wat) {
       switch (Object.prototype.toString.call(wat)) {
         case "[object Error]":
           return true;
@@ -6216,7 +6216,7 @@ var require_is = __commonJS2({
           return wat instanceof Error;
       }
     }
-    exports2.isError = isError14;
+    exports2.isError = isError15;
     function isErrorEvent(wat) {
       return Object.prototype.toString.call(wat) === "[object ErrorEvent]";
     }
@@ -30929,10 +30929,10 @@ var require_util2 = __commonJS2({
       return objectToString(d) === "[object Date]";
     }
     exports2.isDate = isDate;
-    function isError14(e2) {
+    function isError15(e2) {
       return objectToString(e2) === "[object Error]" || e2 instanceof Error;
     }
-    exports2.isError = isError14;
+    exports2.isError = isError15;
     function isFunction(arg2) {
       return typeof arg2 === "function";
     }
@@ -62540,7 +62540,7 @@ var require_package = __commonJS2({
   "../client/package.json"(exports2, module2) {
     module2.exports = {
       name: "@vercel/client",
-      version: "13.3.2",
+      version: "13.3.3",
       main: "dist/index.js",
       typings: "dist/index.d.ts",
       homepage: "https://vercel.com",
@@ -62577,7 +62577,7 @@ var require_package = __commonJS2({
         typescript: "4.9.5"
       },
       dependencies: {
-        "@vercel/build-utils": "8.3.4",
+        "@vercel/build-utils": "8.3.5",
         "@vercel/error-utils": "2.0.2",
         "@vercel/routing-utils": "3.1.0",
         "@zeit/fetch": "5.2.0",
@@ -64828,10 +64828,10 @@ var require_util4 = __commonJS2({
       return objectToString(d) === "[object Date]";
     }
     exports2.isDate = isDate;
-    function isError14(e2) {
+    function isError15(e2) {
       return objectToString(e2) === "[object Error]" || e2 instanceof Error;
     }
-    exports2.isError = isError14;
+    exports2.isError = isError15;
     function isFunction(arg2) {
       return typeof arg2 === "function";
     }
@@ -120569,6 +120569,48 @@ var require_frameworks = __commonJS2({
           }
         ]
       },
+      {
+        name: "FastHTML (Experimental)",
+        slug: "fasthtml",
+        demo: "https://fasthtml-template.vercel.app",
+        logo: "https://api-frameworks.vercel.sh/framework-logos/fasthtml.svg",
+        tagline: "The fastest way to create an HTML app",
+        description: "A library for writing fast and scalable Starlette-powered web applications",
+        website: "https://fastht.ml",
+        useRuntime: { src: "main.py", use: "@vercel/python" },
+        detectors: {
+          every: [
+            {
+              path: "main.py"
+            }
+          ]
+        },
+        settings: {
+          installCommand: {
+            placeholder: "`pip install`"
+          },
+          buildCommand: {
+            placeholder: "None",
+            value: null
+          },
+          devCommand: {
+            value: "uvicorn main:app --reload"
+          },
+          outputDirectory: {
+            value: "N/A"
+          }
+        },
+        getOutputDirName: async () => "",
+        defaultRoutes: [
+          {
+            handle: "filesystem"
+          },
+          {
+            src: "/(.*)",
+            dest: "/main"
+          }
+        ]
+      },
       {
         name: "Sanity",
         slug: "sanity",
@@ -142934,6 +142976,7 @@ async function displayRuntimeLogs(client2, options, abortController) {
     }
     const handleData = (data) => {
       let log3 = parse5 ? data : JSON.parse(data);
+      stopSpinner();
       if (isRuntimeLimitDelimiter(log3)) {
         abortController.abort();
         warn(`${import_chalk44.default.bold(log3.message)}
@@ -142971,18 +143014,11 @@ async function displayRuntimeLogs(client2, options, abortController) {
 function printBuildLog(log2, print) {
   if (!log2.created)
     return;
-  let data;
-  data = (log2.text || "").replace(/\n$/, "").replace(/^\n/, "").replace(/\x1b\[1000D/g, "").replace(/\x1b\[0K/g, "").replace(/\x1b\[1A/g, "");
-  if (/warning/i.test(data)) {
-    data = import_chalk44.default.yellow(data);
-  } else if (log2.type === "stderr") {
-    data = import_chalk44.default.red(data);
-  }
   const date = new Date(log2.created).toISOString();
-  data.split("\n").forEach((line) => {
+  for (const line of colorize(sanitize(log2)).split("\n")) {
     print(`${import_chalk44.default.dim(date)}  ${line.replace("[now-builder-debug] ", "")}
 `);
-  });
+  }
 }
 function isRuntimeLimitDelimiter(log2) {
   return log2.rowId === "" && log2.level === "error" && log2.source === "delimiter";
@@ -143043,6 +143079,25 @@ function getSourceIcon(source) {
     return "\u0192";
   return " ";
 }
+function sanitize(log2) {
+  return (log2.text || "").replace(/\n$/, "").replace(/^\n/, "").replace(/\x1b\[1000D/g, "").replace(/\x1b\[0K/g, "").replace(/\x1b\[1A/g, "");
+}
+function colorize(text2) {
+  if (isError7(text2)) {
+    return import_chalk44.default.red(text2);
+  }
+  return isWarning(text2) ? import_chalk44.default.yellow(text2) : text2;
+}
+function isError7(text2) {
+  return /^(\s+⨯\s+|\s+at\s+|npm err!)/i.test(text2) || /(^| |\[|eval|internal|range|reference|syntax|type|uri|fetch)err(or)?( |:)/i.test(
+    text2
+  ) || /(command not found|module not found|failed to compile|cannot open shared object file|err_pnpm_|please contact vercel.com\/help|exit code 1|elifecycle|exited)/i.test(
+    text2
+  );
+}
+function isWarning(text2) {
+  return /^warn(ing)?(:|!)/i.test(text2) && !text2.includes("deprecationwarning");
+}
 var import_chalk44, import_date_fns, import_ms7, import_jsonlines2, import_split2, import_url13, runtimeLogSpinnerMessage, dateTimeFormat, moreSymbol, statusWidth;
 var init_logs = __esm({
   "src/util/logs.ts"() {
@@ -147921,7 +147976,8 @@ function sortBuilders(builds) {
   const frontendRuntimeSet2 = new Set(
     import_frameworks3.frameworkList.map((f) => f.useRuntime?.use || "@vercel/static-build")
   );
-  const toNumber = (build2) => frontendRuntimeSet2.has(build2.use) ? 0 : 1;
+  frontendRuntimeSet2.delete("@vercel/python");
+  const toNumber = (build2) => build2.use === "@vercel/python" ? 1 : frontendRuntimeSet2.has(build2.use) ? 0 : 2;
   return builds.sort((build1, build2) => {
     return toNumber(build1) - toNumber(build2);
   });
@@ -148163,6 +148219,13 @@ var init_command5 = __esm({
           type: Boolean,
           deprecated: false
         },
+        {
+          name: "target",
+          shorthand: null,
+          type: String,
+          deprecated: false,
+          description: "Specify the target environment"
+        },
         {
           name: "output",
           description: "Directory where built assets should be written to",
@@ -148213,6 +148276,35 @@ var init_scrub_argv = __esm({
   }
 });
 
+// src/util/parse-target.ts
+function parseTarget({
+  output: output2,
+  targetFlagName,
+  targetFlagValue,
+  prodFlagValue
+}) {
+  if (prodFlagValue && targetFlagValue) {
+    output2.warn(
+      `Both \`--prod\` and \`--${targetFlagName}\` detected. Ignoring \`--prod\`.`
+    );
+  }
+  if (targetFlagValue) {
+    const lowerCaseTarget = targetFlagValue.toLowerCase();
+    output2.debug(`Setting target to ${lowerCaseTarget}`);
+    return lowerCaseTarget;
+  }
+  if (prodFlagValue) {
+    output2.debug("Setting target to production");
+    return "production";
+  }
+  return void 0;
+}
+var init_parse_target = __esm({
+  "src/util/parse-target.ts"() {
+    "use strict";
+  }
+});
+
 // src/commands/build/index.ts
 var build_exports = {};
 __export3(build_exports, {
@@ -148248,7 +148340,12 @@ async function main2(client2) {
     output2.print(help2(buildCommand, { columns: client2.stderr.columns }));
     return 2;
   }
-  const target = parsedArgs.flags["--prod"] ? "production" : "preview";
+  const target = parseTarget({
+    output: output2,
+    targetFlagName: "target",
+    targetFlagValue: parsedArgs.flags["--target"],
+    prodFlagValue: parsedArgs.flags["--prod"]
+  }) || "preview";
   const yes = Boolean(parsedArgs.flags["--yes"]);
   try {
     await (0, import_build_utils13.validateNpmrc)(cwd);
@@ -148538,6 +148635,15 @@ async function doBuild(client2, project, buildsJson, cwd, outputDir) {
       let buildResult;
       try {
         buildResult = await builder.build(buildOptions);
+        if (buildConfig.zeroConfig && buildConfig.framework && "output" in buildResult && !buildResult.routes) {
+          const framework2 = import_frameworks4.frameworkList.find(
+            (f) => f.slug === buildConfig.framework
+          );
+          if (framework2) {
+            const defaultRoutes = await getFrameworkRoutes(framework2, workPath);
+            buildResult.routes = defaultRoutes;
+          }
+        }
       } finally {
         try {
           Object.assign(diagnostics, await builder.diagnostics?.(buildOptions));
@@ -148804,6 +148910,15 @@ async function writeFlagsJSON({ output: output2 }, buildResults, outputDir) {
 async function writeBuildJson(buildsJson, outputDir) {
   await import_fs_extra18.default.writeJSON((0, import_path28.join)(outputDir, "builds.json"), buildsJson, { spaces: 2 });
 }
+async function getFrameworkRoutes(framework, dirPrefix) {
+  let routes2 = [];
+  if (typeof framework.defaultRoutes === "function") {
+    routes2 = await framework.defaultRoutes(dirPrefix);
+  } else if (Array.isArray(framework.defaultRoutes)) {
+    routes2 = framework.defaultRoutes;
+  }
+  return routes2;
+}
 var import_fs_extra18, import_chalk49, import_dotenv, import_semver3, import_minimatch2, import_path28, import_frameworks4, import_build_utils13, import_fs_detectors4, import_routing_utils2, import_client8;
 var init_build = __esm({
   "src/commands/build/index.ts"() {
@@ -148843,6 +148958,7 @@ var init_build = __esm({
     init_command5();
     init_scrub_argv();
     init_get_flags_specification();
+    init_parse_target();
   }
 });
 
@@ -149710,29 +149826,6 @@ var init_get_prebuilt_json = __esm({
   }
 });
 
-// src/util/deploy/parse-target.ts
-function parseTarget(output2, targetArg, prodArg) {
-  if (targetArg) {
-    if (targetArg === "production") {
-      output2.warn(
-        "We recommend using the much shorter `--prod` option instead of `--target production` (deprecated)"
-      );
-    }
-    output2.debug(`Setting target to ${targetArg}`);
-    return targetArg;
-  }
-  if (prodArg) {
-    output2.debug("Setting target to production");
-    return "production";
-  }
-  return void 0;
-}
-var init_parse_target = __esm({
-  "src/util/deploy/parse-target.ts"() {
-    "use strict";
-  }
-});
-
 // src/util/deploy/is-deploying.ts
 function isDeploying(readyState) {
   return deploymentInProgressStates.includes(readyState);
@@ -150123,7 +150216,6 @@ var init_deploy = __esm({
     init_create_deploy();
     init_get_deployment_checks();
     init_get_prebuilt_json();
-    init_parse_target();
     init_print_deployment_status();
     init_validate_archive_format();
     init_purchase_domain_if_available();
@@ -150153,6 +150245,7 @@ var init_deploy = __esm({
     init_validate_paths();
     init_help();
     init_command7();
+    init_parse_target();
     deploy_default = async (client2) => {
       const { output: output2 } = client2;
       let parsedArguments = null;
@@ -150232,14 +150325,12 @@ var init_deploy = __esm({
 `
         );
       }
-      const target = parseTarget(
-        output2,
-        parsedArguments.flags["--target"],
-        parsedArguments.flags["--prod"]
-      );
-      if (typeof target === "number") {
-        return target;
-      }
+      const target = parseTarget({
+        output: output2,
+        targetFlagName: "target",
+        targetFlagValue: parsedArguments.flags["--target"],
+        prodFlagValue: parsedArguments.flags["--prod"]
+      });
       const archive = parsedArguments.flags["--archive"];
       if (typeof archive === "string" && !isValidArchive(archive)) {
         output2.error(`Format must be one of: ${import_client10.VALID_ARCHIVE_FORMATS.join(", ")}`);
@@ -173300,7 +173391,11 @@ async function main6(client2) {
   const subArgs = argv2._.slice(1);
   const { subcommand: subcommand2, args: args2 } = getSubcommand(subArgs, COMMAND_CONFIG6);
   const { cwd, output: output2, config: config3 } = client2;
-  const target = argv2["--environment"]?.toLowerCase() || "development";
+  const target = parseTarget({
+    output: output2,
+    targetFlagName: "environment",
+    targetFlagValue: argv2["--environment"]
+  }) || "development";
   if (!isValidEnvTarget(target)) {
     output2.error(
       `Invalid environment \`${import_chalk83.default.cyan(
@@ -173368,6 +173463,7 @@ var init_env = __esm({
     init_pull();
     init_rm5();
     init_command11();
+    init_parse_target();
     COMMAND_CONFIG6 = {
       ls: ["ls", "list"],
       add: ["add"],
@@ -175124,7 +175220,12 @@ async function list2(client2) {
   }
   const autoConfirm = !!argv2["--yes"];
   const meta = parseMeta(argv2["--meta"]);
-  const target = argv2["--prod"] ? "production" : typeof argv2["--environment"] === "string" ? argv2["--environment"].toLowerCase() : void 0;
+  const target = parseTarget({
+    output: output2,
+    targetFlagName: "environment",
+    targetFlagValue: argv2["--environment"],
+    prodFlagValue: argv2["--prod"]
+  });
   let link4 = await getLinkedProject(client2, cwd);
   if (link4.status === "error") {
     return link4.exitCode;
@@ -175368,6 +175469,7 @@ var init_list2 = __esm({
     import_error_utils25 = __toESM3(require_dist2());
     init_help();
     init_command16();
+    init_parse_target();
   }
 });
 
@@ -175408,6 +175510,13 @@ async function logs(client2) {
   }
   const asJson = parsedArguments.flags["--json"];
   let [deploymentIdOrHost] = parsedArguments.args;
+  if (!deploymentIdOrHost) {
+    error4(
+      `${getCommandName("logs <deployment>")} expects exactly one argument`
+    );
+    print(help2(logsCommand, { columns: client2.stderr.columns }));
+    return 1;
+  }
   let contextName = null;
   try {
     ({ contextName } = await getScope(client2));
@@ -175483,6 +175592,7 @@ var init_logs2 = __esm({
     init_get_scope();
     init_logs();
     init_param();
+    init_pkg_name();
     init_help();
     init_list2();
     init_command3();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "35.0.3",
+  "version": "35.2.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -21,17 +21,17 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "8.3.4",
+    "@vercel/build-utils": "8.3.5",
     "@vercel/fun": "1.1.0",
     "@vercel/go": "3.1.1",
     "@vercel/hydrogen": "1.0.4",
     "@vercel/next": "4.3.6",
-    "@vercel/node": "3.2.6",
+    "@vercel/node": "3.2.7",
     "@vercel/python": "4.3.0",
     "@vercel/redwood": "2.1.3",
     "@vercel/remix-builder": "2.2.1",
     "@vercel/ruby": "2.1.0",
-    "@vercel/static-build": "2.5.16",
+    "@vercel/static-build": "2.5.17",
     "chokidar": "3.3.1"
   },
   "devDependencies": {
@@ -82,11 +82,11 @@
     "@types/yauzl-promise": "2.1.0",
     "@vercel-internals/constants": "1.0.4",
     "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.43",
-    "@vercel/client": "13.3.2",
+    "@vercel-internals/types": "1.0.44",
+    "@vercel/client": "13.3.3",
     "@vercel/error-utils": "2.0.2",
-    "@vercel/frameworks": "3.0.3",
-    "@vercel/fs-detectors": "5.2.5",
+    "@vercel/frameworks": "3.1.0",
+    "@vercel/fs-detectors": "5.2.6",
     "@vercel/routing-utils": "3.1.0",
     "@vitest/expect": "1.4.0",
     "ajv": "6.12.2",