@skafform/vite-plugin 0.1.1 → 0.1.3

package/dist/index.js

@@ -7,8 +7,6 @@ var VIRTUAL_CONFIG = "virtual:skafform/config";
 var RESOLVED_CONFIG = "\0virtual:skafform/config";
 var VIRTUAL_SERVER_INIT = "virtual:skafform/server-init";
 var RESOLVED_SERVER_INIT = "\0virtual:skafform/server-init";
-var VIRTUAL_NAV = "virtual:skafform/nav";
-var RESOLVED_NAV = "\0virtual:skafform/nav";
 var VIRTUAL_ADMIN_SECTIONS = "virtual:skafform/admin-sections";
 var RESOLVED_ADMIN_SECTIONS = "\0virtual:skafform/admin-sections";
 var norm = (p) => p.replace(/\\/g, "/");
@@ -59,10 +57,22 @@ function skafform() {
   let root = process.cwd();
   let brickIndex = /* @__PURE__ */ new Set();
   let config = {};
+  let themeJsonCache = null;
+  let bricksConfigCache = null;
   function getThemeJson(theme) {
+    if (themeJsonCache) return themeJsonCache;
     const childPath = resolve(root, `themes/${theme}/child/theme.json`);
     if (!existsSync(childPath)) return {};
-    return JSON.parse(readFileSync(childPath, "utf-8"));
+    const parsed = JSON.parse(readFileSync(childPath, "utf-8"));
+    themeJsonCache = parsed;
+    return parsed;
+  }
+  function getBricksConfig() {
+    if (bricksConfigCache) return bricksConfigCache;
+    const path = resolve(root, "skafform-bricks.json");
+    if (!existsSync(path)) return null;
+    bricksConfigCache = JSON.parse(readFileSync(path, "utf-8"));
+    return bricksConfigCache;
   }
   function readCss(path) {
     return readFileSync(path, "utf-8").replace(/^/, "");
@@ -88,14 +98,17 @@ ${vars}
     enforce: "pre",
     configResolved(resolved) {
       root = resolved.root;
-      config = JSON.parse(readFileSync(resolve(root, "skafform.config.json"), "utf-8"));
+      try {
+        config = JSON.parse(readFileSync(resolve(root, "skafform.config.json"), "utf-8"));
+      } catch (err) {
+        throw new Error(`[skafform] Cannot read skafform.config.json: ${err instanceof Error ? err.message : err}`);
+      }
       brickIndex = loadBrickIndex(root);
       writeFileSync(resolve(root, "app/skafform-theme.css"), getCssString(), "utf-8");
     },
     resolveId(id, importer) {
       if (id === VIRTUAL_CONFIG) return RESOLVED_CONFIG;
       if (id === VIRTUAL_SERVER_INIT) return RESOLVED_SERVER_INIT;
-      if (id === VIRTUAL_NAV) return RESOLVED_NAV;
       if (id === VIRTUAL_ADMIN_SECTIONS) return RESOLVED_ADMIN_SECTIONS;
       if (id.startsWith(".") && importer) {
         const themeDir = norm(resolve(root, `themes/${config.theme}`));
@@ -123,35 +136,9 @@ ${vars}
           customize: { ...themeJson.customize ?? {}, ...config.customize ?? {} }
         })}`;
       }
-      if (id === RESOLVED_NAV) {
-        const bricksConfigPath = resolve(root, "skafform-bricks.json");
-        const themeJson = getThemeJson(config.theme);
-        const navLocations = themeJson.nav_locations ?? config.nav_locations ?? {};
-        const customNav = themeJson.nav ?? config.nav ?? {};
-        const bricksConfig = existsSync(bricksConfigPath) ? JSON.parse(readFileSync(bricksConfigPath, "utf-8")) : { bricks: {} };
-        const registry = {};
-        for (const loc of Object.keys(navLocations)) registry[loc] = [];
-        for (const [brickName, brick] of Object.entries(bricksConfig.bricks ?? {})) {
-          for (const item of brick.nav ?? []) {
-            if (registry[item.location] !== void 0) {
-              registry[item.location].push({ ...item, order: item.order ?? 0, brick: brickName });
-            }
-          }
-        }
-        for (const [loc, items] of Object.entries(customNav)) {
-          if (registry[loc] !== void 0) {
-            registry[loc].push(...items.map((i) => ({ ...i, order: i.order ?? 0, brick: "config" })));
-          }
-        }
-        for (const loc of Object.keys(registry)) {
-          registry[loc].sort((a, b) => a.order - b.order);
-        }
-        return `export default ${JSON.stringify(registry)}`;
-      }
       if (id === RESOLVED_ADMIN_SECTIONS) {
-        const bricksConfigPath = resolve(root, "skafform-bricks.json");
-        if (!existsSync(bricksConfigPath)) return "export default []";
-        const bricksConfig = JSON.parse(readFileSync(bricksConfigPath, "utf-8"));
+        const bricksConfig = getBricksConfig();
+        if (!bricksConfig) return "export default []";
         const sections = [];
         for (const brick of Object.values(bricksConfig.bricks ?? {})) {
           for (const section of brick.adminSections ?? []) {
@@ -161,23 +148,31 @@ ${vars}
         return `export default ${JSON.stringify(sections)}`;
       }
       if (id === RESOLVED_SERVER_INIT) {
-        const bricksConfigPath = resolve(root, "skafform-bricks.json");
-        if (!existsSync(bricksConfigPath)) return "";
-        const bricksConfig = JSON.parse(readFileSync(bricksConfigPath, "utf-8"));
+        const bricksConfig = getBricksConfig();
+        if (!bricksConfig) return "";
         const adapters = bricksConfig.adapters ?? {};
         if (!adapters.auth) return "";
         const adapterPath = resolve(root, adapters.auth).replace(/\\/g, "/");
         return [
           `import { setAdapter } from "@skafform/core/runtime"`,
-          `import { authAdapter } from "${adapterPath}"`,
+          `import { authAdapter } from ${JSON.stringify(adapterPath)}`,
           `setAdapter(authAdapter)`
         ].join("\n");
       }
     },
     handleHotUpdate({ file, server }) {
-      if (file.includes("skafform.config") || file.includes("themes") || file.includes("bricks")) {
-        config = JSON.parse(readFileSync(resolve(root, "skafform.config.json"), "utf-8"));
+      const f = norm(file);
+      const r = norm(root);
+      if (f === `${r}/skafform.config.json` || f.startsWith(`${r}/themes/`) || f.startsWith(`${r}/bricks/`)) {
+        try {
+          config = JSON.parse(readFileSync(resolve(root, "skafform.config.json"), "utf-8"));
+        } catch {
+          return;
+        }
         brickIndex = loadBrickIndex(root);
+        themeJsonCache = null;
+        bricksConfigCache = null;
+        writeFileSync(resolve(root, "app/skafform-theme.css"), getCssString(), "utf-8");
         server.moduleGraph.invalidateAll();
         server.ws.send({ type: "full-reload" });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skafform/vite-plugin",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "exports": {
     ".": {