refactor: always rely on getFunctionForURLPath

netlify · Oct 9, 2023 · 6dd8aec · 6dd8aec
1 parent cb03449
commit 6dd8aec
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/utils/proxy.mjs b/src/utils/proxy.mjs
@@ -329,24 +329,24 @@ const serveRedirect = async function ({ env, functionsRegistry, match, options,
       return proxy.web(req, res, { target: options.functionsServer })
     }
 
-    const functionWithCustomRoute =
-      functionsRegistry && (await functionsRegistry.getFunctionForURLPath(destURL, req.method))
+    const matchingFunction = functionsRegistry && (await functionsRegistry.getFunctionForURLPath(destURL, req.method))
     const destStaticFile = await getStatic(dest.pathname, options.publicFolder)
     let statusValue
     if (
       match.force ||
-      (!staticFile && ((!options.framework && destStaticFile) || isInternal(destURL) || functionWithCustomRoute))
+      (!staticFile && ((!options.framework && destStaticFile) || isInternal(destURL) || matchingFunction))
     ) {
       req.url = destStaticFile ? destStaticFile + dest.search : destURL
       const { status } = match
       statusValue = status
       console.log(`${NETLIFYDEVLOG} Rewrote URL to`, req.url)
     }
 
-    if (isFunction(options.functionsPort, req.url) || functionWithCustomRoute) {
-      const functionHeaders = functionWithCustomRoute
-        ? { [NFFunctionName]: functionWithCustomRoute.func.name, [NFFunctionRoute]: functionWithCustomRoute.route }
-        : {}
+    if (matchingFunction) {
+      const functionHeaders = {
+        [NFFunctionName]: matchingFunction.func.name,
+        [NFFunctionRoute]: matchingFunction.route,
+      }
       const url = reqToURL(req, originalURL)
       req.headers['x-netlify-original-pathname'] = url.pathname
       req.headers['x-netlify-original-search'] = url.search