@vercel/go 3.4.7 → 3.5.0

package/dist/index.js

@@ -14283,8 +14283,15 @@ var GoWrapper = class {
       throw enrichGoCommandError(error);
     }
   }
-  mod() {
-    return this.execute("mod", "tidy");
+  mod({ tolerateErrors = false } = {}) {
+    const args = ["mod", "tidy"];
+    if (tolerateErrors) {
+      args.push("-e");
+    }
+    return this.execute(...args);
+  }
+  vendor() {
+    return this.execute("mod", "vendor");
   }
   get(src) {
     const args = ["get"];
@@ -14296,11 +14303,14 @@ var GoWrapper = class {
     }
     return this.execute(...args);
   }
-  build(src, dest) {
+  build(src, dest, { vendorMode = false } = {}) {
     (0, import_build_utils.debug)(`Building optimized 'go' binary ${src} -> ${dest}`);
     const sources = Array.isArray(src) ? src : [src];
     const envGoBuildFlags = (this.env || this.opts.env).GO_BUILD_FLAGS;
-    const flags = envGoBuildFlags ? (0, import_string_argv.default)(envGoBuildFlags) : GO_FLAGS;
+    const flags = envGoBuildFlags ? (0, import_string_argv.default)(envGoBuildFlags) : [...GO_FLAGS];
+    if (vendorMode && !envGoBuildFlags) {
+      flags.push("-mod=vendor");
+    }
     return this.execute("build", ...flags, "-o", dest, ...sources);
   }
 };
@@ -14593,12 +14603,17 @@ async function buildStandaloneServer({
   const outDir = await (0, import_build_utils3.getWriteableDirectory)();
   const userServerPath = (0, import_path6.join)(outDir, "user-server");
   const bootstrapPath = (0, import_path6.join)(outDir, "executable");
+  const vendorModulesPath = (0, import_path6.join)(workPath, "vendor", "modules.txt");
+  const isVendored = await (0, import_fs_extra3.pathExists)(vendorModulesPath);
+  if (isVendored) {
+    (0, import_build_utils3.debug)("Detected vendor directory, using -mod=vendor for build");
+  }
   const buildTarget = entrypoint === "main.go" ? "." : "./" + (0, import_path6.dirname)(entrypoint);
   (0, import_build_utils3.debug)(
     `Building user Go server (${architecture}): go build ${buildTarget} -> ${userServerPath}`
   );
   try {
-    await go.build(buildTarget, userServerPath);
+    await go.build(buildTarget, userServerPath, { vendorMode: isVendored });
   } catch (err) {
     console.error(`Failed to build standalone Go server: ${buildTarget}`);
     throw err;
@@ -14927,6 +14942,21 @@ async function buildHandlerWithGoMod({
       });
     }
   }
+  const vendorModulesPath = (0, import_path7.join)(
+    goModDirname || entrypointDirname,
+    "vendor",
+    "modules.txt"
+  );
+  const isVendored = await (0, import_fs_extra4.pathExists)(vendorModulesPath);
+  if (isVendored) {
+    (0, import_build_utils4.debug)("Detected vendor directory in project");
+    const vendorModulesBackup = vendorModulesPath + ".bak";
+    await (0, import_fs_extra4.copy)(vendorModulesPath, vendorModulesBackup);
+    undo.fileActions.push({
+      to: vendorModulesPath,
+      from: vendorModulesBackup
+    });
+  }
   const entrypointArr = entrypoint.split(import_path7.posix.sep);
   let goPackageName = `${packageName}/${packageName}`;
   const goFuncName = `${packageName}.${handlerFunctionName}`;
@@ -14992,16 +15022,25 @@ async function buildHandlerWithGoMod({
   }
   (0, import_build_utils4.debug)("Tidy `go.mod` file...");
   try {
-    await go.mod();
+    await go.mod({ tolerateErrors: isVendored });
   } catch (err) {
     console.error("failed to `go mod tidy`");
     throw err;
   }
+  if (isVendored) {
+    (0, import_build_utils4.debug)("Regenerating vendor directory after go.mod rewrite...");
+    try {
+      await go.vendor();
+    } catch (err) {
+      console.error("failed to `go mod vendor`");
+      throw err;
+    }
+  }
   (0, import_build_utils4.debug)("Running `go build`...");
   const destPath = (0, import_path7.join)(outDir, HANDLER_FILENAME);
   try {
     const src = [(0, import_path7.join)(baseGoModPath, MAIN_GO_FILENAME)];
-    await go.build(src, destPath);
+    await go.build(src, destPath, { vendorMode: isVendored });
   } catch (err) {
     console.error("failed to `go build`");
     throw err;
@@ -15151,7 +15190,11 @@ async function writeGoMod({
       /^(replace .+=>\s*)(.+)$/gm,
       (orig, replaceStmt, replacePath) => {
         if (replacePath.startsWith(".")) {
-          return replaceStmt + (0, import_path7.join)(goModRelPath, replacePath);
+          let newPath = (0, import_path7.join)(goModRelPath, replacePath);
+          if (!newPath.startsWith(".") && !newPath.startsWith("/")) {
+            newPath = "./" + newPath;
+          }
+          return replaceStmt + newPath;
         }
         return orig;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/go",
-  "version": "3.4.7",
+  "version": "3.5.0",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -32,7 +32,7 @@
     "typescript": "4.9.5",
     "xdg-app-paths": "5.1.0",
     "yauzl-promise": "2.1.3",
-    "@vercel/build-utils": "13.12.1"
+    "@vercel/build-utils": "13.14.2"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",