From 9746908f3c44f0814889d36c7ad36e72a552bdc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 20:50:52 +0000 Subject: [PATCH 1/2] fix(deps): bump react-icons from 4.4.0 to 4.12.0 Bumps [react-icons](https://github.com/react-icons/react-icons) from 4.4.0 to 4.12.0. - [Release notes](https://github.com/react-icons/react-icons/releases) - [Commits](https://github.com/react-icons/react-icons/compare/v4.4.0...v4.12.0) --- updated-dependencies: - dependency-name: react-icons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- packages/frontend/package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3e34031ca..c66df832a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20819,9 +20819,9 @@ } }, "node_modules/react-icons": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.4.0.tgz", - "integrity": "sha512-fSbvHeVYo/B5/L4VhB7sBA1i2tS8MkT0Hb9t2H1AVPkwGfVHLJCqyr2Py9dKMxsyM63Eng1GkdZfbWj+Fmv8Rg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.12.0.tgz", + "integrity": "sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==", "peerDependencies": { "react": "*" } @@ -25968,7 +25968,7 @@ "react-ga": "3.3.0", "react-helmet": "6.1.0", "react-hook-form": "7.12.2", - "react-icons": "4.4.0", + "react-icons": "4.12.0", "react-infinite-scroller": "1.2.6", "react-linkify": "1.0.0-alpha", "react-markdown": "8.0.6", @@ -32375,7 +32375,7 @@ "react-ga": "3.3.0", "react-helmet": "6.1.0", "react-hook-form": "7.12.2", - "react-icons": "4.4.0", + "react-icons": "4.12.0", "react-infinite-scroller": "1.2.6", "react-linkify": "1.0.0-alpha", "react-markdown": "8.0.6", @@ -45219,9 +45219,9 @@ "requires": {} }, "react-icons": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.4.0.tgz", - "integrity": "sha512-fSbvHeVYo/B5/L4VhB7sBA1i2tS8MkT0Hb9t2H1AVPkwGfVHLJCqyr2Py9dKMxsyM63Eng1GkdZfbWj+Fmv8Rg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.12.0.tgz", + "integrity": "sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==", "requires": {} }, "react-infinite-scroller": { diff --git a/packages/frontend/package.json b/packages/frontend/package.json index a98e1871b..9678a8a4a 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -44,7 +44,7 @@ "react-ga": "3.3.0", "react-helmet": "6.1.0", "react-hook-form": "7.12.2", - "react-icons": "4.4.0", + "react-icons": "4.12.0", "react-infinite-scroller": "1.2.6", "react-linkify": "1.0.0-alpha", "react-markdown": "8.0.6", From 7d7220cc65cff1f34a767303ba9d6e8d378b59d3 Mon Sep 17 00:00:00 2001 From: Dave Bauman Date: Thu, 4 Jan 2024 14:54:18 -0500 Subject: [PATCH 2/2] fix: Replace deprecated icons --- .../frontend/src/shared/file-icon-factory.tsx | 8 +++---- packages/frontend/src/shared/icon-factory.tsx | 22 +++++++++++++------ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/packages/frontend/src/shared/file-icon-factory.tsx b/packages/frontend/src/shared/file-icon-factory.tsx index d38b1a1c2..1a497700e 100644 --- a/packages/frontend/src/shared/file-icon-factory.tsx +++ b/packages/frontend/src/shared/file-icon-factory.tsx @@ -27,15 +27,15 @@ import { } from 'react-icons/ai'; import { BsImage } from 'react-icons/bs'; import { DiDatabase } from 'react-icons/di'; +import { FaJava } from 'react-icons/fa'; import { GiHouseKeys, GiZipper } from 'react-icons/gi'; -import { GoMarkGithub } from 'react-icons/go'; import { SiApachegroovy, SiClojure, + SiGithub, SiGnubash, SiGo, SiHtml5, - SiJava, SiJavascript, SiJenkins, SiJson, @@ -182,7 +182,7 @@ const icons: Record = { color: COLORS.blue }, 'text/x-java-source': { - icon: SiJava, + icon: FaJava, color: COLORS.red }, 'text/x-python': { @@ -224,7 +224,7 @@ const icons: Record = { color: COLORS.yellow }, '.gitignore': { - icon: GoMarkGithub, + icon: SiGithub, color: COLORS.ignore }, diff --git a/packages/frontend/src/shared/icon-factory.tsx b/packages/frontend/src/shared/icon-factory.tsx index b2082db54..7da58a7c7 100644 --- a/packages/frontend/src/shared/icon-factory.tsx +++ b/packages/frontend/src/shared/icon-factory.tsx @@ -63,17 +63,14 @@ import { GoChevronRight, GoChevronUp, GoCircleSlash, - GoClippy, GoCommentDiscussion, GoGitCommit, GoLinkExternal, GoLocation, - GoMarkGithub, GoReply, GoRss, GoSearch, GoSync, - GoTrashcan, GoX } from 'react-icons/go'; import { @@ -89,8 +86,18 @@ import { GrTemplate, GrUndo } from 'react-icons/gr'; -import { MdAdd, MdFileDownload, MdOndemandVideo, MdPrint, MdSchedule, MdShare, MdUpdate } from 'react-icons/md'; +import { + MdAdd, + MdContentCopy, + MdFileDownload, + MdOndemandVideo, + MdPrint, + MdSchedule, + MdShare, + MdUpdate +} from 'react-icons/md'; import { RiVipCrownLine } from 'react-icons/ri'; +import { SiGithub } from 'react-icons/si'; import { VscBriefcase, VscCalendar, @@ -113,6 +120,7 @@ import { VscPreview, VscRocket, VscSettingsGear, + VscTrash, VscWarning } from 'react-icons/vsc'; @@ -134,7 +142,7 @@ const icons = { chevronUp: GoChevronUp, clone: GrClone, close: GoX, - clipboard: GoClippy, + clipboard: MdContentCopy, code: VscCode, comments: GoCommentDiscussion, commit: GoGitCommit, @@ -149,7 +157,7 @@ const icons = { fileChange: FiFileText, filter: FaFilter, folderOpened: VscFolderOpened, - github: GoMarkGithub, + github: SiGithub, graphql: GrGraphQl, heart: FaRegHeart, heartFilled: FaHeart, @@ -202,7 +210,7 @@ const icons = { team: FaUsers, template: GrTemplate, time: AiOutlineFieldTime, - trash: GoTrashcan, + trash: VscTrash, unlike: FaHeartBroken, video: MdOndemandVideo, views: GrOverview,