@vercel/static-build 2.8.41 → 2.8.42

package/dist/index.js

@@ -2918,12 +2918,12 @@ var require_lib2 = __commonJS({
       const dest = new URL$1(destination).hostname;
       return orig === dest || orig[orig.length - dest.length - 1] === "." && orig.endsWith(dest);
     };
-    function fetch3(url, opts) {
-      if (!fetch3.Promise) {
+    function fetch(url, opts) {
+      if (!fetch.Promise) {
         throw new Error("native promise missing, set fetch.Promise to your favorite alternative");
       }
-      Body.Promise = fetch3.Promise;
-      return new fetch3.Promise(function(resolve, reject) {
+      Body.Promise = fetch.Promise;
+      return new fetch.Promise(function(resolve, reject) {
         const request = new Request(url, opts);
         const options = getNodeRequestOptions(request);
         const send = (options.protocol === "https:" ? https : http).request;
@@ -2973,7 +2973,7 @@ var require_lib2 = __commonJS({
         req.on("response", function(res) {
           clearTimeout(reqTimeout);
           const headers = createHeadersLenient(res.headers);
-          if (fetch3.isRedirect(res.statusCode)) {
+          if (fetch.isRedirect(res.statusCode)) {
             const location = headers.get("Location");
             let locationURL = null;
             try {
@@ -3035,7 +3035,7 @@ var require_lib2 = __commonJS({
                   requestOpts.body = void 0;
                   requestOpts.headers.delete("content-length");
                 }
-                resolve(fetch3(new Request(locationURL, requestOpts)));
+                resolve(fetch(new Request(locationURL, requestOpts)));
                 finalize();
                 return;
             }
@@ -3095,11 +3095,11 @@ var require_lib2 = __commonJS({
         writeToStream(req, request);
       });
     }
-    fetch3.isRedirect = function(code) {
+    fetch.isRedirect = function(code) {
       return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
     };
-    fetch3.Promise = global.Promise;
-    module2.exports = exports2 = fetch3;
+    fetch.Promise = global.Promise;
+    module2.exports = exports2 = fetch;
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.default = exports2;
     exports2.Headers = Headers;
@@ -21584,24 +21584,31 @@ var require_schemas = __commonJS({
     };
     var routesSchema = {
       type: "array",
-      deprecated: true,
       description: "A list of routes objects used to rewrite paths to point towards other internal or external paths",
       example: [{ dest: "https://docs.example.com", src: "/docs" }],
       items: {
         anyOf: [
           {
             type: "object",
-            required: ["src"],
+            anyOf: [{ required: ["src"] }, { required: ["source"] }],
             additionalProperties: false,
             properties: {
               src: {
                 type: "string",
                 maxLength: 4096
               },
+              source: {
+                type: "string",
+                maxLength: 4096
+              },
               dest: {
                 type: "string",
                 maxLength: 4096
               },
+              destination: {
+                type: "string",
+                maxLength: 4096
+              },
               headers: {
                 type: "object",
                 additionalProperties: false,
@@ -21626,6 +21633,7 @@ var require_schemas = __commonJS({
                 type: "boolean"
               },
               important: {
+                deprecated: true,
                 type: "boolean"
               },
               user: {
@@ -21635,6 +21643,7 @@ var require_schemas = __commonJS({
                 type: "boolean"
               },
               override: {
+                deprecated: true,
                 type: "boolean"
               },
               check: {
@@ -21648,6 +21657,11 @@ var require_schemas = __commonJS({
                 minimum: 100,
                 maximum: 999
               },
+              statusCode: {
+                type: "integer",
+                minimum: 100,
+                maximum: 999
+              },
               locale: {
                 type: "object",
                 additionalProperties: false,
@@ -21713,6 +21727,7 @@ var require_schemas = __commonJS({
           },
           {
             type: "object",
+            deprecated: true,
             required: ["handle"],
             additionalProperties: false,
             properties: {
@@ -21986,6 +22001,35 @@ var require_dist6 = __commonJS({
     function isValidHandleValue(handle) {
       return validHandleValues.has(handle);
     }
+    function convertRouteAliases(route, index) {
+      if (route.source !== void 0) {
+        if (route.src !== void 0) {
+          throw new Error(
+            `Route at index ${index} cannot define both \`src\` and \`source\`. Please use only one.`
+          );
+        }
+        route.src = route.source;
+        delete route.source;
+      }
+      if (route.destination !== void 0) {
+        if (route.dest !== void 0) {
+          throw new Error(
+            `Route at index ${index} cannot define both \`dest\` and \`destination\`. Please use only one.`
+          );
+        }
+        route.dest = route.destination;
+        delete route.destination;
+      }
+      if (route.statusCode !== void 0) {
+        if (route.status !== void 0) {
+          throw new Error(
+            `Route at index ${index} cannot define both \`status\` and \`statusCode\`. Please use only one.`
+          );
+        }
+        route.status = route.statusCode;
+        delete route.statusCode;
+      }
+    }
     function normalizeRoutes(inputRoutes) {
       if (!inputRoutes || inputRoutes.length === 0) {
         return { routes: inputRoutes, error: null };
@@ -21996,6 +22040,13 @@ var require_dist6 = __commonJS({
       inputRoutes.forEach((r, i) => {
         const route = { ...r };
         routes.push(route);
+        if (!isHandler(route)) {
+          try {
+            convertRouteAliases(route, i);
+          } catch (err) {
+            errors.push(err.message);
+          }
+        }
         const keys = Object.keys(route);
         if (isHandler(route)) {
           const { handle } = route;
@@ -22031,12 +22082,12 @@ var require_dist6 = __commonJS({
           if (handleValue === "hit") {
             if (route.dest) {
               errors.push(
-                `Route at index ${i} cannot define \`dest\` after \`handle: hit\`.`
+                `Route at index ${i} cannot define \`dest\`/\`destination\` after \`handle: hit\`.`
               );
             }
             if (route.status) {
               errors.push(
-                `Route at index ${i} cannot define \`status\` after \`handle: hit\`.`
+                `Route at index ${i} cannot define \`status\`/\`statusCode\` after \`handle: hit\`.`
               );
             }
             if (!route.continue) {
@@ -22057,7 +22108,7 @@ var require_dist6 = __commonJS({
           }
         } else {
           errors.push(
-            `Route at index ${i} must define either \`handle\` or \`src\` property.`
+            `Route at index ${i} must define either \`src\` or \`source\` property.`
           );
         }
       });
@@ -22073,7 +22124,7 @@ var require_dist6 = __commonJS({
       try {
         new RegExp(src);
       } catch (err) {
-        const prop = type === "Route" ? "src" : "source";
+        const prop = type === "Route" ? "src`/`source" : "source";
         return `${type} at index ${index} has invalid \`${prop}\` regular expression "${src}".`;
       }
       return null;
@@ -22146,20 +22197,8 @@ var require_dist6 = __commonJS({
     }
     function getTransformedRoutes(vercelConfig) {
       const { cleanUrls, rewrites, redirects, headers, trailingSlash } = vercelConfig;
-      let { routes = null } = vercelConfig;
-      if (routes) {
-        const hasNewProperties = typeof cleanUrls !== "undefined" || typeof trailingSlash !== "undefined" || typeof redirects !== "undefined" || typeof headers !== "undefined" || typeof rewrites !== "undefined";
-        if (hasNewProperties) {
-          const error = createError(
-            "invalid_mixed_routes",
-            "If `rewrites`, `redirects`, `headers`, `cleanUrls` or `trailingSlash` are used, then `routes` cannot be present.",
-            "https://vercel.link/mix-routing-props",
-            "Learn More"
-          );
-          return { routes, error };
-        }
-        return normalizeRoutes(routes);
-      }
+      const { routes: userRoutes = null } = vercelConfig;
+      let routes = null;
       if (typeof cleanUrls !== "undefined") {
         const normalized = normalizeRoutes(
           (0, import_superstatic.convertCleanUrls)(cleanUrls, trailingSlash)
@@ -22180,6 +22219,14 @@ var require_dist6 = __commonJS({
         routes = routes || [];
         routes.push(...normalized.routes || []);
       }
+      if (userRoutes) {
+        const normalized = normalizeRoutes(userRoutes);
+        if (normalized.error) {
+          return { routes, error: normalized.error };
+        }
+        routes = routes || [];
+        routes.push(...normalized.routes || []);
+      }
       if (typeof redirects !== "undefined") {
         const code = "invalid_redirect";
         const regexErrorMessage = redirects.map((r, i) => checkRegexSyntax("Redirect", i, r.source)).find(notEmpty);
@@ -23462,6 +23509,7 @@ var require_detect_services = __commonJS({
       if (configError) {
         return {
           services: [],
+          source: "configured",
           routes: { rewrites: [], defaults: [], crons: [], workers: [] },
           errors: [configError],
           warnings: []
@@ -23474,6 +23522,7 @@ var require_detect_services = __commonJS({
         if (autoResult.errors.length > 0) {
           return {
             services: [],
+            source: "auto-detected",
             routes: { rewrites: [], defaults: [], crons: [], workers: [] },
             errors: autoResult.errors,
             warnings: []
@@ -23488,6 +23537,7 @@ var require_detect_services = __commonJS({
           const routes2 = generateServicesRoutes2(result2.services);
           return {
             services: result2.services,
+            source: "auto-detected",
             routes: routes2,
             errors: result2.errors,
             warnings: []
@@ -23495,6 +23545,7 @@ var require_detect_services = __commonJS({
         }
         return {
           services: [],
+          source: "auto-detected",
           routes: { rewrites: [], defaults: [], crons: [], workers: [] },
           errors: [
             {
@@ -23513,6 +23564,7 @@ var require_detect_services = __commonJS({
       const routes = generateServicesRoutes2(result.services);
       return {
         services: result.services,
+        source: "configured",
         routes,
         errors: result.errors,
         warnings: []
@@ -24414,23 +24466,7 @@ var require_detect_builders = __commonJS({
         }
       }
       if (frontendBuilder && ((0, import_is_official_runtime.isOfficialRuntime)("express", frontendBuilder.use) || (0, import_is_official_runtime.isOfficialRuntime)("hono", frontendBuilder.use) || (0, import_is_official_runtime.isOfficialRuntime)("backends", frontendBuilder.use))) {
-        const validFilenames = [
-          "app",
-          "index",
-          "server",
-          "src/app",
-          "src/index",
-          "src/server"
-        ];
-        const validExtensions = ["js", "cjs", "mjs", "ts", "cts", "mts"];
-        const validEntrypoints = validFilenames.flatMap(
-          (filename) => validExtensions.map((extension) => `${filename}.${extension}`)
-        );
-        for (const fnKey of unusedFunctions.values()) {
-          if (validEntrypoints.includes(fnKey)) {
-            unusedFunctions.delete(fnKey);
-          }
-        }
+        return null;
       }
       if (unusedFunctions.size) {
         const [fnKey] = Array.from(unusedFunctions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.8.41",
+  "version": "2.8.42",
   "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.139",
+    "@vercel/gatsby-plugin-vercel-builder": "2.0.140",
     "@vercel/static-config": "3.1.2"
   },
   "devDependencies": {
@@ -38,11 +38,11 @@
     "rc9": "1.2.0",
     "semver": "7.5.2",
     "tree-kill": "1.2.2",
-    "@vercel/build-utils": "13.5.0",
+    "@vercel/build-utils": "13.6.0",
     "@vercel/error-utils": "2.0.3",
-    "@vercel/frameworks": "3.19.0",
-    "@vercel/fs-detectors": "5.8.10",
-    "@vercel/routing-utils": "5.3.3"
+    "@vercel/routing-utils": "6.0.0",
+    "@vercel/fs-detectors": "5.8.12",
+    "@vercel/frameworks": "3.19.1"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",