WIP fix: do not encode IDN domain

lib/generator.js

@@ -2,6 +2,7 @@
 
 const micromatch = require('micromatch');
 const template = require('./template');
+const url = require('url');
 
 module.exports = function(locals) {
   const config = this.config;
@@ -22,7 +23,15 @@ module.exports = function(locals) {
     })
     .sort(function(a, b) {
       return b.updated - a.updated;
-    });
+    })
+    .map(post => ({
+      ...post,
+      permalink: url.format({
+        protocol: url.parse(post.permalink).protocol,
+        hostname: url.parse(post.permalink).hostname,
+        pathname: encodeURI(url.parse(post.permalink).pathname)
+      })
+    }));
 
   const xml = template(config).render({
     config: config,

lib/template.js

@@ -13,10 +13,6 @@ module.exports = function(config) {
     watch: false
   });
 
-  env.addFilter('uriencode', str => {
-    return encodeURI(str);
-  });
-
   const sitemapSrc = config.sitemap.template || pathFn.join(__dirname, '../sitemap.xml');
   sitemapTmpl = nunjucks.compile(fs.readFileSync(sitemapSrc, 'utf8'), env);
 

sitemap.xml

@@ -2,7 +2,7 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   {% for post in posts %}
   <url>
-    <loc>{{ post.permalink | uriencode }}</loc>
+    <loc>{{ post.permalink }}</loc>
     {% if post.updated %}
     <lastmod>{{ post.updated.toISOString() }}</lastmod>
     {% elif post.date %}

test/index.js

@@ -3,6 +3,7 @@
 const should = require('chai').should(); // eslint-disable-line
 const Hexo = require('hexo');
 const cheerio = require('cheerio');
+const urlFn = require('url');
 
 describe('Sitemap generator', () => {
   const hexo = new Hexo(__dirname, {silent: true});
@@ -67,4 +68,20 @@ describe('Sitemap generator', () => {
       result.should.be.ok;
     });
   });
+
+  it('IDN handling', () => {
+    hexo.config.url = 'http://fôo.com/bár';
+    const parsedUrl = urlFn.format({
+      protocol: urlFn.parse(hexo.config.url).protocol,
+      hostname: urlFn.parse(hexo.config.url).hostname,
+      pathname: encodeURI(urlFn.parse(hexo.config.url).pathname)
+    });
+
+    const result = generator(locals);
+    const $ = cheerio.load(result.data);
+
+    $('url').each((index, element) => {
+      $(element).children('loc').text().startsWith(parsedUrl).should.be.true;
+    });
+  });
 });