Skip to content

Commit 3fc2a0d

Browse files
wdssmqwdssmq
committed
style. eslint
1 parent 0058329 commit 3fc2a0d

7 files changed

Lines changed: 46 additions & 49 deletions

File tree

‎packages/Mikan_Proj/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"version": "1.0.2",
32
"type": "module",
3+
"version": "1.0.2",
44
"scripts": {
55
"build": "rollup -c --environment NODE_ENV:prod",
66
"dev": "rollup -c -w --environment NODE_ENV:dev",
7-
"lint": "eslint --ext .js,.mjs . --fix",
87
"clean:out": "rm -rf dev *.user.js",
98
"clean:deps": "rm -rf node_modules",
10-
"up:ver": "npm version patch && npm run build"
9+
"up:ver": "npm version patch && npm run build",
10+
"lint": "cd ../../ && eslint packages/Mikan_Proj --fix"
1111
},
1212
"dependencies": {
1313
"@rollup/plugin-replace": "^5.0.5",
@@ -16,6 +16,6 @@
1616
"rollup-plugin-monkey": "^1.0.9"
1717
},
1818
"devDependencies": {
19-
"eslint": "^8.57.1"
19+
"baseline-browser-mapping": "^2.9.6"
2020
}
2121
}

‎packages/Mikan_Proj/rollup.config.mjs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { gm_name, gm_banner, gm_require } from "./src/__info.js";
21
import replace from "@rollup/plugin-replace";
32
import open from "open";
4-
53
// for prod
64
import monkey, { monkeyPath, monkeyRequire } from "rollup-plugin-monkey";
75

6+
import { gm_banner, gm_name, gm_require } from "./src/__info.js";
7+
88
// console.log("typeof monkey：", typeof monkey);
99
// // typeof monkey： function
1010

1111
const gobConfig = {
1212
gm_file: `${gm_name}.user.js`,
13-
gm_banner: gm_banner.trim() + "\n",
13+
gm_banner: `${gm_banner.trim()}\n`,
1414
gm_version: process.env.npm_package_version,
1515
gm_dev: monkeyPath.devJS,
1616
...monkeyRequire(gm_require),
@@ -24,7 +24,7 @@ const gobConfig = {
2424
gobConfig.url = `http://${gobConfig.listen.host}:${gobConfig.listen.port}`;
2525
gobConfig.gm_banner = gobConfig.gm_banner.replace("placeholder.pkg.version", gobConfig.gm_version);
2626
if (gm_require.length > 0) {
27-
gobConfig.gm_banner = gobConfig.gm_banner.replace("// ==/", gobConfig.gm_require + "\n// ==/");
27+
gobConfig.gm_banner = gobConfig.gm_banner.replace("// ==/", `${gobConfig.gm_require}\n// ==/`);
2828
}
2929

3030
if (process.env.NODE_ENV === "prod") {
@@ -54,12 +54,12 @@ const devConfig = {
5454
listen: gobConfig.listen,
5555
onListen(web) {
5656
web.server.log.info({
57-
"msg": "{{header}} install script for dev {{url}}",
58-
"url": `${gobConfig.url}/dev/${gobConfig.gm_file}`,
57+
msg: "{{header}} install script for dev {{url}}",
58+
url: `${gobConfig.url}/dev/${gobConfig.gm_file}`,
5959
});
6060
web.server.log.info({
61-
"msg": "{{header}} install script for prod {{url}}",
62-
"url": `${gobConfig.url}/${gobConfig.gm_file}`,
61+
msg: "{{header}} install script for prod {{url}}",
62+
url: `${gobConfig.url}/${gobConfig.gm_file}`,
6363
});
6464
open(`${gobConfig.url}/dev/${gobConfig.gm_file}`);
6565
},
@@ -76,7 +76,7 @@ const loaderConfig = {
7676
},
7777
plugins: [
7878
replace({
79-
preventAssignment: true,
79+
"preventAssignment": true,
8080
"placeholder.livereload.js": `${gobConfig.url}/livereload.js?snipver=1`,
8181
"placeholder.user.js": `${gobConfig.url}/dev/main.js`,
8282
"placeholder.gm_api": gobConfig.gm_api,

‎packages/Mikan_Proj/src/_base.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { gm_name } from "./__info";
44
const curUrl = window.location.href;
55
const curDate = new Date();
66
// ---------------------------------------------------
7-
const _curUrl = () => { return window.location.href };
8-
const _curDate = () => { return new Date() };
7+
const _curUrl = () => window.location.href;
8+
const _curDate = () => new Date();
99
const _sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
1010
// ---------------------------------------------------
1111
const _log = (...args) => console.log(`[${gm_name}]|`, ...args);
@@ -26,7 +26,7 @@ function fnAfter($ne, e) {
2626
$e.parentNode.insertBefore($ne, $e.nextSibling);
2727
}
2828
// 元素变化监听
29-
const fnElChange = (el, fn = () => { }) => {
29+
function fnElChange(el, fn = () => { }) {
3030
const observer = new MutationObserver((mutationRecord, mutationObserver) => {
3131
// _log('mutationRecord = ', mutationRecord);
3232
// _log('mutationObserver === observer', mutationObserver === observer);
@@ -40,20 +40,20 @@ const fnElChange = (el, fn = () => { }) => {
4040
// characterData: false,
4141
subtree: true,
4242
});
43-
};
43+
}
4444
// ---------------------------------------------------
4545
export {
46-
curUrl,
47-
curDate,
48-
_curUrl,
49-
_curDate,
50-
_sleep,
51-
_log,
52-
_warn,
53-
_error,
5446
// $,
5547
$n,
5648
$na,
49+
_curDate,
50+
_curUrl,
51+
_error,
52+
_log,
53+
_sleep,
54+
_warn,
55+
curDate,
56+
curUrl,
5757
fnAfter,
5858
fnElChange,
5959
};

‎packages/Mikan_Proj/src/_config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const _config = {
3939
firstRun: true,
4040
},
4141
optToggle: (opt, ret = false) => {
42+
console.log(opt, ret);
4243
},
4344
menuCommand: () => {
4445
},

‎packages/Mikan_Proj/src/_feedly.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { _curUrl, $na } from "./_base";
1+
import { $na, _curUrl } from "./_base";
22

33
const _feedly = {
44
data: {
@@ -13,18 +13,16 @@ const _feedly = {
1313
},
1414
menuCommand: (curUrl = "") => {
1515
if (curUrl.includes("feedly.com")) {
16-
GM_registerMenuCommand("在 feedly 应用过滤",
17-
() => {
18-
_feedly.data.fnAction();
19-
},
20-
);
16+
GM_registerMenuCommand("在 feedly 应用过滤", () => {
17+
_feedly.data.fnAction();
18+
});
2119
}
2220
},
2321
regAction: (fnEachNodeList, fnFilter, _filter) => {
2422
_feedly.data.fnAction = () => {
2523
const $list = _feedly.getList();
2624
fnEachNodeList($list, ($item) => {
27-
const curText = $item.querySelector("a.entry__title").innerText.toLowerCase();
25+
const curText = $item.querySelector("a.entry__title").textContent.toLowerCase();
2826
if (fnFilter(curText, _filter)) {
2927
$item.remove();
3028
}
@@ -41,4 +39,3 @@ const _feedly = {
4139
_feedly.init();
4240

4341
export default _feedly;
44-

‎packages/Mikan_Proj/src/_pick.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import config from "./_config";
88
function fnAddBatchCopy($th, magnetList) {
99
// _log("fnAddBatchCopy", magnetList);
1010
const $btn = document.createElement("button");
11-
$btn.innerText = "批量复制";
11+
$btn.textContent = "批量复制";
1212
$btn.addEventListener("click", () => {
1313
const magnetStr = magnetList.join("\n");
1414
GM_setClipboard(magnetStr);
15-
$btn.innerText = "复制成功";
15+
$btn.textContent = "复制成功";
1616
_log(`已复制 ${magnetStr}`);
1717
}, false);
1818
// appendChild 2 elements
@@ -37,12 +37,11 @@ function fnPickByRegex(text, regex = null) {
3737
return oRegex.test(text);
3838
}
3939

40-
41-
export default function(name, $table) {
40+
export default function (name, $table) {
4241
const pickRules = config.data.pickRules;
4342
// 数组中查找 name 对应的规则
4443
const curRule = pickRules.find((rule) => {
45-
return name == rule.name;
44+
return name === rule.name;
4645
});
4746
// _log("_pick() curRule: ", curRule);
4847
// _log("_pick() name: ", name);
@@ -54,9 +53,9 @@ export default function(name, $table) {
5453
// 记录第一个 th
5554
let $firstTh = null;
5655

57-
$listTr.forEach(($tr, i) => {
56+
$listTr.forEach(($tr, _i) => {
5857
// _log("_pick()", i, $listTr.length);
59-
if ($tr.innerText.includes("番组名")) {
58+
if ($tr.textContent.includes("番组名")) {
6059
$firstTh = $tr.querySelector("th");
6160
// $lstTh = $curTh;
6261
// _log("fnMain() $curTh\n", $curTh);
@@ -67,14 +66,15 @@ export default function(name, $table) {
6766
if (!$curA) {
6867
return;
6968
}
70-
const curText = $curA.innerText.toLowerCase();
69+
const curText = $curA.textContent.toLowerCase();
7170
// data-clipboard-text
7271
let magnet = $curB.getAttribute("data-clipboard-text");
7372
magnet = fnRemoveTracker(magnet);
7473
// _log("_pick():", magnet);
7574
if (fnPickByRegex(curText, curRule?.regex)) {
7675
magnetList.push(magnet);
77-
} else {
76+
}
77+
else {
7878
$tr.remove();
7979
}
8080
});

‎packages/Mikan_Proj/src/main.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import {
2-
_log,
3-
$n,
42
$na,
5-
fnElChange,
3+
_log,
64
} from "./_base";
75

86
import _pick from "./_pick";
@@ -20,9 +18,9 @@ function fnGetGroupInfo() {
2018
const arrGroup = [];
2119
// 获取全部 div.subgroup-text
2220
const $listGroup = $na(".subgroup-text");
23-
fnEachNodeList($listGroup, ($group, i) => {
21+
fnEachNodeList($listGroup, ($group, _i) => {
2422
const $groupTitle = $group.querySelector("div.dropdown-toggle span") || $group.querySelector("a");
25-
const groupName = $groupTitle.innerText;
23+
const groupName = $groupTitle.textContent;
2624
const $groupTable = $group.nextElementSibling;
2725
arrGroup.push({
2826
name: groupName,
@@ -52,10 +50,11 @@ function fnAutoExpand() {
5250

5351
// 判断每个按钮是否为 display: none
5452
const isVisible = el => el.offsetParent !== null;
55-
fnEachNodeList($more, ($btn, i) => {
53+
fnEachNodeList($more, ($btn, _i) => {
5654
if (isVisible($btn)) {
5755
$btn.click();
58-
} else {
56+
}
57+
else {
5958
clickCount++;
6059
}
6160
});

0 commit comments

Comments
 (0)