Skip to content

Merge upstream modrinth/code main into fork - #1

Closed
Dimitrysaf wants to merge 559 commits into
mainfrom
ccr-d0d4ab88-wyywbz
Closed

Dimitrysaf wants to merge 559 commits into
mainfrom
ccr-d0d4ab88-wyywbz

Conversation

@Dimitrysaf

Copy link
Copy Markdown
Owner

Syncs the fork with modrinth/code@main (558 upstream commits) and re-applies the fork's CEF/Linux work on top. 19 files conflicted.

Conflict resolutions worth reviewing

  • Tauri patch (Cargo.toml): upstream added its own [patch.crates-io] pinning tauri-apps/tauri@7cc68e74 (Tao 0.36 + Windows input deadlock fix, feat: update tao to 0.36 and wry to 0.56 tauri-apps/tauri#15307). Git auto-merged this into a second [patch.crates-io] table, which is invalid TOML. Cargo allows one patch per crate, and the CEF runtime only exists in Dimitrysaf/tauri@feat/cef, so the fork's patch stays and upstream's was removed. The Windows deadlock fix is therefore not included. It comes back once feat/cef is rebased onto 7cc68e74; a comment in Cargo.toml says so.
  • Cargo.lock: regenerated from upstream's lock. The tauri crates and the 8 plugins-workspace feat/cef plugins are re-pointed at the patched sources (upstream's newer crates.io pins had made the plugin patches silently unused).
  • main.rs: upstream now builds a tokio runtime and (with export-app-events) writes TS bindings at the top of main(). The CEF helper-process hand-off was moved back above both, so renderer/GPU subprocesses don't run them.
  • event/mod.rs: upstream's event channel and get_window lookup, with the fork's AppRuntime generic kept.
  • logger.rs: the fork's refactor, plus upstream's webview=trace directive.
  • Titlebar drag regions: upstream's new titlebar/breadcrumb markup brought back nested bare data-tauri-drag-region attributes. Those break the CEF branch's semantics, so the fork's scheme was re-applied: "deep" on the root, no inner bare attributes, "false" on window controls.
  • Overlays: took upstream's reworked components; the remaining #teleports targets now point at body. Upstream's moved TeleportOverflowMenu and FloatingMenu already teleport to body.
  • "Disable animations": upstream removed store/theme.ts and the old AppearanceSettings.vue. The toggle is ported onto the shared @modrinth/ui appearance-settings layout as an optional setting, with state in use-theme.ts (still localStorage).
  • Scripts/config: upstream versions plus the fork's cef feature and dev:cef/build:cef/app:dev:cef scripts. beforeDevCommand now runs upstream's i18n:coverage followed by the fork's direct-vite call.

Validation

  • cargo fmt --check passes for theseus and theseus_gui.
  • Prettier passes on the edited frontend files.
  • Not verified: the Rust compile. cargo check -p theseus_gui failed twice in theseus's Gradle build script because Maven Central returned HTTP 429.
  • Not verified: the frontend lint and type checks. pnpm install couldn't finish because the sandbox blocks codeload.github.com.
  • Not verified: the CEF build (--features cef). Please build it locally before merging.

🤖 Generated with Claude Code

https://claude.ai/code/session_01CvKssB4B9gTzHCa9gS8YMX


Generated by Claude Code

clrxbl and others added 30 commits August 29, 2026 01:30
* remove old analytics routes

* remove tests for old analytics routes
* feat: per file slicer button, with custom target

* chore: move slicer link to file card instead of issue card
feat: Add `/version/{version}` redirect to `{project_type}/{slug}/version/{version}` using global middleware
)

* feat: add roll SFTP credentials button

Add a confirmation-gated control to regenerate SFTP username and password, plus API client and sync support for the new roll endpoint.

Co-authored-by: François-Xavier Talbot <fetchfern@users.noreply.github.com>

* fix lint

* chore: switch copy to Rotate

* chore: remove redundant teleport

* chore: intl:extract

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: François-Xavier Talbot <fetchfern@users.noreply.github.com>
* fix: ux changes for sync settings/overrides

* fix: screenshots page lag + better virtualization pass

* fix: gallery issues

* feat: further ux changes
fix: archived requested status not being set
* fix: 7371

* fix: continued
* feat: add ability to report organizations

* fix(labrinth): missing report case

* chore(labrinth): sqlx prepare

* fix: bump cmake to fix issues with being unable to build using windows and MSVC from visual studio

* Update apps/labrinth/src/routes/v3/reports.rs

Co-authored-by: aecsocket <43144841+aecsocket@users.noreply.github.com>
Signed-off-by: Blodhgarm <timekeeperguild@gmail.com>

---------

Signed-off-by: Blodhgarm <timekeeperguild@gmail.com>
Co-authored-by: sychic <47618543+Sychic@users.noreply.github.com>
Co-authored-by: aecsocket <43144841+aecsocket@users.noreply.github.com>
* feat: per file slicer button, with custom target

* chore: move slicer link to file card instead of issue card

* chore: move slicer link to file card instead of issue card

* tech rev part 2

* finish merge issues

* alternative host link settings

* QA changes

* prepr

* remove duplicate key

* tech rev qa 3

* report consistency + loading state to fix jumping

* fix error + queue consistency pt 2

---------

Co-authored-by: Gravy Boat <gravy@thatgravyboat.tech>
* feat: add project status and target filters

* prepr

---------

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
* feat: add hosting file archive actions

* fixes

* feat: stat check, fixes

* lint

* fix: removing padding
* fix: unfollow race condition

* remove test since it's lowkey useless
* wip: delphi trace transform rules

* add demo delphi rules ui

* use Ace editor

* run rule scans

* show in/out schema

* remove old ui

* rules affect tech review detail statuses

* clean up __dummy stuff

* fmt

* fix

* prepr

* clean up db stuff

* cleanup

* move hidden to severity

* flatten input context

* adjust schema

* improve errors for CEL input

* live/outdated label on rules

* prepare

* add dummy fixture

* allow returning strings from CEL as shorthand

* fix up wrap err calls

* add sibling traces

* update frontend

* allow modifying test trace in rules.vue

* enable cel regex

* cel #define preprocessor, regex ext

* simple autocomplete

* prepr

* cel #bind directive

* impl url parsing stuff

* switch to file_details

* paginate affected traces

* filter rule runs by specific issue details

* prepare

* fix migrations

* fix ci

* add issue type warning

* add raw CEL JSON test input

* or_null

* show hidden rules checkbox

* prepare

* adjust CEL button

* prepr

* prepr

* fix CEL input error state

* escape handling for select

* fix link to detail
* feat: add ability to get status counts for projects from users and organizations

- Also add ability to get tech review verdict counts for projects from users and organizations

* refactor: Adjust API to return project ids instead of direct count

* fix: resolve linting/import issues

* fix: service entries not getting renamed when refactoring methods

* fix: be more declarative with types

* fix: remove dereference

):

* fix linting error with cargo fmt

* refactor: adjust naming of methods for project status grouping from `_grouped` to `_by_status`

---------

Signed-off-by: Blodhgarm <blodhgrm@gmail.com>
clrxbl and others added 28 commits October 7, 2026 12:12
* HTTP redirects for v3

* move v3 gallery item routes

* v3 post redirects

* ensure redirects check user auth

* fix 200 instead of 204

* match endpoints which take canonical IDs to not resolve slug refs anymore

* slug invalidation dfetails, auth scopes

* cargo fmt
feat(labrinth): reduce rows returned by project query
* refactor(app-lib): use state helpers instead of raw state

* fix(app-lib): await state instead of polling
* update server promo

* prepr
Brings in 558 upstream commits and reapplies the fork's CEF/Linux work on top.

Conflict resolutions:
- Cargo.toml: upstream added its own [patch.crates-io] pinning tauri-apps/tauri@7cc68e74
  (Tao 0.36, Windows input deadlock fix). Cargo allows one patch per crate, so the CEF
  fork patch (Dimitrysaf/tauri feat/cef) is kept and upstream's duplicate table removed.
  Rebasing feat/cef onto 7cc68e74 restores that fix.
- Cargo.lock: regenerated from upstream's lock; tauri crates and the plugins-workspace
  feat/cef plugins re-pointed at the patched sources.
- apps/app/src/main.rs: CEF helper-process hand-off moved back to the very top of main(),
  ahead of upstream's new tokio runtime and TS-binding export.
- event/mod.rs: upstream's event channel + get_window lookup, kept AppRuntime generic.
- logger.rs: kept the fork's refactor, added upstream's webview=trace directive.
- Titlebar/Breadcrumbs/WindowControls: upstream markup with the CEF drag-region scheme
  (deep root, no nested bare attributes, "false" exclusion).
- Overlays: upstream components, remaining #teleports targets pointed at body.
- "Disable animations" setting ported onto upstream's shared appearance-settings
  layout and use-theme composable (theme store and old AppearanceSettings were removed).
- package.json / tauri.conf.json / app-lib Cargo.toml: upstream versions plus the
  fork's cef scripts, feature, and direct-vite beforeDevCommand.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CvKssB4B9gTzHCa9gS8YMX
@coderabbitai

coderabbitai Bot commented Oct 9, 2026

Copy link
Copy Markdown

Important

Draft PR not reviewed

Draft PRs are not automatically reviewed by default.

  • Trigger a manual review

To automatically review draft PRs, update your CodeRabbit configuration:

reviews:
  auto_review:
    drafts: true
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@Dimitrysaf Dimitrysaf closed this Oct 31, 2026
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.