From b1c5d5375be9ac6dd32226f6f929d1ddf975f418 Mon Sep 17 00:00:00 2001 From: PikachuEXE Date: Mon, 28 Aug 2023 14:45:35 +0800 Subject: [PATCH 1/2] $ Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again --- src/renderer/main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/renderer/main.js b/src/renderer/main.js index c3284766f186a..1d8712cbe0202 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -26,6 +26,8 @@ import { faExchangeAlt, faExclamationCircle, faExternalLinkAlt, + faEye, + faEyeSlash, faFileDownload, faFileVideo, faFilter, @@ -57,8 +59,6 @@ import { faTimes, faTimesCircle, faUsers, - faEye, - faEyeSlash, } from '@fortawesome/free-solid-svg-icons' import { faBitcoin, @@ -94,6 +94,8 @@ library.add( faExchangeAlt, faExclamationCircle, faExternalLinkAlt, + faEye, + faEyeSlash, faFileDownload, faFileVideo, faFilter, @@ -125,8 +127,6 @@ library.add( faTimes, faTimesCircle, faUsers, - faEye, - faEyeSlash, // brand icons faGithub, From 1f5ab198cdb2f2af574bb5457be6f0122335403f Mon Sep 17 00:00:00 2001 From: PikachuEXE Date: Tue, 29 Aug 2023 08:11:32 +0800 Subject: [PATCH 2/2] ~ Add code comment about constant list ordering --- src/renderer/main.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/renderer/main.js b/src/renderer/main.js index 1d8712cbe0202..e9c1fbb389f28 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -5,6 +5,8 @@ import router from './router/index' import store from './store/index' import i18n from './i18n/index' import { library } from '@fortawesome/fontawesome-svg-core' +// Please keep the list of constants sorted by name +// to avoid code conflict and duplicate entries import { faAngleDown, faArrowDown, @@ -72,6 +74,8 @@ Vue.config.devtools = process.env.NODE_ENV === 'development' Vue.config.performance = process.env.NODE_ENV === 'development' Vue.config.productionTip = process.env.NODE_ENV === 'development' +// Please keep the list of constants sorted by name +// to avoid code conflict and duplicate entries library.add( // solid icons faAngleDown,