@daz4126/swifty 2.4.1 → 2.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daz4126/swifty",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "main": "index.js",
   "type": "module",
   "bin": {
@@ -25,6 +25,7 @@
   "license": "MIT",
   "description": "Super Speedy Static Site Generator",
   "dependencies": {
+    "chokidar": "^4.0.0",
     "fs-extra": "^11.2.0",
     "gray-matter": "^4.0.3",
     "highlight.js": "^11.11.1",

package/src/partials.js

@@ -45,8 +45,9 @@ const replacePlaceholders = async (template, values) => {
     },
   );
   // Replace other placeholders **only outside of code blocks**
+  // Fenced blocks require closing ``` to be at start of line (after newline)
   const codeBlockRegex =
-    /```[\s\S]*?```|`[^`]+`|<(pre|code)[^>]*>[\s\S]*?<\/\1>/g;
+    /```[\s\S]*?\n```|`[^`\n]+`|<(pre|code)[^>]*>[\s\S]*?<\/\1>/g;
   const codeBlocks = [];
   template = template.replace(codeBlockRegex, (match) => {
     codeBlocks.push(match);

package/src/watcher.js

@@ -1,5 +1,4 @@
 import chokidar from "chokidar";
-import { exec } from "child_process";
 import path from "path";
 
 // Define files to watch, resolving relative to the current working directory
@@ -16,35 +15,35 @@ const filesToWatch = [
   "config.json",
 ].map((pattern) => path.join(process.cwd(), pattern));
 
-const buildScript = "npm run build";
+export default async function watch(outDir = "dist") {
+  const build = await import("./build.js");
 
-// Initialize watcher
-const watcher = chokidar.watch(filesToWatch, {
-  persistent: true,
-  ignoreInitial: true,
-  awaitWriteFinish: {
-    stabilityThreshold: 200,
-    pollInterval: 100,
-  },
-});
+  // Initialize watcher
+  const watcher = chokidar.watch(filesToWatch, {
+    persistent: true,
+    ignoreInitial: true,
+    awaitWriteFinish: {
+      stabilityThreshold: 200,
+      pollInterval: 100,
+    },
+  });
 
-// Rebuild function
-function triggerBuild(event, filePath) {
-  console.log(`File ${event}: ${filePath}. Running build...`);
-  exec(buildScript, (error, stdout, stderr) => {
-    if (error) {
+  // Rebuild function
+  async function triggerBuild(event, filePath) {
+    console.log(`File ${event}: ${filePath}. Running build...`);
+    try {
+      await build.default(outDir);
+      console.log("Build complete.");
+    } catch (error) {
       console.error(`Build failed: ${error.message}`);
-      return;
     }
-    if (stderr) console.error(`stderr: ${stderr}`);
-    if (stdout) console.log(stdout);
-  });
-}
+  }
 
-// Set up event listeners
-watcher
-  .on("change", (filePath) => triggerBuild("changed", filePath))
-  .on("add", (filePath) => triggerBuild("added", filePath))
-  .on("unlink", (filePath) => triggerBuild("deleted", filePath));
+  // Set up event listeners
+  watcher
+    .on("change", (filePath) => triggerBuild("changed", filePath))
+    .on("add", (filePath) => triggerBuild("added", filePath))
+    .on("unlink", (filePath) => triggerBuild("deleted", filePath));
 
-console.log("Watching for file changes...");
+  console.log("Watching for file changes...");
+}