@vercel/go 2.2.0 → 2.2.3

package/dist/analyze.go

@@ -197,7 +197,9 @@ func main() {
 			// find a valid `http.HandlerFunc` handler function
 			params := rf[fn.Type.Params.Pos()-offset : fn.Type.Params.End()-offset]
 			validHandlerFunc := (strings.Contains(string(params), "http.ResponseWriter") &&
-				strings.Contains(string(params), "*http.Request") && len(fn.Type.Params.List) == 2)
+				strings.Contains(string(params), "*http.Request") &&
+				len(fn.Type.Params.List) == 2 &&
+				(fn.Recv == nil || len(fn.Recv.List) == 0))
 
 			if validHandlerFunc {
 				// we found the first exported function with `http.HandlerFunc`
@@ -223,7 +225,7 @@ func main() {
 		if fn.Name.IsExported() == true {
 			for _, param := range fn.Type.Params.List {
 				paramStr := fmt.Sprintf("%s", param.Type)
-				if strings.Contains(string(paramStr), "http ResponseWriter") && len(fn.Type.Params.List) == 2 {
+				if strings.Contains(string(paramStr), "http ResponseWriter") && len(fn.Type.Params.List) == 2 && (fn.Recv == nil || len(fn.Recv.List) == 0) {
 					analyzed := analyze{
 						PackageName: parsed.Name.Name,
 						FuncName:    fn.Name.Name,

package/dist/index.js

@@ -18074,8 +18074,14 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
 exports.build = build;
 async function renameHandlerFunction(fsPath, from, to) {
     let fileContents = await fs_extra_1.readFile(fsPath, 'utf8');
-    const fromRegex = new RegExp(`\\b${from}\\b`, 'g');
-    fileContents = fileContents.replace(fromRegex, to);
+    // This regex has to walk a fine line where it replaces the most-likely occurrences
+    // of the handler's identifier without clobbering other syntax.
+    // Left-hand Side: A single space was chosen because it can catch `func Handler`
+    //   as well as `var _ http.HandlerFunc = Index`.
+    // Right-hand Side: a word boundary was chosen because this can be an end of line
+    //   or an open paren (as in `func Handler(`).
+    const fromRegex = new RegExp(String.raw ` ${from}\b`, 'g');
+    fileContents = fileContents.replace(fromRegex, ` ${to}`);
     await fs_extra_1.writeFile(fsPath, fileContents);
 }
 function getNewHandlerFunctionName(originalFunctionName, entrypoint) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/go",
-  "version": "2.2.0",
+  "version": "2.2.3",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -35,7 +35,7 @@
     "@types/jest": "28.1.6",
     "@types/node-fetch": "^2.3.0",
     "@types/tar": "^4.0.0",
-    "@vercel/build-utils": "5.3.1",
+    "@vercel/build-utils": "5.4.0",
     "@vercel/ncc": "0.24.0",
     "async-retry": "1.3.1",
     "execa": "^1.0.0",
@@ -45,5 +45,5 @@
     "tar": "4.4.6",
     "typescript": "4.3.4"
   },
-  "gitHead": "09c85f63d2aa47c147260d343767f6eea60e352c"
+  "gitHead": "e7e0a55b72bc73c26661f7b2a3caa0884a5d1764"
 }