Skip to content

Commit 070d202

Browse files
committed
refactor: 移除json-ld功能并更新依赖项
- 删除json-ld相关代码和文档 - 更新package.json中的依赖版本 - 调整VSCode设置中的eslint行为 - 重构extend/index.js中的模块加载逻辑 - 优化utils.js中的代码风格和功能
1 parent 267b979 commit 070d202

7 files changed

Lines changed: 3726 additions & 120 deletions

File tree

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
}
66
},
77
"editor.codeActionsOnSave": {
8-
"source.fixAll.eslint": true
8+
"source.fixAll.eslint": "explicit"
99
}
1010
}

lib/extend/index.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
'use strict';
1+
"use strict";
22

3-
module.exports = hexo => {
3+
module.exports = (hexo) => {
44
return Promise.all([
5-
require('./lozad')(hexo),
6-
require('./medium-zoom')(hexo),
7-
require('./reward')(hexo),
8-
require('./external-link')(hexo),
9-
require('./json-ld')(hexo),
10-
require('./comment')(hexo),
11-
require('./font-size-preview')(hexo)
5+
// todo fix lozad
6+
// require('./lozad')(hexo),
7+
require("./medium-zoom")(hexo),
8+
require("./reward")(hexo),
9+
require("./external-link")(hexo),
10+
require("./comment")(hexo),
11+
require("./font-size-preview")(hexo),
1212
]);
1313
};

lib/extend/json-ld/README.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

lib/extend/json-ld/index.js

Lines changed: 0 additions & 62 deletions
This file was deleted.

lib/utils.js

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1-
'use strict';
1+
"use strict";
22

3-
const { mergeWith } = require('lodash');
4-
const { join } = require('path');
5-
const { readFileSync } = require('fs');
6-
const { Cache } = require('hexo-util');
3+
const { mergeWith } = require("lodash");
4+
const { join } = require("path");
5+
const { readFileSync } = require("fs");
6+
const { Cache } = require("hexo-util");
77
const cache = new Cache();
88

99
const utils = {
1010
htmlTag: (tag, attrs, text) => {
11-
let attrText = '';
11+
let attrText = "";
1212
if (attrs) {
13-
attrText = ' ' + Object.keys(attrs).map(key => `${key}="${attrs[key]}"`).join(' ');
13+
attrText =
14+
" " +
15+
Object.keys(attrs)
16+
.map((key) => `${key}="${attrs[key]}"`)
17+
.join(" ");
1418
}
15-
let end = '/>';
19+
let end = "/>";
1620
if (text) {
1721
end = `>${text}</${tag}>`;
1822
}
@@ -25,25 +29,28 @@ const utils = {
2529
}
2630
});
2731
},
28-
readJsonFile: path => {
32+
readJsonFile: (path) => {
2933
return cache.apply(path, () => {
30-
const data = readFileSync(path, 'utf-8');
34+
const data = readFileSync(path, "utf-8");
3135
return JSON.parse(data);
3236
});
3337
},
34-
deps: dir => utils.readJsonFile(join(dir, 'package.json')).dependencies,
35-
loadUtil: hexo => {
38+
deps: (dir) => utils.readJsonFile(join(dir, "package.json")).dependencies,
39+
loadUtil: (hexo) => {
3640
const deps = utils.deps(hexo.base_dir);
37-
return name => {
41+
return (name) => {
3842
if (!deps[name]) {
39-
return hexo.loadPlugin(hexo.resolvePlugin(name));
43+
return hexo.loadPlugin(
44+
hexo.resolvePlugin(name, hexo.base_dir),
45+
hexo.base_dir,
46+
);
4047
}
4148
};
4249
},
43-
isHexoRendererMarkedMini: hexo => {
50+
isHexoRendererMarkedMini: (hexo) => {
4451
const deps = utils.deps(hexo.base_dir);
45-
return deps['hexo-renderer-marked-mini'];
46-
}
52+
return deps["hexo-renderer-marked-mini"];
53+
},
4754
};
4855

4956
module.exports = utils;

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,29 @@
3333
},
3434
"homepage": "https://www.dnocm.com/cake",
3535
"devDependencies": {
36-
"chai": "^4.3.4",
37-
"eslint": "^7.22.0",
38-
"eslint-config-hexo": "^4.1.0",
39-
"hexo": "^5.3.0",
40-
"jshint-stylish": "^2.1.0",
41-
"mocha": "^9.0.2",
36+
"chai": "^6.2.2",
37+
"eslint": "^10.0.3",
38+
"eslint-config-hexo": "^6.0.0",
39+
"hexo": "^8.1.1",
40+
"jshint-stylish": "^2.2.1",
41+
"mocha": "^11.7.5",
4242
"stylint": "^2.0.0"
4343
},
4444
"dependencies": {
45-
"@jiangtj/hexo-icon-svg-core": "^1.0.0",
46-
"@jiangtj/hexo-patch-load-highlight-style": "^1.1.0",
47-
"ajv": "^8.6.1",
48-
"cheerio": "^1.0.0-rc.5",
49-
"hexo-extend-injector2": "^0.3.0",
50-
"hexo-renderer-ejs": "^1.0.0",
51-
"hexo-renderer-stylus": "^2.0.1",
52-
"hexo-util": "^2.4.0",
53-
"inquirer": "^8.0.0",
54-
"js-yaml": "^4.0.0",
55-
"lodash": "^4.17.19",
45+
"@jiangtj/hexo-icon-svg-core": "^1.1.0",
46+
"@jiangtj/hexo-patch-load-highlight-style": "^1.2.0",
47+
"ajv": "^8.18.0",
48+
"cheerio": "^1.2.0",
49+
"hexo-extend-injector2": "^0.3.1",
50+
"hexo-renderer-ejs": "^2.0.0",
51+
"hexo-renderer-stylus": "^3.0.1",
52+
"hexo-util": "^4.0.0",
53+
"inquirer": "^13.3.2",
54+
"js-yaml": "^4.1.1",
55+
"lodash": "^4.17.23",
5656
"lozad": "^1.16.0",
57-
"medium-zoom": "^1.0.6",
58-
"semver": "^7.3.4"
57+
"medium-zoom": "^1.1.0",
58+
"semver": "^7.7.4"
5959
},
6060
"publishConfig": {
6161
"registry": "https://registry.npmjs.org/"

0 commit comments

Comments
 (0)