@vercel/gatsby-plugin-vercel-builder 2.0.138 → 2.0.140

package/dist/index.js

@@ -1829,24 +1829,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,
@@ -1871,6 +1878,7 @@ var require_schemas = __commonJS({
                 type: "boolean"
               },
               important: {
+                deprecated: true,
                 type: "boolean"
               },
               user: {
@@ -1880,6 +1888,7 @@ var require_schemas = __commonJS({
                 type: "boolean"
               },
               override: {
+                deprecated: true,
                 type: "boolean"
               },
               check: {
@@ -1893,6 +1902,11 @@ var require_schemas = __commonJS({
                 minimum: 100,
                 maximum: 999
               },
+              statusCode: {
+                type: "integer",
+                minimum: 100,
+                maximum: 999
+              },
               locale: {
                 type: "object",
                 additionalProperties: false,
@@ -1958,6 +1972,7 @@ var require_schemas = __commonJS({
           },
           {
             type: "object",
+            deprecated: true,
             required: ["handle"],
             additionalProperties: false,
             properties: {
@@ -2231,6 +2246,35 @@ var require_dist3 = __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 };
@@ -2241,6 +2285,13 @@ var require_dist3 = __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;
@@ -2276,12 +2327,12 @@ var require_dist3 = __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) {
@@ -2302,7 +2353,7 @@ var require_dist3 = __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.`
           );
         }
       });
@@ -2318,7 +2369,7 @@ var require_dist3 = __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;
@@ -2391,20 +2442,8 @@ var require_dist3 = __commonJS({
     }
     function getTransformedRoutes2(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)
@@ -2425,6 +2464,14 @@ var require_dist3 = __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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/gatsby-plugin-vercel-builder",
-  "version": "2.0.138",
+  "version": "2.0.140",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -17,7 +17,7 @@
     "esbuild": "0.27.0",
     "etag": "1.8.1",
     "fs-extra": "11.1.0",
-    "@vercel/build-utils": "13.4.3"
+    "@vercel/build-utils": "13.6.0"
   },
   "devDependencies": {
     "@types/etag": "1.8.0",
@@ -27,7 +27,7 @@
     "@types/react": "18.0.26",
     "jest-junit": "16.0.0",
     "typescript": "4.9.5",
-    "@vercel/routing-utils": "5.3.3"
+    "@vercel/routing-utils": "6.0.0"
   },
   "license": "Apache-2.0",
   "scripts": {