diff --git a/Build/lib/clash.ts b/Build/lib/clash.ts deleted file mode 100644 index 2d407347..00000000 --- a/Build/lib/clash.ts +++ /dev/null @@ -1,7 +0,0 @@ -const unsupported = Symbol('unsupported'); - -// https://dreamacro.github.io/clash/configuration/rules.html -export const PROCESSOR: Record string) | typeof unsupported> = { - 'URL-REGEX': unsupported, - 'USER-AGENT': unsupported -}; diff --git a/Build/lib/parse-filter.ts b/Build/lib/parse-filter.ts index 71e64a18..02b2e05a 100644 --- a/Build/lib/parse-filter.ts +++ b/Build/lib/parse-filter.ts @@ -1,5 +1,4 @@ -// @ts-check -import { NetworkFilter } from '@cliqz/adblocker'; +import { NetworkFilter } from '@ghostery/adblocker'; import { processLine } from './process-line'; import tldts from 'tldts-experimental'; diff --git a/package.json b/package.json index f41a69b9..fcb59ef3 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "author": "", "license": "ISC", "dependencies": { - "@cliqz/adblocker": "^1.34.0", + "@ghostery/adblocker": "^2.0.0", "@jsdevtools/ez-spawn": "^3.0.4", "async-sema": "^3.1.1", "better-sqlite3": "^11.3.0", @@ -41,12 +41,13 @@ "tar-fs": "^3.0.6", "tldts": "^6.1.52", "tldts-experimental": "^6.1.52", + "typeson-registry": "^11.1.1", "undici": "6.20.1", "why-is-node-running": "^3.2.0", "yaml": "^2.6.0" }, "devDependencies": { - "@eslint-sukka/node": "^6.7.0", + "@eslint-sukka/node": "^6.8.0", "@swc-node/register": "^1.10.9", "@swc/core": "^1.7.36", "@types/better-sqlite3": "^7.6.11", @@ -59,8 +60,8 @@ "@types/tar-fs": "^2.0.4", "@types/tar-stream": "^3.1.3", "eslint": "^9.12.0", - "eslint-config-sukka": "^6.7.0", - "eslint-formatter-sukka": "^6.7.0", + "eslint-config-sukka": "^6.8.0", + "eslint-formatter-sukka": "^6.8.0", "expect": "^29.7.0", "mitata": "^1.0.10", "mocha": "^10.7.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 61cb001b..d7df9f48 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,9 +16,9 @@ importers: .: dependencies: - '@cliqz/adblocker': - specifier: ^1.34.0 - version: 1.34.0 + '@ghostery/adblocker': + specifier: ^2.0.0 + version: 2.0.0 '@jsdevtools/ez-spawn': specifier: ^3.0.4 version: 3.0.4 @@ -79,6 +79,9 @@ importers: tldts-experimental: specifier: ^6.1.52 version: 6.1.52 + typeson-registry: + specifier: ^11.1.1 + version: 11.1.1 undici: specifier: 6.20.1 version: 6.20.1(patch_hash=yuj5uy4vvwj67xoliq5togiyme) @@ -90,8 +93,8 @@ importers: version: 2.6.0 devDependencies: '@eslint-sukka/node': - specifier: ^6.7.0 - version: 6.7.0(eslint@9.12.0)(typescript@5.6.3) + specifier: ^6.8.0 + version: 6.8.0(eslint@9.12.0)(typescript@5.6.3) '@swc-node/register': specifier: ^1.10.9 version: 1.10.9(@swc/core@1.7.36)(@swc/types@0.1.13)(typescript@5.6.3) @@ -129,11 +132,11 @@ importers: specifier: ^9.12.0 version: 9.12.0 eslint-config-sukka: - specifier: ^6.7.0 - version: 6.7.0(@typescript-eslint/eslint-plugin@8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3) + specifier: ^6.8.0 + version: 6.8.0(@typescript-eslint/eslint-plugin@8.9.0(@typescript-eslint/parser@8.9.0(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3) eslint-formatter-sukka: - specifier: ^6.7.0 - version: 6.7.0 + specifier: ^6.8.0 + version: 6.8.0 expect: specifier: ^29.7.0 version: 29.7.0 @@ -164,15 +167,6 @@ packages: resolution: {integrity: sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==} engines: {node: '>=6.9.0'} - '@cliqz/adblocker-content@1.34.0': - resolution: {integrity: sha512-5LcV8UZv49RWwtpom9ve4TxJIFKd+bjT59tS/2Z2c22Qxx5CW1ncO/T+ybzk31z422XplQfd0ZE6gMGGKs3EMg==} - - '@cliqz/adblocker-extended-selectors@1.34.0': - resolution: {integrity: sha512-lNrgdUPpsBWHjrwXy2+Z5nX/Gy5YAvNwFMLqkeMdjzrybwPIalJJN2e+YtkS1I6mVmOMNppF5cv692OAVoI74g==} - - '@cliqz/adblocker@1.34.0': - resolution: {integrity: sha512-d7TeUl5t+TOMJe7/CRYtf+x6hbd8N25DtH7guQTIjjr3AFVortxiAIgNejGvVqy0by4eNByw+oVil15oqxz2Eg==} - '@colors/colors@1.5.0': resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} @@ -205,11 +199,11 @@ packages: resolution: {integrity: sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint-sukka/node@6.7.0': - resolution: {integrity: sha512-28MW9Jj29SJ85wQvkg46nl9Spg0d68HOOWsPsMRgg0yq15r/lsQyEjE/Mtx8JybW9dLYNWQW9P7bq3ZNPlxHSg==} + '@eslint-sukka/node@6.8.0': + resolution: {integrity: sha512-XcOwvKr+i1x1H8bKu58D+/73k+JELxy5KewaW6Zazp3mOqJ8rogtgcnNN4uaCyL0xAIpitjbMF1LTA4SgKp6+Q==} - '@eslint-sukka/shared@6.7.0': - resolution: {integrity: sha512-0VF/pfxsmF267y7rN3eF2b1spBJ3YQMsPZt5EGuwUYRdjOkACfWTPj1mSGe/oMD5d4i9IYpP+XlPXsc2i6UdmQ==} + '@eslint-sukka/shared@6.8.0': + resolution: {integrity: sha512-u/cw3cx7ZSy2dysgU32KXuH7yzh/sjV5CFBfUGnqBlt7AV3BQm5ERlquLiasta+fvM6XFGTys5yqUtWniPbzhQ==} '@eslint/config-array@0.18.0': resolution: {integrity: sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==} @@ -235,6 +229,15 @@ packages: resolution: {integrity: sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@ghostery/adblocker-content@2.0.0': + resolution: {integrity: sha512-tG27OMbRYxybZnY0gcWpHKMkuDzAINPc2GIOQgKkUjdckolxyIayox/1M3QK++QGe6jryeFBWMdJqSuUVJNhOQ==} + + '@ghostery/adblocker-extended-selectors@2.0.0': + resolution: {integrity: sha512-NADqSwcsCCr1aI81t0bGM8G7l6Sz4ezk6QP+O2YZfEjKIZ49vYZivMmdh1s5WODJOw5MFIOEDXK49Y3UiMZOmg==} + + '@ghostery/adblocker@2.0.0': + resolution: {integrity: sha512-93uGOVZcOuAsyP3oDNUuG/C8PZIN+bDIK2OlXGE2BDUVW9zpZdy0HvQkDst2GpgUVTtXxmDNLmbPFopnt8SihA==} + '@humanfs/core@0.19.0': resolution: {integrity: sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==} engines: {node: '>=18.18.0'} @@ -381,19 +384,19 @@ packages: '@sinclair/typebox@0.27.8': resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} - '@stylistic/eslint-plugin-js@2.8.0': - resolution: {integrity: sha512-/e7pSzVMrwBd6yzSDsKHwax3TS96+pd/xSKzELaTkOuYqUhYfj/becWdfDbFSBGQD7BBBCiiE4L8L2cUfu5h+A==} + '@stylistic/eslint-plugin-js@2.9.0': + resolution: {integrity: sha512-h08DQybPsXxIvHIvQqU1tFWcu74M7kZK/0S0jVIDdoHSFq7jB+TzxikBWAg5j0lPR17WsGGGHAS8GHFlAAQXHA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: '>=8.40.0' - '@stylistic/eslint-plugin-plus@2.8.0': - resolution: {integrity: sha512-NBfv9xuBcG0oIM5323xjW6duxbcLP8WX6lr5XWLmypZo4uf6sdkfrTEdo7AHl17DvKl/2qgurqCwzYV/DiXstQ==} + '@stylistic/eslint-plugin-plus@2.9.0': + resolution: {integrity: sha512-h0BGy24ag0pk9Z0ioClyTxcO8VUkxM5JJOwyybd0D8Bg1Q/GYlwfrNM7AEEDBy3QWqmjT39WHezOQ8JidNYwKw==} peerDependencies: eslint: '*' - '@stylistic/eslint-plugin-ts@2.8.0': - resolution: {integrity: sha512-VukJqkRlC2psLKoIHJ+4R3ZxLJfWeizGGX+X5ZxunjXo4MbxRNtwu5UvXuerABg4s2RV6Z3LFTdm0WvI4+RAMQ==} + '@stylistic/eslint-plugin-ts@2.9.0': + resolution: {integrity: sha512-CxB73paAKlmaIDtOfKoIHlhNJVlyRMVobuBqdOc4wbVSqfhbgpCWuJYpBkV3ydGDKRfVWNJ9yg5b99lzZtrjhg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: '>=8.40.0' @@ -567,8 +570,8 @@ packages: '@types/yargs@17.0.33': resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==} - '@typescript-eslint/eslint-plugin@8.8.1': - resolution: {integrity: sha512-xfvdgA8AP/vxHgtgU310+WBnLB4uJQ9XdyP17RebG26rLtDrQJV3ZYrcopX91GrHmMoH8bdSwMRh2a//TiJ1jQ==} + '@typescript-eslint/eslint-plugin@8.9.0': + resolution: {integrity: sha512-Y1n621OCy4m7/vTXNlCbMVp87zSd7NH0L9cXD8aIpOaNlzeWxIK4+Q19A68gSmTNRZn92UjocVUWDthGxtqHFg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 @@ -578,8 +581,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.7.0': - resolution: {integrity: sha512-lN0btVpj2unxHlNYLI//BQ7nzbMJYBVQX5+pbNXvGYazdlgYonMn4AhhHifQ+J4fGRYA/m1DjaQjx+fDetqBOQ==} + '@typescript-eslint/parser@8.9.0': + resolution: {integrity: sha512-U+BLn2rqTTHnc4FL3FJjxaXptTxmf9sNftJK62XLz4+GxG3hLHm/SUNaaXP5Y4uTiuYoL5YLy4JBCJe3+t8awQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -588,26 +591,16 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.8.1': - resolution: {integrity: sha512-hQUVn2Lij2NAxVFEdvIGxT9gP1tq2yM83m+by3whWFsWC+1y8pxxxHUFE1UqDu2VsGi2i6RLcv4QvouM84U+ow==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - - '@typescript-eslint/scope-manager@8.7.0': - resolution: {integrity: sha512-87rC0k3ZlDOuz82zzXRtQ7Akv3GKhHs0ti4YcbAJtaomllXoSO8hi7Ix3ccEvCd824dy9aIX+j3d2UMAfCtVpg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/scope-manager@8.8.1': resolution: {integrity: sha512-X4JdU+66Mazev/J0gfXlcC/dV6JI37h+93W9BRYXrSn0hrE64IoWgVkO9MSJgEzoWkxONgaQpICWg8vAN74wlA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.8.1': - resolution: {integrity: sha512-qSVnpcbLP8CALORf0za+vjLYj1Wp8HSoiI8zYU5tHxRVj30702Z1Yw4cLwfNKhTPWp5+P+k1pjmD5Zd1nhxiZA==} + '@typescript-eslint/scope-manager@8.9.0': + resolution: {integrity: sha512-bZu9bUud9ym1cabmOYH9S6TnbWRzpklVmwqICeOulTCZ9ue2/pczWzQvt/cGj2r2o1RdKoZbuEMalJJSYw3pHQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@typescript-eslint/type-utils@8.9.0': + resolution: {integrity: sha512-JD+/pCqlKqAk5961vxCluK+clkppHY07IbV3vett97KOV+8C6l+CPEPwpUuiMwgbOz/qrN3Ke4zzjqbT+ls+1Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -615,16 +608,16 @@ packages: typescript: optional: true - '@typescript-eslint/types@8.7.0': - resolution: {integrity: sha512-LLt4BLHFwSfASHSF2K29SZ+ZCsbQOM+LuarPjRUuHm+Qd09hSe3GCeaQbcCr+Mik+0QFRmep/FyZBO6fJ64U3w==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/types@8.8.1': resolution: {integrity: sha512-WCcTP4SDXzMd23N27u66zTKMuEevH4uzU8C9jf0RO4E04yVHgQgW+r+TeVTNnO1KIfrL8ebgVVYYMMO3+jC55Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.7.0': - resolution: {integrity: sha512-MC8nmcGHsmfAKxwnluTQpNqceniT8SteVwd2voYlmiSWGOtjvGXdPl17dYu2797GVscK30Z04WRM28CrKS9WOg==} + '@typescript-eslint/types@8.9.0': + resolution: {integrity: sha512-SjgkvdYyt1FAPhU9c6FiYCXrldwYYlIQLkuc+LfAhCna6ggp96ACncdtlbn8FmnG72tUkXclrDExOpEYf1nfJQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@typescript-eslint/typescript-estree@8.8.1': + resolution: {integrity: sha512-A5d1R9p+X+1js4JogdNilDuuq+EHZdsH9MjTVxXOdVFfTJXunKJR/v+fNNyO4TnoOn5HqobzfRlc70NC6HTcdg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -632,8 +625,8 @@ packages: typescript: optional: true - '@typescript-eslint/typescript-estree@8.8.1': - resolution: {integrity: sha512-A5d1R9p+X+1js4JogdNilDuuq+EHZdsH9MjTVxXOdVFfTJXunKJR/v+fNNyO4TnoOn5HqobzfRlc70NC6HTcdg==} + '@typescript-eslint/typescript-estree@8.9.0': + resolution: {integrity: sha512-9iJYTgKLDG6+iqegehc5+EqE6sqaee7kb8vWpmHZ86EqwDjmlqNNHeqDVqb9duh+BY6WCNHfIGvuVU3Tf9Db0g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -647,14 +640,20 @@ packages: peerDependencies: eslint: ^8.57.0 || ^9.0.0 - '@typescript-eslint/visitor-keys@8.7.0': - resolution: {integrity: sha512-b1tx0orFCCh/THWPQa2ZwWzvOeyzzp36vkJYOpVg0u8UVOIsfVrnuC9FqAw9gRKn+rG2VmWQ/zDJZzkxUnj/XQ==} + '@typescript-eslint/utils@8.9.0': + resolution: {integrity: sha512-PKgMmaSo/Yg/F7kIZvrgrWa1+Vwn036CdNUvYFEkYbPwOH4i8xvkaRlu148W3vtheWK9ckKRIz7PBP5oUlkrvQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 '@typescript-eslint/visitor-keys@8.8.1': resolution: {integrity: sha512-0/TdC3aeRAsW7MDvYRwEc1Uwm0TIBfzjPFgg60UU2Haj5qsCs9cc3zNgY71edqE3LbWfF/WoZQd3lJoDXFQpag==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/visitor-keys@8.9.0': + resolution: {integrity: sha512-Ht4y38ubk4L5/U8xKUBfKNYGmvKvA1CANoxiTRMM+tOLk3lbF3DvzZCxJCRSE+2GdCMSh6zq9VZJc3asc1XuAA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + acorn-jsx@5.3.2: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: @@ -734,6 +733,10 @@ packages: bare-stream@2.2.1: resolution: {integrity: sha512-YTB47kHwBW9zSG8LD77MIBAAQXjU2WjAkMHeeb7hUplVs6+IoM5I7uEVQNPMB7lj9r8I76UMdoMkGnCodHOLqg==} + base64-arraybuffer-es6@3.1.0: + resolution: {integrity: sha512-QKKtftiSrKjilihGNLXxnrb9LJj7rnEdB1cYAqVpekFy0tisDklAf1RAgvpm0HsGYx9sv7FUbgpsrfwTyCPVLg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} @@ -958,17 +961,17 @@ packages: peerDependencies: eslint: '>=6.0.0' - eslint-config-sukka@6.7.0: - resolution: {integrity: sha512-THoUWqxt52xtB2JyP+Boha4MzFSYAKmydGsIXMZ5uX2VrHYG3uPqPp3S5YrL6/img+AQjLg2bF+j3w1chumM9A==} + eslint-config-sukka@6.8.0: + resolution: {integrity: sha512-kQyOjkAG6gqZbI0BNS/oPfULdRnFwzaXOlAe0KWF7vtIMwS17gHIVQFUu/jaT8622PA+Mhx6EaXDhniOTdPhmw==} - eslint-formatter-sukka@6.7.0: - resolution: {integrity: sha512-h3/mjxwtAPjfvs1FzlzrkxgHw/h9cWlqhwX3IruuGZm9LnYMc6uwBuANToco1f0iWh7chKLXfLPJfz9VPkkOoA==} + eslint-formatter-sukka@6.8.0: + resolution: {integrity: sha512-N/stBFE80OSd1pTYY8yxq67ZI+N0RSH5G5aqQw3k6TJD7D1qNKS4R+GRl0kQ8DKSf2NTrcGnUkkfvAhhEWi3Ww==} eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} - eslint-import-resolver-ts-bundled@6.7.0: - resolution: {integrity: sha512-0haJVgQKhKa+03bEZPbVVqCg2V1RfY9YjIV765/nBl7niigZLu5Ouny6jNBOOZfXSSH4HEDb+oc09bnMWsrmlA==} + eslint-import-resolver-ts-bundled@6.8.0: + resolution: {integrity: sha512-Xkn4cNlGUP3FXAzHe4pBVxtGO06d+MVpwXHX1reyx6D95HwlNIU+P0SEK9F4vHa0hh41C7qD5VTG4fz0RgyVhw==} eslint-plugin-antfu@2.7.0: resolution: {integrity: sha512-gZM3jq3ouqaoHmUNszb1Zo2Ux7RckSvkGksjLWz9ipBYGSv1EwwBETN6AdiUXn+RpVHXTbEMPAPlXJazcA6+iA==} @@ -1017,8 +1020,8 @@ packages: peerDependencies: eslint: '>=8.44.0' - eslint-plugin-sukka@6.7.0: - resolution: {integrity: sha512-wUgdP3PqmJ8VSW0uTuf+irLyaHccVwdl0417NsdVFXG3k0o6B9ABjBgJWSoBUoqNAGXCNVlO4fzsciFgXfXgDw==} + eslint-plugin-sukka@6.8.0: + resolution: {integrity: sha512-D1xgz1+4YMcJxmQmxOKuIcGNiDsyB9muXA+1Khn9s0mLC3dZAwnQzKBR+qgWjBjYaVDkWjHjh2bh3CSLvw+A9w==} peerDependencies: typescript: '*' peerDependenciesMeta: @@ -1833,6 +1836,10 @@ packages: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} + tr46@5.0.0: + resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==} + engines: {node: '>=18'} + ts-api-utils@1.3.0: resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} engines: {node: '>=16'} @@ -1853,8 +1860,8 @@ packages: resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} engines: {node: '>=4'} - typescript-eslint@8.8.1: - resolution: {integrity: sha512-R0dsXFt6t4SAFjUSKFjMh4pXDtq04SsFKCVGDP3ZOzNP7itF0jBcZYU4fMsZr4y7O7V7Nc751dDeESbe4PbQMQ==} + typescript-eslint@8.9.0: + resolution: {integrity: sha512-AuD/FXGYRQyqyOBCpNLldMlsCGvmDNxptQ3Dp58/NXeB+FqyvTfXmMyba3PYa0Vi9ybnj7G8S/yd/4Cw8y47eA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -1867,6 +1874,14 @@ packages: engines: {node: '>=14.17'} hasBin: true + typeson-registry@11.1.1: + resolution: {integrity: sha512-WF8meNtURfGXXY2RitEMgZrMEclHU8IdxxN4YTcnXTQUHvisPYsKrxxPFhc4DKTCAc6sVvWVtKelOXFDtw/OQQ==} + engines: {node: '>=18.14.0'} + + typeson@9.0.3: + resolution: {integrity: sha512-vsOn+VPbIYI3jgj96vwIhAO0BNmlBxEgBKVmuzl1dwXzQe+3XjRi/gK2zYgAansWYlrtvluy4lvWcL8LF01P3Q==} + engines: {node: '>=16.0.0'} + undici-types@6.19.8: resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} @@ -1888,6 +1903,14 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + webidl-conversions@7.0.0: + resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} + engines: {node: '>=12'} + + whatwg-url@14.0.0: + resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==} + engines: {node: '>=18'} + which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} @@ -1966,23 +1989,6 @@ snapshots: js-tokens: 4.0.0 picocolors: 1.1.1 - '@cliqz/adblocker-content@1.34.0': - dependencies: - '@cliqz/adblocker-extended-selectors': 1.34.0 - - '@cliqz/adblocker-extended-selectors@1.34.0': {} - - '@cliqz/adblocker@1.34.0': - dependencies: - '@cliqz/adblocker-content': 1.34.0 - '@cliqz/adblocker-extended-selectors': 1.34.0 - '@remusao/guess-url-type': 1.3.0 - '@remusao/small': 1.3.0 - '@remusao/smaz': 1.10.0 - '@types/chrome': 0.0.278 - '@types/firefox-webext-browser': 120.0.4 - tldts-experimental: 6.1.52 - '@colors/colors@1.5.0': optional: true @@ -2017,22 +2023,22 @@ snapshots: '@eslint-community/regexpp@4.11.1': {} - '@eslint-sukka/node@6.7.0(eslint@9.12.0)(typescript@5.6.3)': + '@eslint-sukka/node@6.8.0(eslint@9.12.0)(typescript@5.6.3)': dependencies: - '@eslint-sukka/shared': 6.7.0(eslint@9.12.0)(typescript@5.6.3) + '@eslint-sukka/shared': 6.8.0(eslint@9.12.0)(typescript@5.6.3) eslint-plugin-n: 17.11.1(eslint@9.12.0) - eslint-plugin-sukka: 6.7.0(eslint@9.12.0)(typescript@5.6.3) + eslint-plugin-sukka: 6.8.0(eslint@9.12.0)(typescript@5.6.3) transitivePeerDependencies: - eslint - supports-color - typescript - '@eslint-sukka/shared@6.7.0(eslint@9.12.0)(typescript@5.6.3)': + '@eslint-sukka/shared@6.8.0(eslint@9.12.0)(typescript@5.6.3)': dependencies: '@dual-bundle/import-meta-resolve': 4.1.0 '@package-json/types': 0.0.11 '@types/eslint': 9.6.1 - '@typescript-eslint/utils': 8.8.1(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/utils': 8.9.0(eslint@9.12.0)(typescript@5.6.3) transitivePeerDependencies: - eslint - supports-color @@ -2070,6 +2076,23 @@ snapshots: dependencies: levn: 0.4.1 + '@ghostery/adblocker-content@2.0.0': + dependencies: + '@ghostery/adblocker-extended-selectors': 2.0.0 + + '@ghostery/adblocker-extended-selectors@2.0.0': {} + + '@ghostery/adblocker@2.0.0': + dependencies: + '@ghostery/adblocker-content': 2.0.0 + '@ghostery/adblocker-extended-selectors': 2.0.0 + '@remusao/guess-url-type': 1.3.0 + '@remusao/small': 1.3.0 + '@remusao/smaz': 1.10.0 + '@types/chrome': 0.0.278 + '@types/firefox-webext-browser': 120.0.4 + tldts-experimental: 6.1.52 + '@humanfs/core@0.19.0': {} '@humanfs/node@0.16.5': @@ -2210,17 +2233,17 @@ snapshots: '@sinclair/typebox@0.27.8': {} - '@stylistic/eslint-plugin-js@2.8.0(eslint@9.12.0)': + '@stylistic/eslint-plugin-js@2.9.0(eslint@9.12.0)': dependencies: eslint: 9.12.0 eslint-visitor-keys: 4.1.0 espree: 10.2.0 - '@stylistic/eslint-plugin-plus@2.8.0(eslint@9.12.0)': + '@stylistic/eslint-plugin-plus@2.9.0(eslint@9.12.0)': dependencies: eslint: 9.12.0 - '@stylistic/eslint-plugin-ts@2.8.0(eslint@9.12.0)(typescript@5.6.3)': + '@stylistic/eslint-plugin-ts@2.9.0(eslint@9.12.0)(typescript@5.6.3)': dependencies: '@typescript-eslint/utils': 8.8.1(eslint@9.12.0)(typescript@5.6.3) eslint: 9.12.0 @@ -2396,14 +2419,14 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 - '@typescript-eslint/eslint-plugin@8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3)': + '@typescript-eslint/eslint-plugin@8.9.0(@typescript-eslint/parser@8.9.0(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.8.1(eslint@9.12.0)(typescript@5.6.3) - '@typescript-eslint/scope-manager': 8.8.1 - '@typescript-eslint/type-utils': 8.8.1(eslint@9.12.0)(typescript@5.6.3) - '@typescript-eslint/utils': 8.8.1(eslint@9.12.0)(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.8.1 + '@typescript-eslint/parser': 8.9.0(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/scope-manager': 8.9.0 + '@typescript-eslint/type-utils': 8.9.0(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/utils': 8.9.0(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/visitor-keys': 8.9.0 eslint: 9.12.0 graphemer: 1.4.0 ignore: 5.3.2 @@ -2414,12 +2437,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.7.0(eslint@9.12.0)(typescript@5.6.3)': + '@typescript-eslint/parser@8.9.0(eslint@9.12.0)(typescript@5.6.3)': dependencies: - '@typescript-eslint/scope-manager': 8.7.0 - '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.7.0 + '@typescript-eslint/scope-manager': 8.9.0 + '@typescript-eslint/types': 8.9.0 + '@typescript-eslint/typescript-estree': 8.9.0(typescript@5.6.3) + '@typescript-eslint/visitor-keys': 8.9.0 debug: 4.3.7(supports-color@8.1.1) eslint: 9.12.0 optionalDependencies: @@ -2427,33 +2450,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.8.1(eslint@9.12.0)(typescript@5.6.3)': - dependencies: - '@typescript-eslint/scope-manager': 8.8.1 - '@typescript-eslint/types': 8.8.1 - '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.8.1 - debug: 4.3.7(supports-color@8.1.1) - eslint: 9.12.0 - optionalDependencies: - typescript: 5.6.3 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/scope-manager@8.7.0': - dependencies: - '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/visitor-keys': 8.7.0 - '@typescript-eslint/scope-manager@8.8.1': dependencies: '@typescript-eslint/types': 8.8.1 '@typescript-eslint/visitor-keys': 8.8.1 - '@typescript-eslint/type-utils@8.8.1(eslint@9.12.0)(typescript@5.6.3)': + '@typescript-eslint/scope-manager@8.9.0': dependencies: - '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.3) - '@typescript-eslint/utils': 8.8.1(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/types': 8.9.0 + '@typescript-eslint/visitor-keys': 8.9.0 + + '@typescript-eslint/type-utils@8.9.0(eslint@9.12.0)(typescript@5.6.3)': + dependencies: + '@typescript-eslint/typescript-estree': 8.9.0(typescript@5.6.3) + '@typescript-eslint/utils': 8.9.0(eslint@9.12.0)(typescript@5.6.3) debug: 4.3.7(supports-color@8.1.1) ts-api-utils: 1.3.0(typescript@5.6.3) optionalDependencies: @@ -2462,14 +2472,14 @@ snapshots: - eslint - supports-color - '@typescript-eslint/types@8.7.0': {} - '@typescript-eslint/types@8.8.1': {} - '@typescript-eslint/typescript-estree@8.7.0(typescript@5.6.3)': + '@typescript-eslint/types@8.9.0': {} + + '@typescript-eslint/typescript-estree@8.8.1(typescript@5.6.3)': dependencies: - '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/visitor-keys': 8.7.0 + '@typescript-eslint/types': 8.8.1 + '@typescript-eslint/visitor-keys': 8.8.1 debug: 4.3.7(supports-color@8.1.1) fast-glob: 3.3.2 is-glob: 4.0.3 @@ -2481,10 +2491,10 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@8.8.1(typescript@5.6.3)': + '@typescript-eslint/typescript-estree@8.9.0(typescript@5.6.3)': dependencies: - '@typescript-eslint/types': 8.8.1 - '@typescript-eslint/visitor-keys': 8.8.1 + '@typescript-eslint/types': 8.9.0 + '@typescript-eslint/visitor-keys': 8.9.0 debug: 4.3.7(supports-color@8.1.1) fast-glob: 3.3.2 is-glob: 4.0.3 @@ -2507,16 +2517,27 @@ snapshots: - supports-color - typescript - '@typescript-eslint/visitor-keys@8.7.0': + '@typescript-eslint/utils@8.9.0(eslint@9.12.0)(typescript@5.6.3)': dependencies: - '@typescript-eslint/types': 8.7.0 - eslint-visitor-keys: 3.4.3 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0) + '@typescript-eslint/scope-manager': 8.9.0 + '@typescript-eslint/types': 8.9.0 + '@typescript-eslint/typescript-estree': 8.9.0(typescript@5.6.3) + eslint: 9.12.0 + transitivePeerDependencies: + - supports-color + - typescript '@typescript-eslint/visitor-keys@8.8.1': dependencies: '@typescript-eslint/types': 8.8.1 eslint-visitor-keys: 3.4.3 + '@typescript-eslint/visitor-keys@8.9.0': + dependencies: + '@typescript-eslint/types': 8.9.0 + eslint-visitor-keys: 3.4.3 + acorn-jsx@5.3.2(acorn@8.12.1): dependencies: acorn: 8.12.1 @@ -2593,6 +2614,8 @@ snapshots: streamx: 2.20.0 optional: true + base64-arraybuffer-es6@3.1.0: {} + base64-js@1.5.1: {} better-sqlite3@11.3.0: @@ -2801,36 +2824,36 @@ snapshots: eslint: 9.12.0 semver: 7.6.3 - eslint-config-sukka@6.7.0(@typescript-eslint/eslint-plugin@8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3): + eslint-config-sukka@6.8.0(@typescript-eslint/eslint-plugin@8.9.0(@typescript-eslint/parser@8.9.0(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3): dependencies: '@eslint-community/eslint-plugin-eslint-comments': 4.4.0(eslint@9.12.0) - '@eslint-sukka/shared': 6.7.0(eslint@9.12.0)(typescript@5.6.3) + '@eslint-sukka/shared': 6.8.0(eslint@9.12.0)(typescript@5.6.3) '@eslint/js': 9.12.0 - '@stylistic/eslint-plugin-js': 2.8.0(eslint@9.12.0) - '@stylistic/eslint-plugin-plus': 2.8.0(eslint@9.12.0) - '@stylistic/eslint-plugin-ts': 2.8.0(eslint@9.12.0)(typescript@5.6.3) - '@typescript-eslint/parser': 8.7.0(eslint@9.12.0)(typescript@5.6.3) + '@stylistic/eslint-plugin-js': 2.9.0(eslint@9.12.0) + '@stylistic/eslint-plugin-plus': 2.9.0(eslint@9.12.0) + '@stylistic/eslint-plugin-ts': 2.9.0(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/parser': 8.9.0(eslint@9.12.0)(typescript@5.6.3) ci-info: 4.0.0 defu: 6.1.4 - eslint-import-resolver-ts-bundled: 6.7.0 + eslint-import-resolver-ts-bundled: 6.8.0 eslint-plugin-antfu: 2.7.0(eslint@9.12.0) eslint-plugin-autofix: 2.2.0(eslint@9.12.0) eslint-plugin-import-x: 4.3.1(eslint@9.12.0)(typescript@5.6.3) eslint-plugin-jsonc: 2.16.0(eslint@9.12.0) eslint-plugin-promise: 7.1.0(eslint@9.12.0) eslint-plugin-regexp: 2.6.0(eslint@9.12.0) - eslint-plugin-sukka: 6.7.0(eslint@9.12.0)(typescript@5.6.3) - eslint-plugin-unused-imports: 4.1.4(@typescript-eslint/eslint-plugin@8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0) + eslint-plugin-sukka: 6.8.0(eslint@9.12.0)(typescript@5.6.3) + eslint-plugin-unused-imports: 4.1.4(@typescript-eslint/eslint-plugin@8.9.0(@typescript-eslint/parser@8.9.0(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0) jsonc-eslint-parser: 2.4.0 picocolors: 1.1.1 - typescript-eslint: 8.8.1(eslint@9.12.0)(typescript@5.6.3) + typescript-eslint: 8.9.0(eslint@9.12.0)(typescript@5.6.3) transitivePeerDependencies: - '@typescript-eslint/eslint-plugin' - eslint - supports-color - typescript - eslint-formatter-sukka@6.7.0: + eslint-formatter-sukka@6.8.0: dependencies: ci-info: 4.0.0 picocolors: 1.1.1 @@ -2843,7 +2866,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-ts-bundled@6.7.0: + eslint-import-resolver-ts-bundled@6.8.0: dependencies: enhanced-resolve: 5.17.1 @@ -2922,22 +2945,22 @@ snapshots: regexp-ast-analysis: 0.7.1 scslre: 0.3.0 - eslint-plugin-sukka@6.7.0(eslint@9.12.0)(typescript@5.6.3): + eslint-plugin-sukka@6.8.0(eslint@9.12.0)(typescript@5.6.3): dependencies: - '@eslint-sukka/shared': 6.7.0(eslint@9.12.0)(typescript@5.6.3) - '@typescript-eslint/type-utils': 8.8.1(eslint@9.12.0)(typescript@5.6.3) - '@typescript-eslint/utils': 8.8.1(eslint@9.12.0)(typescript@5.6.3) + '@eslint-sukka/shared': 6.8.0(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/type-utils': 8.9.0(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/utils': 8.9.0(eslint@9.12.0)(typescript@5.6.3) optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: - eslint - supports-color - eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0): + eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.9.0(@typescript-eslint/parser@8.9.0(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0): dependencies: eslint: 9.12.0 optionalDependencies: - '@typescript-eslint/eslint-plugin': 8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/eslint-plugin': 8.9.0(@typescript-eslint/parser@8.9.0(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3) eslint-rule-composer@0.3.0: {} @@ -3794,6 +3817,10 @@ snapshots: dependencies: is-number: 7.0.0 + tr46@5.0.0: + dependencies: + punycode: 2.3.1 + ts-api-utils@1.3.0(typescript@5.6.3): dependencies: typescript: 5.6.3 @@ -3810,11 +3837,11 @@ snapshots: type-detect@4.0.8: {} - typescript-eslint@8.8.1(eslint@9.12.0)(typescript@5.6.3): + typescript-eslint@8.9.0(eslint@9.12.0)(typescript@5.6.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3) - '@typescript-eslint/parser': 8.8.1(eslint@9.12.0)(typescript@5.6.3) - '@typescript-eslint/utils': 8.8.1(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/eslint-plugin': 8.9.0(@typescript-eslint/parser@8.9.0(eslint@9.12.0)(typescript@5.6.3))(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/parser': 8.9.0(eslint@9.12.0)(typescript@5.6.3) + '@typescript-eslint/utils': 8.9.0(eslint@9.12.0)(typescript@5.6.3) optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: @@ -3823,6 +3850,14 @@ snapshots: typescript@5.6.3: {} + typeson-registry@11.1.1: + dependencies: + base64-arraybuffer-es6: 3.1.0 + typeson: 9.0.3 + whatwg-url: 14.0.0 + + typeson@9.0.3: {} + undici-types@6.19.8: {} undici@6.20.1(patch_hash=yuj5uy4vvwj67xoliq5togiyme): {} @@ -3841,6 +3876,13 @@ snapshots: util-deprecate@1.0.2: {} + webidl-conversions@7.0.0: {} + + whatwg-url@14.0.0: + dependencies: + tr46: 5.0.0 + webidl-conversions: 7.0.0 + which@2.0.2: dependencies: isexe: 2.0.0