@vercel/static-build 2.8.43 → 2.8.45

package/dist/index.js

@@ -8421,10 +8421,10 @@ var require_frameworks = __commonJS({
             const nowRoutes = JSON.parse(content);
             try {
               await unlink(nowRoutesPath);
-            } catch (err) {
+            } catch (_err) {
             }
             return nowRoutes;
-          } catch (err) {
+          } catch (_err) {
             return [
               {
                 src: "^/static/(.*)$",
@@ -10407,6 +10407,11 @@ var require_frameworks = __commonJS({
             {
               path: "Pipfile",
               matchContent: "[Dd]jango"
+            },
+            {
+              // a default django project will create a manage.py which sets DJANGO_SETTINGS_MODULE
+              path: "manage.py",
+              matchContent: "DJANGO_SETTINGS_MODULE"
             }
           ]
         },
@@ -20683,7 +20688,7 @@ var require_superstatic = __commonJS({
             route.missing = r.missing;
           }
           return route;
-        } catch (e) {
+        } catch (_e) {
           throw new Error(`Failed to parse redirect: ${JSON.stringify(r)}`);
         }
       });
@@ -20716,7 +20721,7 @@ var require_superstatic = __commonJS({
             route.status = r.statusCode;
           }
           return route;
-        } catch (e) {
+        } catch (_e) {
           throw new Error(`Failed to parse rewrite: ${JSON.stringify(r)}`);
         }
       });
@@ -20927,7 +20932,7 @@ var require_superstatic = __commonJS({
       if (attemptDirectCompile) {
         try {
           return (0, import_path_to_regexp.compile)(value, { validate: false })(indexes);
-        } catch (e) {
+        } catch (_e) {
         }
       }
       for (const key of Object.keys(indexes)) {
@@ -22123,7 +22128,7 @@ var require_dist6 = __commonJS({
     function checkRegexSyntax(type, index, src) {
       try {
         new RegExp(src);
-      } catch (err) {
+      } catch (_err) {
         const prop = type === "Route" ? "src`/`source" : "source";
         return `${type} at index ${index} has invalid \`${prop}\` regular expression "${src}".`;
       }
@@ -22138,7 +22143,7 @@ var require_dist6 = __commonJS({
       const destinationSegments = /* @__PURE__ */ new Set();
       try {
         sourceSegments = new Set((0, import_superstatic.sourceToRegex)(source).segments);
-      } catch (err) {
+      } catch (_err) {
         return {
           message: `${type} at index ${index} has invalid \`source\` pattern "${source}".`,
           link: "https://vercel.link/invalid-route-source-pattern"
@@ -22159,7 +22164,7 @@ var require_dist6 = __commonJS({
               (name) => destinationSegments.add(name)
             );
           }
-        } catch (err) {
+        } catch (_err) {
         }
         const hasSegments = (0, import_superstatic.collectHasSegments)(has);
         for (const segment of destinationSegments) {
@@ -22445,9 +22450,15 @@ var require_utils4 = __commonJS({
     var utils_exports = {};
     __export2(utils_exports, {
       INTERNAL_SERVICE_PREFIX: () => INTERNAL_SERVICE_PREFIX2,
+      filterFrameworksByRuntime: () => filterFrameworksByRuntime,
       getBuilderForRuntime: () => getBuilderForRuntime,
+      getInternalServiceCronPath: () => getInternalServiceCronPath2,
+      getInternalServiceCronPathPrefix: () => getInternalServiceCronPathPrefix2,
       getInternalServiceFunctionPath: () => getInternalServiceFunctionPath2,
+      getInternalServiceWorkerPath: () => getInternalServiceWorkerPath2,
+      getInternalServiceWorkerPathPrefix: () => getInternalServiceWorkerPathPrefix2,
       hasFile: () => hasFile,
+      inferRuntimeFromFramework: () => inferRuntimeFromFramework,
       inferServiceRuntime: () => inferServiceRuntime,
       isRouteOwningBuilder: () => isRouteOwningBuilder2,
       isStaticBuild: () => isStaticBuild2,
@@ -22467,6 +22478,24 @@ var require_utils4 = __commonJS({
     function getInternalServiceFunctionPath2(serviceName) {
       return `${INTERNAL_SERVICE_PREFIX2}/${serviceName}/index`;
     }
+    function normalizeInternalServiceEntrypoint(entrypoint) {
+      const normalized = entrypoint.replace(/\\/g, "/").replace(/^\/+/, "").replace(/\.[^/.]+$/, "");
+      return normalized || "index";
+    }
+    function getInternalServiceWorkerPathPrefix2(serviceName) {
+      return `${INTERNAL_SERVICE_PREFIX2}/${serviceName}/workers`;
+    }
+    function getInternalServiceCronPathPrefix2(serviceName) {
+      return `${INTERNAL_SERVICE_PREFIX2}/${serviceName}/crons`;
+    }
+    function getInternalServiceWorkerPath2(serviceName, entrypoint, handler = "worker") {
+      const normalizedEntrypoint = normalizeInternalServiceEntrypoint(entrypoint);
+      return `${getInternalServiceWorkerPathPrefix2(serviceName)}/${normalizedEntrypoint}/${handler}`;
+    }
+    function getInternalServiceCronPath2(serviceName, entrypoint, handler = "cron") {
+      const normalizedEntrypoint = normalizeInternalServiceEntrypoint(entrypoint);
+      return `${getInternalServiceCronPathPrefix2(serviceName)}/${normalizedEntrypoint}/${handler}`;
+    }
     function getBuilderForRuntime(runtime) {
       const builder = import_types.RUNTIME_BUILDERS[runtime];
       if (!builder) {
@@ -22480,19 +22509,37 @@ var require_utils4 = __commonJS({
     function isRouteOwningBuilder2(service) {
       return import_types.ROUTE_OWNING_BUILDERS.has(service.builder.use);
     }
-    function inferServiceRuntime(config) {
-      if (config.runtime && config.runtime in import_types.RUNTIME_BUILDERS) {
-        return config.runtime;
+    function inferRuntimeFromFramework(framework) {
+      if (!framework) {
+        return void 0;
       }
-      if (config.framework && config.framework in import_types.RUNTIME_BUILDERS) {
-        return config.framework;
+      if (framework in import_types.RUNTIME_BUILDERS) {
+        return framework;
       }
-      if ((0, import_framework_helpers.isPythonFramework)(config.framework)) {
+      if ((0, import_framework_helpers.isPythonFramework)(framework)) {
         return "python";
       }
-      if ((0, import_framework_helpers.isBackendFramework)(config.framework)) {
+      if ((0, import_framework_helpers.isBackendFramework)(framework)) {
         return "node";
       }
+      return void 0;
+    }
+    function filterFrameworksByRuntime(frameworks2, runtime) {
+      if (!runtime) {
+        return [...frameworks2];
+      }
+      return frameworks2.filter(
+        (framework) => inferRuntimeFromFramework(framework.slug) === runtime
+      );
+    }
+    function inferServiceRuntime(config) {
+      if (config.runtime && config.runtime in import_types.RUNTIME_BUILDERS) {
+        return config.runtime;
+      }
+      const frameworkRuntime = inferRuntimeFromFramework(config.framework);
+      if (frameworkRuntime) {
+        return frameworkRuntime;
+      }
       if (config.builder) {
         for (const [runtime, builderName] of Object.entries(import_types.RUNTIME_BUILDERS)) {
           if (config.builder === builderName) {
@@ -22914,12 +22961,14 @@ var require_resolve = __commonJS({
     async function detectFrameworkFromWorkspace({
       fs: fs5,
       workspace,
-      serviceName
+      serviceName,
+      runtime
     }) {
       const serviceFs = workspace === "." ? fs5 : fs5.chdir(workspace);
+      const frameworkCandidates = (0, import_utils.filterFrameworksByRuntime)(import_frameworks2.default, runtime);
       const frameworks2 = await (0, import_detect_framework.detectFrameworks)({
         fs: serviceFs,
-        frameworkList: import_frameworks2.default
+        frameworkList: frameworkCandidates
       });
       if (frameworks2.length > 1) {
         const frameworkNames = frameworks2.map((f) => f.name).join(", ");
@@ -23000,6 +23049,16 @@ var require_resolve = __commonJS({
           serviceName: name
         };
       }
+      if (config.runtime && config.framework) {
+        const frameworkRuntime = (0, import_utils.inferRuntimeFromFramework)(config.framework);
+        if (frameworkRuntime && frameworkRuntime !== config.runtime) {
+          return {
+            code: "RUNTIME_FRAMEWORK_MISMATCH",
+            message: `Service "${name}" has conflicting runtime/framework: runtime "${config.runtime}" is incompatible with framework "${config.framework}" (runtime "${frameworkRuntime}").`,
+            serviceName: name
+          };
+        }
+      }
       const hasFramework = Boolean(config.framework);
       const hasBuilderOrRuntime = Boolean(config.builder || config.runtime);
       const hasEntrypoint = Boolean(config.entrypoint);
@@ -23183,30 +23242,56 @@ var require_resolve = __commonJS({
           }
         }
         let resolvedConfig = serviceConfig;
-        const shouldDetectFramework = !serviceConfig.framework && Boolean(resolvedEntrypoint?.isDirectory);
-        if (shouldDetectFramework) {
-          const workspace = resolvedEntrypoint.normalized;
-          const { framework, error } = await detectFrameworkFromWorkspace({
-            fs: fs5,
-            workspace,
-            serviceName: name
-          });
-          if (error) {
-            errors.push(error);
-            continue;
-          }
-          if (!framework) {
-            errors.push({
-              code: "MISSING_SERVICE_FRAMEWORK",
-              message: `Service "${name}" uses directory entrypoint "${serviceConfig.entrypoint}" but no framework could be detected in "${workspace}". Specify "framework" explicitly or use a file entrypoint.`,
+        if (!serviceConfig.framework && resolvedEntrypoint) {
+          if (resolvedEntrypoint.isDirectory) {
+            const workspace = resolvedEntrypoint.normalized;
+            const { framework, error } = await detectFrameworkFromWorkspace({
+              fs: fs5,
+              workspace,
               serviceName: name
             });
-            continue;
+            if (error) {
+              errors.push(error);
+              continue;
+            }
+            if (!framework) {
+              errors.push({
+                code: "MISSING_SERVICE_FRAMEWORK",
+                message: `Service "${name}" uses directory entrypoint "${serviceConfig.entrypoint}" but no framework could be detected in "${workspace}". Specify "framework" explicitly or use a file entrypoint.`,
+                serviceName: name
+              });
+              continue;
+            }
+            resolvedConfig = {
+              ...resolvedConfig,
+              framework
+            };
+          } else {
+            const inferredRuntime = (0, import_utils.inferServiceRuntime)({
+              ...serviceConfig,
+              entrypoint: resolvedEntrypoint.normalized
+            });
+            if (inferredRuntime) {
+              const inferredWorkspace = await inferWorkspaceFromNearestManifest({
+                fs: fs5,
+                entrypoint: resolvedEntrypoint.normalized,
+                runtime: inferredRuntime
+              });
+              const workspace = inferredWorkspace ?? import_path7.posix.dirname(resolvedEntrypoint.normalized);
+              const detection = await detectFrameworkFromWorkspace({
+                fs: fs5,
+                workspace,
+                serviceName: name,
+                runtime: inferredRuntime
+              });
+              if (detection.framework) {
+                resolvedConfig = {
+                  ...resolvedConfig,
+                  framework: detection.framework
+                };
+              }
+            }
           }
-          resolvedConfig = {
-            ...serviceConfig,
-            framework
-          };
         }
         const service = await resolveConfiguredService({
           name,
@@ -23354,6 +23439,9 @@ var require_auto_detect = __commonJS({
       if (backendResult.error) {
         return { services: null, errors: [backendResult.error] };
       }
+      if (Object.keys(backendResult.services).length === 0) {
+        return { services: null, errors: [] };
+      }
       Object.assign(services, backendResult.services);
       return { services, errors: [] };
     }
@@ -23624,8 +23712,36 @@ var require_detect_services = __commonJS({
           continue;
         }
       }
+      const workerServices = services.filter((s) => s.type === "worker");
+      for (const service of workerServices) {
+        const workerEntrypoint = service.entrypoint || service.builder.src || "index";
+        const workerPath = (0, import_utils.getInternalServiceWorkerPath)(
+          service.name,
+          workerEntrypoint
+        );
+        const functionPath = (0, import_utils.getInternalServiceFunctionPath)(service.name);
+        workers.push({
+          src: `^${escapeRegex(workerPath)}$`,
+          dest: functionPath,
+          check: true
+        });
+      }
+      const cronServices = services.filter((s) => s.type === "cron");
+      for (const service of cronServices) {
+        const cronEntrypoint = service.entrypoint || service.builder.src || "index";
+        const cronPath = (0, import_utils.getInternalServiceCronPath)(service.name, cronEntrypoint);
+        const functionPath = (0, import_utils.getInternalServiceFunctionPath)(service.name);
+        crons.push({
+          src: `^${escapeRegex(cronPath)}$`,
+          dest: functionPath,
+          check: true
+        });
+      }
       return { rewrites, defaults, crons, workers };
     }
+    function escapeRegex(str) {
+      return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    }
     function getWebRoutePrefixes(services) {
       const unique = /* @__PURE__ */ new Set();
       for (const service of services) {
@@ -23925,7 +24041,11 @@ var require_get_services_builders = __commonJS({
         warnings: warningResponses,
         defaultRoutes: result.routes.defaults.length > 0 ? result.routes.defaults : null,
         redirectRoutes: [],
-        rewriteRoutes: result.routes.rewrites.length > 0 ? result.routes.rewrites : null,
+        rewriteRoutes: result.routes.rewrites.length > 0 || result.routes.workers.length > 0 || result.routes.crons.length > 0 ? [
+          ...result.routes.rewrites,
+          ...result.routes.workers,
+          ...result.routes.crons
+        ] : null,
         errorRoutes: [],
         services: result.services
       };
@@ -24182,7 +24302,7 @@ var require_detect_builders = __commonJS({
         builders.push(...apiBuilders);
       }
       if (frontendBuilder) {
-        if (frontendBuilder?.use === "@vercel/express" || frontendBuilder?.use === "@vercel/hono" || frontendBuilder?.use === "@vercel/python" || frontendBuilder?.use === "@vercel/go") {
+        if ((0, import_is_official_runtime.isOfficialRuntime)("express", frontendBuilder?.use) || (0, import_is_official_runtime.isOfficialRuntime)("hono", frontendBuilder?.use) || (0, import_is_official_runtime.isOfficialRuntime)("python", frontendBuilder?.use) || (0, import_is_official_runtime.isOfficialRuntime)("go", frontendBuilder?.use) || (0, import_is_official_runtime.isOfficialRuntime)("backends", frontendBuilder?.use)) {
           builders.push({
             src: "public/**/*",
             use: "@vercel/static",
@@ -24688,7 +24808,7 @@ var require_detect_builders = __commonJS({
           const hasApiBuild = apiBuilders.find((builder) => {
             return builder.src?.startsWith("api/");
           });
-          if (typeof ignoreRuntimes === "undefined" && hasApiBuild) {
+          if (typeof ignoreRuntimes === "undefined" && hasApiBuild && !isNextjs) {
             rewriteRoutes.push({
               src: "^/api(/.*)?$",
               status: 404
@@ -24696,7 +24816,7 @@ var require_detect_builders = __commonJS({
           }
         } else {
           defaultRoutes.push(...apiRoutes);
-          if (apiRoutes.length) {
+          if (apiRoutes.length && !isNextjs) {
             defaultRoutes.push({
               status: 404,
               src: "^/api(/.*)?$"
@@ -32191,7 +32311,11 @@ var require_dist7 = __commonJS({
       detectOutputDirectory: () => import_detect_builders.detectOutputDirectory,
       detectServices: () => import_detect_services.detectServices,
       generateServicesRoutes: () => import_detect_services.generateServicesRoutes,
+      getInternalServiceCronPath: () => import_utils.getInternalServiceCronPath,
+      getInternalServiceCronPathPrefix: () => import_utils.getInternalServiceCronPathPrefix,
       getInternalServiceFunctionPath: () => import_utils.getInternalServiceFunctionPath,
+      getInternalServiceWorkerPath: () => import_utils.getInternalServiceWorkerPath,
+      getInternalServiceWorkerPathPrefix: () => import_utils.getInternalServiceWorkerPathPrefix,
       getProjectPaths: () => import_get_project_paths.getProjectPaths,
       getServicesBuilders: () => import_get_services_builders.getServicesBuilders,
       getWorkspacePackagePaths: () => import_get_workspace_package_paths.getWorkspacePackagePaths,
@@ -32264,7 +32388,7 @@ async function readPackageJson(entryPath) {
   const packagePath = import_path.default.join(entryPath, "package.json");
   try {
     return JSON.parse(await import_fs.promises.readFile(packagePath, "utf8"));
-  } catch (err) {
+  } catch (_err) {
     return {};
   }
 }
@@ -32528,7 +32652,7 @@ async function readBuildOutputDirectory2({
           const project = new import_ts_morph.Project();
           const config = (0, import_static_config.getConfig)(project, middleware.file.fsPath);
           return config?.regions;
-        } catch (err) {
+        } catch (_err) {
           return void 0;
         }
       })()
@@ -33126,7 +33250,7 @@ function validateDistDir(distDir, workPath) {
       try {
         const vercelJson = JSON.parse((0, import_fs4.readFileSync)(vercelJsonPath, "utf8"));
         buildCommandExists = vercelJson.buildCommand !== void 0;
-      } catch (e) {
+      } catch (_e) {
       }
     }
     let message = `No Output Directory named "${distDirName}" found after the Build completed.`;
@@ -33602,7 +33726,7 @@ var build = async ({
         nowDevChildProcesses.add(child);
         try {
           await checkForPort(devPort, DEV_SERVER_PORT_BIND_TIMEOUT);
-        } catch (err) {
+        } catch (_err) {
           throw new Error(
             `Failed to detect a server running on port ${devPort}.
 Details: https://err.sh/vercel/vercel/now-static-build-failed-to-detect-a-server`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.8.43",
+  "version": "2.8.45",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -16,7 +16,7 @@
     "ts-morph": "12.0.0",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
     "@vercel/static-config": "3.1.2",
-    "@vercel/gatsby-plugin-vercel-builder": "2.0.141"
+    "@vercel/gatsby-plugin-vercel-builder": "2.0.143"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
@@ -38,11 +38,11 @@
     "rc9": "1.2.0",
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
-    "@vercel/build-utils": "13.6.1",
+    "@vercel/build-utils": "13.6.3",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/fs-detectors": "5.8.12",
-    "@vercel/routing-utils": "6.0.0",
-    "@vercel/frameworks": "3.19.1"
+    "@vercel/frameworks": "3.20.0",
+    "@vercel/routing-utils": "6.0.2",
+    "@vercel/fs-detectors": "5.8.18"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",