From ea0d7c3df1e43b2061027482abe77a210dcf6b4d Mon Sep 17 00:00:00 2001 From: sxyugao Date: Mon, 3 Aug 2020 20:40:14 +0800 Subject: [PATCH 1/2] chore(deps): support hexo 5.0.0 (#26) --- lib/cache.js | 18 +++++++++--------- lib/list-json.js | 14 +++++++------- lib/util.js | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/cache.js b/lib/cache.js index f59d870..290756a 100755 --- a/lib/cache.js +++ b/lib/cache.js @@ -23,27 +23,27 @@ module.exports = ( hexo ) => { // load hexo@3.2's cache // -------------------------------------------- // If the article is not updated, hexo internally caches the previous data (db.json). - if (hexo && hexo.locals && hexo.locals.cache.cache && hexo.locals.cache.cache.posts.length && hexo.locals.cache.cache.posts.data[0].popularPost_tmp_gaData && hexo.locals.cache.cache.posts.data[hexo.locals.cache.cache.posts.length - 1].popularPost_tmp_gaData) { + if (hexo && hexo.locals && hexo.locals.cache.cache && hexo.locals.cache.cache.get('posts').length && hexo.locals.cache.cache.get('posts').data[0].popularPost_tmp_gaData && hexo.locals.cache.cache.get('posts').data[hexo.locals.cache.cache.get('posts').length - 1].popularPost_tmp_gaData) { let tmp_gaData = hexo.config.popularPosts.tmp.gaData hexo.config.popularPosts.tmp.postPath = null hexo.config.popularPosts.tmp.postPath = [] hexo.config.popularPosts.tmp.gaData = null hexo.config.popularPosts.tmp.gaData = [] - for (let v=0; v { // ----------------------------------------------- // When you use the hexo clean command, the internal cache of hexo is cleared. // In this case , merge the updated article data and plugin's cache data (e.g. hexo-rpp-cached.json). - } else if (hexo && hexo.locals && hexo.locals.cache.cache && hexo.locals.cache.cache.posts.length && !hexo.locals.cache.cache.posts.data[0].popularPost_tmp_gaData && cache_path) { + } else if (hexo && hexo.locals && hexo.locals.cache.cache && hexo.locals.cache.cache.get('posts').length && !hexo.locals.cache.cache.get('posts').data[0].popularPost_tmp_gaData && cache_path) { for (let i = 0; i < gaData.length; i++) { let matchedPath = true for (let k = 0; k < hexo.config.popularPosts.tmp.postPath.length; k++) { @@ -66,7 +66,7 @@ module.exports = ( hexo ) => { // ----------------------------------------------- // When you use the hexo clean command, the internal cache of hexo is cleared. // In this case , merge the postPath data - } else if (hexo && hexo.locals && hexo.locals.cache.cache && hexo.locals.cache.cache.posts.length && hexo.locals.cache.cache.posts.data[0].popularPost_tmp_gaData && !hexo.locals.cache.cache.posts.data[hexo.locals.cache.cache.posts.length - 1].popularPost_tmp_gaData) { + } else if (hexo && hexo.locals && hexo.locals.cache.cache && hexo.locals.cache.cache.get('posts').length && hexo.locals.cache.cache.get('posts').data[0].popularPost_tmp_gaData && !hexo.locals.cache.cache.get('posts').data[hexo.locals.cache.cache.get('posts').length - 1].popularPost_tmp_gaData) { if (hexo.config.popularPosts.tmp.postPath.length == 0) { for (let i = 0; i < gaData.length; i++) { hexo.config.popularPosts.tmp.postPath.push(gaData[i].path) diff --git a/lib/list-json.js b/lib/list-json.js index 09199d6..814911b 100755 --- a/lib/list-json.js +++ b/lib/list-json.js @@ -21,26 +21,26 @@ module.exports.getList = (inOptions, inPost, inHexo) => { // load hexo@3.2's cache // -------------------------------------------- - if (!config.popularPosts.tmp.cache_path && inHexo && inHexo.locals && inHexo.locals.cache.cache && inHexo.locals.cache.cache.posts.length && inHexo.locals.cache.cache.posts.data[0].popularPost_tmp_gaData) { + if (!config.popularPosts.tmp.cache_path && inHexo && inHexo.locals && inHexo.locals.cache.cache && inHexo.locals.cache.cache.get('posts').length && inHexo.locals.cache.cache.get('posts').data[0].popularPost_tmp_gaData) { let tmp_gaData = config.popularPosts.tmp.gaData config.popularPosts.tmp.postPath = null config.popularPosts.tmp.postPath = [] config.popularPosts.tmp.gaData = null config.popularPosts.tmp.gaData = [] - for (let i = 0; i < inHexo.locals.cache.cache.posts.length; i++) { + for (let i = 0; i < inHexo.locals.cache.cache.get('posts').length; i++) { // PV update if (config.popularPosts.tmp.isGaUpdate) { for (k=0; k { // load hexo@3.2's cache // ---------------------------------------------- let isUseHexosCache = false - if (( !inGaData || inGaData == []) && inHexo && inHexo.locals && inHexo.locals.cache.cache && inHexo.locals.cache.cache.posts.length && inHexo.locals.cache.cache.posts.data[0].popularPost_tmp_gaData) { + if (( !inGaData || inGaData == []) && inHexo && inHexo.locals && inHexo.locals.cache.cache && inHexo.locals.cache.cache.get('posts').length && inHexo.locals.cache.cache.get('posts').data[0].popularPost_tmp_gaData) { isUseHexosCache = true gaData_tmp = null gaData_tmp = [] let postPath_temp = [] - for (let v=0; v Date: Mon, 3 Aug 2020 22:04:15 +0800 Subject: [PATCH 2/2] update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0bf3b6b..66da27b 100755 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "devDependencies": { "eslint": "^4.12.0", "eslint-config-google": "^0.9.1", - "hexo": "^4.2.0", + "hexo": "^5.0.0", "intelli-espower-loader": "^1.0.1", "istanbul": "^0.4.5", "mocha": "^4.0.1",