@vercel/ruby 1.2.8-canary.4 → 1.2.8-canary.5

package/dist/index.js

@@ -8665,10 +8665,11 @@ exports.version = 3;
 async function build({ workPath, files, entrypoint, config, meta = {}, }) {
     await build_utils_1.download(files, workPath, meta);
     const entrypointFsDirname = path_1.join(workPath, path_1.dirname(entrypoint));
+    const gemfileName = 'Gemfile';
     const gemfilePath = await build_utils_1.walkParentDirs({
         base: workPath,
         start: entrypointFsDirname,
-        filename: 'Gemfile',
+        filename: gemfileName,
     });
     const gemfileContents = gemfilePath
         ? await fs_extra_1.readFile(gemfilePath, 'utf8')
@@ -8700,14 +8701,23 @@ async function build({ workPath, files, entrypoint, config, meta = {}, }) {
     if (!hasVendorDir) {
         if (gemfilePath) {
             build_utils_1.debug('did not find a vendor directory but found a Gemfile, bundling gems...');
-            // try installing. this won't work if native extesions are required.
-            // if that's the case, gems should be vendored locally before deploying.
-            try {
-                await bundleInstall(bundlerPath, bundleDir, gemfilePath);
+            const fileAtRoot = path_1.relative(workPath, gemfilePath) === gemfileName;
+            // If the `Gemfile` is located in the Root Directory of the project and
+            // the new File System API is used (`avoidTopLevelInstall`), the Install Command
+            // will have already installed its dependencies, so we don't need to do it again.
+            if (meta.avoidTopLevelInstall && fileAtRoot) {
+                build_utils_1.debug('Skipping `bundle install` — already handled by Install Command');
             }
-            catch (err) {
-                build_utils_1.debug('unable to build gems from Gemfile. vendor the gems locally with "bundle install --deployment" and retry.');
-                throw err;
+            else {
+                // try installing. this won't work if native extesions are required.
+                // if that's the case, gems should be vendored locally before deploying.
+                try {
+                    await bundleInstall(bundlerPath, bundleDir, gemfilePath);
+                }
+                catch (err) {
+                    build_utils_1.debug('unable to build gems from Gemfile. vendor the gems locally with "bundle install --deployment" and retry.');
+                    throw err;
+                }
             }
         }
     }
@@ -8830,6 +8840,11 @@ function getRubyPath(meta, gemfileContents) {
 // process.env.GEM_HOME), and returns
 // the absolute path to it
 async function installBundler(meta, gemfileContents) {
+    // If the new File System API is used (`avoidTopLevelInstall`), the Install Command
+    // will have already installed the dependencies, so we don't need to do it again.
+    if (meta.avoidTopLevelInstall) {
+        build_utils_1.debug(`Skipping bundler installation, already installed by Install Command`);
+    }
     const { gemHome, rubyPath, gemPath, vendorPath, runtime } = getRubyPath(meta, gemfileContents);
     build_utils_1.debug('installing bundler...');
     await execa_1.default(gemPath, ['install', 'bundler', '--no-document'], {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vercel/ruby",
   "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "1.2.8-canary.4",
+  "version": "1.2.8-canary.5",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",
@@ -28,5 +28,5 @@
     "semver": "6.1.1",
     "typescript": "4.3.4"
   },
-  "gitHead": "ed1dacd27698f3bb181f32b516af6953655b37e9"
+  "gitHead": "1202ff7b2b8a821c6404a86baa12996f3078ed36"
 }