Merge branch 'main' into lunny/update_swagger_fields

techknowlogick · web-flow · commit 64b417adb23e · 2025-09-06T18:25:56.000+02:00
diff --git a/Dockerfile b/Dockerfile
@@ -18,6 +18,9 @@ RUN apk --no-cache add \
     && npm install -g pnpm@10 \
     && rm -rf /var/cache/apk/*
 
+# workaround for node >= 22.18.0 on alpine 3.22. Remove when upgrading to alpine 3.23
+COPY --from=docker.io/node:22-alpine3.22 /usr/local/bin/node /usr/local/bin/node
+
 # Setup repo
 COPY . ${GOPATH}/src/code.gitea.io/gitea
 WORKDIR ${GOPATH}/src/code.gitea.io/gitea
diff --git a/Dockerfile.rootless b/Dockerfile.rootless
@@ -18,6 +18,9 @@ RUN apk --no-cache add \
     && npm install -g pnpm@10 \
     && rm -rf /var/cache/apk/*
 
+# workaround for node >= 22.18.0 on alpine 3.22. Remove when upgrading to alpine 3.23
+COPY --from=docker.io/node:22-alpine3.22 /usr/local/bin/node /usr/local/bin/node
+
 # Setup repo
 COPY . ${GOPATH}/src/code.gitea.io/gitea
 WORKDIR ${GOPATH}/src/code.gitea.io/gitea
diff --git a/Makefile b/Makefile
@@ -127,7 +127,7 @@ GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/m
 MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitea.io/gitea/models/migrations/...)
 
 WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
-WEBPACK_CONFIGS := webpack.config.js tailwind.config.js
+WEBPACK_CONFIGS := webpack.config.ts tailwind.config.ts
 WEBPACK_DEST := public/assets/js/index.js public/assets/css/index.css
 WEBPACK_DEST_ENTRIES := public/assets/js public/assets/css public/assets/fonts
 
@@ -153,9 +153,9 @@ TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(DIST)
 GO_DIRS := build cmd models modules routers services tests
 WEB_DIRS := web_src/js web_src/css
 
-ESLINT_FILES := web_src/js tools *.js *.ts *.cjs tests/e2e
+ESLINT_FILES := web_src/js tools *.ts *.cjs tests/e2e
 STYLELINT_FILES := web_src/css web_src/js/components/*.vue
-SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.js *.md *.yml *.yaml *.toml)) $(filter-out tools/misspellings.csv, $(wildcard tools/*))
+SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.md *.yml *.yaml *.toml)) $(filter-out tools/misspellings.csv, $(wildcard tools/*))
 EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
 
 GO_SOURCES := $(wildcard *.go)
@@ -407,7 +407,7 @@ lint-actions: ## lint action workflow files
 
 .PHONY: lint-templates
 lint-templates: .venv node_modules ## lint template files
-	@node tools/lint-templates-svg.js
+	@node tools/lint-templates-svg.ts
 	@uv run --frozen djlint $(shell find templates -type f -iname '*.tmpl')
 
 .PHONY: lint-yaml
@@ -421,7 +421,7 @@ watch: ## watch everything and continuously rebuild
 .PHONY: watch-frontend
 watch-frontend: node-check node_modules ## watch frontend files and continuously rebuild
 	@rm -rf $(WEBPACK_DEST_ENTRIES)
-	NODE_ENV=development pnpm exec webpack --watch --progress
+	NODE_ENV=development pnpm exec webpack --watch --progress --disable-interpret
 
 .PHONY: watch-backend
 watch-backend: go-check ## watch backend files and continuously rebuild
@@ -877,13 +877,13 @@ $(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) pnpm-lock.yaml
 	@$(MAKE) -s node-check node_modules
 	@rm -rf $(WEBPACK_DEST_ENTRIES)
 	@echo "Running webpack..."
-	@BROWSERSLIST_IGNORE_OLD_DATA=true pnpm exec webpack
+	@BROWSERSLIST_IGNORE_OLD_DATA=true pnpm exec webpack --disable-interpret
 	@touch $(WEBPACK_DEST)
 
 .PHONY: svg
 svg: node-check | node_modules ## build svg files
 	rm -rf $(SVG_DEST_DIR)
-	node tools/generate-svg.js
+	node tools/generate-svg.ts
 
 .PHONY: svg-check
 svg-check: svg
@@ -922,7 +922,7 @@ generate-gitignore: ## update gitignore files
 
 .PHONY: generate-images
 generate-images: | node_modules ## generate images
-	cd tools && node generate-images.js $(TAGS)
+	cd tools && node generate-images.ts $(TAGS)
 
 .PHONY: generate-manpage
 generate-manpage: ## generate manpage
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -496,6 +496,7 @@ repo.transfer.to_you=vám
 repo.collaborator.added.subject=%s vás přidal do %s
 repo.collaborator.added.text=Byl jste přidán jako spolupracovník repozitáře:
 
+
 team_invite.subject=%[1]s vás pozval/a, abyste se připojili k organizaci %[2]s
 team_invite.text_1=%[1]s vás pozval/a do týmu %[2]s v organizaci %[3]s.
 team_invite.text_2=Pro připojení k týmu klikněte na následující odkaz:
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -509,6 +509,7 @@ repo.transfer.to_you=dir
 repo.collaborator.added.subject=%s hat dich zu %s hinzugefügt
 repo.collaborator.added.text=Du wurdest als Mitarbeiter für folgendes Repository hinzugefügt:
 
+
 team_invite.subject=%[1]s hat dich eingeladen, der Organisation %[2]s beizutreten
 team_invite.text_1=%[1]s hat dich eingeladen, dem Team %[2]s in der Organisation %[3]s beizutreten.
 team_invite.text_2=Bitte klicke auf den folgenden Link, um dem Team beizutreten:
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
@@ -451,6 +451,7 @@ repo.transfer.to_you=εσάς
 repo.collaborator.added.subject=%s σας πρόσθεσε στο %s
 repo.collaborator.added.text=Έχετε προστεθεί ως συνεργάτης του αποθετηρίου:
 
+
 team_invite.subject=%[1]s σας προσκάλεσε να συμμετέχετε στον οργανισμό %[2]s
 team_invite.text_1=%[1]s σας προσκάλεσε να συμμετέχετε στην ομάδα %[2]s στον οργανισμός %[3]s.
 team_invite.text_2=Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να συμμετάσχετε στην ομάδα:
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -448,6 +448,7 @@ repo.transfer.to_you=usted
 repo.collaborator.added.subject=%s le añadió en %s
 repo.collaborator.added.text=Has sido añadido como colaborador del repositorio:
 
+
 team_invite.subject=%[1]s le ha invitado a unirse a la organización de %[2]s
 team_invite.text_1=%[1]s le ha invitado a unirse al equipo %[2]s en la organización %[3]s.
 team_invite.text_2=Por favor, haz clic en el siguiente enlace para unirte al equipo:
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
@@ -363,6 +363,7 @@ repo.collaborator.added.subject=%s شما را به پروژه %s اضافه ک
 repo.collaborator.added.text=شما به عنوان مشارکت‌کننده در این مخزن اضافه شدید:
 
 
+
 [modal]
 yes=بله
 no=خیر
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
@@ -348,6 +348,7 @@ repo.transfer.to_you=sinä
 
 
 
+
 [modal]
 yes=Kyllä
 no=Ei
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -550,6 +550,7 @@ repo.transfer.body=Pour l’accepter ou le rejeter, visitez %s ou ignorez-le.
 repo.collaborator.added.subject=%s vous a ajouté à %s
 repo.collaborator.added.text=Vous avez été ajouté en tant que collaborateur du dépôt :
 
+
 team_invite.subject=%[1]s vous a invité à rejoindre l’organisation %[2]s
 team_invite.text_1=%[1]s vous a invité à rejoindre l’équipe %[2]s dans l’organisation %[3]s.
 team_invite.text_2=Veuillez cliquer sur le lien suivant pour rejoindre l'équipe :
diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini
@@ -551,6 +551,7 @@ repo.transfer.body=Chun glacadh leis nó diúltú dó, tabhair cuairt ar %s nó
 repo.collaborator.added.subject=Chuir %s le %s tú
 repo.collaborator.added.text=Cuireadh tú leis mar chomhoibritheoir stórais:
 
+
 team_invite.subject=Tá cuireadh tugtha agat ag %[1]s chun dul le heagraíocht %[2]s
 team_invite.text_1=Tá cuireadh tugtha ag %[1]s duit chun dul le foireann %[2]s in eagraíocht %[3]s.
 team_invite.text_2=Cliceáil ar an nasc seo a leanas le do thoil chun dul isteach san fhoireann:
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
@@ -294,6 +294,7 @@ register_success=Sikeres regisztráció
 
 
 
+
 [modal]
 yes=Igen
 no=Nem
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
@@ -302,6 +302,7 @@ register_success=Pendaftaran berhasil
 
 
 
+
 [modal]
 yes=Ya
 no=Tidak
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
@@ -326,6 +326,7 @@ repo.collaborator.added.subject=%s bætti þér við í %s
 repo.collaborator.added.text=Þér hefur verið bætt við sem aðila hugbúnaðarsafns:
 
 
+
 [modal]
 yes=Já
 no=Nei
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
@@ -386,6 +386,7 @@ repo.collaborator.added.subject=%s ti ha aggiunto a %s
 repo.collaborator.added.text=Sei stato aggiunto come collaboratore del repository:
 
 
+
 [modal]
 yes=Sì
 no=No
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -551,6 +551,7 @@ repo.transfer.body=承認または拒否するには %s を開きます。 も
 repo.collaborator.added.subject=%s が %s にあなたを追加しました
 repo.collaborator.added.text=あなたは次のリポジトリの共同作業者に追加されました:
 
+
 team_invite.subject=%[1]s さんが %[2]s への参加にあなたを招待しました
 team_invite.text_1=%[1]s さんが、組織 %[3]s 内のチーム %[2]s への参加に、あなたを招待しました。
 team_invite.text_2=下のリンクをクリックしてチームに参加してください。
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
@@ -278,6 +278,7 @@ register_success=등록 완료
 
 
 
+
 [modal]
 yes=예
 no=아니오
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -454,6 +454,7 @@ repo.transfer.to_you=Jums
 repo.collaborator.added.subject=%s pievienoja Jūs repozitorijam %s
 repo.collaborator.added.text=Jūs tikāt pievienots kā līdzstrādnieks repozitorijam:
 
+
 team_invite.subject=%[1]s uzaicināja Jūs pievienoties organizācijai %[2]s
 team_invite.text_1=%[1]s uzaicināja Jūs pievienoties komandai %[2]s organizācijā %[3]s.
 team_invite.text_2=Uzspiediet uz šīs saites, lai pievienoties komandai:
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
@@ -385,6 +385,7 @@ repo.collaborator.added.subject=%s heeft jou toegevoegd aan %s
 repo.collaborator.added.text=U bent toegevoegd als een medewerker van de repository:
 
 
+
 [modal]
 yes=Ja
 no=Nee
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
@@ -372,6 +372,7 @@ repo.collaborator.added.subject=%s dodał Cię do %s
 repo.collaborator.added.text=Zostałeś dodany jako współtwórca repozytorium:
 
 
+
 [modal]
 yes=Tak
 no=Nie
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -540,6 +540,7 @@ repo.transfer.body=Para o aceitar ou rejeitar visite %s, ou simplesmente o ignor
 repo.collaborator.added.subject=%s adicionou você a %s
 repo.collaborator.added.text=Você foi adicionado como um colaborador do repositório:
 
+
 team_invite.subject=%[1]s convidou você para participar da organização %[2]s
 team_invite.text_1=%[1]s convidou você para participar da equipe %[2]s na organização %[3]s.
 team_invite.text_2=Por favor, clique no seguinte link para se juntar à equipe:
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -551,6 +551,7 @@ repo.transfer.body=Para o aceitar ou rejeitar, visite %s ou ignore-o, simplesmen
 repo.collaborator.added.subject=%s adicionou você a %s
 repo.collaborator.added.text=Foi adicionado(a) como colaborador(a) do repositório:
 
+
 team_invite.subject=%[1]s fez-lhe um convite para se juntar à organização %[2]s
 team_invite.text_1=%[1]s fez-lhe um convite para se juntar à equipa %[2]s na organização %[3]s.
 team_invite.text_2=Clique na ligação seguinte para se juntar à equipa:
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
@@ -449,6 +449,7 @@ repo.transfer.to_you=вам
 repo.collaborator.added.subject=%s добавил(а) вас в %s
 repo.collaborator.added.text=Вы были добавлены в качестве соавтора репозитория:
 
+
 team_invite.subject=%[1]s приглашает вас присоединиться к организации %[2]s
 team_invite.text_1=%[1]s приглашает вас присоединиться к команде %[2]s в организации %[3]s.
 team_invite.text_2=Перейдите по ссылке, чтобы присоединиться к команде:
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
@@ -355,6 +355,7 @@ repo.collaborator.added.subject=%s ඔබව %s ට එකතු කළා
 repo.collaborator.added.text=ඔබ ගබඩාවේ සහයෝගිතාකරුවෙකු ලෙස එකතු කර ඇත:
 
 
+
 [modal]
 yes=ඔව්
 no=නැහැ
diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini
@@ -436,6 +436,7 @@ repo.transfer.to_you=vy
 repo.collaborator.added.subject=%s vás pridal do %s
 repo.collaborator.added.text=Boli ste pridaný ako spolupracovník repozitára:
 
+
 team_invite.subject=%[1]s vás pozval/a, aby ste sa pripojili k organizácii %[2]s
 team_invite.text_1=%[1]s vás pozval/a, aby ste sa pripojili k tímu %[2]s v organizácii %[3]s.
 team_invite.text_2=Ak sa chcete pripojiť k tímu, kliknite na nasledujúci odkaz:
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
@@ -303,6 +303,7 @@ register_success=Registreringen lyckades
 
 
 
+
 [modal]
 yes=Ja
 no=Nej
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
@@ -533,6 +533,7 @@ repo.transfer.to_you=siz
 repo.collaborator.added.subject=%s sizi %s ekledi
 repo.collaborator.added.text=Bu depo için katkıcı olarak eklendiniz:
 
+
 team_invite.subject=%[1]s sizi %[2]s organizasyonuna katılmaya davet etti
 team_invite.text_1=%[1]s sizi %[3]s organizasyonundaki %[2]s takımına katılmaya davet etti.
 team_invite.text_2=Takıma katılmak lütfen aşağıdaki bağlantıya tıklayın:
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
@@ -503,6 +503,7 @@ repo.transfer.to_you=вам
 repo.collaborator.added.subject=%s додав вас до %s
 repo.collaborator.added.text=Вас додали як співавтора до сховища:
 
+
 team_invite.subject=%[1]s запрошує вас приєднатися до організації %[2]s
 team_invite.text_1=%[1]s запрошує вас до команди %[2]s в організації %[3]s.
 team_invite.text_2=Перейдіть за посиланням, щоб приєднатися до команди:
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -551,6 +551,7 @@ repo.transfer.body=访问 %s 以接受或拒绝转移，亦可忽略此邮件。
 repo.collaborator.added.subject=%s 把您添加到 %s
 repo.collaborator.added.text=您已被添加为仓库的协作者：
 
+
 team_invite.subject=%[1]s 邀请您加入组织 %[2]s
 team_invite.text_1=%[1]s 邀请您加入组织 %[3]s 中的团队 %[2]s。
 team_invite.text_2=请点击下面的链接加入团队：
diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
@@ -158,6 +158,7 @@ register_success=註冊成功
 
 
 
+
 [modal]
 yes=確認操作
 no=取消操作
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
@@ -494,6 +494,7 @@ repo.transfer.to_you=您
 repo.collaborator.added.subject=%s 把您加入到 %s
 repo.collaborator.added.text=您已被新增為儲存庫的協作者：
 
+
 team_invite.subject=%[1]s 邀請您加入組織 %[2]s
 team_invite.text_1=%[1]s 邀請您加入組織 %[3]s 中的 %[2]s 團隊
 team_invite.text_2=請點擊下方連結加入團隊:
diff --git a/package.json b/package.json
@@ -2,8 +2,8 @@
   "type": "module",
   "packageManager": "pnpm@10.0.0",
   "engines": {
-    "node": ">= 20.0.0",
-    "pnpm": ">=10.0.0"
+    "node": ">= 22.18.0",
+    "pnpm": ">= 10.0.0"
   },
   "dependencies": {
     "@citation-js/core": "0.7.18",
@@ -31,7 +31,6 @@
     "dropzone": "6.0.0-beta.2",
     "easymde": "2.20.0",
     "esbuild-loader": "4.3.0",
-    "fast-glob": "3.3.3",
     "htmx.org": "2.0.6",
     "idiomorph": "0.7.3",
     "jquery": "3.7.1",
@@ -110,7 +109,6 @@
     "stylelint-config-recommended": "17.0.0",
     "stylelint-declaration-block-no-ignored-properties": "2.8.0",
     "stylelint-declaration-strict-value": "1.10.11",
-    "stylelint-define-config": "16.22.0",
     "stylelint-value-no-unknown-custom-properties": "6.0.1",
     "svgo": "4.0.0",
     "type-fest": "4.41.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/stylelint.config.ts b/stylelint.config.ts
diff --git a/tailwind.config.ts b/tailwind.config.ts
diff --git a/tools/generate-images.ts b/tools/generate-images.ts
diff --git a/tools/generate-svg.ts b/tools/generate-svg.ts
diff --git a/tools/lint-templates-svg.ts b/tools/lint-templates-svg.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/types.d.ts b/types.d.ts
diff --git a/updates.config.ts b/updates.config.ts
diff --git a/webpack.config.ts b/webpack.config.ts

-Original file line number
+Diff line change
++
 [modal]
 yes=Kyllä
 no=Ei