netlify-cli 17.37.0-rc-redirect.0 → 17.37.0-rc-redirects.0

package/dist/utils/proxy.js

@@ -570,6 +570,23 @@ const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRe
     if (edgeFunctionsProxyURL !== undefined) {
         return proxy.web(req, res, { target: edgeFunctionsProxyURL });
     }
+    const match = await rewriter(req);
+    const options = {
+        match,
+        addonsUrls,
+        target: `http://${settings.frameworkHost && isIPv6(settings.frameworkHost) ? `[${settings.frameworkHost}]` : settings.frameworkHost}:${settings.frameworkPort}`,
+        publicFolder: settings.dist,
+        functionsServer,
+        functionsPort: settings.functionsPort,
+        jwtRolePath: settings.jwtRolePath,
+        framework: settings.framework,
+    };
+    if (match) {
+        // We don't want to generate an ETag for 3xx redirects.
+        // @ts-expect-error TS(7031) FIXME: Binding element 'statusCode' implicitly has an 'an... Remove this comment to see the full error message
+        req[shouldGenerateETag] = ({ statusCode }) => statusCode < 300 || statusCode >= 400;
+        return serveRedirect({ req, res, proxy, imageProxy, match, options, siteInfo, env, functionsRegistry });
+    }
     const functionMatch = functionsRegistry &&
         (await functionsRegistry.getFunctionForURLPath(req.url, req.method, () => getStatic(decodeURIComponent(reqToURL(req, req.url).pathname), settings.dist ?? '')));
     if (functionMatch) {
@@ -591,23 +608,6 @@ const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRe
     if (addonUrl) {
         return handleAddonUrl({ req, res, addonUrl });
     }
-    const match = await rewriter(req);
-    const options = {
-        match,
-        addonsUrls,
-        target: `http://${settings.frameworkHost && isIPv6(settings.frameworkHost) ? `[${settings.frameworkHost}]` : settings.frameworkHost}:${settings.frameworkPort}`,
-        publicFolder: settings.dist,
-        functionsServer,
-        functionsPort: settings.functionsPort,
-        jwtRolePath: settings.jwtRolePath,
-        framework: settings.framework,
-    };
-    if (match) {
-        // We don't want to generate an ETag for 3xx redirects.
-        // @ts-expect-error TS(7031) FIXME: Binding element 'statusCode' implicitly has an 'an... Remove this comment to see the full error message
-        req[shouldGenerateETag] = ({ statusCode }) => statusCode < 300 || statusCode >= 400;
-        return serveRedirect({ req, res, proxy, imageProxy, match, options, siteInfo, env, functionsRegistry });
-    }
     // The request will be served by the framework server, which means we want to
     // generate an ETag unless we're rendering an error page. The only way for
     // us to know that is by looking at the status code

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "17.37.0-rc-redirect.0",
+  "version": "17.37.0-rc-redirects.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "17.37.0-rc-redirect.0",
+      "version": "17.37.0-rc-redirects.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.37.0-rc-redirect.0",
+  "version": "17.37.0-rc-redirects.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {