encode "+" character in query string

Author: john-trieu-nguyen

packages/open-next/src/core/routing/matcher.ts

@@ -200,10 +200,16 @@ export function handleRewrites<T extends RewriteDefinition>(
     );
     // We need to use a localized path if the rewrite is not locale specific
     const pathToUse = rewrite.locale === false ? rawPath : localizedRawPath;
+    // We need to encode the "+" character with its UTF-8 equivalent "%20" to avoid 2 issues:
+    // 1. The compile function from path-to-regexp will throw an error if it finds a "+" character.
+    // https://github.com/pillarjs/path-to-regexp?tab=readme-ov-file#unexpected--or-
+    // 2. The convertToQueryString function will replace the "+" character with %2B instead of %20.
+    // %2B does not get interpreted as a space in the URL thus breaking the query string.
+    const encodePlusQueryString = queryString.replaceAll("+", "%20")
     debug("urlParts", { pathname, protocol, hostname, queryString });
     const toDestinationPath = compile(escapeRegex(pathname ?? "") ?? "");
     const toDestinationHost = compile(escapeRegex(hostname ?? "") ?? "");
-    const toDestinationQuery = compile(escapeRegex(queryString ?? "") ?? "");
+    const toDestinationQuery = compile(escapeRegex(encodePlusQueryString ?? "") ?? "");
     let params = {
       // params for the source
       ...getParamsFromSource(match(escapeRegex(rewrite?.source) ?? ""))(
@@ -219,7 +225,7 @@ export function handleRewrites<T extends RewriteDefinition>(
       }, {}),
     };
     const isUsingParams = Object.keys(params).length > 0;
-    let rewrittenQuery = queryString;
+    let rewrittenQuery = encodePlusQueryString;
     let rewrittenHost = hostname;
     let rewrittenPath = pathname;
     if (isUsingParams) {