ci: fix vendoring completely (#7328)

BridgeAR · web-flow · commit 9e11e52a908c · 2026-01-26T12:18:38.000Z
The vendoring still had two issues.

1. Updated dev dependencies should also run the vendoring, since
   these may change how the bundle is minified. This is not taken
   into account.
2. The artifact generated was added to the repository. That way
   we actually also added the patch file itself to the repository.
   That works once, while creating the second patch would not
   conflict. This is fixed by generating the file outside of the
   repository and only applying ./vendor as patch.
   The patch file is now ignored, to further mitigate the risk for
   this to happen again in case the code is refactored,

* chore: fix type error and improve error output while bundling
diff --git a/.github/workflows/dependabot-automation.yml b/.github/workflows/dependabot-automation.yml
@@ -62,7 +62,7 @@ jobs:
         run: |
           set -euo pipefail
 
-          echo "is_vendor_group=${{ steps.metadata.outputs.directory == '/vendor' && steps.metadata.outputs.dependency-type == 'direct:production' }}" >> $GITHUB_OUTPUT
+          echo "is_vendor_group=${{ steps.metadata.outputs.directory == '/vendor' }}" >> $GITHUB_OUTPUT
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         if: steps.ctx.outputs.is_vendor_group == 'true'
         with:
@@ -126,13 +126,13 @@ jobs:
             exit 1
           fi
 
-          git diff --binary --no-color > vendor.patch
+          git diff --binary --no-color > "${RUNNER_TEMP}/vendor.patch"
           echo "has_changes=true" >> $GITHUB_OUTPUT
       - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: steps.diff.outputs.has_changes == 'true'
         with:
           name: vendor-patch
-          path: vendor.patch
+          path: ${{ runner.temp }}/vendor.patch
           if-no-files-found: error
 
   vendor-push:
@@ -159,8 +159,9 @@ jobs:
       - uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: vendor-patch
+          path: ${{ runner.temp }}/vendor-artifact
       - name: Apply patch
-        run: git apply --whitespace=nowarn vendor.patch
+        run: git apply --whitespace=nowarn "${{ runner.temp }}/vendor-artifact/vendor.patch"
       - name: Validate changed paths
         run: |
           set -euo pipefail
@@ -193,7 +194,7 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
 
-          git add -A
+          git add vendor/dist vendor/package.json vendor/yarn.lock
           git commit -m "update vendored dependencies with new versions"
           echo "commits=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
       - name: Push commit
diff --git a/.gitignore b/.gitignore
@@ -130,6 +130,7 @@ packages/dd-trace/test/plugins/versions/yarn.lock
 !packages/dd-trace/**/telemetry/logs
 packages/datadog-plugin-azure-functions/test/integration-test/fixtures/node_modules
 !vendor/dist
+vendor.patch
 __azurite_db_queue__.json
 __azurite_db_queue_extent__.json
 __queuestorage__/AzuriteConfig
diff --git a/vendor.patch b/vendor.patch
diff --git a/vendor/rspack.config.js b/vendor/rspack.config.js
@@ -27,6 +27,7 @@ const exclude = new Set([
 ])
 
 module.exports = {
+  // @ts-expect-error Array#difference exists in the Node.js version being used here.
   entry: Object.fromEntries(include.difference(exclude).entries()),
   target: 'node',
   mode: 'production',
diff --git a/vendor/rspack.js b/vendor/rspack.js
@@ -5,7 +5,7 @@ const config = require('./rspack.config')
 
 rspack(config, (err, stats) => {
   if (err) {
-    console.error(err.stack || err)
+    console.error(err)
     if (err.details) {
       console.error(err.details)
     }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ const config = require('./rspack.config')`
`5`	`5`
`6`	`6`	`rspack(config, (err, stats) => {`
`7`	`7`	`if (err) {`
`8`		`- console.error(err.stack \|\| err)`
	`8`	`+ console.error(err)`
`9`	`9`	`if (err.details) {`
`10`	`10`	`console.error(err.details)`
`11`	`11`	`}`