markdown generation revamp

* Fix the spacing for the implicit line breaks in odt * Improve debuggability of markdown generation
mieweb · Apr 11, 2024 · b15eab5 · b15eab5
1 parent 79974ad
commit b15eab5
Show file tree

Hide file tree

Showing 71 changed files with 2,674 additions and 22,046 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -109,7 +109,7 @@
     "relateurl": "0.2.7",
     "sharp": "0.32.6",
     "sharp-phash": "^2.0.0",
-    "slugify": "1.6.5",
+    "slugify": "1.6.6",
     "stream": "^0.0.2",
     "ts-node": "10.9.2",
     "typescript": "5.3.3",
@@ -137,7 +137,7 @@
     "@typescript-eslint/eslint-plugin": "6.12.0",
     "@typescript-eslint/parser": "6.12.0",
     "chai": "5.0.0",
-    "diff": "5.0.0",
+    "diff": "5.2.0",
     "eslint": "8.54.0",
     "husky": "7.0.4",
     "jshint": "2.13.4",

diff --git a/src/containers/google_folder/UserConfigService.ts b/src/containers/google_folder/UserConfigService.ts
@@ -6,7 +6,7 @@ import {FileContentService} from '../../utils/FileContentService.ts';
 import {HugoTheme} from '../server/routes/ConfigController.ts';
 import {FRONTMATTER_DUMP_OPTS} from '../transform/frontmatters/frontmatter.ts';
 import {DEFAULT_ACTIONS} from '../action/ActionRunnerContainer.ts';
-import {RewriteRule} from '../../odt/applyRewriteRule.js';
+import {RewriteRule} from '../../odt/applyRewriteRule.ts';
 
 async function execAsync(command: string) {
   const err = new Error();

diff --git a/src/google/markdownToHtml.ts b/src/google/markdownToHtml.ts
@@ -31,8 +31,8 @@ export async function markdownToHtml(buffer: Buffer): Promise<string> {
   const html = marked.parse(md, { pedantic: false, hooks: {
       preprocess: (markdown: string) => markdown,
       postprocess(html: string) {
-        const style = '<style>\n.code { font-family: Courier; }\n</style>\n';
-        return `<html>\n<head>\n<meta content="text/html; charset=UTF-8" http-equiv="content-type" />\n${style}</head>\n<body>\n${html}\n</body>\n</html>\n`;
+        const style = '<style>\n.code { font-family: Courier, serif; }\n</style>\n';
+        return `<html>\n<head>\n<meta content="text/html; charset=UTF-8" http-equiv="content-type" />\n${style}</head>\n<body>\n${html.trim()}\n</body>\n</html>\n`;
       }
     }
   });