Skip to content

Commit cfa6ff3

Browse files
committed
chore: remove cache.ts
1 parent 23f58f1 commit cfa6ff3

5 files changed

Lines changed: 3 additions & 91 deletions

File tree

builder/source/build.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import * as Zod from 'zod'
33
import * as Process from 'node:process'
44
import * as TLDTS from 'tldts'
55
import PackageJson from '@npmcli/package-json'
6-
import { LoadDomainsFromCache } from './cache.js'
76
import { FetchAdShieldDomains } from './references/index.js'
87
import { CustomDefinedMatches } from './references/custom-defined.js'
98
import { ConvertWildcardSuffixToRegexPattern } from './utils/wildcard-suffix-converter.js'
@@ -12,7 +11,6 @@ import { SafeInitCwd } from './utils/safe-init-cwd.js'
1211

1312
export type BuildOptions = {
1413
Minify: boolean
15-
UseCache: boolean
1614
BuildType: 'production' | 'development',
1715
SubscriptionUrl: string,
1816
Version?: string
@@ -21,18 +19,13 @@ export type BuildOptions = {
2119
export async function Build(OptionsParam?: BuildOptions): Promise<void> {
2220
const Options = await Zod.strictObject({
2321
Minify: Zod.boolean(),
24-
UseCache: Zod.boolean(),
2522
BuildType: Zod.enum(['production', 'development']),
2623
SubscriptionUrl: Zod.string().transform(Value => new URL(Value)).default(new URL('https://cdn.jsdelivr.net/npm/@filteringdev/tinyshield@latest/dist/tinyShield.user.js')),
2724
Version: Zod.string().optional()
2825
}).parseAsync(OptionsParam)
2926

3027
let MatchingDomains: Set<string> = new Set<string>()
31-
if (Options.UseCache) {
32-
MatchingDomains = await LoadDomainsFromCache()
33-
} else {
34-
MatchingDomains = await FetchAdShieldDomains()
35-
}
28+
MatchingDomains = await FetchAdShieldDomains()
3629
CustomDefinedMatches.forEach(Domain => MatchingDomains.add(Domain))
3730

3831
MatchingDomains = new Set<string>([...MatchingDomains].map(Domain => TLDTS.parse(Domain).domain ?? Domain).filter((D): D is string => D !== null))

builder/source/buildci.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { Build, BuildOptions } from './build.js'
66
let ParsedArgv = (await ParseArgumentsAndOptions<BuildOptions>(FilterArgumentsForOptions(Process.argv))).Options
77
let Options = await Zod.strictObject({
88
Minify: Zod.string().pipe(Zod.enum(['true', 'false'])).transform(Value => Value === 'true').default(true),
9-
UseCache: Zod.string().pipe(Zod.enum(['true', 'false'])).transform(Value => Value === 'true').default(true),
109
BuildType: Zod.enum(['production', 'development']),
1110
SubscriptionUrl: Zod.string()
1211
}).parseAsync(ParsedArgv)

builder/source/cache.ts

Lines changed: 0 additions & 80 deletions
This file was deleted.

builder/source/debug.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Watcher.on('all', async (WatcherEvent, WatcherPath) => {
2828
BuildCooldownTimer = setTimeout(async () => {
2929
console.log(`Detected file change (${WatcherEvent}):`, WatcherPath)
3030
ShouldPreventHTTPResponse = true
31-
await Build({ Version: `0.0.${Version}`, Minify: false, UseCache: true, BuildType: 'development', SubscriptionUrl: `http://localhost:${RandomPort}/tinyShield.dev.user.js` })
31+
await Build({ Version: `0.0.${Version}`, Minify: false, BuildType: 'development', SubscriptionUrl: `http://localhost:${RandomPort}/tinyShield.dev.user.js` })
3232
Version++
3333
ShouldPreventHTTPResponse = false
3434
}, 1500)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build:interface": "tsc -p userscript/tsconfig.json",
8-
"build:userscript": "npm run build -w builder -- --minify true --use-cache false --build-type production --SubscriptionUrl https://cdn.jsdelivr.net/npm/@filteringdev/tinyshield@latest/dist/tinyShield.user.js",
8+
"build:userscript": "npm run build -w builder -- --minify true --build-type production --SubscriptionUrl https://cdn.jsdelivr.net/npm/@filteringdev/tinyshield@latest/dist/tinyShield.user.js",
99
"build": "npm run build:interface && npm run build:userscript",
1010
"debug": "npm run debug -w builder",
1111
"lint": "npm run lint -w builder && npm run lint -w userscript"

0 commit comments

Comments
 (0)