surgio 2.19.0 → 2.20.1

package/README.md

@@ -5,7 +5,6 @@
 </p>
 
 [![NPM version][npm-image]][npm-url]
-[![TAONPM version][taonpm-image]][taonpm-url]
 ![Nodejs][nodejs-version]
 ![Github Actions][github-actions-image]
 [![Test coverage][codecov-image]][codecov-url]
@@ -22,8 +21,6 @@
 [download-image]: https://img.shields.io/npm/dm/surgio.svg?style=flat-square
 [download-url]: https://npmjs.org/package/surgio
 [github-actions-image]: https://github.com/surgioproject/surgio/workflows/Node%20CI/badge.svg
-[taonpm-image]: https://npmmirror.com/badge/v/surgio.svg
-[taonpm-url]: https://npmmirror.com/package/surgio
 [nodejs-version]: https://img.shields.io/node/v/surgio
 
 ## 文档

package/build/generator/artifact.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+import _ from 'lodash';
 import { Environment } from 'nunjucks';
 import { EventEmitter } from 'events';
 import { getProvider } from '../provider';
@@ -26,7 +27,62 @@ export declare class Artifact extends EventEmitter {
     private youtubePremiumFilter;
     constructor(surgioConfig: CommandConfig, artifact: ArtifactConfig, options?: ArtifactOptions);
     get isReady(): boolean;
-    getRenderContext(extendRenderContext?: ExtendableRenderContext): any;
+    getRenderContext(extendRenderContext?: ExtendableRenderContext): {
+        clashProxyConfig?: {
+            proxies: readonly any[];
+            'proxy-groups': readonly any[];
+        } | undefined;
+        proxyTestUrl: string | undefined;
+        downloadUrl: string;
+        snippet: (filePath: string) => RemoteSnippet;
+        nodes: PossibleNodeConfigType[];
+        names: SimpleNodeConfig[];
+        remoteSnippets: _.Dictionary<RemoteSnippet>;
+        nodeList: PossibleNodeConfigType[];
+        provider: string;
+        providerName: string;
+        artifactName: string;
+        getDownloadUrl: (name: string) => string;
+        getUrl: (p: string) => string;
+        getNodeNames: (list: readonly SimpleNodeConfig[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType | undefined, separator?: string | undefined) => string;
+        getClashNodeNames: (list: readonly SimpleNodeConfig[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType | undefined, existingProxies?: readonly string[] | undefined) => readonly string[];
+        getClashNodes: (list: readonly PossibleNodeConfigType[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeFilterType | undefined) => readonly any[];
+        getSurgeNodes: (list: readonly PossibleNodeConfigType[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeFilterType | undefined) => string;
+        getShadowsocksNodes: (list: readonly import("../types").ShadowsocksNodeConfig[], groupName?: string) => string;
+        getShadowsocksNodesJSON: (list: readonly import("../types").ShadowsocksNodeConfig[]) => string;
+        getShadowsocksrNodes: (list: readonly import("../types").ShadowsocksrNodeConfig[], groupName: string) => string;
+        getQuantumultNodes: (list: readonly (import("../types").VmessNodeConfig | import("../types").HttpsNodeConfig | import("../types").ShadowsocksNodeConfig | import("../types").ShadowsocksrNodeConfig)[], groupName?: string, filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType | undefined) => string;
+        getV2rayNNodes: (list: readonly import("../types").VmessNodeConfig[]) => string;
+        getQuantumultXNodes: (list: readonly PossibleNodeConfigType[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType | undefined) => string;
+        getMellowNodes: (list: readonly (import("../types").VmessNodeConfig | import("../types").ShadowsocksNodeConfig)[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeFilterType | undefined) => string;
+        getLoonNodes: (list: readonly PossibleNodeConfigType[], filter?: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType | undefined) => string;
+        usFilter: import("../types").NodeNameFilterType;
+        hkFilter: import("../types").NodeNameFilterType;
+        japanFilter: import("../types").NodeNameFilterType;
+        koreaFilter: import("../types").NodeNameFilterType;
+        singaporeFilter: import("../types").NodeNameFilterType;
+        taiwanFilter: import("../types").NodeNameFilterType;
+        chinaBackFilter: import("../types").NodeNameFilterType;
+        chinaOutFilter: import("../types").NodeNameFilterType;
+        shadowsocksFilter: import("../types").NodeNameFilterType;
+        shadowsocksrFilter: import("../types").NodeNameFilterType;
+        vmessFilter: import("../types").NodeNameFilterType;
+        v2rayFilter: import("../types").NodeNameFilterType;
+        snellFilter: import("../types").NodeNameFilterType;
+        httpFilter: import("../types").NodeNameFilterType;
+        httpsFilter: import("../types").NodeNameFilterType;
+        trojanFilter: import("../types").NodeNameFilterType;
+        socks5Filter: import("../types").NodeNameFilterType;
+        toUrlSafeBase64: (str: string) => string;
+        toBase64: (str: string) => string;
+        encodeURIComponent: typeof encodeURIComponent;
+        netflixFilter: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType;
+        youtubePremiumFilter: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType;
+        customFilters: {
+            readonly [name: string]: import("../types").SortedNodeNameFilterType | import("../types").NodeNameFilterType;
+        };
+        customParams: import("../types").PlainObjectOf<string | number | boolean> & Record<string, string>;
+    };
     init({ requestUserAgent, }?: {
         requestUserAgent?: string;
     }): Promise<this>;

package/build/generator/artifact.js

@@ -11,6 +11,8 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
 const events_1 = require("events");
+const util_1 = require("util");
+const deprecation_1 = require("../misc/deprecation");
 const provider_1 = require("../provider");
 const types_1 = require("../types");
 const utils_1 = require("../utils");
@@ -20,6 +22,7 @@ const filter_1 = require("../utils/filter");
 const flag_1 = require("../utils/flag");
 const loon_1 = require("../utils/loon");
 const template_1 = require("./template");
+const showDEP009 = (0, util_1.deprecate)(lodash_1.default.noop, deprecation_1.DEP009, 'DEP009');
 class Artifact extends events_1.EventEmitter {
     constructor(surgioConfig, artifact, options = {}) {
         super();
@@ -37,6 +40,9 @@ class Artifact extends events_1.EventEmitter {
         if (!templateString) {
             (0, assert_1.default)(template, '必须指定 artifact 的 template 属性');
         }
+        if (this.artifact.proxyGroupModifier) {
+            showDEP009();
+        }
         const mainProviderName = artifact.provider;
         const combineProviders = artifact.combineProviders || [];
         this.providerNameList = [mainProviderName].concat(combineProviders);
@@ -47,7 +53,7 @@ class Artifact extends events_1.EventEmitter {
     getRenderContext(extendRenderContext = {}) {
         const config = this.surgioConfig;
         const gatewayConfig = config.gateway;
-        const gatewayHasToken = !!(gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken);
+        const gatewayToken = (gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.viewerToken) || (gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken);
         const { name: artifactName, customParams, downloadUrl } = this.artifact;
         const { nodeList, nodeNameList, netflixFilter, youtubePremiumFilter, customFilters, } = this;
         const remoteSnippets = lodash_1.default.keyBy(this.options.remoteSnippetList || [], (item) => item.name);
@@ -55,10 +61,10 @@ class Artifact extends events_1.EventEmitter {
         const mergedCustomParams = lodash_1.default.merge({}, globalCustomParams, customParams, extendRenderContext === null || extendRenderContext === void 0 ? void 0 : extendRenderContext.urlParams);
         return Object.assign({ proxyTestUrl: config.proxyTestUrl, downloadUrl: downloadUrl
                 ? downloadUrl
-                : (0, utils_1.getDownloadUrl)(config.urlBase, artifactName, true, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), snippet: (filePath) => {
+                : (0, utils_1.getDownloadUrl)(config.urlBase, artifactName, true, gatewayToken), snippet: (filePath) => {
                 return (0, template_1.loadLocalSnippet)(config.templateDir, filePath);
             }, nodes: nodeList, names: nodeNameList, remoteSnippets,
-            nodeList, provider: this.artifact.provider, providerName: this.artifact.provider, artifactName, getDownloadUrl: (name) => (0, utils_1.getDownloadUrl)(config.urlBase, name, true, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), getUrl: (p) => (0, utils_1.getUrl)(config.publicUrl, p, gatewayHasToken ? gatewayConfig === null || gatewayConfig === void 0 ? void 0 : gatewayConfig.accessToken : undefined), getNodeNames: utils_1.getNodeNames,
+            nodeList, provider: this.artifact.provider, providerName: this.artifact.provider, artifactName, getDownloadUrl: (name) => (0, utils_1.getDownloadUrl)(config.urlBase, name, true, gatewayToken), getUrl: (p) => (0, utils_1.getUrl)(config.publicUrl, p, gatewayToken), getNodeNames: utils_1.getNodeNames,
             getClashNodeNames: utils_1.getClashNodeNames,
             getClashNodes: utils_1.getClashNodes,
             getSurgeNodes: utils_1.getSurgeNodes,
@@ -289,4 +295,4 @@ class Artifact extends events_1.EventEmitter {
     }
 }
 exports.Artifact = Artifact;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../lib/generator/artifact.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"artifact.js","sourceRoot":"","sources":["../../lib/generator/artifact.ts"],"names":[],"mappings":"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"}

package/build/misc/deprecation.d.ts

@@ -2,3 +2,4 @@ export declare const DEP005 = "surgioConfig.surgeConfig.shadowsocksFormat: \"cus
 export declare const DEP006 = "surgioConfig.surgeConfig.v2ray: \"external\" \u5DF2\u4E0D\u63A8\u8350\u4F7F\u7528\uFF0C\u8BF7\u6539\u4E3A \"native\"";
 export declare const DEP007 = "patchYamlArray \u5DF2\u4E0D\u63A8\u8350\u4F7F\u7528\uFF0C\u8BF7\u6539\u4E3A clash";
 export declare const DEP008 = "surgioConfig.clashConfig.ssrFormat: \"legacy\" \u4F1A\u5728\u540E\u7EED\u7248\u672C\u4E2D\u79FB\u51FA\uFF0C\u8BF7\u4F7F\u7528\u539F\u7248 Clash \u5BA2\u6237\u7AEF";
+export declare const DEP009 = "proxyGroupModifier \u4F1A\u5728\u540E\u7EED\u7248\u672C\u4E2D\u79FB\u51FA\uFF0C\u8BE6\u60C5\u8BF7\u9605\u8BFB https://url.royli.dev/YyKh1";

package/build/misc/deprecation.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEP008 = exports.DEP007 = exports.DEP006 = exports.DEP005 = void 0;
+exports.DEP009 = exports.DEP008 = exports.DEP007 = exports.DEP006 = exports.DEP005 = void 0;
 exports.DEP005 = 'surgioConfig.surgeConfig.shadowsocksFormat: "custom" 已不推荐使用，请改为 "ss"';
 exports.DEP006 = 'surgioConfig.surgeConfig.v2ray: "external" 已不推荐使用，请改为 "native"';
 exports.DEP007 = 'patchYamlArray 已不推荐使用，请改为 clash';
 exports.DEP008 = 'surgioConfig.clashConfig.ssrFormat: "legacy" 会在后续版本中移出，请使用原版 Clash 客户端';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwcmVjYXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvbWlzYy9kZXByZWNhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLE1BQU0sR0FDakIsc0VBQXNFLENBQUM7QUFDNUQsUUFBQSxNQUFNLEdBQ2pCLGdFQUFnRSxDQUFDO0FBQ3RELFFBQUEsTUFBTSxHQUFHLGlDQUFpQyxDQUFDO0FBQzNDLFFBQUEsTUFBTSxHQUNqQix3RUFBd0UsQ0FBQyJ9
+exports.DEP009 = 'proxyGroupModifier 会在后续版本中移出，详情请阅读 https://url.royli.dev/YyKh1';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwcmVjYXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9saWIvbWlzYy9kZXByZWNhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLE1BQU0sR0FDakIsc0VBQXNFLENBQUM7QUFDNUQsUUFBQSxNQUFNLEdBQ2pCLGdFQUFnRSxDQUFDO0FBQ3RELFFBQUEsTUFBTSxHQUFHLGlDQUFpQyxDQUFDO0FBQzNDLFFBQUEsTUFBTSxHQUNqQix3RUFBd0UsQ0FBQztBQUM5RCxRQUFBLE1BQU0sR0FDakIsZ0VBQWdFLENBQUMifQ==

package/build/types.d.ts

@@ -61,6 +61,7 @@ export interface CommandConfig {
     };
     readonly gateway?: {
         readonly accessToken?: string;
+        readonly viewerToken?: string;
         readonly auth?: boolean;
         readonly cookieMaxAge?: number;
         readonly useCacheOnError?: boolean;

package/build/utils/config.js

@@ -21,6 +21,7 @@ const showDEP008 = (0, util_1.deprecate)(lodash_1.default.noop, deprecation_1.DE
 let finalConfig = null;
 const loadConfig = (cwd, configPath, override) => {
     const absPath = path_1.default.resolve(cwd, configPath);
+    // istanbul ignore next
     if (!fs_extra_1.default.existsSync(absPath)) {
         throw new Error(`配置文件 ${absPath} 不存在`);
     }
@@ -51,6 +52,7 @@ const loadConfig = (cwd, configPath, override) => {
 };
 exports.loadConfig = loadConfig;
 const getConfig = () => {
+    // istanbul ignore next
     if (!finalConfig) {
         throw new Error('请先调用 loadConfig 方法');
     }
@@ -58,6 +60,7 @@ const getConfig = () => {
 };
 exports.getConfig = getConfig;
 const setConfig = (key, value) => {
+    // istanbul ignore next
     if (!finalConfig) {
         throw new Error('请先调用 loadConfig 方法');
     }
@@ -129,12 +132,19 @@ const normalizeConfig = (cwd, userConfig) => {
     if (((_c = config.clashConfig) === null || _c === void 0 ? void 0 : _c.ssrFormat) === 'legacy') {
         showDEP008();
     }
+    // istanbul ignore next
     if (config.cache && config.cache.type === 'redis') {
         if (!config.cache.redisUrl) {
             throw new Error('缓存配置错误，请检查 cache.redisUrl 配置');
         }
         redis_1.default.createRedis(config.cache.redisUrl);
     }
+    // istanbul ignore next
+    if (config.gateway) {
+        if (config.gateway.auth && !config.gateway.accessToken) {
+            throw new Error('请检查 gateway.accessToken 配置');
+        }
+    }
     return config;
 };
 exports.normalizeConfig = normalizeConfig;
@@ -196,6 +206,7 @@ const validateConfig = (userConfig) => {
         analytics: joi_1.default.boolean().strict(),
         gateway: joi_1.default.object({
             accessToken: joi_1.default.string(),
+            viewerToken: joi_1.default.string(),
             auth: joi_1.default.boolean().strict(),
             cookieMaxAge: joi_1.default.number(),
             useCacheOnError: joi_1.default.boolean().strict(),
@@ -223,4 +234,4 @@ const validateConfig = (userConfig) => {
     }
 };
 exports.validateConfig = validateConfig;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/utils/config.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/utils/config.ts"],"names":[],"mappings":"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"}

package/build/utils/http-client.d.ts

@@ -1,3 +1,3 @@
 export declare const getUserAgent: (str?: string) => string;
-declare const httpClient: import("got").Got;
+declare const httpClient: import("got/dist/source").Got;
 export default httpClient;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "surgio",
   "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
-  "version": "2.19.0",
+  "version": "2.20.1",
   "main": "build/index.js",
   "typings": "build/index.d.ts",
   "bin": {
@@ -27,102 +27,103 @@
     "coverage": "cross-env TS_NODE_FILES=true nyc ava",
     "clean": "rimraf build",
     "build": "run-s clean && tsc -p tsconfig.json",
-    "prepublish": "run-s build",
+    "prepublishOnly": "run-s build",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "pub": "np",
+    "pub": "np --no-cleanup",
     "version": "npm run changelog && git add .",
+    "prepare": "husky install",
     "docs:dev": "vuepress dev docs",
     "docs:build": "vuepress build docs"
   },
   "dependencies": {
     "@royli/hygen": "^6.2.0",
-    "@surgio/eslint-config-surgio": "^1.0.3",
-    "@surgio/logger": "^1.1.0",
-    "@types/eslint": "^7.2.0",
-    "agentkeepalive": "^4.1.0",
-    "ali-oss": "^6.7.0",
+    "@surgio/eslint-config-surgio": "^1.0.4",
+    "@surgio/logger": "^1.1.4",
+    "@types/eslint": "^7.29.0",
+    "agentkeepalive": "^4.2.1",
+    "ali-oss": "^6.17.1",
     "bluebird": "^3.7.2",
-    "bytes": "^3.1.0",
-    "chalk": "^4.0.0",
-    "check-node-version": "^4.0.3",
-    "common-bin": "^2.8.3",
-    "cross-env": "^7.0.2",
-    "date-fns": "^2.16.1",
+    "bytes": "^3.1.2",
+    "chalk": "^4.1.2",
+    "check-node-version": "^4.2.1",
+    "common-bin": "^2.9.2",
+    "cross-env": "^7.0.3",
+    "date-fns": "^2.28.0",
     "detect-newline": "^3.1.0",
     "emoji-regex": "^10.1.0",
     "env2": "^2.2.2",
-    "eslint": "^7.8.1",
-    "espree": "^7.3.0",
-    "execa": "^4.0.3",
-    "filesize": "^9.0.0",
-    "fs-extra": "^9.0.0",
-    "get-port": "^5.1.0",
+    "eslint": "^7.32.0",
+    "espree": "^7.3.1",
+    "execa": "^4.1.0",
+    "filesize": "^9.0.9",
+    "fs-extra": "^9.1.0",
+    "get-port": "^5.1.1",
     "global-agent": "^3.0.0",
-    "got": "^11.6.1",
-    "inquirer": "^7.1.0",
-    "ioredis": "^5.0.5",
-    "joi": "^17.1.1",
+    "got": "^11.8.5",
+    "inquirer": "^7.3.3",
+    "ioredis": "^5.1.0",
+    "joi": "^17.6.0",
     "listr": "^0.14.3",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.21",
     "micromatch": "^4.0.5",
     "ms": "^2.1.3",
     "node-cache": "^5.1.2",
     "node-dir": "^0.1.17",
-    "nunjucks": "^3.2.1",
-    "ora": "^5.1.0",
+    "nunjucks": "^3.2.3",
+    "ora": "^5.4.1",
     "query-string": "^7.1.1",
-    "rimraf": "^3.0.0",
-    "source-map-support": "^0.5.19",
-    "update-notifier": "^5.0.0",
+    "rimraf": "^3.0.2",
+    "source-map-support": "^0.5.21",
+    "update-notifier": "^5.1.0",
     "urlsafe-base64": "^1.0.0",
-    "yaml": "^1.9.2"
+    "yaml": "^1.10.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-angular": "^11.0.0",
-    "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@types/bluebird": "^3.5.30",
-    "@types/bytes": "^3.1.0",
-    "@types/debug": "^4.1.5",
+    "@istanbuljs/nyc-config-typescript": "^1.0.2",
+    "@types/bluebird": "^3.5.36",
+    "@types/bytes": "^3.1.1",
+    "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.13",
-    "@types/hapi__joi": "^17.1.3",
-    "@types/inquirer": "^7.3.0",
-    "@types/listr": "^0.14.2",
-    "@types/lodash": "^4.14.174",
-    "@types/node": "^16",
-    "@types/nunjucks": "^3.2.0",
-    "@types/sinon": "^10.0.6",
+    "@types/hapi__joi": "^17.1.8",
+    "@types/inquirer": "^7.3.3",
+    "@types/listr": "^0.14.4",
+    "@types/lodash": "^4.14.182",
+    "@types/node": "^16.11.41",
+    "@types/nunjucks": "^3.2.1",
+    "@types/sinon": "^10.0.11",
     "@types/urlsafe-base64": "^1.0.28",
-    "@typescript-eslint/eslint-plugin": "^5.9.1",
-    "@typescript-eslint/parser": "^5.9.1",
-    "@vuepress/plugin-docsearch": "^2.0.0-beta.26",
-    "@vuepress/plugin-google-analytics": "^2.0.0-beta.26",
-    "@vuepress/plugin-register-components": "^2.0.0-beta.26",
-    "@vuepress/theme-default": "^2.0.0-beta.26",
-    "@vuepress/utils": "^2.0.0-beta.25",
-    "ava": "^4.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.29.0",
+    "@typescript-eslint/parser": "^5.29.0",
+    "@vuepress/client": "^2.0.0-beta.48",
+    "@vuepress/plugin-docsearch": "^2.0.0-beta.48",
+    "@vuepress/plugin-google-analytics": "^2.0.0-beta.48",
+    "@vuepress/plugin-register-components": "^2.0.0-beta.48",
+    "@vuepress/theme-default": "^2.0.0-beta.48",
+    "@vuepress/utils": "^2.0.0-beta.48",
+    "ava": "^4.3.0",
     "benchmark": "^2.1.4",
-    "codecov": "^3.7.1",
-    "coffee": "^5.3.0",
-    "conventional-changelog-cli": "^2.0.31",
-    "eslint-config-prettier": "^8.3.0",
+    "coffee": "^5.4.0",
+    "conventional-changelog-cli": "^2.2.2",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^4.3.0",
-    "ini": "^1.3.5",
+    "husky": "^8.0.1",
+    "ini": "^1.3.8",
     "ioredis-mock": "^8.2.2",
-    "lint-staged": "^12.1.7",
-    "nock": "^13.0.0-beta.3",
-    "np": "^6.3.1",
+    "lint-staged": "^12.5.0",
+    "nock": "^13.2.7",
+    "np": "^6.5.0",
     "npm-debug-log-cleaner": "^1.0.3",
     "npm-run-all": "^4.1.5",
-    "nyc": "^15.0.1",
-    "prettier": "^2.4.1",
+    "nyc": "^15.1.0",
+    "prettier": "^2.7.1",
     "sinon": "^12.0.1",
-    "ts-node": "^10.4.0",
-    "type-fest": "^2.3.4",
-    "typescript": "^4.4.3",
-    "vuepress": "^2.0.0-beta.26",
-    "vuepress-plugin-sitemap2": "^2.0.0-beta.82"
+    "ts-node": "^10.8.1",
+    "type-fest": "^2.14.0",
+    "typescript": "^4.7.4",
+    "vuepress": "^2.0.0-beta.48",
+    "vuepress-plugin-sitemap2": "^2.0.0-beta.84"
   },
   "ava": {
     "failFast": false,