@vercel/go 3.6.0 → 3.7.1

package/bootstrap/go.mod

@@ -0,0 +1,3 @@
+module vc-init
+
+go 1.23

package/dist/index.js

@@ -3566,8 +3566,8 @@ var require_graceful_fs = __commonJS({
         }
       }
       var fs$writeFile = fs3.writeFile;
-      fs3.writeFile = writeFile3;
-      function writeFile3(path, data, options, cb) {
+      fs3.writeFile = writeFile2;
+      function writeFile2(path, data, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
         return go$writeFile(path, data, options, cb);
@@ -5343,7 +5343,7 @@ var require_jsonfile = __commonJS({
       var str = JSON.stringify(obj, options ? options.replacer : null, spaces);
       return str.replace(/\n/g, EOL) + EOL;
     }
-    function writeFile3(file, obj, options, callback) {
+    function writeFile2(file, obj, options, callback) {
       if (callback == null) {
         callback = options;
         options = {};
@@ -5375,7 +5375,7 @@ var require_jsonfile = __commonJS({
     var jsonfile = {
       readFile: readFile4,
       readFileSync,
-      writeFile: writeFile3,
+      writeFile: writeFile2,
       writeFileSync
     };
     module2.exports = jsonfile;
@@ -10881,6 +10881,8 @@ var require_xdg_app_paths = __commonJS({
 var src_exports = {};
 __export(src_exports, {
   build: () => build,
+  detectEntrypoint: () => detectEntrypoint,
+  detectGoEntrypoint: () => detectGoEntrypoint,
   getNewHandlerFunctionName: () => getNewHandlerFunctionName,
   prepareCache: () => prepareCache,
   shouldServe: () => import_build_utils4.shouldServe,
@@ -14271,6 +14273,7 @@ var GoWrapper = class {
     const subprocess = (0, import_execa.default)("go", args, {
       ...opts,
       env,
+      extendEnv: false,
       stdio: captureAndForwardOutput ? "pipe" : opts.stdio
     });
     if (captureAndForwardOutput) {
@@ -14324,7 +14327,7 @@ async function createGo({
     goPreferredVersion = await parseGoModVersionFromModule(modulePath);
   }
   const goSelectedVersion = goPreferredVersion ? goPreferredVersion.toolchain || goPreferredVersion.go : Array.from(versionMap.values())[0];
-  const env = (0, import_build_utils.cloneEnv)(process.env, opts.env);
+  const env = opts.env ? (0, import_build_utils.cloneEnv)(opts.env) : (0, import_build_utils.cloneEnv)(process.env);
   const { PATH } = env;
   const { platform } = process;
   const goGlobalCacheDir = (0, import_path4.join)(
@@ -14393,7 +14396,10 @@ async function createGo({
       }
       env.GOROOT = goDir || void 0;
       env.PATH = goBinDir || PATH;
-      const { stdout } = await (0, import_execa.default)("go", ["version"], { env });
+      const { stdout } = await (0, import_execa.default)("go", ["version"], {
+        env,
+        extendEnv: false
+      });
       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`);
@@ -14537,7 +14543,7 @@ var GO_CANDIDATE_ENTRYPOINTS = [
   "cmd/server/main.go"
 ];
 async function detectGoEntrypoint(workPath, configuredEntrypoint) {
-  if (await (0, import_fs_extra2.pathExists)((0, import_path5.join)(workPath, configuredEntrypoint))) {
+  if (configuredEntrypoint && await (0, import_fs_extra2.pathExists)((0, import_path5.join)(workPath, configuredEntrypoint))) {
     (0, import_build_utils2.debug)(`Using configured Go entrypoint: ${configuredEntrypoint}`);
     return configuredEntrypoint;
   }
@@ -14549,6 +14555,12 @@ async function detectGoEntrypoint(workPath, configuredEntrypoint) {
   }
   return null;
 }
+var detectEntrypoint = async ({ workPath }) => {
+  const file = await detectGoEntrypoint(workPath);
+  if (!file)
+    return null;
+  return { kind: "file", entrypoint: file };
+};
 
 // src/standalone-server.ts
 var import_child_process = require("child_process");
@@ -14618,19 +14630,28 @@ async function buildStandaloneServer({
     console.error(`Failed to build standalone Go server: ${buildTarget}`);
     throw err;
   }
-  const bootstrapSrc = (0, import_path6.join)(__dirname, "../vc-init.go");
-  const utilsSrc = (0, import_path6.join)(__dirname, "../vc-utils.go");
+  const bootstrapDir = (0, import_path6.join)(__dirname, "../bootstrap");
+  const bootstrapSrc = (0, import_path6.join)(bootstrapDir, "vc-init.go");
+  const utilsSrc = (0, import_path6.join)(bootstrapDir, "vc-utils.go");
+  const bootstrapGoModSrc = (0, import_path6.join)(bootstrapDir, "go.mod");
   (0, import_build_utils3.debug)(`Building bootstrap wrapper: ${bootstrapSrc} -> ${bootstrapPath}`);
   try {
     const bootstrapBuildDir = await (0, import_build_utils3.getWriteableDirectory)();
     const bootstrapGoFile = (0, import_path6.join)(bootstrapBuildDir, "main.go");
     await (0, import_fs_extra3.copy)(bootstrapSrc, bootstrapGoFile);
     await (0, import_fs_extra3.copy)(utilsSrc, (0, import_path6.join)(bootstrapBuildDir, "vc-utils.go"));
-    const bootstrapGoMod = (0, import_path6.join)(bootstrapBuildDir, "go.mod");
-    await (0, import_fs_extra3.writeFile)(bootstrapGoMod, "module vc-init\n\ngo 1.21\n");
+    await (0, import_fs_extra3.copy)(bootstrapGoModSrc, (0, import_path6.join)(bootstrapBuildDir, "go.mod"));
+    const bootstrapEnv = {
+      PATH: process.env.PATH || "",
+      HOME: process.env.HOME || "",
+      TMPDIR: process.env.TMPDIR || "",
+      GOARCH: architecture === "arm64" ? "arm64" : "amd64",
+      GOOS: "linux",
+      CGO_ENABLED: "0"
+    };
     const bootstrapGo = await createGo({
       modulePath: bootstrapBuildDir,
-      opts: { cwd: bootstrapBuildDir, env },
+      opts: { cwd: bootstrapBuildDir, env: bootstrapEnv },
       workPath: bootstrapBuildDir
     });
     await bootstrapGo.build(".", bootstrapPath);
@@ -14676,8 +14697,8 @@ async function startStandaloneDevServer(opts, resolvedEntrypoint) {
     PORT: String(port)
   });
   const runTarget = resolvedEntrypoint === "main.go" ? "." : "./" + (0, import_path6.dirname)(resolvedEntrypoint);
-  const devWrapper = (0, import_path6.join)(__dirname, "../vc-init-dev.go");
-  const devUtils = (0, import_path6.join)(__dirname, "../vc-utils.go");
+  const devWrapper = (0, import_path6.join)(__dirname, "../bootstrap/vc-init-dev.go");
+  const devUtils = (0, import_path6.join)(__dirname, "../bootstrap/vc-utils.go");
   (0, import_build_utils3.debug)(
     `Starting standalone Go dev server wrapper: go run ${devWrapper} (target ${runTarget}, port ${port})`
   );
@@ -15451,6 +15472,8 @@ async function prepareCache({
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   build,
+  detectEntrypoint,
+  detectGoEntrypoint,
   getNewHandlerFunctionName,
   prepareCache,
   shouldServe,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/go",
-  "version": "3.6.0",
+  "version": "3.7.1",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -11,32 +11,34 @@
   },
   "files": [
     "dist",
-    "*.go"
+    "*.go",
+    "bootstrap"
   ],
   "devDependencies": {
     "@tootallnate/once": "1.1.2",
     "@types/async-retry": "1.4.5",
     "@types/execa": "^0.9.0",
     "@types/fs-extra": "^5.0.5",
-    "@types/jest": "28.1.6",
     "@types/node": "20.11.0",
     "@types/node-fetch": "^2.3.0",
     "@types/yauzl-promise": "2.1.0",
     "async-retry": "1.3.3",
     "execa": "^1.0.0",
     "fs-extra": "^7.0.0",
-    "jest-junit": "16.0.0",
     "node-fetch": "^2.2.1",
     "string-argv": "0.3.1",
     "tar": "7.5.11",
+    "vitest": "2.0.3",
     "xdg-app-paths": "5.1.0",
     "yauzl-promise": "2.1.3",
-    "@vercel/build-utils": "13.21.0"
+    "@vercel/build-utils": "13.26.0"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",
-    "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
+    "test": "vitest run --config ../../vitest.config.mts",
     "test-e2e": "pnpm test test/integration-*",
-    "type-check": "tsc --noEmit"
+    "type-check": "tsc --noEmit",
+    "vitest-run": "vitest -c ../../vitest.config.mts",
+    "vitest-e2e": "glob --absolute 'test/integration-*'"
   }
 }