@vercel/build-utils 13.0.0 → 13.0.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @vercel/build-utils
 
+## 13.0.2
+
+### Patch Changes
+
+- Improve warning messages surrounding Elysia ([#14272](https://github.com/vercel/vercel/pull/14272))
+
+## 13.0.1
+
+### Patch Changes
+
+- Revert "Remove getSpawnOptions" ([#14261](https://github.com/vercel/vercel/pull/14261))
+
 ## 13.0.0
 
 ### Major Changes

package/dist/fs/run-user-scripts.d.ts

@@ -84,6 +84,7 @@ export declare function getNodeBinPath({ cwd, }: {
 }): Promise<string>;
 export declare function getNodeBinPaths({ start, base, }: TraverseUpDirectoriesProps): string[];
 export declare function runShellScript(fsPath: string, args?: string[], spawnOpts?: SpawnOptions): Promise<boolean>;
+export declare function getSpawnOptions(meta: Meta, nodeVersion: NodeVersion): SpawnOptions;
 export declare function getNodeVersion(destPath: string, fallbackVersion?: string | undefined, config?: Config, meta?: Meta, availableVersions?: number[]): Promise<NodeVersion | BunVersion>;
 export declare function scanParentDirs(destPath: string, readPackageJson?: boolean, base?: string): Promise<ScanParentDirsResult>;
 export declare function turboVersionSpecifierSupportsCorepack(turboVersionSpecifier: string): boolean;

package/dist/fs/run-user-scripts.js

@@ -38,6 +38,7 @@ __export(run_user_scripts_exports, {
   getPathForPackageManager: () => getPathForPackageManager,
   getPathOverrideForPackageManager: () => getPathOverrideForPackageManager,
   getScriptName: () => getScriptName,
+  getSpawnOptions: () => getSpawnOptions,
   installDependencies: () => installDependencies,
   runBundleInstall: () => runBundleInstall,
   runCustomInstallCommand: () => runCustomInstallCommand,
@@ -177,6 +178,30 @@ async function runShellScript(fsPath, args = [], spawnOpts) {
   });
   return true;
 }
+function getSpawnOptions(meta, nodeVersion) {
+  const opts = {
+    env: (0, import_clone_env.cloneEnv)(process.env)
+  };
+  if ((0, import_node_version.isBunVersion)(nodeVersion)) {
+    return opts;
+  }
+  if (!meta.isDev) {
+    let found = false;
+    const oldPath = opts.env.PATH || process.env.PATH || "";
+    const pathSegments = oldPath.split(import_path.default.delimiter).map((segment) => {
+      if (/^\/node[0-9]+\/bin/.test(segment)) {
+        found = true;
+        return `/node${nodeVersion.major}/bin`;
+      }
+      return segment;
+    });
+    if (!found) {
+      pathSegments.unshift(`/node${nodeVersion.major}/bin`);
+    }
+    opts.env.PATH = pathSegments.filter(Boolean).join(import_path.default.delimiter);
+  }
+  return opts;
+}
 async function getNodeVersion(destPath, fallbackVersion = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION, config = {}, meta = {}, availableVersions = (0, import_node_version.getAvailableNodeVersions)()) {
   if (config.bunVersion) {
     return (0, import_node_version.getSupportedBunVersion)(config.bunVersion);
@@ -642,11 +667,6 @@ To use ${otherVersion}, manually opt in using corepack (https://vercel.com/docs/
           `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager}`
         );
       }
-      if (cliType === "bun") {
-        console.warn(
-          "Warning: Bun is used as a package manager at build time only, not at runtime with Functions"
-        );
-      }
     }
   }
   if (cliType === "yarn" && !env.YARN_NODE_LINKER) {
@@ -1044,6 +1064,7 @@ const installDependencies = (0, import_util.deprecate)(
   getPathForPackageManager,
   getPathOverrideForPackageManager,
   getScriptName,
+  getSpawnOptions,
   installDependencies,
   runBundleInstall,
   runCustomInstallCommand,

package/dist/generate-node-builder-functions.d.ts

@@ -1,6 +1,12 @@
-import { BuildV3 } from './types';
+import { BuildV3, Config } from './types';
 import type FileFsRef from './file-fs-ref';
-export declare function generateNodeBuilderFunctions(frameworkName: string, regex: RegExp, validFilenames: string[], validExtensions: string[], nodeBuild: any): {
+export declare function generateNodeBuilderFunctions(frameworkName: string, regex: RegExp, validFilenames: string[], validExtensions: string[], nodeBuild: any, // necessary to avoid circular dependency
+opts?: {
+    checks?: (info: {
+        config: Config;
+        isBun: boolean;
+    }) => void;
+}): {
     require_: NodeRequire;
     findEntrypoint: (files: Record<string, FileFsRef>) => {
         entrypoint: string;

package/dist/generate-node-builder-functions.js

@@ -35,7 +35,7 @@ var import_glob = __toESM(require("./fs/glob"));
 var import_node_path = require("node:path");
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_module = require("node:module");
-function generateNodeBuilderFunctions(frameworkName, regex, validFilenames, validExtensions, nodeBuild) {
+function generateNodeBuilderFunctions(frameworkName, regex, validFilenames, validExtensions, nodeBuild, opts) {
   const entrypointsForMessage = validFilenames.map((filename) => `- ${filename}.{${validExtensions.join(",")}}`).join("\n");
   const require_ = (0, import_node_module.createRequire)(__filename);
   const build = async (args) => {
@@ -57,7 +57,9 @@ function generateNodeBuilderFunctions(frameworkName, regex, validFilenames, vali
       considerBuildCommand: true,
       entrypointCallback: async () => {
         return entrypointCallback(args);
-      }
+      },
+      checks: opts?.checks ?? (() => {
+      })
     });
     let version = void 0;
     try {

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import download, { downloadFile, DownloadedFiles, isSymbolicLink, isDirectory }
 import getWriteableDirectory from './fs/get-writable-directory';
 import glob, { GlobOptions } from './fs/glob';
 import rename from './fs/rename';
-import { spawnAsync, execCommand, spawnCommand, walkParentDirs, getScriptName, installDependencies, runPackageJsonScript, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getPathForPackageManager, detectPackageManager, getNodeBinPath, getNodeBinPaths, scanParentDirs, traverseUpDirectories } from './fs/run-user-scripts';
+import { spawnAsync, execCommand, spawnCommand, walkParentDirs, getScriptName, installDependencies, runPackageJsonScript, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getPathForPackageManager, detectPackageManager, getSpawnOptions, getNodeBinPath, getNodeBinPaths, scanParentDirs, traverseUpDirectories } from './fs/run-user-scripts';
 import { getLatestNodeVersion, getDiscontinuedNodeVersions, getSupportedNodeVersion, isBunVersion, getSupportedBunVersion } from './fs/node-version';
 import streamToBuffer, { streamToBufferChunks } from './fs/stream-to-buffer';
 import debug from './debug';
@@ -18,7 +18,7 @@ import { getPrefixedEnvVars } from './get-prefixed-env-vars';
 import { cloneEnv } from './clone-env';
 import { hardLinkDir } from './hard-link-dir';
 import { validateNpmrc } from './validate-npmrc';
-export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, getNodeBinPaths, getSupportedNodeVersion, isBunVersion, getSupportedBunVersion, detectPackageManager, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getPathForPackageManager, getLatestNodeVersion, getDiscontinuedNodeVersions, getPlatformEnv, getPrefixedEnvVars, streamToBuffer, streamToBufferChunks, debug, isSymbolicLink, isDirectory, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, cloneEnv, hardLinkDir, traverseUpDirectories, validateNpmrc, };
+export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, getNodeBinPaths, getSupportedNodeVersion, isBunVersion, getSupportedBunVersion, detectPackageManager, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getPathForPackageManager, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, streamToBuffer, streamToBufferChunks, debug, isSymbolicLink, isDirectory, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, cloneEnv, hardLinkDir, traverseUpDirectories, validateNpmrc, };
 export { EdgeFunction } from './edge-function';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';

package/dist/index.js

@@ -21860,6 +21860,7 @@ __export(src_exports, {
   getPrettyError: () => getPrettyError,
   getProvidedRuntime: () => getProvidedRuntime,
   getScriptName: () => getScriptName,
+  getSpawnOptions: () => getSpawnOptions,
   getSupportedBunVersion: () => getSupportedBunVersion,
   getSupportedNodeVersion: () => getSupportedNodeVersion,
   getWriteableDirectory: () => getWritableDirectory,
@@ -23300,6 +23301,30 @@ async function runShellScript(fsPath, args = [], spawnOpts) {
   });
   return true;
 }
+function getSpawnOptions(meta, nodeVersion) {
+  const opts = {
+    env: cloneEnv(process.env)
+  };
+  if (isBunVersion(nodeVersion)) {
+    return opts;
+  }
+  if (!meta.isDev) {
+    let found = false;
+    const oldPath = opts.env.PATH || process.env.PATH || "";
+    const pathSegments = oldPath.split(import_path5.default.delimiter).map((segment) => {
+      if (/^\/node[0-9]+\/bin/.test(segment)) {
+        found = true;
+        return `/node${nodeVersion.major}/bin`;
+      }
+      return segment;
+    });
+    if (!found) {
+      pathSegments.unshift(`/node${nodeVersion.major}/bin`);
+    }
+    opts.env.PATH = pathSegments.filter(Boolean).join(import_path5.default.delimiter);
+  }
+  return opts;
+}
 async function getNodeVersion(destPath, fallbackVersion = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION, config = {}, meta = {}, availableVersions = getAvailableNodeVersions()) {
   if (config.bunVersion) {
     return getSupportedBunVersion(config.bunVersion);
@@ -23765,11 +23790,6 @@ To use ${otherVersion}, manually opt in using corepack (https://vercel.com/docs/
           `Detected \`${detectedLockfile}\` ${versionString}generated by ${detectedPackageManager}`
         );
       }
-      if (cliType === "bun") {
-        console.warn(
-          "Warning: Bun is used as a package manager at build time only, not at runtime with Functions"
-        );
-      }
     }
   }
   if (cliType === "yarn" && !env.YARN_NODE_LINKER) {
@@ -24596,7 +24616,7 @@ var defaultCachePathGlob = "**/{node_modules,.yarn/cache}/**";
 var import_node_path = require("path");
 var import_node_fs = __toESM(require("fs"));
 var import_node_module = require("module");
-function generateNodeBuilderFunctions(frameworkName, regex, validFilenames, validExtensions, nodeBuild) {
+function generateNodeBuilderFunctions(frameworkName, regex, validFilenames, validExtensions, nodeBuild, opts) {
   const entrypointsForMessage = validFilenames.map((filename) => `- ${filename}.{${validExtensions.join(",")}}`).join("\n");
   const require_ = (0, import_node_module.createRequire)(__filename);
   const build = async (args) => {
@@ -24618,7 +24638,9 @@ function generateNodeBuilderFunctions(frameworkName, regex, validFilenames, vali
       considerBuildCommand: true,
       entrypointCallback: async () => {
         return entrypointCallback(args);
-      }
+      },
+      checks: opts?.checks ?? (() => {
+      })
     });
     let version = void 0;
     try {
@@ -24832,6 +24854,7 @@ function shouldUseExperimentalBackends(framework) {
   getPrettyError,
   getProvidedRuntime,
   getScriptName,
+  getSpawnOptions,
   getSupportedBunVersion,
   getSupportedNodeVersion,
   getWriteableDirectory,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "13.0.0",
+  "version": "13.0.2",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -27,7 +27,7 @@
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.2",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/routing-utils": "5.2.1",
+    "@vercel/routing-utils": "5.2.2",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",