Merge branch 'main' into fix/skip-multipart-rewrites

vercel · Apr 30, 2024 · 863deb5 · 863deb5
2 parents a8ff168 + 1bf04ba
commit 863deb5
Show file tree

Hide file tree

Showing 38 changed files with 13,606 additions and 18,246 deletions.
diff --git a/.changeset/cyan-beers-tell.md b/.changeset/cyan-beers-tell.md
diff --git a/.changeset/friendly-badgers-protect.md b/.changeset/friendly-badgers-protect.md
diff --git a/.changeset/nervous-rice-tie.md b/.changeset/nervous-rice-tie.md
diff --git a/.changeset/new-fireants-burn.md b/.changeset/new-fireants-burn.md
diff --git a/.changeset/short-bears-sit.md b/.changeset/short-bears-sit.md
diff --git a/.changeset/short-roses-obey.md b/.changeset/short-roses-obey.md
diff --git a/examples/package.json b/examples/package.json
@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "@types/jest": "27.4.1",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "@vercel/frameworks": "3.0.2"
   },
   "version": null

diff --git a/internals/types/CHANGELOG.md b/internals/types/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @vercel-internals/types
 
+## 1.0.31
+
+### Patch Changes
+
+- Updated dependencies [[`15475c8a2`](https://github.com/vercel/vercel/commit/15475c8a2c303a1dd189ba24044fac750280dd2e), [`21f5e7375`](https://github.com/vercel/vercel/commit/21f5e7375e4cb4ceed98ab56486d09a85fa3894d)]:
+  - @vercel/build-utils@8.0.0
+
 ## 1.0.30
 
 ### Patch Changes

diff --git a/internals/types/package.json b/internals/types/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@vercel-internals/types",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "types": "index.d.ts",
   "main": "index.d.ts",
   "files": [
@@ -10,7 +10,7 @@
   "dependencies": {
     "@types/node": "14.14.31",
     "@vercel-internals/constants": "1.0.4",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "@vercel/routing-utils": "3.1.0"
   },
   "devDependencies": {

diff --git a/packages/build-utils/CHANGELOG.md b/packages/build-utils/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @vercel/build-utils
 
+## 8.0.0
+
+### Major Changes
+
+- Remove legacy `avoidTopLevelInstall` logic ([#11513](https://github.com/vercel/vercel/pull/11513))
+
+### Patch Changes
+
+- [build-utils] Add `VERCEL_PROJECT_PRODUCTION_URL` framework env var prefix ([#11506](https://github.com/vercel/vercel/pull/11506))
+
 ## 7.12.0
 
 ### Minor Changes

diff --git a/packages/build-utils/package.json b/packages/build-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "7.12.0",
+  "version": "8.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

diff --git a/packages/build-utils/src/types.ts b/packages/build-utils/src/types.ts
@@ -66,7 +66,6 @@ export interface Meta {
   filesRemoved?: string[];
   env?: Env;
   buildEnv?: Env;
-  avoidTopLevelInstall?: boolean;
   [key: string]: unknown;
 }
 

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,15 @@
 # vercel
 
+## 34.1.5
+
+### Patch Changes
+
+- Updated dependencies [[`763a6d107`](https://github.com/vercel/vercel/commit/763a6d10709ca40405634d41863c2e524917ebe1), [`15475c8a2`](https://github.com/vercel/vercel/commit/15475c8a2c303a1dd189ba24044fac750280dd2e), [`21f5e7375`](https://github.com/vercel/vercel/commit/21f5e7375e4cb4ceed98ab56486d09a85fa3894d)]:
+  - @vercel/ruby@2.1.0
+  - @vercel/build-utils@8.0.0
+  - @vercel/node@3.0.28
+  - @vercel/static-build@2.5.1
+
 ## 34.1.4
 
 ### Patch Changes

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "34.1.4",
+  "version": "34.1.5",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",
@@ -32,17 +32,17 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "@vercel/fun": "1.1.0",
     "@vercel/go": "3.1.1",
     "@vercel/hydrogen": "1.0.2",
     "@vercel/next": "4.2.4",
-    "@vercel/node": "3.0.27",
+    "@vercel/node": "3.0.28",
     "@vercel/python": "4.2.0",
     "@vercel/redwood": "2.0.8",
     "@vercel/remix-builder": "2.1.5",
-    "@vercel/ruby": "2.0.5",
-    "@vercel/static-build": "2.5.0",
+    "@vercel/ruby": "2.1.0",
+    "@vercel/static-build": "2.5.1",
     "chokidar": "3.3.1"
   },
   "devDependencies": {
@@ -92,8 +92,8 @@
     "@types/yauzl-promise": "2.1.0",
     "@vercel-internals/constants": "1.0.4",
     "@vercel-internals/get-package-json": "1.0.0",
-    "@vercel-internals/types": "1.0.30",
-    "@vercel/client": "13.2.1",
+    "@vercel-internals/types": "1.0.31",
+    "@vercel/client": "13.2.2",
     "@vercel/error-utils": "2.0.2",
     "@vercel/frameworks": "3.0.2",
     "@vercel/fs-detectors": "5.2.3",

diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @vercel/client
 
+## 13.2.2
+
+### Patch Changes
+
+- Updated dependencies [[`15475c8a2`](https://github.com/vercel/vercel/commit/15475c8a2c303a1dd189ba24044fac750280dd2e), [`21f5e7375`](https://github.com/vercel/vercel/commit/21f5e7375e4cb4ceed98ab56486d09a85fa3894d)]:
+  - @vercel/build-utils@8.0.0
+
 ## 13.2.1
 
 ### Patch Changes

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vercel/client",
-  "version": "13.2.1",
+  "version": "13.2.2",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "homepage": "https://vercel.com",
@@ -37,7 +37,7 @@
     "typescript": "4.9.5"
   },
   "dependencies": {
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "@vercel/error-utils": "2.0.2",
     "@vercel/routing-utils": "3.1.0",
     "@zeit/fetch": "5.2.0",

diff --git a/packages/fs-detectors/package.json b/packages/fs-detectors/package.json
@@ -37,7 +37,7 @@
     "@types/minimatch": "3.0.5",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.10",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "jest-junit": "16.0.0",
     "typescript": "4.9.5"
   }

diff --git a/packages/gatsby-plugin-vercel-builder/CHANGELOG.md b/packages/gatsby-plugin-vercel-builder/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @vercel/gatsby-plugin-vercel-builder
 
+## 2.0.26
+
+### Patch Changes
+
+- Updated dependencies [[`15475c8a2`](https://github.com/vercel/vercel/commit/15475c8a2c303a1dd189ba24044fac750280dd2e), [`21f5e7375`](https://github.com/vercel/vercel/commit/21f5e7375e4cb4ceed98ab56486d09a85fa3894d)]:
+  - @vercel/build-utils@8.0.0
+
 ## 2.0.25
 
 ### Patch Changes

diff --git a/packages/gatsby-plugin-vercel-builder/package.json b/packages/gatsby-plugin-vercel-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vercel/gatsby-plugin-vercel-builder",
-  "version": "2.0.25",
+  "version": "2.0.26",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@sinclair/typebox": "0.25.24",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "@vercel/routing-utils": "3.1.0",
     "esbuild": "0.14.47",
     "etag": "1.8.1",

diff --git a/packages/go/package.json b/packages/go/package.json
@@ -29,7 +29,7 @@
     "@types/node-fetch": "^2.3.0",
     "@types/tar": "6.1.5",
     "@types/yauzl-promise": "2.1.0",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "async-retry": "1.3.3",
     "execa": "^1.0.0",
     "fs-extra": "^7.0.0",

diff --git a/packages/hydrogen/package.json b/packages/hydrogen/package.json
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0"

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -40,7 +40,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "@vercel/routing-utils": "3.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",

diff --git a/packages/node/CHANGELOG.md b/packages/node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @vercel/node
 
+## 3.0.28
+
+### Patch Changes
+
+- Updated dependencies [[`15475c8a2`](https://github.com/vercel/vercel/commit/15475c8a2c303a1dd189ba24044fac750280dd2e), [`21f5e7375`](https://github.com/vercel/vercel/commit/21f5e7375e4cb4ceed98ab56486d09a85fa3894d)]:
+  - @vercel/build-utils@8.0.0
+
 ## 3.0.27
 
 ### Patch Changes

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vercel/node",
-  "version": "3.0.27",
+  "version": "3.0.28",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/node-js",
@@ -24,7 +24,7 @@
     "@edge-runtime/primitives": "4.1.0",
     "@edge-runtime/vm": "3.2.0",
     "@types/node": "14.18.33",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "@vercel/error-utils": "2.0.2",
     "@vercel/nft": "0.26.4",
     "@vercel/static-config": "3.0.0",

diff --git a/packages/python/package.json b/packages/python/package.json
@@ -26,7 +26,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "14.18.33",
     "@types/which": "3.0.0",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "execa": "^1.0.0",
     "fs-extra": "11.1.1",
     "jest-junit": "16.0.0",

diff --git a/packages/redwood/package.json b/packages/redwood/package.json
@@ -28,7 +28,7 @@
     "@types/aws-lambda": "8.10.19",
     "@types/node": "14.18.33",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0"

diff --git a/packages/remix/package.json b/packages/remix/package.json
@@ -32,7 +32,7 @@
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "jest-junit": "16.0.0",
     "path-to-regexp": "6.2.1",
     "semver": "7.5.2"

diff --git a/packages/ruby/CHANGELOG.md b/packages/ruby/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @vercel/ruby
 
+## 2.1.0
+
+### Minor Changes
+
+- Add support for Ruby 3.3 ([#11497](https://github.com/vercel/vercel/pull/11497))
+
+- Remove legacy `avoidTopLevelInstall` logic ([#11513](https://github.com/vercel/vercel/pull/11513))
+
 ## 2.0.5
 
 ### Patch Changes

diff --git a/packages/ruby/package.json b/packages/ruby/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vercel/ruby",
   "author": "Nathan Cahill <nathan@nathancahill.com>",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/ruby",
@@ -24,7 +24,7 @@
     "@types/fs-extra": "8.0.0",
     "@types/semver": "6.0.0",
     "@types/which": "3.0.0",
-    "@vercel/build-utils": "7.12.0",
+    "@vercel/build-utils": "8.0.0",
     "execa": "2.0.4",
     "fs-extra": "^7.0.1",
     "jest-junit": "16.0.0",

diff --git a/packages/ruby/src/index.ts b/packages/ruby/src/index.ts
@@ -1,5 +1,5 @@
 import { EOL } from 'os';
-import { join, dirname, relative } from 'path';
+import { join, dirname } from 'path';
 import execa from 'execa';
 import {
   ensureDir,
@@ -187,24 +187,9 @@ export const build: BuildV3 = async ({
         'did not find a vendor directory but found a Gemfile, bundling gems...'
       );
 
-      const fileAtRoot = 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) {
-        debug('Skipping `bundle install` — already handled by Install Command');
-      } else {
-        // try installing. this won't work if native extensions are required.
-        // if that's the case, gems should be vendored locally before deploying.
-        await bundleInstall(
-          bundlerPath,
-          bundleDir,
-          gemfilePath,
-          rubyPath,
-          major
-        );
-      }
+      // try installing. this won't work if native extensions are required.
+      // if that's the case, gems should be vendored locally before deploying.
+      await bundleInstall(bundlerPath, bundleDir, gemfilePath, rubyPath, major);
     }
   } else {
     debug('found vendor directory, skipping "bundle install"...');