From ed4b31931a30e852a7bcf51fffa369ca5d0193b5 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Thu, 26 Oct 2023 13:38:24 -0400 Subject: [PATCH] Prepare to ship minified lists in package --- assets/assets.dev.json | 10 ++++++---- assets/assets.json | 8 +++++--- tools/make-assets.sh | 1 - 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/assets/assets.dev.json b/assets/assets.dev.json index 82e6136da..998f2bd86 100644 --- a/assets/assets.dev.json +++ b/assets/assets.dev.json @@ -99,6 +99,7 @@ "title": "uBlock filters – Unbreak", "contentURL": [ "https://ublockorigin.github.io/uAssets/filters/unbreak.txt", + "assets/ublock/unbreak.min.txt", "assets/ublock/unbreak.txt" ], "cdnURLs": [ @@ -116,13 +117,14 @@ "title": "uBlock filters – Quick fixes", "contentURL": [ "https://ublockorigin.github.io/uAssets/filters/quick-fixes.txt", + "assets/ublock/quick-fixes.min.txt", "assets/ublock/quick-fixes.txt" ], "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/quick-fixes.txt", - "https://ublockorigin.pages.dev/filters/quick-fixes.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@latest/filters/quick-fixes.txt", - "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/quick-fixes.txt?dev=1" + "https://ublockorigin.github.io/uAssetsCDN/filters/quick-fixes.min.txt", + "https://ublockorigin.pages.dev/filters/quick-fixes.min.txt", + "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@latest/filters/quick-fixes.min.txt", + "https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/quick-fixes.min.txt?dev=1" ], "supportURL": "https://github.com/uBlockOrigin/uAssets" }, diff --git a/assets/assets.json b/assets/assets.json index b6d388c03..05a28fb33 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -99,6 +99,7 @@ "title": "uBlock filters – Unbreak", "contentURL": [ "https://ublockorigin.github.io/uAssets/filters/unbreak.txt", + "assets/ublock/unbreak.min.txt", "assets/ublock/unbreak.txt" ], "cdnURLs": [ @@ -116,12 +117,13 @@ "title": "uBlock filters – Quick fixes", "contentURL": [ "https://ublockorigin.github.io/uAssets/filters/quick-fixes.txt", + "assets/ublock/quick-fixes.min.txt", "assets/ublock/quick-fixes.txt" ], "cdnURLs": [ - "https://ublockorigin.github.io/uAssetsCDN/filters/quick-fixes.txt", - "https://ublockorigin.pages.dev/filters/quick-fixes.txt", - "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@latest/filters/quick-fixes.txt" + "https://ublockorigin.github.io/uAssetsCDN/filters/quick-fixes.min.txt", + "https://ublockorigin.pages.dev/filters/quick-fixes.min.txt", + "https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@latest/filters/quick-fixes.min.txt" ], "supportURL": "https://github.com/uBlockOrigin/uAssets" }, diff --git a/tools/make-assets.sh b/tools/make-assets.sh index aeb6a684a..bac28ccb8 100755 --- a/tools/make-assets.sh +++ b/tools/make-assets.sh @@ -37,7 +37,6 @@ mkdir $DES/ublock cp $ASSETS_PROD/filters/badlists.txt $DES/ublock/badlists.txt cp $ASSETS_PROD/filters/badware.txt $DES/ublock/badware.txt cp $ASSETS_PROD/filters/filters.min.txt $DES/ublock/filters.min.txt -cp $ASSETS_PROD/filters/filters-mobile.txt $DES/ublock/filters-mobile.txt cp $ASSETS_PROD/filters/privacy.min.txt $DES/ublock/privacy.min.txt cp $ASSETS_PROD/filters/quick-fixes.txt $DES/ublock/quick-fixes.txt cp $ASSETS_PROD/filters/unbreak.txt $DES/ublock/unbreak.txt