fixed incompatability with nodejs 'join' method on Windows with regex FIXES nuxt-community#94 nuxt-community#109 and fixed content navigation by making sure regex is parsing content body FIXES nuxt-community#111

Author: alidcast

examples/content-navigation/nuxt.config.js

@@ -1,3 +1,5 @@
+const nuxtent = require('../../dist/module').default
+
 module.exports = {
   head: {
     title: 'starter',
@@ -7,5 +9,5 @@ module.exports = {
       { hid: 'description', name: 'description', content: 'Nuxt.js project' }
     ]
   },
-  modules: ['nuxtent']
+  modules: [nuxtent]
 }

lib/content/api.js

@@ -41,7 +41,7 @@ const curryResponseHandler = (
 
   return function sendContent(req, res) {
     const send = response(res)
-    const permalink = req.params['0']
+    const permalink = req.params['0'].replace(/\\|\/\//, '/')
     // eslint-disable-next-line no-unused-vars
     const [_, queryStr] = req.url.match(/\?(.*)/) || []
     const { only, between, ...query } = parse(queryStr)

lib/content/page.js

@@ -73,7 +73,7 @@ export default function prepPage(meta, options, isDev) {
         const nestedPath = /([^_][a-zA-z]*?)\/[^a-z_]*/
         const matchedPath = options.page.match(nestedPath)
         if (matchedPath && matchedPath[1] !== 'index') {
-          cached.path = join(matchedPath[1], permalink)
+          cached.path = matchedPath[1] + permalink
         } else {
           cached.path = permalink
         }
@@ -89,10 +89,8 @@ export default function prepPage(meta, options, isDev) {
         const { year, month, day } = splitDate(date)
         const params = { section, slug, date, year, month, day }
         const toPermalink = permalinkCompiler(options.permalink)
-        cached.permalink = join(
-          '/',
-          toPermalink(params, { pretty: true }).replace(/%2F/gi, '/')
-        ) // make url encoded slash pretty
+        cached.permalink =
+          '/' + toPermalink(params, { pretty: true }).replace(/%2F/gi, '/') // make url encoded slash pretty
       }
       return cached.permalink
     },
@@ -114,7 +112,7 @@ export default function prepPage(meta, options, isDev) {
 
           let result
           const anchors = []
-          while ((result = anchorsExp.exec(_rawData))) {
+          while ((result = anchorsExp.exec(_rawData.body))) {
             // eslint-disable-next-line no-unused-vars
             const [match, codeSnippet, otherHeading, headingText] = result
             if (!(codeSnippet || otherHeading) && headingText) {
@@ -141,7 +139,8 @@ export default function prepPage(meta, options, isDev) {
         const { parsers } = options
         const { dirName, section, fileName } = meta
         if (fileName.search(/\.comp\.md$/) > -1) {
-          const relativePath = '.' + join(dirName, section, fileName)
+          const relativePath =
+            '.' + join(dirName, section, fileName).replace(/\\/, '/') // normalize windows path
           cached.body = {
             relativePath // component body compiled by loader and imported separately
           }

lib/loader.js

@@ -13,10 +13,10 @@ const getDirOpts = (contentOptions, section) => {
   return contentOptions['/'] ? contentOptions['/'] : contentOptions[section]
 }
 
-const getSection = path => {
+const getSection = dirPath => {
   // capture '/content/closestSubsection' or  '/content'
   // eslint-disable-next-line no-unused-vars
-  const [match, section] = path.match(/\/content([/][a-zA-Z\-_]*|$)/)
+  const [match, section] = dirPath.match(/[/\\]content([/\\][a-zA-Z\-_]*|$)/)
   return section === '' ? '/' : section
 }