@antora/playbook-builder 3.0.0-beta.3 → 3.0.0-rc.1
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/config/schema.js +4 -4
- package/lib/solitary-convict.js +3 -3
- package/package.json +5 -2
package/lib/config/schema.js
CHANGED
|
@@ -11,7 +11,7 @@ module.exports = {
|
|
|
11
11
|
generator: {
|
|
12
12
|
doc: 'A require request for the generator package name or script to use.',
|
|
13
13
|
format: String,
|
|
14
|
-
default: '@antora/site-generator
|
|
14
|
+
default: '@antora/site-generator',
|
|
15
15
|
arg: 'generator',
|
|
16
16
|
},
|
|
17
17
|
extensions: {
|
|
@@ -59,7 +59,7 @@ module.exports = {
|
|
|
59
59
|
__private__google_analytics_key: {
|
|
60
60
|
doc: [
|
|
61
61
|
'The Google Analytics account key.',
|
|
62
|
-
'(
|
|
62
|
+
'(@deprecated; scheduled to be removed in Antora 4; define using --key google-analytics=<key> instead)',
|
|
63
63
|
].join('\n'),
|
|
64
64
|
format: String,
|
|
65
65
|
default: undefined,
|
|
@@ -259,7 +259,7 @@ module.exports = {
|
|
|
259
259
|
},
|
|
260
260
|
format: new Proxy(
|
|
261
261
|
{
|
|
262
|
-
doc: 'Set the format of log messages. Defaults to
|
|
262
|
+
doc: 'Set the format of log messages. Defaults to pretty if CI=true or stdout is a TTY, json otherwise.',
|
|
263
263
|
format: ['json', 'pretty'],
|
|
264
264
|
default: undefined,
|
|
265
265
|
arg: 'log-format',
|
|
@@ -268,7 +268,7 @@ module.exports = {
|
|
|
268
268
|
{
|
|
269
269
|
get (target, property) {
|
|
270
270
|
if (property !== 'default') return target[property]
|
|
271
|
-
return process.env.CI === 'true' || process.
|
|
271
|
+
return process.env.CI === 'true' || process.stdout.isTTY ? 'pretty' : 'json'
|
|
272
272
|
},
|
|
273
273
|
}
|
|
274
274
|
),
|
package/lib/solitary-convict.js
CHANGED
|
@@ -22,8 +22,8 @@ function registerParsers (convict) {
|
|
|
22
22
|
convict.addParser([
|
|
23
23
|
{ extension: 'json', parse: json.parse },
|
|
24
24
|
{ extension: 'toml', parse: toml.parse },
|
|
25
|
-
{ extension: 'yaml', parse: yaml.load },
|
|
26
|
-
{ extension: 'yml', parse: yaml.load },
|
|
25
|
+
{ extension: 'yaml', parse: (source) => yaml.load(source, { schema: yaml.CORE_SCHEMA }) },
|
|
26
|
+
{ extension: 'yml', parse: (source) => yaml.load(source, { schema: yaml.CORE_SCHEMA }) },
|
|
27
27
|
{
|
|
28
28
|
extension: '*',
|
|
29
29
|
parse: () => {
|
|
@@ -46,7 +46,7 @@ function registerFormats (convict) {
|
|
|
46
46
|
ARGS_SCANNER_RX.lastIndex = 0
|
|
47
47
|
while ((match = ARGS_SCANNER_RX.exec(val))) {
|
|
48
48
|
const [, k, v] = match
|
|
49
|
-
if (k) accum[k] = v ? (v === '-' ? '-' : yaml.load(v)) : ''
|
|
49
|
+
if (k) accum[k] = v ? (v === '-' ? '-' : yaml.load(v, { schema: yaml.CORE_SCHEMA })) : ''
|
|
50
50
|
}
|
|
51
51
|
return accum
|
|
52
52
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antora/playbook-builder",
|
|
3
|
-
"version": "3.0.0-
|
|
3
|
+
"version": "3.0.0-rc.1",
|
|
4
4
|
"description": "Builds a playbook object from user input for configuring successive documentation components in an Antora pipeline.",
|
|
5
5
|
"license": "MPL-2.0",
|
|
6
6
|
"author": "OpenDevise Inc. (https://opendevise.com)",
|
|
@@ -15,6 +15,9 @@
|
|
|
15
15
|
"url": "https://gitlab.com/antora/antora/issues"
|
|
16
16
|
},
|
|
17
17
|
"main": "lib/index.js",
|
|
18
|
+
"scripts": {
|
|
19
|
+
"test": "_mocha"
|
|
20
|
+
},
|
|
18
21
|
"dependencies": {
|
|
19
22
|
"@iarna/toml": "~2.2",
|
|
20
23
|
"camelcase-keys": "~7.0",
|
|
@@ -36,5 +39,5 @@
|
|
|
36
39
|
"static site",
|
|
37
40
|
"web publishing"
|
|
38
41
|
],
|
|
39
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "044371a33e2c0fed9724d30945bbb549d64845d5"
|
|
40
43
|
}
|