hdoc-tools 0.41.3 → 0.41.5

package/hdoc-build.js

@@ -18,33 +18,41 @@
 
 	const h_tags_to_search = ["h1", "h2", "h3"];
 	const image_extensions = ["png", "svg", "jpg"];
-	const doc_header_template_path = path.join(
+
+	const templates_path = path.join(
 		__dirname,
-		"templates",
+		"templates"
+	);
+	const doc_header_template_path = path.join(
+		templates_path,
 		"doc-header.html",
 	);
 	const non_git_doc_header_template_path = path.join(
-		__dirname,
-		"templates",
+		templates_path,
 		"doc-header-non-git.html",
 	);
 	const pdf_header_template_path = path.join(
-		__dirname,
-		"templates",
+		templates_path,
 		"pdf-header.html",
 	);
 	const non_git_pdf_header_template_path = path.join(
-		__dirname,
-		"templates",
+		templates_path,
 		"pdf-header-non-git.html",
 	);
 
 	const mermaid_theme_path = path.resolve(
-		__dirname,
-		"templates",
+		templates_path,
 		"mermaid-theme.yaml",
 	);
 
+	let mermaid_puppeteer_config_path = path.resolve(
+		templates_path,
+		"mermaid-puppeteer-config.json",
+	);
+	if (process.platform === "win32") {
+		mermaid_puppeteer_config_path = `"${mermaid_puppeteer_config_path}"`
+	}
+
 	const pdf_template_path = path.join(__dirname, "templates", "pdf");
 	const ui_css_path = path.join(__dirname, "ui", "css");
 	const pdf_template_file_path = path.join(pdf_template_path, "template.html");
@@ -90,6 +98,7 @@
 	let includes_success = 0;
 	let includes_failed = 0;
 	let work_path_content = "";
+	let mermaid_images_path = "";
 	let verbose = false;
 
 	const pdf_path_excluded = (relative_path) => {
@@ -524,34 +533,33 @@
 					if (lang === "mermaid" && process.env.GITHUB_ACTIONS !== 'true') {
 						try {
 							const tmpInput = tmp.fileSync({ postfix: ".mmd" });
-							const tmpOutput = tmp.fileSync({ postfix: ".svg" });
+							const outputFileName = `mermaid-${crypto.createHash("sha256").update(str).digest("hex").slice(0, 16)}.svg`;
+							const outputPath = path.join(mermaid_images_path, outputFileName);
+							const outputLink = `/_books/${doc_id}/mermaid-images/${outputFileName}`
 
-							/*
 							if (!str.startsWith('---')) {
 								str = '---\n' + fs.readFileSync(mermaid_theme_path, {encoding: 'utf-8'}) + `\n---\n${str}`;
 							}
-								*/
 
 							fs.writeFileSync(tmpInput.name, str);
 							let cmd = `${__dirname}/node_modules/.bin/mmdc`;
 
 							if (process.platform === "win32") {
-								cmd = `"${cmd}"`;
+								cmd = `"${cmd}.cmd"`;
 							} 
-							cmd = `${cmd} -i "${tmpInput.name}" -o "${tmpOutput.name}" --quiet --backgroundColor transparent`;
-							console.log(`Generating Inline Mermaid SVG found in: ${file_path.relativePath}`);
+
+
+							cmd = `${cmd} -i "${tmpInput.name}" -o "${outputPath}" --backgroundColor transparent --puppeteerConfigFile ${mermaid_puppeteer_config_path}`;
+							console.log(`Generating Mermaid SVG found in ${file_path.relativePath} - ${outputPath}`);
 							execSync(cmd);
 							
-							if (!fs.existsSync(tmpOutput.name)) {
+							if (!fs.existsSync(outputPath)) {
 								throw new Error("mmdc did not generate output");
 							}
 
-							const svg = fs.readFileSync(tmpOutput.name, "utf8");
-
 							tmpInput.removeCallback();
-							tmpOutput.removeCallback();
 
-							return `<div class="text-body">${svg}</div>`;
+							return `<img class="mermaid-diagram" src="${outputLink}" alt="Mermaid Diagram">`;
 						} catch (err) {
 							mermaid_failures.push({path: file_path.relativePath, error: err.message});
 							return  ``;
@@ -1321,6 +1329,9 @@
 			process.exit(1);
 		}
 
+		mermaid_images_path = path.join(work_path_content, 'mermaid-images');
+		if (!fs.existsSync(mermaid_images_path)) fs.mkdirSync(mermaid_images_path);
+
 		// Create MD5 hash of content before build
 		console.log("Creating Hash...");
 

package/hdoc-serve.js

@@ -137,11 +137,9 @@
 							const tmpInput = tmp.fileSync({ postfix: ".mmd" });
 							const tmpOutput = tmp.fileSync({ postfix: ".svg" });
 
-							/*
 							if (!str.startsWith('---')) {
 								str = '---\n' + fs.readFileSync(mermaid_theme_path, {encoding: 'utf-8'}) + `\n---\n${str}`;
 							}
-								*/
 
 							fs.writeFileSync(tmpInput.name, str);
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hdoc-tools",
-	"version": "0.41.3",
+	"version": "0.41.5",
 	"description": "Hornbill HDocBook Development Support Tool",
 	"main": "hdoc.js",
 	"bin": {

package/templates/mermaid-puppeteer-config.json

@@ -0,0 +1,6 @@
+{
+  "args": [
+    "--no-sandbox", 
+    "--disable-gpu"
+  ]
+}