Skip to content

chore(deps): batch the second Dependabot wave, realigning @types/jsdom with its runtime - #1268

Merged
xiaolai merged 6 commits into
mainfrom
chore/dependabot-batch-2-20260813
Aug 13, 2026
Merged

xiaolai merged 6 commits into
mainfrom
chore/dependabot-batch-2-20260813

Conversation

@xiaolai

@xiaolai xiaolai commented Aug 13, 2026

Copy link
Copy Markdown
Owner

The second Dependabot wave, batched into one CI cycle like #1262. These three were opened this morning, before #1262 and #1266 landed.

PR Scope Contents
#1263 github-actions taiki-e/install-action v2.85.10→v2.85.11, anthropics/claude-code-action v1 — SHA-pinned, within major, comment tags updated
#1264 npm, root @testing-library/jest-dom 7.0.0→7.0.1, knip 6.32.0→6.32.1, tsx 4.23.11→4.23.12
#1265 npm, server/content @types/jsdom 28.0.3→30.0.0

#1265 is the config fix paying off

That major bump is a correction, not a risk. server/content runs jsdom at ^30.0.1 while its types were pinned at ^28.0.3 — two majors behind the runtime they describe. They were stranded there because the only Dependabot entry that could move them was the broken /server/content one: #1189 tried exactly this bump and was closed unmerged with ERR_PNPM_OUTDATED_LOCKFILE.

This PR arrives from the root / entry carrying server/content/package.json and pnpm-lock.yaml together — the thing #1262 predicted would start working. Types and runtime now agree.

Conflict resolution

#1264 and #1265 both touch pnpm-lock.yaml, so they conflict with each other regardless of merge order, and #1264 was already DIRTY against main. Rather than hand-editing a generated file, the manifests were merged (all four bumps land cleanly in package.json / server/content/package.json) and the lockfile was regenerated from them with pnpm install --lockfile-only.

Verified the regeneration kept every intent rather than dropping a side:

root  @testing-library/jest-dom  ^7.0.1  -> 7.0.1(@testing-library/dom@10.4.1)(vitest@4.1.10)
root  knip                        6.32.1 -> 6.32.1
root  tsx                        ^4.23.12 -> 4.23.12
server/content  @types/jsdom     ^30.0.0 -> 30.0.0

Workspace importers are intact — ., server/mcp, server/content, website — so #1266's change is preserved, and the diff against main touches only the eight files these three PRs intend.

Verification

  • pnpm typecheck — clean.
  • pnpm check:static — green: 38 gate files, 836 tests, plus the file-size, shell-slots, bespoke-button, deleted-name, keybinding-drift, knip and debt-register gates.
  • lint:tauri-versions — 10 @tauri-apps packages still match src-tauri/Cargo.lock.
  • This PR's CI is the gate on the combined tree.

dependabot Bot and others added 6 commits August 13, 2026 09:57
Bumps the npm-minor-patch group with 3 updates: [@testing-library/jest-dom](https://github.com/testing-library/jest-dom), [knip](https://github.com/webpro-nl/knip/tree/HEAD/packages/knip) and [tsx](https://github.com/privatenumber/tsx).


Updates `@testing-library/jest-dom` from 7.0.0 to 7.0.1
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md)
- [Commits](testing-library/jest-dom@v7.0.0...v7.0.1)

Updates `knip` from 6.32.0 to 6.32.1
- [Release notes](https://github.com/webpro-nl/knip/releases)
- [Commits](https://github.com/webpro-nl/knip/commits/knip@6.32.1/packages/knip)

Updates `tsx` from 4.23.11 to 4.23.12
- [Release notes](https://github.com/privatenumber/tsx/releases)
- [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs)
- [Commits](privatenumber/tsx@v4.23.11...v4.23.12)

---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
  dependency-version: 7.0.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-minor-patch
- dependency-name: knip
  dependency-version: 6.32.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-minor-patch
- dependency-name: tsx
  dependency-version: 4.23.12
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-minor-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@types/jsdom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jsdom) from 28.0.3 to 30.0.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jsdom)

---
updated-dependencies:
- dependency-name: "@types/jsdom"
  dependency-version: 30.0.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…th 2 updates

Bumps the actions-minor-patch group with 2 updates in the / directory: [taiki-e/install-action](https://github.com/taiki-e/install-action) and [anthropics/claude-code-action](https://github.com/anthropics/claude-code-action).


Updates `taiki-e/install-action` from 2.85.10 to 2.85.11
- [Release notes](https://github.com/taiki-e/install-action/releases)
- [Changelog](https://github.com/taiki-e/install-action/blob/main/CHANGELOG.md)
- [Commits](taiki-e/install-action@6c6fd71...7f4eb89)

Updates `anthropics/claude-code-action` from 1.0.187 to 1.0.190
- [Release notes](https://github.com/anthropics/claude-code-action/releases)
- [Commits](anthropics/claude-code-action@1623c36...5ef2e55)

---
updated-dependencies:
- dependency-name: anthropics/claude-code-action
  dependency-version: 1.0.190
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: actions-minor-patch
- dependency-name: taiki-e/install-action
  dependency-version: 2.85.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: actions-minor-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…s-minor-patch-d5013271e5' into chore/dependabot-batch-2-20260813
…dom-30.0.0' into chore/dependabot-batch-2-20260813
…r-patch-4063261c47' into chore/dependabot-batch-2-20260813

# Conflicts:
#	pnpm-lock.yaml
@xiaolai
xiaolai merged commit 1cec611 into main Aug 13, 2026
15 checks passed
@xiaolai
xiaolai deleted the chore/dependabot-batch-2-20260813 branch August 13, 2026 14:28
bet4it pushed a commit to bet4it/vmark that referenced this pull request Aug 19, 2026
Ships the DMG notarization fix (xiaolai#1271): tauri-action signed the disk image
but never notarized it, so Gatekeeper refused the download with
"Unnotarized Developer ID" before the stapled app inside was ever assessed.

Also carries this cycle's dependency updates (xiaolai#1262, xiaolai#1268, xiaolai#1269) and the
pnpm workspace consolidation (xiaolai#1266).

All five version sources plus the derived src-tauri/Cargo.lock move together
per .claude/rules/40-version-bump.md.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant