fix

wxiaoguang · wxiaoguang · commit 3b4bcba16081 · 2026-04-12T17:52:16.000+08:00
diff --git a/eslint.config.ts b/eslint.config.ts
@@ -575,7 +575,6 @@ export default defineConfig([
       'no-restricted-imports': [2, {paths: [
         {name: 'jquery', message: 'Use the global $ instead', allowTypeImports: true},
         {name: 'htmx.org', message: 'Use the global htmx instead', allowTypeImports: true},
-        {name: 'idiomorph/htmx', message: 'Loaded in globals.ts', allowTypeImports: true},
       ]}],
       'no-restricted-syntax': [2, 'WithStatement', 'ForInStatement', 'LabeledStatement', 'SequenceExpression'],
       'no-return-assign': [0],
diff --git a/routers/web/repo/star.go b/routers/web/repo/star.go
@@ -26,6 +26,5 @@ func ActionStar(ctx *context.Context) {
 		ctx.ServerError("GetRepositoryByName", err)
 		return
 	}
-	ctx.RespHeader().Add("hx-trigger", "refreshUserCards") // see the `hx-trigger="refreshUserCards ..."` comments in tmpl
 	ctx.HTML(http.StatusOK, tplStarUnstar)
 }
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
@@ -316,7 +316,9 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri
 			clearFilesCommitInfo := func() {
 				log.Warn("clear directory file commit info to force async loading on frontend")
 				for i := range files {
-					files[i].Commit = nil
+					if i%2 == 0 {
+						files[i].Commit = nil
+					}
 				}
 			}
 			_ = clearFilesCommitInfo
diff --git a/routers/web/repo/watch.go b/routers/web/repo/watch.go
@@ -26,6 +26,5 @@ func ActionWatch(ctx *context.Context) {
 		ctx.ServerError("GetRepositoryByName", err)
 		return
 	}
-	ctx.RespHeader().Add("hx-trigger", "refreshUserCards") // see the `hx-trigger="refreshUserCards ..."` comments in tmpl
 	ctx.HTML(http.StatusOK, tplWatchUnwatch)
 }
diff --git a/routers/web/web.go b/routers/web/web.go
@@ -1710,7 +1710,7 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) {
 
 		m.Get("/forks", repo.Forks)
 		m.Get("/commit/{sha:([a-f0-9]{7,64})}.{ext:patch|diff}", repo.MustBeNotEmpty, repo.RawDiff)
-		m.Post("/lastcommit/*", context.RepoRefByType(git.RefTypeCommit), repo.LastCommit)
+		m.Get("/lastcommit/*", context.RepoRefByType(git.RefTypeCommit), repo.LastCommit)
 	}, optSignIn, context.RepoAssignment, reqUnitCodeReader)
 	// end "/{username}/{reponame}": repo code
 
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
@@ -76,10 +76,7 @@
 		</h4>
 		{{/* TODO: make these stats work in multi-server deployments, likely needs per-server stats in DB */}}
 		<div class="ui attached table segment">
-			<div class="no-loading-indicator tw-hidden"></div>
-			<div hx-get="{{$.Link}}/system_status" hx-swap="morph:innerHTML" hx-trigger="every 5s" hx-indicator=".no-loading-indicator">
-				{{template "admin/system_status" .}}
-			</div>
+			{{template "admin/system_status" .}}
 		</div>
 	</div>
 {{template "admin/layout_footer" .}}
diff --git a/templates/admin/system_status.tmpl b/templates/admin/system_status.tmpl
@@ -1,4 +1,4 @@
-<dl class="admin-dl-horizontal">
+<dl class="admin-dl-horizontal" data-url="{{AppSubUrl}}/-/admin/system_status" data-fetch-sync="$idiomorph" data-fetch-trigger="every 5s">
 	<dt>{{ctx.Locale.Tr "admin.dashboard.server_uptime"}}</dt>
 	<dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd>
 	<dt>{{ctx.Locale.Tr "admin.dashboard.current_goroutine"}}</dt>
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
@@ -23,7 +23,7 @@
 	{{template "base/head_script" .}}
 	{{template "custom/header" .}}
 </head>
-<body hx-swap="outerHTML" hx-ext="morph" hx-push-url="false">
+<body hx-swap="outerHTML" hx-push-url="false">
 	{{template "custom/body_outer_pre" .}}
 
 	<div class="full height">
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
@@ -108,7 +108,7 @@
 									>
 										{{svg "octicon-star"}} {{ctx.Locale.Tr "repo.projects.column.set_default"}}
 									</a>
-									<a class="item button link-action" data-url="{{$.Link}}/{{.ID}}" data-link-action-method="DELETE"
+									<a class="item button link-action" data-url="{{$.Link}}/{{.ID}}" data-fetch-action-method="DELETE"
 										data-modal-confirm-header="{{ctx.Locale.Tr "repo.projects.column.delete"}}"
 										data-modal-confirm-content="{{ctx.Locale.Tr "repo.projects.column.deletion_desc"}}"
 									>
diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl
@@ -1,13 +1,18 @@
-<form class="flex-text-inline" hx-boost="true" hx-target="this" method="post" action="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}unstar{{else}}star{{end}}">
-	<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
-		{{$buttonText := ctx.Locale.Tr "repo.star"}}
-		{{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}}
-		<button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}} aria-label="{{$buttonText}}">
-			{{svg (Iif $.IsStaringRepo "octicon-star-fill" "octicon-star")}}
-			<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
-		</button>
-		<a hx-boost="false" class="ui basic label" href="{{$.RepoLink}}/stars">
-			{{CountFmt .Repository.NumStars}}
-		</a>
-	</div>
-</form>
+<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
+	{{$buttonText := ctx.Locale.Tr "repo.star"}}
+	{{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}}
+	<button type="button" class="ui compact small basic button link-action" aria-label="{{$buttonText}}"
+		{{if $.IsSigned}}
+			data-url="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}unstar{{else}}star{{end}}"
+			data-fetch-sync="$closest(.ui.labeled.button)"
+		{{else}}
+			disabled
+		{{end}}
+	>
+		{{svg (Iif $.IsStaringRepo "octicon-star-fill" "octicon-star")}}
+		<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
+	</button>
+	<a class="ui basic label" href="{{$.RepoLink}}/stars">
+		{{CountFmt .Repository.NumStars}}
+	</a>
+</div>
diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl
@@ -1,14 +1,4 @@
-<!-- Refresh the content if a htmx response contains "HX-Trigger" header.
-This usually happens when a user stays on the watchers/stargazers page
-when they watched/unwatched/starred/unstarred and the list should be refreshed.
-To test go to the watchers page and click the watch button. The user cards should reload.
-At the moment, no JS initialization would re-trigger (fortunately there is no JS for this page).
--->
-<div class="no-loading-indicator tw-hidden"></div>
-<div class="user-cards"
-		hx-trigger="refreshUserCards from:body" hx-indicator=".no-loading-indicator"
-		hx-get="" hx-swap="outerHTML" hx-select=".user-cards"
->
+<div class="user-cards" id="user-cards-container" data-fetch-trigger="fetch-reload">
 	{{if .CardsTitle}}
 	<h2 class="ui dividing header">
 		{{.CardsTitle}}
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
@@ -1,5 +1,11 @@
 {{/* use grid layout, still use the old ID because there are many other CSS styles depending on this ID */}}
-<div id="repo-files-table" {{if .HasFilesWithoutLatestCommit}}hx-indicator="#repo-files-table .repo-file-cell.message" hx-trigger="load" hx-swap="morph" hx-post="{{.LastCommitLoaderURL}}"{{end}}>
+<div id="repo-files-table"
+	{{if .HasFilesWithoutLatestCommit}}
+		data-url="{{.LastCommitLoaderURL}}"
+		data-fetch-trigger="load" data-fetch-sync="$idiomorph"
+		data-fetch-indicator="#repo-files-table .repo-file-cell.notready.message"
+	{{end}}
+>
 	<div class="repo-file-line repo-file-last-commit">
 		{{template "repo/latest_commit" .}}
 		<div>{{if and .LatestCommit .LatestCommit.Committer}}{{DateUtils.TimeSince .LatestCommit.Committer.When}}{{end}}</div>
@@ -15,7 +21,7 @@
 			{{$entry := $item.Entry}}
 			{{$commit := $item.Commit}}
 			{{$submoduleFile := $item.SubmoduleFile}}
-			<div class="repo-file-cell name muted-links {{if not $commit}}notready{{end}}">
+			<div class="repo-file-cell name muted-links">
 				{{index $.FileIcons $entry.Name}}
 				{{if $entry.IsSubModule}}
 					{{$submoduleLink := $submoduleFile.SubmoduleWebLinkTree ctx}}
@@ -47,7 +53,7 @@
 					{{end}}
 				{{end}}
 			</div>
-			<div class="repo-file-cell message commit-summary loading-icon-2px">
+			<div class="repo-file-cell message commit-summary {{if not $commit}}notready{{end}}">
 				{{if $commit}}
 					{{$commitLink := printf "%s/commit/%s" $.RepoLink (PathEscape $commit.ID.String)}}
 					{{ctx.RenderUtils.RenderCommitMessageLinkSubject $commit.Message $commitLink $.Repository}}
diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/watch_unwatch.tmpl
@@ -1,13 +1,18 @@
-<form class="flex-text-inline" hx-boost="true" hx-target="this" method="post" action="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}unwatch{{else}}watch{{end}}">
-	<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
-		{{$buttonText := ctx.Locale.Tr "repo.watch"}}
-		{{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}}
-		<button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}} aria-label="{{$buttonText}}">
-			{{svg "octicon-eye"}}
-			<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
-		</button>
-		<a hx-boost="false" class="ui basic label" href="{{.RepoLink}}/watchers">
-			{{CountFmt .Repository.NumWatches}}
-		</a>
-	</div>
-</form>
+<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
+	{{$buttonText := ctx.Locale.Tr "repo.watch"}}
+	{{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}}
+	<button type="button" class="ui compact small basic button link-action" aria-label="{{$buttonText}}"
+		{{if $.IsSigned}}
+			data-url="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}unwatch{{else}}watch{{end}}"
+			data-fetch-sync="$closest(.ui.labeled.button)"
+		{{else}}
+			disabled
+		{{end}}
+	>
+		{{svg "octicon-eye"}}
+		<span class="not-mobile" aria-hidden="true">{{$buttonText}}</span>
+	</button>
+	<a class="ui basic label" href="{{.RepoLink}}/watchers">
+		{{CountFmt .Repository.NumWatches}}
+	</a>
+</div>
diff --git a/types.d.ts b/types.d.ts
@@ -41,6 +41,13 @@ declare module 'htmx.org/dist/htmx.esm.js' {
   export default value;
 }
 
+declare module 'idiomorph' {
+  interface Idiomorph {
+    morph(existing: Node | string, replacement: Node | string, options?: {morphStyle: 'innerHTML' | 'outerHTML'}): void;
+  }
+  export const Idiomorph: Idiomorph;
+}
+
 declare module 'swagger-ui-dist/swagger-ui-es-bundle.js' {
   const value = await import('swagger-ui-dist');
   export default value.SwaggerUIBundle;
diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css
@@ -92,3 +92,8 @@
   white-space: nowrap;
   color: var(--color-text-light-1);
 }
+
+#repo-files-table .repo-file-cell.is-loading::after {
+  height: 40%;
+  border-width: 2px;
+}
diff --git a/web_src/js/features/common-fetch-action.ts b/web_src/js/features/common-fetch-action.ts
diff --git a/web_src/js/globals.ts b/web_src/js/globals.ts

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,5 @@ func ActionStar(ctx *context.Context) {`
`26`	`26`	`ctx.ServerError("GetRepositoryByName", err)`
`27`	`27`	`return`
`28`	`28`	`}`
`29`		- ctx.RespHeader().Add("hx-trigger", "refreshUserCards") // see the `hx-trigger="refreshUserCards ..."` comments in tmpl
`30`	`29`	`ctx.HTML(http.StatusOK, tplStarUnstar)`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,9 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri`
`316`	`316`	`clearFilesCommitInfo := func() {`
`317`	`317`	`log.Warn("clear directory file commit info to force async loading on frontend")`
`318`	`318`	`for i := range files {`
`319`		`- files[i].Commit = nil`
	`319`	`+ if i%2 == 0 {`
	`320`	`+ files[i].Commit = nil`
	`321`	`+ }`
`320`	`322`	`}`
`321`	`323`	`}`
`322`	`324`	`_ = clearFilesCommitInfo`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,5 @@ func ActionWatch(ctx *context.Context) {`
`26`	`26`	`ctx.ServerError("GetRepositoryByName", err)`
`27`	`27`	`return`
`28`	`28`	`}`
`29`		- ctx.RespHeader().Add("hx-trigger", "refreshUserCards") // see the `hx-trigger="refreshUserCards ..."` comments in tmpl
`30`	`29`	`ctx.HTML(http.StatusOK, tplWatchUnwatch)`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<dl class="admin-dl-horizontal">`
	`1`	`+<dl class="admin-dl-horizontal" data-url="{{AppSubUrl}}/-/admin/system_status" data-fetch-sync="$idiomorph" data-fetch-trigger="every 5s">`
`2`	`2`	`<dt>{{ctx.Locale.Tr "admin.dashboard.server_uptime"}}</dt>`
`3`	`3`	`<dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd>`
`4`	`4`	`<dt>{{ctx.Locale.Tr "admin.dashboard.current_goroutine"}}</dt>`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@`
`108`	`108`	`>`
`109`	`109`	`{{svg "octicon-star"}} {{ctx.Locale.Tr "repo.projects.column.set_default"}}`
`110`	`110`	`</a>`
`111`		`- <a class="item button link-action" data-url="{{$.Link}}/{{.ID}}" data-link-action-method="DELETE"`
	`111`	`+ <a class="item button link-action" data-url="{{$.Link}}/{{.ID}}" data-fetch-action-method="DELETE"`
`112`	`112`	`data-modal-confirm-header="{{ctx.Locale.Tr "repo.projects.column.delete"}}"`
`113`	`113`	`data-modal-confirm-content="{{ctx.Locale.Tr "repo.projects.column.deletion_desc"}}"`
`114`	`114`	`>`