diff --git a/package.json b/package.json index c5558ad..a8be6a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "warcio", - "version": "2.4.0-beta.1", + "version": "2.4.0-beta.2", "keywords": [ "WARC", "web archiving" @@ -58,12 +58,11 @@ "pako": "^1.0.11", "tempy": "^3.1.0", "uuid-random": "^1.3.2", - "yargs": "^17.6.2" + "yargs": "^17.7.2" }, "devDependencies": { "@types/jest": "^29.2.3", "@types/node": "^18.11.9", - "@types/yargs": "^17.0.17", "@typescript-eslint/eslint-plugin": "^8.2.0", "@typescript-eslint/parser": "^8.2.0", "cross-fetch": "^4.0.0", diff --git a/src/commands/args.ts b/src/commands/args.ts index 057d0fe..5ed36fb 100644 --- a/src/commands/args.ts +++ b/src/commands/args.ts @@ -1,11 +1,11 @@ import { DEFAULT_CDX_FIELDS, DEFAULT_FIELDS } from "../lib/indexer"; -import type yargs from "yargs"; +import { type Argv } from "yargs"; const coerce = (array: string[]): string[] => { return array.flatMap((v) => v.split(",")).filter((x) => !!x); }; -export const indexCommandArgs = (yarg: yargs.Argv) => { +export const indexCommandArgs = (yarg: Argv) => { return yarg .positional("filenames", { describe: "WARC file(s) to index", @@ -26,7 +26,7 @@ export type IndexCommandArgs = Awaited< ReturnType["argv"] >; -export const cdxIndexCommandArgs = (yarg: yargs.Argv) => { +export const cdxIndexCommandArgs = (yarg: Argv) => { return yarg .positional("filenames", { describe: "WARC file(s) to index", diff --git a/yarn.lock b/yarn.lock index 14a72af..3e40554 100644 --- a/yarn.lock +++ b/yarn.lock @@ -870,7 +870,7 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== -"@types/yargs@^17.0.17", "@types/yargs@^17.0.8": +"@types/yargs@^17.0.8": version "17.0.17" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.17.tgz#5672e5621f8e0fca13f433a8017aae4b7a2a03e7" integrity sha512-72bWxFKTK6uwWJAVT+3rF6Jo6RTojiJ27FQo8Rf60AL+VZbzoVPnMFhKsUnbjR8A3BTCYQ7Mv3hnl8T0A+CX9g== @@ -3301,7 +3301,7 @@ yargs-parser@^21.0.1, yargs-parser@^21.1.1: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.3.1, yargs@^17.6.2: +yargs@^17.3.1: version "17.6.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== @@ -3314,6 +3314,19 @@ yargs@^17.3.1, yargs@^17.6.2: y18n "^5.0.5" yargs-parser "^21.1.1" +yargs@^17.7.2: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"