@vercel/build-utils 10.3.0 → 10.3.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @vercel/build-utils
 
+## 10.3.2
+
+### Patch Changes
+
+- Add support for expire values in Next.js prerender manifest ([#13087](https://github.com/vercel/vercel/pull/13087))
+
+- Detect yarn version from lockfile version ([#13118](https://github.com/vercel/vercel/pull/13118))
+
+## 10.3.1
+
+### Patch Changes
+
+- Parse yarn.lock file version ([#13114](https://github.com/vercel/vercel/pull/13114))
+
+- [env-vars] expose VERCEL_DEPLOYMENT_ID as NEXT_PUBLIC_VERCEL_DEPLOYMENT_ID ([#13115](https://github.com/vercel/vercel/pull/13115))
+
+- Fix vitest-e2e glob to include integration.test.ts ([#13097](https://github.com/vercel/vercel/pull/13097))
+
 ## 10.3.0
 
 ### Minor Changes

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

@@ -68,6 +68,7 @@ var import_node_version = require("./node-version");
 var import_read_config_file = require("./read-config-file");
 var import_clone_env = require("../clone-env");
 var import_json5 = __toESM(require("json5"));
+var import_js_yaml = __toESM(require("js-yaml"));
 const NO_OVERRIDE = {
   detectedLockfile: void 0,
   detectedPackageManager: void 0,
@@ -263,11 +264,11 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   let lockfileVersion;
   let cliType;
   const bunLockPath = bunLockTextPath ?? bunLockBinPath;
-  const [hasYarnLock, packageLockJson, pnpmLockYaml, bunLock] = await Promise.all([
-    Boolean(yarnLockPath),
+  const [packageLockJson, pnpmLockYaml, bunLock, yarnLock] = await Promise.all([
     npmLockPath ? (0, import_read_config_file.readConfigFile)(npmLockPath) : null,
     pnpmLockPath ? (0, import_read_config_file.readConfigFile)(pnpmLockPath) : null,
-    bunLockPath ? import_fs_extra.default.readFile(bunLockPath) : null
+    bunLockPath ? import_fs_extra.default.readFile(bunLockPath) : null,
+    yarnLockPath ? import_fs_extra.default.readFile(yarnLockPath, "utf8") : null
   ]);
   const rootProjectInfo = readPackageJson ? await readProjectRootInfo({
     base,
@@ -278,13 +279,14 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     turboVersionRange,
     rootProjectInfo?.rootDir
   ) : void 0;
-  if (bunLock && hasYarnLock) {
+  if (bunLock && yarnLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
     lockfileVersion = bunLockTextPath ? 1 : 0;
-  } else if (hasYarnLock) {
+  } else if (yarnLock) {
     cliType = "yarn";
     lockfilePath = yarnLockPath;
+    lockfileVersion = parseYarnLockVersion(yarnLock);
   } else if (pnpmLockYaml) {
     cliType = "pnpm";
     lockfilePath = pnpmLockPath;
@@ -314,6 +316,17 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     turboSupportsCorepackHome
   };
 }
+function parseYarnLockVersion(yarnLock) {
+  if (!yarnLock.includes("__metadata:")) {
+    return 1;
+  }
+  try {
+    const metadata = import_js_yaml.default.load(yarnLock).__metadata;
+    return Number(metadata.version);
+  } catch {
+    return void 0;
+  }
+}
 async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
   if (turboVersionSpecifierSupportsCorepack(turboVersionRange)) {
     return true;
@@ -636,6 +649,20 @@ function detectPnpmVersion(lockfileVersion, projectCreatedAt) {
       return "not found";
   }
 }
+function detectYarnVersion(lockfileVersion) {
+  if (lockfileVersion) {
+    if ([1].includes(lockfileVersion)) {
+      return "yarn@1.x";
+    } else if ([4, 5].includes(lockfileVersion)) {
+      return "yarn@2.x";
+    } else if ([6, 7].includes(lockfileVersion)) {
+      return "yarn@3.x";
+    } else if ([8].includes(lockfileVersion)) {
+      return "yarn@4.x";
+    }
+  }
+  return "unknown yarn";
+}
 function validLockfileForPackageManager(cliType, lockfileVersion, packageManagerVersion) {
   const packageManagerMajorVersion = packageManagerVersion.major;
   switch (cliType) {
@@ -825,7 +852,7 @@ function detectPackageManager(cliType, lockfileVersion, projectCreatedAt) {
       return {
         path: void 0,
         detectedLockfile: "yarn.lock",
-        detectedPackageManager: "yarn"
+        detectedPackageManager: detectYarnVersion(lockfileVersion)
       };
   }
 }

package/dist/get-prefixed-env-vars.js

@@ -32,7 +32,8 @@ function getPrefixedEnvVars({
     "VERCEL_TARGET_ENV",
     "VERCEL_REGION",
     "VERCEL_BRANCH_URL",
-    "VERCEL_PROJECT_PRODUCTION_URL"
+    "VERCEL_PROJECT_PRODUCTION_URL",
+    "VERCEL_DEPLOYMENT_ID"
   ];
   const newEnvs = {};
   if (envPrefix && envs.VERCEL_URL) {

package/dist/index.js

@@ -18333,8 +18333,8 @@ var require_js_yaml = __commonJS({
 var require_js_yaml2 = __commonJS({
   "../../node_modules/.pnpm/js-yaml@3.13.1/node_modules/js-yaml/index.js"(exports2, module2) {
     "use strict";
-    var yaml2 = require_js_yaml();
-    module2.exports = yaml2;
+    var yaml3 = require_js_yaml();
+    module2.exports = yaml3;
   }
 });
 
@@ -22604,6 +22604,7 @@ var NodejsLambda = class extends Lambda {
 var Prerender = class {
   constructor({
     expiration,
+    staleExpiration,
     lambda,
     fallback,
     group,
@@ -22620,6 +22621,7 @@ var Prerender = class {
   }) {
     this.type = "Prerender";
     this.expiration = expiration;
+    this.staleExpiration = staleExpiration;
     this.sourcePath = sourcePath;
     this.lambda = lambda;
     if (this.lambda) {
@@ -23080,6 +23082,7 @@ function cloneEnv(...envs) {
 
 // src/fs/run-user-scripts.ts
 var import_json5 = __toESM(require_lib5());
+var import_js_yaml2 = __toESM(require_js_yaml2());
 var NO_OVERRIDE = {
   detectedLockfile: void 0,
   detectedPackageManager: void 0,
@@ -23275,11 +23278,11 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   let lockfileVersion;
   let cliType;
   const bunLockPath = bunLockTextPath ?? bunLockBinPath;
-  const [hasYarnLock, packageLockJson, pnpmLockYaml, bunLock] = await Promise.all([
-    Boolean(yarnLockPath),
+  const [packageLockJson, pnpmLockYaml, bunLock, yarnLock] = await Promise.all([
     npmLockPath ? readConfigFile(npmLockPath) : null,
     pnpmLockPath ? readConfigFile(pnpmLockPath) : null,
-    bunLockPath ? import_fs_extra7.default.readFile(bunLockPath) : null
+    bunLockPath ? import_fs_extra7.default.readFile(bunLockPath) : null,
+    yarnLockPath ? import_fs_extra7.default.readFile(yarnLockPath, "utf8") : null
   ]);
   const rootProjectInfo = readPackageJson ? await readProjectRootInfo({
     base,
@@ -23290,13 +23293,14 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     turboVersionRange,
     rootProjectInfo?.rootDir
   ) : void 0;
-  if (bunLock && hasYarnLock) {
+  if (bunLock && yarnLock) {
     cliType = "bun";
     lockfilePath = bunLockPath;
     lockfileVersion = bunLockTextPath ? 1 : 0;
-  } else if (hasYarnLock) {
+  } else if (yarnLock) {
     cliType = "yarn";
     lockfilePath = yarnLockPath;
+    lockfileVersion = parseYarnLockVersion(yarnLock);
   } else if (pnpmLockYaml) {
     cliType = "pnpm";
     lockfilePath = pnpmLockPath;
@@ -23326,6 +23330,17 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     turboSupportsCorepackHome
   };
 }
+function parseYarnLockVersion(yarnLock) {
+  if (!yarnLock.includes("__metadata:")) {
+    return 1;
+  }
+  try {
+    const metadata = import_js_yaml2.default.load(yarnLock).__metadata;
+    return Number(metadata.version);
+  } catch {
+    return void 0;
+  }
+}
 async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
   if (turboVersionSpecifierSupportsCorepack(turboVersionRange)) {
     return true;
@@ -23648,6 +23663,20 @@ function detectPnpmVersion(lockfileVersion, projectCreatedAt) {
       return "not found";
   }
 }
+function detectYarnVersion(lockfileVersion) {
+  if (lockfileVersion) {
+    if ([1].includes(lockfileVersion)) {
+      return "yarn@1.x";
+    } else if ([4, 5].includes(lockfileVersion)) {
+      return "yarn@2.x";
+    } else if ([6, 7].includes(lockfileVersion)) {
+      return "yarn@3.x";
+    } else if ([8].includes(lockfileVersion)) {
+      return "yarn@4.x";
+    }
+  }
+  return "unknown yarn";
+}
 function validLockfileForPackageManager(cliType, lockfileVersion, packageManagerVersion) {
   const packageManagerMajorVersion = packageManagerVersion.major;
   switch (cliType) {
@@ -23837,7 +23866,7 @@ function detectPackageManager(cliType, lockfileVersion, projectCreatedAt) {
       return {
         path: void 0,
         detectedLockfile: "yarn.lock",
-        detectedPackageManager: "yarn"
+        detectedPackageManager: detectYarnVersion(lockfileVersion)
       };
   }
 }
@@ -24060,7 +24089,8 @@ function getPrefixedEnvVars({
     "VERCEL_TARGET_ENV",
     "VERCEL_REGION",
     "VERCEL_BRANCH_URL",
-    "VERCEL_PROJECT_PRODUCTION_URL"
+    "VERCEL_PROJECT_PRODUCTION_URL",
+    "VERCEL_DEPLOYMENT_ID"
   ];
   const newEnvs = {};
   if (envPrefix && envs.VERCEL_URL) {

package/dist/prerender.d.ts

@@ -2,6 +2,7 @@ import type { File, HasField, Chain } from './types';
 import { Lambda } from './lambda';
 interface PrerenderOptions {
     expiration: number | false;
+    staleExpiration?: number;
     lambda?: Lambda;
     fallback: File | null;
     group?: number;
@@ -18,7 +19,17 @@ interface PrerenderOptions {
 }
 export declare class Prerender {
     type: 'Prerender';
+    /**
+     * `expiration` is `revalidate` in Next.js terms, and `s-maxage` in
+     * `cache-control` terms.
+     */
     expiration: number | false;
+    /**
+     * `staleExpiration` is `expire` in Next.js terms, and
+     * `stale-while-revalidate` + `s-maxage` in `cache-control` terms. It's
+     * expected to be undefined if `expiration` is `false`.
+     */
+    staleExpiration?: number;
     lambda?: Lambda;
     fallback: File | null;
     group?: number;
@@ -32,6 +43,6 @@ export declare class Prerender {
     experimentalBypassFor?: HasField;
     experimentalStreamingLambdaPath?: string;
     chain?: Chain;
-    constructor({ expiration, lambda, fallback, group, bypassToken, allowQuery, allowHeader, initialHeaders, initialStatus, passQuery, sourcePath, experimentalBypassFor, experimentalStreamingLambdaPath, chain, }: PrerenderOptions);
+    constructor({ expiration, staleExpiration, lambda, fallback, group, bypassToken, allowQuery, allowHeader, initialHeaders, initialStatus, passQuery, sourcePath, experimentalBypassFor, experimentalStreamingLambdaPath, chain, }: PrerenderOptions);
 }
 export {};

package/dist/prerender.js

@@ -24,6 +24,7 @@ module.exports = __toCommonJS(prerender_exports);
 class Prerender {
   constructor({
     expiration,
+    staleExpiration,
     lambda,
     fallback,
     group,
@@ -40,6 +41,7 @@ class Prerender {
   }) {
     this.type = "Prerender";
     this.expiration = expiration;
+    this.staleExpiration = staleExpiration;
     this.sourcePath = sourcePath;
     this.lambda = lambda;
     if (this.lambda) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "10.3.0",
+  "version": "10.3.2",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -54,7 +54,7 @@
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand",
     "vitest-run": "vitest -c ../../vitest.config.mts",
     "vitest-unit": "glob --absolute 'test/unit.*test.ts'",
-    "vitest-e2e": "glob --absolute 'test/integration-*.test.ts'",
+    "vitest-e2e": "glob --absolute 'test/integration*.test.ts'",
     "type-check": "tsc --noEmit"
   }
 }