diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3bbd0c8b..2abcca06 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,6 +9,9 @@ name: Test on: push: + branches-ignore: + # don't double-build dependabot PRs + - dependabot/** pull_request: workflow_dispatch: diff --git a/bin/configurable-http-proxy b/bin/configurable-http-proxy index 18b607f2..45be175d 100755 --- a/bin/configurable-http-proxy +++ b/bin/configurable-http-proxy @@ -9,11 +9,11 @@ var fs = require("fs"), pkg = require("../package.json"), - args = require("commander"), + cli = require("commander"), tls = require("tls"), winston = require("winston"); -args +cli .version(pkg.version) .option("--ip ", "Public-facing IP of the proxy") .option("--port (defaults to 8000)", "Public-facing port of the proxy", parseInt) @@ -117,7 +117,8 @@ function collectHeadersIntoObject(value, previous) { previous[headerParts[0]] = headerParts[1]; } -args.parse(process.argv); +cli.parse(process.argv); +var args = cli.opts(); var ConfigurableProxy = require("../lib/configproxy.js").ConfigurableProxy; diff --git a/package-lock.json b/package-lock.json index ca82f1bd..b8c9a518 100644 --- a/package-lock.json +++ b/package-lock.json @@ -519,9 +519,9 @@ } }, "commander": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", + "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==" }, "commondir": { "version": "1.0.1", diff --git a/package.json b/package.json index a7278802..3d1e7128 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "url": "https://github.com/jupyterhub/configurable-http-proxy.git" }, "dependencies": { - "commander": "~6.2.0", + "commander": "~7.1.0", "http-proxy": "^1.18.1", "lynx": "^0.2.0", "strftime": "~0.10.0",