@daz4126/swifty 3.1.0 → 3.2.0

package/README.md

@@ -59,14 +59,14 @@ npx swifty my-site          # Create new site in my-site/ folder
 npx swifty build            # Build static site to dist/ (for production)
 npx swifty start            # Build, watch, and serve at localhost:3000 (for development)
 npx swifty build --out dir  # Build to custom output directory
-npx swifty deploy "message" # Build, git add, commit, and push (message optional)
+npx swifty deploy "message" # Build, commit the output folder, and push
 ```
 
 ### Development vs Production
 
 - **`swifty start`** - For development. Includes live reload (auto-refreshes browser on file changes) and file watching with incremental builds for CSS/JS/images.
 - **`swifty build`** - For production deployment. Produces clean output without any development scripts.
-- **`swifty deploy "message"`** - Builds the site and commits/pushes to git in one command.
+- **`swifty deploy "message"`** - Builds the site, commits only the generated output folder, and pushes it to git.
 
 ## Documentation
 

package/package.json

@@ -1,11 +1,17 @@
 {
   "name": "@daz4126/swifty",
-  "version": "3.1.0",
-  "main": "index.js",
+  "version": "3.2.0",
+  "main": "./src/index.js",
   "type": "module",
+  "exports": {
+    ".": "./src/index.js"
+  },
   "bin": {
     "swifty": "./src/cli.js"
   },
+  "engines": {
+    "node": ">=18"
+  },
   "files": [
     "src/"
   ],
@@ -45,10 +51,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/daz4126/swifty.git"
+    "url": "git+https://github.com/daz-codes/swifty.git"
   },
   "bugs": {
-    "url": "https://github.com/daz4126/swifty/issues"
+    "url": "https://github.com/daz-codes/swifty/issues"
   },
-  "homepage": "https://github.com/daz4126/swifty#readme"
+  "homepage": "https://github.com/daz-codes/swifty#readme"
 }

package/src/build.js

@@ -1,22 +1,47 @@
 import { argv } from "process";
+import path from "path";
 import { fileURLToPath } from "url";
+
+import fsExtra from "fs-extra";
+
 import { copyAssets, optimizeImages } from "./assets.js";
 import { generatePages, createPages, addLinks } from "./pages.js";
 import { generateRssFeeds } from "./rss.js";
 import { generateSeoFiles } from "./sitemap.js";
-import { dirs } from "./config.js";
+import { baseDir, dirs } from "./config.js";
+import { clearDataCache } from "./data.js";
+import { resetCaches } from "./layout.js";
+import { clearCache as clearPartialCache } from "./partials.js";
+
+const prepareOutputDirectory = async (outputDir) => {
+  const projectPath = path.resolve(baseDir);
+  const outputPath = path.resolve(baseDir, outputDir);
+  const outputContainsProject =
+    projectPath === outputPath || projectPath.startsWith(`${outputPath}${path.sep}`);
+
+  if (outputContainsProject) {
+    throw new Error(`Refusing to empty unsafe output directory: ${outputPath}`);
+  }
+
+  await fsExtra.emptyDir(outputPath);
+  return outputPath;
+};
 
 export default async function build(outputDir = dirs.dist) {
   const startTime = performance.now();
   console.log("🚀 Starting build...");
+  const resolvedOutputDir = await prepareOutputDirectory(outputDir);
+  clearDataCache();
+  clearPartialCache();
   
   const copyStart = performance.now();
-  await copyAssets(outputDir);
+  await copyAssets(resolvedOutputDir);
   const copyTime = performance.now() - copyStart;
   console.log(`📁 Assets copied in ${(copyTime / 1000).toFixed(2)}s`);
+  await resetCaches();
   
   const imageStart = performance.now();
-  await optimizeImages(outputDir);
+  await optimizeImages(resolvedOutputDir);
   const imageTime = performance.now() - imageStart;
   console.log(`🖼️  Images optimized in ${(imageTime / 1000).toFixed(2)}s`);
   
@@ -31,17 +56,17 @@ export default async function build(outputDir = dirs.dist) {
   console.log(`🔗 Links added in ${(linksTime / 1000).toFixed(2)}s`);
   
   const createStart = performance.now();
-  await createPages(pages, outputDir);
+  await createPages(pages, resolvedOutputDir);
   const createTime = performance.now() - createStart;
   console.log(`✨ Pages created in ${(createTime / 1000).toFixed(2)}s`);
   
   const rssStart = performance.now();
-  await generateRssFeeds(pages, outputDir);
+  await generateRssFeeds(pages, resolvedOutputDir);
   const rssTime = performance.now() - rssStart;
   console.log(`📡 RSS feeds generated in ${(rssTime / 1000).toFixed(2)}s`);
 
   const seoStart = performance.now();
-  await generateSeoFiles(pages, outputDir);
+  await generateSeoFiles(pages, resolvedOutputDir);
   const seoTime = performance.now() - seoStart;
   console.log(`🧭 SEO files generated in ${(seoTime / 1000).toFixed(2)}s`);
   
@@ -70,6 +95,8 @@ export default async function build(outputDir = dirs.dist) {
   }
 }
 
+export { prepareOutputDirectory };
+
 // Run the build when invoked directly (e.g. `npm run build`, `npm start`),
 // not when imported as a module (e.g. by cli.js).
 if (argv[1] && fileURLToPath(import.meta.url) === argv[1]) {

package/src/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
-import { spawn, execSync } from "child_process";
+import { execFileSync, spawn, spawnSync } from "child_process";
+import { fileURLToPath } from "url";
 
 const args = process.argv.slice(2);
 let outDir = "dist"; // default
@@ -14,7 +15,46 @@ if (outIndex !== -1 && args[outIndex + 1]) {
 // Pass outDir as an environment variable too (optional, still useful)
 process.env.OUT_DIR = outDir;
 
-const reservedCommands = ["build", "start", "watch", "deploy"];
+const commitAndPushOutput = (
+  outputDir,
+  commitMessage,
+  { execFile = execFileSync, spawnFile = spawnSync } = {},
+) => {
+  const existingDiff = spawnFile("git", ["diff", "--cached", "--quiet"], {
+    stdio: "ignore",
+  });
+  if (existingDiff.error) throw existingDiff.error;
+  if (existingDiff.status === 1) {
+    throw new Error("Refusing to deploy while unrelated changes are already staged.");
+  }
+  if (existingDiff.status !== 0) {
+    throw new Error(
+      `Unable to inspect staged changes (git exited ${existingDiff.status}).`,
+    );
+  }
+
+  console.log(`Adding generated output from ${outputDir} to git...`);
+  execFile("git", ["add", "--", outputDir], { stdio: "inherit" });
+
+  const diffResult = spawnFile("git", ["diff", "--cached", "--quiet"], {
+    stdio: "ignore",
+  });
+  if (diffResult.error) throw diffResult.error;
+  if (diffResult.status === 0) {
+    console.log("No generated output changes to deploy.");
+    return false;
+  }
+  if (diffResult.status !== 1) {
+    throw new Error(`Unable to inspect staged changes (git exited ${diffResult.status}).`);
+  }
+
+  console.log("Committing generated output...");
+  execFile("git", ["commit", "-m", commitMessage], { stdio: "inherit" });
+
+  console.log("Pushing to remote...");
+  execFile("git", ["push"], { stdio: "inherit" });
+  return true;
+};
 
 async function main() {
   const command = args[0];
@@ -64,7 +104,11 @@ async function main() {
       break;
     }
     case "deploy": {
-      const commitMessage = args[1] || "Deploying latest build";
+      const commandArgs = args.slice(1).filter((arg, index, values) => {
+        if (arg === "--out") return false;
+        return index === 0 || values[index - 1] !== "--out";
+      });
+      const commitMessage = commandArgs[0] || "Deploying latest build";
 
       // Build the site
       const build = await import("./build.js");
@@ -74,18 +118,8 @@ async function main() {
 
       // Git operations
       try {
-        console.log("Adding files to git...");
-        execSync("git add .", { stdio: "inherit" });
-
-        console.log("Committing changes...");
-        execSync(`git commit -m "${commitMessage.replace(/"/g, '\\"')}"`, {
-          stdio: "inherit",
-        });
-
-        console.log("Pushing to remote...");
-        execSync("git push", { stdio: "inherit" });
-
-        console.log("Deployed successfully!");
+        const deployed = commitAndPushOutput(outDir, commitMessage);
+        if (deployed) console.log("Deployed successfully!");
       } catch (error) {
         console.error("Deploy failed:", error.message);
         process.exit(1);
@@ -104,4 +138,8 @@ async function main() {
   }
 }
 
-main();
+if (process.argv[1] && fileURLToPath(import.meta.url) === process.argv[1]) {
+  main();
+}
+
+export { commitAndPushOutput, main };

package/src/config.js

@@ -64,15 +64,27 @@ const builtInDefaults = {
   navigation_cache_ttl: 15,
 };
 
-const loadedConfig = await loadConfig(baseDir);
-const hasConfig = (key) => Object.prototype.hasOwnProperty.call(loadedConfig, key);
+const defaultConfig = {};
 
-if (hasConfig('turbo')) {
-  console.warn('The "turbo" config option is deprecated. Use "morphing" and "prefetching" instead.');
-  if (!hasConfig('morphing')) {
-    loadedConfig.morphing = loadedConfig.turbo;
+const reloadConfig = async () => {
+  const loadedConfig = await loadConfig(baseDir);
+  const hasConfig = (key) =>
+    Object.prototype.hasOwnProperty.call(loadedConfig, key);
+
+  if (hasConfig('turbo')) {
+    console.warn('The "turbo" config option is deprecated. Use "morphing" and "prefetching" instead.');
+    if (!hasConfig('morphing')) {
+      loadedConfig.morphing = loadedConfig.turbo;
+    }
   }
-}
-const defaultConfig = { ...builtInDefaults, ...loadedConfig };
 
-export { baseDir, dirs, defaultConfig, loadConfig };
+  for (const key of Object.keys(defaultConfig)) {
+    delete defaultConfig[key];
+  }
+  Object.assign(defaultConfig, builtInDefaults, loadedConfig);
+  return defaultConfig;
+};
+
+await reloadConfig();
+
+export { baseDir, dirs, defaultConfig, loadConfig, reloadConfig };

package/src/index.js

@@ -0,0 +1,3 @@
+export { default, default as build, prepareOutputDirectory } from "./build.js";
+export { defaultConfig, loadConfig, reloadConfig } from "./config.js";
+export { addLinks, createPages, generatePages } from "./pages.js";

package/src/minify.js

@@ -1,7 +1,10 @@
+let protectionSequence = 0;
+
 const protectBlocks = (content, pattern) => {
   const blocks = [];
+  const tokenPrefix = `__SWIFTY_MINIFY_BLOCK_${protectionSequence++}_`;
   const protectedContent = content.replace(pattern, (match) => {
-    const token = `__SWIFTY_MINIFY_BLOCK_${blocks.length}__`;
+    const token = `${tokenPrefix}${blocks.length}__`;
     blocks.push(match);
     return token;
   });
@@ -9,7 +12,10 @@ const protectBlocks = (content, pattern) => {
   return {
     content: protectedContent,
     restore: (value) =>
-      value.replace(/__SWIFTY_MINIFY_BLOCK_(\d+)__/g, (_, index) => blocks[index]),
+      value.replace(
+        new RegExp(`${tokenPrefix}(\\d+)__`, "g"),
+        (_, index) => blocks[index],
+      ),
   };
 };
 
@@ -116,14 +122,17 @@ const minifyHtml = (html) => {
     html,
     /<(pre|code|textarea|script|style)\b[^>]*>[\s\S]*?<\/\1>/gi,
   );
+  const strings = protectBlocks(
+    blocks.content,
+    /(["'])(?:\\[\s\S]|(?!\1)[^\\])*\1/g,
+  );
 
-  const minified = blocks.content
+  const minified = strings.content
     .replace(/<!--(?!\[if|<!|>)[\s\S]*?-->/g, "")
-    .replace(/\s{2,}/g, " ")
-    .replace(/>\s+</g, "><")
+    .replace(/\s+/g, " ")
     .trim();
 
-  return blocks.restore(minified);
+  return blocks.restore(strings.restore(minified));
 };
 
 export { minifyCss, minifyHtml, minifyJs };

package/src/pages.js

@@ -44,6 +44,54 @@ const parseDate = (dateValue) => {
   return isNaN(parsed.getTime()) ? null : parsed;
 };
 
+const applyMarkdownFileToPage = async (
+  page,
+  filePath,
+  { notFound = false, folderIndex = false } = {},
+) => {
+  const markdownContent = await fs.readFile(filePath, "utf-8");
+  const { data, content } = matter(markdownContent);
+  Object.assign(page, { meta: { ...page.meta, ...data }, content });
+
+  if (folderIndex) {
+    const stats = await fs.stat(filePath);
+    const { dateFormat } = page.meta;
+    page.hasIndexContent = true;
+    page.indexFilePath = filePath;
+    page.createdAtObj = stats.birthtime;
+    page.updatedAtObj = stats.mtime;
+    page.created_at = new Date(stats.birthtime).toLocaleDateString(
+      undefined,
+      dateFormat,
+    );
+    page.updated_at = new Date(stats.mtime).toLocaleDateString(
+      undefined,
+      dateFormat,
+    );
+    page.date = new Date(stats.birthtime).toLocaleDateString(undefined, dateFormat);
+  }
+
+  if (notFound && data.sitemap === undefined) {
+    page.meta.sitemap = false;
+  }
+
+  page.title = page.meta.title || page.title;
+  page.name = page.meta.title || page.name;
+
+  if (typeof data.nav === "boolean") {
+    page.nav = data.nav;
+  }
+
+  if (data.date) {
+    const parsedDate = parseDate(data.date);
+    if (parsedDate) {
+      page.dateObj = parsedDate;
+      page.date = parsedDate.toLocaleDateString(undefined, page.meta.dateFormat);
+      page.meta.date = page.date;
+    }
+  }
+};
+
 const tagsMap = new Map();
 const pageIndex = [];
 const pageIndexUrls = new Set();
@@ -78,6 +126,8 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
       files,
       async (file) => {
         const filePath = path.join(sourceDir, file.name);
+        if (parent && file.name === "index.md") return null;
+
         const stats = await getValidStats(filePath);
         if (!stats) return null;
 
@@ -130,28 +180,11 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
         };
 
         if (path.extname(file.name) === ".md") {
-          const markdownContent = await fs.readFile(filePath, "utf-8");
-          const { data, content } = matter(markdownContent);
-          Object.assign(page, { meta: { ...page.meta, ...data }, content });
-          if (notFound && data.sitemap === undefined) {
-            page.meta.sitemap = false;
-          }
-          page.title = page.meta.title || page.title;
-          page.name = page.meta.title || page.name;
-
-          // Allow front matter to override nav (opt in or opt out)
-          if (typeof data.nav === "boolean") {
-            page.nav = data.nav;
-          }
-
-          // If front matter has a date, parse and format it
-          if (data.date) {
-            const parsedDate = parseDate(data.date);
-            if (parsedDate) {
-              page.dateObj = parsedDate;
-              page.date = parsedDate.toLocaleDateString(undefined, dateFormat);
-              page.meta.date = page.date;
-            }
+          await applyMarkdownFileToPage(page, filePath, { notFound });
+        } else if (isDirectory) {
+          const indexPath = path.join(filePath, "index.md");
+          if (await fsExtra.pathExists(indexPath)) {
+            await applyMarkdownFileToPage(page, indexPath, { folderIndex: true });
           }
         }
 
@@ -208,7 +241,9 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
           page.visiblePages = chunks[0];
 
           // First page content
-          page.content = await generateLinkList(page.filename, chunks[0]);
+          if (!page.hasIndexContent) {
+            page.content = await generateLinkList(page.filename, chunks[0]);
+          }
           page.meta.pagination = generatePaginationNav({
             currentPage: 1,
             totalPages,
@@ -242,7 +277,9 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
             page.paginatedPages.push(paginatedPage);
           }
         } else {
-          page.content = await generateLinkList(page.filename, page.pages);
+          if (!page.hasIndexContent) {
+            page.content = await generateLinkList(page.filename, page.pages);
+          }
           page.meta.pagination = '';
         }
       }

package/src/watcher.js

@@ -2,7 +2,7 @@ import chokidar from "chokidar";
 import livereload from "livereload";
 import path from "path";
 import fs from "fs";
-import { defaultConfig } from "./config.js";
+import { defaultConfig, reloadConfig } from "./config.js";
 
 // Directory to extension mapping for filtering
 const dirExtensions = {
@@ -80,6 +80,14 @@ function getChangeType(filePath) {
   return "full"; // pages, layouts, partials, config files
 }
 
+const isRootConfigFile = (filePath) => {
+  const relativePath = path.relative(process.cwd(), filePath);
+  return (
+    !relativePath.includes(path.sep) &&
+    ["config.yaml", "config.yml", "config.json"].includes(relativePath)
+  );
+};
+
 export default async function watch(outDir = "dist") {
   const build = await import("./build.js");
   const { copySingleAsset, optimizeSingleImage } = await import("./assets.js");
@@ -94,12 +102,13 @@ export default async function watch(outDir = "dist") {
   }
 
   // Start livereload server
+  const livereloadPort = defaultConfig.livereload_port || 35729;
   const lrServer = livereload.createServer({
+    port: livereloadPort,
     usePolling: true,
     delay: defaultConfig.watcher_delay || 100,
   });
   const outPath = path.join(process.cwd(), outDir);
-  const livereloadPort = defaultConfig.livereload_port || 35729;
   lrServer.watch(outPath);
   console.log(`LiveReload server started on port ${livereloadPort}`);
 
@@ -128,6 +137,10 @@ export default async function watch(outDir = "dist") {
     const filename = path.basename(filePath);
 
     try {
+      if (isRootConfigFile(filePath)) {
+        await reloadConfig();
+      }
+
       if (event === "deleted") {
         // For deletions, do a full rebuild to clean up
         console.log(`🗑️  File deleted: ${filename}. Running full build...`);