@vercel/build-utils 10.3.1 → 10.4.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @vercel/build-utils
 
+## 10.4.0
+
+### Minor Changes
+
+- Expose pnpm6 within the detected package manager path for future versions of the build container ([#13132](https://github.com/vercel/vercel/pull/13132))
+
+## 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

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

@@ -144,11 +144,6 @@ export declare function detectPackageManager(cliType: CliType, lockfileVersion:
     detectedLockfile: string;
     detectedPackageManager: string;
     pnpmVersionRange: string;
-} | {
-    path: undefined;
-    detectedLockfile: string;
-    detectedPackageManager: string;
-    pnpmVersionRange: string;
 } | {
     path: string;
     detectedLockfile: string;

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

@@ -649,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) {
@@ -819,8 +833,7 @@ function detectPackageManager(cliType, lockfileVersion, projectCreatedAt) {
           };
         case "pnpm 6":
           return {
-            // undefined because pnpm@6 is the current default in the build container
-            path: void 0,
+            path: "/pnpm6/node_modules/.bin",
             detectedLockfile: "pnpm-lock.yaml",
             detectedPackageManager: "pnpm@6.x",
             pnpmVersionRange: "6.x"
@@ -838,7 +851,7 @@ function detectPackageManager(cliType, lockfileVersion, projectCreatedAt) {
       return {
         path: void 0,
         detectedLockfile: "yarn.lock",
-        detectedPackageManager: "yarn"
+        detectedPackageManager: detectYarnVersion(lockfileVersion)
       };
   }
 }

package/dist/index.js

@@ -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) {
@@ -23661,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) {
@@ -23831,8 +23847,7 @@ function detectPackageManager(cliType, lockfileVersion, projectCreatedAt) {
           };
         case "pnpm 6":
           return {
-            // undefined because pnpm@6 is the current default in the build container
-            path: void 0,
+            path: "/pnpm6/node_modules/.bin",
             detectedLockfile: "pnpm-lock.yaml",
             detectedPackageManager: "pnpm@6.x",
             pnpmVersionRange: "6.x"
@@ -23850,7 +23865,7 @@ function detectPackageManager(cliType, lockfileVersion, projectCreatedAt) {
       return {
         path: void 0,
         detectedLockfile: "yarn.lock",
-        detectedPackageManager: "yarn"
+        detectedPackageManager: detectYarnVersion(lockfileVersion)
       };
   }
 }

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.1",
+  "version": "10.4.0",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",