Conversation
|
This seems to pull in quite a few dependencies, are we ok with that? |
ChaosExAnima
force-pushed
the
remove-rails-delegate
branch
from
b7bf198 to
23fe747
Compare
ChaosExAnima
force-pushed
the
remove-rails-delegate
branch
from
23fe747 to
95ec505
Compare
something was off with the lock file- i reset to |
|
Should this also remove the |
no- there's more work to do, which is why i said "part of" in the description. |
Thanks for clarification, sounds good. FYI there are some older now closed unmerged/unreviewed PRs related to this if you want to pick through scraps to help the migration effort (example: https://github.com/mastodon/mastodon/pull/32255/files). Let me know if me rebasing/reopening any of those is desired ... not sure how out of date they are now. |
no idea. we're replacing the functionality in future PRs tho, so it shouldn't affect things. |
Merges 36 commits from upstream main (Nov 12-17, 2025) CRITICAL CDN FIXES: - Emoji worker path resolution (mastodon#36897) - Uses Vite manifest instead of hardcoded /packs/emoji/ paths. This fixes emoji loading with CDN_HOST. - CSS module CORS handling (mastodon#36890) - Adds crossorigin attribute for proper CDN stylesheet loading. - Vite deprecation warnings (mastodon#36849) - Updates to query: '?url' syntax. OTHER UPSTREAM CHANGES: - Add CSS theme tokens behind feature flag (mastodon#36861) - New styles_new/ directory with token-based theming system - Remove rails delegate (mastodon#36835) - Replaces Rails.delegate with delegated-events package - Multiple UI bug fixes for quote posts, compose form, filters - Crowdin translation updates (30+ locales) - Security update: js-yaml to v4.1.1 - Minor dependency updates (prometheus_exporter, aws-sdk-core, etc.) MERGE CONFLICT RESOLUTIONS: - emoji/loader.ts: Accepted upstream (removes hardcoded CDN paths) - boost_button.tsx: Merged quoteApproval feature - All locale files: Accepted upstream (automated translations) - Gemfile.lock: Accepted upstream (will re-add Linux platform) - yarn.lock: Accepted upstream (will rebuild) MAKEFILE IMPROVEMENTS (this branch): - Added Docker-based linting targets (rubocop, lint-js, lint-css, format) - Updated CLAUDE.md to reference Makefile instead of raw Docker commands NEXT STEPS: - Re-add Linux platform to Gemfile.lock for Docker builds - Update version to 4.5.1-theatlsocial-20251117 - Rebuild yarn dependencies - Expand CI tests for emoji CDN verification 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
4 participants
Part of MAS-383.
This PR removes usage of
Rails.delegatein favor of a lightweight dedicated library, asujsisn't maintained anymore.