Skip to content

Merge main into release/v1.0.3 - #43

Merged
DDecoene merged 3 commits into
release/v1.0.3from
feature/sync-main-into-1.0.3
Jul 5, 2026
Merged

Merge main into release/v1.0.3#43
DDecoene merged 3 commits into
release/v1.0.3from
feature/sync-main-into-1.0.3

Conversation

@DDecoene

@DDecoene DDecoene commented Jul 5, 2026

Copy link
Copy Markdown
Owner

Dependabot PR #36 (dev-dependency majors) landed on main instead of the release branch — Dependabot reset its base when the branch was updated. This merges main into release/v1.0.3 per the GitFlow convention (main merges into open release branches, never the reverse), resolving the package.json/package-lock.json conflicts (version stays 1.0.3, dependency majors from #36 win; lockfile regenerated). Unblocks release PR #42. Verified locally: 434 unit tests and build green on TypeScript 6 / Vite 8 / Vitest 4.

dependabot Bot and others added 3 commits July 5, 2026 18:37
…ith 5 updates

Bumps the dev-dependencies group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `20.19.43` | `26.1.0` |
| [tsx](https://github.com/privatenumber/tsx) | `4.22.4` | `4.23.0` |
| [typescript](https://github.com/microsoft/TypeScript) | `5.9.3` | `6.0.3` |
| [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `5.4.21` | `8.1.3` |
| [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) | `2.1.9` | `4.1.9` |



Updates `@types/node` from 20.19.43 to 26.1.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `tsx` from 4.22.4 to 4.23.0
- [Release notes](https://github.com/privatenumber/tsx/releases)
- [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs)
- [Commits](privatenumber/tsx@v4.22.4...v4.23.0)

Updates `typescript` from 5.9.3 to 6.0.3
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Commits](microsoft/TypeScript@v5.9.3...v6.0.3)

Updates `vite` from 5.4.21 to 8.1.3
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v8.1.3/packages/vite)

Updates `vitest` from 2.1.9 to 4.1.9
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md)
- [Commits](https://github.com/vitest-dev/vitest/commits/v4.1.9/packages/vitest)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 26.1.0
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: dev-dependencies
- dependency-name: tsx
  dependency-version: 4.23.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
- dependency-name: typescript
  dependency-version: 6.0.3
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: dev-dependencies
- dependency-name: vite
  dependency-version: 8.1.3
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: dev-dependencies
- dependency-name: vitest
  dependency-version: 4.1.9
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
…ndencies-29bffba6b4

chore(deps-dev): bump the dev-dependencies group across 1 directory with 5 updates
@DDecoene DDecoene added this to the v1.0.3 milestone Jul 5, 2026
@DDecoene
DDecoene merged commit b2263ad into release/v1.0.3 Jul 5, 2026
2 checks passed
@DDecoene
DDecoene deleted the feature/sync-main-into-1.0.3 branch July 5, 2026 18:50
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