@vercel/fs-detectors 7.9.5 → 7.9.7

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export { builderToFrameworks, detectBuilders, detectOutputDirectory, detectApiDirectory, detectApiExtensions, getProxyBuilder, validateProxyConfig, validateProxy, type Options as DetectBuildersOptions, type ProxyConfig, } from './detect-builders';
 export { detectServices, generateServiceRewrites, generateServicesRoutes, } from './services/detect-services';
+export { detectDaemons } from './services/detect-daemons';
 export { resolveAllConfiguredServicesV2, resolveConfiguredServiceV2, validateServiceConfigV2, } from './services/resolve-v2';
 export { resolveAllConfiguredServices } from './services/resolve';
 export { hasLegacyServicesConfig, migrateExperimentalServices, planExperimentalServicesMigration, } from './services/migrate';
@@ -8,7 +9,7 @@ export { isExperimentalService, isExperimentalServiceV2, } from '@vercel/build-u
 export { autoDetectServices } from './services/auto-detect';
 export type { AutoDetectOptions, AutoDetectResult, } from './services/auto-detect';
 export { isStaticBuild, isRouteOwningBuilder, INTERNAL_SERVICE_PREFIX, getInternalServiceFunctionPath, getInternalServiceCronPath, getInternalServiceCronPathPrefix, getInternalServiceWorkerPath, getInternalServiceWorkerPathPrefix, } from './services/utils';
-export type { DetectServicesOptions, DetectServicesResult, DetectServicesSource, InferredServiceConfig, InferredServicesConfig, ResolvedServicesResult, InferredServicesResult, ResolvedService, Service, ExperimentalService, ExperimentalServiceV2, ExperimentalServiceV2Config, ExperimentalServicesV2, ExperimentalServiceV2Binding, ServiceBinding, ServiceConfig, Services, ServicesRoutes, ServiceDetectionError, ConfiguredServices, ConfiguredServicesType, } from './services/types';
+export type { DetectServicesOptions, DetectServicesResult, DetectServicesSource, InferredServiceConfig, InferredServicesConfig, ResolvedServicesResult, InferredServicesResult, ResolvedService, Service, ExperimentalService, ExperimentalServiceV2, ExperimentalServiceV2Config, ExperimentalServicesV2, ExperimentalServiceV2Binding, ServiceBinding, ServiceConfig, Services, ServicesRoutes, ServiceDetectionError, ConfiguredServices, ConfiguredServicesType, DetectedDaemon, } from './services/types';
 export { detectFileSystemAPI } from './detect-file-system-api';
 export { detectFramework, detectFrameworks, detectFrameworkRecord, detectFrameworkVersion, } from './detect-framework';
 export { getProjectPaths } from './get-project-paths';

package/dist/index.js

@@ -32,6 +32,7 @@ __export(src_exports, {
   detectApiDirectory: () => import_detect_builders.detectApiDirectory,
   detectApiExtensions: () => import_detect_builders.detectApiExtensions,
   detectBuilders: () => import_detect_builders.detectBuilders,
+  detectDaemons: () => import_detect_daemons.detectDaemons,
   detectFileSystemAPI: () => import_detect_file_system_api.detectFileSystemAPI,
   detectFramework: () => import_detect_framework.detectFramework,
   detectFrameworkRecord: () => import_detect_framework.detectFrameworkRecord,
@@ -74,6 +75,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_detect_builders = require("./detect-builders");
 var import_detect_services = require("./services/detect-services");
+var import_detect_daemons = require("./services/detect-daemons");
 var import_resolve_v2 = require("./services/resolve-v2");
 var import_resolve = require("./services/resolve");
 var import_migrate = require("./services/migrate");
@@ -110,6 +112,7 @@ var import_detect_instrumentation = require("./detect-instrumentation");
   detectApiDirectory,
   detectApiExtensions,
   detectBuilders,
+  detectDaemons,
   detectFileSystemAPI,
   detectFramework,
   detectFrameworkRecord,

package/dist/services/detect-daemons.d.ts

@@ -0,0 +1,19 @@
+import type { DetectorFilesystem } from '../detectors/filesystem';
+import type { DetectedDaemon } from './types';
+/**
+ * Read the daemons in `vercel.json#daemons` (or `vercel.toml`) from `fs`.
+ *
+ * This reads the same files as `detectServices` does when it isn't given
+ * `configuredServices`. A caller that passes services from an already loaded
+ * config (e.g. a compiled `vercel.ts`) should read that config's `daemons`
+ * instead, so services and daemons come from the same config.
+ *
+ * Safe on unvalidated config: a `daemons` that isn't an object yields no
+ * daemons, an `entrypoint` that isn't a string is left out, and an unreadable
+ * config yields no daemons (`detectServices` reports the parse error).
+ */
+export declare function detectDaemons({ fs, workPath, }: {
+    fs: DetectorFilesystem;
+    /** Working directory path (relative to fs root) to read the config from. */
+    workPath?: string;
+}): Promise<DetectedDaemon[]>;

package/dist/services/detect-daemons.js

@@ -0,0 +1,44 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var detect_daemons_exports = {};
+__export(detect_daemons_exports, {
+  detectDaemons: () => detectDaemons
+});
+module.exports = __toCommonJS(detect_daemons_exports);
+var import_build_utils = require("@vercel/build-utils");
+var import_utils = require("./utils");
+async function detectDaemons({
+  fs,
+  workPath
+}) {
+  const { config } = await (0, import_utils.readVercelConfig)(workPath ? fs.chdir(workPath) : fs);
+  return getDetectedDaemons(config);
+}
+function getDetectedDaemons(config) {
+  const daemons = config?.daemons;
+  return (0, import_build_utils.getDaemonNames)(config).map((name) => {
+    const daemon = daemons?.[name];
+    const entrypoint = typeof daemon === "object" && daemon !== null ? daemon.entrypoint : void 0;
+    return typeof entrypoint === "string" ? { name, entrypoint } : { name };
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  detectDaemons
+});

package/dist/services/runtimes/entrypoint.d.ts

@@ -8,10 +8,7 @@ export declare function parsePyModuleAttrEntrypoint(entrypoint: string): {
     attrName: string;
     filePath: string;
 } | null;
-/**
- * Returns true if the path names a blessed Dockerfile or Containerfile.
- * Suffixed names like `Dockerfile.prod` are intentionally not matched.
- */
+/** Recognize explicit Dockerfile/Containerfile paths, with the name anywhere in the basename. */
 export declare function isDockerfileEntrypoint(entrypoint: string): boolean;
 /**
  * Strip trailing slashes from a posixPath.normalize'd path.

package/dist/services/runtimes/entrypoint.js

@@ -24,7 +24,6 @@ __export(entrypoint_exports, {
 });
 module.exports = __toCommonJS(entrypoint_exports);
 var import_path = require("path");
-var import_constants = require("./constants");
 const PYTHON_MODULE_ATTR_RE = /^([A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)*):([A-Za-z_][\w]*)$/;
 function parsePyModuleAttrEntrypoint(entrypoint) {
   const match = PYTHON_MODULE_ATTR_RE.exec(entrypoint);
@@ -38,13 +37,8 @@ function parsePyModuleAttrEntrypoint(entrypoint) {
     filePath: modulePart.replace(/\./g, "/") + ".py"
   };
 }
-const CONTAINER_ENTRYPOINT_BASENAMES = new Set(
-  import_constants.CONTAINER_ENTRYPOINT_CANDIDATES.map((name) => name.toLowerCase())
-);
 function isDockerfileEntrypoint(entrypoint) {
-  return CONTAINER_ENTRYPOINT_BASENAMES.has(
-    import_path.posix.basename(entrypoint).toLowerCase()
-  );
+  return /(docker|container)file/i.test(import_path.posix.basename(entrypoint));
 }
 function stripTrailingSlash(p) {
   const stripped = p.replace(/\/+$/, "");

package/dist/services/types.d.ts

@@ -100,6 +100,12 @@ export interface DetectServicesResult extends ResolvedServicesResult {
     resolved: ResolvedServicesResult;
     inferred: InferredServicesResult | null;
 }
+/** A `vercel.json#daemons` entry as written in the config, before validation. */
+export interface DetectedDaemon {
+    name: string;
+    /** The daemon's `entrypoint` (e.g. `Dockerfile`), if it's a string. */
+    entrypoint?: string;
+}
 export type DetectServicesSource = 'configured' | 'auto-detected';
 export interface ServiceDetectionWarning {
     code: string;

package/dist/services/utils.d.ts

@@ -22,6 +22,8 @@ export interface ReadVercelConfigResult {
         experimentalServices?: ExperimentalServices;
         services?: Services;
         experimentalServicesV2?: ExperimentalServicesV2;
+        /** Unvalidated; read by `detectDaemons`. */
+        daemons?: unknown;
     } | null;
     error: ServiceDetectionError | null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "7.9.5",
+  "version": "7.9.7",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,7 +20,7 @@
     "minimatch": "3.1.2",
     "semver": "6.3.1",
     "smol-toml": "1.5.2",
-    "@vercel/build-utils": "14.20.0",
+    "@vercel/build-utils": "14.21.0",
     "@vercel/error-utils": "2.2.1",
     "@vercel/frameworks": "3.35.0",
     "@vercel/python-analysis": "0.14.0",
@@ -33,7 +33,7 @@
     "@types/node": "20.11.0",
     "@types/semver": "7.3.10",
     "vitest": "4.1.10",
-    "@vercel-internals/runtimes": "1.1.13"
+    "@vercel-internals/runtimes": "1.1.15"
   },
   "scripts": {
     "build": "node build.mjs",