From 7602a167a91c4a769c80465966cae0290cbf00a2 Mon Sep 17 00:00:00 2001 From: MachX <28209092+machsix@users.noreply.github.com> Date: Sat, 25 May 2024 17:21:53 +0000 Subject: [PATCH] update --- dist/Super_preloaderPlus_one_New.user.js | 58 ++++++++++++------------ src/rules/jsSiteRule.js | 6 +-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dist/Super_preloaderPlus_one_New.user.js b/dist/Super_preloaderPlus_one_New.user.js index 389f3014b4..f740203ddb 100644 --- a/dist/Super_preloaderPlus_one_New.user.js +++ b/dist/Super_preloaderPlus_one_New.user.js @@ -11,7 +11,7 @@ // @thanksto ywzhaiqi, NLF // @version 7.0.15 // @license GPL-3.0 -// @update 2024/5/8 +// @update 2024/5/26 // @homepageURL https://github.com/machsix/Super-preloader // @downloadURL https://machsix.github.io/Super-preloader/Super_preloaderPlus_one_New.user.js // @updateURL https://machsix.github.io/Super-preloader/Super_preloaderPlus_one_New.user.js @@ -9673,7 +9673,7 @@ } } - var name="super-preloader";var version="7.0.15";var description="Super-preloader";var main="dist/Super_preloaderPlus_one_New.user.js";var author="Mach6";var license="GPL-3.0";var type="module";var bugs={url:"https://github.com/machsix/Super-preloader/issues"};var homepage="https://github.com/machsix/Super-preloader";var directories={doc:"docs"};var repository={type:"git",url:"git+https://github.com/machsix/Super-preloader.git"};var scripts={preinstall:"npx only-allow pnpm",lint:"eslint \"dist/*.json\" \"src/**/*.js\" \"ci/*.js\" \"rollup.config.mjs\"",fix:"eslint \"dist/*.json\" \"src/**/*.js\" \"ci/*.js\" \"rollup.config.mjs\" --fix",format:"prettier --write \"dist/*.json\" \"src/**/*.{js,css}\" \"ci/*.js\" \"rollup.config.mjs\" \"docs/**/*.{ts,js,md}\"","format:check":"prettier --check \"dist/*.json\" \"src/**/*.{js,css}\" \"ci/*.js\" \"rollup.config.mjs\" \"docs/**/*.{ts,js,md}\"","format:staged":"lint-staged -v",check:"pnpm run lint && pnpm run typecheck",test:"cd test && node test.js",dev:"rollup -c --dev -w",build:"rollup -c","docs:dev":"vitepress dev docs","docs:build":"vitepress build docs","docs:publish":"pnpm run docs:build && bash ./ci/gen_ghpage.sh","docs:preview":"vitepress preview docs",preversion:"pnpm run check",version:"pnpm run build && git add dist/*.js && git add dist/*.json",postversion:"git add package.json package-lock.json && pnpm run test","publish:patch":"npm --no-git-tag-version version patch",publish:"npm --no-git-tag-version version minor",typecheck:"tsc -p jsconfig.json --noEmit"};var husky={hooks:{"pre-commit":"pnpm run check"}};var keywords=["userscript"];var devDependencies={typescript:"5.4.5",vitepress:"^1.1.4",vue:"^3.4.26"};var dependencies={"@babel/core":"7.24.4","@babel/plugin-syntax-import-attributes":"7.24.1","@babel/plugin-transform-runtime":"7.24.3","@babel/preset-env":"7.24.4","@babel/runtime-corejs3":"^7.24.5","@rollup/plugin-babel":"6.0.4","@rollup/plugin-commonjs":"25.0.7","@rollup/plugin-json":"6.1.0","@rollup/plugin-node-resolve":"15.2.3","@types/greasemonkey":"4.0.7","@types/lodash":"4.17.0","babel-plugin-lodash":"3.3.4","babel-plugin-wildcard":"7.0.0","compare-versions":"6.1.0","cross-env":"7.0.3",displacejs:"https://github.com/machsix/displace.git#v1.4.0",eslint:"^8.0.0","eslint-config-prettier":"9.1.0","eslint-plugin-import":"2.29.1","eslint-plugin-json":"3.1.0","eslint-plugin-prettier":"5.1.3","extract-zip":"2.0.1",got:"14.2.1",husky:"9.0.11","lint-staged":"15.2.2",lodash:"4.17.21",loglevel:"1.9.1",prettier:"3.2.5",puppeteer:"2.1.0",rollup:"4.14.3","rollup-plugin-banner2":"1.2.3","rollup-plugin-dev":"2.0.4","rollup-plugin-ejs":"4.0.0","rollup-plugin-re":"1.0.7","rollup-plugin-scss-string":"github:machsix/rollup-plugin-scss-string",yargs:"17.7.2"};var pnpm={overrides:{"babel-plugin-lodash>@babel/types":"~7.20.0"}};var pkg = {name:name,version:version,description:description,main:main,author:author,license:license,type:type,bugs:bugs,homepage:homepage,directories:directories,repository:repository,scripts:scripts,husky:husky,keywords:keywords,devDependencies:devDependencies,dependencies:dependencies,pnpm:pnpm}; + var name="super-preloader";var version="7.0.15";var description="Super-preloader";var main="dist/Super_preloaderPlus_one_New.user.js";var author="Mach6";var license="GPL-3.0";var type="module";var bugs={url:"https://github.com/machsix/Super-preloader/issues"};var homepage="https://github.com/machsix/Super-preloader";var directories={doc:"docs"};var repository={type:"git",url:"git+https://github.com/machsix/Super-preloader.git"};var scripts={preinstall:"npx only-allow pnpm",lint:"eslint \"dist/*.json\" \"src/**/*.js\" \"ci/*.js\" \"rollup.config.mjs\"",fix:"eslint \"dist/*.json\" \"src/**/*.js\" \"ci/*.js\" \"rollup.config.mjs\" --fix",format:"prettier --write \"dist/*.json\" \"src/**/*.{js,css}\" \"ci/*.js\" \"rollup.config.mjs\" \"docs/**/*.{ts,js,md}\"","format:check":"prettier --check \"dist/*.json\" \"src/**/*.{js,css}\" \"ci/*.js\" \"rollup.config.mjs\" \"docs/**/*.{ts,js,md}\"","format:staged":"lint-staged -v",check:"pnpm run lint && pnpm run typecheck",test:"cd test && node test.js",dev:"rollup -c --dev -w",build:"rollup -c","docs:dev":"vitepress dev docs","docs:build":"vitepress build docs","docs:publish":"pnpm run docs:build && bash ./ci/gen_ghpage.sh","docs:preview":"vitepress preview docs",preversion:"pnpm run check",version:"pnpm run build && git add dist/*.js && git add dist/*.json",postversion:"git add package.json package-lock.json && pnpm run test","publish:patch":"npm --no-git-tag-version version patch",publish:"npm --no-git-tag-version version minor",typecheck:"tsc -p jsconfig.json --noEmit"};var husky={hooks:{"pre-commit":"pnpm run check"}};var keywords=["userscript"];var devDependencies={typescript:"5.4.5",vitepress:"^1.1.4",vue:"^3.4.26"};var dependencies={"@babel/core":"7.24.4","@babel/plugin-syntax-import-attributes":"7.24.1","@babel/plugin-transform-runtime":"7.24.3","@babel/preset-env":"7.24.4","@babel/runtime-corejs3":"^7.24.5","@rollup/plugin-babel":"6.0.4","@rollup/plugin-commonjs":"25.0.7","@rollup/plugin-json":"6.1.0","@rollup/plugin-node-resolve":"15.2.3","@types/greasemonkey":"4.0.7","@types/lodash":"4.17.0","babel-plugin-lodash":"3.3.4","babel-plugin-wildcard":"7.0.0","compare-versions":"6.1.0","cross-env":"7.0.3",displacejs:"github:machsix/displace#v1.4.0",eslint:"^8.0.0","eslint-config-prettier":"9.1.0","eslint-plugin-import":"2.29.1","eslint-plugin-json":"3.1.0","eslint-plugin-prettier":"5.1.3","extract-zip":"2.0.1",got:"14.2.1",husky:"9.0.11","lint-staged":"15.2.2",lodash:"4.17.21",loglevel:"1.9.1",prettier:"3.2.5",puppeteer:"2.1.0",rollup:"4.14.3","rollup-plugin-banner2":"1.2.3","rollup-plugin-dev":"2.0.4","rollup-plugin-ejs":"4.0.0","rollup-plugin-re":"1.0.7","rollup-plugin-scss-string":"github:machsix/rollup-plugin-scss-string",yargs:"17.7.2"};var pnpm={overrides:{"babel-plugin-lodash>@babel/types":"~7.20.0"}};var pkg = {name:name,version:version,description:description,main:main,author:author,license:license,type:type,bugs:bugs,homepage:homepage,directories:directories,repository:repository,scripts:scripts,husky:husky,keywords:keywords,devDependencies:devDependencies,dependencies:dependencies,pnpm:pnpm}; // Information of script var now = new Date(); @@ -10849,7 +10849,7 @@ function encode_char(c) { return _ENCODE_HTML_RULES[c] || c; }var __line = 1 - , __lines = "Super_preloaderPlus_one_New is upgraded from v<%= locals.oldversion %> to v<%= locals.newversion%>\r\n" + , __lines = "Super_preloaderPlus_one_New is upgraded from v<%= locals.oldversion %> to v<%= locals.newversion%>\n" , __filename = undefined; try { var __output = ""; @@ -10858,7 +10858,7 @@ ; __append(escapeFn( locals.oldversion )) ; __append(" to v") ; __append(escapeFn( locals.newversion)) - ; __append("\r\n") + ; __append("\n") ; __line = 2; return __output; } catch (e) { @@ -10909,31 +10909,31 @@ function encode_char(c) { return _ENCODE_HTML_RULES[c] || c; }var __line = 1 - , __lines = "
Super_preloaderPlus_one_New Settings
\r\n\r\n
\r\n" + , __lines = "
Super_preloaderPlus_one_New Settings
\n\n
\n" , __filename = undefined; try { var __output = ""; function __append(s) { if (s !== undefined && s !== null) __output += s; } - ; __append("
Super_preloaderPlus_one_New Settings
\r\n\n
\n") ; __line = 47; return __output; } catch (e) { @@ -10984,12 +10984,12 @@ function encode_char(c) { return _ENCODE_HTML_RULES[c] || c; }var __line = 1 - , __lines = "
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n \r\n Super_preloader\r\n
\r\n
\r\n Preloader Settings\r\n
    \r\n
  • \r\n \r\n \r\n
    • \r\n
\r\n
\r\n
\r\n Autopager Settings\r\n
    \r\n
  • \r\n \r\n \r\n
      \r\n
    • \r\n \r\n
      • \r\n
    • \r\n \r\n
      • \r\n
    \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n instantly\r\n Start\r\n
    • \r\n
\r\n
\r\n
\r\n \r\n Global Settings\r\n Save\r\n
\r\n
\r\n
\r\n" + , __lines = "
\n
\n
\n
\n
\n
\n
\n \n \n Super_preloader\n
\n
\n Preloader Settings\n
    \n
  • \n \n \n
    • \n
\n
\n
\n Autopager Settings\n
    \n
  • \n \n \n
      \n
    • \n \n
      • \n
    • \n \n
      • \n
    \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n instantly\n Start\n
    • \n
\n
\n
\n \n Global Settings\n Save\n
\n
\n
\n" , __filename = undefined; try { var __output = ""; function __append(s) { if (s !== undefined && s !== null) __output += s; } - ; __append("
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n \r\n Super_preloader\r\n
\r\n
\r\n Preloader Settings\r\n
    \r\n
  • \r\n \r\n \r\n
    • \r\n
\r\n
\r\n
\r\n Autopager Settings\r\n
    \r\n
  • \r\n \r\n \r\n
      \r\n
    • \r\n \r\n
      • \r\n
    • \r\n \r\n
      • \r\n
    \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n instantly\r\n Start\r\n
    • \r\n
\r\n
\r\n
\r\n \r\n Global Settings\r\n Save\r\n
\r\n
\r\n
\r\n") + ; __append("
\n
\n
\n
\n
\n
\n
\n \n \n Super_preloader\n
\n
\n Preloader Settings\n
    \n
  • \n \n \n
    • \n
\n
\n
\n Autopager Settings\n
    \n
  • \n \n \n
      \n
    • \n \n
      • \n
    • \n \n
      • \n
    \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n instantly\n Start\n
    • \n
\n
\n
\n \n Global Settings\n Save\n
\n
\n
\n") ; __line = 112; return __output; } catch (e) { @@ -11040,7 +11040,7 @@ function encode_char(c) { return _ENCODE_HTML_RULES[c] || c; }var __line = 1 - , __lines = "Super_preloaderPlus_one_改 从 v<%= locals.oldversion %> 升级到 v<%= locals.newversion%>\r\n" + , __lines = "Super_preloaderPlus_one_改 从 v<%= locals.oldversion %> 升级到 v<%= locals.newversion%>\n" , __filename = undefined; try { var __output = ""; @@ -11049,7 +11049,7 @@ ; __append(escapeFn( locals.oldversion )) ; __append(" 升级到 v") ; __append(escapeFn( locals.newversion)) - ; __append("\r\n") + ; __append("\n") ; __line = 2; return __output; } catch (e) { @@ -11100,31 +11100,31 @@ function encode_char(c) { return _ENCODE_HTML_RULES[c] || c; }var __line = 1 - , __lines = "
Super_preloaderPlus_one_New设置
\r\n\r\n
\r\n" + , __lines = "
Super_preloaderPlus_one_New设置
\n\n
\n" , __filename = undefined; try { var __output = ""; function __append(s) { if (s !== undefined && s !== null) __output += s; } - ; __append("
Super_preloaderPlus_one_New设置
\r\n\n
\n") ; __line = 45; return __output; } catch (e) { @@ -11175,12 +11175,12 @@ function encode_char(c) { return _ENCODE_HTML_RULES[c] || c; }var __line = 1 - , __lines = "
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n
\r\n
\r\n 预读设置\r\n
    \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
\r\n
\r\n
\r\n 翻页设置\r\n
    \r\n
  • \r\n \r\n \r\n
      \r\n
    • \r\n \r\n
      • \r\n
    • \r\n \r\n
      • \r\n
    \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n 开始\r\n
    • \r\n
\r\n
\r\n
\r\n \r\n 设置\r\n 保存\r\n
\r\n
\r\n
\r\n" + , __lines = "
\n
\n
\n
\n
\n
\n
\n \n \n \n
\n
\n 预读设置\n
    \n
  • \n \n
    • \n
  • \n \n
    • \n
\n
\n
\n 翻页设置\n
    \n
  • \n \n \n
      \n
    • \n \n
      • \n
    • \n \n
      • \n
    \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n 开始\n
    • \n
\n
\n
\n \n 设置\n 保存\n
\n
\n
\n" , __filename = undefined; try { var __output = ""; function __append(s) { if (s !== undefined && s !== null) __output += s; } - ; __append("
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n \r\n \r\n
\r\n
\r\n 预读设置\r\n
    \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
\r\n
\r\n
\r\n 翻页设置\r\n
    \r\n
  • \r\n \r\n \r\n
      \r\n
    • \r\n \r\n
      • \r\n
    • \r\n \r\n
      • \r\n
    \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n
    • \r\n
  • \r\n \r\n 开始\r\n
    • \r\n
\r\n
\r\n
\r\n \r\n 设置\r\n 保存\r\n
\r\n
\r\n
\r\n") + ; __append("
\n
\n
\n
\n
\n
\n
\n \n \n \n
\n
\n 预读设置\n
    \n
  • \n \n
    • \n
  • \n \n
    • \n
\n
\n
\n 翻页设置\n
    \n
  • \n \n \n
      \n
    • \n \n
      • \n
    • \n \n
      • \n
    \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n
    • \n
  • \n \n 开始\n
    • \n
\n
\n
\n \n 设置\n 保存\n
\n
\n
\n") ; __line = 107; return __output; } catch (e) { @@ -11231,14 +11231,14 @@ function encode_char(c) { return _ENCODE_HTML_RULES[c] || c; }var __line = 1 - , __lines = "
<%= locals.notice %>
\r\n
\r\n" + , __lines = "
<%= locals.notice %>
\n
\n" , __filename = undefined; try { var __output = ""; function __append(s) { if (s !== undefined && s !== null) __output += s; } ; __append("
") ; __append(escapeFn( locals.notice )) - ; __append("
\r\n
\r\n") + ; __append("\n
\n") ; __line = 3; return __output; } catch (e) { @@ -14172,7 +14172,7 @@ exampleUrl: 'http://www.xgyw.cc/Xgyw/Xgyw6874.html', nextLink: "//div[@class='pagination']/ul/a[text()='下一页']", autopager: { - ip: ['198.54.115.248'], + ip: ['198.54.115.248', '206.237.29.173'], ipages: [true, 30], startFilter: function startFilter(doc, _win) { var p = [doc.querySelector('div.pagination > p'), doc.querySelector('header > a[href^="http"]'), doc.querySelector('ins')]; @@ -14194,7 +14194,7 @@ exampleUrl: 'https://www.xgmn5.xyz/plus/search/index.asp?keyword=%E5%B0%A4%E5%A6%AE%E4%B8%9D', nextLink: "//div[@class='pagination']/ul/a[@class='current']/following-sibling::a", autopager: { - ip: ['198.54.115.248'], + ip: ['198.54.115.248', '206.237.29.173'], ipages: [true, 5], startFilter: function () { var _startFilter = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(doc, _win) { @@ -14264,7 +14264,7 @@ exampleUrl: 'http://www.xgyw.cc/Xgyw', nextLink: 'null;', autopager: { - ip: ['198.54.115.248'], + ip: ['198.54.115.248', '206.237.29.173'], ipages: [true, 10], startFilter: function startFilter(doc, _win) { var a = doc.querySelectorAll('li > a[href^="/html"]'); diff --git a/src/rules/jsSiteRule.js b/src/rules/jsSiteRule.js index d494a20e7e..2f3452da6d 100644 --- a/src/rules/jsSiteRule.js +++ b/src/rules/jsSiteRule.js @@ -196,7 +196,7 @@ export const jsSiteRule = [ exampleUrl: 'http://www.xgyw.cc/Xgyw/Xgyw6874.html', nextLink: "//div[@class='pagination']/ul/a[text()='下一页']", autopager: { - ip: ['198.54.115.248'], + ip: ['198.54.115.248', '206.237.29.173'], ipages: [true, 30], startFilter: function (doc, _win) { const p = [doc.querySelector('div.pagination > p'), doc.querySelector('header > a[href^="http"]'), doc.querySelector('ins')]; @@ -219,7 +219,7 @@ export const jsSiteRule = [ exampleUrl: 'https://www.xgmn5.xyz/plus/search/index.asp?keyword=%E5%B0%A4%E5%A6%AE%E4%B8%9D', nextLink: "//div[@class='pagination']/ul/a[@class='current']/following-sibling::a", autopager: { - ip: ['198.54.115.248'], + ip: ['198.54.115.248', '206.237.29.173'], ipages: [true, 5], startFilter: async function (doc, _win) { if (!doc.getElementById('thumbCss')) { @@ -257,7 +257,7 @@ export const jsSiteRule = [ exampleUrl: 'http://www.xgyw.cc/Xgyw', nextLink: 'null;', autopager: { - ip: ['198.54.115.248'], + ip: ['198.54.115.248', '206.237.29.173'], ipages: [true, 10], startFilter: function (doc, _win) { const a = doc.querySelectorAll('li > a[href^="/html"]');