From de37c175685800cb00a1645b3ec6acf4bb149f9c Mon Sep 17 00:00:00 2001
From: whereareiam <mmm.g032@gmail.com>
Date: Thu, 22 Oct 2026 22:25:33 +0200
Subject: [PATCH] fix(packages): the repository's packages in the shared
 package list

A repository's Packages tab now shows the list a user or organization
shows: a "Packages" heading, the search with the type filter, and a
box with a row per package or GitHub's empty state. The list becomes a
component (package/list) for all three pages. The repository page's old
rule boxed every classless child of the page, Forgejo's empty flash
message included, which drew a stray line above the list.

The asset step now copies every component group instead of a fixed
list.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 components/package/list/list.css     | 84 ++++++++++++++++++++++++++++
 components/package/list/list.tmpl    | 60 ++++++++++++++++++++
 scripts/assembleForgejo.ts           |  2 +-
 src/build-output.test.ts             | 16 ++++++
 styles/components/repo/packages.ts   | 41 +-------------
 styles/pages/profile-subpages.css    | 51 -----------------
 templates/base/component_assets.tmpl |  1 +
 templates/repo/packages.tmpl         | 16 ++++++
 templates/user/profile_packages.tmpl | 60 +-------------------
 9 files changed, 181 insertions(+), 150 deletions(-)
 create mode 100644 components/package/list/list.css
 create mode 100644 components/package/list/list.tmpl
 create mode 100644 templates/repo/packages.tmpl

diff --git a/components/package/list/list.css b/components/package/list/list.css
new file mode 100644
index 00000000..4ed2fd05
--- /dev/null
+++ b/components/package/list/list.css
@@ -0,0 +1,84 @@
+/* GitHub's package list: the search, type filter and Search button on one line, then a box with a row per package
+   (its icon, name and type, then the latest version and who published it). */
+.theme-package-search {
+  margin: 0 0 16px;
+}
+
+.theme-package-search-controls {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.theme-package-search-controls > .theme-search-field {
+  flex: 1;
+}
+
+.theme-package-row {
+  border: 1px solid var(--color-secondary);
+  border-bottom: 0;
+}
+
+.theme-package-row:first-child {
+  border-radius: 6px 6px 0 0;
+}
+
+.theme-package-row:last-of-type {
+  border-bottom: 1px solid var(--color-secondary);
+  border-radius: 0 0 6px 6px;
+}
+
+.theme-package-row:only-of-type {
+  border-radius: var(--border-radius);
+}
+
+.theme-package-row > .flex-item {
+  gap: 16px;
+  padding: 16px;
+}
+
+.theme-package-icon {
+  flex: none;
+  color: var(--color-text-light-1);
+}
+
+.theme-package-row .flex-item-title {
+  flex-wrap: wrap;
+  gap: 8px;
+  font-size: 16px;
+  line-height: 24px;
+}
+
+.theme-package-row .flex-item-title > a {
+  color: var(--color-primary);
+}
+
+.theme-package-row .flex-item-body {
+  display: block;
+  margin-top: 4px;
+  color: var(--color-text-light-1);
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.theme-package-version {
+  margin-right: 12px;
+}
+
+@media (max-width: 767px) {
+  .theme-package-search-controls {
+    flex-wrap: wrap;
+  }
+
+  .theme-package-search-controls > .theme-search-field {
+    flex-basis: 100%;
+  }
+
+  .theme-package-search-controls > .theme-select-wrap {
+    flex: 1;
+  }
+
+  .theme-package-search-controls .theme-select {
+    width: 100%;
+  }
+}
diff --git a/components/package/list/list.tmpl b/components/package/list/list.tmpl
new file mode 100644
index 00000000..f247b323
--- /dev/null
+++ b/components/package/list/list.tmpl
@@ -0,0 +1,60 @@
+{{- /* GitHub's package list for a user, an organization or a repository: the search with the type filter, then a box
+with a row per package, or the empty state. Called with the page context. */ -}}
+{{if .HasPackages}}
+<form class="ui form ignore-dirty theme-package-search">
+	<div class="theme-package-search-controls">
+		{{template "components/common/search/search" dict "Kind" "plain" "Value" .Query "Placeholder" (ctx.Locale.Tr "search.package_kind")}}
+		<span class="theme-select-wrap"><select class="theme-select" name="type" aria-label="{{ctx.Locale.Tr "packages.filter.type"}}">
+			<option value="">{{ctx.Locale.Tr "packages.filter.type"}}</option>
+			<option value="all">{{ctx.Locale.Tr "packages.filter.type.all"}}</option>
+			{{range $type := .AvailableTypes}}
+			<option{{if eq $.PackageType $type}} selected="selected"{{end}} value="{{$type}}">{{$type.Name}}</option>
+			{{end}}
+		</select></span>
+		<button class="secondary button theme-control theme-control-wide" type="submit">{{ctx.Locale.Tr "search.search"}}</button>
+	</div>
+</form>
+{{end}}
+<div class="theme-package-list">
+	{{range .PackageDescriptors}}
+	<div class="theme-package-row">
+		<div class="flex-item">
+			<div class="theme-package-icon">{{svg .Package.Type.SVGName 24}}</div>
+			<div class="flex-item-main">
+				<div class="flex-item-title">
+					<a href="{{.VersionWebLink}}">{{.Package.Name}}</a>
+					<span class="ui basic label">{{.Package.Type.Name}}</span>
+				</div>
+				<div class="flex-item-body">
+					<span class="theme-package-version">{{.Version.LowerVersion}}</span>
+					{{$timeStr := DateUtils.TimeSince .Version.CreatedUnix}}
+					{{$hasRepositoryAccess := false}}
+					{{if .Repository}}
+						{{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}}
+					{{end}}
+					{{if $hasRepositoryAccess}}
+						{{ctx.Locale.Tr "packages.published_by_in" $timeStr .Creator.HomeLink .Creator.GetDisplayName .Repository.Link .Repository.FullName}}
+					{{else}}
+						{{ctx.Locale.Tr "packages.published_by" $timeStr .Creator.HomeLink .Creator.GetDisplayName}}
+					{{end}}
+				</div>
+			</div>
+		</div>
+	</div>
+	{{else}}
+		{{if not .HasPackages}}
+			<div class="theme-empty">
+				{{svg "octicon-package" 48}}
+				<h2>{{ctx.Locale.Tr "packages.empty"}}</h2>
+				{{if and .Repository .CanWritePackages}}
+					{{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}}
+					<p>{{ctx.Locale.Tr "packages.empty.repo" $packagesUrl}}</p>
+				{{end}}
+				<p>{{ctx.Locale.Tr "packages.empty.documentation" "https://forgejo.org/docs/latest/user/packages/"}}</p>
+			</div>
+		{{else}}
+			{{template "user/profile_empty" dict "Icon" "octicon-package" "Title" (ctx.Locale.Tr "packages.filter.no_result")}}
+		{{end}}
+	{{end}}
+</div>
+{{template "base/paginate" .}}
diff --git a/scripts/assembleForgejo.ts b/scripts/assembleForgejo.ts
index a72a6fff..61a19ab4 100644
--- a/scripts/assembleForgejo.ts
+++ b/scripts/assembleForgejo.ts
@@ -28,7 +28,7 @@ const copyTemplates = (source: string, target: string): void => {
 };
 copyTemplates(join(root, "components"), join(templates, "components"));
 
-for (const directory of ["common", "project", "repository"]) {
+for (const directory of readdirSync(join(root, "components"))) {
   const source = join(root, "components", directory);
   for (const component of readdirSync(source, { withFileTypes: true })) {
     if (!component.isDirectory()) continue;
diff --git a/src/build-output.test.ts b/src/build-output.test.ts
index 9fba01a1..8f1661b2 100644
--- a/src/build-output.test.ts
+++ b/src/build-output.test.ts
@@ -594,6 +594,22 @@ describe("Forgejo 15 native integration", () => {
     expect(read("templates", "repo", "activity.tmpl")).toContain("flex-container github-insights");
   });
 
+  it("lists a repository's packages like a user's or an organization's", () => {
+    const read = (...parts: string[]) => fs.readFileSync(path.join(ROOT_DIR, ...parts), "utf-8");
+    expect(read("templates", "repo", "packages.tmpl")).toContain('{{template "components/package/list/list" .}}');
+    expect(read("templates", "user", "profile_packages.tmpl")).toContain(
+      '{{template "components/package/list/list" .}}'
+    );
+    // Forgejo's flash message is a classless div; the old list rule boxed it into a stray line.
+    expect(read("styles", "components", "repo", "packages.ts")).not.toContain("div:not([class])");
+    expect(read("scripts", "assembleForgejo.ts")).toContain('readdirSync(join(root, "components"))');
+    expect(
+      fs.existsSync(
+        path.join(DIST_DIR, "forgejo", "public", "assets", "css", "components", "package", "list", "list.css")
+      )
+    ).toBe(true);
+  });
+
   it("matches GitHub's repository About, visibility, and code-search details", () => {
     const headerStyle = fs.readFileSync(path.join(ROOT_DIR, "styles", "templates", "repo", "header.ts"), "utf-8");
     const headerTemplate = fs.readFileSync(path.join(ROOT_DIR, "templates", "repo", "home_header.tmpl"), "utf-8");
diff --git a/styles/components/repo/packages.ts b/styles/components/repo/packages.ts
index dcc36723..bb4fdbb1 100644
--- a/styles/components/repo/packages.ts
+++ b/styles/components/repo/packages.ts
@@ -17,44 +17,7 @@
  * limitations under the License.
  */
 
-import { css, cssCombine, otherThemeVars, themeVars } from "@lutinglt/gitea-github-theme/core";
-
-const packageList = css`
-  .page-content.packages > .ui.container > div:not([class]):not(:has(img.ui.avatar)) {
-    border: 1px solid ${themeVars.color.light.border};
-    border-radius: ${otherThemeVars.border.radius};
-    margin-top: 16px;
-    > .flex-list {
-      border-top: 1px solid ${themeVars.color.light.border};
-      &:first-child {
-        border-top: 0;
-      }
-      > .flex-item {
-        padding: 16px;
-        .flex-item-title {
-          gap: 8px;
-          > a {
-            min-height: 25px;
-          }
-          .ui.label {
-            background-color: transparent;
-            border: 1px solid ${themeVars.color.light.border};
-            color: ${themeVars.color.primary.self};
-            gap: 4px;
-            min-height: 24.5px;
-            padding: 3px 6px;
-          }
-        }
-        .flex-item-body {
-          font-size: 12px;
-          a {
-            text-decoration: underline;
-          }
-        }
-      }
-    }
-  }
-`;
+import { css, cssCombine, themeVars } from "@lutinglt/gitea-github-theme/core";
 
 const packageDetails = css`
   .page-content.packages {
@@ -138,4 +101,4 @@ const packageDetailsMobile = css`
   }
 `;
 
-export default cssCombine(packageList, packageDetails, packageDetailsMobile);
+export default cssCombine(packageDetails, packageDetailsMobile);
diff --git a/styles/pages/profile-subpages.css b/styles/pages/profile-subpages.css
index 3c187be3..44282992 100644
--- a/styles/pages/profile-subpages.css
+++ b/styles/pages/profile-subpages.css
@@ -266,53 +266,6 @@
   line-height: 20px;
 }
 
-:is(.github-profile, .github-org) .profile-package-row {
-  border: 1px solid var(--color-secondary);
-  border-bottom: 0;
-}
-
-:is(.github-profile, .github-org) .profile-package-row:first-child {
-  border-radius: 6px 6px 0 0;
-}
-
-:is(.github-profile, .github-org) .profile-package-row:last-of-type {
-  border-bottom: 1px solid var(--color-secondary);
-  border-radius: 0 0 6px 6px;
-}
-
-:is(.github-profile, .github-org) .profile-package-row:only-of-type {
-  border-radius: var(--border-radius);
-}
-
-:is(.github-profile, .github-org) .profile-package-row > .flex-item {
-  gap: 16px;
-  padding: 16px;
-}
-
-:is(.github-profile, .github-org) .profile-package-icon {
-  flex: none;
-  color: var(--color-text-light-1);
-}
-
-:is(.github-profile, .github-org) .profile-packages .flex-item-title {
-  flex-wrap: wrap;
-  gap: 8px;
-  font-size: 16px;
-  line-height: 24px;
-}
-
-:is(.github-profile, .github-org) .profile-packages .flex-item-body {
-  display: block;
-  margin-top: 4px;
-  color: var(--color-text-light-1);
-  font-size: 12px;
-  line-height: 18px;
-}
-
-:is(.github-profile, .github-org) .profile-package-version {
-  margin-right: 12px;
-}
-
 :is(.github-profile, .github-org) .profile-package-breadcrumb {
   margin: 0 0 16px;
   font-size: 14px;
@@ -363,10 +316,6 @@
   border-color: var(--github-borderColor-accent-emphasis);
 }
 
-:is(.github-profile, .github-org) .profile-packages .flex-item-title > a {
-  color: var(--color-primary);
-}
-
 :is(.github-profile, .github-org) .profile-subpage-title {
   overflow-wrap: anywhere;
 }
diff --git a/templates/base/component_assets.tmpl b/templates/base/component_assets.tmpl
index 17e8b3cc..7f8d7210 100644
--- a/templates/base/component_assets.tmpl
+++ b/templates/base/component_assets.tmpl
@@ -19,6 +19,7 @@
 <script src="{{AssetUrlPrefix}}/js/components/common/dropdown/dropdown.js" defer></script>
 <script src="{{AssetUrlPrefix}}/js/components/common/dropdown/open-animation.js" defer></script>
 <script src="{{AssetUrlPrefix}}/js/branch-selector.js" defer></script>
+<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/components/package/list/list.css">
 <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/components/repository/branch/branch.css">
 <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/components/repository/commit-groups/commit-groups.css">
 <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/components/repository/label/list.css">
diff --git a/templates/repo/packages.tmpl b/templates/repo/packages.tmpl
new file mode 100644
index 00000000..5ea5a499
--- /dev/null
+++ b/templates/repo/packages.tmpl
@@ -0,0 +1,16 @@
+{{/* A repository's packages in the package list a user or organization shows, under a "Packages" heading. */}}
+{{template "base/head" .}}
+<div role="main" aria-label="{{.Title}}" class="page-content repository packages">
+	<div class="ui container">
+		{{if (and .Repository.IsPrivate .Repository.Owner.Visibility.IsPublic)}}
+			<div class="ui warning message flash-message flash-warning">
+				{{svg "octicon-alert"}}
+				{{ctx.Locale.Tr "repo.packages.visibility_warning" .Repository.OwnerName}}
+			</div>
+		{{end}}
+		<div class="theme-list-heading"><div class="theme-list-title"><h1>{{ctx.Locale.Tr "packages.title"}}</h1></div></div>
+		{{template "base/alert" .}}
+		{{template "components/package/list/list" .}}
+	</div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/user/profile_packages.tmpl b/templates/user/profile_packages.tmpl
index 70000f9c..da5375ba 100644
--- a/templates/user/profile_packages.tmpl
+++ b/templates/user/profile_packages.tmpl
@@ -1,63 +1,5 @@
 <section class="profile-packages">
 <h2 class="profile-subpage-title">{{ctx.Locale.Tr "packages.title"}}</h2>
 {{template "base/alert" .}}
-{{if .HasPackages}}
-<form class="ui form ignore-dirty profile-list-search">
-	<div class="profile-search-controls">
-		{{template "components/common/search/search" dict "Kind" "plain" "Value" .Query "Placeholder" (ctx.Locale.Tr "search.package_kind")}}
-		<span class="theme-select-wrap"><select class="theme-select" name="type" aria-label="{{ctx.Locale.Tr "packages.filter.type"}}">
-			<option value="">{{ctx.Locale.Tr "packages.filter.type"}}</option>
-			<option value="all">{{ctx.Locale.Tr "packages.filter.type.all"}}</option>
-			{{range $type := .AvailableTypes}}
-			<option{{if eq $.PackageType $type}} selected="selected"{{end}} value="{{$type}}">{{$type.Name}}</option>
-			{{end}}
-		</select></span>
-		<button class="secondary button theme-control theme-control-wide" type="submit">{{ctx.Locale.Tr "search.search"}}</button>
-	</div>
-</form>
-{{end}}
-<div class="profile-package-list">
-	{{range .PackageDescriptors}}
-	<div class="profile-package-row">
-		<div class="flex-item">
-			<div class="profile-package-icon">{{svg .Package.Type.SVGName 24}}</div>
-			<div class="flex-item-main">
-				<div class="flex-item-title">
-					<a href="{{.VersionWebLink}}">{{.Package.Name}}</a>
-					<span class="ui basic label">{{.Package.Type.Name}}</span>
-				</div>
-				<div class="flex-item-body">
-					<span class="profile-package-version">{{.Version.LowerVersion}}</span>
-					{{$timeStr := DateUtils.TimeSince .Version.CreatedUnix}}
-					{{$hasRepositoryAccess := false}}
-					{{if .Repository}}
-						{{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}}
-					{{end}}
-					{{if $hasRepositoryAccess}}
-						{{ctx.Locale.Tr "packages.published_by_in" $timeStr .Creator.HomeLink .Creator.GetDisplayName .Repository.Link .Repository.FullName}}
-					{{else}}
-						{{ctx.Locale.Tr "packages.published_by" $timeStr .Creator.HomeLink .Creator.GetDisplayName}}
-					{{end}}
-				</div>
-			</div>
-		</div>
-	</div>
-	{{else}}
-		{{if not .HasPackages}}
-			<div class="theme-empty profile-empty">
-				{{svg "octicon-package" 48}}
-				<h2>{{ctx.Locale.Tr "packages.empty"}}</h2>
-				{{if and .Repository .CanWritePackages}}
-					{{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}}
-					<p>{{ctx.Locale.Tr "packages.empty.repo" $packagesUrl}}</p>
-				{{end}}
-				<p>{{ctx.Locale.Tr "packages.empty.documentation" "https://forgejo.org/docs/latest/user/packages/"}}</p>
-			</div>
-		{{else}}
-			{{template "user/profile_empty" dict "Icon" "octicon-package" "Title" (ctx.Locale.Tr "packages.filter.no_result")}}
-		{{end}}
-	{{end}}
-</div>
-{{template "base/paginate" .}}
-
+{{template "components/package/list/list" .}}
 </section>