vercel 33.5.4 → 33.6.0

package/dist/index.js

@@ -62513,7 +62513,7 @@ var require_package = __commonJS2({
   "../client/package.json"(exports2, module2) {
     module2.exports = {
       name: "@vercel/client",
-      version: "13.1.4",
+      version: "13.1.6",
       main: "dist/index.js",
       typings: "dist/index.d.ts",
       homepage: "https://vercel.com",
@@ -62550,7 +62550,7 @@ var require_package = __commonJS2({
         typescript: "4.9.5"
       },
       dependencies: {
-        "@vercel/build-utils": "7.7.1",
+        "@vercel/build-utils": "7.9.0",
         "@vercel/error-utils": "2.0.2",
         "@vercel/routing-utils": "3.1.0",
         "@zeit/fetch": "5.2.0",
@@ -147045,7 +147045,7 @@ var require_detect_builders = __commonJS2({
     });
     module2.exports = __toCommonJS4(detect_builders_exports);
     var import_minimatch5 = __toESM4(require_minimatch2());
-    var import_semver4 = require_semver2();
+    var import_semver5 = require_semver2();
     var import_path44 = require("path");
     var import_frameworks6 = __toESM4(require_frameworks());
     var import_is_official_runtime = require_is_official_runtime();
@@ -147449,7 +147449,7 @@ var require_detect_builders = __commonJS2({
         }
         if (func.runtime !== void 0) {
           const tag = `${func.runtime}`.split("@").pop();
-          if (!tag || !(0, import_semver4.valid)(tag)) {
+          if (!tag || !(0, import_semver5.valid)(tag)) {
             return {
               code: "invalid_function_runtime",
               message: "Function Runtimes must have a valid version, for example `now-php@1.0.0`."
@@ -147811,7 +147811,7 @@ var require_detect_file_system_api = __commonJS2({
       detectFileSystemAPI: () => detectFileSystemAPI2
     });
     module2.exports = __toCommonJS4(detect_file_system_api_exports);
-    var import_semver4 = __toESM4(require_semver2());
+    var import_semver5 = __toESM4(require_semver2());
     var import__3 = require_dist27();
     async function detectFileSystemAPI2({
       files,
@@ -147924,8 +147924,8 @@ var require_detect_file_system_api = __commonJS2({
           };
         }
         if (nextVersion !== "latest" && nextVersion !== "canary") {
-          const fixedVersion = import_semver4.default.valid(import_semver4.default.coerce(nextVersion) || "");
-          if (!fixedVersion || !import_semver4.default.gte(fixedVersion, "12.0.0")) {
+          const fixedVersion = import_semver5.default.valid(import_semver5.default.coerce(nextVersion) || "");
+          if (!fixedVersion || !import_semver5.default.gte(fixedVersion, "12.0.0")) {
             return {
               metadata,
               fsApiBuilder: null,
@@ -147937,8 +147937,8 @@ var require_detect_file_system_api = __commonJS2({
       if (!hasDotOutput) {
         const vercelCliVersion = deps["vercel"];
         if (vercelCliVersion && vercelCliVersion !== "latest" && vercelCliVersion !== "canary") {
-          const fixedVersion = import_semver4.default.valid(import_semver4.default.coerce(vercelCliVersion) || "");
-          if (!fixedVersion || !import_semver4.default.gte(fixedVersion, "23.1.3-canary.68")) {
+          const fixedVersion = import_semver5.default.valid(import_semver5.default.coerce(vercelCliVersion) || "");
+          if (!fixedVersion || !import_semver5.default.gte(fixedVersion, "23.1.3-canary.68")) {
             return {
               metadata,
               fsApiBuilder: null,
@@ -155107,7 +155107,7 @@ var require_get_monorepo_default_settings = __commonJS2({
     var import_package_managers = require_package_managers();
     var import_detect_framework = require_detect_framework();
     var import_json5 = __toESM4(require_lib21());
-    var import_semver4 = __toESM4(require_semver2());
+    var import_semver5 = __toESM4(require_semver2());
     var MissingBuildPipeline2 = class extends Error {
       constructor() {
         super(
@@ -155126,10 +155126,10 @@ var require_get_monorepo_default_settings = __commonJS2({
       if (!turboSemVer) {
         return false;
       }
-      if (!import_semver4.default.validRange(turboSemVer)) {
+      if (!import_semver5.default.validRange(turboSemVer)) {
         return false;
       }
-      return !import_semver4.default.intersects(turboSemVer, "<1.8.0");
+      return !import_semver5.default.intersects(turboSemVer, "<1.8.0");
     }
     async function getMonorepoDefaultSettings2(projectName, projectPath, relativeToRoot, detectorFilesystem) {
       const [monorepoManager, packageManager] = await Promise.all([
@@ -166041,7 +166041,8 @@ async function setupAndLink(client2, path11, {
         skipAutoDetectionConfirmation: false,
         projectSettings: {
           ...localConfigurationOverrides,
-          sourceFilesOutsideRootDirectory
+          sourceFilesOutsideRootDirectory,
+          rootDirectory
         },
         autoAssignCustomDomains: true
       };
@@ -169488,7 +169489,7 @@ var require_npa = __commonJS2({
     module2.exports.Result = Result;
     var url3;
     var HostedGit;
-    var semver3;
+    var semver4;
     var path11;
     var validatePackageName;
     var osenv;
@@ -169736,10 +169737,10 @@ var require_npa = __commonJS2({
       const spec = res.rawSpec === "" ? "latest" : res.rawSpec;
       res.saveSpec = null;
       res.fetchSpec = spec;
-      if (!semver3)
-        semver3 = require_semver();
-      const version2 = semver3.valid(spec, true);
-      const range = semver3.validRange(spec, true);
+      if (!semver4)
+        semver4 = require_semver();
+      const version2 = semver4.valid(spec, true);
+      const range = semver4.validRange(spec, true);
       if (version2) {
         res.type = "version";
       } else if (range) {
@@ -170516,9 +170517,6 @@ async function main2(client2) {
     if (project.settings.analyticsId) {
       envToUnset.add("VERCEL_ANALYTICS_ID");
       process.env.VERCEL_ANALYTICS_ID = project.settings.analyticsId;
-      output2.warn(
-        "Vercel Speed Insights auto-injection is deprecated in favor of @vercel/speed-insights package. Learn more: https://vercel.link/upgrate-to-speed-insights-package"
-      );
     }
     process.env.VERCEL = "1";
     process.env.NOW_BUILDER = "1";
@@ -170827,8 +170825,7 @@ async function doBuild(client2, project, buildsJson, cwd2, outputDir) {
   const mergedCrons = mergeCrons(localConfig.crons, buildResults.values());
   const mergedWildcard = mergeWildcard(buildResults.values());
   const mergedOverrides = overrides.length > 0 ? Object.assign({}, ...overrides) : void 0;
-  const mergedFlags = mergeFlags(buildResults.values());
-  const framework = await getFramework(cwd2, buildResults);
+  const framework = await getFramework(workPath, buildResults);
   const config3 = {
     version: 3,
     routes: mergedRoutes,
@@ -170836,12 +170833,10 @@ async function doBuild(client2, project, buildsJson, cwd2, outputDir) {
     wildcard: mergedWildcard,
     overrides: mergedOverrides,
     framework,
-    crons: mergedCrons,
-    /** @deprecated Replaced by Variants. Remove once fully replaced. */
-    flags: mergedFlags
+    crons: mergedCrons
   };
   await import_fs_extra18.default.writeJSON((0, import_path28.join)(outputDir, "config.json"), config3, { spaces: 2 });
-  await writeVariantsJson(client2, buildResults.values(), outputDir);
+  await writeFlagsJSON(client2, buildResults.values(), outputDir);
   const relOutputDir = (0, import_path28.relative)(cwd2, outputDir);
   output2.print(
     `${prependEmoji(
@@ -170940,40 +170935,32 @@ function mergeWildcard(buildResults) {
   }
   return wildcard;
 }
-function mergeFlags(buildResults) {
-  return Array.from(buildResults).flatMap((result) => {
-    if ("flags" in result) {
-      return result.flags ?? [];
-    }
-    return [];
-  });
-}
-async function writeVariantsJson({ output: output2 }, buildResults, outputDir) {
-  const variantsFilePath = (0, import_path28.join)(outputDir, "variants.json");
-  let hasVariants = true;
-  const variants = await import_fs_extra18.default.readJSON(variantsFilePath).catch((error4) => {
+async function writeFlagsJSON({ output: output2 }, buildResults, outputDir) {
+  const flagsFilePath = (0, import_path28.join)(outputDir, "flags.json");
+  let hasFlags = true;
+  const flags = await import_fs_extra18.default.readJSON(flagsFilePath).catch((error4) => {
     if (error4.code === "ENOENT") {
-      hasVariants = false;
+      hasFlags = false;
       return { definitions: {} };
     }
     throw error4;
   });
   for (const result of buildResults) {
-    if (!("variants" in result) || !result.variants)
+    if (!("flags" in result) || !result.flags || !result.flags.definitions)
       continue;
-    for (const [key, defintion] of Object.entries(result.variants)) {
-      if (result.variants[key]) {
+    for (const [key, definition] of Object.entries(result.flags.definitions)) {
+      if (result.flags.definitions[key]) {
         output2.warn(
-          `The variant "${key}" was found multiple times. Only its first occurrence will be considered.`
+          `The flag "${key}" was found multiple times. Only its first occurrence will be considered.`
         );
         continue;
       }
-      hasVariants = true;
-      variants.definitions[key] = defintion;
+      hasFlags = true;
+      flags.definitions[key] = definition;
     }
   }
-  if (hasVariants) {
-    await import_fs_extra18.default.writeJSON(variantsFilePath, variants, { spaces: 2 });
+  if (hasFlags) {
+    await import_fs_extra18.default.writeJSON(flagsFilePath, flags, { spaces: 2 });
   }
 }
 async function writeBuildJson(buildsJson, outputDir) {
@@ -172326,7 +172313,7 @@ function handleCreateDeployError(output2, error4, localConfig) {
   }
   return error4;
 }
-var import_ms10, import_fs_extra20, import_bytes5, import_chalk53, import_path32, import_client10, import_build_utils14, import_error_utils18, deploy_default, addProcessEnv;
+var import_ms10, import_fs_extra20, import_bytes5, import_chalk53, import_semver4, import_path32, import_client10, import_build_utils14, import_error_utils18, deploy_default, addProcessEnv;
 var init_deploy = __esm({
   "src/commands/deploy/index.ts"() {
     "use strict";
@@ -172334,6 +172321,7 @@ var init_deploy = __esm({
     import_fs_extra20 = __toESM3(require_lib());
     import_bytes5 = __toESM3(require_bytes());
     import_chalk53 = __toESM3(require_source());
+    import_semver4 = __toESM3(require_semver());
     import_path32 = require("path");
     import_client10 = __toESM3(require_dist10());
     init_code();
@@ -172688,6 +172676,18 @@ var init_deploy = __esm({
           "`name` not found on project or provided by existing project"
         );
       }
+      const { packageJson } = await (0, import_build_utils14.scanParentDirs)(
+        (0, import_path32.join)(cwd2, project?.rootDirectory ?? ""),
+        true,
+        cwd2
+      );
+      let nodeVersion;
+      if (packageJson?.engines?.node) {
+        const parsedNodeVersion = import_semver4.default.coerce(packageJson.engines.node);
+        if (parsedNodeVersion) {
+          nodeVersion = `${parsedNodeVersion.major}.x`;
+        }
+      }
       try {
         const autoAssignCustomDomains = argv2["--skip-domain"] ? false : void 0;
         const createArgs = {
@@ -172716,9 +172716,17 @@ var init_deploy = __esm({
           autoAssignCustomDomains
         };
         if (!localConfig.builds || localConfig.builds.length === 0) {
-          createArgs.projectSettings = status === "not_linked" ? {
-            sourceFilesOutsideRootDirectory
-          } : { ...localConfigurationOverrides, sourceFilesOutsideRootDirectory };
+          createArgs.projectSettings = {
+            sourceFilesOutsideRootDirectory,
+            rootDirectory,
+            nodeVersion
+          };
+          if (status !== "not_linked") {
+            createArgs.projectSettings = {
+              ...createArgs.projectSettings,
+              ...localConfigurationOverrides
+            };
+          }
         }
         deployment = await createDeploy(
           client2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "33.5.4",
+  "version": "33.6.0",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -21,17 +21,17 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.7.1",
+    "@vercel/build-utils": "7.9.0",
     "@vercel/fun": "1.1.0",
     "@vercel/go": "3.0.5",
     "@vercel/hydrogen": "1.0.2",
-    "@vercel/next": "4.1.4",
-    "@vercel/node": "3.0.21",
+    "@vercel/next": "4.1.5",
+    "@vercel/node": "3.0.23",
     "@vercel/python": "4.1.1",
     "@vercel/redwood": "2.0.8",
-    "@vercel/remix-builder": "2.1.1",
+    "@vercel/remix-builder": "2.1.3",
     "@vercel/ruby": "2.0.5",
-    "@vercel/static-build": "2.4.1",
+    "@vercel/static-build": "2.4.3",
     "chokidar": "3.3.1"
   },
   "devDependencies": {
@@ -78,8 +78,8 @@
     "@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.24",
-    "@vercel/client": "13.1.4",
+    "@vercel-internals/types": "1.0.26",
+    "@vercel/client": "13.1.6",
     "@vercel/error-utils": "2.0.2",
     "@vercel/frameworks": "3.0.0",
     "@vercel/fs-detectors": "5.2.1",