Merge branch 'master' into feat/fence

Author: D-Sketon

lib/extend/injector.ts

@@ -44,7 +44,7 @@ class Injector {
   }
 
   getSize(entry: Entry): number {
-    return this.cache.apply(`${entry}-size`, Object.keys(this.store[entry]).length) as number;
+    return this.cache.apply(`${entry}-size`, () => Object.keys(this.store[entry]).length) as number;
   }
 
   register(entry: Entry, value: string | (() => string), to = 'default'): void {

lib/plugins/filter/before_post_render/backtick_code_block.ts

@@ -2,7 +2,7 @@ import type { HighlightOptions } from '../../../extend/syntax_highlight';
 import type Hexo from '../../../hexo';
 import type { RenderData } from '../../../types';
 
-const rBacktick = /^((?:[^\S\r\n]*>){0,3}[^\S\r\n]*)(`{3,}|~{3,})[^\S\r\n]*((?:.*?[^`\s])?)[^\S\r\n]*\n((?:[\s\S]*?\n)?)(?:(?:[^\S\r\n]*>){0,3}[^\S\r\n]*)\2[^\S\r\n]?(\n+|$)/gm;
+const rBacktick = /^((?:(?:[^\S\r\n]*>){0,3}|[-*+]|[0-9]+\.)[^\S\r\n]*)(`{3,}|~{3,})[^\S\r\n]*((?:.*?[^`\s])?)[^\S\r\n]*\n((?:[\s\S]*?\n)?)(?:(?:[^\S\r\n]*>){0,3}[^\S\r\n]*)\2[^\S\r\n]?(\n+|$)/gm;
 const rAllOptions = /([^\s]+)\s+(.+?)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/;
 const rLangCaption = /([^\s]+)\s*(.+)?/;
 const rAdditionalOptions = /\s((?:line_number|line_threshold|first_line|wrap|mark|language_attr|highlight):\S+)/g;

lib/plugins/helper/list_archives.ts

@@ -1,6 +1,7 @@
-import type { LocalsType } from '../../types';
+import type Query from 'warehouse/dist/query';
+import type { LocalsType, PostSchema } from '../../types';
 import { toMomentLocale } from './date';
-import { url_for } from 'hexo-util';
+import { url_for, Cache } from 'hexo-util';
 
 interface Options {
   format?: string;
@@ -20,6 +21,8 @@ interface Data {
   count: number;
 }
 
+const postsCache = new Cache();
+
 function listArchivesHelper(this: LocalsType, options: Options = {}) {
   const { config } = this;
   const archiveDir = config.archive_dir;
@@ -41,7 +44,7 @@ function listArchivesHelper(this: LocalsType, options: Options = {}) {
     format = type === 'monthly' ? 'MMMM YYYY' : 'YYYY';
   }
 
-  const posts = this.site.posts.sort('date', order);
+  const posts = config.relative_link ? postsCache.apply(`date-${order}`, () => this.site.posts.sort('date', order)) as Query<PostSchema> : this.site.posts.sort('date', order);
   if (!posts.length) return result;
 
   const data: Data[] = [];

test/scripts/filters/backtick_code_block.ts

@@ -692,6 +692,80 @@ describe('Backtick code block', () => {
       codeBlock(data);
       data.content.should.eql('<hexoPostRenderCodeBlock>' + expected + '</hexoPostRenderCodeBlock>');
     });
+
+    // https://github.com/hexojs/hexo/issues/5423
+    it('with ordered list', () => {
+      const data = {
+        content: [
+          '1. ``` js',
+          code,
+          '```',
+          '2. ``` js',
+          code,
+          '```'
+        ].join('\n')
+      };
+
+      codeBlock(data);
+      data.content.should.eql([
+        '1. <hexoPostRenderCodeBlock>' + highlight(code, { lang: 'js' }) + '</hexoPostRenderCodeBlock>',
+        '2. <hexoPostRenderCodeBlock>' + highlight(code, { lang: 'js' }) + '</hexoPostRenderCodeBlock>'
+      ].join('\n'));
+    });
+
+    // https://github.com/hexojs/hexo/issues/5423
+    it('with unordered list', () => {
+      let data = {
+        content: [
+          '- ``` js',
+          code,
+          '```',
+          '- ``` js',
+          code,
+          '```'
+        ].join('\n')
+      };
+
+      codeBlock(data);
+      data.content.should.eql([
+        '- <hexoPostRenderCodeBlock>' + highlight(code, { lang: 'js' }) + '</hexoPostRenderCodeBlock>',
+        '- <hexoPostRenderCodeBlock>' + highlight(code, { lang: 'js' }) + '</hexoPostRenderCodeBlock>'
+      ].join('\n'));
+
+      data = {
+        content: [
+          '* ``` js',
+          code,
+          '```',
+          '* ``` js',
+          code,
+          '```'
+        ].join('\n')
+      };
+
+      codeBlock(data);
+      data.content.should.eql([
+        '* <hexoPostRenderCodeBlock>' + highlight(code, { lang: 'js' }) + '</hexoPostRenderCodeBlock>',
+        '* <hexoPostRenderCodeBlock>' + highlight(code, { lang: 'js' }) + '</hexoPostRenderCodeBlock>'
+      ].join('\n'));
+
+      data = {
+        content: [
+          '+ ``` js',
+          code,
+          '```',
+          '+ ``` js',
+          code,
+          '```'
+        ].join('\n')
+      };
+
+      codeBlock(data);
+      data.content.should.eql([
+        '+ <hexoPostRenderCodeBlock>' + highlight(code, { lang: 'js' }) + '</hexoPostRenderCodeBlock>',
+        '+ <hexoPostRenderCodeBlock>' + highlight(code, { lang: 'js' }) + '</hexoPostRenderCodeBlock>'
+      ].join('\n'));
+    });
   });
 
   describe('prismjs', () => {