Merge branch 'SukkaW:master' into master

FYLSen · Mar 5, 2024 · 3ec811a · 3ec811a
2 parents 397c7cd + 2948da0
commit 3ec811a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/Build/build-sgmodule-redirect.ts b/Build/build-sgmodule-redirect.ts
@@ -34,10 +34,10 @@ const REDIRECT = [
   // libravatar
   ['seccdn.libravatar.org/gravatarproxy/', 'https://secure.gravatar.com/'],
   // ghproxy
-  ['ghproxy.com/', ''],
-  ['ghps.cc/', ''],
+  ['ghproxy.com/', 'https://'],
+  ['ghps.cc/', 'https://'],
   // gh-proxy
-  ['github.moeyy.xyz/', ''],
+  ['github.moeyy.xyz/', 'https://'],
   // 7ED Services
   ['use.sevencdn.com/css', 'https://fonts.googleapis.com/css'],
   ['use.sevencdn.com/ajax/libs/', 'https://cdnjs.cloudflare.com/ajax/libs/'],
@@ -65,6 +65,10 @@ const REDIRECT = [
   // KGitHub
   ['raw.kgithub.com/', 'https://raw.githubusercontent.com/'],
   ['raw.kkgithub.com/', 'https://raw.githubusercontent.com/'],
+  // Polyfill
+  ['polyfill.io/', 'https://cdnjs.cloudflare.com/polyfill/'],
+  ['fastly-polyfill.io/', 'https://cdnjs.cloudflare.com/polyfill/'],
+  ['fastly-polyfill.net/', 'https://cdnjs.cloudflare.com/polyfill/'],
   // Misc
   ['pics.javbus.com/', 'https://i0.wp.com/pics.javbus.com/'],
   ['googlefonts.wp-china-yes.net/', 'https://fonts.googleapis.com/'],
@@ -84,10 +88,7 @@ export const buildRedirectModule = task(import.meta.path, async (span) => {
       `hostname = %APPEND% ${domains.join(', ')}`,
       '',
       '[URL Rewrite]',
-      ...REDIRECT.map(([from, to]) => {
-        const src = `^https?://${escapeRegExp(from)}(.*)`;
-        return `${src} ${to}$1 302`;
-      })
+      ...REDIRECT.map(([from, to]) => `^https?://${escapeRegExp(from)}(.*) ${to}$1 302`)
     ],
     path.resolve(import.meta.dir, '../Modules/sukka_url_redirect.sgmodule')
   );

diff --git a/Source/domainset/cdn.conf b/Source/domainset/cdn.conf
@@ -669,6 +669,7 @@ cdn.ghostery.com
 .someonewhocares.org
 osint.digitalside.it
 phishing.army
+.i-dont-care-about-cookies.eu
 
 # >> 1Password
 .1passwordusercontent.com
@@ -685,6 +686,7 @@ cdn-sellix.com
 assets.calendly.com
 cdn.commento.io
 js.hsforms.net
+js-eu1.hsforms.net
 js.hscollectedforms.net
 js.createsend1.com
 showcase.abovemarket.com
@@ -2421,3 +2423,5 @@ cdn.parsely.com
 linuxiac.b-cdn.net
 cdn.usd.fan
 static.esimplus.net
+cdn.european-alternatives.eu
+assets.gcore.pro
diff --git a/Source/non_ip/domestic.ts b/Source/non_ip/domestic.ts
@@ -341,7 +341,6 @@ export const DOMESTICS = {
       'web.setup',
       'web.setup.home',
       // AS112
-      '168.192.in-addr.arpa',
       '10.in-addr.arpa',
       '16.172.in-addr.arpa',
       '17.172.in-addr.arpa',

diff --git a/Source/non_ip/global.conf b/Source/non_ip/global.conf
@@ -292,6 +292,7 @@ DOMAIN-SUFFIX,flipboard.com
 DOMAIN-SUFFIX,gameloft.com
 DOMAIN-SUFFIX,gate.io
 DOMAIN-SUFFIX,gitlab.com
+DOMAIN-SUFFIX,ghostery.com
 DOMAIN-SUFFIX,godaddy.com
 DOMAIN-SUFFIX,goodreads.com
 DOMAIN-SUFFIX,grammarly.com
@@ -307,6 +308,7 @@ DOMAIN-SUFFIX,issuu.com
 DOMAIN-SUFFIX,istatmenus.app
 DOMAIN-SUFFIX,iwara.tv
 DOMAIN-SUFFIX,jkforum.net
+DOMAIN-SUFFIX,jsdelivr.com
 DOMAIN-SUFFIX,jsdelivr.net
 DOMAIN-SUFFIX,hostloc.com
 DOMAIN-SUFFIX,kakao.com