Merge 79b4da6 into 80c3ef3

index.js

@@ -4,4 +4,4 @@
 
 const renderer = require('./lib/renderer');
 
-hexo.extend.renderer.register('ejs', 'html', renderer, true);
+hexo.extend.renderer.register('ejs', 'html', renderer);

lib/renderer.js

@@ -3,13 +3,11 @@
 const ejs = require('ejs');
 
 function ejsRenderer(data, locals) {
-  return ejs.render(data.text, Object.assign({filename: data.path}, locals));
+  return ejs.render(data.text, Object.assign({ filename: data.path }, locals), { async: true });
 }
 
 ejsRenderer.compile = function(data) {
-  return ejs.compile(data.text, {
-    filename: data.path
-  });
+  return ejs.compile(data.text, { filename: data.path }, { async: true });
 };
 
 module.exports = ejsRenderer;

test/index.js

@@ -7,46 +7,39 @@ const pathFn = require('path');
 describe('EJS renderer', () => {
   const r = require('../lib/renderer');
 
-  it('default', () => {
+  it('default', async () => {
     const body = 'Hello <%= name %>';
-    const result = r({text: body}, {name: 'world'});
+    const result = await r({ text: body }, { name: 'world' });
 
     result.should.eql('Hello world');
   });
 
-  it('comments', () => {
-    const body = [
-      'Comment <%# hidden %>'
-    ].join('\n');
+  it('comments', async () => {
+    const body = ['Comment <%# hidden %>'].join('\n');
 
-    const result = r({text: body});
+    const result = await r({text: body});
     result.should.eql('Comment ');
   });
 
-  it('include', () => {
+  it('include', async () => {
     const body = '<%- include(\'test\') %>';
     const path = pathFn.join(__dirname, 'include_test', 'index.ejs');
     const includePath = pathFn.join(path, '../test.ejs');
     const includeBody = 'include body';
 
-    return fs.writeFile(includePath, includeBody).then(() => {
-      const result = r({
-        text: body,
-        path
-      });
+    await fs.writeFile(includePath, includeBody);
 
-      result.should.eql(includeBody);
-    }).finally(() => {
-      return fs.unlink(includePath);
-    });
+    const render = await r.compile({ text: body, path });
+    const result = await render({ text: body, path });
+    result.should.eql(includeBody);
+
+    await fs.unlink(includePath);
   });
 
-  it('compile', () => {
+  it('compile', async () => {
     const body = 'Hello <%= name %>';
-    const render = r.compile({text: body});
-    const result = render({
-      name: 'world'
-    });
+    const render = await r.compile({ text: body });
+    const result = await render({ name: 'world' });
 
     result.should.eql('Hello world');
   });