Updated: Google Material Icons v84 -> v85 (#371)

THIRD_PARTY.txt

@@ -1185,7 +1185,7 @@ https://cdn.jsdelivr.net/npm/ui-select@0.19.8/dist/select.min.js
 https://cdn.jsdelivr.net/npm/urlize.js/urlize.js
 https://cdn.jsdelivr.net/npm/videojs-seek-buttons@1.6.0/dist/videojs-seek-buttons.css
 https://cdn.jsdelivr.net/npm/videojs-seek-buttons@1.6.0/dist/videojs-seek-buttons.min.js
-https://fonts.gstatic.com/s/materialicons/v84/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2
+https://fonts.gstatic.com/s/materialicons/v85/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2
 https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css
 https://raw.githubusercontent.com/jquery-validation/jquery-validation/1.19.3/dist/jquery.validate.min.js
 https://raw.githubusercontent.com/pagekit/vue-resource/1.5.2/dist/vue-resource.min.js

core/constants.js

@@ -199,8 +199,8 @@ const IconType = {
 };
 
 const Regex = {
-    'GOOGLE_FONTS': /fonts\.(googleapis|gstatic)\.com\/.*(?!.*Material\+Icons.*).*/,
-    'GOOGLE_MATERIAL_ICONS': /fonts\.googleapis\.com\/.*\?family=.*Material\+Icons/,
+    'GOOGLE_FONTS': /fonts\.(googleapis|gstatic)\.com\/(?!.*(Material\+Icons|materialicons).*).*/,
+    'GOOGLE_MATERIAL_ICONS': /fonts\.(googleapis|gstatic)\.com\/.*\?family=.*Material\+Icons/,
     'JSDELIVR_COMBINE': /cdn\.jsdelivr\.net.*\/combine.*jquery.*hogan.*algoliasearch.*autocomplete.*/,
     'BOOTSTRAP_DATEPICKER_3': /\/bootstrap-datepicker3.*\.css/,
     'BOOTSTRAP_DATEPICKER': /\/bootstrap-datepicker.*\.css/,
@@ -210,6 +210,10 @@ const Regex = {
     'BOOTSTRAP_FONTS_ONLY': /\/bootstrap\/(?:\d{1,2}\.){1,3}\d{1,2}\/fonts\//
 };
 
+const MaterialIcons = {
+    'DEFAULT': 'flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2'
+};
+
 const Links = {
     'CODEBERG_HTML_FILTER': 'https://codeberg.org/nobody/LocalCDN/wiki/Home#user-content-7-a-website-looks-weird-or-cannot-be-used-if-i-deactivate-localcdn-everything-works-what-is-the-problem',
     'CODEBERG_RULESET': 'https://codeberg.org/nobody/LocalCDN/wiki/Home#user-content-6-why-do-i-need-this-rule-generator-i-use-an-adblocker-and-want-to-import-these-rules-how-does-it-work',
@@ -249,7 +253,8 @@ const CDNs = {
     'akamai-webcdn.kgstatic.net': 'Akamai WebCDN',
     'netdna.bootstrapcdn.com': 'NetDNA',
     'pagecdn.io': 'PageCDN',
-    'fonts.googleapis.com': 'Google Fonts',
+    'fonts.googleapis.com': 'Google',
+    'fonts.gstatic.com': 'Google',
     'gitcdn.github.io': 'GitHub',
     'cdn.bootcdn.net': 'BootCDN #2',
     'vjs.zencdn.net': 'Video.js CDN',

core/shorthands.js

@@ -28,6 +28,7 @@ var shorthands = {};
 shorthands.specialFiles = function (channelHost, channelPath, searchString) {
 
     let lastVersion;
+    const CompleteURL = channelHost + channelPath + searchString;
 
     /**
      * NOTE:
@@ -54,7 +55,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
             'path': 'resources/algoliasearch3.33.0_algoliasearchLite_algoliasearchHelper.jsm',
             'bundle': ''
         };
-    } else if (Regex.GOOGLE_MATERIAL_ICONS.test(channelHost + channelPath + searchString)) {
+    } else if (Regex.GOOGLE_MATERIAL_ICONS.test(CompleteURL)) {
         lastVersion = targets.setLastVersion('/google-material-design-icons/');
         return {
             'source': channelHost,
@@ -62,6 +63,14 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
             'path': 'resources/google-material-design-icons/google-material-design-icons.css',
             'bundle': ''
         };
+    } else if (channelPath.endsWith(MaterialIcons.DEFAULT)) {
+        lastVersion = targets.setLastVersion('/google-material-design-icons/');
+        return {
+            'source': channelHost,
+            'versionDelivered': lastVersion,
+            'path': `resources/google-material-design-icons/${lastVersion}/MaterialIcons.woff2`,
+            'bundle': ''
+        };
     } else if (Regex.BOOTSTRAP_DATEPICKER_3.test(channelPath)) {
         lastVersion = targets.setLastVersion('/bootstrap-datepicker/1.');
         return {

modules/internal/targets.js

@@ -273,6 +273,8 @@ targets.setLastVersion = function (type, version) {
         return '3.5.1';
     } else if (type.startsWith('/google-material-design-icons/')) {
         return '3.0.1';
+    } else if (type.startsWith('/google-material-design-icons/')) {
+        return 'v85';
     } else if (type.startsWith('/highlight.js/10.')) {
         return '10.7.2';
     } else if (type.startsWith('/highlight.js/9.')) {
@@ -576,6 +578,7 @@ targets.determineResourceName = function (filename) {
 };
 
 const ListOfFiles = {
+    'MaterialIcons.woff2': 'Google Material Icons',
     'font-awesome': 'Font Awesome',
     'leaflet.jsm': 'leaflet (JS)',
     'leaflet.css': 'leaflet (CSS)',

pages/updates/updates.html

@@ -26,7 +26,7 @@
                     </div>
                     <ul>
                         <li>Improved: i18n help page (<a href="https://codeberg.org/nobody/LocalCDN/issues/352">#352</a>)</li>
-                        <li>Updated: Google Material Icons v83 -> v84 (<a href="https://codeberg.org/nobody/LocalCDN/issues/371">#371</a>)</li>
+                        <li>Updated: Google Material Icons v83 -> v85 (<a href="https://codeberg.org/nobody/LocalCDN/issues/371">#371</a>)</li>
                     </ul>
                     <div id="generator-section">
                         <div class="topic-label">

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

@@ -9,8 +9,8 @@
     font-family: 'Material Icons';
     font-style: normal;
     font-weight: 400;
-    src: url('./v84/MaterialIcons-Regular.woff2') format('woff2');
-    /* src: url(https://fonts.gstatic.com/s/materialicons/v84/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2'); */
+    src: url('./v85/MaterialIcons.woff2') format('woff2');
+    /* src: url(https://fonts.gstatic.com/s/materialicons/v85/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2'); */
 }
 
 .material-icons {