marp-dev-preview 0.1.6 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marp-dev-preview",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "A CLI tool to preview Marp markdown files.",
   "main": "src/marp-dev-preview.mjs",
   "type": "module",

package/src/client.js

@@ -53,6 +53,11 @@ document.addEventListener('DOMContentLoaded', () => {
     try {
       const data = JSON.parse(event.data);
       if (data.type === 'update') {
+        // TODO: support force rebuild
+        // if(data.rebuild == true) {
+        //   window.location.reload();
+        //   return;
+        // }
         const marpContainer = document.getElementById('marp-container');
         if (marpContainer) {
           morphdom(marpContainer, `<div id="marp-container">${data.html}</div>`);
@@ -65,6 +70,8 @@ document.addEventListener('DOMContentLoaded', () => {
         goToSlide(parseInt(data.slide, 10));
       } else if (data.command === 'find' && data.string) {
         findSlideByString(data.string);
+      } else if (data.command === 'close_preview') {
+        window.close();
       }
     } catch (e) {
       console.error('Failed to parse WebSocket message:', e);

package/src/marp-dev-preview.mjs

@@ -149,9 +149,6 @@ chokidar.watch(markdownFile).on('change', async () => {
 
 initializeMarp(themeDir).then(() => {
   createServer(port, markdownFile, markdownDir, renderMarp, reload, wss, __dirname);
-  if (themeDir) {
-    console.log(`Using custom themes from ${themeDir}`);
-  }
 }).catch(error => {
   console.error("Failed to initialize Marp:", error);
   process.exit(1);

package/src/marp-utils.mjs

@@ -15,15 +15,31 @@ export async function initializeMarp(themeDir) {
     .use(markdownItMark)
     .use(markdownItContainer, 'note');
 
-  if (themeDir) {
-    const themeFiles = await fs.readdir(themeDir);
-    for (const file of themeFiles) {
-      if (path.extname(file) === '.css') {
-        const css = await fs.readFile(path.join(themeDir, file), 'utf8');
-        marp.themeSet.add(css);
-      }
+  if (!themeDir) {
+    return marp;
+  }
+
+  let stats = await fs.stat(themeDir).catch(() => null);
+  if (!stats) {
+    console.warn(`Theme directory "${themeDir}" does not exist.`);
+    return marp;
+  }
+
+  if(!stats.isDirectory()) {
+    console.warn(`Theme directory "${themeDir}" is not a directory.`);
+    return marp;
+  }
+
+  console.log("Loading themes from:", themeDir);
+
+  const themeFiles = await fs.readdir(themeDir);
+  for (const file of themeFiles) {
+    if (path.extname(file) === '.css') {
+      const css = await fs.readFile(path.join(themeDir, file), 'utf8');
+      marp.themeSet.add(css);
     }
   }
+
   return marp;
 }