@antora/cli 3.1.14 → 3.1.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cli.js +7 -5
- package/package.json +4 -4
package/lib/cli.js
CHANGED
|
@@ -67,7 +67,6 @@ function requireLogger (fromPath = undefined, moduleName = '@antora/logger') {
|
|
|
67
67
|
cli
|
|
68
68
|
.allowExcessArguments(false)
|
|
69
69
|
.configureOutput({ getOutHelpWidth: getTTYColumns, getErrHelpWidth: getTTYColumns, outputError })
|
|
70
|
-
.storeOptionsAsProperties()
|
|
71
70
|
.name('antora')
|
|
72
71
|
.version(
|
|
73
72
|
{
|
|
@@ -104,7 +103,9 @@ cli
|
|
|
104
103
|
)
|
|
105
104
|
})
|
|
106
105
|
.option('-r, --require <library>', 'Require library (aka node module) or script path before executing command.')
|
|
107
|
-
.on('option:require', (requireRequest) =>
|
|
106
|
+
.on('option:require', (requireRequest) => {
|
|
107
|
+
cli.setOptionValueWithSource('requires', (cli.getOptionValue('requires') || []).concat(requireRequest), 'cli')
|
|
108
|
+
})
|
|
108
109
|
.option('--stacktrace', 'Print the stacktrace to the console if the application fails.')
|
|
109
110
|
|
|
110
111
|
cli
|
|
@@ -113,12 +114,13 @@ cli
|
|
|
113
114
|
.optionsFromConvict(convict(buildPlaybook.defaultSchema), { exclude: 'playbook' })
|
|
114
115
|
.trackOptions()
|
|
115
116
|
.action(async (playbookFile, options, command) => {
|
|
116
|
-
const errorOpts = { stacktrace: cli.stacktrace, silent: command.silent }
|
|
117
|
+
const errorOpts = { stacktrace: cli.getOptionValue('stacktrace'), silent: command.getOptionValue('silent') }
|
|
117
118
|
const playbookDir = ospath.resolve(playbookFile, '..')
|
|
118
119
|
const userRequireContext = { dot: playbookDir, paths: [playbookDir, __dirname] }
|
|
119
|
-
|
|
120
|
+
const requires = cli.getOptionValue('requires') || []
|
|
121
|
+
if (requires.length) {
|
|
120
122
|
try {
|
|
121
|
-
|
|
123
|
+
requires.forEach((requireRequest) => userRequire(requireRequest, userRequireContext))
|
|
122
124
|
} catch (err) {
|
|
123
125
|
return exitWithError(err, errorOpts)
|
|
124
126
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antora/cli",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.15",
|
|
4
4
|
"description": "The command line interface for Antora.",
|
|
5
5
|
"license": "MPL-2.0",
|
|
6
6
|
"author": "OpenDevise Inc. (https://opendevise.com)",
|
|
@@ -28,13 +28,13 @@
|
|
|
28
28
|
"antora": "bin/antora"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@antora/logger": "3.1.
|
|
32
|
-
"@antora/playbook-builder": "3.1.
|
|
31
|
+
"@antora/logger": "3.1.15",
|
|
32
|
+
"@antora/playbook-builder": "3.1.15",
|
|
33
33
|
"@antora/user-require-helper": "~3.0",
|
|
34
34
|
"commander": "~11.1"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@antora/site-publisher": "3.1.
|
|
37
|
+
"@antora/site-publisher": "3.1.15",
|
|
38
38
|
"@asciidoctor/core": "~2.2",
|
|
39
39
|
"convict": "~6.2",
|
|
40
40
|
"kapok-js": "~0.10"
|