basecampjs 0.0.4 → 0.0.6

package/index.js

@@ -128,18 +128,20 @@ async function walkFiles(dir) {
   return results;
 }
 
-function createNunjucksEnv(layoutsDir, pagesDir, srcDir) {
-  // Allow templates to resolve from layouts, pages, or the src root
+function createNunjucksEnv(layoutsDir, pagesDir, srcDir, partialsDir) {
+  // Allow templates to resolve from layouts, partials, pages, or the src root
+  const searchPaths = [layoutsDir, partialsDir, pagesDir, srcDir].filter(Boolean);
   return new nunjucks.Environment(
-    new nunjucks.FileSystemLoader([layoutsDir, pagesDir, srcDir], { noCache: true }),
+    new nunjucks.FileSystemLoader(searchPaths, { noCache: true }),
     { autoescape: false }
   );
 }
 
-function createLiquidEnv(layoutsDir, pagesDir, srcDir) {
+function createLiquidEnv(layoutsDir, pagesDir, srcDir, partialsDir) {
   // Liquid loader will search these roots for partials/layouts
+  const root = [layoutsDir, partialsDir, pagesDir, srcDir].filter(Boolean);
   return new Liquid({
-    root: [layoutsDir, pagesDir, srcDir],
+    root,
     extname: ".liquid",
     cache: false
   });
@@ -147,18 +149,24 @@ function createLiquidEnv(layoutsDir, pagesDir, srcDir) {
 
 function toUrlPath(outRel) {
   const normalized = outRel.replace(/\\/g, "/");
-  if (normalized.endsWith("index.html")) {
-    const trimmed = normalized.slice(0, -"index.html".length);
-    return trimmed ? `/${trimmed}` : "/";
+  let path = `/${normalized}`;
+  // Remove trailing index.html for directory-style URLs
+  if (path.endsWith("index.html")) {
+    path = path.slice(0, -"index.html".length);
   }
-  return `/${normalized}`;
+  // Strip trailing slash except for root
+  if (path !== "/" && path.endsWith("/")) {
+    path = path.slice(0, -1);
+  }
+  return path || "/";
 }
 
 function pageContext(frontmatter, html, config, relPath, data, path = "/") {
   return {
     site: { name: config.siteName, config },
     page: { ...frontmatter, content: html, source: relPath, path },
-    collections: data
+    collections: data,
+    ...data
   };
 }
 
@@ -255,11 +263,12 @@ async function build(cwdArg = cwd) {
   const srcDir = resolve(cwdArg, config.srcDir || "src");
   const pagesDir = join(srcDir, "pages");
   const layoutsDir = join(srcDir, "layouts");
+  const partialsDir = join(srcDir, "partials");
   const dataDir = join(srcDir, "data");
   const publicDir = resolve(cwdArg, "public");
   const outDir = resolve(cwdArg, config.outDir || "dist");
-  const env = createNunjucksEnv(layoutsDir, pagesDir, srcDir);
-  const liquidEnv = createLiquidEnv(layoutsDir, pagesDir, srcDir);
+  const env = createNunjucksEnv(layoutsDir, pagesDir, srcDir, partialsDir);
+  const liquidEnv = createLiquidEnv(layoutsDir, pagesDir, srcDir, partialsDir);
   const data = await loadData(dataDir);
 
   await cleanDir(outDir);
@@ -412,4 +421,4 @@ async function main() {
 main().catch((err) => {
   console.error(err);
   exit(1);
-});
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "basecampjs",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "type": "module",
   "description": "BasecampJS engine for CampsiteJS static site generator.",
   "bin": {