@vercel/fs-detectors 7.7.2 → 7.8.0

package/dist/detect-builders.js

@@ -153,6 +153,7 @@ var require_entrypoint = __commonJS({
     var import_constants2 = require_constants();
     var PYTHON_MODULE_ATTR_RE = /^([A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)*):([A-Za-z_][\w]*)$/;
     var NODE_FILE_ENTRYPOINT_RE = /^(?!\/)(?!.*(?:^|\/)\.\.?(?:\/|$))(?:[\w@+.-]+\/)*[\w@+.-]+\.[cm]?[jt]s$/;
+    var PYTHON_FILE_ENTRYPOINT_RE = /^(?!\/)(?!.*(?:^|\/)\.\.?(?:\/|$))(?:[\w@+.-]+\/)*[\w@+.-]+\.py$/;
     var NODE_DECLARATION_ENTRYPOINT_RE = /\.d\.[cm]?ts$/;
     function parsePyModuleAttrEntrypoint2(entrypoint) {
       const match = PYTHON_MODULE_ATTR_RE.exec(entrypoint);
@@ -167,11 +168,10 @@ var require_entrypoint = __commonJS({
         moduleName: modulePart
       };
     }
-    var SCHEDULE_ENTRYPOINT_FORMS_HINT = 'Use a source file path like "jobs/nightly.ts" or a Python "module.path:function" reference.';
+    var SCHEDULE_ENTRYPOINT_FORMS_HINT = 'Use a source file path like "jobs/nightly.py" or "jobs/nightly.ts".';
     function parseScheduleEntrypoint(entrypoint) {
-      const python = parsePyModuleAttrEntrypoint2(entrypoint);
-      if (python) {
-        return { runtime: "python", ...python };
+      if (PYTHON_FILE_ENTRYPOINT_RE.test(entrypoint)) {
+        return { runtime: "python", filePath: entrypoint };
       }
       if (NODE_FILE_ENTRYPOINT_RE.test(entrypoint) && !NODE_DECLARATION_ENTRYPOINT_RE.test(entrypoint)) {
         return { runtime: "node", filePath: entrypoint };

package/dist/detect-framework.d.ts

@@ -3,6 +3,7 @@ import { DetectorFilesystem } from './detectors/filesystem';
 interface BaseFramework {
     slug: Framework['slug'];
     detectors?: Framework['detectors'];
+    supersedes?: Framework['supersedes'];
 }
 export interface DetectFrameworkOptions {
     fs: DetectorFilesystem;

package/dist/detect-framework.js

@@ -63,7 +63,8 @@ async function matches(fs, framework) {
   const check = async ({
     path,
     matchContent,
-    matchPackage
+    matchPackage,
+    fallback = false
   }) => {
     if (matchPackage && matchContent) {
       throw new Error(
@@ -102,12 +103,14 @@ async function matches(fs, framework) {
       if (matchPackage && match[3]) {
         return {
           framework,
-          detectedVersion: match[3]
+          detectedVersion: match[3],
+          fallback
         };
       }
     }
     return {
-      framework
+      framework,
+      fallback
     };
   };
   const result = [];
@@ -134,7 +137,8 @@ async function matches(fs, framework) {
   )?.detectedVersion;
   return {
     framework,
-    detectedVersion
+    detectedVersion,
+    fallback: result.some((match) => match?.fallback)
   };
 }
 function removeSupersededFramework(matches2, slug) {
@@ -158,6 +162,31 @@ function removeSupersededFrameworks(matches2) {
     }
   }
 }
+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 detectFramework({
   fs,
   frameworkList,
@@ -168,15 +197,12 @@ async function detectFramework({
     useExperimentalFrameworks
   );
   const result = await Promise.all(
-    filteredList.map(async (frameworkMatch) => {
-      if (await matches(fs, frameworkMatch)) {
-        return frameworkMatch;
-      }
-      return null;
+    filteredList.map(async (framework) => {
+      const match = await matches(fs, 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 detectFrameworks({
   fs,
@@ -188,15 +214,12 @@ async function detectFrameworks({
     useExperimentalFrameworks
   );
   const result = await Promise.all(
-    filteredList.map(async (frameworkMatch) => {
-      if (await matches(fs, frameworkMatch)) {
-        return frameworkMatch;
-      }
-      return null;
+    filteredList.map(async (framework) => {
+      const match = await matches(fs, framework);
+      return match ? { ...match, framework } : null;
     })
   );
-  removeSupersededFrameworks(result);
-  return result.filter((res) => res !== null);
+  return orderFrameworkMatches(result).map((match) => match.framework);
 }
 async function detectFrameworkRecord({
   fs,
@@ -208,19 +231,13 @@ async function detectFrameworkRecord({
     useExperimentalFrameworks
   );
   const result = await Promise.all(
-    filteredList.map(async (frameworkMatch) => {
-      const matchResult = await matches(fs, frameworkMatch);
-      if (matchResult) {
-        return {
-          ...frameworkMatch,
-          detectedVersion: matchResult?.detectedVersion
-        };
-      }
-      return null;
+    filteredList.map(async (framework) => {
+      const match2 = await matches(fs, 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 detectFrameworkVersion(frameworkRecord) {
   const allDetectors = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/fs-detectors",
-  "version": "7.7.2",
+  "version": "7.8.0",
   "description": "Vercel filesystem detectors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,11 +20,11 @@
     "minimatch": "3.1.2",
     "semver": "6.3.1",
     "smol-toml": "1.5.2",
-    "@vercel/build-utils": "14.13.0",
-    "@vercel/error-utils": "2.2.1",
-    "@vercel/frameworks": "3.34.0",
+    "@vercel/build-utils": "14.13.2",
+    "@vercel/frameworks": "3.35.0",
     "@vercel/python-analysis": "0.14.0",
-    "@vercel/routing-utils": "6.6.0"
+    "@vercel/routing-utils": "6.6.0",
+    "@vercel/error-utils": "2.2.1"
   },
   "devDependencies": {
     "@types/glob": "7.2.0",
@@ -33,7 +33,7 @@
     "@types/node": "20.11.0",
     "@types/semver": "7.3.10",
     "vitest": "4.1.10",
-    "@vercel-internals/runtimes": "1.1.4"
+    "@vercel-internals/runtimes": "1.1.6"
   },
   "scripts": {
     "build": "node build.mjs",