diff --git a/.cspell/custom-words.txt b/.cspell/custom-words.txt index 46b00bf0..b194fd6d 100644 --- a/.cspell/custom-words.txt +++ b/.cspell/custom-words.txt @@ -23,6 +23,7 @@ DDTHH deeplink esmfile execa +ghostery idtype immer inversify diff --git a/package.json b/package.json index 2b427339..d44d7935 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ }, "pnpm": { "patchedDependencies": { - "@cliqz/adblocker@1.27.3": "patches/@cliqz__adblocker@1.27.3.patch" + "@ghostery/adblocker@2.3.1": "patches/@ghostery__adblocker@2.3.1.patch" } } } diff --git a/packages/main/app/package.json b/packages/main/app/package.json index 7006c315..305eff19 100644 --- a/packages/main/app/package.json +++ b/packages/main/app/package.json @@ -7,8 +7,7 @@ "homepage": "https://downloader.caorushizi.cn/", "license": "MIT", "dependencies": { - "@cliqz/adblocker-electron": "1.27.3", - "@cliqz/adblocker-electron-preload": "1.27.3", + "@ghostery/adblocker-electron": "^2.3.1", "node-pty": "^1.0.0" }, "devDependencies": { diff --git a/packages/main/package.json b/packages/main/package.json index 432a1a70..75f6bd78 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -55,8 +55,7 @@ "typescript-eslint": "^7.10.0" }, "dependencies": { - "@cliqz/adblocker-electron": "1.27.3", - "@cliqz/adblocker-electron-preload": "1.27.3", + "@ghostery/adblocker-electron": "^2.3.1", "axios": "^1.7.2", "better-sqlite3": "^9.6.0", "cheerio": "1.0.0-rc.12", diff --git a/packages/main/scripts/config.ts b/packages/main/scripts/config.ts index e74337fa..f3fd902b 100644 --- a/packages/main/scripts/config.ts +++ b/packages/main/scripts/config.ts @@ -7,7 +7,7 @@ const external = [ "nock", "aws-sdk", "mock-aws-s3", - "@cliqz/adblocker-electron-preload", + "@ghostery/adblocker-electron", "node-pty", ]; diff --git a/packages/main/src/services/WebviewService.ts b/packages/main/src/services/WebviewService.ts index a976be4f..adba3e67 100644 --- a/packages/main/src/services/WebviewService.ts +++ b/packages/main/src/services/WebviewService.ts @@ -10,7 +10,7 @@ import { pcUA, pluginPath, } from "../helper/index.ts"; -import { ElectronBlocker } from "@cliqz/adblocker-electron"; +import { ElectronBlocker } from "@ghostery/adblocker-electron"; import ElectronLogger from "../vendor/ElectronLogger.ts"; import ElectronStore from "../vendor/ElectronStore.ts"; import MainWindow from "../windows/MainWindow.ts"; @@ -294,6 +294,9 @@ export default class WebviewService { this.logger.error(`[AdBlocker] enable failed(not initialized)`); return; } + if (this.blocker.isBlockingEnabled(this.session)) { + return; + } this.blocker.enableBlockingInSession(this.session); this.logger.info(`[AdBlocker] enable`); } diff --git a/patches/@cliqz__adblocker@1.27.3.patch b/patches/@cliqz__adblocker@1.27.3.patch deleted file mode 100644 index c37123c1..00000000 --- a/patches/@cliqz__adblocker@1.27.3.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/dist/cjs/src/fetch.js b/dist/cjs/src/fetch.js -index 1be3fec374c8c367422559442ba5543e4d2b8d1c..3be9f4a6d13470fca6304cfab924d3fc7649a69b 100644 ---- a/dist/cjs/src/fetch.js -+++ b/dist/cjs/src/fetch.js -@@ -39,7 +39,7 @@ exports.fetchWithRetry = fetchWithRetry; - function fetchResource(fetch, url) { - return fetchWithRetry(fetch, url).then((response) => response.text()); - } --const PREFIX = 'https://raw.githubusercontent.com/cliqz-oss/adblocker/master/packages/adblocker/assets'; -+const PREFIX = 'https://static.ziying.site/adblocker'; - exports.adsLists = [ - `${PREFIX}/easylist/easylist.txt`, - `${PREFIX}/peter-lowe/serverlist.txt`, -diff --git a/dist/es6/src/fetch.js b/dist/es6/src/fetch.js -index 28fb987d3d0377acf59819e304dbceea73596010..c32025691c39060cffa3b3c3ffa04c537f364aa6 100644 ---- a/dist/es6/src/fetch.js -+++ b/dist/es6/src/fetch.js -@@ -35,7 +35,7 @@ export function fetchWithRetry(fetch, url) { - function fetchResource(fetch, url) { - return fetchWithRetry(fetch, url).then((response) => response.text()); - } --const PREFIX = 'https://raw.githubusercontent.com/cliqz-oss/adblocker/master/packages/adblocker/assets'; -+const PREFIX = 'https://static.ziying.site/adblocker'; - export const adsLists = [ - `${PREFIX}/easylist/easylist.txt`, - `${PREFIX}/peter-lowe/serverlist.txt`, diff --git a/patches/@ghostery__adblocker@2.3.1.patch b/patches/@ghostery__adblocker@2.3.1.patch new file mode 100644 index 00000000..202b26ab --- /dev/null +++ b/patches/@ghostery__adblocker@2.3.1.patch @@ -0,0 +1,26 @@ +diff --git a/dist/commonjs/fetch.js b/dist/commonjs/fetch.js +index b610f9d3accead5b44693333598783e425f33ed9..ec538d5a0f15686d6983cd06c989e1ffd9cea987 100644 +--- a/dist/commonjs/fetch.js ++++ b/dist/commonjs/fetch.js +@@ -41,7 +41,7 @@ function fetchWithRetry(fetch, url) { + function fetchResource(fetch, url) { + return fetchWithRetry(fetch, url).then((response) => response.text()); + } +-const PREFIX = 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets'; ++const PREFIX = 'https://static.ziying.site/adblocker'; + exports.adsLists = [ + `${PREFIX}/easylist/easylist.txt`, + `${PREFIX}/peter-lowe/serverlist.txt`, +diff --git a/dist/esm/fetch.js b/dist/esm/fetch.js +index 2bc86ba508144053bda8d27fa663fdbe7846eed8..7a35c0d34945832dc09f0fc1b7429121ae2434eb 100644 +--- a/dist/esm/fetch.js ++++ b/dist/esm/fetch.js +@@ -35,7 +35,7 @@ export function fetchWithRetry(fetch, url) { + function fetchResource(fetch, url) { + return fetchWithRetry(fetch, url).then((response) => response.text()); + } +-const PREFIX = 'https://raw.githubusercontent.com/ghostery/adblocker/master/packages/adblocker/assets'; ++const PREFIX = 'https://static.ziying.site/adblocker'; + export const adsLists = [ + `${PREFIX}/easylist/easylist.txt`, + `${PREFIX}/peter-lowe/serverlist.txt`, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ab40670..add3a19b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,9 +5,9 @@ settings: excludeLinksFromLockfile: false patchedDependencies: - '@cliqz/adblocker@1.27.3': - hash: ehnwxuhizcxatborac3eqflbk4 - path: patches/@cliqz__adblocker@1.27.3.patch + '@ghostery/adblocker@2.3.1': + hash: 7gama4b5ctanzmxhpbpuvfbgfm + path: patches/@ghostery__adblocker@2.3.1.patch importers: @@ -242,12 +242,9 @@ importers: packages/main: dependencies: - '@cliqz/adblocker-electron': - specifier: 1.27.3 - version: 1.27.3(electron@30.0.8) - '@cliqz/adblocker-electron-preload': - specifier: 1.27.3 - version: 1.27.3(electron@30.0.8) + '@ghostery/adblocker-electron': + specifier: ^2.3.1 + version: 2.3.1(electron@30.0.8) axios: specifier: ^1.7.2 version: 1.7.2 @@ -389,7 +386,7 @@ importers: version: 30.0.8 electron-builder: specifier: ^24.13.3 - version: 24.13.3(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) + version: 24.13.3(electron-builder-squirrel-windows@24.13.3) electron-updater: specifier: ^6.1.8 version: 6.1.8 @@ -426,12 +423,9 @@ importers: packages/main/app: dependencies: - '@cliqz/adblocker-electron': - specifier: 1.27.3 - version: 1.27.3(electron@30.0.8) - '@cliqz/adblocker-electron-preload': - specifier: 1.27.3 - version: 1.27.3(electron@30.0.8) + '@ghostery/adblocker-electron': + specifier: ^2.3.1 + version: 2.3.1(electron@30.0.8) node-pty: specifier: ^1.0.0 version: 1.0.0 @@ -792,25 +786,6 @@ packages: resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==} engines: {node: '>=6.9.0'} - '@cliqz/adblocker-content@1.27.3': - resolution: {integrity: sha512-fMyvLGzw2aQKO1yuNfc9Pw4wI+a9xAyOgCXgqQOLYn4uXELthdn9vbng/gYmBs5Z3zetJpJmIitoRkIBlwOPhA==} - - '@cliqz/adblocker-electron-preload@1.27.3': - resolution: {integrity: sha512-yLd7uzOxqBVsWGXBvZ9iyyDs9xAiEKXIVvnzoRCRA1XXvz2ckYxHGtz/eNqR5811jJ2F8tuhOmqE8M/3+MaPpQ==} - peerDependencies: - electron: '>11' - - '@cliqz/adblocker-electron@1.27.3': - resolution: {integrity: sha512-eP0q+NrYrr/CKGYWuDumuaHSX5LXsljyS704kdOl0/XkFwGBeeUpm/cm9Fm43Fs9WZh4rgL3+jbwdyuOmNfrTg==} - peerDependencies: - electron: '>11' - - '@cliqz/adblocker-extended-selectors@1.27.3': - resolution: {integrity: sha512-aAmb6ExlqUO3m0Td0DWuUxcJhji9tZBisT1G+y+iETcynlv9oG7UR0///gNiceFGJZH2ARjehSIFAi2dPSc55g==} - - '@cliqz/adblocker@1.27.3': - resolution: {integrity: sha512-qPbQW1ZJBj2f7VhVOg8SCZws4G6WGJ9gmxF+tMpGXHeYN9PwFIvgdiYYmO6m+VH51ccgPu21rBvva9tfWi4I/w==} - '@colors/colors@1.6.0': resolution: {integrity: sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==} engines: {node: '>=0.1.90'} @@ -1518,6 +1493,25 @@ packages: '@gar/promisify@1.1.3': resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==} + '@ghostery/adblocker-content@2.3.1': + resolution: {integrity: sha512-8ZTY1sEE218b0EMk3Q9fv/cWwUxunSCyBOaKuviEmJY5EyvPa1VbGPuTq/Qdvo1kduD8nLEzCwgWhcT3F3TT0Q==} + + '@ghostery/adblocker-electron-preload@2.3.1': + resolution: {integrity: sha512-ljNnxNJiX0PaNzlH3kH7R5jAmeRqZm0nlyvPshGFft/sF2YOSpbwQnIIF55V/cg7rM6rWLuv6FEKh+xprL5dLw==} + peerDependencies: + electron: '>11' + + '@ghostery/adblocker-electron@2.3.1': + resolution: {integrity: sha512-zu1g5iBx2Owhc4AmWgA9s/tzDkw+AqPoFzRb50GYtO62WCef4sqmmLX1MMIfApzrGdy16NDSnXdwtDcRMshfgw==} + peerDependencies: + electron: '>11' + + '@ghostery/adblocker-extended-selectors@2.3.1': + resolution: {integrity: sha512-hDNiOd/1V4b6NTkNnMkZUUmhMwwo8+5rpSUtQUFzCCCzy+v5izHt4rBr2RGeK5L1pNq0NbFxZJjBHFDbiQiS1A==} + + '@ghostery/adblocker@2.3.1': + resolution: {integrity: sha512-6k8ZFHjYII54a32qrKwhnTbrPfR+KPgM6GlyAiEm8OCZoewN1cfBfSw5GVpzaAB2yJ4DzazmP8Wq/UBvEk5mHg==} + '@gulpjs/messages@1.1.0': resolution: {integrity: sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==} engines: {node: '>=10.13.0'} @@ -1911,8 +1905,8 @@ packages: resolution: {integrity: sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==} engines: {node: '>=14.0.0'} - '@remusao/guess-url-type@1.2.1': - resolution: {integrity: sha512-rbOqre2jW8STjheOsOaQHLgYBaBZ9Owbdt8NO7WvNZftJlaG3y/K9oOkl8ZUpuFBisIhmBuMEW6c+YrQl5inRA==} + '@remusao/guess-url-type@1.3.0': + resolution: {integrity: sha512-SNSJGxH5ckvxb3EUHj4DqlAm/bxNxNv2kx/AESZva/9VfcBokwKNS+C4D1lQdWIDM1R3d3UG+xmVzlkNG8CPTQ==} '@remusao/small@1.2.1': resolution: {integrity: sha512-7MjoGt0TJMVw1GPKgWq6SJPws1SLsUXQRa43Umht+nkyw2jnpy3WpiLNqGdwo5rHr5Wp9B2W/Pm5RQp656UJdw==} @@ -2234,9 +2228,6 @@ packages: '@types/cacheable-request@6.0.3': resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==} - '@types/chrome@0.0.267': - resolution: {integrity: sha512-vnCWPpYjazSPRMNmybRH+0q4f738F+Pbbls4ZPFsPr9/4TTNJyK1OLZDpSnghnEWb4stfmIUtq/GegnlfD4sPA==} - '@types/connect@3.4.38': resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} @@ -2279,15 +2270,6 @@ packages: '@types/express@4.17.21': resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==} - '@types/filesystem@0.0.36': - resolution: {integrity: sha512-vPDXOZuannb9FZdxgHnqSwAG/jvdGM8Wq+6N4D/d80z+D4HWH+bItqsZaVRQykAn6WEVeEkLm2oQigyHtgb0RA==} - - '@types/filewriter@0.0.33': - resolution: {integrity: sha512-xFU8ZXTw4gd358lb2jw25nxY9QAgqn2+bKKjKOYfNCzN4DKCFetK7sPtrlpg66Ywe3vWY9FNxprZawAh9wfJ3g==} - - '@types/firefox-webext-browser@120.0.3': - resolution: {integrity: sha512-APbBSxOvFMbKwXy/4YrEVa5Di6N0C9yl4w0WA0xzdkOrChAfPQ/KlcC8QLyhemHCHpF1CB/zHy52+oUQurViOg==} - '@types/fs-extra@11.0.4': resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} @@ -2303,9 +2285,6 @@ packages: '@types/gulp@4.0.17': resolution: {integrity: sha512-+pKQynu2C/HS16kgmDlAicjtFYP8kaa86eE9P0Ae7GB5W29we/E2TIdbOWtEZD5XkpY+jr8fyqfwO6SWZecLpQ==} - '@types/har-format@1.2.15': - resolution: {integrity: sha512-RpQH4rXLuvTXKR0zqHq3go0RVXYv/YVqv4TnPH95VbwUxZdQlK1EtcMvQvMpDngHbt13Csh9Z4qT9AbkiQH5BA==} - '@types/hoist-non-react-statics@3.3.5': resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==} @@ -2931,6 +2910,7 @@ packages: boolean@3.2.0: resolution: {integrity: sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==} + deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} @@ -3877,6 +3857,7 @@ packages: eslint@8.57.0: resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. hasBin: true esniff@2.0.1: @@ -7571,35 +7552,6 @@ snapshots: '@babel/helper-validator-identifier': 7.24.5 to-fast-properties: 2.0.0 - '@cliqz/adblocker-content@1.27.3': - dependencies: - '@cliqz/adblocker-extended-selectors': 1.27.3 - - '@cliqz/adblocker-electron-preload@1.27.3(electron@30.0.8)': - dependencies: - '@cliqz/adblocker-content': 1.27.3 - electron: 30.0.8 - - '@cliqz/adblocker-electron@1.27.3(electron@30.0.8)': - dependencies: - '@cliqz/adblocker': 1.27.3(patch_hash=ehnwxuhizcxatborac3eqflbk4) - '@cliqz/adblocker-electron-preload': 1.27.3(electron@30.0.8) - electron: 30.0.8 - tldts-experimental: 6.1.21 - - '@cliqz/adblocker-extended-selectors@1.27.3': {} - - '@cliqz/adblocker@1.27.3(patch_hash=ehnwxuhizcxatborac3eqflbk4)': - dependencies: - '@cliqz/adblocker-content': 1.27.3 - '@cliqz/adblocker-extended-selectors': 1.27.3 - '@remusao/guess-url-type': 1.2.1 - '@remusao/small': 1.2.1 - '@remusao/smaz': 1.9.1 - '@types/chrome': 0.0.267 - '@types/firefox-webext-browser': 120.0.3 - tldts-experimental: 6.1.21 - '@colors/colors@1.6.0': {} '@commitlint/cli@19.3.0(@types/node@20.12.12)(typescript@5.4.5)': @@ -8278,6 +8230,33 @@ snapshots: '@gar/promisify@1.1.3': {} + '@ghostery/adblocker-content@2.3.1': + dependencies: + '@ghostery/adblocker-extended-selectors': 2.3.1 + + '@ghostery/adblocker-electron-preload@2.3.1(electron@30.0.8)': + dependencies: + '@ghostery/adblocker-content': 2.3.1 + electron: 30.0.8 + + '@ghostery/adblocker-electron@2.3.1(electron@30.0.8)': + dependencies: + '@ghostery/adblocker': 2.3.1(patch_hash=7gama4b5ctanzmxhpbpuvfbgfm) + '@ghostery/adblocker-electron-preload': 2.3.1(electron@30.0.8) + electron: 30.0.8 + tldts-experimental: 6.1.21 + + '@ghostery/adblocker-extended-selectors@2.3.1': {} + + '@ghostery/adblocker@2.3.1(patch_hash=7gama4b5ctanzmxhpbpuvfbgfm)': + dependencies: + '@ghostery/adblocker-content': 2.3.1 + '@ghostery/adblocker-extended-selectors': 2.3.1 + '@remusao/guess-url-type': 1.3.0 + '@remusao/small': 1.2.1 + '@remusao/smaz': 1.9.1 + tldts-experimental: 6.1.21 + '@gulpjs/messages@1.1.0': {} '@gulpjs/to-absolute-glob@4.0.0': @@ -8670,7 +8649,7 @@ snapshots: '@remix-run/router@1.16.1': {} - '@remusao/guess-url-type@1.2.1': {} + '@remusao/guess-url-type@1.3.0': {} '@remusao/small@1.2.1': {} @@ -8876,11 +8855,6 @@ snapshots: '@types/node': 20.12.12 '@types/responselike': 1.0.3 - '@types/chrome@0.0.267': - dependencies: - '@types/filesystem': 0.0.36 - '@types/har-format': 1.2.15 - '@types/connect@3.4.38': dependencies: '@types/node': 20.12.12 @@ -8935,14 +8909,6 @@ snapshots: '@types/qs': 6.9.15 '@types/serve-static': 1.15.7 - '@types/filesystem@0.0.36': - dependencies: - '@types/filewriter': 0.0.33 - - '@types/filewriter@0.0.33': {} - - '@types/firefox-webext-browser@120.0.3': {} - '@types/fs-extra@11.0.4': dependencies: '@types/jsonfile': 6.1.4 @@ -8970,8 +8936,6 @@ snapshots: '@types/vinyl-fs': 3.0.5 chokidar: 3.6.0 - '@types/har-format@1.2.15': {} - '@types/hoist-non-react-statics@3.3.5': dependencies: '@types/react': 18.3.3 @@ -9547,7 +9511,7 @@ snapshots: app-builder-bin@4.0.0: {} - app-builder-lib@24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)): + app-builder-lib@24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.2.1 @@ -10631,7 +10595,7 @@ snapshots: dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3): dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) + app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) builder-util: 24.13.1 builder-util-runtime: 9.2.4 fs-extra: 10.1.0 @@ -10716,7 +10680,7 @@ snapshots: electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3): dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) + app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) archiver: 5.3.2 builder-util: 24.13.1 fs-extra: 10.1.0 @@ -10724,9 +10688,9 @@ snapshots: - dmg-builder - supports-color - electron-builder@24.13.3(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)): + electron-builder@24.13.3(electron-builder-squirrel-windows@24.13.3): dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@24.13.3))(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) + app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@24.13.3) builder-util: 24.13.1 builder-util-runtime: 9.2.4 chalk: 4.1.2