Skip to content

Commit 86e5c78

Browse files
Merge branch 'master' into juan-fernandez/flip-default-value-failed-test-replay
2 parents dbb99bf + 14a3795 commit 86e5c78

File tree

4 files changed

+157
-140
lines changed

4 files changed

+157
-140
lines changed

eslint.config.mjs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export default [
4545
'integration-tests/debugger/target-app/source-map-support/typescript.js', // Generated
4646
'integration-tests/esbuild/out.js', // Generated
4747
'integration-tests/esbuild/aws-sdk-out.js', // Generated
48-
'packages/dd-trace/src/appsec/blocked_templates.js', // TODO Why is this ignored?
4948
'packages/dd-trace/src/payload-tagging/jsonpath-plus.js' // Vendored
5049
]
5150
},

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"checksum": "^1.0.0",
132132
"cli-table3": "^0.6.3",
133133
"dotenv": "16.3.1",
134-
"esbuild": "0.16.12",
134+
"esbuild": "^0.25.0",
135135
"eslint": "^9.19.0",
136136
"eslint-config-standard": "^17.1.0",
137137
"eslint-plugin-import": "^2.31.0",

packages/dd-trace/src/appsec/blocked_templates.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)