@vercel/build-utils 8.4.12 → 8.6.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @vercel/build-utils
 
+## 8.6.0
+
+### Minor Changes
+
+- Add support for `NOW_EPHEMERAL_FILES_S3_URL`, `NOW_FILES_CLOUDFRONT_URL` and `NOW_FILES_S3_URL` environment variables ([#12643](https://github.com/vercel/vercel/pull/12643))
+
+## 8.5.0
+
+### Minor Changes
+
+- Remove `VERCEL_ALLOW_NODEJS22` env var check ([#12614](https://github.com/vercel/vercel/pull/12614))
+
 ## 8.4.12
 
 ### Patch Changes

package/dist/file-ref.d.ts

@@ -13,6 +13,25 @@ export default class FileRef implements FileBase {
     contentType: string | undefined;
     private mutable;
     constructor({ mode, digest, contentType, mutable, }: FileRefOptions);
+    /**
+     * Retrieves the URL of the CloudFront distribution for the S3
+     * bucket represented by {@link getNowFilesS3Url}.
+     *
+     * @returns The URL of the CloudFront distribution
+     */
+    private getNowFilesCloudfrontUrl;
+    /**
+     * Retrieves the URL of the S3 bucket for storing ephemeral files.
+     *
+     * @returns The URL of the S3 bucket
+     */
+    private getNowEphemeralFilesS3Url;
+    /**
+     * Retrieves the URL of the S3 bucket for storing files.
+     *
+     * @returns The URL of the S3 bucket
+     */
+    private getNowFilesS3Url;
     toStreamAsync(): Promise<NodeJS.ReadableStream>;
     toStream(): NodeJS.ReadableStream;
 }

package/dist/file-ref.js

@@ -58,13 +58,38 @@ class FileRef {
     this.contentType = contentType;
     this.mutable = mutable;
   }
+  /**
+   * Retrieves the URL of the CloudFront distribution for the S3
+   * bucket represented by {@link getNowFilesS3Url}.
+   *
+   * @returns The URL of the CloudFront distribution
+   */
+  getNowFilesCloudfrontUrl() {
+    return getEnvAsUrlOrThrow("NOW_FILES_CLOUDFRONT_URL") || "https://dmmcy0pwk6bqi.cloudfront.net";
+  }
+  /**
+   * Retrieves the URL of the S3 bucket for storing ephemeral files.
+   *
+   * @returns The URL of the S3 bucket
+   */
+  getNowEphemeralFilesS3Url() {
+    return getEnvAsUrlOrThrow("NOW_EPHEMERAL_FILES_S3_URL") || "https://now-ephemeral-files.s3.amazonaws.com";
+  }
+  /**
+   * Retrieves the URL of the S3 bucket for storing files.
+   *
+   * @returns The URL of the S3 bucket
+   */
+  getNowFilesS3Url() {
+    return getEnvAsUrlOrThrow("NOW_FILES_S3_URL") || "https://now-files.s3.amazonaws.com";
+  }
   async toStreamAsync() {
     let url = "";
     const [digestType, digestHash] = this.digest.split(":");
     if (digestType === "sha") {
-      url = this.mutable ? `https://now-files.s3.amazonaws.com/${digestHash}` : `https://dmmcy0pwk6bqi.cloudfront.net/${digestHash}`;
+      url = this.mutable ? `${this.getNowFilesS3Url()}/${digestHash}` : `${this.getNowFilesCloudfrontUrl()}/${digestHash}`;
     } else if (digestType === "sha+ephemeral") {
-      url = `https://now-ephemeral-files.s3.amazonaws.com/${digestHash}`;
+      url = `${this.getNowEphemeralFilesS3Url()}/${digestHash}`;
     } else {
       throw new Error("Expected digest to be sha");
     }
@@ -103,3 +128,20 @@ class FileRef {
     });
   }
 }
+function getEnvAsUrlOrThrow(key) {
+  const value = process.env[key];
+  if (value === void 0)
+    return void 0;
+  try {
+    new URL(value);
+    return value;
+  } catch (e) {
+    if (e instanceof TypeError && "code" in e && e.code === "ERR_INVALID_URL") {
+      throw new Error(
+        `A non-URL value was supplied to the ${key} environment variable`
+      );
+    } else {
+      throw e;
+    }
+  }
+}

package/dist/fs/node-version.js

@@ -40,6 +40,7 @@ var import_semver = require("semver");
 var import_errors = require("../errors");
 var import_debug = __toESM(require("../debug"));
 const NODE_VERSIONS = [
+  { major: 22, range: "22.x", runtime: "nodejs22.x" },
   { major: 20, range: "20.x", runtime: "nodejs20.x" },
   { major: 18, range: "18.x", runtime: "nodejs18.x" },
   {
@@ -74,12 +75,6 @@ const NODE_VERSIONS = [
   }
 ];
 function getOptions() {
-  if (process.env.VERCEL_ALLOW_NODEJS22 === "1") {
-    return [
-      { major: 22, range: "22.x", runtime: "nodejs22.x" },
-      ...NODE_VERSIONS
-    ];
-  }
   return NODE_VERSIONS;
 }
 function isNodeVersionAvailable(version) {

package/dist/index.js

@@ -8619,8 +8619,8 @@ var require_URL = __commonJS({
     var utils = require_utils3();
     var Impl = require_URL_impl();
     var impl = utils.implSymbol;
-    function URL(url) {
-      if (!this || this[impl] || !(this instanceof URL)) {
+    function URL2(url) {
+      if (!this || this[impl] || !(this instanceof URL2)) {
         throw new TypeError("Failed to construct 'URL': Please use the 'new' operator, this DOM object constructor cannot be called as a function.");
       }
       if (arguments.length < 1) {
@@ -8636,7 +8636,7 @@ var require_URL = __commonJS({
       }
       module2.exports.setup(this, args);
     }
-    URL.prototype.toJSON = function toJSON() {
+    URL2.prototype.toJSON = function toJSON() {
       if (!this || !module2.exports.is(this)) {
         throw new TypeError("Illegal invocation");
       }
@@ -8646,7 +8646,7 @@ var require_URL = __commonJS({
       }
       return this[impl].toJSON.apply(this[impl], args);
     };
-    Object.defineProperty(URL.prototype, "href", {
+    Object.defineProperty(URL2.prototype, "href", {
       get() {
         return this[impl].href;
       },
@@ -8657,20 +8657,20 @@ var require_URL = __commonJS({
       enumerable: true,
       configurable: true
     });
-    URL.prototype.toString = function() {
+    URL2.prototype.toString = function() {
       if (!this || !module2.exports.is(this)) {
         throw new TypeError("Illegal invocation");
       }
       return this.href;
     };
-    Object.defineProperty(URL.prototype, "origin", {
+    Object.defineProperty(URL2.prototype, "origin", {
       get() {
         return this[impl].origin;
       },
       enumerable: true,
       configurable: true
     });
-    Object.defineProperty(URL.prototype, "protocol", {
+    Object.defineProperty(URL2.prototype, "protocol", {
       get() {
         return this[impl].protocol;
       },
@@ -8681,7 +8681,7 @@ var require_URL = __commonJS({
       enumerable: true,
       configurable: true
     });
-    Object.defineProperty(URL.prototype, "username", {
+    Object.defineProperty(URL2.prototype, "username", {
       get() {
         return this[impl].username;
       },
@@ -8692,7 +8692,7 @@ var require_URL = __commonJS({
       enumerable: true,
       configurable: true
     });
-    Object.defineProperty(URL.prototype, "password", {
+    Object.defineProperty(URL2.prototype, "password", {
       get() {
         return this[impl].password;
       },
@@ -8703,7 +8703,7 @@ var require_URL = __commonJS({
       enumerable: true,
       configurable: true
     });
-    Object.defineProperty(URL.prototype, "host", {
+    Object.defineProperty(URL2.prototype, "host", {
       get() {
         return this[impl].host;
       },
@@ -8714,7 +8714,7 @@ var require_URL = __commonJS({
       enumerable: true,
       configurable: true
     });
-    Object.defineProperty(URL.prototype, "hostname", {
+    Object.defineProperty(URL2.prototype, "hostname", {
       get() {
         return this[impl].hostname;
       },
@@ -8725,7 +8725,7 @@ var require_URL = __commonJS({
       enumerable: true,
       configurable: true
     });
-    Object.defineProperty(URL.prototype, "port", {
+    Object.defineProperty(URL2.prototype, "port", {
       get() {
         return this[impl].port;
       },
@@ -8736,7 +8736,7 @@ var require_URL = __commonJS({
       enumerable: true,
       configurable: true
     });
-    Object.defineProperty(URL.prototype, "pathname", {
+    Object.defineProperty(URL2.prototype, "pathname", {
       get() {
         return this[impl].pathname;
       },
@@ -8747,7 +8747,7 @@ var require_URL = __commonJS({
       enumerable: true,
       configurable: true
     });
-    Object.defineProperty(URL.prototype, "search", {
+    Object.defineProperty(URL2.prototype, "search", {
       get() {
         return this[impl].search;
       },
@@ -8758,7 +8758,7 @@ var require_URL = __commonJS({
       enumerable: true,
       configurable: true
     });
-    Object.defineProperty(URL.prototype, "hash", {
+    Object.defineProperty(URL2.prototype, "hash", {
       get() {
         return this[impl].hash;
       },
@@ -8774,7 +8774,7 @@ var require_URL = __commonJS({
         return !!obj && obj[impl] instanceof Impl.implementation;
       },
       create(constructorArgs, privateData) {
-        let obj = Object.create(URL.prototype);
+        let obj = Object.create(URL2.prototype);
         this.setup(obj, constructorArgs, privateData);
         return obj;
       },
@@ -8785,10 +8785,10 @@ var require_URL = __commonJS({
         obj[impl] = new Impl.implementation(constructorArgs, privateData);
         obj[impl][utils.wrapperSymbol] = obj;
       },
-      interface: URL,
+      interface: URL2,
       expose: {
-        Window: { URL },
-        Worker: { URL }
+        Window: { URL: URL2 },
+        Worker: { URL: URL2 }
       }
     };
   }
@@ -9639,12 +9639,12 @@ var require_lib3 = __commonJS({
       configurable: true
     });
     var INTERNALS$2 = Symbol("Request internals");
-    var URL = Url.URL || whatwgUrl.URL;
+    var URL2 = Url.URL || whatwgUrl.URL;
     var parse_url = Url.parse;
     var format_url = Url.format;
     function parseURL(urlStr) {
       if (/^[a-zA-Z][a-zA-Z\d+\-.]*:/.exec(urlStr)) {
-        urlStr = new URL(urlStr).toString();
+        urlStr = new URL2(urlStr).toString();
       }
       return parse_url(urlStr);
     }
@@ -23651,13 +23651,38 @@ var FileRef = class {
     this.contentType = contentType;
     this.mutable = mutable;
   }
+  /**
+   * Retrieves the URL of the CloudFront distribution for the S3
+   * bucket represented by {@link getNowFilesS3Url}.
+   *
+   * @returns The URL of the CloudFront distribution
+   */
+  getNowFilesCloudfrontUrl() {
+    return getEnvAsUrlOrThrow("NOW_FILES_CLOUDFRONT_URL") || "https://dmmcy0pwk6bqi.cloudfront.net";
+  }
+  /**
+   * Retrieves the URL of the S3 bucket for storing ephemeral files.
+   *
+   * @returns The URL of the S3 bucket
+   */
+  getNowEphemeralFilesS3Url() {
+    return getEnvAsUrlOrThrow("NOW_EPHEMERAL_FILES_S3_URL") || "https://now-ephemeral-files.s3.amazonaws.com";
+  }
+  /**
+   * Retrieves the URL of the S3 bucket for storing files.
+   *
+   * @returns The URL of the S3 bucket
+   */
+  getNowFilesS3Url() {
+    return getEnvAsUrlOrThrow("NOW_FILES_S3_URL") || "https://now-files.s3.amazonaws.com";
+  }
   async toStreamAsync() {
     let url = "";
     const [digestType, digestHash] = this.digest.split(":");
     if (digestType === "sha") {
-      url = this.mutable ? `https://now-files.s3.amazonaws.com/${digestHash}` : `https://dmmcy0pwk6bqi.cloudfront.net/${digestHash}`;
+      url = this.mutable ? `${this.getNowFilesS3Url()}/${digestHash}` : `${this.getNowFilesCloudfrontUrl()}/${digestHash}`;
     } else if (digestType === "sha+ephemeral") {
-      url = `https://now-ephemeral-files.s3.amazonaws.com/${digestHash}`;
+      url = `${this.getNowEphemeralFilesS3Url()}/${digestHash}`;
     } else {
       throw new Error("Expected digest to be sha");
     }
@@ -23696,6 +23721,23 @@ var FileRef = class {
     });
   }
 };
+function getEnvAsUrlOrThrow(key) {
+  const value = process.env[key];
+  if (value === void 0)
+    return void 0;
+  try {
+    new URL(value);
+    return value;
+  } catch (e) {
+    if (e instanceof TypeError && "code" in e && e.code === "ERR_INVALID_URL") {
+      throw new Error(
+        `A non-URL value was supplied to the ${key} environment variable`
+      );
+    } else {
+      throw e;
+    }
+  }
+}
 
 // src/lambda.ts
 var import_assert4 = __toESM(require("assert"));
@@ -24384,6 +24426,7 @@ var import_util2 = require("util");
 var import_fs = require("fs");
 var import_semver = __toESM(require_semver2());
 var NODE_VERSIONS = [
+  { major: 22, range: "22.x", runtime: "nodejs22.x" },
   { major: 20, range: "20.x", runtime: "nodejs20.x" },
   { major: 18, range: "18.x", runtime: "nodejs18.x" },
   {
@@ -24418,12 +24461,6 @@ var NODE_VERSIONS = [
   }
 ];
 function getOptions() {
-  if (process.env.VERCEL_ALLOW_NODEJS22 === "1") {
-    return [
-      { major: 22, range: "22.x", runtime: "nodejs22.x" },
-      ...NODE_VERSIONS
-    ];
-  }
   return NODE_VERSIONS;
 }
 function isNodeVersionAvailable(version) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "8.4.12",
+  "version": "8.6.0",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -26,7 +26,7 @@
     "@types/node-fetch": "^2.1.6",
     "@types/semver": "6.0.0",
     "@types/yazl": "2.4.2",
-    "@vercel/error-utils": "2.0.2",
+    "@vercel/error-utils": "2.0.3",
     "aggregate-error": "3.0.1",
     "async-retry": "1.2.3",
     "async-sema": "2.1.4",
@@ -40,18 +40,21 @@
     "jest-junit": "16.0.0",
     "js-yaml": "3.13.1",
     "minimatch": "3.1.2",
+    "ms": "2.1.3",
     "multistream": "2.1.1",
     "node-fetch": "2.6.7",
     "semver": "6.3.1",
     "typescript": "4.9.5",
     "yazl": "2.5.1",
+    "vitest": "2.0.1",
     "json5": "2.2.3"
   },
   "scripts": {
     "build": "node build.mjs",
-    "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
-    "test-unit": "pnpm test test/unit.*test.*",
-    "test-e2e": "pnpm test test/integration.test.ts",
+    "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'",
     "type-check": "tsc --noEmit"
   }
 }