Merge branch 'master' into juan-fernandez/flip-default-value-failed-t…

…est-replay
DataDog · Feb 18, 2025 · 86e5c78 · 86e5c78
2 parents dbb99bf + 14a3795
commit 86e5c78
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 140 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -45,7 +45,6 @@ export default [
       'integration-tests/debugger/target-app/source-map-support/typescript.js', // Generated
       'integration-tests/esbuild/out.js', // Generated
       'integration-tests/esbuild/aws-sdk-out.js', // Generated
-      'packages/dd-trace/src/appsec/blocked_templates.js', // TODO Why is this ignored?
       'packages/dd-trace/src/payload-tagging/jsonpath-plus.js' // Vendored
     ]
   },

diff --git a/package.json b/package.json
@@ -131,7 +131,7 @@
     "checksum": "^1.0.0",
     "cli-table3": "^0.6.3",
     "dotenv": "16.3.1",
-    "esbuild": "0.16.12",
+    "esbuild": "^0.25.0",
     "eslint": "^9.19.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.31.0",

diff --git a/packages/dd-trace/src/appsec/blocked_templates.js b/packages/dd-trace/src/appsec/blocked_templates.js