@daz4126/swifty 2.2.0 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daz4126/swifty",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "main": "index.js",
   "type": "module",
   "bin": {

package/src/pages.js

@@ -123,7 +123,9 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
       }
 
       pages.push(page);
-      pageIndex.push({ url: page.url, title: page.title, nav: page.nav });
+      if (!pageIndex.some((p) => p.url === page.url)) {
+        pageIndex.push({ url: page.url, title: page.title, nav: page.nav });
+      }
     });
 
     // Await all directory recursion
@@ -141,7 +143,7 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
       folder: true,
       name: "Tags",
       title: "All Tags",
-      layout: "pages",
+      layout: tagLayout ? "tags" : defaultConfig.default_layout_name,
       updated_at: new Date().toLocaleDateString(
         undefined,
         defaultConfig.dateFormat,
@@ -159,16 +161,13 @@ const generatePages = async (sourceDir, baseDir = sourceDir, parent) => {
           defaultConfig.dateFormat,
         ),
         url: `/tags/${tag}`,
-        layout: tagLayout ? "tags" : "pages",
+        layout: tagLayout ? "tags" : defaultConfig.default_layout_name,
         data: { ...config, title: `Pages tagged with ${capitalize(tag)}` },
       };
-      page.content = pagesForTag
-        .map((p) => `* <a href="${p.url}">${p.title}</a>`)
-        .join("\n");
+      page.content = await generateLinkList("tags", pagesForTag);
 
       tagPage.pages.push(page);
     }
-
     tagPage.content = await generateLinkList("tags", tagPage.pages);
     pages.push(tagPage);
   }

package/src/watcher.js

@@ -39,5 +39,5 @@ export default async function startWatcher(outDir = "dist") {
     }
   });
 
-  console.log(`👀 Watching for changes in ${outDir}...`);
+  console.log(`👀 Watching for changes...`);
 }