@slybridges/kiss 0.5.2 → 0.5.6

package/README.md

@@ -42,7 +42,7 @@ Concept is being tuned until reaching v1. Things might break. Use at your own ri
 
 ## Requirements
 
-Node 10 or above.
+Node 12 or above.
 
 ## Quick start
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slybridges/kiss",
-  "version": "0.5.2",
+  "version": "0.5.6",
   "description": "Keep It Simple and Static site generator",
   "main": "src/index.js",
   "bin": {
@@ -12,24 +12,24 @@
   "author": "Sylvestre Dupont",
   "license": "MIT",
   "dependencies": {
-    "browser-sync": "^2.26.14",
-    "chalk": "^4.1.0",
-    "cheerio": "^1.0.0-rc.6",
-    "chokidar": "^3.5.1",
-    "date-fns": "^2.21.1",
-    "fast-glob": "^3.2.5",
+    "browser-sync": "^2.27.7",
+    "chalk": "^4.1.2",
+    "cheerio": "^1.0.0-rc.10",
+    "chokidar": "^3.5.2",
+    "date-fns": "^2.27.0",
+    "fast-glob": "^3.2.7",
     "front-matter": "^4.0.2",
-    "fs-extra": "^9.1.0",
+    "fs-extra": "^10.0.0",
     "lodash": "^4.17.21",
-    "marked": "^2.0.3",
+    "marked": "^4.0.6",
     "nunjucks": "^3.2.3",
-    "sharp": "^0.28.1",
-    "slugify": "^1.5.0",
+    "sharp": "^0.29.3",
+    "slugify": "^1.6.3",
     "xml": "^1.0.1",
-    "yargs": "^16.2.0"
+    "yargs": "^17.3.0"
   },
   "devDependencies": {
-    "eslint": "^7.24.0"
+    "eslint": "^8.3.0"
   },
   "repository": {
     "type": "git",

package/src/config/defaultConfig.js

@@ -8,6 +8,7 @@ const {
 } = require("../libs")
 const {
   jsLoader,
+  jsonLoader,
   markdownLoader,
   staticLoader,
   textLoader,
@@ -112,6 +113,7 @@ const defaultConfig = {
   libs: {},
   loaders: [
     { handler: jsLoader, namespace: "jsLoader" },
+    { handler: jsonLoader, namespace: "jsonLoader" },
     { handler: markdownLoader, namespace: "markdownLoader" },
     { handler: staticLoader, namespace: "staticLoader" },
     { handler: textLoader, namespace: "textLoader" },
@@ -145,6 +147,7 @@ const defaultConfig = {
   ],
   // Namespaced options
   jsLoader: { match: ["**/*.js"] },
+  jsonLoader: { match: ["**/*.json"] },
   markdownLoader: { match: ["**/*.md"] },
   textLoader: { match: ["**/*.html"] },
   staticLoader: {
@@ -171,7 +174,8 @@ const defaultConfig = {
   rss: {
     active: true,
     target: "feed.xml",
-    pageFilter: (page) => page._meta.isPost && !page.excludeFromCollection,
+    pageFilter: (page) =>
+      page.url && page._meta.isPost && !page.excludeFromCollection,
     xmlOptions: {
       declaration: true,
       indent: env === "production" ? null : "  ",
@@ -196,7 +200,7 @@ const defaultConfig = {
       collection: 0.5,
     },
     target: "sitemap.xml",
-    pageFilter: (page) => page._meta.outputType === "HTML",
+    pageFilter: (page) => page.url && page._meta.outputType === "HTML",
     xmlOptions: {
       declaration: true,
       indent: env === "production" ? null : "  ",

package/src/data/computeTitle.js

@@ -1,7 +1,11 @@
 // Super basic computation, you probably want to set the title manually
 // or do something smarter according to your context
-const computeTitle = ({ permalink }, config) =>
-  config.libs.unslugify(permalink, { slash: " | " })
+const computeTitle = ({ permalink }, config) => {
+  if (!permalink) {
+    return null
+  }
+  return config.libs.unslugify(permalink, { slash: " | " })
+}
 
 computeTitle.kissDependencies = ["permalink"]
 

package/src/data/computeURL.js

@@ -1,4 +1,7 @@
 const computeURL = ({ permalink }, config, context) => {
+  if (!permalink) {
+    return null
+  }
   if (!context.site.url) {
     return permalink
   }

package/src/libs/loadMarked.js

@@ -1,4 +1,4 @@
-const marked = require("marked")
+const { marked } = require("marked")
 
 const loadMarked = (_, config) => {
   config.libs.marked = marked

package/src/loaders/index.js

@@ -1,6 +1,7 @@
 const baseLoader = require("./baseLoader")
 const computeCollectionLoader = require("./computeCollectionLoader")
 const jsLoader = require("./jsLoader")
+const jsonLoader = require("./jsonLoader")
 const markdownLoader = require("./markdownLoader")
 const staticLoader = require("./staticLoader")
 const textLoader = require("./textLoader")
@@ -9,6 +10,7 @@ module.exports = {
   baseLoader,
   computeCollectionLoader,
   jsLoader,
+  jsonLoader,
   markdownLoader,
   staticLoader,
   textLoader,

package/src/loaders/jsonLoader.js

@@ -0,0 +1,17 @@
+const { parseISO } = require("date-fns")
+const { readJsonSync } = require("fs-extra")
+
+const jsonLoader = (path, options, page, pages, config) => {
+  let fileData = readJsonSync(path)
+  const published = fileData[config.defaults.pagePublishedAttribute]
+  const updated = fileData[config.defaults.pageUpdatedAttribute]
+  if (published && typeof published === "string") {
+    fileData[config.defaults.pagePublishedAttribut] = parseISO(published)
+  }
+  if (updated && typeof updated === "string") {
+    fileData[config.defaults.pageUpdatedAttribute] = parseISO(updated)
+  }
+  return { ...page, ...fileData }
+}
+
+module.exports = jsonLoader

package/src/writers/sitemapContextWriter.js

@@ -33,7 +33,7 @@ const pageObject = (page, options, config) => {
   }
   return {
     url: [
-      { loc: page.permalink },
+      { loc: page.url },
       { lastmod: lastMod },
       { changefreq: changeFreq },
       { priority: priority.toFixed(1) },

package/clean.sh

@@ -1,2 +0,0 @@
-rm -rf public package-lock.json node_modules
-