Skip to content

Commit

Permalink
Merge branch 'v1.2-next' into DEVEXP-585_Backward-compatible-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
asein-sinch authored Oct 1, 2024
2 parents 1a9dc74 + 42eae5e commit 8b0c6cb
Show file tree
Hide file tree
Showing 4 changed files with 1,156 additions and 725 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/validate-audit-report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ echo '{"vulnerabilities": [' > audit-report.json
awk 'NR > 1 {print ","} {print}' audit-report.txt >> audit-report.json
echo ']}' >> audit-report.json

# Filter JSON array to remove lerna's transitive dependencies as these dependencies are not used at runtime
jq '.vulnerabilities |= map(select(.data.resolution.path | type == "string" and startswith("lerna") | not))' audit-report.json > audit-report-filtered.json
# Filter JSON array to remove jest and lerna's transitive dependencies as these dependencies are not used at runtime
jq '.vulnerabilities |= map(select(.data.resolution.path | type == "string" and (startswith("lerna") or startswith("jest") or startswith("@types/jest") or startswith("babel-jest")) | not))' audit-report.json > audit-report-filtered.json

# Fail the build if filtered JSON array contains audit advisories
if [ "$(jq '.vulnerabilities[] | select(.type == "auditAdvisory") | .type' audit-report-filtered.json | wc -l)" -gt 0 ]; then
Expand Down
6 changes: 3 additions & 3 deletions examples/webhooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"start:prod": "node dist/main"
},
"dependencies": {
"@nestjs/common": "^10.3.7",
"@nestjs/core": "^10.3.7",
"@nestjs/platform-express": "^10.3.7",
"@nestjs/common": "^10.4.4",
"@nestjs/core": "^10.4.4",
"@nestjs/platform-express": "^10.4.4",
"@sinch/sdk-core": "^1.1.0",
"dotenv": "^16.3.1",
"raw-body": "^2.5.2",
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
},
"keywords": [],
"devDependencies": {
"@babel/core": "^7.23.3",
"@babel/preset-env": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.4",
"@babel/preset-typescript": "^7.24.7",
"@cucumber/cucumber": "^10.3.1",
"@types/jest": "^29.5.1",
"@types/jest": "^29.5.13",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.9.0",
"babel-jest": "^29.7.0",
Expand All @@ -35,8 +35,8 @@
"eslint-plugin-jest-extended": "^2.0.0",
"eslint-plugin-jest-formatting": "^3.1.0",
"eslint-plugin-prettier": "^5.0.1",
"jest": "^29.5.0",
"lerna": "^7.4.1"
"jest": "^29.7.0",
"lerna": "^7.4.2"
},
"engines": {
"node": ">=18.0.0"
Expand Down
Loading

0 comments on commit 8b0c6cb

Please sign in to comment.