From c91bef47b4244eeb063403ddc451da9c51c5163e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Jun 2023 18:26:26 +0000 Subject: [PATCH 1/2] [NPM] Bump yargs and @types/yargs Bumps [yargs](https://github.com/yargs/yargs) and [@types/yargs](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/yargs). These dependencies needed to be updated together. Updates `yargs` from 15.4.1 to 17.7.2 - [Release notes](https://github.com/yargs/yargs/releases) - [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md) - [Commits](https://github.com/yargs/yargs/compare/v15.4.1...v17.7.2) Updates `@types/yargs` from 15.0.15 to 17.0.24 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/yargs) --- updated-dependencies: - dependency-name: yargs dependency-type: direct:production update-type: version-update:semver-major - dependency-name: "@types/yargs" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 4 ++-- yarn.lock | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 6928844b..b1814e01 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "xterm-addon-fit": "^0.6.0", "xterm-addon-image": "^0.2.0", "xterm-addon-web-links": "^0.8.0", - "yargs": "^15.4.1" + "yargs": "^17.7.2" }, "devDependencies": { "@snowpack/plugin-run-script": "^2.3.0", @@ -143,7 +143,7 @@ "@types/response-time": "^2", "@types/sinon": "^10.0.13", "@types/toastify-js": "^1.9.2", - "@types/yargs": "^15.0.5", + "@types/yargs": "^17.0.24", "@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/parser": "^5.59.9", "all-contributors-cli": "^6.17.2", diff --git a/yarn.lock b/yarn.lock index fc1911fc..2dbcfe2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -759,10 +759,10 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== -"@types/yargs@^15.0.5": - version "15.0.15" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.15.tgz#e609a2b1ef9e05d90489c2f5f45bbfb2be092158" - integrity sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg== +"@types/yargs@^17.0.24": + version "17.0.24" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902" + integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw== dependencies: "@types/yargs-parser" "*" @@ -1595,6 +1595,15 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-response@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" @@ -7096,6 +7105,11 @@ yargs-parser@^20.0.0, yargs-parser@^20.2.2: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== +yargs-parser@^21.1.1: + version "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-unparser@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" @@ -7135,7 +7149,7 @@ yargs@^13.3.0: y18n "^4.0.0" yargs-parser "^13.1.2" -yargs@^15.0.1, yargs@^15.4.1: +yargs@^15.0.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== @@ -7152,6 +7166,19 @@ yargs@^15.0.1, yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" +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" + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 118664d077728e3ca4a4eac0144b4d79ec4015c1 Mon Sep 17 00:00:00 2001 From: Cian Butler Date: Sat, 10 Jun 2023 19:42:16 +0100 Subject: [PATCH 2/2] Bumps for yargs 17 --- .eslintrc.cjs | 2 +- .github/workflows/docker.workflow.yml | 2 -- src/main.ts | 10 ++++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 3d4d91f7..6d2858b1 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -17,7 +17,7 @@ module.exports = { 'func-style': ['error', 'declaration', { allowArrowFunctions: true }], 'import/extensions': [ 'error', - 'always', + 'ignorePackages', { ts: 'never', js: 'ignorePackages', diff --git a/.github/workflows/docker.workflow.yml b/.github/workflows/docker.workflow.yml index e78d98f0..8b4c0306 100644 --- a/.github/workflows/docker.workflow.yml +++ b/.github/workflows/docker.workflow.yml @@ -11,9 +11,7 @@ on: default: false secrets: DOCKERHUB_USERNAME: - required: true DOCKERHUB_TOKEN: - required: true jobs: docker: runs-on: ubuntu-latest diff --git a/src/main.ts b/src/main.ts index 32c430df..77fd6136 100644 --- a/src/main.ts +++ b/src/main.ts @@ -8,6 +8,7 @@ */ import { createRequire } from 'module'; import yargs from 'yargs'; +import { hideBin } from 'yargs/helpers'; import { start } from './server.js'; import { loadConfigFile, mergeCliConf } from './shared/config.js'; import { setLevel, logger } from './shared/logger.js'; @@ -16,7 +17,7 @@ import { setLevel, logger } from './shared/logger.js'; const require = createRequire(import.meta.url); const packageJson = require('../package.json'); -const opts = yargs +const opts = yargs(hideBin(process.argv)) .scriptName(packageJson.name) .version(packageJson.version) .options('conf', { @@ -113,12 +114,13 @@ const opts = yargs type: 'boolean', description: 'Print help message', }) - .boolean('allow_discovery').argv; + .boolean('allow_discovery') + .parseSync(); if (!opts.help) { loadConfigFile(opts.conf) - .then(config => mergeCliConf(opts, config)) - .then(conf => { + .then((config) => mergeCliConf(opts, config)) + .then((conf) => { setLevel(conf.logLevel); start(conf.ssh, conf.server, conf.command, conf.forceSSH, conf.ssl); })