@vercel/go 3.2.4 → 3.3.0

package/dist/index.js

@@ -17027,7 +17027,7 @@ __export(src_exports, {
   build: () => build,
   getNewHandlerFunctionName: () => getNewHandlerFunctionName,
   prepareCache: () => prepareCache,
-  shouldServe: () => import_build_utils2.shouldServe,
+  shouldServe: () => import_build_utils3.shouldServe,
   startDevServer: () => startDevServer,
   version: () => version
 });
@@ -17039,7 +17039,7 @@ var import_child_process = require("child_process");
 var import_once = __toESM(require_dist());
 var import_path2 = require("path");
 var import_fs_extra2 = __toESM(require_lib2());
-var import_build_utils2 = require("@vercel/build-utils");
+var import_build_utils3 = require("@vercel/build-utils");
 
 // src/go-helpers.ts
 var import_tar = __toESM(require_tar());
@@ -17054,6 +17054,7 @@ var import_util = require("util");
 var import_os = require("os");
 var import_yauzl_promise = __toESM(require_lib6());
 var import_xdg_app_paths = __toESM(require_xdg_app_paths());
+var import_build_utils2 = require("@vercel/build-utils");
 var streamPipeline = (0, import_util.promisify)(import_stream.pipeline);
 var versionMap = /* @__PURE__ */ new Map([
   ["1.24", "1.24.5"],
@@ -17217,15 +17218,41 @@ async function createGo({
     );
   }
   const setGoEnv = async (goDir) => {
-    if (platform !== "win32" && goDir === goGlobalCacheDir) {
+    if (!goDir) {
+      env.GOROOT = void 0;
+      env.PATH = PATH;
+      return;
+    }
+    const isUnix = platform !== "win32";
+    const setEnvPaths = (modCache, buildCache) => {
+      env.GOMODCACHE = modCache;
+      env.GOCACHE = buildCache;
+      (0, import_build_utils.debug)(`Set GOMODCACHE to ${env.GOMODCACHE}`);
+      (0, import_build_utils.debug)(`Set GOCACHE to ${env.GOCACHE}`);
+    };
+    if (isUnix && goDir === goGlobalCacheDir) {
       (0, import_build_utils.debug)(`Symlinking ${goDir} -> ${goCacheDir}`);
       await (0, import_fs_extra.remove)(goCacheDir);
       await (0, import_fs_extra.mkdirp)((0, import_path.dirname)(goCacheDir));
       await (0, import_fs_extra.symlink)(goDir, goCacheDir);
+      const modCache = (0, import_path.join)(goDir, "pkg", "mod");
+      const buildCache = (0, import_path.join)(goDir, "go-build");
+      setEnvPaths(modCache, buildCache);
       goDir = goCacheDir;
-    }
-    env.GOROOT = goDir || void 0;
-    env.PATH = goDir ? `${(0, import_path.join)(goDir, "bin")}${import_path.delimiter}${PATH}` : PATH;
+    } else if (isUnix && goDir === goCacheDir) {
+      const tmpBase = await (0, import_build_utils2.getWriteableDirectory)();
+      const tmpModCache = (0, import_path.join)(tmpBase, "pkg");
+      const tmpBuildCache = (0, import_path.join)(tmpBase, ".cache");
+      await Promise.all([
+        (0, import_fs_extra.mkdirp)((0, import_path.join)(goDir, "pkg", "mod")),
+        (0, import_fs_extra.mkdirp)((0, import_path.join)(goDir, ".cache", "go-build")),
+        (0, import_fs_extra.symlink)((0, import_path.join)(goCacheDir, "pkg", "mod"), tmpModCache),
+        (0, import_fs_extra.symlink)((0, import_path.join)(goCacheDir, ".cache", "go-build"), tmpBuildCache)
+      ]);
+      setEnvPaths(tmpModCache, tmpBuildCache);
+    }
+    env.GOROOT = goDir;
+    env.PATH = `${(0, import_path.join)(goDir, "bin")}${import_path.delimiter}${PATH}`;
   };
   const goDirs = {
     "local cache": goCacheDir,
@@ -17393,7 +17420,7 @@ function getRenamedEntrypoint(entrypoint) {
   const filename = (0, import_path2.basename)(entrypoint);
   if (filename.startsWith("[")) {
     const newEntrypoint = entrypoint.replace("/[", "/now-bracket[");
-    (0, import_build_utils2.debug)(`Renamed entrypoint from ${entrypoint} to ${newEntrypoint}`);
+    (0, import_build_utils3.debug)(`Renamed entrypoint from ${entrypoint} to ${newEntrypoint}`);
     return newEntrypoint;
   }
   return void 0;
@@ -17406,22 +17433,22 @@ async function build({
   workPath,
   meta = {}
 }) {
-  const goPath = await (0, import_build_utils2.getWriteableDirectory)();
+  const goPath = await (0, import_build_utils3.getWriteableDirectory)();
   const srcPath = (0, import_path2.join)(goPath, "src", "lambda");
   const downloadPath = meta.skipDownload ? workPath : srcPath;
-  await (0, import_build_utils2.download)(files, downloadPath, meta);
+  await (0, import_build_utils3.download)(files, downloadPath, meta);
   const undo = {
     fileActions: [],
     directoryCreation: [],
     functionRenames: []
   };
-  const env = (0, import_build_utils2.cloneEnv)(process.env, meta.env, {
+  const env = (0, import_build_utils3.cloneEnv)(process.env, meta.env, {
     GOARCH: "amd64",
     GOOS: "linux"
   });
   try {
     if (env.GIT_CREDENTIALS) {
-      (0, import_build_utils2.debug)("Initialize Git credentials...");
+      (0, import_build_utils3.debug)("Initialize Git credentials...");
       await initPrivateGit(env.GIT_CREDENTIALS);
     }
     if (env.GO111MODULE) {
@@ -17483,7 +17510,7 @@ Manually assigning 'GO111MODULE' is not recommended.
     if (config && config.includeFiles) {
       const patterns = Array.isArray(config.includeFiles) ? config.includeFiles : [config.includeFiles];
       for (const pattern of patterns) {
-        const fsFiles = await (0, import_build_utils2.glob)(pattern, entrypointDirname);
+        const fsFiles = await (0, import_build_utils3.glob)(pattern, entrypointDirname);
         for (const [assetName, asset] of Object.entries(fsFiles)) {
           includedFiles[assetName] = asset;
         }
@@ -17498,7 +17525,7 @@ Manually assigning 'GO111MODULE' is not recommended.
       },
       workPath
     });
-    const outDir = await (0, import_build_utils2.getWriteableDirectory)();
+    const outDir = await (0, import_build_utils3.getWriteableDirectory)();
     const buildOptions = {
       downloadPath,
       entrypoint,
@@ -17517,9 +17544,9 @@ Manually assigning 'GO111MODULE' is not recommended.
     } else {
       await buildHandlerWithGoMod(buildOptions);
     }
-    const runtime = await (0, import_build_utils2.getProvidedRuntime)();
-    const lambda = new import_build_utils2.Lambda({
-      files: { ...await (0, import_build_utils2.glob)("**", outDir), ...includedFiles },
+    const runtime = await (0, import_build_utils3.getProvidedRuntime)();
+    const lambda = new import_build_utils3.Lambda({
+      files: { ...await (0, import_build_utils3.glob)("**", outDir), ...includedFiles },
       handler: HANDLER_FILENAME,
       runtime,
       supportsWrapper: true,
@@ -17529,7 +17556,7 @@ Manually assigning 'GO111MODULE' is not recommended.
       output: lambda
     };
   } catch (error) {
-    (0, import_build_utils2.debug)(`Go Builder Error: ${error}`);
+    (0, import_build_utils3.debug)(`Go Builder Error: ${error}`);
     throw error;
   } finally {
     try {
@@ -17538,7 +17565,7 @@ Manually assigning 'GO111MODULE' is not recommended.
       if (error instanceof Error) {
         console.error(`Build cleanup failed: ${error.message}`);
       }
-      (0, import_build_utils2.debug)("Cleanup Error: " + error);
+      (0, import_build_utils3.debug)("Cleanup Error: " + error);
     }
   }
 }
@@ -17555,7 +17582,7 @@ async function buildHandlerWithGoMod({
   packageName,
   undo
 }) {
-  (0, import_build_utils2.debug)(
+  (0, import_build_utils3.debug)(
     `Building Go handler as package "${packageName}" (with${goModPath ? "" : "out"} go.mod)`
   );
   let goModDirname;
@@ -17586,13 +17613,13 @@ async function buildHandlerWithGoMod({
   }
   let mainGoFile;
   if (goModPath && isGoModInRootDir) {
-    (0, import_build_utils2.debug)(`[mod-root] Write main file to ${downloadPath}`);
+    (0, import_build_utils3.debug)(`[mod-root] Write main file to ${downloadPath}`);
     mainGoFile = (0, import_path2.join)(downloadPath, MAIN_GO_FILENAME);
   } else if (goModDirname && !isGoModInRootDir) {
-    (0, import_build_utils2.debug)(`[mod-other] Write main file to ${goModDirname}`);
+    (0, import_build_utils3.debug)(`[mod-other] Write main file to ${goModDirname}`);
     mainGoFile = (0, import_path2.join)(goModDirname, MAIN_GO_FILENAME);
   } else {
-    (0, import_build_utils2.debug)(`[entrypoint] Write main file to ${entrypointDirname}`);
+    (0, import_build_utils3.debug)(`[entrypoint] Write main file to ${entrypointDirname}`);
     mainGoFile = (0, import_path2.join)(entrypointDirname, MAIN_GO_FILENAME);
   }
   await Promise.all([
@@ -17618,7 +17645,7 @@ async function buildHandlerWithGoMod({
       );
     }
     if (!goModPath || (0, import_path2.dirname)(entrypointAbsolute) === (0, import_path2.dirname)(goModPath)) {
-      (0, import_build_utils2.debug)(
+      (0, import_build_utils3.debug)(
         `moving entrypoint "${entrypointAbsolute}" to "${finalDestination}"`
       );
       await (0, import_fs_extra2.move)(entrypointAbsolute, finalDestination);
@@ -17640,14 +17667,14 @@ async function buildHandlerWithGoMod({
   } else {
     baseGoModPath = entrypointDirname;
   }
-  (0, import_build_utils2.debug)("Tidy `go.mod` file...");
+  (0, import_build_utils3.debug)("Tidy `go.mod` file...");
   try {
     await go.mod();
   } catch (err) {
     console.error("failed to `go mod tidy`");
     throw err;
   }
-  (0, import_build_utils2.debug)("Running `go build`...");
+  (0, import_build_utils3.debug)("Running `go build`...");
   const destPath = (0, import_path2.join)(outDir, HANDLER_FILENAME);
   try {
     const src = [(0, import_path2.join)(baseGoModPath, MAIN_GO_FILENAME)];
@@ -17665,7 +17692,7 @@ async function buildHandlerAsPackageMain({
   outDir,
   undo
 }) {
-  (0, import_build_utils2.debug)('Building Go handler as package "main" (legacy)');
+  (0, import_build_utils3.debug)('Building Go handler as package "main" (legacy)');
   await writeEntrypoint(
     (0, import_path2.join)(entrypointDirname, MAIN_GO_FILENAME),
     "",
@@ -17676,14 +17703,14 @@ async function buildHandlerAsPackageMain({
     // delete
     from: (0, import_path2.join)(entrypointDirname, MAIN_GO_FILENAME)
   });
-  (0, import_build_utils2.debug)("Running `go get`...");
+  (0, import_build_utils3.debug)("Running `go get`...");
   try {
     await go.get();
   } catch (err) {
     console.error("Failed to `go get`");
     throw err;
   }
-  (0, import_build_utils2.debug)("Running `go build`...");
+  (0, import_build_utils3.debug)("Running `go build`...");
   const destPath = (0, import_path2.join)(outDir, HANDLER_FILENAME);
   try {
     const src = [
@@ -17713,10 +17740,10 @@ function getNewHandlerFunctionName(originalFunctionName, entrypoint) {
       "Handler function renaming failed because entrypoint was empty."
     );
   }
-  (0, import_build_utils2.debug)(`Found exported function "${originalFunctionName}" in "${entrypoint}"`);
+  (0, import_build_utils3.debug)(`Found exported function "${originalFunctionName}" in "${entrypoint}"`);
   const pathSlug = entrypoint.replace(/(\s|\\|\/|\]|\[|-|\.)/g, "_");
   const newHandlerName = `${originalFunctionName}_${pathSlug}`;
-  (0, import_build_utils2.debug)(
+  (0, import_build_utils3.debug)(
     `Renaming handler function temporarily from "${originalFunctionName}" to "${newHandlerName}"`
   );
   return newHandlerName;
@@ -17754,7 +17781,7 @@ async function findGoModPath(entrypointDir, workPath) {
     const goMod = (0, import_path2.join)(dir, "go.mod");
     if (await (0, import_fs_extra2.pathExists)(goMod)) {
       goModPath = goMod;
-      (0, import_build_utils2.debug)(`Found ${goModPath}"`);
+      (0, import_build_utils3.debug)(`Found ${goModPath}"`);
       break;
     }
     dir = (0, import_path2.dirname)(dir);
@@ -17830,7 +17857,7 @@ async function writeGoMod({
     }
   }
   const destGoModPath = (0, import_path2.join)(destDir, "go.mod");
-  (0, import_build_utils2.debug)(`Writing ${destGoModPath}`);
+  (0, import_build_utils3.debug)(`Writing ${destGoModPath}`);
   await (0, import_fs_extra2.writeFile)(destGoModPath, contents, "utf-8");
 }
 async function findGoWorkFile(goWorkDir, workPath) {
@@ -17935,7 +17962,7 @@ async function startDevServer(opts) {
     TMP,
     `vercel-dev-port-${Math.random().toString(32).substring(2)}`
   );
-  const env = (0, import_build_utils2.cloneEnv)(process.env, meta.env, {
+  const env = (0, import_build_utils3.cloneEnv)(process.env, meta.env, {
     VERCEL_DEV_PORT_FILE: portFile
   });
   const executable = `./vercel-dev-server-go${process.platform === "win32" ? ".exe" : ""}`;
@@ -17948,7 +17975,7 @@ async function startDevServer(opts) {
     workPath
   });
   await go.build("./...", executable);
-  (0, import_build_utils2.debug)(`SPAWNING ${executable} CWD=${tmp}`);
+  (0, import_build_utils3.debug)(`SPAWNING ${executable} CWD=${tmp}`);
   const child = (0, import_child_process.spawn)(executable, [], {
     cwd: tmp,
     env,
@@ -18020,11 +18047,11 @@ async function prepareCache({
   const stat = await (0, import_fs_extra2.lstat)(goCacheDir);
   if (stat.isSymbolicLink()) {
     const goGlobalCacheDir = await (0, import_fs_extra2.readlink)(goCacheDir);
-    (0, import_build_utils2.debug)(`Preparing cache by moving ${goGlobalCacheDir} -> ${goCacheDir}`);
+    (0, import_build_utils3.debug)(`Preparing cache by moving ${goGlobalCacheDir} -> ${goCacheDir}`);
     await (0, import_fs_extra2.unlink)(goCacheDir);
     await (0, import_fs_extra2.move)(goGlobalCacheDir, goCacheDir);
   }
-  const cache = await (0, import_build_utils2.glob)(`${localCacheDir}/**`, workPath);
+  const cache = await (0, import_build_utils3.glob)(`${localCacheDir}/**`, workPath);
   return cache;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/go",
-  "version": "3.2.4",
+  "version": "3.3.0",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -33,7 +33,7 @@
     "typescript": "4.3.4",
     "xdg-app-paths": "5.1.0",
     "yauzl-promise": "2.1.3",
-    "@vercel/build-utils": "13.2.3"
+    "@vercel/build-utils": "13.2.4"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",