fix: merge pdf options into defaults properly

simonhaenisch · Jan 20, 2019 · d13f5e2 · d13f5e2
1 parent 3780f30
commit d13f5e2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 25 deletions.
diff --git a/index.js b/index.js
@@ -21,7 +21,7 @@ module.exports = async (mdFile, config) => {
 	const port = await getPort();
 	const server = await serveDirectory(getDir(mdFile), port);
 
-	config = { ...defaultConfig, ...config };
+	config = { ...defaultConfig, ...config, pdf_options: { ...defaultConfig.pdf_options, ...config.pdf_options } };
 
 	const pdf = await mdToPdf(mdFile, config, port);
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/util/md-to-pdf.js b/util/md-to-pdf.js
@@ -22,7 +22,11 @@ module.exports = async (mdFile, config, port, args = {}) => {
 	const { content: md, data: frontMatterConfig } = grayMatter(mdFileContent);
 
 	// merge front-matter config
-	config = { ...config, ...frontMatterConfig };
+	config = {
+		...config,
+		...frontMatterConfig,
+		pdf_options: { ...config.pdf_options, ...frontMatterConfig.pdf_options },
+	};
 
 	// sanitize array cli arguments
 	for (const option of ['stylesheet', 'body_class']) {