Merge pull request #367 from iamcam/master

Exclude drafts from the sitemap, added typescript file to glob

scripts/generate-sitemap.js

@@ -1,5 +1,6 @@
 const fs = require('fs')
 const globby = require('globby')
+const matter = require('gray-matter')
 const prettier = require('prettier')
 const siteMetadata = require('../data/siteMetadata')
 
@@ -7,10 +8,12 @@ const siteMetadata = require('../data/siteMetadata')
   const prettierConfig = await prettier.resolveConfig('./.prettierrc.js')
   const pages = await globby([
     'pages/*.js',
+    'pages/*.tsx',
     'data/blog/**/*.mdx',
     'data/blog/**/*.md',
     'public/tags/**/*.xml',
     '!pages/_*.js',
+    '!pages/_*.tsx',
     '!pages/api',
   ])
 
@@ -19,16 +22,26 @@ const siteMetadata = require('../data/siteMetadata')
         <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
             ${pages
               .map((page) => {
+                // Exclude drafts from the sitemap
+                if (page.search('.md') >= 1 && fs.existsSync(page)) {
+                  const source = fs.readFileSync(page, 'utf8')
+                  const fm = matter(source)
+                  if (fm.data.draft) {
+                    return
+                  }
+                }
                 const path = page
                   .replace('pages/', '/')
                   .replace('data/blog', '/blog')
                   .replace('public/', '/')
                   .replace('.js', '')
+                  .replace('.tsx', '')
                   .replace('.mdx', '')
                   .replace('.md', '')
                   .replace('/feed.xml', '')
                 const route = path === '/index' ? '' : path
-                if (page === `pages/404.js` || page === `pages/blog/[...slug].js`) {
+
+                if (page.search('pages/404.') > -1 || page.search(`pages/blog/[...slug].`) > -1) {
                   return
                 }
                 return `