@vercel/redwood 2.4.9 → 2.4.11

package/dist/index.js

@@ -928,7 +928,7 @@ var require_superstatic = __commonJS({
             route.missing = r.missing;
           }
           return route;
-        } catch (e) {
+        } catch (_e) {
           throw new Error(`Failed to parse redirect: ${JSON.stringify(r)}`);
         }
       });
@@ -961,7 +961,7 @@ var require_superstatic = __commonJS({
             route.status = r.statusCode;
           }
           return route;
-        } catch (e) {
+        } catch (_e) {
           throw new Error(`Failed to parse rewrite: ${JSON.stringify(r)}`);
         }
       });
@@ -1172,7 +1172,7 @@ var require_superstatic = __commonJS({
       if (attemptDirectCompile) {
         try {
           return (0, import_path_to_regexp.compile)(value, { validate: false })(indexes);
-        } catch (e) {
+        } catch (_e) {
         }
       }
       for (const key of Object.keys(indexes)) {
@@ -1390,6 +1390,76 @@ var require_merge = __commonJS({
   }
 });
 
+// ../routing-utils/dist/service-route-ownership.js
+var require_service_route_ownership = __commonJS({
+  "../routing-utils/dist/service-route-ownership.js"(exports, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames2(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      }
+      return to;
+    };
+    var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+    var service_route_ownership_exports = {};
+    __export2(service_route_ownership_exports, {
+      getOwnershipGuard: () => getOwnershipGuard2,
+      normalizeRoutePrefix: () => normalizeRoutePrefix2,
+      scopeRouteSourceToOwnership: () => scopeRouteSourceToOwnership2
+    });
+    module2.exports = __toCommonJS2(service_route_ownership_exports);
+    function normalizeRoutePrefix2(routePrefix) {
+      let normalized = routePrefix.startsWith("/") ? routePrefix : `/${routePrefix}`;
+      if (normalized !== "/" && normalized.endsWith("/")) {
+        normalized = normalized.slice(0, -1);
+      }
+      return normalized || "/";
+    }
+    function escapeForRegex(value) {
+      return value.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&");
+    }
+    function toPrefixMatcher(routePrefix) {
+      return `${escapeForRegex(routePrefix)}(?:/|$)`;
+    }
+    function isDescendantPrefix(candidate, prefix) {
+      return candidate !== prefix && candidate.startsWith(`${prefix}/`);
+    }
+    function getOwnershipGuard2(ownerPrefix, allRoutePrefixes) {
+      const owner = normalizeRoutePrefix2(ownerPrefix);
+      const normalizedPrefixes = Array.from(
+        new Set(allRoutePrefixes.map(normalizeRoutePrefix2))
+      );
+      const nonRootPrefixes = normalizedPrefixes.filter((prefix) => prefix !== "/").sort((a, b) => b.length - a.length);
+      if (owner === "/") {
+        return nonRootPrefixes.map((prefix) => `(?!${toPrefixMatcher(prefix)})`).join("");
+      }
+      const descendants = nonRootPrefixes.filter(
+        (prefix) => isDescendantPrefix(prefix, owner)
+      );
+      const positive = `(?=${toPrefixMatcher(owner)})`;
+      const negative = descendants.map((prefix) => `(?!${toPrefixMatcher(prefix)})`).join("");
+      return `${positive}${negative}`;
+    }
+    function scopeRouteSourceToOwnership2(source, ownershipGuard) {
+      if (!ownershipGuard) {
+        return source;
+      }
+      const inner = source.startsWith("^") ? source.slice(1) : source;
+      return `^${ownershipGuard}(?:${inner})`;
+    }
+  }
+});
+
 // ../routing-utils/dist/schemas.js
 var require_schemas = __commonJS({
   "../routing-utils/dist/schemas.js"(exports, module2) {
@@ -1699,6 +1769,7 @@ var require_schemas = __commonJS({
                 }
               }
             },
+            // biome-ignore lint/suspicious/noThenProperty: JSON Schema if/then keyword
             then: {
               required: ["args"]
             }
@@ -1722,6 +1793,7 @@ var require_schemas = __commonJS({
                 }
               ]
             },
+            // biome-ignore lint/suspicious/noThenProperty: JSON Schema if/then keyword
             then: {
               properties: {
                 target: {
@@ -1730,6 +1802,7 @@ var require_schemas = __commonJS({
                       if: {
                         type: "string"
                       },
+                      // biome-ignore lint/suspicious/noThenProperty: JSON Schema if/then keyword
                       then: {
                         pattern: "^[a-zA-Z0-9_-]+$"
                       }
@@ -1759,24 +1832,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,
@@ -1801,6 +1881,7 @@ var require_schemas = __commonJS({
                 type: "boolean"
               },
               important: {
+                deprecated: true,
                 type: "boolean"
               },
               user: {
@@ -1810,6 +1891,7 @@ var require_schemas = __commonJS({
                 type: "boolean"
               },
               override: {
+                deprecated: true,
                 type: "boolean"
               },
               check: {
@@ -1823,6 +1905,11 @@ var require_schemas = __commonJS({
                 minimum: 100,
                 maximum: 999
               },
+              statusCode: {
+                type: "integer",
+                minimum: 100,
+                maximum: 999
+              },
               locale: {
                 type: "object",
                 additionalProperties: false,
@@ -1888,6 +1975,7 @@ var require_schemas = __commonJS({
           },
           {
             type: "object",
+            deprecated: true,
             required: ["handle"],
             additionalProperties: false,
             properties: {
@@ -2127,11 +2215,14 @@ var require_dist3 = __commonJS({
     __export2(src_exports2, {
       appendRoutesToPhase: () => import_append.appendRoutesToPhase,
       getCleanUrls: () => import_superstatic2.getCleanUrls,
+      getOwnershipGuard: () => import_service_route_ownership.getOwnershipGuard,
       getTransformedRoutes: () => getTransformedRoutes2,
       isHandler: () => isHandler,
       isValidHandleValue: () => isValidHandleValue,
       mergeRoutes: () => import_merge.mergeRoutes,
+      normalizeRoutePrefix: () => import_service_route_ownership.normalizeRoutePrefix,
       normalizeRoutes: () => normalizeRoutes,
+      scopeRouteSourceToOwnership: () => import_service_route_ownership.scopeRouteSourceToOwnership,
       sourceToRegex: () => import_superstatic2.sourceToRegex
     });
     module2.exports = __toCommonJS2(src_exports2);
@@ -2139,6 +2230,7 @@ var require_dist3 = __commonJS({
     var import_superstatic = require_superstatic();
     var import_append = require_append();
     var import_merge = require_merge();
+    var import_service_route_ownership = require_service_route_ownership();
     __reExport(src_exports2, require_schemas(), module2.exports);
     var import_superstatic2 = require_superstatic();
     __reExport(src_exports2, require_types(), module2.exports);
@@ -2157,6 +2249,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 };
@@ -2167,6 +2288,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;
@@ -2202,12 +2330,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) {
@@ -2228,7 +2356,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.`
           );
         }
       });
@@ -2243,8 +2371,8 @@ var require_dist3 = __commonJS({
     function checkRegexSyntax(type, index, src) {
       try {
         new RegExp(src);
-      } catch (err) {
-        const prop = type === "Route" ? "src" : "source";
+      } catch (_err) {
+        const prop = type === "Route" ? "src`/`source" : "source";
         return `${type} at index ${index} has invalid \`${prop}\` regular expression "${src}".`;
       }
       return null;
@@ -2258,7 +2386,7 @@ var require_dist3 = __commonJS({
       const destinationSegments = /* @__PURE__ */ new Set();
       try {
         sourceSegments = new Set((0, import_superstatic.sourceToRegex)(source).segments);
-      } catch (err) {
+      } catch (_err) {
         return {
           message: `${type} at index ${index} has invalid \`source\` pattern "${source}".`,
           link: "https://vercel.link/invalid-route-source-pattern"
@@ -2279,7 +2407,7 @@ var require_dist3 = __commonJS({
               (name) => destinationSegments.add(name)
             );
           }
-        } catch (err) {
+        } catch (_err) {
         }
         const hasSegments = (0, import_superstatic.collectHasSegments)(has);
         for (const segment of destinationSegments) {
@@ -2317,20 +2445,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)
@@ -2351,6 +2467,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/redwood",
-  "version": "2.4.9",
+  "version": "2.4.11",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs",
@@ -13,20 +13,20 @@
     "directory": "packages/redwood"
   },
   "dependencies": {
-    "@vercel/nft": "1.1.1",
+    "@vercel/nft": "1.4.0",
     "semver": "6.3.1",
     "ts-morph": "12.0.0",
-    "@vercel/static-config": "3.1.2"
+    "@vercel/static-config": "3.2.0"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.19",
-    "@types/node": "14.18.33",
+    "@types/node": "20.11.0",
     "@types/semver": "6.0.0",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0",
-    "@vercel/routing-utils": "5.3.2",
-    "@vercel/build-utils": "13.2.9"
+    "@vercel/build-utils": "13.8.2",
+    "@vercel/routing-utils": "6.0.2"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",