Reverses to previous versions of dependencies

scripts/commands/channels/lint.mts

@@ -1,4 +1,5 @@
-import { XmlDocument, XsdValidator, XmlValidateError, ErrorDetail } from 'libxml2-wasm'
+import { XmlDocument, XsdValidator, XmlValidateError } from 'libxml2-wasm'
+import type { ErrorDetail } from 'libxml2-wasm'
 import { Storage, File } from '@freearhey/storage-js'
 import { program } from 'commander'
 import chalk from 'chalk'

scripts/commands/channels/parse.ts

@@ -1,8 +1,7 @@
 import { Storage, File } from '@freearhey/storage-js'
 import { Collection, Logger } from '@freearhey/core'
 import epgGrabber, { EPGGrabber } from 'epg-grabber'
-import { generateChannelsXML } from '../../core'
-import { pathToFileURL } from 'node:url'
+import { generateChannelsXML, loadJs } from '../../core'
 import { Channel } from '../../models'
 import { Command } from 'commander'
 
@@ -45,7 +44,7 @@ async function main() {
   const logger = new Logger()
   const file = new File(options.config)
   const dir = file.dirname()
-  const config = (await import(pathToFileURL(options.config).toString())).default
+  const config = await loadJs(options.config)
   const outputFilepath = options.output || `${dir}/${config.site}.channels.xml`
 
   const args: Record<string, string> = {}

scripts/core/utils.ts

@@ -5,9 +5,9 @@ import { Collection } from '@freearhey/core'
 import { Channel } from '../models/channel'
 import { AxiosProxyConfig } from 'axios'
 import { Octokit } from '@octokit/core'
-import { pathToFileURL } from 'url'
 import { Issue } from '../models'
-import { URL } from 'node:url'
+import { URL, fileURLToPath } from 'node:url'
+import path from 'node:path'
 
 export function generateChannelsXML(channels: Collection<Channel>): string {
   let output = `<?xml version="1.0" encoding="UTF-8"?>${EOL}<channels>${EOL}`
@@ -33,13 +33,13 @@ export function escapeString(value: string, defaultValue = '') {
 
   const regex = new RegExp(
     '((?:[\0-\x08\x0B\f\x0E-\x1F\uFFFD\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]))|([\\x7F-\\x84]|[\\x86-\\x9F]|[\\uFDD0-\\uFDEF]|(?:\\uD83F[\\uDFFE\\uDFFF])|(?:\\uD87F[\\uDF' +
-      'FE\\uDFFF])|(?:\\uD8BF[\\uDFFE\\uDFFF])|(?:\\uD8FF[\\uDFFE\\uDFFF])|(?:\\uD93F[\\uDFFE\\uD' +
-      'FFF])|(?:\\uD97F[\\uDFFE\\uDFFF])|(?:\\uD9BF[\\uDFFE\\uDFFF])|(?:\\uD9FF[\\uDFFE\\uDFFF])' +
-      '|(?:\\uDA3F[\\uDFFE\\uDFFF])|(?:\\uDA7F[\\uDFFE\\uDFFF])|(?:\\uDABF[\\uDFFE\\uDFFF])|(?:\\' +
-      'uDAFF[\\uDFFE\\uDFFF])|(?:\\uDB3F[\\uDFFE\\uDFFF])|(?:\\uDB7F[\\uDFFE\\uDFFF])|(?:\\uDBBF' +
-      '[\\uDFFE\\uDFFF])|(?:\\uDBFF[\\uDFFE\\uDFFF])(?:[\\0-\\t\\x0B\\f\\x0E-\\u2027\\u202A-\\uD7FF\\' +
-      'uE000-\\uFFFF]|[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|' +
-      '(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF]))',
+    'FE\\uDFFF])|(?:\\uD8BF[\\uDFFE\\uDFFF])|(?:\\uD8FF[\\uDFFE\\uDFFF])|(?:\\uD93F[\\uDFFE\\uD' +
+    'FFF])|(?:\\uD97F[\\uDFFE\\uDFFF])|(?:\\uD9BF[\\uDFFE\\uDFFF])|(?:\\uD9FF[\\uDFFE\\uDFFF])' +
+    '|(?:\\uDA3F[\\uDFFE\\uDFFF])|(?:\\uDA7F[\\uDFFE\\uDFFF])|(?:\\uDABF[\\uDFFE\\uDFFF])|(?:\\' +
+    'uDAFF[\\uDFFE\\uDFFF])|(?:\\uDB3F[\\uDFFE\\uDFFF])|(?:\\uDB7F[\\uDFFE\\uDFFF])|(?:\\uDBBF' +
+    '[\\uDFFE\\uDFFF])|(?:\\uDBFF[\\uDFFE\\uDFFF])(?:[\\0-\\t\\x0B\\f\\x0E-\\u2027\\u202A-\\uD7FF\\' +
+    'uE000-\\uFFFF]|[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|' +
+    '(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF]))',
     'g'
   )
 
@@ -73,9 +73,13 @@ export function parseProxy(string: string): AxiosProxyConfig {
 }
 
 export async function loadJs(filepath: string) {
-  const fileUrl = pathToFileURL(filepath).toString()
+  const resolvedPath = filepath.startsWith('file://')
+    ? fileURLToPath(filepath)
+    : path.resolve(filepath)
 
-  return (await import(fileUrl)).default
+  const mod = require(resolvedPath)
+
+  return mod.default || mod
 }
 
 export async function loadIssues(props?: { labels: string[] | string }) {