@antora/playbook-builder - npm Package Compare versions

Comparing version 3.0.0-rc.1 to 3.0.0-rc.2

lib/build-playbook.js

		@@ -22,4 +22,4 @@ 'use strict'
		* option flags and switches. Should begin with the first flag or switch.
		* @param {Object} [env={}] - A map of environment variables.
		* @param {Object} [schema=undefined] - A convict configuration schema.
		* @param {Object} [env=process.env] - A map of environment variables.
		* @param {Object} [schema=require('./config/schema').defaultSchema] - A convict configuration schema.
		* @param {Function} [beforeValidate=undefined] - A function to invoke on the
		@@ -32,5 +32,5 @@ * config before validating it.
		*/
		function buildPlaybook (args = [], env = {}, schema = undefined, beforeValidate = undefined) {
		const config = loadConvictConfig(args, env, schema)
		const playbook = config.get('playbook')
		function buildPlaybook (args = [], env = process.env, schema = defaultSchema, beforeValidate = undefined) {
		const config = Object.assign(convict(schema, { args, env }), { getModel })
		const playbook = config.has('playbook') && config.get('playbook')
		let absPlaybookPath
		@@ -73,6 +73,2 @@ if (playbook) {

		function loadConvictConfig (args, env, customSchema) {
		return Object.assign(convict(customSchema \|\| defaultSchema, { args, env }), { getModel })
		}

		function getModel (name = '') {
		@@ -79,0 +75,0 @@ let config = this

lib/config/schema.js

		@@ -58,11 +58,7 @@ 'use strict'
		},
		// NOTE used to map arg and env for site.keys.google_analytics key
		// NOTE used to map env var for site.keys.google_analytics key
		__private__google_analytics_key: {
		doc: [
		'The Google Analytics account key.',
		'(@deprecated; scheduled to be removed in Antora 4; define using --key google-analytics=<key> instead)',
		].join('\n'),
		doc: 'The environment variable mapping for the Google Analytics account key.',
		format: String,
		default: undefined,
		arg: 'google-analytics-key',
		env: 'GOOGLE_ANALYTICS_KEY',
		@@ -69,0 +65,0 @@ },

lib/solitary-convict.js

		@@ -10,2 +10,3 @@ 'use strict'
		const PRIMITIVE_TYPES = [Boolean, Number, String]
		const YAML_SCHEMA = yaml.CORE_SCHEMA.extend({ implicit: [yaml.types.merge] })

		@@ -26,4 +27,4 @@ /**
		{ extension: 'toml', parse: toml.parse },
		{ extension: 'yaml', parse: (source) => yaml.load(source, { schema: yaml.CORE_SCHEMA }) },
		{ extension: 'yml', parse: (source) => yaml.load(source, { schema: yaml.CORE_SCHEMA }) },
		{ extension: 'yaml', parse: (source) => yaml.load(source, { schema: YAML_SCHEMA }) },
		{ extension: 'yml', parse: (source) => yaml.load(source, { schema: YAML_SCHEMA }) },
		{
		@@ -79,3 +80,3 @@ extension: '*',
		if (v && v !== '-') {
		parsed = yaml.load(v)
		parsed = yaml.load(v, { schema: yaml.CORE_SCHEMA })
		if (parsed && PRIMITIVE_TYPES.indexOf(parsed.constructor) < 0) parsed = v
		@@ -82,0 +83,0 @@ } else {

package.json

		{
		"name": "@antora/playbook-builder",
		"version": "3.0.0-rc.1",
		"version": "3.0.0-rc.2",
		"description": "Builds a playbook object from user input for configuring successive documentation components in an Antora pipeline.",
		@@ -42,3 +42,3 @@ "license": "MPL-2.0",
		],
		"gitHead": "044371a33e2c0fed9724d30945bbb549d64845d5"
		"gitHead": "b64861391b7e55ea31fcecce4490b9cc02fec1c7"
		}

New alerts