@vercel/static-build 13.0.1 → 13.0.2

package/dist/index.js

@@ -7165,18 +7165,15 @@ var require_frameworks = __commonJS({
     var { readdir, readFile, unlink } = import_fs5.promises;
     var frameworks2 = [
       {
-        // A `Dockerfile.vercel` / `Containerfile.vercel` is an explicit opt-in to
-        // deploy a project as a container, regardless of any other framework that
-        // may also be detected. It is listed first so that framework detection
-        // (which returns the first match in list order) selects it over everything
-        // else — e.g. a Next.js app shipping a `Dockerfile.vercel` deploys as a
-        // container, not via `@vercel/next`.
+        // Versioned container files are an explicit opt-in and remain eager. Plain
+        // Dockerfile and Containerfile matches are fallback-only so they do not
+        // override a project's actual framework preset.
         name: "Container",
         slug: "container",
         runtimeFramework: true,
         logo: "https://api-frameworks.vercel.sh/framework-logos/container.svg",
         tagline: "Deploy any project as a container image built from a Dockerfile.",
-        description: "A project deployed as a container image, built from a Dockerfile.vercel or Containerfile.vercel.",
+        description: "A project deployed as a container image, built from a Dockerfile or Containerfile.",
         website: "https://docs.docker.com/reference/dockerfile/",
         useRuntime: { src: "<detect>", use: "@vercel/container" },
         detectors: {
@@ -7186,6 +7183,14 @@ var require_frameworks = __commonJS({
             },
             {
               path: "Containerfile.vercel"
+            },
+            {
+              path: "Dockerfile",
+              fallback: true
+            },
+            {
+              path: "Containerfile",
+              fallback: true
             }
           ]
         },
@@ -37677,7 +37682,8 @@ var require_detect_framework = __commonJS({
       const check = async ({
         path: path6,
         matchContent,
-        matchPackage
+        matchPackage,
+        fallback = false
       }) => {
         if (matchPackage && matchContent) {
           throw new Error(
@@ -37716,12 +37722,14 @@ var require_detect_framework = __commonJS({
           if (matchPackage && match[3]) {
             return {
               framework,
-              detectedVersion: match[3]
+              detectedVersion: match[3],
+              fallback
             };
           }
         }
         return {
-          framework
+          framework,
+          fallback
         };
       };
       const result = [];
@@ -37748,7 +37756,8 @@ var require_detect_framework = __commonJS({
       )?.detectedVersion;
       return {
         framework,
-        detectedVersion
+        detectedVersion,
+        fallback: result.some((match) => match?.fallback)
       };
     }
     function removeSupersededFramework(matches2, slug) {
@@ -37772,6 +37781,31 @@ var require_detect_framework = __commonJS({
         }
       }
     }
+    function orderFrameworkMatches(matches2) {
+      const normalMatches = matches2.filter(
+        (match) => Boolean(match && !match.fallback)
+      );
+      const fallbackMatches = matches2.filter(
+        (match) => Boolean(match?.fallback)
+      );
+      const normalFrameworks = normalMatches.map((match) => match.framework);
+      removeSupersededFrameworks(normalFrameworks);
+      const fallbackFrameworks = fallbackMatches.map((match) => match.framework);
+      for (const framework of normalFrameworks) {
+        for (const slug of framework.supersedes ?? []) {
+          removeSupersededFramework(fallbackFrameworks, slug);
+        }
+      }
+      removeSupersededFrameworks(fallbackFrameworks);
+      return [
+        ...normalMatches.filter(
+          (match) => normalFrameworks.includes(match.framework)
+        ),
+        ...fallbackMatches.filter(
+          (match) => fallbackFrameworks.includes(match.framework)
+        )
+      ];
+    }
     async function detectFramework2({
       fs: fs5,
       frameworkList,
@@ -37782,15 +37816,12 @@ var require_detect_framework = __commonJS({
         useExperimentalFrameworks
       );
       const result = await Promise.all(
-        filteredList.map(async (frameworkMatch) => {
-          if (await matches(fs5, frameworkMatch)) {
-            return frameworkMatch;
-          }
-          return null;
+        filteredList.map(async (framework) => {
+          const match = await matches(fs5, framework);
+          return match ? { ...match, framework } : null;
         })
       );
-      removeSupersededFrameworks(result);
-      return result.find((res) => res !== null)?.slug ?? null;
+      return orderFrameworkMatches(result)[0]?.framework.slug ?? null;
     }
     async function detectFrameworks2({
       fs: fs5,
@@ -37802,15 +37833,12 @@ var require_detect_framework = __commonJS({
         useExperimentalFrameworks
       );
       const result = await Promise.all(
-        filteredList.map(async (frameworkMatch) => {
-          if (await matches(fs5, frameworkMatch)) {
-            return frameworkMatch;
-          }
-          return null;
+        filteredList.map(async (framework) => {
+          const match = await matches(fs5, framework);
+          return match ? { ...match, framework } : null;
         })
       );
-      removeSupersededFrameworks(result);
-      return result.filter((res) => res !== null);
+      return orderFrameworkMatches(result).map((match) => match.framework);
     }
     async function detectFrameworkRecord3({
       fs: fs5,
@@ -37822,19 +37850,13 @@ var require_detect_framework = __commonJS({
         useExperimentalFrameworks
       );
       const result = await Promise.all(
-        filteredList.map(async (frameworkMatch) => {
-          const matchResult = await matches(fs5, frameworkMatch);
-          if (matchResult) {
-            return {
-              ...frameworkMatch,
-              detectedVersion: matchResult?.detectedVersion
-            };
-          }
-          return null;
+        filteredList.map(async (framework) => {
+          const match2 = await matches(fs5, framework);
+          return match2 ? { ...match2, framework } : null;
         })
       );
-      removeSupersededFrameworks(result);
-      return result.find((res) => res !== null) ?? null;
+      const match = orderFrameworkMatches(result)[0];
+      return match ? { ...match.framework, detectedVersion: match.detectedVersion } : null;
     }
     function detectFrameworkVersion2(frameworkRecord) {
       const allDetectors = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "13.0.1",
+  "version": "13.0.2",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -15,11 +15,11 @@
   "dependencies": {
     "ts-morph": "12.0.0",
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.12",
-    "@vercel/gatsby-plugin-vercel-builder": "2.2.62",
-    "@vercel/static-config": "3.4.3"
+    "@vercel/gatsby-plugin-vercel-builder": "2.2.63",
+    "@vercel/static-config": "3.4.4"
   },
   "peerDependencies": {
-    "@vercel/build-utils": "14.13.1"
+    "@vercel/build-utils": "14.13.2"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
@@ -40,11 +40,11 @@
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
     "vitest": "4.1.10",
-    "@vercel/build-utils": "14.13.1",
     "@vercel/error-utils": "2.2.1",
-    "@vercel/frameworks": "3.34.0",
-    "@vercel/routing-utils": "6.6.0",
-    "@vercel/fs-detectors": "7.7.3"
+    "@vercel/build-utils": "14.13.2",
+    "@vercel/frameworks": "3.35.0",
+    "@vercel/fs-detectors": "7.8.0",
+    "@vercel/routing-utils": "6.6.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",