Merge pull request #4781 from kristofzerbe/master

fix(#1490): if `post_asset_folder` is set, restrict renderable files to default file extension
hexojs · Jan 1, 2022 · 8465a61 · 8465a61
2 parents c749815 + 8f01a02
commit 8465a61
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/lib/plugins/processor/post.js b/lib/plugins/processor/post.js
@@ -43,7 +43,14 @@ module.exports = ctx => {
 
       if (!result || isHiddenFile(result.path)) return;
 
+      // checks only if there is a renderer for the file type or if is included in skip_render
       result.renderable = ctx.render.isRenderable(path) && !isMatch(path, ctx.config.skip_render);
+
+      // if post_asset_folder is set, restrict renderable files to default file extension
+      if (result.renderable && ctx.config.post_asset_folder) {
+        result.renderable = (extname(ctx.config.new_post_name) === extname(path));
+      }
+
       return result;
     }),
 

diff --git a/test/scripts/processors/post.js b/test/scripts/processors/post.js
@@ -88,6 +88,18 @@ describe('post', () => {
     hexo.config.skip_render = ['_posts/foo/**'];
     pattern.match('_posts/foo/bar.html').should.have.property('renderable', false);
     hexo.config.skip_render = [];
+
+    // Skip render in the subdir assets if post_asset_folder is enabled
+    hexo.config.post_asset_folder = true;
+    pattern.match('_posts/foo/subdir/bar.html').should.have.property('renderable', false);
+    pattern.match('_posts/foo/subdir/bar.css').should.have.property('renderable', false);
+    pattern.match('_posts/foo/subdir/bar.js').should.have.property('renderable', false);
+    hexo.config.post_asset_folder = false;
+
+    // Render in the subdir assets if post_asset_folder is disabled
+    pattern.match('_posts/foo/subdir/bar.html').should.have.property('renderable', true);
+    pattern.match('_posts/foo/subdir/bar.css').should.have.property('renderable', true);
+    pattern.match('_posts/foo/subdir/bar.js').should.have.property('renderable', true);
   });
 
   it('asset - post_asset_folder disabled', async () => {