Skip to content

Commit 2f05b36

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/js/babel/helpers-8.0.0
2 parents 3e1619f + 920dbc3 commit 2f05b36

5 files changed

Lines changed: 27 additions & 31 deletions

File tree

.github/dependabot.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ updates:
3737
- dependency-name: "@dagrejs/dagre"
3838
# Pinned: breaking API changes in v2
3939
- dependency-name: "html2canvas-pro"
40-
# Pinned to 4.2.x (see js/pnpm-workspace.yaml): date-fns 4.3.0+ breaks
41-
# vi.mock("date-fns") in TimelineEvent.test.tsx via subpath re-exports.
42-
- dependency-name: "date-fns"
4340
groups:
4441
all-minor-patch:
4542
patterns: ["*"]

js/.husky/pre-commit

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export GIT_WORK_TREE="$REPO_ROOT"
1616
# ALLOW_BIOME_BUMP=1 git commit ...
1717
PINNED_PKG_JSON="js/package.json"
1818
if git diff --cached --name-only --diff-filter=ACM | grep -qx "$PINNED_PKG_JSON"; then
19-
# Pinned: @biomejs/biome → 2.4.15.
19+
# Pinned: @biomejs/biome → 2.5.0.
2020
#
2121
# Rationale: biome 2.4.12 through 2.4.16 have a deterministic Rust stack
2222
# overflow on macOS arm64 when running TS-aware nursery rules
@@ -26,12 +26,14 @@ if git diff --cached --name-only --diff-filter=ACM | grep -qx "$PINNED_PKG_JSON"
2626
# 2.4.16 locally on 2026-05-28 and CONFIRMED it still crashes — see
2727
# DataRecce/recce-cloud-infra#1382 for the testing notes.
2828
#
29-
# The js/biome.json in this repo does NOT currently enable those rules,
30-
# so 2.4.15 is safe here. But a silent dependabot bump past this version
31-
# (or a future enabling of those rules) could regress us. Any change
32-
# requires deliberate ack. When biome ships a release that confirms the
33-
# full fix, update EXPECTED_BIOME in the same commit as the bump.
34-
EXPECTED_BIOME="2.4.15"
29+
# 2.5.0 is ABOVE the affected 2.4.12–2.4.16 range and verified clean on
30+
# macOS arm64 (`biome check src/` + `packages/ui/src/` exit 0, no stack
31+
# overflow). Bumped to 2.5.0 in #1435; this guard was left at 2.4.15 by
32+
# that PR and reconciled here. The js/biome.json in this repo does NOT
33+
# currently enable those nursery rules either. A silent dependabot bump
34+
# still requires deliberate ack: when changing biome, update EXPECTED_BIOME
35+
# in the same commit as the bump (and re-run the macOS arm64 check above).
36+
EXPECTED_BIOME="2.5.0"
3537
# head -1 hardens against a future pnpm.overrides entry adding a second
3638
# "@biomejs/biome": line. Fail-loud (below) if extraction is empty so a
3739
# package.json reformat (or removed dep) can't silently disable the guard.

js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"chart.js": "^4.5.1",
5757
"codemirror": "^6.0.2",
5858
"common-tags": "^1.8.2",
59-
"date-fns": "~4.2.1",
59+
"date-fns": "^4.4.0",
6060
"file-saver": "^2.0.5",
6161
"happy-dom": "^20.10.5",
6262
"import-in-the-middle": "^3.0.2",

js/pnpm-lock.yaml

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

js/pnpm-workspace.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ overrides:
5252
'yaml@>=2.0.0 <2.8.3': '>=2.8.3'
5353
'js-cookie@<3.0.7': ^3.0.7
5454
'ws@>=8.0.0 <8.20.1': ^8.20.1
55-
# Pinned to 4.2.x: date-fns 4.3.0 added a modularized optimization fallback
56-
# that breaks `vi.mock("date-fns", ...)` in TimelineEvent.test.tsx (OSS).
57-
# Revisit when the test mock is updated to handle subpath re-exports.
58-
date-fns: ~4.2.1
55+
date-fns: ^4.1.0
5956

6057
allowBuilds:
6158
# Allowed: these packages produce native artifacts we use at runtime

0 commit comments

Comments
 (0)