From 112f69177b7be1538925b81da3ad4c0a909652a2 Mon Sep 17 00:00:00 2001 From: Esteban Beltran Date: Thu, 4 Aug 2022 10:29:42 +0200 Subject: [PATCH] Build: Replace the file-loader loader with asset module in webpack config (#53088) --- package.json | 2 +- .../src/components/Icon/iconBundle.ts | 324 +++++++++--------- scripts/copy-unicons.js | 23 ++ scripts/webpack/plugins/CopyUniconsPlugin.js | 39 --- scripts/webpack/webpack.common.js | 16 +- 5 files changed, 193 insertions(+), 211 deletions(-) create mode 100644 scripts/copy-unicons.js delete mode 100644 scripts/webpack/plugins/CopyUniconsPlugin.js diff --git a/package.json b/package.json index 2efa998deb1..0dc170ea6a6 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "ci:test-frontend": "yarn run test:ci && yarn grafana-toolkit node-version-check", "i18n:extract": "lingui extract", "i18n:compile": "lingui compile", - "postinstall": "husky install", + "postinstall": "husky install && node ./scripts/copy-unicons.js", "betterer": "betterer", "betterer:merge": "betterer merge", "betterer:stats": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/reportBettererStats.ts" diff --git a/packages/grafana-ui/src/components/Icon/iconBundle.ts b/packages/grafana-ui/src/components/Icon/iconBundle.ts index 69ce1355936..ded3db389be 100644 --- a/packages/grafana-ui/src/components/Icon/iconBundle.ts +++ b/packages/grafana-ui/src/components/Icon/iconBundle.ts @@ -1,169 +1,169 @@ // This file was autogenerated from // https://github.com/grafana/icons - -import u1141 from '!!raw-loader!../../../../../public/img/icons/custom/gf-bar-alignment-after.svg'; -import u1142 from '!!raw-loader!../../../../../public/img/icons/custom/gf-bar-alignment-before.svg'; -import u1143 from '!!raw-loader!../../../../../public/img/icons/custom/gf-bar-alignment-center.svg'; -import u1137 from '!!raw-loader!../../../../../public/img/icons/custom/gf-grid.svg'; -import u1144 from '!!raw-loader!../../../../../public/img/icons/custom/gf-interpolation-linear.svg'; -import u1145 from '!!raw-loader!../../../../../public/img/icons/custom/gf-interpolation-smooth.svg'; -import u1146 from '!!raw-loader!../../../../../public/img/icons/custom/gf-interpolation-step-after.svg'; -import u1147 from '!!raw-loader!../../../../../public/img/icons/custom/gf-interpolation-step-before.svg'; -import u1138 from '!!raw-loader!../../../../../public/img/icons/custom/gf-landscape.svg'; -import u1139 from '!!raw-loader!../../../../../public/img/icons/custom/gf-layout-simple.svg'; -import u1148 from '!!raw-loader!../../../../../public/img/icons/custom/gf-logs.svg'; -import u1140 from '!!raw-loader!../../../../../public/img/icons/custom/gf-portrait.svg'; -import u1149 from '!!raw-loader!../../../../../public/img/icons/mono/favorite.svg'; -import u1150 from '!!raw-loader!../../../../../public/img/icons/mono/grafana.svg'; -import u1152 from '!!raw-loader!../../../../../public/img/icons/mono/heart-break.svg'; -import u1151 from '!!raw-loader!../../../../../public/img/icons/mono/heart.svg'; -import u1154 from '!!raw-loader!../../../../../public/img/icons/mono/library-panel.svg'; -import u1153 from '!!raw-loader!../../../../../public/img/icons/mono/panel-add.svg'; -import u1001 from '!!raw-loader!../../../../../public/img/icons/unicons/angle-double-down.svg'; -import u1002 from '!!raw-loader!../../../../../public/img/icons/unicons/angle-double-right.svg'; -import u1003 from '!!raw-loader!../../../../../public/img/icons/unicons/angle-down.svg'; -import u1004 from '!!raw-loader!../../../../../public/img/icons/unicons/angle-left.svg'; -import u1005 from '!!raw-loader!../../../../../public/img/icons/unicons/angle-right.svg'; -import u1006 from '!!raw-loader!../../../../../public/img/icons/unicons/angle-up.svg'; -import u1007 from '!!raw-loader!../../../../../public/img/icons/unicons/apps.svg'; -import u1009 from '!!raw-loader!../../../../../public/img/icons/unicons/arrow-down.svg'; -import u1010 from '!!raw-loader!../../../../../public/img/icons/unicons/arrow-from-right.svg'; -import u1011 from '!!raw-loader!../../../../../public/img/icons/unicons/arrow-left.svg'; -import u1012 from '!!raw-loader!../../../../../public/img/icons/unicons/arrow-random.svg'; -import u1013 from '!!raw-loader!../../../../../public/img/icons/unicons/arrow-right.svg'; -import u1014 from '!!raw-loader!../../../../../public/img/icons/unicons/arrow-up.svg'; -import u1008 from '!!raw-loader!../../../../../public/img/icons/unicons/arrow.svg'; -import u1015 from '!!raw-loader!../../../../../public/img/icons/unicons/arrows-h.svg'; -import u1016 from '!!raw-loader!../../../../../public/img/icons/unicons/backward.svg'; -import u1017 from '!!raw-loader!../../../../../public/img/icons/unicons/bars.svg'; -import u1019 from '!!raw-loader!../../../../../public/img/icons/unicons/bell-slash.svg'; -import u1018 from '!!raw-loader!../../../../../public/img/icons/unicons/bell.svg'; -import u1020 from '!!raw-loader!../../../../../public/img/icons/unicons/bolt.svg'; -import u1022 from '!!raw-loader!../../../../../public/img/icons/unicons/book-open.svg'; -import u1021 from '!!raw-loader!../../../../../public/img/icons/unicons/book.svg'; -import u1023 from '!!raw-loader!../../../../../public/img/icons/unicons/brackets-curly.svg'; -import u1024 from '!!raw-loader!../../../../../public/img/icons/unicons/bug.svg'; -import u1025 from '!!raw-loader!../../../../../public/img/icons/unicons/building.svg'; -import u1026 from '!!raw-loader!../../../../../public/img/icons/unicons/calculator-alt.svg'; -import u1027 from '!!raw-loader!../../../../../public/img/icons/unicons/calendar-alt.svg'; -import u1028 from '!!raw-loader!../../../../../public/img/icons/unicons/camera.svg'; -import u1136 from '!!raw-loader!../../../../../public/img/icons/unicons/capture.svg'; -import u1029 from '!!raw-loader!../../../../../public/img/icons/unicons/channel-add.svg'; -import u1030 from '!!raw-loader!../../../../../public/img/icons/unicons/chart-line.svg'; -import u1032 from '!!raw-loader!../../../../../public/img/icons/unicons/check-circle.svg'; -import u1031 from '!!raw-loader!../../../../../public/img/icons/unicons/check.svg'; -import u1033 from '!!raw-loader!../../../../../public/img/icons/unicons/circle.svg'; -import u1034 from '!!raw-loader!../../../../../public/img/icons/unicons/clipboard-alt.svg'; -import u1035 from '!!raw-loader!../../../../../public/img/icons/unicons/clock-nine.svg'; -import u1037 from '!!raw-loader!../../../../../public/img/icons/unicons/cloud-download.svg'; -import u1122 from '!!raw-loader!../../../../../public/img/icons/unicons/cloud-upload.svg'; -import u1036 from '!!raw-loader!../../../../../public/img/icons/unicons/cloud.svg'; -import u1038 from '!!raw-loader!../../../../../public/img/icons/unicons/code-branch.svg'; -import u1039 from '!!raw-loader!../../../../../public/img/icons/unicons/cog.svg'; -import u1040 from '!!raw-loader!../../../../../public/img/icons/unicons/columns.svg'; -import u1042 from '!!raw-loader!../../../../../public/img/icons/unicons/comment-alt-share.svg'; -import u1041 from '!!raw-loader!../../../../../public/img/icons/unicons/comment-alt.svg'; -import u1043 from '!!raw-loader!../../../../../public/img/icons/unicons/comments-alt.svg'; -import u1044 from '!!raw-loader!../../../../../public/img/icons/unicons/compass.svg'; -import u1045 from '!!raw-loader!../../../../../public/img/icons/unicons/copy.svg'; -import u1123 from '!!raw-loader!../../../../../public/img/icons/unicons/credit-card.svg'; -import u1046 from '!!raw-loader!../../../../../public/img/icons/unicons/cube.svg'; -import u1047 from '!!raw-loader!../../../../../public/img/icons/unicons/dashboard.svg'; -import u1048 from '!!raw-loader!../../../../../public/img/icons/unicons/database.svg'; -import u1049 from '!!raw-loader!../../../../../public/img/icons/unicons/document-info.svg'; -import u1050 from '!!raw-loader!../../../../../public/img/icons/unicons/download-alt.svg'; -import u1051 from '!!raw-loader!../../../../../public/img/icons/unicons/draggabledots.svg'; -import u1052 from '!!raw-loader!../../../../../public/img/icons/unicons/edit.svg'; -import u1053 from '!!raw-loader!../../../../../public/img/icons/unicons/ellipsis-v.svg'; -import u1054 from '!!raw-loader!../../../../../public/img/icons/unicons/envelope.svg'; -import u1055 from '!!raw-loader!../../../../../public/img/icons/unicons/exchange-alt.svg'; -import u1056 from '!!raw-loader!../../../../../public/img/icons/unicons/exclamation-triangle.svg'; -import u1057 from '!!raw-loader!../../../../../public/img/icons/unicons/external-link-alt.svg'; -import u1059 from '!!raw-loader!../../../../../public/img/icons/unicons/eye-slash.svg'; -import u1058 from '!!raw-loader!../../../../../public/img/icons/unicons/eye.svg'; -import u1060 from '!!raw-loader!../../../../../public/img/icons/unicons/file-alt.svg'; -import u1061 from '!!raw-loader!../../../../../public/img/icons/unicons/file-blank.svg'; -import u1124 from '!!raw-loader!../../../../../public/img/icons/unicons/file-copy-alt.svg'; -import u1062 from '!!raw-loader!../../../../../public/img/icons/unicons/filter.svg'; -import u1125 from '!!raw-loader!../../../../../public/img/icons/unicons/fire.svg'; -import u1064 from '!!raw-loader!../../../../../public/img/icons/unicons/folder-open.svg'; -import u1065 from '!!raw-loader!../../../../../public/img/icons/unicons/folder-plus.svg'; -import u1066 from '!!raw-loader!../../../../../public/img/icons/unicons/folder-upload.svg'; -import u1063 from '!!raw-loader!../../../../../public/img/icons/unicons/folder.svg'; -import u1067 from '!!raw-loader!../../../../../public/img/icons/unicons/forward.svg'; -import u1068 from '!!raw-loader!../../../../../public/img/icons/unicons/graph-bar.svg'; -import u1069 from '!!raw-loader!../../../../../public/img/icons/unicons/history.svg'; -import u1070 from '!!raw-loader!../../../../../public/img/icons/unicons/home-alt.svg'; -import u1158 from '!!raw-loader!../../../../../public/img/icons/unicons/horizontal-align-center.svg'; -import u1156 from '!!raw-loader!../../../../../public/img/icons/unicons/horizontal-align-left.svg'; -import u1157 from '!!raw-loader!../../../../../public/img/icons/unicons/horizontal-align-right.svg'; -import u1126 from '!!raw-loader!../../../../../public/img/icons/unicons/hourglass.svg'; -import u1071 from '!!raw-loader!../../../../../public/img/icons/unicons/import.svg'; -import u1073 from '!!raw-loader!../../../../../public/img/icons/unicons/info-circle.svg'; -import u1072 from '!!raw-loader!../../../../../public/img/icons/unicons/info.svg'; -import u1074 from '!!raw-loader!../../../../../public/img/icons/unicons/key-skeleton-alt.svg'; -import u1075 from '!!raw-loader!../../../../../public/img/icons/unicons/keyboard.svg'; -import u1127 from '!!raw-loader!../../../../../public/img/icons/unicons/layer-group.svg'; -import u1128 from '!!raw-loader!../../../../../public/img/icons/unicons/line-alt.svg'; -import u1076 from '!!raw-loader!../../../../../public/img/icons/unicons/link.svg'; -import u1129 from '!!raw-loader!../../../../../public/img/icons/unicons/list-ui-alt.svg'; -import u1077 from '!!raw-loader!../../../../../public/img/icons/unicons/list-ul.svg'; -import u1078 from '!!raw-loader!../../../../../public/img/icons/unicons/lock.svg'; -import u1130 from '!!raw-loader!../../../../../public/img/icons/unicons/message.svg'; -import u1080 from '!!raw-loader!../../../../../public/img/icons/unicons/minus-circle.svg'; -import u1079 from '!!raw-loader!../../../../../public/img/icons/unicons/minus.svg'; -import u1081 from '!!raw-loader!../../../../../public/img/icons/unicons/mobile-android.svg'; -import u1082 from '!!raw-loader!../../../../../public/img/icons/unicons/monitor.svg'; -import u1131 from '!!raw-loader!../../../../../public/img/icons/unicons/palette.svg'; -import u1083 from '!!raw-loader!../../../../../public/img/icons/unicons/pause.svg'; -import u1084 from '!!raw-loader!../../../../../public/img/icons/unicons/pen.svg'; -import u1132 from '!!raw-loader!../../../../../public/img/icons/unicons/percentage.svg'; -import u1085 from '!!raw-loader!../../../../../public/img/icons/unicons/play.svg'; -import u1086 from '!!raw-loader!../../../../../public/img/icons/unicons/plug.svg'; -import u1088 from '!!raw-loader!../../../../../public/img/icons/unicons/plus-circle.svg'; -import u1134 from '!!raw-loader!../../../../../public/img/icons/unicons/plus-square.svg'; -import u1087 from '!!raw-loader!../../../../../public/img/icons/unicons/plus.svg'; -import u1089 from '!!raw-loader!../../../../../public/img/icons/unicons/power.svg'; -import u1090 from '!!raw-loader!../../../../../public/img/icons/unicons/presentation-play.svg'; -import u1091 from '!!raw-loader!../../../../../public/img/icons/unicons/process.svg'; -import u1092 from '!!raw-loader!../../../../../public/img/icons/unicons/question-circle.svg'; -import u1155 from '!!raw-loader!../../../../../public/img/icons/unicons/record-audio.svg'; -import u1093 from '!!raw-loader!../../../../../public/img/icons/unicons/repeat.svg'; -import u1094 from '!!raw-loader!../../../../../public/img/icons/unicons/rocket.svg'; -import u1095 from '!!raw-loader!../../../../../public/img/icons/unicons/save.svg'; -import u1097 from '!!raw-loader!../../../../../public/img/icons/unicons/search-minus.svg'; -import u1098 from '!!raw-loader!../../../../../public/img/icons/unicons/search-plus.svg'; -import u1096 from '!!raw-loader!../../../../../public/img/icons/unicons/search.svg'; -import u1099 from '!!raw-loader!../../../../../public/img/icons/unicons/share-alt.svg'; -import u1133 from '!!raw-loader!../../../../../public/img/icons/unicons/shield-exclamation.svg'; -import u1100 from '!!raw-loader!../../../../../public/img/icons/unicons/shield.svg'; -import u1101 from '!!raw-loader!../../../../../public/img/icons/unicons/signal.svg'; -import u1102 from '!!raw-loader!../../../../../public/img/icons/unicons/signin.svg'; -import u1103 from '!!raw-loader!../../../../../public/img/icons/unicons/signout.svg'; -import u1104 from '!!raw-loader!../../../../../public/img/icons/unicons/sitemap.svg'; -import u1105 from '!!raw-loader!../../../../../public/img/icons/unicons/slack.svg'; -import u1106 from '!!raw-loader!../../../../../public/img/icons/unicons/sliders-v-alt.svg'; -import u1107 from '!!raw-loader!../../../../../public/img/icons/unicons/sort-amount-down.svg'; -import u1108 from '!!raw-loader!../../../../../public/img/icons/unicons/sort-amount-up.svg'; -import u1109 from '!!raw-loader!../../../../../public/img/icons/unicons/square-shape.svg'; -import u1110 from '!!raw-loader!../../../../../public/img/icons/unicons/star.svg'; -import u1111 from '!!raw-loader!../../../../../public/img/icons/unicons/step-backward.svg'; -import u1112 from '!!raw-loader!../../../../../public/img/icons/unicons/sync.svg'; -import u1113 from '!!raw-loader!../../../../../public/img/icons/unicons/table.svg'; -import u1114 from '!!raw-loader!../../../../../public/img/icons/unicons/tag-alt.svg'; -import u1115 from '!!raw-loader!../../../../../public/img/icons/unicons/times.svg'; -import u1116 from '!!raw-loader!../../../../../public/img/icons/unicons/trash-alt.svg'; -import u1117 from '!!raw-loader!../../../../../public/img/icons/unicons/unlock.svg'; -import u1118 from '!!raw-loader!../../../../../public/img/icons/unicons/upload.svg'; -import u1119 from '!!raw-loader!../../../../../public/img/icons/unicons/user.svg'; -import u1120 from '!!raw-loader!../../../../../public/img/icons/unicons/users-alt.svg'; -import u1160 from '!!raw-loader!../../../../../public/img/icons/unicons/vertical-align-bottom.svg'; -import u1161 from '!!raw-loader!../../../../../public/img/icons/unicons/vertical-align-center.svg'; -import u1159 from '!!raw-loader!../../../../../public/img/icons/unicons/vertical-align-top.svg'; -import u1121 from '!!raw-loader!../../../../../public/img/icons/unicons/wrap-text.svg'; -import u1135 from '!!raw-loader!../../../../../public/img/icons/unicons/x.svg'; import { cacheStore } from 'react-inlinesvg'; +import u1141 from '../../../../../public/img/icons/custom/gf-bar-alignment-after.svg'; +import u1142 from '../../../../../public/img/icons/custom/gf-bar-alignment-before.svg'; +import u1143 from '../../../../../public/img/icons/custom/gf-bar-alignment-center.svg'; +import u1137 from '../../../../../public/img/icons/custom/gf-grid.svg'; +import u1144 from '../../../../../public/img/icons/custom/gf-interpolation-linear.svg'; +import u1145 from '../../../../../public/img/icons/custom/gf-interpolation-smooth.svg'; +import u1146 from '../../../../../public/img/icons/custom/gf-interpolation-step-after.svg'; +import u1147 from '../../../../../public/img/icons/custom/gf-interpolation-step-before.svg'; +import u1138 from '../../../../../public/img/icons/custom/gf-landscape.svg'; +import u1139 from '../../../../../public/img/icons/custom/gf-layout-simple.svg'; +import u1148 from '../../../../../public/img/icons/custom/gf-logs.svg'; +import u1140 from '../../../../../public/img/icons/custom/gf-portrait.svg'; +import u1149 from '../../../../../public/img/icons/mono/favorite.svg'; +import u1150 from '../../../../../public/img/icons/mono/grafana.svg'; +import u1152 from '../../../../../public/img/icons/mono/heart-break.svg'; +import u1151 from '../../../../../public/img/icons/mono/heart.svg'; +import u1154 from '../../../../../public/img/icons/mono/library-panel.svg'; +import u1153 from '../../../../../public/img/icons/mono/panel-add.svg'; +import u1001 from '../../../../../public/img/icons/unicons/angle-double-down.svg'; +import u1002 from '../../../../../public/img/icons/unicons/angle-double-right.svg'; +import u1003 from '../../../../../public/img/icons/unicons/angle-down.svg'; +import u1004 from '../../../../../public/img/icons/unicons/angle-left.svg'; +import u1005 from '../../../../../public/img/icons/unicons/angle-right.svg'; +import u1006 from '../../../../../public/img/icons/unicons/angle-up.svg'; +import u1007 from '../../../../../public/img/icons/unicons/apps.svg'; +import u1009 from '../../../../../public/img/icons/unicons/arrow-down.svg'; +import u1010 from '../../../../../public/img/icons/unicons/arrow-from-right.svg'; +import u1011 from '../../../../../public/img/icons/unicons/arrow-left.svg'; +import u1012 from '../../../../../public/img/icons/unicons/arrow-random.svg'; +import u1013 from '../../../../../public/img/icons/unicons/arrow-right.svg'; +import u1014 from '../../../../../public/img/icons/unicons/arrow-up.svg'; +import u1008 from '../../../../../public/img/icons/unicons/arrow.svg'; +import u1015 from '../../../../../public/img/icons/unicons/arrows-h.svg'; +import u1016 from '../../../../../public/img/icons/unicons/backward.svg'; +import u1017 from '../../../../../public/img/icons/unicons/bars.svg'; +import u1019 from '../../../../../public/img/icons/unicons/bell-slash.svg'; +import u1018 from '../../../../../public/img/icons/unicons/bell.svg'; +import u1020 from '../../../../../public/img/icons/unicons/bolt.svg'; +import u1022 from '../../../../../public/img/icons/unicons/book-open.svg'; +import u1021 from '../../../../../public/img/icons/unicons/book.svg'; +import u1023 from '../../../../../public/img/icons/unicons/brackets-curly.svg'; +import u1024 from '../../../../../public/img/icons/unicons/bug.svg'; +import u1025 from '../../../../../public/img/icons/unicons/building.svg'; +import u1026 from '../../../../../public/img/icons/unicons/calculator-alt.svg'; +import u1027 from '../../../../../public/img/icons/unicons/calendar-alt.svg'; +import u1028 from '../../../../../public/img/icons/unicons/camera.svg'; +import u1136 from '../../../../../public/img/icons/unicons/capture.svg'; +import u1029 from '../../../../../public/img/icons/unicons/channel-add.svg'; +import u1030 from '../../../../../public/img/icons/unicons/chart-line.svg'; +import u1032 from '../../../../../public/img/icons/unicons/check-circle.svg'; +import u1031 from '../../../../../public/img/icons/unicons/check.svg'; +import u1033 from '../../../../../public/img/icons/unicons/circle.svg'; +import u1034 from '../../../../../public/img/icons/unicons/clipboard-alt.svg'; +import u1035 from '../../../../../public/img/icons/unicons/clock-nine.svg'; +import u1037 from '../../../../../public/img/icons/unicons/cloud-download.svg'; +import u1122 from '../../../../../public/img/icons/unicons/cloud-upload.svg'; +import u1036 from '../../../../../public/img/icons/unicons/cloud.svg'; +import u1038 from '../../../../../public/img/icons/unicons/code-branch.svg'; +import u1039 from '../../../../../public/img/icons/unicons/cog.svg'; +import u1040 from '../../../../../public/img/icons/unicons/columns.svg'; +import u1042 from '../../../../../public/img/icons/unicons/comment-alt-share.svg'; +import u1041 from '../../../../../public/img/icons/unicons/comment-alt.svg'; +import u1043 from '../../../../../public/img/icons/unicons/comments-alt.svg'; +import u1044 from '../../../../../public/img/icons/unicons/compass.svg'; +import u1045 from '../../../../../public/img/icons/unicons/copy.svg'; +import u1123 from '../../../../../public/img/icons/unicons/credit-card.svg'; +import u1046 from '../../../../../public/img/icons/unicons/cube.svg'; +import u1047 from '../../../../../public/img/icons/unicons/dashboard.svg'; +import u1048 from '../../../../../public/img/icons/unicons/database.svg'; +import u1049 from '../../../../../public/img/icons/unicons/document-info.svg'; +import u1050 from '../../../../../public/img/icons/unicons/download-alt.svg'; +import u1051 from '../../../../../public/img/icons/unicons/draggabledots.svg'; +import u1052 from '../../../../../public/img/icons/unicons/edit.svg'; +import u1053 from '../../../../../public/img/icons/unicons/ellipsis-v.svg'; +import u1054 from '../../../../../public/img/icons/unicons/envelope.svg'; +import u1055 from '../../../../../public/img/icons/unicons/exchange-alt.svg'; +import u1056 from '../../../../../public/img/icons/unicons/exclamation-triangle.svg'; +import u1057 from '../../../../../public/img/icons/unicons/external-link-alt.svg'; +import u1059 from '../../../../../public/img/icons/unicons/eye-slash.svg'; +import u1058 from '../../../../../public/img/icons/unicons/eye.svg'; +import u1060 from '../../../../../public/img/icons/unicons/file-alt.svg'; +import u1061 from '../../../../../public/img/icons/unicons/file-blank.svg'; +import u1124 from '../../../../../public/img/icons/unicons/file-copy-alt.svg'; +import u1062 from '../../../../../public/img/icons/unicons/filter.svg'; +import u1125 from '../../../../../public/img/icons/unicons/fire.svg'; +import u1064 from '../../../../../public/img/icons/unicons/folder-open.svg'; +import u1065 from '../../../../../public/img/icons/unicons/folder-plus.svg'; +import u1066 from '../../../../../public/img/icons/unicons/folder-upload.svg'; +import u1063 from '../../../../../public/img/icons/unicons/folder.svg'; +import u1067 from '../../../../../public/img/icons/unicons/forward.svg'; +import u1068 from '../../../../../public/img/icons/unicons/graph-bar.svg'; +import u1069 from '../../../../../public/img/icons/unicons/history.svg'; +import u1070 from '../../../../../public/img/icons/unicons/home-alt.svg'; +import u1158 from '../../../../../public/img/icons/unicons/horizontal-align-center.svg'; +import u1156 from '../../../../../public/img/icons/unicons/horizontal-align-left.svg'; +import u1157 from '../../../../../public/img/icons/unicons/horizontal-align-right.svg'; +import u1126 from '../../../../../public/img/icons/unicons/hourglass.svg'; +import u1071 from '../../../../../public/img/icons/unicons/import.svg'; +import u1073 from '../../../../../public/img/icons/unicons/info-circle.svg'; +import u1072 from '../../../../../public/img/icons/unicons/info.svg'; +import u1074 from '../../../../../public/img/icons/unicons/key-skeleton-alt.svg'; +import u1075 from '../../../../../public/img/icons/unicons/keyboard.svg'; +import u1127 from '../../../../../public/img/icons/unicons/layer-group.svg'; +import u1128 from '../../../../../public/img/icons/unicons/line-alt.svg'; +import u1076 from '../../../../../public/img/icons/unicons/link.svg'; +import u1129 from '../../../../../public/img/icons/unicons/list-ui-alt.svg'; +import u1077 from '../../../../../public/img/icons/unicons/list-ul.svg'; +import u1078 from '../../../../../public/img/icons/unicons/lock.svg'; +import u1130 from '../../../../../public/img/icons/unicons/message.svg'; +import u1080 from '../../../../../public/img/icons/unicons/minus-circle.svg'; +import u1079 from '../../../../../public/img/icons/unicons/minus.svg'; +import u1081 from '../../../../../public/img/icons/unicons/mobile-android.svg'; +import u1082 from '../../../../../public/img/icons/unicons/monitor.svg'; +import u1131 from '../../../../../public/img/icons/unicons/palette.svg'; +import u1083 from '../../../../../public/img/icons/unicons/pause.svg'; +import u1084 from '../../../../../public/img/icons/unicons/pen.svg'; +import u1132 from '../../../../../public/img/icons/unicons/percentage.svg'; +import u1085 from '../../../../../public/img/icons/unicons/play.svg'; +import u1086 from '../../../../../public/img/icons/unicons/plug.svg'; +import u1088 from '../../../../../public/img/icons/unicons/plus-circle.svg'; +import u1134 from '../../../../../public/img/icons/unicons/plus-square.svg'; +import u1087 from '../../../../../public/img/icons/unicons/plus.svg'; +import u1089 from '../../../../../public/img/icons/unicons/power.svg'; +import u1090 from '../../../../../public/img/icons/unicons/presentation-play.svg'; +import u1091 from '../../../../../public/img/icons/unicons/process.svg'; +import u1092 from '../../../../../public/img/icons/unicons/question-circle.svg'; +import u1155 from '../../../../../public/img/icons/unicons/record-audio.svg'; +import u1093 from '../../../../../public/img/icons/unicons/repeat.svg'; +import u1094 from '../../../../../public/img/icons/unicons/rocket.svg'; +import u1095 from '../../../../../public/img/icons/unicons/save.svg'; +import u1097 from '../../../../../public/img/icons/unicons/search-minus.svg'; +import u1098 from '../../../../../public/img/icons/unicons/search-plus.svg'; +import u1096 from '../../../../../public/img/icons/unicons/search.svg'; +import u1099 from '../../../../../public/img/icons/unicons/share-alt.svg'; +import u1133 from '../../../../../public/img/icons/unicons/shield-exclamation.svg'; +import u1100 from '../../../../../public/img/icons/unicons/shield.svg'; +import u1101 from '../../../../../public/img/icons/unicons/signal.svg'; +import u1102 from '../../../../../public/img/icons/unicons/signin.svg'; +import u1103 from '../../../../../public/img/icons/unicons/signout.svg'; +import u1104 from '../../../../../public/img/icons/unicons/sitemap.svg'; +import u1105 from '../../../../../public/img/icons/unicons/slack.svg'; +import u1106 from '../../../../../public/img/icons/unicons/sliders-v-alt.svg'; +import u1107 from '../../../../../public/img/icons/unicons/sort-amount-down.svg'; +import u1108 from '../../../../../public/img/icons/unicons/sort-amount-up.svg'; +import u1109 from '../../../../../public/img/icons/unicons/square-shape.svg'; +import u1110 from '../../../../../public/img/icons/unicons/star.svg'; +import u1111 from '../../../../../public/img/icons/unicons/step-backward.svg'; +import u1112 from '../../../../../public/img/icons/unicons/sync.svg'; +import u1113 from '../../../../../public/img/icons/unicons/table.svg'; +import u1114 from '../../../../../public/img/icons/unicons/tag-alt.svg'; +import u1115 from '../../../../../public/img/icons/unicons/times.svg'; +import u1116 from '../../../../../public/img/icons/unicons/trash-alt.svg'; +import u1117 from '../../../../../public/img/icons/unicons/unlock.svg'; +import u1118 from '../../../../../public/img/icons/unicons/upload.svg'; +import u1119 from '../../../../../public/img/icons/unicons/user.svg'; +import u1120 from '../../../../../public/img/icons/unicons/users-alt.svg'; +import u1160 from '../../../../../public/img/icons/unicons/vertical-align-bottom.svg'; +import u1161 from '../../../../../public/img/icons/unicons/vertical-align-center.svg'; +import u1159 from '../../../../../public/img/icons/unicons/vertical-align-top.svg'; +import u1121 from '../../../../../public/img/icons/unicons/wrap-text.svg'; +import u1135 from '../../../../../public/img/icons/unicons/x.svg'; + export let cacheInitialized = false; export let iconRoot = 'public/img/icons'; diff --git a/scripts/copy-unicons.js b/scripts/copy-unicons.js new file mode 100644 index 00000000000..a512e19c193 --- /dev/null +++ b/scripts/copy-unicons.js @@ -0,0 +1,23 @@ +const fs = require('fs-extra'); +const path = require('path'); + +const iconsDir = path.resolve(__dirname, '../public/img/icons/'); +const lineDestDir = path.join(iconsDir, 'unicons'); + +if (!fs.pathExistsSync(lineDestDir)) { + let uniconSourceDir = path.join( + path.dirname(require.resolve('iconscout-unicons-tarball/package.json')), + 'unicons/svg/line' + ); + fs.copySync(uniconSourceDir, lineDestDir); +} + +let solidDestDir = path.join(iconsDir, 'solid'); + +if (!fs.pathExistsSync(solidDestDir)) { + let uniconSourceDir = path.join( + path.dirname(require.resolve('iconscout-unicons-tarball/package.json')), + 'unicons/svg/solid' + ); + fs.copySync(uniconSourceDir, solidDestDir); +} diff --git a/scripts/webpack/plugins/CopyUniconsPlugin.js b/scripts/webpack/plugins/CopyUniconsPlugin.js deleted file mode 100644 index 0e5fafcf04c..00000000000 --- a/scripts/webpack/plugins/CopyUniconsPlugin.js +++ /dev/null @@ -1,39 +0,0 @@ -const fs = require('fs-extra'); -const path = require('path'); - -class CopyUniconsPlugin { - /** - * @param {import('webpack').Compiler} compiler - */ - apply(compiler) { - compiler.hooks.afterEnvironment.tap( - 'CopyUniconsPlugin', - /** - * @param {import('webpack').Compilation} compilation - */ - () => { - let destDir = path.resolve(__dirname, '../../../public/img/icons/unicons'); - - if (!fs.pathExistsSync(destDir)) { - let srcDir = path.join( - path.dirname(require.resolve('iconscout-unicons-tarball/package.json')), - 'unicons/svg/line' - ); - fs.copySync(srcDir, destDir); - } - - let solidDestDir = path.resolve(__dirname, '../../../public/img/icons/solid'); - - if (!fs.pathExistsSync(solidDestDir)) { - let srcDir = path.join( - path.dirname(require.resolve('iconscout-unicons-tarball/package.json')), - 'unicons/svg/solid' - ); - fs.copySync(srcDir, solidDestDir); - } - } - ); - } -} - -module.exports = CopyUniconsPlugin; diff --git a/scripts/webpack/webpack.common.js b/scripts/webpack/webpack.common.js index 0f1f07a0853..cff93efbcd8 100644 --- a/scripts/webpack/webpack.common.js +++ b/scripts/webpack/webpack.common.js @@ -2,7 +2,6 @@ const CopyWebpackPlugin = require('copy-webpack-plugin'); const path = require('path'); const webpack = require('webpack'); -const CopyUniconsPlugin = require('./plugins/CopyUniconsPlugin'); const CorsWorkerPlugin = require('./plugins/CorsWorkerPlugin'); module.exports = { @@ -45,7 +44,6 @@ module.exports = { new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'], }), - new CopyUniconsPlugin(), new CopyWebpackPlugin({ patterns: [ { @@ -98,15 +96,15 @@ module.exports = { test: /\.css$/, use: ['style-loader', 'css-loader'], }, - // for pre-caching SVGs as part of the JS bundles - { - test: /\.svg$/, - use: 'raw-loader', - }, { test: /\.(svg|ico|jpg|jpeg|png|gif|eot|otf|webp|ttf|woff|woff2|cur|ani|pdf)(\?.*)?$/, - loader: 'file-loader', - options: { name: 'static/img/[name].[contenthash:8].[ext]' }, + type: 'asset/resource', + generator: { filename: 'static/img/[name].[hash:8][ext]' }, + }, + // for pre-caching SVGs as part of the JS bundles + { + test: /(unicons|mono|custom)[\\/].*\.svg$/, + type: 'asset/source', }, ], },