@vercel/go 3.1.3 → 3.2.1

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.1"],
-  ["1.22", "1.22.7"],
+  ["1.23", "1.23.2"],
+  ["1.22", "1.22.8"],
   ["1.21", "1.21.13"],
   ["1.20", "1.20.14"],
   ["1.19", "1.19.13"],
@@ -17927,13 +17927,14 @@ var archMap = /* @__PURE__ */ new Map([
 var platformMap = /* @__PURE__ */ new Map([["win32", "windows"]]);
 var localCacheDir = (0, import_path.join)(".vercel", "cache", "golang");
 var GO_FLAGS = process.platform === "win32" ? [] : ["-ldflags", "-s -w"];
-var GO_MIN_VERSION = 13;
+var GO_MIN_MAJOR_VERSION = 1;
+var GO_MIN_MINOR_VERSION = 13;
 function getGoUrl(version2) {
   const { arch, platform } = process;
   const ext = platform === "win32" ? "zip" : "tar.gz";
   const goPlatform = platformMap.get(platform) || platform;
   let goArch = archMap.get(arch) || arch;
-  if (platform === "darwin" && goArch === "arm64" && parseInt(version2.split(".")[1], 10) < 16) {
+  if (platform === "darwin" && goArch === "arm64" && parseInt(/^\d+.(\d+)/.exec(version2)[1], 10) < 16) {
     goArch = "amd64";
   }
   const filename = `go${version2}.${goPlatform}-${goArch}.${ext}`;
@@ -18047,9 +18048,9 @@ async function createGo({
 }) {
   let goPreferredVersion;
   if (modulePath) {
-    goPreferredVersion = await getFullVersionFromGoMod(modulePath);
+    goPreferredVersion = await parseGoModVersionFromModule(modulePath);
   }
-  const goSelectedVersion = goPreferredVersion || Array.from(versionMap.values())[0];
+  const goSelectedVersion = goPreferredVersion ? goPreferredVersion.toolchain || goPreferredVersion.go : Array.from(versionMap.values())[0];
   const env = (0, import_build_utils.cloneEnv)(process.env, opts.env);
   const { PATH } = env;
   const { platform } = process;
@@ -18059,7 +18060,7 @@ async function createGo({
   );
   const goCacheDir = (0, import_path.join)(workPath, localCacheDir);
   if (goPreferredVersion) {
-    (0, import_build_utils.debug)(`Preferred go version ${goPreferredVersion} (from go.mod)`);
+    (0, import_build_utils.debug)(`Preferred go version ${goSelectedVersion} (from go.mod)`);
     env.GO111MODULE = "on";
   } else {
     (0, import_build_utils.debug)(
@@ -18092,8 +18093,8 @@ async function createGo({
       env.GOROOT = goDir || void 0;
       env.PATH = goBinDir || PATH;
       const { stdout } = await (0, import_execa.default)("go", ["version"], { env });
-      const { minor, short, version: version2 } = parseGoVersionString(stdout);
-      if (minor < GO_MIN_VERSION) {
+      const { major, minor, short, version: version2 } = parseGoVersionString(stdout);
+      if (major < GO_MIN_MAJOR_VERSION || major === GO_MIN_MAJOR_VERSION && minor < GO_MIN_MINOR_VERSION) {
         (0, import_build_utils.debug)(`Found go ${version2} in ${label}, but version is unsupported`);
       }
       if (version2 === goSelectedVersion || short === goSelectedVersion) {
@@ -18172,48 +18173,57 @@ function parseGoVersionString(goVersionOutput) {
 }
 var GoError = class extends Error {
 };
-async function getFullVersionFromGoMod(modulePath) {
+async function parseGoModVersionFromModule(modulePath) {
+  let version2;
   const file = (0, import_path.join)(modulePath, "go.mod");
-  let content;
   try {
-    content = await (0, import_fs_extra.readFile)(file, "utf8");
+    const content = await (0, import_fs_extra.readFile)(file, "utf8");
+    version2 = parseGoModVersion(content);
+    if (!version2) {
+      console.log(`Warning: Unknown Go version in ${file}`);
+    }
   } catch (err) {
-    if (err.code === "ENOENT") {
+    if (typeof err === "object" && err.code === "ENOENT") {
       (0, import_build_utils.debug)(`File not found: ${file}`);
       return void 0;
     } else {
       throw err;
     }
   }
-  const version2 = parseGoVersion(content);
-  if (!version2) {
-    console.log(`Warning: Unknown Go version in ${file}`);
+  return version2;
+}
+function parseGoModVersion(content) {
+  const goMatches = /^\s*go\s+(\d+)\.(\d+)(?:\.(\d+))?\s*(?:\/\/.*)?$/gm.exec(
+    content
+  );
+  if (!goMatches) {
     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;
+  const major = parseInt(goMatches[1], 10);
+  const minor = parseInt(goMatches[2], 10);
+  const patch = goMatches[3] && parseInt(goMatches[3], 10);
+  const toolchainMatches = /^\s*toolchain\s+go((\d+)\.(\d+)(?:\.(\d+)|\w+\d+)?)\s*(?:\/\/.*)?$/gm.exec(
+    content
+  );
+  const toolchain = toolchainMatches ? toolchainMatches[1] : void 0;
+  if (major >= GO_MIN_MAJOR_VERSION && minor >= GO_MIN_MINOR_VERSION) {
+    if (patch) {
+      return {
+        go: `${major}.${minor}.${patch}`,
+        toolchain
+      };
+    }
+    const full = versionMap.get(`${major}.${minor}`);
+    if (full) {
+      return {
+        go: full,
+        toolchain
+      };
     }
-    return { major, minor, patch };
   }
-  return null;
+  const err = new GoError(`Unsupported Go version ${major}.${minor}`);
+  err.code = "ERR_UNSUPPORTED_GO_VERSION";
+  throw err;
 }
 
 // src/index.ts
@@ -18686,8 +18696,13 @@ async function findGoWorkFile(goWorkDir, workPath) {
 async function writeGoWork(destDir, workPath, modulePath) {
   const workspaces = /* @__PURE__ */ new Set(["."]);
   const goWorkPath = await findGoWorkFile(modulePath || workPath, workPath);
+  let goVersion;
   if (goWorkPath) {
     const contents2 = await (0, import_fs_extra2.readFile)(goWorkPath, "utf-8");
+    const goVersionMatch = contents2.match(/^go\s+(\d+\.\d+(\.\d+)?)/m);
+    if (goVersionMatch) {
+      goVersion = goVersionMatch[1];
+    }
     const addPath = (path) => {
       if (path) {
         if (path.startsWith(".")) {
@@ -18715,8 +18730,22 @@ async function writeGoWork(destDir, workPath, modulePath) {
     }
   } else if (modulePath) {
     workspaces.add((0, import_path2.relative)(destDir, modulePath));
+    const goModPath = (0, import_path2.join)(modulePath, "go.mod");
+    if (await (0, import_fs_extra2.pathExists)(goModPath)) {
+      const goModContents = await (0, import_fs_extra2.readFile)(goModPath, "utf-8");
+      const goVersionMatch = goModContents.match(/^go\s+(\d+\.\d+(\.\d+)?)/m);
+      if (goVersionMatch) {
+        goVersion = goVersionMatch[1];
+      }
+    }
+  }
+  let contents = "";
+  if (goVersion) {
+    contents += `go ${goVersion}
+
+`;
   }
-  const contents = `use (
+  contents += `use (
 ${Array.from(workspaces).map((w) => `  ${w}
 `).join("")})
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/go",
-  "version": "3.1.3",
+  "version": "3.2.1",
   "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.4.2",
+    "@vercel/build-utils": "8.4.12",
     "async-retry": "1.3.3",
     "execa": "^1.0.0",
     "fs-extra": "^7.0.0",