From 8887c5522166caa0c1d62b7b6d517822e4109ebc Mon Sep 17 00:00:00 2001 From: Honza Javorek Date: Wed, 13 Mar 2019 18:01:39 +0100 Subject: [PATCH 1/2] refactor: require options where they're used BREAKING CHANGE: Dredd's public JavaScript interface doesn't provide the CLI options definitions in the undocumented 'Dredd.options' property anymore. There is no replacement. The CLI options definitions are internal to Dredd. --- lib/CLI.js | 4 +++- lib/Dredd.js | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/CLI.js b/lib/CLI.js index 2372d2ecc..95199e8ba 100644 --- a/lib/CLI.js +++ b/lib/CLI.js @@ -13,8 +13,10 @@ const logger = require('./logger'); const { applyLoggingOptions } = require('./configuration'); const { spawn } = require('./childProcess'); +const dreddOptions = require('./options.json'); const packageData = require('../package.json'); + class CLI { constructor(options = {}, cb) { this.cb = cb; @@ -47,7 +49,7 @@ Or: Example: $ dredd ./api-description.apib http://127.0.0.1:3000 --dry-run\ `) - .options(Dredd.options) + .options(dreddOptions) .wrap(80); this.argv = this.optimist.argv; diff --git a/lib/Dredd.js b/lib/Dredd.js index 5079fc4f9..9fdeaa7fa 100644 --- a/lib/Dredd.js +++ b/lib/Dredd.js @@ -13,7 +13,6 @@ const resolveLocations = require('./resolveLocations'); const logger = require('./logger'); const Runner = require('./TransactionRunner'); const { applyConfiguration } = require('./configuration'); -const options = require('./options.json'); const PROXY_ENV_VARIABLES = ['HTTP_PROXY', 'HTTPS_PROXY', 'NO_PROXY']; @@ -250,5 +249,5 @@ Is the provided path correct? } } + module.exports = Dredd; -module.exports.options = options; From 6617222e4abc6897860ea710143c4cec61298fce Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Thu, 28 Mar 2019 12:23:14 +0100 Subject: [PATCH 2/2] style: omit the .json extension in require Co-Authored-By: honzajavorek --- lib/CLI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/CLI.js b/lib/CLI.js index 95199e8ba..7aa5cf41b 100644 --- a/lib/CLI.js +++ b/lib/CLI.js @@ -13,7 +13,7 @@ const logger = require('./logger'); const { applyLoggingOptions } = require('./configuration'); const { spawn } = require('./childProcess'); -const dreddOptions = require('./options.json'); +const dreddOptions = require('./options'); const packageData = require('../package.json');