@vercel/static-build 1.4.0 → 2.0.0

package/dist/index.js

@@ -234352,6 +234352,7 @@ exports.frameworks = [
         description: 'A new Remix app — the result of running `npx create-remix`.',
         website: 'https://remix.run',
         sort: 6,
+        supersedes: 'hydrogen',
         useRuntime: { src: 'package.json', use: '@vercel/remix-builder' },
         ignoreRuntimes: ['@vercel/node'],
         detectors: {
@@ -235810,6 +235811,7 @@ exports.frameworks = [
         tagline: 'React framework for headless commerce',
         description: 'React framework for headless commerce',
         website: 'https://hydrogen.shopify.dev',
+        supersedes: 'vite',
         useRuntime: { src: 'package.json', use: '@vercel/hydrogen' },
         envPrefix: 'PUBLIC_',
         detectors: {
@@ -236884,6 +236886,7 @@ function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders,
     const rewriteRoutes = [];
     const errorRoutes = [];
     const framework = frontendBuilder?.config?.framework || '';
+    const isGatsby = framework === 'gatsby';
     const isNextjs = framework === 'nextjs' || (0, is_official_runtime_1.isOfficialRuntime)('next', frontendBuilder?.use);
     const ignoreRuntimes = slugToFramework.get(framework)?.ignoreRuntimes;
     if (apiRoutes && apiRoutes.length > 0) {
@@ -236954,8 +236957,8 @@ function getRouteResult(apiRoutes, dynamicRoutes, outputDirectory, apiBuilders,
             dest: `/${outputDirectory}/$1`,
         });
     }
-    if (options.featHandleMiss && !isNextjs) {
-        // Exclude Next.js to avoid overriding custom error page
+    if (options.featHandleMiss && !isNextjs && !isGatsby) {
+        // Exclude Next.js (and Gatsby) to avoid overriding custom error page
         // https://nextjs.org/docs/advanced-features/custom-error-page
         errorRoutes.push({
             status: 404,
@@ -237179,7 +237182,7 @@ exports.detectFileSystemAPI = detectFileSystemAPI;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.detectFrameworkVersion = exports.detectFrameworkRecord = exports.detectFrameworks = exports.detectFramework = void 0;
+exports.detectFrameworkVersion = exports.detectFrameworkRecord = exports.detectFrameworks = exports.detectFramework = exports.removeSupersededFrameworks = void 0;
 const child_process_1 = __webpack_require__(7004);
 async function matches(fs, framework) {
     const { detectors } = framework;
@@ -237258,15 +237261,34 @@ async function matches(fs, framework) {
         detectedVersion,
     };
 }
+function removeSupersededFramework(matches, slug) {
+    const index = matches.findIndex(f => f?.slug === slug);
+    const framework = matches[index];
+    if (framework) {
+        if (framework.supersedes) {
+            removeSupersededFramework(matches, framework.supersedes);
+        }
+        matches.splice(index, 1);
+    }
+}
+function removeSupersededFrameworks(matches) {
+    for (const match of matches.slice()) {
+        if (match?.supersedes) {
+            removeSupersededFramework(matches, match.supersedes);
+        }
+    }
+}
+exports.removeSupersededFrameworks = removeSupersededFrameworks;
 // TODO: Deprecate and replace with `detectFrameworkRecord`
 async function detectFramework({ fs, frameworkList, }) {
     const result = await Promise.all(frameworkList.map(async (frameworkMatch) => {
         if (await matches(fs, frameworkMatch)) {
-            return frameworkMatch.slug;
+            return frameworkMatch;
         }
         return null;
     }));
-    return result.find(res => res !== null) ?? null;
+    removeSupersededFrameworks(result);
+    return result.find(res => res !== null)?.slug ?? null;
 }
 exports.detectFramework = detectFramework;
 /**
@@ -237279,6 +237301,7 @@ async function detectFrameworks({ fs, frameworkList, }) {
         }
         return null;
     }));
+    removeSupersededFrameworks(result);
     return result.filter(res => res !== null);
 }
 exports.detectFrameworks = detectFrameworks;
@@ -237294,8 +237317,8 @@ async function detectFrameworkRecord({ fs, frameworkList, }) {
         }
         return null;
     }));
-    const frameworkRecord = result.find(res => res !== null) ?? null;
-    return frameworkRecord;
+    removeSupersededFrameworks(result);
+    return result.find(res => res !== null) ?? null;
 }
 exports.detectFrameworkRecord = detectFrameworkRecord;
 function detectFrameworkVersion(frameworkRecord) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "1.4.0",
+  "version": "2.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.10",
-    "@vercel/gatsby-plugin-vercel-builder": "1.3.18"
+    "@vercel/gatsby-plugin-vercel-builder": "2.0.0"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.64",
@@ -26,17 +26,18 @@
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "6.8.3",
-    "@vercel/error-utils": "1.0.10",
-    "@vercel/frameworks": "1.6.0",
-    "@vercel/fs-detectors": "4.1.3",
+    "@vercel/build-utils": "7.0.0",
+    "@vercel/error-utils": "2.0.0",
+    "@vercel/frameworks": "2.0.0",
+    "@vercel/fs-detectors": "5.0.0",
     "@vercel/ncc": "0.24.0",
-    "@vercel/routing-utils": "2.2.1",
-    "@vercel/static-config": "2.0.17",
+    "@vercel/routing-utils": "3.0.0",
+    "@vercel/static-config": "3.0.0",
     "execa": "3.2.0",
     "fs-extra": "10.0.0",
     "get-port": "5.0.0",
     "is-port-reachable": "2.0.1",
+    "jest-junit": "16.0.0",
     "ms": "2.1.2",
     "node-fetch": "2.6.7",
     "rc9": "1.2.0",
@@ -46,7 +47,7 @@
   },
   "scripts": {
     "build": "node build",
-    "test": "jest --env node --verbose --bail --runInBand",
+    "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand",
     "test-unit": "pnpm test test/build.test.ts test/gatsby.test.ts test/prepare-cache.test.ts",
     "test-e2e": "pnpm test test/integration-*.test.js"
   }