Google Material Icons restructured

audit/audit.sh

@@ -438,17 +438,18 @@ function create_url() {
     elif [ "$folder" = "rocket-loader" ]; then
         url="$CLOUDFLARE_AJAX/7089c43e/cloudflare-static/rocket-loader.min.js"
     elif [ "$folder" = "google-material-design-icons" ]; then
-        googlefontversion=$(echo -e "$path" | cut -d"/" -f5)
-        if [[ $subfile = "MaterialIcons.woff2" ]]; then
-            url="$FONTSGSTATIC/s/materialicons/$googlefontversion/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2"
-        elif [[ $subfile = "MaterialIconsOutlined.woff2" ]]; then
-            url="$FONTSGSTATIC/s/materialiconsoutlined/$googlefontversion/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2"
-        elif [[ $subfile = "MaterialIconsRound.woff2" ]]; then
-            url="$FONTSGSTATIC/s/materialiconsround/$googlefontversion/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2"
-        elif [[ $subfile = "MaterialIconsSharp.woff2" ]]; then
-            url="$FONTSGSTATIC/s/materialiconssharp/$googlefontversion/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2"
-        elif [[ $subfile = "MaterialIconsTwoTone.woff2" ]]; then
-            url="$FONTSGSTATIC/s/materialiconstwotone/$googlefontversion/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2"
+        iconVersion=$(echo -e "$path" | cut -d"/" -f5)
+        iconType=$(echo -e "$path" | cut -d"/" -f4)
+        if [[ $iconType = "materialicons" ]]; then
+            url="$FONTSGSTATIC/s/materialicons/$iconVersion/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2"
+        elif [[ $iconType = "materialiconsoutlined" ]]; then
+            url="$FONTSGSTATIC/s/materialiconsoutlined/$iconVersion/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2"
+        elif [[ $iconType = "materialiconsround" ]]; then
+            url="$FONTSGSTATIC/s/materialiconsround/$iconVersion/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2"
+        elif [[ $iconType = "materialiconssharp" ]]; then
+            url="$FONTSGSTATIC/s/materialiconssharp/$iconVersion/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2"
+        elif [[ $iconType = "materialiconstwotone" ]]; then
+            url="$FONTSGSTATIC/s/materialiconstwotone/$iconVersion/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2"
         fi
     elif [ "$folder" = "object-assign" ]; then
         url="$JSDELIVR/npm/object-assign@4.1.1/index.js"

modules/internal/targets.js

@@ -213,6 +213,15 @@ targets.setLastVersion = function (type, version) {
     if (type.startsWith('/gsap/1.')) return '1.20.5';
     if (type.startsWith('/gsap/2.')) return '2.1.3';
     if (type.startsWith('/gsap/3.')) return '3.10.4';
+
+    // just for testing ----------------------------------------------
+    if (type.startsWith('/materialicons/')) return 'v129';
+    if (type.startsWith('/materialiconsoutlined/')) return 'v104';
+    if (type.startsWith('/materialiconsround/')) return 'v103';
+    if (type.startsWith('/materialiconssharp/')) return 'v104';
+    if (type.startsWith('/materialiconstwotone/')) return 'v107';
+    // ---------------------------------------------------------------
+
     if (type.startsWith('/highlight.js/7.')) return '9.18.5';
     if (type.startsWith('/highlight.js/8.')) return '9.18.5';
     if (type.startsWith('/highlight.js/9.')) return '9.18.5';

resources/google-material-design-icons/google-material-design-icons.css

@@ -9,7 +9,7 @@
     font-family: 'Material Icons';
     font-style: normal;
     font-weight: 400;
-    src: url('./MaterialIcons/v129/MaterialIcons.woff2') format('woff2');
+    src: url('./materialicons/v129/MaterialIcons.woff2') format('woff2');
     /* src: url(https://fonts.gstatic.com/s/materialicons/v129/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2'); */
 }
 
@@ -17,7 +17,7 @@
     font-family: 'Google Material Icons';
     font-style: normal;
     font-weight: 400;
-    src: url('./MaterialIcons/v129/MaterialIcons.woff2') format('woff2');
+    src: url('./materialicons/v129/MaterialIcons.woff2') format('woff2');
     /* src: url(https://fonts.gstatic.com/s/materialicons/v129/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2'); */
 }
 
@@ -25,7 +25,7 @@
     font-family: 'Material Icons Outlined';
     font-style: normal;
     font-weight: 400;
-    src: url('./MaterialIconsOutlined/v104/MaterialIconsOutlined.woff2') format('woff2');
+    src: url('./materialiconsoutlined/v104/MaterialIconsOutlined.woff2') format('woff2');
     /* src: url(https://fonts.gstatic.com/s/materialiconsoutlined/v104/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2) format('woff2'); */
 }
 
@@ -33,7 +33,7 @@
     font-family: 'Google Material Icons Outlined';
     font-style: normal;
     font-weight: 400;
-    src: url('./MaterialIconsOutlined/v104/MaterialIconsOutlined.woff2') format('woff2');
+    src: url('./materialiconsoutlined/v104/MaterialIconsOutlined.woff2') format('woff2');
     /* src: url(https://fonts.gstatic.com/s/materialiconsoutlined/v104/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2) format('woff2'); */
 }
 
@@ -41,7 +41,7 @@
     font-family: 'Material Icons Round';
     font-style: normal;
     font-weight: 400;
-    src: url('./MaterialIconsRound/v103/MaterialIconsRound.woff2') format('woff2');
+    src: url('./materialiconsround/v103/MaterialIconsRound.woff2') format('woff2');
     /* src: url(https://fonts.gstatic.com/s/materialiconsround/v103/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2) format('woff2'); */
 }
 
@@ -49,7 +49,7 @@
     font-family: 'Google Material Icons Round';
     font-style: normal;
     font-weight: 400;
-    src: url('./MaterialIconsRound/v103/MaterialIconsRound.ttf') format('woff2');
+    src: url('./materialiconsround/v103/MaterialIconsRound.woff2') format('woff2');
     /* src: url(https://fonts.gstatic.com/s/materialiconsround/v103/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2) format('woff2'); */
 }
 
@@ -57,7 +57,7 @@
     font-family: 'Material Icons Sharp';
     font-style: normal;
     font-weight: 400;
-    src: url('./MaterialIconsSharp/v104/MaterialIconsSharp.woff2') format('woff2');
+    src: url('./materialiconssharp/v104/MaterialIconsSharp.woff2') format('woff2');
     /* src: url(https://fonts.gstatic.com/s/materialiconssharp/v104/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2) format('woff2'); */
 }
 
@@ -65,7 +65,7 @@
     font-family: 'Google Material Icons Sharp';
     font-style: normal;
     font-weight: 400;
-    src: url('./MaterialIconsSharp/v104/MaterialIconsSharp.woff2') format('woff2');
+    src: url('./materialiconssharp/v104/MaterialIconsSharp.woff2') format('woff2');
     /* src: url(https://fonts.gstatic.com/s/materialiconssharp/v104/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2) format('woff2'); */
 }
 
@@ -73,7 +73,7 @@
     font-family: 'Material Icons Two Tone';
     font-style: normal;
     font-weight: 400;
-    src: url('./MaterialIconsTwoTone/v107/MaterialIconsTwoTone.woff2') format('woff2');
+    src: url('./materialiconstwotone/v107/MaterialIconsTwoTone.woff2') format('woff2');
     /* src: url(https://fonts.gstatic.com/s/materialiconstwotone/v107/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2) format('woff2'); */
 }