@vercel/build-utils 10.5.1 → 10.6.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @vercel/build-utils
 
+## 10.6.1
+
+### Patch Changes
+
+- next package uses @vercel/routing-utils HasField rather than redefining & stricter validation. ([#13409](https://github.com/vercel/vercel/pull/13409))
+
+- Make architecture a defined property on Lambda classes to apply when creating ([#13398](https://github.com/vercel/vercel/pull/13398))
+
+- [env-vars] expose VERCEL_PROJECT_ID as NEXT_PUBLIC_VERCEL_PROJECT_ID ([#13431](https://github.com/vercel/vercel/pull/13431))
+
+## 10.6.0
+
+### Minor Changes
+
+- provide a more verbose error when package.json is not valid ([#13346](https://github.com/vercel/vercel/pull/13346))
+
+- Allow configuring functions `architecture` via the `vercel.json` configuration ([#13344](https://github.com/vercel/vercel/pull/13344))
+
 ## 10.5.1
 
 ### Patch Changes

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

@@ -239,7 +239,16 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     start: destPath,
     filename: "package.json"
   });
-  const packageJson = readPackageJson && pkgJsonPath ? JSON.parse(await import_fs_extra.default.readFile(pkgJsonPath, "utf8")) : void 0;
+  let packageJson;
+  if (readPackageJson && pkgJsonPath) {
+    try {
+      packageJson = JSON.parse(await import_fs_extra.default.readFile(pkgJsonPath, "utf8"));
+    } catch (err) {
+      throw new Error(
+        `Could not read ${pkgJsonPath}: ${err.message}.`
+      );
+    }
+  }
   const {
     paths: [
       yarnLockPath,

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

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

package/dist/index.js

@@ -10825,9 +10825,9 @@ var require_fs2 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/minimatch@5.1.6/node_modules/minimatch/lib/path.js
+// ../../node_modules/.pnpm/minimatch@5.0.1/node_modules/minimatch/lib/path.js
 var require_path = __commonJS({
-  "../../node_modules/.pnpm/minimatch@5.1.6/node_modules/minimatch/lib/path.js"(exports2, module2) {
+  "../../node_modules/.pnpm/minimatch@5.0.1/node_modules/minimatch/lib/path.js"(exports2, module2) {
     var isWindows = typeof process === "object" && process && process.platform === "win32";
     module2.exports = isWindows ? { sep: "\\" } : { sep: "/" };
   }
@@ -10984,9 +10984,9 @@ var require_brace_expansion2 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/minimatch@5.1.6/node_modules/minimatch/minimatch.js
+// ../../node_modules/.pnpm/minimatch@5.0.1/node_modules/minimatch/minimatch.js
 var require_minimatch2 = __commonJS({
-  "../../node_modules/.pnpm/minimatch@5.1.6/node_modules/minimatch/minimatch.js"(exports2, module2) {
+  "../../node_modules/.pnpm/minimatch@5.0.1/node_modules/minimatch/minimatch.js"(exports2, module2) {
     var minimatch2 = module2.exports = (p, pattern, options = {}) => {
       assertValidPattern(pattern);
       if (!options.nocomment && pattern.charAt(0) === "#") {
@@ -11072,9 +11072,7 @@ var require_minimatch2 = __commonJS({
       return list;
     };
     var globUnescape = (s) => s.replace(/\\(.)/g, "$1");
-    var charUnescape = (s) => s.replace(/\\([^-\]])/g, "$1");
     var regExpEscape = (s) => s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-    var braExpEscape = (s) => s.replace(/[[\]\\]/g, "\\$&");
     var Minimatch = class {
       constructor(pattern, options) {
         assertValidPattern(pattern);
@@ -11083,10 +11081,6 @@ var require_minimatch2 = __commonJS({
         this.options = options;
         this.set = [];
         this.pattern = pattern;
-        this.windowsPathsNoEscape = !!options.windowsPathsNoEscape || options.allowWindowsEscape === false;
-        if (this.windowsPathsNoEscape) {
-          this.pattern = this.pattern.replace(/\\/g, "/");
-        }
         this.regexp = null;
         this.negate = false;
         this.comment = false;
@@ -11131,7 +11125,7 @@ var require_minimatch2 = __commonJS({
           negateOffset++;
         }
         if (negateOffset)
-          this.pattern = pattern.slice(negateOffset);
+          this.pattern = pattern.substr(negateOffset);
         this.negate = negate;
       }
       // set partial to true to test if, for example,
@@ -11222,7 +11216,7 @@ var require_minimatch2 = __commonJS({
         if (pattern === "")
           return "";
         let re = "";
-        let hasMagic = false;
+        let hasMagic = !!options.nocase;
         let escaping = false;
         const patternListStack = [];
         const negativeLists = [];
@@ -11233,10 +11227,7 @@ var require_minimatch2 = __commonJS({
         let cs;
         let pl;
         let sp;
-        let dotTravAllowed = pattern.charAt(0) === ".";
-        let dotFileAllowed = options.dot || dotTravAllowed;
-        const patternStart = () => dotTravAllowed ? "" : dotFileAllowed ? "(?!(?:^|\\/)\\.{1,2}(?:$|\\/))" : "(?!\\.)";
-        const subPatternStart = (p) => p.charAt(0) === "." ? "" : options.dot ? "(?!(?:^|\\/)\\.{1,2}(?:$|\\/))" : "(?!\\.)";
+        const patternStart = pattern.charAt(0) === "." ? "" : options.dot ? "(?!(?:^|\\/)\\.{1,2}(?:$|\\/))" : "(?!\\.)";
         const clearStateChar = () => {
           if (stateChar) {
             switch (stateChar) {
@@ -11274,10 +11265,6 @@ var require_minimatch2 = __commonJS({
               return false;
             }
             case "\\":
-              if (inClass && pattern.charAt(i + 1) === "-") {
-                re += c;
-                continue;
-              }
               clearStateChar();
               escaping = true;
               continue;
@@ -11300,7 +11287,7 @@ var require_minimatch2 = __commonJS({
               if (options.noext)
                 clearStateChar();
               continue;
-            case "(": {
+            case "(":
               if (inClass) {
                 re += "(";
                 continue;
@@ -11309,54 +11296,39 @@ var require_minimatch2 = __commonJS({
                 re += "\\(";
                 continue;
               }
-              const plEntry = {
+              patternListStack.push({
                 type: stateChar,
                 start: i - 1,
                 reStart: re.length,
                 open: plTypes[stateChar].open,
                 close: plTypes[stateChar].close
-              };
-              this.debug(this.pattern, "	", plEntry);
-              patternListStack.push(plEntry);
-              re += plEntry.open;
-              if (plEntry.start === 0 && plEntry.type !== "!") {
-                dotTravAllowed = true;
-                re += subPatternStart(pattern.slice(i + 1));
-              }
+              });
+              re += stateChar === "!" ? "(?:(?!(?:" : "(?:";
               this.debug("plType %j %j", stateChar, re);
               stateChar = false;
               continue;
-            }
-            case ")": {
-              const plEntry = patternListStack[patternListStack.length - 1];
-              if (inClass || !plEntry) {
+            case ")":
+              if (inClass || !patternListStack.length) {
                 re += "\\)";
                 continue;
               }
-              patternListStack.pop();
               clearStateChar();
               hasMagic = true;
-              pl = plEntry;
+              pl = patternListStack.pop();
               re += pl.close;
               if (pl.type === "!") {
-                negativeLists.push(Object.assign(pl, { reEnd: re.length }));
+                negativeLists.push(pl);
               }
+              pl.reEnd = re.length;
               continue;
-            }
-            case "|": {
-              const plEntry = patternListStack[patternListStack.length - 1];
-              if (inClass || !plEntry) {
+            case "|":
+              if (inClass || !patternListStack.length) {
                 re += "\\|";
                 continue;
               }
               clearStateChar();
               re += "|";
-              if (plEntry.start === 0 && plEntry.type !== "!") {
-                dotTravAllowed = true;
-                re += subPatternStart(pattern.slice(i + 1));
-              }
               continue;
-            }
             case "[":
               clearStateChar();
               if (inClass) {
@@ -11375,13 +11347,17 @@ var require_minimatch2 = __commonJS({
               }
               cs = pattern.substring(classStart + 1, i);
               try {
-                RegExp("[" + braExpEscape(charUnescape(cs)) + "]");
-                re += c;
+                RegExp("[" + cs + "]");
               } catch (er) {
-                re = re.substring(0, reClassStart) + "(?:$.)";
+                sp = this.parse(cs, SUBPARSE);
+                re = re.substr(0, reClassStart) + "\\[" + sp[0] + "\\]";
+                hasMagic = hasMagic || sp[1];
+                inClass = false;
+                continue;
               }
               hasMagic = true;
               inClass = false;
+              re += c;
               continue;
             default:
               clearStateChar();
@@ -11393,9 +11369,9 @@ var require_minimatch2 = __commonJS({
           }
         }
         if (inClass) {
-          cs = pattern.slice(classStart + 1);
+          cs = pattern.substr(classStart + 1);
           sp = this.parse(cs, SUBPARSE);
-          re = re.substring(0, reClassStart) + "\\[" + sp[0];
+          re = re.substr(0, reClassStart) + "\\[" + sp[0];
           hasMagic = hasMagic || sp[1];
         }
         for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
@@ -11424,28 +11400,24 @@ var require_minimatch2 = __commonJS({
           const nlFirst = re.slice(nl.reStart, nl.reEnd - 8);
           let nlAfter = re.slice(nl.reEnd);
           const nlLast = re.slice(nl.reEnd - 8, nl.reEnd) + nlAfter;
-          const closeParensBefore = nlBefore.split(")").length;
-          const openParensBefore = nlBefore.split("(").length - closeParensBefore;
+          const openParensBefore = nlBefore.split("(").length - 1;
           let cleanAfter = nlAfter;
           for (let i = 0; i < openParensBefore; i++) {
             cleanAfter = cleanAfter.replace(/\)[+*?]?/, "");
           }
           nlAfter = cleanAfter;
-          const dollar = nlAfter === "" && isSub !== SUBPARSE ? "(?:$|\\/)" : "";
+          const dollar = nlAfter === "" && isSub !== SUBPARSE ? "$" : "";
           re = nlBefore + nlFirst + nlAfter + dollar + nlLast;
         }
         if (re !== "" && hasMagic) {
           re = "(?=.)" + re;
         }
         if (addPatternStart) {
-          re = patternStart() + re;
+          re = patternStart + re;
         }
         if (isSub === SUBPARSE) {
           return [re, hasMagic];
         }
-        if (options.nocase && !hasMagic) {
-          hasMagic = pattern.toUpperCase() !== pattern.toLowerCase();
-        }
         if (!hasMagic) {
           return globUnescape(pattern);
         }
@@ -22400,6 +22372,20 @@ async function download(files, basePath, meta) {
 }
 
 // src/lambda.ts
+function getDefaultLambdaArchitecture(architecture) {
+  if (architecture) {
+    return architecture;
+  }
+  switch (process.arch) {
+    case "arm":
+    case "arm64": {
+      return "arm64";
+    }
+    default: {
+      return "x86_64";
+    }
+  }
+}
 var Lambda = class {
   constructor(opts) {
     const {
@@ -22489,7 +22475,7 @@ var Lambda = class {
     this.files = "files" in opts ? opts.files : void 0;
     this.handler = handler;
     this.runtime = runtime;
-    this.architecture = architecture;
+    this.architecture = getDefaultLambdaArchitecture(architecture);
     this.memory = memory;
     this.maxDuration = maxDuration;
     this.environment = environment;
@@ -22573,6 +22559,7 @@ async function getLambdaOptionsFromFunction({
     for (const [pattern, fn] of Object.entries(config.functions)) {
       if (sourceFile === pattern || (0, import_minimatch.default)(sourceFile, pattern)) {
         return {
+          architecture: fn.architecture,
           memory: fn.memory,
           maxDuration: fn.maxDuration
         };
@@ -22656,8 +22643,7 @@ var Prerender = class {
     }
     if (experimentalBypassFor !== void 0) {
       if (!Array.isArray(experimentalBypassFor) || experimentalBypassFor.some(
-        (field) => typeof field !== "object" || // host doesn't need a key
-        field.type !== "host" && typeof field.key !== "string" || typeof field.type !== "string" || field.value !== void 0 && typeof field.value !== "string"
+        (field) => typeof field !== "object" || typeof field.type !== "string" || field.type === "host" && "key" in field || field.type !== "host" && typeof field.key !== "string" || field.value !== void 0 && typeof field.value !== "string" && (typeof field.value !== "object" || field.value === null || Array.isArray(field.value))
       )) {
         throw new Error(
           "The `experimentalBypassFor` argument for `Prerender` must be Array of objects with fields `type`, `key` and optionally `value`."
@@ -23253,7 +23239,16 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     start: destPath,
     filename: "package.json"
   });
-  const packageJson = readPackageJson && pkgJsonPath ? JSON.parse(await import_fs_extra7.default.readFile(pkgJsonPath, "utf8")) : void 0;
+  let packageJson;
+  if (readPackageJson && pkgJsonPath) {
+    try {
+      packageJson = JSON.parse(await import_fs_extra7.default.readFile(pkgJsonPath, "utf8"));
+    } catch (err) {
+      throw new Error(
+        `Could not read ${pkgJsonPath}: ${err.message}.`
+      );
+    }
+  }
   const {
     paths: [
       yarnLockPath,
@@ -24105,7 +24100,8 @@ function getPrefixedEnvVars({
     "VERCEL_REGION",
     "VERCEL_BRANCH_URL",
     "VERCEL_PROJECT_PRODUCTION_URL",
-    "VERCEL_DEPLOYMENT_ID"
+    "VERCEL_DEPLOYMENT_ID",
+    "VERCEL_PROJECT_ID"
   ];
   const newEnvs = {};
   if (envPrefix && envs.VERCEL_URL) {
@@ -24286,6 +24282,10 @@ var functionsSchema = {
       type: "object",
       additionalProperties: false,
       properties: {
+        architecture: {
+          type: "string",
+          enum: ["x86_64", "arm64"]
+        },
         runtime: {
           type: "string",
           maxLength: 256

package/dist/lambda.d.ts

@@ -49,7 +49,7 @@ export declare class Lambda {
     files?: Files;
     handler: string;
     runtime: string;
-    architecture?: LambdaArchitecture;
+    architecture: LambdaArchitecture;
     memory?: number;
     maxDuration?: number;
     environment: Env;
@@ -77,5 +77,5 @@ export declare class Lambda {
  */
 export declare function createLambda(opts: LambdaOptions): Promise<Lambda>;
 export declare function createZip(files: Files): Promise<Buffer>;
-export declare function getLambdaOptionsFromFunction({ sourceFile, config, }: GetLambdaOptionsFromFunctionOptions): Promise<Pick<LambdaOptions, 'memory' | 'maxDuration'>>;
+export declare function getLambdaOptionsFromFunction({ sourceFile, config, }: GetLambdaOptionsFromFunctionOptions): Promise<Pick<LambdaOptions, 'architecture' | 'memory' | 'maxDuration'>>;
 export {};

package/dist/lambda.js

@@ -41,6 +41,20 @@ var import_minimatch = __toESM(require("minimatch"));
 var import_fs_extra = require("fs-extra");
 var import_download = require("./fs/download");
 var import_stream_to_buffer = __toESM(require("./fs/stream-to-buffer"));
+function getDefaultLambdaArchitecture(architecture) {
+  if (architecture) {
+    return architecture;
+  }
+  switch (process.arch) {
+    case "arm":
+    case "arm64": {
+      return "arm64";
+    }
+    default: {
+      return "x86_64";
+    }
+  }
+}
 class Lambda {
   constructor(opts) {
     const {
@@ -130,7 +144,7 @@ class Lambda {
     this.files = "files" in opts ? opts.files : void 0;
     this.handler = handler;
     this.runtime = runtime;
-    this.architecture = architecture;
+    this.architecture = getDefaultLambdaArchitecture(architecture);
     this.memory = memory;
     this.maxDuration = maxDuration;
     this.environment = environment;
@@ -214,6 +228,7 @@ async function getLambdaOptionsFromFunction({
     for (const [pattern, fn] of Object.entries(config.functions)) {
       if (sourceFile === pattern || (0, import_minimatch.default)(sourceFile, pattern)) {
         return {
+          architecture: fn.architecture,
           memory: fn.memory,
           maxDuration: fn.maxDuration
         };

package/dist/prerender.js

@@ -76,8 +76,7 @@ class Prerender {
     }
     if (experimentalBypassFor !== void 0) {
       if (!Array.isArray(experimentalBypassFor) || experimentalBypassFor.some(
-        (field) => typeof field !== "object" || // host doesn't need a key
-        field.type !== "host" && typeof field.key !== "string" || typeof field.type !== "string" || field.value !== void 0 && typeof field.value !== "string"
+        (field) => typeof field !== "object" || typeof field.type !== "string" || field.type === "host" && "key" in field || field.type !== "host" && typeof field.key !== "string" || field.value !== void 0 && typeof field.value !== "string" && (typeof field.value !== "object" || field.value === null || Array.isArray(field.value))
       )) {
         throw new Error(
           "The `experimentalBypassFor` argument for `Prerender` must be Array of objects with fields `type`, `key` and optionally `value`."

package/dist/schemas.d.ts

@@ -8,6 +8,10 @@ export declare const functionsSchema: {
             type: string;
             additionalProperties: boolean;
             properties: {
+                architecture: {
+                    type: string;
+                    enum: string[];
+                };
                 runtime: {
                     type: string;
                     maxLength: number;

package/dist/schemas.js

@@ -32,6 +32,10 @@ const functionsSchema = {
       type: "object",
       additionalProperties: false,
       properties: {
+        architecture: {
+          type: "string",
+          enum: ["x86_64", "arm64"]
+        },
         runtime: {
           type: "string",
           maxLength: 256

package/dist/types.d.ts

@@ -2,10 +2,11 @@
 import type FileRef from './file-ref';
 import type FileFsRef from './file-fs-ref';
 import type FileBlob from './file-blob';
-import type { Lambda } from './lambda';
+import type { Lambda, LambdaArchitecture } from './lambda';
 import type { Prerender } from './prerender';
 import type { EdgeFunction } from './edge-function';
 import type { Span } from './trace';
+import type { HasField } from '@vercel/routing-utils';
 export interface Env {
     [name: string]: string | undefined;
 }
@@ -44,14 +45,7 @@ export interface Config {
     middleware?: boolean;
     [key: string]: unknown;
 }
-export type HasField = Array<{
-    type: 'host';
-    value: string;
-} | {
-    type: 'header' | 'cookie' | 'query';
-    key: string;
-    value?: string;
-}>;
+export type { HasField };
 export interface Meta {
     isDev?: boolean;
     devCacheDir?: string;
@@ -322,6 +316,7 @@ export interface Builder {
 }
 export interface BuilderFunctions {
     [key: string]: {
+        architecture?: LambdaArchitecture;
         memory?: number;
         maxDuration?: number;
         runtime?: string;
@@ -501,4 +496,3 @@ export interface Chain {
      */
     headers: Record<string, string>;
 }
-export {};

package/package.json

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