test: improve tests (#39)

Author: erezrokah

make_sitemap.js

@@ -4,14 +4,16 @@ const util = require('util')
 
 const globby = require('globby')
 const mkdirp = require('mkdirp')
-const sm = require('sitemap')
+const { createSitemap } = require('sitemap')
 
-const getPaths = async ({ distPath, exclude }) => {
+const ensureTrailingSlash = (url) => (url.endsWith('/') ? url : `${url}/`)
+
+const getPaths = async ({ distPath, exclude, cwd }) => {
   const htmlFiles = `${distPath}/**/**.html`
   const excludeFiles = (exclude || []).map((filePath) => `!${filePath.replace(/^!/, '')}`)
 
   const lookup = [htmlFiles].concat(excludeFiles)
-  const paths = await globby(lookup)
+  const paths = await globby(lookup, { cwd })
   return paths
 }
 
@@ -28,34 +30,47 @@ const getUrlFromFile = ({ file, distPath, prettyURLs, trailingSlash }) => {
     return prettyUrl
   }
 
-  return prettyUrl.endsWith('/') ? prettyUrl : `${prettyUrl}/`
+  return ensureTrailingSlash(prettyUrl)
 }
 
-const DEFAULT_CHANGE_FREQ = 'weekly'
-const DEFAULT_PRIORITY = 0.8
-// 600 sec cache period
-const DEFAULT_CACHE_TIME = 600000
-
-module.exports = async function makeSitemap(opts = {}) {
-  const { distPath, fileName, homepage, exclude, prettyURLs, trailingSlash, failBuild } = opts
-  const paths = await getPaths({ distPath, exclude })
+const getUrlsFromPaths = ({ paths, distPath, prettyURLs, trailingSlash, changeFreq, priority, cwd }) => {
   const urls = paths.map((file) => {
     const url = getUrlFromFile({ file, distPath, prettyURLs, trailingSlash })
     return {
       url,
-      changefreq: opts.changeFreq || DEFAULT_CHANGE_FREQ,
-      priority: opts.priority || DEFAULT_PRIORITY,
+      changefreq: changeFreq,
+      priority,
       lastmodrealtime: true,
-      lastmodfile: file,
+      lastmodfile: cwd === undefined ? file : path.resolve(cwd, file),
     }
   })
-  const options = {
-    hostname: `${homepage.replace(/\/$/, '')}/`,
-    cacheTime: DEFAULT_CACHE_TIME,
-    urls,
-  }
+  return urls
+}
+
+const DEFAULT_CHANGE_FREQ = 'weekly'
+const DEFAULT_PRIORITY = 0.8
+// 600 sec cache period
+const DEFAULT_CACHE_TIME = 600000
+
+module.exports = async function makeSitemap(opts = {}) {
+  const {
+    distPath,
+    fileName,
+    homepage,
+    exclude,
+    prettyURLs,
+    trailingSlash,
+    failBuild,
+    cwd,
+    changeFreq = DEFAULT_CHANGE_FREQ,
+    priority = DEFAULT_PRIORITY,
+  } = opts
+
+  const paths = await getPaths({ distPath, exclude, cwd })
+  const urls = getUrlsFromPaths({ paths, distPath, prettyURLs, trailingSlash, changeFreq, priority, cwd })
+
   // Creates a sitemap object given the input configuration with URLs
-  const sitemap = sm.createSitemap(options)
+  const sitemap = createSitemap({ hostname: ensureTrailingSlash(homepage), cacheTime: DEFAULT_CACHE_TIME, urls })
   // Generates XML
   try {
     await util.promisify(sitemap.toXML.bind(sitemap))()

package-lock.json

@@ -59,7 +59,7 @@
     "@netlify/eslint-config-node": "^2.0.0",
     "ava": "^2.1.0",
     "husky": "^4.3.5",
-    "rimraf": "^3.0.2",
+    "tempy": "^1.0.0",
     "xml2js": "^0.4.23"
   }
 }