chore(deps): update dependency xo to v0.24.0 (#115)

* chore(deps): update dependency xo to v0.24.0

* make xo happy

other-packages/extract-sfc-blocks/index.js

@@ -5,6 +5,7 @@ function stringifyNode(node) {
   if (typeof node === 'string') {
     return node
   }
+
   const content = node.content || []
   return `<${node.tag}${stringifyAttrs(node.attrs || {})}>${content
     .map(n => stringifyNode(n))
@@ -20,6 +21,7 @@ module.exports = input => {
           blocks.push(stringifyNode(node))
           return
         }
+
         return node
       })
   ]).process(input, {

package.json

@@ -24,7 +24,7 @@
     "lerna": "3.13.4",
     "lint-staged": "8.1.5",
     "prettier": "1.17.0",
-    "xo": "0.23.0"
+    "xo": "0.24.0"
   },
   "xo": {
     "extends": [
@@ -35,7 +35,8 @@
       "import/no-unassigned-import": "off",
       "unicorn/filename-case": "off",
       "no-await-in-loop": "off",
-      "unicorn/no-abusive-eslint-disable": "off"
+      "unicorn/no-abusive-eslint-disable": "off",
+      "camelcase": "off"
     },
     "ignore": [
       "**/dist/**",

packages/create-site/cli.js

@@ -51,6 +51,7 @@ promisify(ncp)(path.join(__dirname, 'template'), dir)
       console.log(colors.cyan(`$ npm install`))
       console.log(colors.cyan(`$ npm run dev`))
     }
+
     console.log(colors.dim(`For more details, please check out the README.md`))
   })
   .catch(console.error)

packages/saber-highlighter-prism/loadLanguages.js

@@ -9,15 +9,18 @@ function getPeerDependentsMap() {
     if (language === 'meta') {
       return false
     }
+
     if (components.languages[language].peerDependencies) {
       let { peerDependencies } = components.languages[language]
       if (!Array.isArray(peerDependencies)) {
         peerDependencies = [peerDependencies]
       }
+
       peerDependencies.forEach(peerDependency => {
         if (!peerDependentsMap[peerDependency]) {
           peerDependentsMap[peerDependency] = []
         }
+
         peerDependentsMap[peerDependency].push(language)
       })
     }
@@ -29,6 +32,7 @@ function getPeerDependents(mainLanguage) {
   if (!peerDependentsMap) {
     peerDependentsMap = getPeerDependentsMap()
   }
+
   return peerDependentsMap[mainLanguage] || []
 }
 
@@ -39,6 +43,7 @@ function loadLanguages(arr, withoutDependencies) {
       return language !== 'meta'
     })
   }
+
   if (arr && arr.length === 0) {
     return
   }
@@ -83,6 +88,7 @@ function loadLanguages(arr, withoutDependencies) {
         delete Prism.languages[dependent]
         return true
       }
+
       return false
     })
     if (dependents.length > 0) {

packages/saber-plugin-generate-feed/lib/index.js

@@ -1,7 +1,6 @@
 const path = require('path')
-const url = require('url')
 const { Feed } = require('feed')
-const { getFeedPath } = require('./utils')
+const { getFeedPath, resolveURL } = require('./utils')
 
 const ID = 'generate-feed'
 
@@ -28,9 +27,9 @@ exports.apply = (api, options = {}) => {
   const rss2FeedPath = getFeedPath(options.rss2Feed, 'rss2.xml')
 
   const feedLinks = {
-    json: jsonFeedPath && url.resolve(siteConfig.url, jsonFeedPath),
-    atom: atomFeedPath && url.resolve(siteConfig.url, atomFeedPath),
-    rss2: rss2FeedPath && url.resolve(siteConfig.url, rss2FeedPath)
+    json: jsonFeedPath && resolveURL(siteConfig.url, jsonFeedPath),
+    atom: atomFeedPath && resolveURL(siteConfig.url, atomFeedPath),
+    rss2: rss2FeedPath && resolveURL(siteConfig.url, rss2FeedPath)
   }
 
   api.hooks.afterGenerate.tapPromise(ID, async () => {
@@ -42,7 +41,7 @@ exports.apply = (api, options = {}) => {
         posts.push({
           title: page.attributes.title,
           id: page.attributes.permalink,
-          link: url.resolve(siteConfig.url, page.attributes.permalink),
+          link: resolveURL(siteConfig.url, page.attributes.permalink),
           // Strip HTML tags in excerpt and use it as description (a.k.a. summary)
           description: excerpt && excerpt.replace(/<(?:.|\n)*?>/gm, ''),
           content: page.content,
@@ -51,6 +50,7 @@ exports.apply = (api, options = {}) => {
         })
       }
     }
+
     // Order by published
     const items = posts
       .sort((a, b) => {

packages/saber-plugin-generate-feed/lib/utils.js

@@ -1,4 +1,6 @@
 // @ts-check
+const { URL } = require('url')
+
 /**
  * Get feed path
  * @param {string|boolean|undefined} feedPath
@@ -15,3 +17,12 @@ exports.getFeedPath = (feedPath, defaultPath) => {
 
   return null
 }
+
+/**
+ * @param {string} base
+ * @param {string} pathname
+ * @returns {string}
+ */
+exports.resolveURL = (base, pathname) => {
+  return new URL(base, pathname).href
+}

packages/saber-plugin-netlify-redirect/lib/index.js

@@ -22,6 +22,7 @@ exports.apply = api => {
           config.toPath
         )} ${config.isPermanent ? '301' : '302'}\n`
       }
+
       return content
     }
 

packages/saber-plugin-query-posts/lib/index.js

@@ -46,10 +46,12 @@ exports.apply = (api, options = {}) => {
       if (page.attributes.draft) {
         continue
       }
+
       if (page.attributes.injectAllPosts) {
         injectPostsToPages.add(page)
         continue
       }
+
       if (page.attributes.type === 'post') {
         const pagePublicFields = api.pages.getPagePublicFields(page)
         allPosts.add(pagePublicFields)
@@ -236,9 +238,11 @@ exports.apply = (api, options = {}) => {
     if (pageIndex === 1) {
       return permalink
     }
+
     if (pageIndex === 0) {
       return
     }
+
     return urlJoin(permalink, `page/${pageIndex}`)
   }
 }

packages/saber-plugin-query-posts/lib/utils.js

@@ -7,6 +7,7 @@ function paginate(arr, options) {
   for (let i = 0; i < totalPages; i++) {
     result[i] = arr.slice(i * options.perPage, (i + 1) * options.perPage)
   }
+
   return result
 }
 
@@ -18,6 +19,7 @@ function getIdFromMap(map, name) {
     id = slugify(name.replace(/\//g, '-'))
     map[name] = id
   }
+
   return id
 }
 
@@ -27,6 +29,7 @@ function getNameFromMap(map, id) {
       return name
     }
   }
+
   return id
 }
 
@@ -39,6 +42,7 @@ function renderPermalink(permalink, data) {
   for (const key of Object.keys(data)) {
     permalink = permalink.replace(`:${key}`, data[key])
   }
+
   return permalink
 }
 

packages/saber-utils/index.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-unresolved
 module.exports = require('./dist')
 
 /**

packages/saber/lib/Pages.js

@@ -113,6 +113,7 @@ module.exports = class Pages extends Map {
     if (!page.internal || !page.internal.id) {
       throw new Error(`Page must have an internal id.`)
     }
+
     // Ensure this page is not saved
     // So that it will be emitted to disk later in `emitPages` hook
     page.internal.saved = false
@@ -123,6 +124,7 @@ module.exports = class Pages extends Map {
     if (normalize !== false) {
       page = this.normalizePage(page, file)
     }
+
     this.pageProps.set(page.internal.id, {})
     this.set(page.internal.id, page)
   }
@@ -156,6 +158,7 @@ module.exports = class Pages extends Map {
     if (!page) {
       return page
     }
+
     return Object.assign({}, page, { content: undefined, internal: undefined })
   }
 

packages/saber/lib/Transformers.js

@@ -20,6 +20,7 @@ module.exports = class Transformers {
     for (const transformer of this.transformers.values()) {
       extensions = [...extensions, ...(transformer.extensions || [])]
     }
+
     return extensions
   }
 

packages/saber/lib/index.js

@@ -63,8 +63,10 @@ class Saber {
               const msg = `${hook} ${colors.dim(`(${name})`)}`
               log.verbose(msg)
             }
+
             return fn(...args)
           }
+
           return tapInfo
         }
       })
@@ -131,6 +133,7 @@ class Saber {
           this.theme = distDir
         }
       }
+
       log.info(`Using theme: ${colors.dim(this.config.theme)}`)
       log.verbose(() => `Theme directory: ${colors.dim(this.theme)}`)
     } else {
@@ -197,6 +200,7 @@ class Saber {
             if (typeof p === 'string') {
               p = { resolve: p }
             }
+
             p.resolve = resolveFrom(this.configDir, p.resolve)
             return p
           })
@@ -211,6 +215,7 @@ class Saber {
             plugin.filterPlugins(plugins, options)
           )
         }
+
         return plugin
       }
     )
@@ -255,6 +260,7 @@ class Saber {
       await this.renderer.build()
       await this.hooks.afterBuild.promise()
     }
+
     await this.renderer.generate()
     await this.hooks.afterGenerate.promise()
   }

packages/saber/lib/markdown/escape-interpolations-plugin.js

@@ -1,14 +1,13 @@
 module.exports = md => {
   const defaultCodeInline = md.renderer.rules.code_inline
-  // eslint-disable-next-line camelcase
   md.renderer.rules.code_inline = (...args) => {
     const [tokens, idx] = args
     const token = tokens[idx]
     token.attrSet('v-pre', '')
     return defaultCodeInline(...args)
   }
+
   const defaultFence = md.renderer.rules.fence
-  // eslint-disable-next-line camelcase
   md.renderer.rules.fence = (...args) => {
     const [tokens, idx] = args
     const token = tokens[idx]

packages/saber/lib/markdown/excerpt-plugin.js

@@ -1,7 +1,6 @@
 const hasExcerptMark = value => /<!--\s*more\s*-->/.test(value.trim())
 
 module.exports = (md, { paragraphOnly = true } = {}) => {
-  // eslint-disable-next-line camelcase
   md.renderer.rules.paragraph_close = (...args) => {
     const [tokens, idx, options, env, self] = args
 
@@ -22,6 +21,7 @@ module.exports = (md, { paragraphOnly = true } = {}) => {
             }
           }
         }
+
         env.setAttribute(
           'excerpt',
           self.render(tokens.slice(startIndex, idx + 1), options, env)
@@ -32,9 +32,8 @@ module.exports = (md, { paragraphOnly = true } = {}) => {
     return self.renderToken(tokens, idx, options)
   }
 
-  // eslint-disable-next-line camelcase
   const htmlRule = md.renderer.rules.html_block
-  // eslint-disable-next-line camelcase
+
   md.renderer.rules.html_block = (...args) => {
     const [tokens, idx, options, env, self] = args
     const token = tokens[idx]

packages/saber/lib/markdown/highlight-plugin.js

@@ -67,6 +67,7 @@ module.exports = (md, { highlightedLineBackground } = {}) => {
             if (start && end) {
               return lineNumber >= start && lineNumber <= end
             }
+
             return lineNumber === start
           })
           if (inRange) {
@@ -75,6 +76,7 @@ module.exports = (md, { highlightedLineBackground } = {}) => {
               : ''
             return `<div class="code-line highlighted"${style}>${split}</div>`
           }
+
           return `<div class="code-line">${split}</div>`
         })
         .join('') +

packages/saber/lib/markdown/hoist-tags-plugin.js

@@ -1,7 +1,6 @@
 module.exports = md => {
   const RE = /^<(style|script)(?=(\s|>|$))/i
 
-  // eslint-disable-next-line camelcase
   md.renderer.rules.html_block = (tokens, idx, options, env) => {
     const { content } = tokens[idx]
     const hoistedTags = env.getInternal('hoistedTags') || []
@@ -10,6 +9,7 @@ module.exports = md => {
       env.setInternal('hoistedTags', hoistedTags)
       return ''
     }
+
     return content
   }
 }

packages/saber/lib/markdown/link-plugin.js

@@ -1,7 +1,6 @@
 const path = require('path')
 
 module.exports = function(md) {
-  // eslint-disable-next-line camelcase
   md.renderer.rules.link_open = (tokens, idx, options, env, self) => {
     const token = tokens[idx]
 
@@ -43,7 +42,6 @@ module.exports = function(md) {
     return self.renderToken(tokens, idx, options)
   }
 
-  // eslint-disable-next-line camelcase
   md.renderer.rules.link_close = (tokens, idx, options, env, self) => {
     const openToken = tokens[idx - 2]
     const token = tokens[idx]
@@ -53,6 +51,7 @@ module.exports = function(md) {
         token.tag = 'saber-link'
       }
     }
+
     return prefix + self.renderToken(tokens, idx, options)
   }
 }