Merge some standalone Vite entries into index.js by silverwind · Pull Request #37085 · go-gitea/gitea

silverwind · 2026-04-02T18:06:22Z

Keep swagger and external-render-helper as a standalone entries for external render.

Move devtest.ts to modules/ as init functions
Make external renders correctly load its helper JS and Gitea's current theme
Make external render iframe inherit Gitea's iframe's background color to avoid flicker
Add e2e tests for external render and OpenAPI iframe

This PR was written with the help of Claude Opus 4.6

The webpack-to-vite migration broke OpenAPI document rendering in dev mode because viteDevSourceURL blindly mapped all css/* paths to /web_src/css/*, but standalone CSS like swagger.css lives in web_src/css/standalone/ and needs its bundled npm dependencies. Replace the blind css/ mapping with a generic file-existence check that works for both CSS and JS. Consolidate JS if-chains into a switch and add a path traversal guard. For theme support, load the user's Gitea theme CSS on the /api/swagger page so swagger.ts can read --is-dark-theme instead of relying on prefers-color-scheme (which ignores the user's Gitea theme preference). For the iframe case, inject --is-dark-theme and --color-box-body from the parent page into the iframe document on load. Hide the iframe with is-loading until content is ready to prevent color flashes. Co-Authored-By: Claude (Opus 4.6) <noreply@anthropic.com>

wxiaoguang · 2026-04-03T01:21:57Z

Why not simply merge standalone scripts into the one index.js?

silverwind · 2026-04-03T07:54:11Z

I'm not sure that is actual "simpler".

wxiaoguang · 2026-04-03T08:14:04Z

I'm not sure that is actual "simpler".

You will only have one index.js entry, no need to play the tricks with the files in web_src

silverwind · 2026-04-03T14:04:32Z

You mean merge into IIFE or async index.js?
Will add an e2e test here as well as it seems valuable.

wxiaoguang · 2026-04-03T14:21:52Z

You mean merge into IIFE or async index.js?

Nope. Although I suggested to merge them, you corrected me that it won't work due to index.js must be loaded in <script type=module while IIFE must be loaded before the html body.

I mean merage "devtest" and "swagger" into "index.ts", then they can share the modules, no more vite configs, and maybe fewer chunks.

Since every module in index is chunked, so nothing worse?

silverwind · 2026-04-03T14:28:34Z

I mean merage "devtest" and "swagger" into "index.ts"

index.ts is async but the other standalone endpoints are also async already, so likely can be done without any loading state regressions. Only issue is we run some useless JS that does not apply to the standalone pages, but probably neglible.

wxiaoguang · 2026-04-03T14:51:55Z

Only issue is we run some useless JS that does not apply to the standalone pages, but probably neglible.

They won't run since these JS won't be loaded on the devtest or swagger page, we can make them lazy-load?

silverwind · 2026-04-03T16:42:53Z

I'm talking about all the other init* functions in index.js which will run unavoidably. Swagger/devtest would need a similar init* followed by a lazy-load, introducing 1 extra round trip to the server which is currently avoided by the entry points.

silverwind · 2026-04-03T16:45:20Z

The only real benefit is deduplication of the big swagger-ui chunk which could be lazy-loaded in two places instead of currently one, saving probably ~200kB output size.

I guess I need to experiment if the extra round-trip is noticable in practice or not.

wxiaoguang · 2026-04-03T16:46:05Z

I'm talking about all the other init* functions in index.js which will run unavoidably

I have added the benchmark, they won't take much time. Most of them do nothing if there is no related element on the page.

And we can migrate them to our data-global-init framework, then maybe can be faster.

Swagger/devtest would need a similar init* followed by a lazy-load, introducing 1 extra round trip to the server which is currently avoided by the entry points.

You can benchmark, less than 0.0...01s

wxiaoguang · 2026-04-03T16:47:14Z

introducing 1 extra round trip to the server which is currently avoided by the entry points.

I don't think anyone can really feel the " 1 extra round trip " on the devtest / swagger page, and I don't think anyone would be affected.

silverwind · 2026-04-03T16:48:09Z

If your latency to the server is 300ms+, it could be noticable. But generally most users will have less latency than that.

wxiaoguang · 2026-04-03T16:49:55Z

If your latency to the server is 300ms+, it could be noticable. But generally most users will have less latency than that.

No user will be affected by the 300ms+ latency on devtest page
For the swagger page: if the latency is 300ms+, then the swagger json is already large enough, would they really care the loading time becomes slightly longer?

wxiaoguang · 2026-04-03T16:52:15Z

2. For the swagger page: if the latency is 300ms+, then the swagger json is already large enough, would they really care the loading time becomes slightly longer?

In this case, the more chunks in "index.js" (caused by the standalone files) will affect users more, for >99% time they are visiting the main site's pages, but not swagger page.

So even the network latency is high, the merged solution still brings best user experience.

… resize during loading - Add matchMedia change listener so swagger dark-mode class updates when system color scheme changes at runtime (relevant for auto theme) - Remove is-loading guard on iframe resize messages so the correct height is set before the iframe becomes visible Co-Authored-By: Claude (Opus 4.6) <noreply@anthropic.com>

silverwind · 2026-04-03T17:59:37Z

It seems we have to load iife (needed for jQuery, which is needed by fomantic import in index.js), so it will be loading considerably more js on those pages, but I guess it wont matter. window.config also may need to be stubbed.

wxiaoguang · 2026-04-03T18:04:33Z

window.config also may need to be stubbed.

head_script.tmpl already includes iifs.js and window.config, just simply include it.

Remove standalone JS entry points (swagger, devtest, external-render-iframe) from the Vite config. Move their init logic into modules/ and register them in index.ts's callInitFunctions array. Standalone pages (openapi iframe, external render iframe) now load iife.js + index.js via head_script template. - Move swagger/devtest/external-render-iframe JS into modules/ - Delete web_src/js/standalone/ and web_src/css/standalone/ - Keep swagger.css and devtest.css as CSS-only Vite entries - Swagger template and openapi.go use head_script + index.js - Pass pre-rendered HeadScriptHTML from router to markup renderer - Use `isDarkTheme()` with matchMedia fallback for swagger dark mode - Use `data-gitea-theme-dark` attribute for swagger CSS overrides - Use CSS vars instead of hardcoded colors in swagger.css - Guard customElements.define to prevent re-registration in iframes - Suppress context-canceled proxy errors in vitedev.go Co-Authored-By: Claude (Opus 4.6) <noreply@anthropic.com>

Co-Authored-By: Claude (Opus 4.6) <noreply@anthropic.com>

silverwind · 2026-04-03T19:05:04Z

Standalone entry points removed. CSS files are kept as entry points to avoid FOUC, but could also make it load index.css if you prefer, but it'd be 99% dead CSS.

wxiaoguang · 2026-04-05T08:52:44Z

Move standalone/{swagger,devtest,external-render-iframe}.ts to modules/ as init functions

During the refactoring, I found that keeping swagger as standalone still seems to be a better choice for now. At the moment, it doesn't share anything with "index.ts" and its modules, and the swagger ui page doesn't need any code from main site other than "js-yaml".

In the future, if the swagger ui page needs to use main site's modules, we can migrate it at that time (and the newly added HINT comment can help people to understand the problem).

wxiaoguang · 2026-04-05T11:13:15Z

Found another problem: inconsistent output directories for JS

Old:

js/index.ts
- output: js/index.js
- imported by /assets/js/index.js
js/features/eventsource.sharedworker.ts
- output: js/eventsource.sharedworker.js
- imported by /assets/js/eventsource.sharedworker.js
js/standalone/external-render-iframe.ts (when using iife)
- output: js/standalone/external-render-iframe.js
- imported by /assets/js/external-render-iframe.js

To make everything clear and consistent, now, all "entry" files are moved to the web_src/js directory, no sub-directory anymore.

If any one would like to add sub-directories in the future, all the paths must be kept consistent: if an entry is in a sub-directory, its output should also be in the same sub-directory, and the frontend should also use the sub-directory to import it.

Copilot

Pull request overview

Copilot reviewed 32 out of 34 changed files in this pull request and generated 3 comments.

Comments suppressed due to low confidence (2)

web_src/js/external-render-helper.ts:23

data-gitea-theme-dark is only set when the query param indicates dark mode. When it’s false, the attribute is left unset, which breaks CSS selectors that rely on explicit "true"/"false" (e.g. GitHub-style dark/light image switching based on html[data-gitea-theme-dark="false"]). Consider always setting the attribute to "true" or "false" based on the param value.
web_src/js/external-render-helper.ts:32
themeUri is taken directly from a query parameter and injected into a . A crafted /render/ URL could point this to an arbitrary external CSS URL, causing the sandboxed iframe to make cross-origin requests (privacy leak via Referer) and allowing untrusted CSS to be applied. Consider validating themeUri before using it (e.g. only allow same-origin /assets/css/theme-.css (and/or /web_src/css/themes/ in dev), otherwise ignore).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

wxiaoguang · 2026-04-05T18:22:15Z

I have tested:

make watch-frontend
make frontend

X

a. embedded swagger
b. gitea api swagger
c. other external render

X

A. light theme
B. dark theme

Will merge if tests pass, to catch 1.26 release.

* main: Repair duration display for bad stopped timestamps (go-gitea#37121) Add terraform state registry (go-gitea#36710) Add placeholder content for empty content page (go-gitea#37114) Improve control char rendering and escape button styling (go-gitea#37094) Add gpg signing for merge rebase and update by rebase (go-gitea#36701) Move package settings to package instead of being tied to version (go-gitea#37026) Merge some standalone Vite entries into index.js (go-gitea#37085) Update Nix flake (go-gitea#37110) [skip ci] Updated translations via Crowdin Fix the wrong push commits in the pull request when force push (go-gitea#36914)

silverwind · 2026-04-07T09:37:13Z

Why is CORS being enabled in the Vite server? Surely we can do without CORS?

wxiaoguang · 2026-04-07T09:38:29Z

Why is CORS being enabled in the Vite server? Surely we can do without CORS?

Surely you can't.

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 2, 2026

github-actions Bot added modifies/go labels Apr 2, 2026

silverwind requested a review from Copilot April 2, 2026 18:45

Copilot started reviewing on behalf of silverwind April 2, 2026 18:46 View session

This comment was marked as outdated.

Sign in to view

silverwind added the type/bug label Apr 3, 2026

silverwind changed the title ~~Fix Swagger/OpenAPI rendering in dev mode and improve theme support~~ Fix Swagger/OpenAPI rendering and merge standalone Vite entry points Apr 3, 2026

Merge origin/main into fixswag

2b507dd

Co-Authored-By: Claude (Opus 4.6) <noreply@anthropic.com>

wxiaoguang force-pushed the fixswag branch from 1bc427b to 924c1f7 Compare April 5, 2026 08:52

wxiaoguang added 4 commits April 5, 2026 17:19

fix test

54d9263

Merge branch 'main' into fixswag

9690716

add comment

82b08a6

remove unclear swagger css style

70f137b

wxiaoguang force-pushed the fixswag branch from 6dcafba to 1fc13eb Compare April 5, 2026 11:04

wxiaoguang mentioned this pull request Apr 5, 2026

Fix duplicate script declaration error in pull request merge box #36759

Draft

wxiaoguang force-pushed the fixswag branch from 1fc13eb to 54ed950 Compare April 5, 2026 11:32

fix unclear js name mapping

e8e718f

wxiaoguang force-pushed the fixswag branch from 54ed950 to e8e718f Compare April 5, 2026 11:35

wxiaoguang requested a review from Copilot April 5, 2026 14:45

Copilot started reviewing on behalf of wxiaoguang April 5, 2026 14:46 View session

Copilot AI reviewed Apr 5, 2026

View reviewed changes

Comment thread modules/markup/render.go Outdated

Comment thread vite.config.ts

Comment thread modules/markup/external/openapi.go

wxiaoguang added 3 commits April 5, 2026 23:46

add tests to cover RenderIFrame behavior

c010dbc

simplify external render css injection

d27ad93

fix test

fad6527

wxiaoguang changed the title ~~Merge standalone Vite entry points into index.js~~ Merge some standalone Vite entries into index.js Apr 5, 2026

Merge branch 'main' into fixswag

3cb2cd1

wxiaoguang enabled auto-merge (squash) April 5, 2026 18:32

wxiaoguang added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 5, 2026

wxiaoguang merged commit a893811 into go-gitea:main Apr 5, 2026
26 checks passed

wxiaoguang deleted the fixswag branch April 5, 2026 19:13

GiteaBot added this to the 1.26.0 milestone Apr 5, 2026

GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 5, 2026

Uh oh!

Conversation

silverwind commented Apr 2, 2026 • edited by wxiaoguang Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

wxiaoguang commented Apr 3, 2026

Uh oh!

silverwind commented Apr 3, 2026

Uh oh!

wxiaoguang commented Apr 3, 2026

Uh oh!

silverwind commented Apr 3, 2026

Uh oh!

wxiaoguang commented Apr 3, 2026

Uh oh!

silverwind commented Apr 3, 2026

Uh oh!

wxiaoguang commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

silverwind commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

silverwind commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wxiaoguang commented Apr 3, 2026

Uh oh!

wxiaoguang commented Apr 3, 2026

Uh oh!

silverwind commented Apr 3, 2026

Uh oh!

wxiaoguang commented Apr 3, 2026

Uh oh!

wxiaoguang commented Apr 3, 2026

Uh oh!

silverwind commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wxiaoguang commented Apr 3, 2026

Uh oh!

silverwind commented Apr 3, 2026

Uh oh!

wxiaoguang commented Apr 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wxiaoguang commented Apr 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wxiaoguang commented Apr 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

silverwind commented Apr 7, 2026

Uh oh!

wxiaoguang commented Apr 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

silverwind commented Apr 2, 2026 •

edited by wxiaoguang

Loading

wxiaoguang commented Apr 3, 2026 •

edited

Loading

silverwind commented Apr 3, 2026 •

edited

Loading

silverwind commented Apr 3, 2026 •

edited

Loading

silverwind commented Apr 3, 2026 •

edited

Loading

wxiaoguang commented Apr 5, 2026 •

edited

Loading

wxiaoguang commented Apr 5, 2026 •

edited

Loading

wxiaoguang commented Apr 5, 2026 •

edited

Loading