clean

woodpecker-ci · Dec 18, 2024 · f76b94b · f76b94b
1 parent 7240547
commit f76b94b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 164 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -27,8 +27,8 @@ repos:
     rev: v2.13.1-beta
     hooks:
       - id: hadolint
-  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.4.2
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.8
     hooks:
       - id: prettier
   - repo: https://github.com/adrienverge/yamllint.git

diff --git a/web/components.d.ts b/web/components.d.ts
@@ -62,7 +62,7 @@ declare module 'vue' {
     IMdiErrorOutline: typeof import('~icons/mdi/error-outline')['default']
     IMdiFormatListBulleted: typeof import('~icons/mdi/format-list-bulleted')['default']
     IMdiGestureTap: typeof import('~icons/mdi/gesture-tap')['default']
-    IDeviconGithub: typeof import('~icons/devicon/github')['default']
+    IMdiGithub: typeof import('~icons/mdi/github')['default']
     IMdiLoading: typeof import('~icons/mdi/loading')['default']
     IMdiPlay: typeof import('~icons/mdi/play')['default']
     IMdiRadioboxBlank: typeof import('~icons/mdi/radiobox-blank')['default']
@@ -75,8 +75,8 @@ declare module 'vue' {
     IMdiSync: typeof import('~icons/mdi/sync')['default']
     IMdiTagOutline: typeof import('~icons/mdi/tag-outline')['default']
     InputField: typeof import('./src/components/form/InputField.vue')['default']
-    IDeviconGitlab: typeof import('~icons/devicon/gitlab')['default']
-    IDeviconForgejo: typeof import('~icons/devicon/forgejo')['default']
+    IPhGitlabLogoSimpleFill: typeof import('~icons/ph/gitlab-logo-simple-fill')['default']
+    ISimpleIconsForgejo: typeof import('~icons/simple-icons/forgejo')['default']
     ISimpleIconsGitea: typeof import('~icons/simple-icons/gitea')['default']
     ISvgSpinners180RingWithBg: typeof import('~icons/svg-spinners/180-ring-with-bg')['default']
     ITeenyiconsGitSolid: typeof import('~icons/teenyicons/git-solid')['default']

diff --git a/web/package.json b/web/package.json
@@ -18,17 +18,13 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@iconify/vue": "^4.2.0",
     "@intlify/unplugin-vue-i18n": "^6.0.0",
     "@kyvg/vue3-notification": "^3.2.1",
     "@mdi/js": "^7.4.47",
     "@vueuse/core": "^12.0.0",
     "ansi_up": "^6.0.2",
-    "devicon": "^2.16.0",
-    "devicons": "^1.8.0",
     "dompurify": "^3.2.0",
     "fuse.js": "^7.0.0",
-    "iconify-icon": "^2.2.0",
     "js-base64": "^3.7.7",
     "lodash": "^4.17.21",
     "marked": "^15.0.0",
@@ -37,7 +33,6 @@
     "prismjs": "^1.29.0",
     "semver": "^7.6.3",
     "simple-icons": "^13.5.0",
-    "unplugin-icons": "^0.22.0",
     "vue": "^3.4.38",
     "vue-i18n": "^10.0.3",
     "vue-router": "^4.4.3"
@@ -46,7 +41,6 @@
     "@antfu/eslint-config": "^3.3.2",
     "@eslint/js": "^9.9.0",
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
-    "@iconify-json/devicon": "^1.2.9",
     "@intlify/eslint-plugin-vue-i18n": "3.1.0",
     "@types/eslint__js": "^8.42.3",
     "@types/lodash": "^4.17.7",

diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
diff --git a/web/src/components/atomic/Icon.vue b/web/src/components/atomic/Icon.vue
@@ -53,17 +53,8 @@
   <SvgIcon v-else-if="name === 'visibility-private'" :path="mdiLockOutline" size="24" />
   <SvgIcon v-else-if="name === 'visibility-internal'" :path="mdiLockOpenOutline" size="24" />
 
-  <iconify-icon v-else-if="name === 'forgejo'" icon="devicon:forgejo" width="32" height="32" />
-  <iconify-icon v-else-if="name === 'gitlab'" icon="devicon:gitlab" width="32" height="32" />
-  <iconify-icon v-else-if="name === 'github'" icon="devicon:github" width="32" height="32" />
-  <iconify-icon
-    v-else-if="name === 'gitea'"
-    icon="simple-icons:gitea"
-    width="32"
-    height="32"
-    style="color: #609926"
-    ;
-  />
+  <SvgIcon v-else-if="name === 'forgejo'" :path="siForgejo.path" size="32" />
+  <SvgIcon v-else-if="name === 'gitea'" :path="siGitea.path" size="32" />
 
   <svg v-else-if="name === 'spinner'" width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
     <path
@@ -89,7 +80,6 @@
 </template>
 
 <script lang="ts" setup>
-import 'iconify-icon';
 
 import {
   mdiAlarm,
@@ -132,6 +122,7 @@ import {
   mdiTimerOutline,
   mdiTrashCanOutline,
 } from '@mdi/js';
+import { siForgejo, siGitea } from 'simple-icons';
 
 import SvgIcon from './SvgIcon.vue';