Merge pull request #8 from kght6123/fix/windows-and-mermaidjs

Windowsで起動しない問題を修正 #7、Mermaid生成の内部処理を公式のものに変更

README.md

@@ -209,6 +209,12 @@ MITライセンスの下で公開されています。詳細については LICE
 
 [docs/99-1_samples.md](./docs/99-1_samples.md)を参照してください。
 
+## Print
+
+プリント出力のための設定や注意事項を記載します。
+
+- 後日、KDPへの対応を予定しています。
+
 ## Note
 
 このプロジェクトに関する追加の注意事項や補足情報を記載します。
@@ -249,3 +255,4 @@ npx browser-sync start --proxy 'localhost:3000' --files="dist/lockfile" --startP
 ## ChangeLog
 
 - v0.1 4/26 プロジェクト作成
+- v0.2 7/10 Windowsで起動しない問題を修正 #7、Mermaid生成の内部処理を公式のものに変更

package.json

@@ -6,11 +6,11 @@
     "dev:tc": "npx  --yes tailwindcss@latest -i ./src/global.css -o ./dist/global.css --watch --no-autoprefixer --postcss ./postcss.config.cjs",
     "dev:vs": "npx --yes @vivliostyle/cli preview --style ./dist/global.css",
     "dev:h3": "npx --yes listhen --host 0.0.0.0 --port 3000 --watch ./src/viewer.ts",
-    "dev:sync": "npx --yes browser-sync start --no-ui --port 3001 --config 'bs-config.js' --files=\"dist/*\" --reload-delay=4000 --reload-throttle=4000 --startPath=\"/index.html#src=/dist/publication.json&bookMode=true&renderAllPages=true&style=/dist/global.css\" --browser \"google chrome\"",
-    "dev:sync:lock": "npx --yes browser-sync start --no-ui --port 3001 --config 'bs-config.js' --files=\"dist/lockfile,dist/global.css,images/*\" --reload-delay=4000 --reload-throttle=4000 --startPath=\"/index.html#src=/dist/publication.json&bookMode=true&renderAllPages=true&style=/dist/global.css\" --browser \"google chrome\"",
+    "dev:sync": "npx --yes browser-sync start --no-ui --port 3001 --config bs-config.js --files=\"dist/*\" --reload-delay=4000 --reload-throttle=4000 --startPath=\"/index.html#src=/dist/publication.json&bookMode=true&renderAllPages=true&style=/dist/global.css\" --browser \"google chrome\"",
+    "dev:sync:lock": "npx --yes browser-sync start --no-ui --port 3001 --config bs-config.js --files=\"dist/lockfile,dist/global.css,images/*\" --reload-delay=4000 --reload-throttle=4000 --startPath=\"/index.html#src=/dist/publication.json&bookMode=true&renderAllPages=true&style=/dist/global.css\" --browser \"google chrome\"",
     "dev": "npx --yes concurrently --kill-others --names \"main,h3,tailwind,browser-sync\" -c \"auto\" \"npm run pre-compiler:dev\" \"npm run dev:h3\" \"npx --yes wait-on --interval 500 ./dist/lockfile && npm run dev:tc\" \"npx --yes wait-on --interval 500 ./dist/global.css ./dist/lockfile && npm run dev:sync:lock\"",
     "clean": "npx --yes clear-npx-cache",
-    "pre-compiler:dev": "npm run pre-compiler;npx --yes chokidar-cli \"src/**/*.ts\" \"src/**/*.html\" \"docs/**/*.md\" -c \"npm run pre-compiler\"",
+    "pre-compiler:dev": "npm run pre-compiler && npx --yes chokidar-cli \"src/**/*.ts\" \"src/**/*.html\" \"docs/**/*.md\" -c \"npm run pre-compiler\"",
     "pre-compiler": "npx --yes vite-node src/main.ts",
     "check": "npx --yes @biomejs/biome check --apply-unsafe ./src"
   },

src/rehype-mermaid.ts

@@ -239,7 +239,7 @@ const rehypeMermaid: Plugin<[RehypeMermaidOptions?], Root> = (options) => {
   const outputFormat = "png"
   const parseMMDOptions: ParseMDDOptions = {}
   const puppeteerConfig: PuppeteerLaunchOptions = ({
-    headless: "new"
+    headless: "new",
   })
   const renderDiagrams = (() => (diagrams: string[], renderOptions: RehypeMermaidOptions | undefined): Promise<PromiseSettledResult<RenderResult>[]> => {
     return Promise.allSettled(
@@ -264,7 +264,7 @@ const rehypeMermaid: Plugin<[RehypeMermaidOptions?], Root> = (options) => {
       })
     )
   })();
-  return (ast, file) => {
+  return async (ast, file) => {
     const instances: CodeInstance[] = []
 
     visitParents(ast, 'element', (node: Element, ancestors) => {
@@ -331,7 +331,7 @@ const rehypeMermaid: Plugin<[RehypeMermaidOptions?], Root> = (options) => {
       )
     ]
 
-    return Promise.all(promises).then(([lightResults]) => {
+    return await Promise.all(promises).then(([lightResults]) => {
       for (const [index, instance] of instances.entries()) {
         const lightResult = lightResults[index]
         // biome-ignore lint/suspicious/noConfusingVoidType: <explanation>
@@ -355,10 +355,19 @@ const rehypeMermaid: Plugin<[RehypeMermaidOptions?], Root> = (options) => {
           parent.children.splice(nodeIndex, 1)
         }
       }
-    }).finally(() => {
+    }).finally(async () => {
+      console.log('finally')
       if (browser !== undefined) {
-        browser.close()
+        const pages = await browser.pages();
+        for (let i = 0; i < pages.length; i++) {
+          await pages[i].close();
+        }
+        await browser.close();
         browser = undefined
+        setTimeout(() => {
+          console.log('force exit...')
+          process.exit(0);
+        }, 10 * 1000);
       }
     })
   }