defuss-ssg 0.0.2 → 0.1.0

package/README.md

@@ -1,14 +1,16 @@
 <h1 align="center">
 
-<img src="assets/defuss_mascott.png" width="100px" />
+<img src="https://github.com/kyr0/defuss/blob/main/assets/defuss_mascott.png?raw=true" width="100px" />
 
 <p align="center">
+  
   <code>defuss-ssg</code>
+
 </p>
 
 <sup align="center">
 
-Simple Static Site Generator (SSG) for defuss - with support for Markdown, MDX, and Jinja2 templates
+Static Site Generator (SSG) for defuss
 
 </sup>
 
@@ -18,7 +20,7 @@ Simple Static Site Generator (SSG) for defuss - with support for Markdown, MDX,
 Usage
 </h3>
 
-Simply generate a static site from a content directory to an output directory with full `defuss`-MDX (GFM + Frontmatter) support:
+Simply generate a static site from a content directory to an output directory with full defuss-MDX (GFM + Frontmatter) support:
 
 ```bash
 npx defuss-ssg build ./folder
@@ -52,6 +54,28 @@ This starts a local server at http://localhost:3000 and watches for changes in:
 
 Changes trigger automatic rebuilds, with the last change always taking priority to prevent build queueing issues.
 
+<h4>Local development of SSG and running the example</h4>
+
+Unlike other SSG systems, this package is **not** meant to be installed in a project, but rather used as a global CLI tool or programmatically.
+
+Developing this means to clone the repo, install dependencies and run the example site:
+
+```bash
+git clone
+
+cd defuss/packages/ssg
+
+bun i && bun build
+
+# for building and serving the example site with auto-rebuild:
+bun run cli-serve ./example
+
+# for one-time build of the example site:
+bun run cli-build ./example
+```
+
+Please create a PR or issue if you find any bugs or have feature requests.
+
 <h4>Programmatic API</h4>
 
 Advanced users may want to use the library programmatically:

package/dist/cli.mjs

@@ -1,14 +1,18 @@
 #!/usr/bin/env node
-import { d as build, s as serve } from './serve-C-BY5Ydk.mjs';
-import { resolve } from 'node:path';
+import { v as validateProjectDir, b as build, s as serve } from './serve-BR2MS6bN.mjs';
+import { join, resolve } from 'node:path';
+import { existsSync, readFileSync } from 'node:fs';
+import { spawn } from 'node:child_process';
 import 'chokidar';
-import 'express';
-import 'serve-static';
-import 'node:fs';
+import 'ultimate-express';
 import 'esbuild';
-import 'remark-frontmatter';
 import 'rehype-katex';
+import 'rehype-stringify';
+import 'remark-frontmatter';
 import 'remark-math';
+import 'remark-gfm';
+import 'remark-parse';
+import 'remark-rehype';
 import 'remark-mdx-frontmatter';
 import './tailwind-DV23JSh-.mjs';
 import '@mdx-js/esbuild';
@@ -16,7 +20,93 @@ import 'fast-glob';
 import 'defuss/server';
 import 'node:fs/promises';
 import 'node:url';
-import 'node:child_process';
+import 'node:module';
+
+const setup = async (projectDir) => {
+  const projectDirStatus = validateProjectDir(projectDir);
+  if (projectDirStatus.code !== "OK") return projectDirStatus;
+  const packageJsonPath = join(projectDir, "package.json");
+  if (!existsSync(packageJsonPath)) {
+    return {
+      code: "MISSING_PACKAGE_JSON",
+      message: `package.json not found in ${projectDir}`
+    };
+  }
+  let packageJson;
+  try {
+    packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+  } catch (error) {
+    return {
+      code: "INVALID_JSON",
+      message: `Error reading package.json in ${projectDir}: ${error.message}`
+    };
+  }
+  const packageManager = packageJson.packageManager || "npm";
+  const pm = packageManager.split("@")[0];
+  const validPMs = ["npm", "yarn", "pnpm", "bun"];
+  if (!validPMs.includes(pm)) {
+    return {
+      code: "UNSUPPORTED_PM",
+      message: `Unsupported package manager: ${pm}`
+    };
+  }
+  console.log(`Setting up project in ${projectDir} using ${pm}...`);
+  try {
+    await new Promise((resolve, reject) => {
+      const child = spawn(pm, ["install"], {
+        cwd: projectDir,
+        shell: true,
+        stdio: ["inherit", "pipe", "pipe"]
+      });
+      const lastLines = [];
+      let printedLines = 0;
+      const pushLine = (line) => {
+        lastLines.push(line);
+        if (lastLines.length > 3) lastLines.shift();
+        if (process.stdout.isTTY) {
+          for (let i = 0; i < printedLines; i++) {
+            process.stdout.write("\x1B[1A\x1B[2K");
+          }
+          for (const l of lastLines) {
+            process.stdout.write(`${l}
+`);
+          }
+          printedLines = lastLines.length;
+        } else {
+          process.stdout.write(`${line}
+`);
+        }
+      };
+      const handleData = (chunk) => {
+        const lines = chunk.toString().split(/\r\n|\n|\r/).filter((l) => l.trim().length > 0);
+        for (const line of lines) {
+          pushLine(line);
+        }
+      };
+      child.stdout?.on("data", handleData);
+      child.stderr?.on("data", handleData);
+      child.on("error", reject);
+      child.on("close", (code) => {
+        if (code === 0) {
+          resolve();
+        } else {
+          reject(
+            new Error(
+              `${pm} install exited with code ${code ?? "unknown"}`
+            )
+          );
+        }
+      });
+    });
+    console.log("Dependencies installed successfully.");
+  } catch (error) {
+    return {
+      code: "INSTALL_FAILED",
+      message: `Failed to install dependencies: ${error.message}`
+    };
+  }
+  return { code: "OK", message: "Setup completed successfully" };
+};
 
 (async () => {
   const args = process.argv.slice(2);
@@ -28,6 +118,7 @@ import 'node:child_process';
     process.exit(1);
   }
   const projectDir = resolve(folder);
+  await setup(projectDir);
   if (command === "build") {
     console.log(`Building ${folder}...`);
     await build({

package/dist/components/index.cjs

@@ -9,15 +9,17 @@ function Hydrate({
   children
 }) {
   const id = `dh_${Math.random().toString(36).slice(2)}`;
+  console.log("vdom HYDRATE", children);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    children,
     /* @__PURE__ */ jsxRuntime.jsx(
       "div",
       {
         "data-hydrate": true,
+        "data-vdom": JSON.stringify(children),
         "data-module": module,
         "data-export": exportName,
-        "data-props-id": id
+        "data-props-id": id,
+        children
       }
     ),
     /* @__PURE__ */ jsxRuntime.jsx("script", { type: "application/json", id, children: JSON.stringify(props) })

package/dist/components/index.d.cts

@@ -5,6 +5,7 @@ interface HydrateProps extends Props {
     exportName?: string;
     props?: Record<string, any>;
 }
-declare function Hydrate({ module, exportName, props, children, }: HydrateProps): any;
+declare function Hydrate({ module, exportName, props, children, }: HydrateProps): JSX.Element;
 
-export { Hydrate, type HydrateProps };
+export { Hydrate };
+export type { HydrateProps };

package/dist/components/index.d.mts

@@ -5,6 +5,7 @@ interface HydrateProps extends Props {
     exportName?: string;
     props?: Record<string, any>;
 }
-declare function Hydrate({ module, exportName, props, children, }: HydrateProps): any;
+declare function Hydrate({ module, exportName, props, children, }: HydrateProps): JSX.Element;
 
-export { Hydrate, type HydrateProps };
+export { Hydrate };
+export type { HydrateProps };

package/dist/components/index.mjs

@@ -7,15 +7,17 @@ function Hydrate({
   children
 }) {
   const id = `dh_${Math.random().toString(36).slice(2)}`;
+  console.log("vdom HYDRATE", children);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    children,
     /* @__PURE__ */ jsx(
       "div",
       {
         "data-hydrate": true,
+        "data-vdom": JSON.stringify(children),
         "data-module": module,
         "data-export": exportName,
-        "data-props-id": id
+        "data-props-id": id,
+        children
       }
     ),
     /* @__PURE__ */ jsx("script", { type: "application/json", id, children: JSON.stringify(props) })