fix: Fix issues with puppeteer rendering

markdown-confluence · May 9, 2023 · 01824b6 · 01824b6
1 parent a7d44d3
commit 01824b6
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 122 deletions.
diff --git a/packages/lib/esbuild.config.mjs b/packages/lib/esbuild.config.mjs
diff --git a/packages/lib/package.json b/packages/lib/package.json
@@ -8,8 +8,8 @@
     "type": "module",
     "sideEffects": false,
     "scripts": {
-        "dev": "node esbuild.config.mjs",
-        "build": "tsc && node esbuild.config.mjs production",
+        "dev": "tsc --watch",
+        "build": "tsc",
         "fmt": "npx prettier --write src/",
         "lint": "eslint --ignore-path ../../.eslintignore --ext .js,.ts src/",
         "prettier-check": "npx prettier --check src/",

diff --git a/packages/lib/src/SettingsLoader/CommandLineArgumentSettingsLoader.ts b/packages/lib/src/SettingsLoader/CommandLineArgumentSettingsLoader.ts
@@ -1,4 +1,3 @@
-import path from "path";
 import { ConfluenceSettings } from "../Settings";
 import { SettingsLoader } from "./SettingsLoader";
 import yargs from "yargs";
@@ -15,16 +14,6 @@ export class CommandLineArgumentSettingsLoader extends SettingsLoader {
 	loadPartial(): Partial<ConfluenceSettings> {
 		const options = yargs(process.argv)
 			.usage("Usage: $0 [options]")
-			.option("config", {
-				alias: "c",
-				describe: "Path to the config file",
-				type: "string",
-				default: path.join(
-					process.env["HOME"] ?? "",
-					".mermaid-confluence.json"
-				),
-				demandOption: false,
-			})
 			.option("baseUrl", {
 				alias: "b",
 				describe: "Confluence base URL",

diff --git a/packages/lib/tsconfig.json b/packages/lib/tsconfig.json
@@ -1,13 +1,16 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions":{
-     "baseUrl":".",
-     "rootDir": "src",
-         "outDir": "dist",
-         "declarationDir": "dist",
-         "emitDeclarationOnly": true,
-         "skipLibCheck": true
+    "baseUrl":".",
+    "rootDir": "src",
+    "outDir": "dist",
+    "declarationDir": "dist",
+    "emitDeclarationOnly": false,
+    "skipLibCheck": true,
+    "listEmittedFiles": true,
+    "module":"ESNext",
+    "target":"ESNext",
   },
-  "include":[ "**/*.ts", "**/*.tsx" ],
-    "exclude": ["node_modules", "packages/**/dist/*", "dist/*", "**/*.test.ts", "**/jest.config.ts"]
+  "include":[ "**/*.ts", "**/*.tsx", "**/**.js", "**/**.jsx", ],
+  "exclude": ["node_modules", "packages/**/dist/*", "dist/*", "**/*.test.ts", "**/jest.config.ts"]
 }
diff --git a/packages/mermaid-electron-renderer/esbuild.config.mjs b/packages/mermaid-electron-renderer/esbuild.config.mjs
diff --git a/packages/mermaid-electron-renderer/package.json b/packages/mermaid-electron-renderer/package.json
@@ -8,8 +8,8 @@
     "type": "module",
     "sideEffects": false,
     "scripts": {
-        "dev": "node esbuild.config.mjs",
-        "build": "tsc && node esbuild.config.mjs production",
+        "dev": "tsc --watch",
+        "build": "tsc",
         "fmt": "npx prettier --write src/",
         "lint": "eslint --ignore-path ../../.eslintignore --ext .js,.ts src/",
         "prettier-check": "npx prettier --check src/"

diff --git a/packages/mermaid-electron-renderer/tsconfig.json b/packages/mermaid-electron-renderer/tsconfig.json
@@ -5,8 +5,11 @@
      "rootDir": "src",
          "outDir": "dist",
          "declarationDir": "dist",
-         "emitDeclarationOnly": true,
-         "skipLibCheck": true,
+         "emitDeclarationOnly": false,
+    "skipLibCheck": true,
+    "listEmittedFiles": true,
+    "module":"ESNext",
+    "target":"ESNext",
   },
   "include":[ "**/*.ts", "**/*.tsx"  ],
     "exclude": ["node_modules", "packages/**/dist/*", "dist/*", "**/*.test.ts", "**/jest.config.ts"]

diff --git a/packages/mermaid-puppeteer-renderer/src/global.d.ts b/packages/mermaid-puppeteer-renderer/src/global.d.ts
diff --git a/packages/mermaid-puppeteer-renderer/src/index.ts b/packages/mermaid-puppeteer-renderer/src/index.ts
@@ -3,6 +3,13 @@ import path from "path";
 import puppeteer from "puppeteer";
 import url from "url";
 
+interface RemoteWindowedCustomFunctions {
+	renderMermaidChart: (
+		mermaidData: string,
+		mermaidConfig: unknown
+	) => Promise<{ width: number; height: number }>;
+}
+
 export class PuppeteerMermaidRenderer implements MermaidRenderer {
 	async captureMermaidCharts(
 		charts: ChartData[]
@@ -46,10 +53,10 @@ export class PuppeteerMermaidRenderer implements MermaidRenderer {
 
 				const result = await page.evaluate(
 					(mermaidData, mermaidConfig) => {
-						return window.renderMermaidChart(
-							mermaidData,
-							mermaidConfig
-						);
+						const { renderMermaidChart } =
+							globalThis as unknown as RemoteWindowedCustomFunctions;
+
+						return renderMermaidChart(mermaidData, mermaidConfig);
 					},
 					chart.data,
 					mermaidConfig