@vercel/build-utils 13.26.6 → 13.27.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @vercel/build-utils
 
+## 13.27.1
+
+### Patch Changes
+
+- 0a170fd: [services] wire `experimentalServicesV2` into `fs-detectors`.
+
+## 13.27.0
+
+### Minor Changes
+
+- 338cc35: Add isPackageInstalled util for detecting dependencies during build.
+  Fix Vercel Flags dependency detection for emitting datafiles during builds with OIDC tokens.
+
 ## 13.26.6
 
 ### Patch Changes

package/dist/get-service-url-env-vars.js

@@ -22,6 +22,7 @@ __export(get_service_url_env_vars_exports, {
   getServiceUrlEnvVars: () => getServiceUrlEnvVars
 });
 module.exports = __toCommonJS(get_service_url_env_vars_exports);
+var import_types = require("./types");
 function serviceNameToEnvVar(name) {
   return `${name.replace(/-/g, "_").toUpperCase()}_URL`;
 }
@@ -56,7 +57,8 @@ function getServiceUrlEnvVars(options) {
   const baseUrl = origin || deploymentUrl;
   if (!baseUrl)
     return {};
-  const servicesByName = new Map(services.map((s) => [s.name, s]));
+  const v1Services = services.filter(import_types.isExperimentalService);
+  const servicesByName = new Map(v1Services.map((s) => [s.name, s]));
   const consumerEnvPrefix = getFrameworkEnvPrefix(
     consumerService?.framework,
     frameworkList
@@ -90,15 +92,16 @@ function getExperimentalServiceUrlEnvVars(options) {
   if (!baseUrl || !services || services.length === 0) {
     return {};
   }
+  const v1Services = services.filter(import_types.isExperimentalService);
   const envVars = {};
   const frameworkPrefixes = /* @__PURE__ */ new Set();
-  for (const service of services) {
+  for (const service of v1Services) {
     const prefix = getFrameworkEnvPrefix(service.framework, frameworkList);
     if (prefix) {
       frameworkPrefixes.add(prefix);
     }
   }
-  for (const service of services) {
+  for (const service of v1Services) {
     if (service.type !== "web" || !service.routePrefix) {
       continue;
     }

package/dist/index.d.ts

@@ -34,6 +34,7 @@ export * from './errors';
 export * from './trace';
 export { NODE_VERSIONS } from './fs/node-version';
 export { getInstalledPackageVersion } from './get-installed-package-version';
+export { isPackageInstalled } from './is-package-installed';
 export { defaultCachePathGlob } from './default-cache-path-glob';
 export { generateNodeBuilderFunctions } from './generate-node-builder-functions';
 export { BACKEND_FRAMEWORKS, BACKEND_BUILDERS, UNIFIED_BACKEND_BUILDER, BackendFramework, isBackendFramework, isNodeBackendFramework, isBackendBuilder, isExperimentalBackendsEnabled, isExperimentalBackendsWithoutIntrospectionEnabled, shouldUseExperimentalBackends, PYTHON_FRAMEWORKS, PythonFramework, isPythonFramework, } from './framework-helpers';

package/dist/index.js

@@ -34596,10 +34596,13 @@ __export(src_exports, {
   isDirectory: () => isDirectory,
   isExperimentalBackendsEnabled: () => isExperimentalBackendsEnabled,
   isExperimentalBackendsWithoutIntrospectionEnabled: () => isExperimentalBackendsWithoutIntrospectionEnabled,
+  isExperimentalService: () => isExperimentalService,
+  isExperimentalServiceV2: () => isExperimentalServiceV2,
   isExternalSymlink: () => isExternalSymlink,
   isExternalSymlinkTarget: () => isExternalSymlinkTarget,
   isNodeBackendFramework: () => isNodeBackendFramework,
   isNodeEntrypoint: () => isNodeEntrypoint,
+  isPackageInstalled: () => isPackageInstalled,
   isPythonEntrypoint: () => isPythonEntrypoint,
   isPythonFramework: () => isPythonFramework,
   isQueueBackedService: () => isQueueBackedService,
@@ -35851,6 +35854,12 @@ var NodeVersion = class extends Version {
 var BunVersion = class extends Version {
 };
 var JOB_TRIGGERS = ["queue", "schedule", "workflow"];
+function isExperimentalService(service) {
+  return service.schema === "experimentalServices";
+}
+function isExperimentalServiceV2(service) {
+  return service.schema === "experimentalServicesV2";
+}
 function getServiceQueueTopicConfigs(config) {
   if (Array.isArray(config.topics) && config.topics.length > 0) {
     return typeof config.topics[0] === "string" ? config.topics.map((topic) => ({ topic })) : config.topics;
@@ -38010,7 +38019,8 @@ function getServiceUrlEnvVars(options) {
   const baseUrl = origin || deploymentUrl;
   if (!baseUrl)
     return {};
-  const servicesByName = new Map(services.map((s) => [s.name, s]));
+  const v1Services = services.filter(isExperimentalService);
+  const servicesByName = new Map(v1Services.map((s) => [s.name, s]));
   const consumerEnvPrefix = getFrameworkEnvPrefix(
     consumerService?.framework,
     frameworkList
@@ -38044,15 +38054,16 @@ function getExperimentalServiceUrlEnvVars(options) {
   if (!baseUrl || !services || services.length === 0) {
     return {};
   }
+  const v1Services = services.filter(isExperimentalService);
   const envVars = {};
   const frameworkPrefixes = /* @__PURE__ */ new Set();
-  for (const service of services) {
+  for (const service of v1Services) {
     const prefix = getFrameworkEnvPrefix(service.framework, frameworkList);
     if (prefix) {
       frameworkPrefixes.add(prefix);
     }
   }
-  for (const service of services) {
+  for (const service of v1Services) {
     if (service.type !== "web" || !service.routePrefix) {
       continue;
     }
@@ -39012,6 +39023,23 @@ async function getInstalledPackageVersion(packageName, path8) {
   }
 }
 
+// src/is-package-installed.ts
+async function isPackageInstalled(packageName, path8) {
+  try {
+    const resolved = require.resolve(packageName, {
+      paths: path8 ? Array.isArray(path8) ? path8 : [path8] : [process.cwd()]
+    });
+    require(resolved);
+    return true;
+  } catch (err) {
+    debug(
+      `Could not resolve package "${packageName}". Package is not installed.`,
+      err
+    );
+    return false;
+  }
+}
+
 // src/default-cache-path-glob.ts
 var defaultCachePathGlob = "**/{node_modules,.yarn/cache}/**";
 
@@ -40433,10 +40461,13 @@ function getExtendedPayload({
   isDirectory,
   isExperimentalBackendsEnabled,
   isExperimentalBackendsWithoutIntrospectionEnabled,
+  isExperimentalService,
+  isExperimentalServiceV2,
   isExternalSymlink,
   isExternalSymlinkTarget,
   isNodeBackendFramework,
   isNodeEntrypoint,
+  isPackageInstalled,
   isPythonEntrypoint,
   isPythonFramework,
   isQueueBackedService,

package/dist/is-package-installed.d.ts

@@ -0,0 +1 @@
+export declare function isPackageInstalled(packageName: string, path?: string | string[]): Promise<boolean>;

package/dist/is-package-installed.js

@@ -0,0 +1,53 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var is_package_installed_exports = {};
+__export(is_package_installed_exports, {
+  isPackageInstalled: () => isPackageInstalled
+});
+module.exports = __toCommonJS(is_package_installed_exports);
+var import_debug = __toESM(require("./debug"));
+async function isPackageInstalled(packageName, path) {
+  try {
+    const resolved = require.resolve(packageName, {
+      paths: path ? Array.isArray(path) ? path : [path] : [process.cwd()]
+    });
+    require(resolved);
+    return true;
+  } catch (err) {
+    (0, import_debug.default)(
+      `Could not resolve package "${packageName}". Package is not installed.`,
+      err
+    );
+    return false;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isPackageInstalled
+});

package/dist/types.d.ts

@@ -513,7 +513,8 @@ export interface ServiceRefEnvVar {
 }
 export type EnvVar = ServiceRefEnvVar;
 export type EnvVars = Record<string, EnvVar>;
-export interface Service {
+export interface ExperimentalService {
+    schema: 'experimentalServices';
     name: string;
     type: ServiceType;
     trigger?: JobTrigger;
@@ -534,6 +535,36 @@ export interface Service {
     topics?: ServiceTopics;
     env?: EnvVars;
 }
+export interface ExperimentalServiceV2 {
+    schema: 'experimentalServicesV2';
+    name: string;
+    /** Path to the service root, relative to the project root. */
+    root: string;
+    framework?: string;
+    runtime?: string;
+    /** Resolved entrypoint, relative to the service root. */
+    entrypoint?: string;
+    /** Builder selected by the resolver. */
+    builder: Builder;
+    installCommand?: string;
+    buildCommand?: string;
+    devCommand?: string;
+    ignoreCommand?: string;
+    outputDirectory?: string;
+    /** Caller-side bindings to other services. */
+    bindings?: ExperimentalServiceV2Binding[];
+    /** Function configuration scoped to this service. */
+    functions?: BuilderFunctions;
+    headers?: Header[];
+    redirects?: Redirect[];
+    rewrites?: Rewrite[];
+    routes?: Route[];
+    cleanUrls?: boolean;
+    trailingSlash?: boolean;
+}
+export type Service = ExperimentalService | ExperimentalServiceV2;
+export declare function isExperimentalService(service: Service): service is ExperimentalService;
+export declare function isExperimentalServiceV2(service: Service): service is ExperimentalServiceV2;
 export declare function getServiceQueueTopicConfigs(config: {
     type?: ServiceType;
     topics?: ServiceTopics;

package/dist/types.js

@@ -25,6 +25,8 @@ __export(types_exports, {
   getReportedServiceType: () => getReportedServiceType,
   getServiceQueueTopicConfigs: () => getServiceQueueTopicConfigs,
   getServiceQueueTopics: () => getServiceQueueTopics,
+  isExperimentalService: () => isExperimentalService,
+  isExperimentalServiceV2: () => isExperimentalServiceV2,
   isQueueBackedService: () => isQueueBackedService,
   isQueueTriggeredService: () => isQueueTriggeredService,
   isScheduleTriggeredService: () => isScheduleTriggeredService,
@@ -56,6 +58,12 @@ class NodeVersion extends Version {
 class BunVersion extends Version {
 }
 const JOB_TRIGGERS = ["queue", "schedule", "workflow"];
+function isExperimentalService(service) {
+  return service.schema === "experimentalServices";
+}
+function isExperimentalServiceV2(service) {
+  return service.schema === "experimentalServicesV2";
+}
 function getServiceQueueTopicConfigs(config) {
   if (Array.isArray(config.topics) && config.topics.length > 0) {
     return typeof config.topics[0] === "string" ? config.topics.map((topic) => ({ topic })) : config.topics;
@@ -106,6 +114,8 @@ function getReportedServiceType(service) {
   getReportedServiceType,
   getServiceQueueTopicConfigs,
   getServiceQueueTopics,
+  isExperimentalService,
+  isExperimentalServiceV2,
   isQueueBackedService,
   isQueueTriggeredService,
   isScheduleTriggeredService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "13.26.6",
+  "version": "13.27.1",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -55,8 +55,8 @@
     "vitest": "2.0.1",
     "typescript": "4.9.5",
     "yazl": "2.5.1",
-    "@vercel/error-utils": "2.2.0",
-    "@vercel/routing-utils": "6.2.0"
+    "@vercel/routing-utils": "6.2.0",
+    "@vercel/error-utils": "2.2.0"
   },
   "scripts": {
     "build": "node build.mjs",