Backport: fix(gateway): bump @vercel/oidc to 3.1.0

[vercel-ai-sdk]

This is an automated backport of #11539 to the release-v5.0 branch.

[vercel]

Additional Suggestion:

pnpm-lock.yaml contained unresolved Git merge conflict markers that should not be in a committed file

View Details

📝 Patch Details

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 421e2489a..aaaae75a1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29503,13 +29503,10 @@ snapshots:
     dependencies:
       is-what: 4.1.16
 
-<<<<<<< HEAD
-=======
   copy-anything@4.0.5:
     dependencies:
       is-what: 5.5.0
 
->>>>>>> 976246c5a (fix(gateway): bump `@vercel/oidc` to 3.1.0 (#11539))
   copy-webpack-plugin@13.0.1(webpack@5.101.2(esbuild@0.25.9)):
     dependencies:
       glob-parent: 6.0.2
@@ -36030,8 +36027,6 @@ snapshots:
       tsx: 4.19.2
       yaml: 2.7.0
 
-<<<<<<< HEAD
-=======
   postcss-load-config@6.0.1(jiti@2.6.1)(postcss@8.5.6)(tsx@4.21.0)(yaml@2.7.0):
     dependencies:
       lilconfig: 3.1.3
@@ -36041,7 +36036,6 @@ snapshots:
       tsx: 4.21.0
       yaml: 2.7.0
 
->>>>>>> 976246c5a (fix(gateway): bump `@vercel/oidc` to 3.1.0 (#11539))
   postcss-loader@8.1.1(postcss@8.5.6)(typescript@5.8.3)(webpack@5.101.2(esbuild@0.25.9)):
     dependencies:
       cosmiconfig: 9.0.0(typescript@5.8.3)

Analysis

The pnpm-lock.yaml file contained two unresolved Git merge conflict regions:

1. First conflict (line ~29506): Around copy-anything@4.0.5 with markers <<<<<<< HEAD, =======, and >>>>>>> 976246c5a. The HEAD section was empty and the incoming change added the copy-anything@4.0.5 entry with is-what: 5.5.0.

2. Second conflict (line ~36033): Around postcss-load-config@6.0.1 with the same conflict marker structure. The incoming change added a variant with different dependency versions (jiti@2.6.1, tsx@4.21.0).

These conflict markers should never be committed to the repository. While pnpm can automatically resolve them during package installation, having them in the committed file is a data integrity issue and indicates incomplete merge conflict resolution.

Fix Applied: Used sed to remove all Git merge conflict markers (<<<<<<< HEAD, =======, >>>>>>> ...) from the file while preserving the incoming changes (which represent the backported content from PR #11539). The resolution correctly:

• Removed all three marker types from both conflict regions
• Kept the copy-anything@4.0.5 entry with its dependencies
• Kept both postcss-load-config@6.0.1 variants with their respective dependency versions
• Maintained the YAML file structure and integrity

The file now has no conflict markers and is ready for commit.