Skip to content

Template: [js] Update typescript 5.9.3 → 6.0.2 (major)#1475

Merged
mockdeep merged 2 commits intomainfrom
template-update/1384
Mar 31, 2026
Merged

Template: [js] Update typescript 5.9.3 → 6.0.2 (major)#1475
mockdeep merged 2 commits intomainfrom
template-update/1384

Conversation

@rails-template-sync
Copy link
Copy Markdown
Contributor

Template Update

Cherry-picked from mockdeep/Rails-Template#1384

This PR has conflicts that need manual resolution. Search for <<<<<<< in the changed files.

Resolves merge conflicts in application.ts (keep project's Backbone.js
app, discard template's simplified version) and pnpm-lock.yaml (update
peer dependency keys to typescript@6.0.2, preserve vite@7.3.1).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@mockdeep mockdeep merged commit 4149347 into main Mar 31, 2026
3 checks passed
@mockdeep mockdeep deleted the template-update/1384 branch March 31, 2026 03:58
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