@vojtaholik/static-kit-cli 2.0.0 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vojtaholik/static-kit-cli",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "type": "module",
   "bin": {
     "static-kit": "./src/cli.ts"
@@ -17,7 +17,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vojtaholik/static-kit-core": "^2.0.0",
+    "@vojtaholik/static-kit-core": "^2.1.1",
     "lightningcss": "^1.28.2",
     "browserslist": "^4.24.4"
   },

package/src/commands/dev.ts

@@ -51,32 +51,36 @@ try {
   // svg/ directory doesn't exist, skip silently
 }
 
-// Dynamically import site's blocks and pages
-const blocksModule = await import(join(blocksDir, "index.ts"));
-const pagesModule = await import(join(pagesDir, "index.ts"));
-
-// Register all blocks at startup
-if (typeof blocksModule.registerAllBlocks === "function") {
-  blocksModule.registerAllBlocks();
+// Hot-reloadable module loader
+// bun --watch can't trace dynamic import() with computed paths,
+// so we use require() + cache clearing to reload pages/blocks in-process.
+let pages: PageConfig[];
+let getPageByPath: (path: string) => PageConfig | undefined;
+
+function clearModuleCache(...dirs: string[]) {
+  for (const key of Object.keys(require.cache)) {
+    if (dirs.some((dir) => key.startsWith(dir))) {
+      delete require.cache[key];
+    }
+  }
 }
 
-const pages: PageConfig[] = pagesModule.pages;
-const getPageByPath = pagesModule.getPageByPath as (
-  path: string
-) => PageConfig | undefined;
+function reloadModules() {
+  clearModuleCache(blocksDir, pagesDir);
 
-// Try to load cms-blocks if it exists
-let cmsBlocks: Record<string, unknown> = {};
-try {
-  const cmsPath = config.cmsBlocksFile
-    ? join(cwd, config.cmsBlocksFile)
-    : join(cwd, "cms-blocks.ts");
-  const cmsBlocksModule = await import(`file://${cmsPath}`);
-  cmsBlocks = cmsBlocksModule.cmsBlocks ?? cmsBlocksModule.default ?? {};
-} catch {
-  // No cms-blocks file, that's fine
+  blockRegistry.clear();
+  const blocksModule = require(join(blocksDir, "index.ts"));
+  if (typeof blocksModule.registerAllBlocks === "function") {
+    blocksModule.registerAllBlocks();
+  }
+
+  const pagesModule = require(join(pagesDir, "index.ts"));
+  pages = pagesModule.pages;
+  getPageByPath = pagesModule.getPageByPath;
 }
 
+reloadModules();
+
 const PORT = config.devPort;
 const publicPath = config.publicPath; // e.g. "/public"
 
@@ -156,20 +160,29 @@ async function handleFileChange(filename: string, dir: string) {
     return;
   }
 
-  // HTML template changed - recompile templates before reload
+  // HTML template changed - recompile templates, reload modules, then broadcast
   if (filename.endsWith(".block.html")) {
     console.log(`📝 Template changed: ${filename}`);
     await compileBlockTemplates({
       blocksDir,
       genDir: join(blocksDir, "gen"),
     });
-    // bun --watch will restart the server after recompile
-    // which triggers browser reload via SSE reconnect
+    try {
+      reloadModules();
+    } catch (err) {
+      console.error("⚠ Module reload failed:", err);
+    }
+    broadcastReload("full");
     return;
   }
 
-  // For other source files, just broadcast (bun --watch handles the restart)
+  // Source file changed - reload modules in-process, then broadcast
   if (filename.endsWith(".ts") || filename.endsWith(".js")) {
+    try {
+      reloadModules();
+    } catch (err) {
+      console.error("⚠ Module reload failed:", err);
+    }
     broadcastReload("full");
   }
 }
@@ -268,7 +281,6 @@ Bun.serve({
             title: p.title,
           })),
           blocks: blockRegistry.types(),
-          schemas: cmsBlocks,
         });
       }
 
@@ -312,7 +324,6 @@ Bun.serve({
                   templateFile: `${blocksDir}/${block.type}.block.html`,
                 }
               : null,
-            schema: block ? cmsBlocks[block.type] : null,
           });
         } catch (err) {
           return Response.json(