fix: chokidar does not built-in glob support

Author: piquark6046

builder/source/build.ts

@@ -13,15 +13,17 @@ export type BuildOptions = {
   Minify: boolean
   UseCache: boolean
   BuildType: 'production' | 'development',
-  SubscriptionUrl: string
+  SubscriptionUrl: string,
+  Version?: string
 }
 
 export async function Build(OptionsParam?: BuildOptions): Promise<void> {
   const Options = await Zod.strictObject({
     Minify: Zod.boolean(),
     UseCache: Zod.boolean(),
     BuildType: Zod.enum(['production', 'development']),
-    SubscriptionUrl: Zod.string().transform(Value => new URL(Value)).default(new URL('https://cdn.jsdelivr.net/npm/@filteringdev/tinyshield@latest/dist/tinyShield.user.js'))
+    SubscriptionUrl: Zod.string().transform(Value => new URL(Value)).default(new URL('https://cdn.jsdelivr.net/npm/@filteringdev/tinyshield@latest/dist/tinyShield.user.js')),
+    Version: Zod.string().optional()
   }).parseAsync(OptionsParam)
 
   let MatchingDomains: Set<string> = new Set<string>()
@@ -46,7 +48,7 @@ export async function Build(OptionsParam?: BuildOptions): Promise<void> {
   }
 
   const Banner = CreateBanner({
-    Version: (await PackageJson.load(ProjectRoot)).content.version ?? '0.0.0',
+    Version: Options.Version ?? (await PackageJson.load(ProjectRoot)).content.version ?? '0.0.0',
     BuildType: Options.BuildType ?? 'production',
     Domains: MatchingDomains,
     Name: 'tinyShield',

builder/source/debug.ts

@@ -2,6 +2,7 @@
 import * as Chokidar from 'chokidar'
 import * as Process from 'node:process'
 import * as Crypto from 'node:crypto'
+import * as Fs from 'node:fs'
 import { RunDebugServer } from './utils/http-server.js'
 import { Build } from './build.js'
 
@@ -11,31 +12,28 @@ if (Process.cwd().endsWith('/builder')) {
 }
 const WatchingGlob = [];
 ['builder/', 'userscript/', ''].forEach(Dir => {
-  WatchingGlob.push(`${ProjectRoot}/${Dir}sources/**/*.ts`)
-  WatchingGlob.push(`${ProjectRoot}/${Dir}sources/**/*.json`)
-  WatchingGlob.push(`${ProjectRoot}/${Dir}sources/**/*.txt`)
+  WatchingGlob.push(...Fs.globSync(`${ProjectRoot}/${Dir}source/**/*.ts`))
+  WatchingGlob.push(...Fs.globSync(`${ProjectRoot}/${Dir}source/**/*.json`))
+  WatchingGlob.push(...Fs.globSync(`${ProjectRoot}/${Dir}source/**/*.txt`))
 })
-const Watcher = Chokidar.watch([
-  `${ProjectRoot}/sources/**/*.ts`,
-  `${ProjectRoot}/sources/**/*.json`
-], {
-  cwd: ProjectRoot,
+const Watcher = Chokidar.watch([...WatchingGlob], {
   ignored: '**/node_modules/**',
 })
 
 let BuildCooldownTimer: NodeJS.Timeout = null
 let ShouldPreventHTTPResponse = false
-Watcher.on('all', (WatcherEvent, WatcherPath) => {
+let Version: number = 0
+Watcher.on('all', async (WatcherEvent, WatcherPath) => {
   clearTimeout(BuildCooldownTimer)
   BuildCooldownTimer = setTimeout(async () => {
     console.log(`Detected file change (${WatcherEvent}):`, WatcherPath)
     ShouldPreventHTTPResponse = true
-    await Build({ Minify: false, UseCache: true, BuildType: 'development', SubscriptionUrl: `http://localhost:${RandomPort}/tinyShield.dev.user.js` })
+    await Build({ Version: `0.0.${Version}`, Minify: false, UseCache: true, BuildType: 'development', SubscriptionUrl: `http://localhost:${RandomPort}/tinyShield.dev.user.js` })
+    Version++
     ShouldPreventHTTPResponse = false
   }, 1500)
 })
 
 let RandomPort = Crypto.randomInt(8000, 8999)
-await Build({ Minify: false, UseCache: true, BuildType: 'development', SubscriptionUrl: `http://localhost:${RandomPort}/tinyShield.dev.user.js` })
 RunDebugServer(RandomPort, ['tinyShield.dev.user.js'], ShouldPreventHTTPResponse)
 console.log(`Debug HTTP server running on http://localhost:${RandomPort}/tinyShield.dev.user.js`)