@vercel/ruby 2.0.2 → 2.0.4

package/dist/index.js

@@ -6110,17 +6110,17 @@ var require_jsonfile = __commonJS({
     }
     function stringify(obj, options) {
       var spaces;
-      var EOL = "\n";
+      var EOL2 = "\n";
       if (typeof options === "object" && options !== null) {
         if (options.spaces) {
           spaces = options.spaces;
         }
         if (options.EOL) {
-          EOL = options.EOL;
+          EOL2 = options.EOL;
         }
       }
       var str = JSON.stringify(obj, options ? options.replacer : null, spaces);
-      return str.replace(/\n/g, EOL) + EOL;
+      return str.replace(/\n/g, EOL2) + EOL2;
     }
     function writeFile2(file, obj, options, callback) {
       if (callback == null) {
@@ -7659,6 +7659,7 @@ __export(src_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(src_exports);
+var import_os = require("os");
 var import_path2 = require("path");
 var import_execa2 = __toESM(require_execa());
 var import_fs_extra = __toESM(require_lib());
@@ -7669,18 +7670,28 @@ var import_path = require("path");
 var import_semver = __toESM(require_semver2());
 var import_execa = __toESM(require_execa());
 var import_build_utils = require("@vercel/build-utils");
-var allOptions = [
-  { major: 2, minor: 7, range: "2.7.x", runtime: "ruby2.7" },
-  {
-    major: 2,
-    minor: 5,
-    range: "2.5.x",
-    runtime: "ruby2.5",
-    discontinueDate: /* @__PURE__ */ new Date("2021-11-30")
-  }
-];
+function getOptions() {
+  const options = [
+    { major: 3, minor: 2, range: "3.2.x", runtime: "ruby3.2" },
+    {
+      major: 2,
+      minor: 7,
+      range: "2.7.x",
+      runtime: "ruby2.7",
+      discontinueDate: /* @__PURE__ */ new Date("2023-12-07")
+    },
+    {
+      major: 2,
+      minor: 5,
+      range: "2.5.x",
+      runtime: "ruby2.5",
+      discontinueDate: /* @__PURE__ */ new Date("2021-11-30")
+    }
+  ];
+  return options;
+}
 function getLatestRubyVersion() {
-  return allOptions[0];
+  return getOptions()[0];
 }
 function isDiscontinued({ discontinueDate }) {
   const today = Date.now();
@@ -7696,7 +7707,7 @@ function getRubyPath(meta, gemfileContents) {
     const line = gemfileContents.split("\n").find((line2) => line2.startsWith("ruby"));
     if (line) {
       const strVersion = line.slice(4).trim().slice(1, -1).replace("~>", "");
-      const found = allOptions.some((o) => {
+      const found = getOptions().some((o) => {
         selection = o;
         return (0, import_semver.intersects)(o.range, strVersion);
       });
@@ -7780,7 +7791,7 @@ async function matchPaths(configPatterns, workPath) {
   );
   return patternPaths.reduce((a, b) => a.concat(b), []);
 }
-async function bundleInstall(bundlePath, bundleDir, gemfilePath) {
+async function bundleInstall(bundlePath, bundleDir, gemfilePath, runtime) {
   (0, import_build_utils2.debug)(`running "bundle install --deployment"...`);
   const bundleAppConfig = await (0, import_build_utils2.getWriteableDirectory)();
   const gemfileContent = await (0, import_fs_extra.readFile)(gemfilePath, "utf8");
@@ -7789,19 +7800,46 @@ async function bundleInstall(bundlePath, bundleDir, gemfilePath) {
       gemfilePath,
       gemfileContent.replace('ruby "~> 2.7.x"', 'ruby "~> 2.7.0"')
     );
+  } else if (gemfileContent.includes('ruby "~> 3.2.x"')) {
+    await (0, import_fs_extra.writeFile)(
+      gemfilePath,
+      gemfileContent.replace('ruby "~> 3.2.x"', 'ruby "~> 3.2.0"')
+    );
   }
-  await (0, import_execa2.default)(
+  const bundlerEnv = (0, import_build_utils2.cloneEnv)(process.env, {
+    // Ensure the correct version of `ruby` is in front of the $PATH
+    PATH: `${(0, import_path2.dirname)(bundlePath)}:${process.env.PATH}`,
+    BUNDLE_SILENCE_ROOT_WARNING: "1",
+    BUNDLE_APP_CONFIG: bundleAppConfig,
+    BUNDLE_JOBS: "4"
+  });
+  if (runtime === "ruby3.2") {
+    const result2 = await (0, import_execa2.default)("bundler", ["add", "webrick"], {
+      cwd: (0, import_path2.dirname)(gemfilePath),
+      stdio: "pipe",
+      env: bundlerEnv,
+      reject: false
+    });
+    if (result2.exitCode !== 0) {
+      console.log(result2.stdout);
+      console.error(result2.stderr);
+      throw result2;
+    }
+  }
+  const result = await (0, import_execa2.default)(
     bundlePath,
     ["install", "--deployment", "--gemfile", gemfilePath, "--path", bundleDir],
     {
       stdio: "pipe",
-      env: (0, import_build_utils2.cloneEnv)(process.env, {
-        BUNDLE_SILENCE_ROOT_WARNING: "1",
-        BUNDLE_APP_CONFIG: bundleAppConfig,
-        BUNDLE_JOBS: "4"
-      })
+      env: bundlerEnv,
+      reject: false
     }
   );
+  if (result.exitCode !== 0) {
+    console.log(result.stdout);
+    console.error(result.stderr);
+    throw result;
+  }
 }
 var version = 3;
 async function build({
@@ -7814,11 +7852,15 @@ async function build({
   await (0, import_build_utils2.download)(files, workPath, meta);
   const entrypointFsDirname = (0, import_path2.join)(workPath, (0, import_path2.dirname)(entrypoint));
   const gemfileName = "Gemfile";
-  const gemfilePath = await (0, import_build_utils2.walkParentDirs)({
+  let gemfilePath = await (0, import_build_utils2.walkParentDirs)({
     base: workPath,
     start: entrypointFsDirname,
     filename: gemfileName
   });
+  if (!gemfilePath) {
+    gemfilePath = (0, import_path2.join)(entrypointFsDirname, gemfileName);
+    await (0, import_fs_extra.writeFile)(gemfilePath, `source "https://rubygems.org"${import_os.EOL}`);
+  }
   const gemfileContents = gemfilePath ? await (0, import_fs_extra.readFile)(gemfilePath, "utf8") : "";
   const { gemHome, bundlerPath, vendorPath, runtime } = await installBundler(
     meta,
@@ -7854,7 +7896,7 @@ async function build({
       if (meta.avoidTopLevelInstall && fileAtRoot) {
         (0, import_build_utils2.debug)("Skipping `bundle install` \u2014 already handled by Install Command");
       } else {
-        await bundleInstall(bundlerPath, bundleDir, gemfilePath);
+        await bundleInstall(bundlerPath, bundleDir, gemfilePath, runtime);
       }
     }
   } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vercel/ruby",
   "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",
@@ -17,8 +17,7 @@
   "devDependencies": {
     "@types/fs-extra": "8.0.0",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "7.2.0",
-    "@vercel/ncc": "0.24.0",
+    "@vercel/build-utils": "7.3.0",
     "execa": "2.0.4",
     "fs-extra": "^7.0.1",
     "jest-junit": "16.0.0",
@@ -27,6 +26,7 @@
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --runInBand --bail",
-    "test-e2e": "pnpm test"
+    "test-e2e": "pnpm test",
+    "type-check": "tsc --noEmit"
   }
 }