hdoc-tools 0.11.6 → 0.11.8

package/hdoc-build.js

@@ -36,6 +36,7 @@
         css_templates = [],
         doc_header_template = '',
         doc_header_template_non_git = '',
+        global_source_path = '',
         pdf_created = 0,
         pdf_enable = false,
         pdf_header_template = '',
@@ -178,6 +179,7 @@
 
             // Get contributor data from Github, if exists
             let contribs = [];
+            let last_commit = null;
             if (hdocbook_config.publicSource && hdocbook_config.publicSource !== '' && hdocbook_config.publicSource.includes('github.com/Hornbill-Docs')) {
 
                 const github_paths = hdoc.get_github_api_path(hdocbook_config.publicSource, file_path.relativePath);
@@ -186,6 +188,7 @@
                 if (!contributors.success) {
                     console.log(`Error retrieving contributors from Github: ${contributors.error}`);
                 } else {
+                    last_commit = contributors.last_commit_date;
                     metadata.last_commit = contributors.last_commit_date;
                     metadata.contributor_count = contributors.contributor_count;
                     metadata.edit_url = github_paths.edit_path;
@@ -253,7 +256,8 @@
                 metadata: metadata,
                 contributors: contribs,
                 pdf_size: pdf_size,
-                md5: file_path.hash
+                md5: file_path.hash,
+                lastmod: last_commit !== null ? last_commit : file_path.hb_lastmod
             });
             // Save HTML into HTML file
             try {
@@ -386,6 +390,7 @@
 
             // Get contributor data from Github, if exists
             let contribs = [];
+            let last_commit = null;
             if (hdocbook_config.publicSource && hdocbook_config.publicSource !== '' && hdocbook_config.publicSource.includes('github.com/Hornbill-Docs')) {
 
                 const github_paths = hdoc.get_github_api_path(hdocbook_config.publicSource, file_path.relativePath);
@@ -394,6 +399,7 @@
                 if (!contributors.success) {
                     console.log(`Error retrieving contributors from Github: ${contributors.error}`);
                 } else {
+                    last_commit = contributors.last_commit_date;
                     metadata.last_commit = contributors.last_commit_date;
                     metadata.contributor_count = contributors.contributor_count;
                     metadata.edit_url = github_paths.edit_path;
@@ -474,7 +480,7 @@
                 contributors: contribs,
                 pdf_size: pdf_size,
                 md5: file_path.hash,
-                lastmod: file_path.stat.mtime.toISOString()
+                lastmod: last_commit !== null ? last_commit : file_path.hb_lastmod
             });
 
             // Add MD file to delete queue
@@ -538,6 +544,9 @@
     // File callback for build scan
     const build_file_callback = function (element) {
         if (element.extension === 'md') {
+            element.hb_source_path = path.join(global_source_path, element.relativePath);
+            const fstats = fs.statSync(element.hb_source_path);
+            element.hb_lastmod = `${fstats.mtime.toISOString().slice(0, 19)}Z`;
             md_files.push(element);
         } else {
             // File is html, see if there's a matching md file and if there is then ignore the html
@@ -545,6 +554,9 @@
             if (fs.existsSync(md_path)) {
                 return;
             }
+            element.hb_source_path = path.join(global_source_path, element.relativePath);
+            const fstats = fs.statSync(element.hb_source_path);
+            element.hb_lastmod = `${fstats.mtime.toISOString().slice(0, 19)}Z`;
             static_html_files.push(element);
         }
     };
@@ -576,6 +588,7 @@
         if (github_api_token !== '') {
             git_token = github_api_token;
         }
+        global_source_path = source_path;
         verbose = verbose_output;
 
         const start_time = Date.now();

package/package.json

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

package/templates/init/.npmignore

@@ -1,7 +0,0 @@
-_work/
-node_modules/
-package-lock.json
-.wsuo
-VSWorkspaceState.json
-slnx.state
-slnx.sqlite