feat: remove redundant function error template and clean old one

netlify · Sep 26, 2022 · 906fe6d · 906fe6d
1 parent 84884f1
commit 906fe6d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 347 deletions.
diff --git a/src/lib/functions/synchronous.js b/src/lib/functions/synchronous.js
@@ -50,7 +50,9 @@ const processRenderedResponse = async (err, request) => {
   const acceptsHtml = request.headers && request.headers.accept && request.headers.accept.includes('text/html')
   const errorString = typeof err === 'string' ? err : formatLambdaLocalError(err, acceptsHtml)
 
-  return acceptsHtml ? await renderErrorTemplate(errorString, './templates/function-error.html') : errorString
+  return acceptsHtml
+    ? await renderErrorTemplate(errorString, './templates/function-error.html', 'function')
+    : errorString
 }
 
 const handleErr = async (err, request, response) => {

diff --git a/src/lib/render-error-remplate.js b/src/lib/render-error-remplate.js
@@ -3,12 +3,12 @@ const { join } = require('path')
 
 let errorTemplateFile
 
-const renderErrorTemplate = async (errString, templatePath) => {
-  const regexPattern = /<!--@ERROR-DETAILS-->/g
-
+const renderErrorTemplate = async (errString, templatePath, functionType) => {
+  const errorDetailsRegex = /<!--@ERROR-DETAILS-->/g
+  const functionTypeRegex = /<!--@FUNCTION-TYPE-->/g
   try {
     errorTemplateFile = errorTemplateFile || (await readFile(join(__dirname, templatePath), 'utf-8'))
-    return errorTemplateFile.replace(regexPattern, errString)
+    return errorTemplateFile.replace(errorDetailsRegex, errString).replace(functionTypeRegex, functionType)
   } catch {
     return errString
   }

diff --git a/src/lib/templates/edge-function-error.html b/src/lib/templates/edge-function-error.html