Skip to content

Commit d70d0f5

Browse files
authored
Merge branch 'main' into dx-5487/reusable-dispatch
2 parents 38ae3b5 + 2261aa4 commit d70d0f5

8 files changed

Lines changed: 1571 additions & 18391 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"dot-github": patch
3+
---
4+
5+
Bump nx and @nx/* from 22.5.3 to 22.7.12 for security advisories GHSA-w2vw-w76x-qr89 (OS command injection via git revisions), GHSA-w3vv-58gj-gw77 (daemon/plugin worker socket exposure), GHSA-vp3h-ghgh-jr7g (Zip-Slip in self-hosted remote cache), and GHSA-hrvq-x7jp-36xv (Nx vulnerability in versions <22.7.10). Add overrides for smol-toml, brace-expansion, and axios. Fixes DX-5545, DX-5544, DX-5540, DX-5538, DX-4948, DX-4947
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
"dot-github": patch
3+
---
4+
5+
Bump transitive dependencies via pnpm overrides to remediate Dependabot advisories:
6+
7+
- shell-quote 1.11.0 — GHSA-pqg4-j6r4-53mv, CVE-2026-102422 (quote() command injection)
8+
- vite 7.3.7 — GHSA-fx2h-pf6j-xcff, GHSA-p9ff-h696-f583, GHSA-v2wj-q39q-566r (server.fs.deny bypasses, dev server WebSocket file read)
9+
- undici 6.29.0 — GHSA-vxpw-j846-p89q, GHSA-vrm6-8vpv-qv8q, GHSA-v9p9-hfj2-hcw8 (WebSocket DoS)
10+
- form-data 4.0.6 — GHSA-hmw2-7cc7-3qxx, CVE-2026-12143 (CRLF injection in multipart)
11+
- @graphql-tools/utils 12.0.1 — GHSA-7mx3-vvmw-hjmv (mergeDeep prototype pollution)
12+
- @fastify/busboy 3.2.2 — GHSA-x8mw-p69m-v3mx, CVE-2026-19481 (prototype-named multipart header DoS)
13+
- http-cache-semantics 4.3.0 — GHSA-ch52-4w7c-c8xp, CVE-2026-93748 (cross-user cached response disclosure)
14+
- source-map-js 1.2.2 — GHSA-68fv-2mgg-jv7q, CVE-2026-93749 (event-loop DoS via section offsets)
15+
- picomatch 4.0.7 — GHSA-c2c7-rcm5-vvqj (ReDoS via extglob quantifiers)
16+
17+
Fixes DX-5556, DX-4463, DX-4458, DX-3679, DX-3677, DX-4480, DX-3434, DX-3433, DX-5543, DX-5542, DX-5541, DX-5546, DX-3573

‎actions/ci-grafana-alert-test/dist/index.js‎

Lines changed: 102 additions & 76 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/go-conditional-tests/dist/index.js‎

Lines changed: 414 additions & 17170 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lefthook.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pre-commit:
1515
description: "Fix reusable workflows sync"
1616
glob: "{workflows/*/*,.github/workflows/*}.{yml,yaml}"
1717
run: pnpm workflows:fix --stage {staged_files}
18+
stage_fixed: true
1819
actionlint:
1920
description: "Run actionlint"
2021
glob: "{workflows/*/*,.github/workflows/*}.{yml,yaml}"
@@ -26,5 +27,7 @@ pre-commit:
2627
build-artifacts:
2728
description: "Build artifacts for affected projects"
2829
glob: "*.{js,ts,json}"
30+
env:
31+
CI: "true"
2932
run: pnpm build:affected
3033
stage_fixed: true

‎nx.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,6 @@
5050
"targetName": "lint"
5151
}
5252
}
53-
]
53+
],
54+
"analytics": true
5455
}

‎package.json‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
"devDependencies": {
3131
"@changesets/changelog-github": "^0.5.2",
3232
"@changesets/cli": "^2.31.1",
33-
"@nx/devkit": "22.5.3",
34-
"@nx/esbuild": "22.5.3",
35-
"@nx/eslint": "22.5.3",
36-
"@nx/eslint-plugin": "22.5.3",
37-
"@nx/js": "22.5.3",
38-
"@nx/plugin": "22.5.3",
33+
"@nx/devkit": "22.7.12",
34+
"@nx/esbuild": "22.7.12",
35+
"@nx/eslint": "22.7.12",
36+
"@nx/eslint-plugin": "22.7.12",
37+
"@nx/js": "22.7.12",
38+
"@nx/plugin": "22.7.12",
3939
"@swc-node/register": "1.11.1",
4040
"@swc/cli": "0.7.10",
4141
"@swc/core": "1.15.8",
@@ -48,7 +48,7 @@
4848
"eslint-config-prettier": "10.1.8",
4949
"jsdom": "~24.1.3",
5050
"lefthook": "^1.13.6",
51-
"nx": "22.5.3",
51+
"nx": "22.7.12",
5252
"prettier": "^3.9.9",
5353
"rimraf": "^6.1.3",
5454
"ts-node": "10.9.2",
@@ -60,7 +60,18 @@
6060
"repository": "https://github.com/smartcontractkit/.github",
6161
"pnpm": {
6262
"overrides": {
63-
"form-data": "4.0.4",
63+
"axios": "^1.20.0",
64+
"brace-expansion": "^5.0.12",
65+
"smol-toml": "^1.9.0",
66+
"form-data": "4.0.6",
67+
"shell-quote": "1.11.0",
68+
"vite": "7.3.7",
69+
"undici": "6.29.0",
70+
"@graphql-tools/utils": "12.0.1",
71+
"@fastify/busboy": "3.2.2",
72+
"http-cache-semantics": "4.3.0",
73+
"source-map-js": "1.2.2",
74+
"picomatch@>=4.0.0": "4.0.7",
6475
"minimatch": "^10.2.4",
6576
"immutable": "^4.3.8"
6677
}

0 commit comments

Comments
 (0)