@vercel/go 3.1.2 → 3.1.3

package/dist/index.js

@@ -17908,8 +17908,8 @@ var import_yauzl_promise = __toESM(require_lib6());
 var import_xdg_app_paths = __toESM(require_xdg_app_paths());
 var streamPipeline = (0, import_util.promisify)(import_stream.pipeline);
 var versionMap = /* @__PURE__ */ new Map([
-  ["1.23", "1.23.0"],
-  ["1.22", "1.22.6"],
+  ["1.23", "1.23.1"],
+  ["1.22", "1.22.7"],
   ["1.21", "1.21.13"],
   ["1.20", "1.20.14"],
   ["1.19", "1.19.13"],
@@ -18047,7 +18047,7 @@ async function createGo({
 }) {
   let goPreferredVersion;
   if (modulePath) {
-    goPreferredVersion = await parseGoModVersion(modulePath);
+    goPreferredVersion = await getFullVersionFromGoMod(modulePath);
   }
   const goSelectedVersion = goPreferredVersion || Array.from(versionMap.values())[0];
   const env = (0, import_build_utils.cloneEnv)(process.env, opts.env);
@@ -18172,34 +18172,48 @@ function parseGoVersionString(goVersionOutput) {
 }
 var GoError = class extends Error {
 };
-async function parseGoModVersion(modulePath) {
-  let version2;
+async function getFullVersionFromGoMod(modulePath) {
   const file = (0, import_path.join)(modulePath, "go.mod");
+  let content;
   try {
-    const content = await (0, import_fs_extra.readFile)(file, "utf8");
-    const matches = /^go (\d+)\.(\d+)\.?$/gm.exec(content) || [];
-    const major = parseInt(matches[1], 10);
-    const minor = parseInt(matches[2], 10);
-    const full = versionMap.get(`${major}.${minor}`);
-    if (major === 1 && minor >= GO_MIN_VERSION && full) {
-      version2 = full;
-    } else if (!isNaN(minor)) {
-      const err = new GoError(
-        `Unsupported Go version ${major}.${minor} in ${file}`
-      );
-      err.code = "ERR_UNSUPPORTED_GO_VERSION";
-      throw err;
-    } else {
-      console.log(`Warning: Unknown Go version in ${file}`);
-    }
+    content = await (0, import_fs_extra.readFile)(file, "utf8");
   } catch (err) {
     if (err.code === "ENOENT") {
       (0, import_build_utils.debug)(`File not found: ${file}`);
+      return void 0;
     } else {
       throw err;
     }
   }
-  return version2;
+  const version2 = parseGoVersion(content);
+  if (!version2) {
+    console.log(`Warning: Unknown Go version in ${file}`);
+    return void 0;
+  }
+  if (version2.major === 1 && version2.minor >= GO_MIN_VERSION) {
+    return version2.patch === null ? versionMap.get(`${version2.major}.${version2.minor}`) : `${version2.major}.${version2.minor}.${version2.patch}`;
+  } else {
+    const versionString = version2.patch ? `${version2.major}.${version2.minor}.${version2.patch}` : `${version2.major}.${version2.minor}`;
+    const err = new GoError(
+      `Unsupported Go version ${versionString} in ${file}`
+    );
+    err.code = "ERR_UNSUPPORTED_GO_VERSION";
+    throw err;
+  }
+}
+function parseGoVersion(goModContent) {
+  const goVersionRegex = /^go\s+(\d+)\.(\d+)(?:\.(\d+))?$/m;
+  const match = goModContent.match(goVersionRegex);
+  if (match) {
+    const major = parseInt(match[1], 10);
+    const minor = parseInt(match[2], 10);
+    const patch = match[3] ? parseInt(match[3], 10) : null;
+    if (isNaN(major) || isNaN(minor) || patch !== null && isNaN(patch)) {
+      return null;
+    }
+    return { major, minor, patch };
+  }
+  return null;
 }
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/go",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -23,7 +23,7 @@
     "@types/node-fetch": "^2.3.0",
     "@types/tar": "6.1.5",
     "@types/yauzl-promise": "2.1.0",
-    "@vercel/build-utils": "8.3.9",
+    "@vercel/build-utils": "8.4.2",
     "async-retry": "1.3.3",
     "execa": "^1.0.0",
     "fs-extra": "^7.0.0",