@vercel/static-build 2.8.25 → 2.8.27

package/dist/index.js

@@ -20351,6 +20351,168 @@ var require_detect_builders = __commonJS({
   }
 });
 
+// ../fs-detectors/dist/services/resolve.js
+var require_resolve = __commonJS({
+  "../fs-detectors/dist/services/resolve.js"(exports2, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames2(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      }
+      return to;
+    };
+    var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+    var resolve_exports = {};
+    __export2(resolve_exports, {
+      resolveService: () => resolveService,
+      validateServiceConfig: () => validateServiceConfig
+    });
+    module2.exports = __toCommonJS2(resolve_exports);
+    function validateServiceConfig(name, config) {
+      if (config.type === "cron" && !config.schedule) {
+        return {
+          code: "MISSING_CRON_SCHEDULE",
+          message: `Cron service "${name}" is missing required "schedule" field`,
+          serviceName: name
+        };
+      }
+      return null;
+    }
+    function resolveService(name, config, group) {
+      const type = config.type || "web";
+      const workspace = config.workspace || ".";
+      const topic = type === "worker" ? config.topic || "default" : config.topic;
+      const consumer = type === "worker" ? config.consumer || "default" : config.consumer;
+      return {
+        name,
+        type,
+        group,
+        workspace,
+        entrypoint: config.entrypoint,
+        routePrefix: config.routePrefix,
+        framework: config.framework,
+        builder: config.builder,
+        runtime: config.runtime,
+        buildCommand: config.buildCommand,
+        installCommand: config.installCommand,
+        memory: config.memory,
+        maxDuration: config.maxDuration,
+        includeFiles: config.includeFiles,
+        excludeFiles: config.excludeFiles,
+        schedule: config.schedule,
+        topic,
+        consumer
+      };
+    }
+  }
+});
+
+// ../fs-detectors/dist/services/types.js
+var require_types2 = __commonJS({
+  "../fs-detectors/dist/services/types.js"(exports2, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames2(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      }
+      return to;
+    };
+    var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+    var types_exports = {};
+    __export2(types_exports, {
+      RUNTIME_BUILDERS: () => RUNTIME_BUILDERS
+    });
+    module2.exports = __toCommonJS2(types_exports);
+    var RUNTIME_BUILDERS = {
+      node: "@vercel/node",
+      python: "@vercel/python",
+      go: "@vercel/go",
+      rust: "@vercel/rust",
+      ruby: "@vercel/ruby"
+    };
+  }
+});
+
+// ../fs-detectors/dist/services/index.js
+var require_services = __commonJS({
+  "../fs-detectors/dist/services/index.js"(exports2, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames2(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      }
+      return to;
+    };
+    var __reExport = (target, mod, secondTarget) => (__copyProps2(target, mod, "default"), secondTarget && __copyProps2(secondTarget, mod, "default"));
+    var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+    var services_exports = {};
+    __export2(services_exports, {
+      detectServices: () => detectServices2
+    });
+    module2.exports = __toCommonJS2(services_exports);
+    var import_resolve = require_resolve();
+    __reExport(services_exports, require_types2(), module2.exports);
+    __reExport(services_exports, require_resolve(), module2.exports);
+    async function detectServices2(options) {
+      const { fs: fs5, workPath = "" } = options;
+      const services = [];
+      const errors = [];
+      const configPath = workPath ? `${workPath}/vercel.json` : "vercel.json";
+      let experimentalServices;
+      try {
+        const configBuffer = await fs5.readFile(configPath);
+        const config = JSON.parse(configBuffer.toString("utf-8"));
+        experimentalServices = config.experimentalServices;
+      } catch {
+        return { services, errors };
+      }
+      if (experimentalServices && typeof experimentalServices === "object") {
+        for (const name of Object.keys(experimentalServices)) {
+          const serviceConfig = experimentalServices[name];
+          const validationError = (0, import_resolve.validateServiceConfig)(name, serviceConfig);
+          if (validationError) {
+            errors.push(validationError);
+            continue;
+          }
+          const resolved = (0, import_resolve.resolveService)(name, serviceConfig);
+          services.push(resolved);
+        }
+      }
+      return { services, errors };
+    }
+  }
+});
+
 // ../fs-detectors/dist/detect-file-system-api.js
 var require_detect_file_system_api = __commonJS({
   "../fs-detectors/dist/detect-file-system-api.js"(exports2, module2) {
@@ -28240,6 +28402,7 @@ var require_dist4 = __commonJS({
       detectFrameworks: () => import_detect_framework.detectFrameworks,
       detectInstrumentation: () => import_detect_instrumentation.detectInstrumentation,
       detectOutputDirectory: () => import_detect_builders.detectOutputDirectory,
+      detectServices: () => import_services.detectServices,
       getProjectPaths: () => import_get_project_paths.getProjectPaths,
       getWorkspacePackagePaths: () => import_get_workspace_package_paths.getWorkspacePackagePaths,
       getWorkspaces: () => import_get_workspaces.getWorkspaces,
@@ -28251,6 +28414,7 @@ var require_dist4 = __commonJS({
     });
     module2.exports = __toCommonJS2(src_exports2);
     var import_detect_builders = require_detect_builders();
+    var import_services = require_services();
     var import_detect_file_system_api = require_detect_file_system_api();
     var import_detect_framework = require_detect_framework();
     var import_get_project_paths = require_get_project_paths();
@@ -29379,6 +29543,7 @@ var build = async ({
     let isNpmInstall = false;
     let isBundleInstall = false;
     let isPipInstall = false;
+    let pipTargetDir;
     let output = {};
     let images;
     const routes = [];
@@ -29534,13 +29699,16 @@ var build = async ({
         if ((0, import_fs4.existsSync)(requirementsPath)) {
           (0, import_build_utils4.debug)("Detected requirements.txt");
           printInstall();
-          await (0, import_build_utils4.runPipInstall)(
+          const pipResult = await (0, import_build_utils4.runPipInstall)(
             workPath,
             ["-r", requirementsPath],
             void 0,
             meta
           );
-          isPipInstall = true;
+          if (pipResult.installed) {
+            pipTargetDir = pipResult.targetDir;
+            isPipInstall = true;
+          }
         }
         if (pkg) {
           await (0, import_build_utils4.runNpmInstall)(
@@ -29584,17 +29752,34 @@ var build = async ({
       if (rubyVersion.status === 0 && typeof rubyVersion.stdout === "string") {
         gemHome = import_path6.default.join(dir, rubyVersion.stdout.trim());
         (0, import_build_utils4.debug)(`Set GEM_HOME="${gemHome}" because a Gemfile was found`);
+        const gemBin = import_path6.default.join(gemHome, "bin");
+        pathList.push(gemBin);
+        (0, import_build_utils4.debug)(`Added "${gemBin}" to PATH env because a Gemfile was found`);
       }
     }
-    if (isPipInstall) {
+    if (isPipInstall && pipTargetDir) {
+      const pipBinDir = import_path6.default.join(pipTargetDir, "bin");
+      pathList.push(pipBinDir);
+      (0, import_build_utils4.debug)(
+        `Added "${pipBinDir}" to PATH env because a requirements.txt was found`
+      );
     }
     if (spawnEnv.PATH) {
       pathList.push(spawnEnv.PATH);
     }
+    let pythonPath;
+    if (isPipInstall && pipTargetDir) {
+      const existingPythonPath = process.env.PYTHONPATH;
+      pythonPath = existingPythonPath ? `${pipTargetDir}${import_path6.default.delimiter}${existingPythonPath}` : pipTargetDir;
+      (0, import_build_utils4.debug)(
+        `Set PYTHONPATH="${pythonPath}" because a requirements.txt was found`
+      );
+    }
     const cliEnv = {
       ...process.env,
       PATH: pathList.join(import_path6.default.delimiter),
-      GEM_HOME: gemHome
+      GEM_HOME: gemHome,
+      ...pythonPath && { PYTHONPATH: pythonPath }
     };
     if (meta.isDev && (devCommand || pkg && devScript && pkg.scripts && pkg.scripts[devScript])) {
       let devPort = nowDevScriptPorts.get(entrypoint);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.8.25",
+  "version": "2.8.27",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -15,7 +15,7 @@
   "dependencies": {
     "ts-morph": "12.0.0",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.0.124",
+    "@vercel/gatsby-plugin-vercel-builder": "2.0.126",
     "@vercel/static-config": "3.1.2"
   },
   "devDependencies": {
@@ -24,7 +24,7 @@
     "@types/fs-extra": "9.0.13",
     "@types/jest": "27.4.1",
     "@types/ms": "0.7.31",
-    "@types/node": "14.18.33",
+    "@types/node": "20.11.0",
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
     "@types/semver": "7.3.13",
@@ -38,10 +38,10 @@
     "rc9": "1.2.0",
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
-    "@vercel/build-utils": "13.2.13",
-    "@vercel/routing-utils": "5.3.2",
+    "@vercel/build-utils": "13.2.15",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/fs-detectors": "5.7.15",
+    "@vercel/fs-detectors": "5.7.16",
+    "@vercel/routing-utils": "5.3.2",
     "@vercel/frameworks": "3.15.7"
   },
   "scripts": {