surgio 2.14.0 → 2.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,14 +4,14 @@ exports.getLoonNodes = void 0;
4
4
  const logger_1 = require("@surgio/logger");
5
5
  const types_1 = require("../types");
6
6
  const constant_1 = require("../constant");
7
- const index_1 = require("./index");
7
+ const filter_1 = require("./filter");
8
8
  const logger = (0, logger_1.createLogger)({ service: 'surgio:utils' });
9
9
  // @see https://www.notion.so/1-9809ce5acf524d868affee8dd5fc0a6e
10
10
  const getLoonNodes = function (list, filter) {
11
11
  if (arguments.length === 2 && typeof filter === 'undefined') {
12
12
  throw new Error(constant_1.ERR_INVALID_FILTER);
13
13
  }
14
- const result = (0, index_1.applyFilter)(list, filter)
14
+ const result = (0, filter_1.applyFilter)(list, filter)
15
15
  .map((nodeConfig) => {
16
16
  switch (nodeConfig.type) {
17
17
  case types_1.NodeTypeEnum.Shadowsocks: {
@@ -105,4 +105,4 @@ const getLoonNodes = function (list, filter) {
105
105
  return result.join('\n');
106
106
  };
107
107
  exports.getLoonNodes = getLoonNodes;
108
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9vbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi91dGlscy9sb29uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJDQUE4QztBQUU5QyxvQ0FLa0I7QUFDbEIsMENBQWlEO0FBQ2pELG1DQUFzQztBQUV0QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FBQztBQUV6RCxnRUFBZ0U7QUFDekQsTUFBTSxZQUFZLEdBQUcsVUFDMUIsSUFBMkMsRUFDM0MsTUFBc0Q7SUFFdEQsSUFBSSxTQUFTLENBQUMsTUFBTSxLQUFLLENBQUMsSUFBSSxPQUFPLE1BQU0sS0FBSyxXQUFXLEVBQUU7UUFDM0QsTUFBTSxJQUFJLEtBQUssQ0FBQyw2QkFBa0IsQ0FBQyxDQUFDO0tBQ3JDO0lBRUQsTUFBTSxNQUFNLEdBQTBCLElBQUEsbUJBQVcsRUFBQyxJQUFJLEVBQUUsTUFBTSxDQUFDO1NBQzVELEdBQUcsQ0FBQyxDQUFDLFVBQVUsRUFBc0IsRUFBRTtRQUN0QyxRQUFRLFVBQVUsQ0FBQyxJQUFJLEVBQUU7WUFDdkIsS0FBSyxvQkFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO2dCQUM3QixNQUFNLE1BQU0sR0FBMkI7b0JBQ3JDLEdBQUcsVUFBVSxDQUFDLFFBQVEsZ0JBQWdCO29CQUN0QyxVQUFVLENBQUMsUUFBUTtvQkFDbkIsVUFBVSxDQUFDLElBQUk7b0JBQ2YsVUFBVSxDQUFDLE1BQU07b0JBQ2pCLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQztpQkFDcEMsQ0FBQztnQkFFRixJQUFJLFVBQVUsQ0FBQyxJQUFJLEVBQUU7b0JBQ25CLElBQUksQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRTt3QkFDN0MsTUFBTSxDQUFDLElBQUksQ0FDVCxVQUFVLENBQUMsSUFBSSxF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
108
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9vbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi91dGlscy9sb29uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJDQUE4QztBQUU5QyxvQ0FLa0I7QUFDbEIsMENBQWlEO0FBQ2pELHFDQUF1QztBQUV2QyxNQUFNLE1BQU0sR0FBRyxJQUFBLHFCQUFZLEVBQUMsRUFBRSxPQUFPLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FBQztBQUV6RCxnRUFBZ0U7QUFDekQsTUFBTSxZQUFZLEdBQUcsVUFDMUIsSUFBMkMsRUFDM0MsTUFBc0Q7SUFFdEQsSUFBSSxTQUFTLENBQUMsTUFBTSxLQUFLLENBQUMsSUFBSSxPQUFPLE1BQU0sS0FBSyxXQUFXLEVBQUU7UUFDM0QsTUFBTSxJQUFJLEtBQUssQ0FBQyw2QkFBa0IsQ0FBQyxDQUFDO0tBQ3JDO0lBRUQsTUFBTSxNQUFNLEdBQTBCLElBQUEsb0JBQVcsRUFBQyxJQUFJLEVBQUUsTUFBTSxDQUFDO1NBQzVELEdBQUcsQ0FBQyxDQUFDLFVBQVUsRUFBc0IsRUFBRTtRQUN0QyxRQUFRLFVBQVUsQ0FBQyxJQUFJLEVBQUU7WUFDdkIsS0FBSyxvQkFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDO2dCQUM3QixNQUFNLE1BQU0sR0FBMkI7b0JBQ3JDLEdBQUcsVUFBVSxDQUFDLFFBQVEsZ0JBQWdCO29CQUN0QyxVQUFVLENBQUMsUUFBUTtvQkFDbkIsVUFBVSxDQUFDLElBQUk7b0JBQ2YsVUFBVSxDQUFDLE1BQU07b0JBQ2pCLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQztpQkFDcEMsQ0FBQztnQkFFRixJQUFJLFVBQVUsQ0FBQyxJQUFJLEVBQUU7b0JBQ25CLElBQUksQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRTt3QkFDN0MsTUFBTSxDQUFDLElBQUksQ0FDVCxVQUFVLENBQUMsSUFBSSxF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
@@ -0,0 +1,6 @@
1
+ import { NodeFilterType, PossibleNodeConfigType, SortedNodeNameFilterType } from '../types';
2
+ export declare const getSurgeExtendHeaders: (wsHeaders: Record<string, string>) => string;
3
+ /**
4
+ * @see https://manual.nssurge.com/policy/proxy.html
5
+ */
6
+ export declare const getSurgeNodes: (list: ReadonlyArray<PossibleNodeConfigType>, filter?: NodeFilterType | SortedNodeNameFilterType | undefined) => string;
@@ -0,0 +1,365 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.getSurgeNodes = exports.getSurgeExtendHeaders = void 0;
7
+ const logger_1 = require("@surgio/logger");
8
+ const fs_extra_1 = __importDefault(require("fs-extra"));
9
+ const lodash_1 = __importDefault(require("lodash"));
10
+ const os_1 = __importDefault(require("os"));
11
+ const path_1 = require("path");
12
+ const constant_1 = require("../constant");
13
+ const types_1 = require("../types");
14
+ const index_1 = require("./index");
15
+ const filter_1 = require("./filter");
16
+ const logger = (0, logger_1.createLogger)({ service: 'surgio:utils:surge' });
17
+ const getSurgeExtendHeaders = (wsHeaders) => {
18
+ return Object.keys(wsHeaders)
19
+ .map((headerKey) => `${headerKey}:${wsHeaders[headerKey]}`)
20
+ .join('|');
21
+ };
22
+ exports.getSurgeExtendHeaders = getSurgeExtendHeaders;
23
+ /**
24
+ * @see https://manual.nssurge.com/policy/proxy.html
25
+ */
26
+ const getSurgeNodes = function (list, filter) {
27
+ // istanbul ignore next
28
+ if (arguments.length === 2 && typeof filter === 'undefined') {
29
+ throw new Error(constant_1.ERR_INVALID_FILTER);
30
+ }
31
+ const result = (0, filter_1.applyFilter)(list, filter)
32
+ .map((nodeConfig) => {
33
+ var _a, _b, _c, _d, _e;
34
+ switch (nodeConfig.type) {
35
+ case types_1.NodeTypeEnum.Shadowsocks: {
36
+ const config = nodeConfig;
37
+ if (config.obfs && ['ws', 'wss'].includes(config.obfs)) {
38
+ logger.warn(`不支持为 Surge 生成 v2ray-plugin 的 Shadowsocks 节点,节点 ${nodeConfig.nodeName} 会被省略`);
39
+ return void 0;
40
+ }
41
+ // Native support for Shadowsocks
42
+ if (((_a = nodeConfig === null || nodeConfig === void 0 ? void 0 : nodeConfig.surgeConfig) === null || _a === void 0 ? void 0 : _a.shadowsocksFormat) === 'ss') {
43
+ return [
44
+ config.nodeName,
45
+ [
46
+ 'ss',
47
+ config.hostname,
48
+ config.port,
49
+ 'encrypt-method=' + config.method,
50
+ ...(0, index_1.pickAndFormatStringList)(config, [
51
+ 'password',
52
+ 'udp-relay',
53
+ 'obfs',
54
+ 'obfs-host',
55
+ 'tfo',
56
+ 'mptcp',
57
+ ]),
58
+ ...(typeof config.testUrl === 'string'
59
+ ? [`test-url=${config.testUrl}`]
60
+ : []),
61
+ ...(typeof config.underlyingProxy === 'string'
62
+ ? [`underlying-proxy=${config.underlyingProxy}`]
63
+ : []),
64
+ ].join(', '),
65
+ ].join(' = ');
66
+ }
67
+ // Using custom format
68
+ return [
69
+ config.nodeName,
70
+ [
71
+ 'custom',
72
+ config.hostname,
73
+ config.port,
74
+ config.method,
75
+ config.password,
76
+ 'https://raw.githubusercontent.com/ConnersHua/SSEncrypt/master/SSEncrypt.module',
77
+ ...(0, index_1.pickAndFormatStringList)(config, [
78
+ 'udp-relay',
79
+ 'obfs',
80
+ 'obfs-host',
81
+ 'tfo',
82
+ 'mptcp',
83
+ ]),
84
+ ...(typeof config.testUrl === 'string'
85
+ ? [`test-url=${config.testUrl}`]
86
+ : []),
87
+ ...(typeof config.underlyingProxy === 'string'
88
+ ? [`underlying-proxy=${config.underlyingProxy}`]
89
+ : []),
90
+ ].join(', '),
91
+ ].join(' = ');
92
+ }
93
+ case types_1.NodeTypeEnum.HTTPS: {
94
+ const config = nodeConfig;
95
+ return [
96
+ config.nodeName,
97
+ [
98
+ 'https',
99
+ config.hostname,
100
+ config.port,
101
+ config.username,
102
+ config.password,
103
+ ...(typeof config.skipCertVerify === 'boolean'
104
+ ? [`skip-cert-verify=${config.skipCertVerify}`]
105
+ : []),
106
+ ...(typeof config.underlyingProxy === 'string'
107
+ ? [`underlying-proxy=${config.underlyingProxy}`]
108
+ : []),
109
+ ...(typeof config.testUrl === 'string'
110
+ ? [`test-url=${config.testUrl}`]
111
+ : []),
112
+ ...(0, index_1.pickAndFormatStringList)(config, [
113
+ 'sni',
114
+ 'tfo',
115
+ 'mptcp',
116
+ 'tls13',
117
+ ]),
118
+ ].join(', '),
119
+ ].join(' = ');
120
+ }
121
+ case types_1.NodeTypeEnum.HTTP: {
122
+ const config = nodeConfig;
123
+ return [
124
+ config.nodeName,
125
+ [
126
+ 'http',
127
+ config.hostname,
128
+ config.port,
129
+ config.username,
130
+ config.password,
131
+ ...(typeof config.underlyingProxy === 'string'
132
+ ? [`underlying-proxy=${config.underlyingProxy}`]
133
+ : []),
134
+ ...(typeof config.testUrl === 'string'
135
+ ? [`test-url=${config.testUrl}`]
136
+ : []),
137
+ ...(0, index_1.pickAndFormatStringList)(config, ['tfo', 'mptcp']),
138
+ ].join(', '),
139
+ ].join(' = ');
140
+ }
141
+ case types_1.NodeTypeEnum.Snell: {
142
+ const config = nodeConfig;
143
+ return [
144
+ config.nodeName,
145
+ [
146
+ 'snell',
147
+ config.hostname,
148
+ config.port,
149
+ ...(typeof config.underlyingProxy === 'string'
150
+ ? [`underlying-proxy=${config.underlyingProxy}`]
151
+ : []),
152
+ ...(typeof config.testUrl === 'string'
153
+ ? [`test-url=${config.testUrl}`]
154
+ : []),
155
+ ...(0, index_1.pickAndFormatStringList)(config, [
156
+ 'psk',
157
+ 'obfs',
158
+ 'obfs-host',
159
+ 'version',
160
+ 'tfo',
161
+ 'mptcp',
162
+ ]),
163
+ ].join(', '),
164
+ ].join(' = ');
165
+ }
166
+ case types_1.NodeTypeEnum.Shadowsocksr: {
167
+ const config = nodeConfig;
168
+ // istanbul ignore next
169
+ if (!config.binPath) {
170
+ throw new Error('请按照文档 https://url.royli.dev/vdGh2 添加 Shadowsocksr 二进制文件路径');
171
+ }
172
+ const args = [
173
+ '-s',
174
+ config.hostname,
175
+ '-p',
176
+ `${config.port}`,
177
+ '-m',
178
+ config.method,
179
+ '-o',
180
+ config.obfs,
181
+ '-O',
182
+ config.protocol,
183
+ '-k',
184
+ config.password,
185
+ '-l',
186
+ `${config.localPort}`,
187
+ '-b',
188
+ '127.0.0.1',
189
+ ];
190
+ if (config.protoparam) {
191
+ args.push('-G', config.protoparam);
192
+ }
193
+ if (config.obfsparam) {
194
+ args.push('-g', config.obfsparam);
195
+ }
196
+ const configString = [
197
+ 'external',
198
+ `exec = ${JSON.stringify(config.binPath)}`,
199
+ ...args.map((arg) => `args = ${JSON.stringify(arg)}`),
200
+ `local-port = ${config.localPort}`,
201
+ ];
202
+ if (config.localPort === 0) {
203
+ throw new Error(`为 Surge 生成 SSR 配置时必须为 Provider ${(_b = config.provider) === null || _b === void 0 ? void 0 : _b.name} 设置 startPort,参考 https://url.royli.dev/bWcpe`);
204
+ }
205
+ if (config.hostnameIp && config.hostnameIp.length) {
206
+ configString.push(...config.hostnameIp.map((item) => `addresses = ${item}`));
207
+ }
208
+ if ((0, index_1.isIp)(config.hostname)) {
209
+ configString.push(`addresses = ${config.hostname}`);
210
+ }
211
+ return [config.nodeName, configString.join(', ')].join(' = ');
212
+ }
213
+ case types_1.NodeTypeEnum.Vmess: {
214
+ const config = nodeConfig;
215
+ if (((_c = nodeConfig === null || nodeConfig === void 0 ? void 0 : nodeConfig.surgeConfig) === null || _c === void 0 ? void 0 : _c.v2ray) === 'native') {
216
+ // Native support for vmess
217
+ const configList = [
218
+ 'vmess',
219
+ config.hostname,
220
+ config.port,
221
+ `username=${config.uuid}`,
222
+ ];
223
+ if (['chacha20-ietf-poly1305', 'aes-128-gcm'].includes(config.method)) {
224
+ configList.push(`encrypt-method=${config.method}`);
225
+ }
226
+ if (config.network === 'ws') {
227
+ configList.push('ws=true');
228
+ configList.push(`ws-path=${config.path}`);
229
+ configList.push('ws-headers=' +
230
+ JSON.stringify((0, exports.getSurgeExtendHeaders)(Object.assign({ host: config.host || config.hostname, 'user-agent': constant_1.OBFS_UA }, lodash_1.default.omit(config.wsHeaders, ['host'])))));
231
+ }
232
+ if (config.tls) {
233
+ configList.push('tls=true', ...(typeof config.tls13 === 'boolean'
234
+ ? [`tls13=${config.tls13}`]
235
+ : []), ...(typeof config.skipCertVerify === 'boolean'
236
+ ? [`skip-cert-verify=${config.skipCertVerify}`]
237
+ : []), ...(config.host ? [`sni=${config.host}`] : []));
238
+ }
239
+ if (typeof config.tfo === 'boolean') {
240
+ configList.push(`tfo=${config.tfo}`);
241
+ }
242
+ if (typeof config.mptcp === 'boolean') {
243
+ configList.push(`mptcp=${config.mptcp}`);
244
+ }
245
+ if (config['underlyingProxy']) {
246
+ configList.push(`underlying-proxy=${config['underlyingProxy']}`);
247
+ }
248
+ if (config['testUrl']) {
249
+ configList.push(`test-url=${config['testUrl']}`);
250
+ }
251
+ if ((_d = nodeConfig === null || nodeConfig === void 0 ? void 0 : nodeConfig.surgeConfig) === null || _d === void 0 ? void 0 : _d.vmessAEAD) {
252
+ configList.push('vmess-aead=true');
253
+ }
254
+ else {
255
+ configList.push('vmess-aead=false');
256
+ }
257
+ return [config.nodeName, configList.join(', ')].join(' = ');
258
+ }
259
+ else {
260
+ // Using external provider
261
+ // istanbul ignore next
262
+ if (!config.binPath) {
263
+ throw new Error('请按照文档 https://url.royli.dev/vdGh2 添加 V2Ray 二进制文件路径');
264
+ }
265
+ if (config.localPort === 0) {
266
+ throw new Error(`为 Surge 生成 Vmess 配置时必须为 Provider ${(_e = config.provider) === null || _e === void 0 ? void 0 : _e.name} 设置 startPort,参考 https://url.royli.dev/bWcpe`);
267
+ }
268
+ const jsonFileName = `v2ray_${config.localPort}_${config.hostname}_${config.port}.json`;
269
+ const jsonFilePath = (0, path_1.join)((0, index_1.ensureConfigFolder)(), jsonFileName);
270
+ const jsonFile = (0, index_1.formatV2rayConfig)(config.localPort, nodeConfig);
271
+ const args = [
272
+ '--config',
273
+ jsonFilePath.replace(os_1.default.homedir(), '$HOME'),
274
+ ];
275
+ const configString = [
276
+ 'external',
277
+ `exec = ${JSON.stringify(config.binPath)}`,
278
+ ...args.map((arg) => `args = ${JSON.stringify(arg)}`),
279
+ `local-port = ${config.localPort}`,
280
+ ];
281
+ if (config.hostnameIp && config.hostnameIp.length) {
282
+ configString.push(...config.hostnameIp.map((item) => `addresses = ${item}`));
283
+ }
284
+ if ((0, index_1.isIp)(config.hostname)) {
285
+ configString.push(`addresses = ${config.hostname}`);
286
+ }
287
+ // istanbul ignore next
288
+ if (process.env.NODE_ENV !== 'test') {
289
+ fs_extra_1.default.writeJSONSync(jsonFilePath, jsonFile);
290
+ }
291
+ return [config.nodeName, configString.join(', ')].join(' = ');
292
+ }
293
+ }
294
+ case types_1.NodeTypeEnum.Trojan: {
295
+ const configList = [
296
+ 'trojan',
297
+ nodeConfig.hostname,
298
+ `${nodeConfig.port}`,
299
+ `password=${nodeConfig.password}`,
300
+ ...(0, index_1.pickAndFormatStringList)(nodeConfig, [
301
+ 'tfo',
302
+ 'mptcp',
303
+ 'sni',
304
+ 'tls13',
305
+ ]),
306
+ ...(typeof nodeConfig.testUrl === 'string'
307
+ ? [`test-url=${nodeConfig.testUrl}`]
308
+ : []),
309
+ ...(typeof nodeConfig.underlyingProxy === 'string'
310
+ ? [`underlying-proxy=${nodeConfig.underlyingProxy}`]
311
+ : []),
312
+ ...(typeof nodeConfig.skipCertVerify === 'boolean'
313
+ ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
314
+ : []),
315
+ ];
316
+ if (nodeConfig.network === 'ws') {
317
+ configList.push('ws=true');
318
+ configList.push(`ws-path=${nodeConfig.wsPath}`);
319
+ if (nodeConfig.wsHeaders) {
320
+ configList.push('ws-headers=' +
321
+ JSON.stringify((0, exports.getSurgeExtendHeaders)(nodeConfig.wsHeaders)));
322
+ }
323
+ }
324
+ return [nodeConfig.nodeName, configList.join(', ')].join(' = ');
325
+ }
326
+ case types_1.NodeTypeEnum.Socks5: {
327
+ const config = [
328
+ nodeConfig.tls === true ? 'socks5-tls' : 'socks5',
329
+ nodeConfig.hostname,
330
+ nodeConfig.port,
331
+ ...(typeof nodeConfig.underlyingProxy === 'string'
332
+ ? [`underlying-proxy=${nodeConfig.underlyingProxy}`]
333
+ : []),
334
+ ...(typeof nodeConfig.testUrl === 'string'
335
+ ? [`test-url=${nodeConfig.testUrl}`]
336
+ : []),
337
+ ...(0, index_1.pickAndFormatStringList)(nodeConfig, [
338
+ 'username',
339
+ 'password',
340
+ 'sni',
341
+ 'tfo',
342
+ 'mptcp',
343
+ 'tls13',
344
+ ]),
345
+ ];
346
+ if (nodeConfig.tls === true) {
347
+ config.push(...(typeof nodeConfig.skipCertVerify === 'boolean'
348
+ ? [`skip-cert-verify=${nodeConfig.skipCertVerify}`]
349
+ : []), ...(typeof nodeConfig.clientCert === 'string'
350
+ ? [`client-cert=${nodeConfig.clientCert}`]
351
+ : []));
352
+ }
353
+ return [nodeConfig.nodeName, config.join(', ')].join(' = ');
354
+ }
355
+ // istanbul ignore next
356
+ default:
357
+ logger.warn(`不支持为 Surge 生成 ${nodeConfig.type} 的节点,节点 ${nodeConfig.nodeName} 会被省略`);
358
+ return void 0;
359
+ }
360
+ })
361
+ .filter((item) => item !== undefined);
362
+ return result.join('\n');
363
+ };
364
+ exports.getSurgeNodes = getSurgeNodes;
365
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"surge.js","sourceRoot":"","sources":["../../lib/utils/surge.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,7 @@
1
1
  {
2
2
  "name": "surgio",
3
- "version": "2.14.0",
3
+ "description": "Generating rules for Surge, Clash, Quantumult like a PRO",
4
+ "version": "2.15.0",
4
5
  "main": "build/index.js",
5
6
  "typings": "build/index.d.ts",
6
7
  "bin": {
@@ -18,56 +19,6 @@
18
19
  "url": "https://github.com/geekdada/surgio/issues"
19
20
  },
20
21
  "homepage": "https://surgio.royli.dev",
21
- "devDependencies": {
22
- "@commitlint/cli": "^11.0.0",
23
- "@commitlint/config-angular": "^11.0.0",
24
- "@istanbuljs/nyc-config-typescript": "^1.0.1",
25
- "@types/bluebird": "^3.5.30",
26
- "@types/bytes": "^3.1.0",
27
- "@types/debug": "^4.1.5",
28
- "@types/eslint": "^7.2.0",
29
- "@types/fs-extra": "^9.0.13",
30
- "@types/hapi__joi": "^17.1.3",
31
- "@types/inquirer": "^7.3.0",
32
- "@types/listr": "^0.14.2",
33
- "@types/lodash": "^4.14.174",
34
- "@types/lru-cache": "^5.1.0",
35
- "@types/node": "^12",
36
- "@types/nunjucks": "^3.2.0",
37
- "@types/sinon": "^10.0.6",
38
- "@types/urlsafe-base64": "^1.0.28",
39
- "@typescript-eslint/eslint-plugin": "^4.31.2",
40
- "@typescript-eslint/parser": "^4.31.2",
41
- "@vuepress/plugin-docsearch": "^2.0.0-beta.26",
42
- "@vuepress/plugin-google-analytics": "^2.0.0-beta.26",
43
- "@vuepress/plugin-register-components": "^2.0.0-beta.26",
44
- "@vuepress/theme-default": "^2.0.0-beta.26",
45
- "@vuepress/utils": "^2.0.0-beta.25",
46
- "ava": "^3.14.0",
47
- "benchmark": "^2.1.4",
48
- "codecov": "^3.7.1",
49
- "coffee": "^5.3.0",
50
- "conventional-changelog-cli": "^2.0.31",
51
- "eslint-config-prettier": "^8.3.0",
52
- "eslint-plugin-prettier": "^4.0.0",
53
- "husky": "^4.3.0",
54
- "ini": "^1.3.5",
55
- "jsdom": "^16.2.2",
56
- "lint-staged": "^10.3.0",
57
- "nock": "^13.0.0-beta.3",
58
- "np": "^6.3.1",
59
- "npm-debug-log-cleaner": "^1.0.3",
60
- "npm-run-all": "^4.1.5",
61
- "nyc": "^15.0.1",
62
- "pkg": "^4.4.8",
63
- "prettier": "^2.4.1",
64
- "sinon": "^12.0.1",
65
- "sitemap": "^3.0.0",
66
- "ts-node": "^10.4.0",
67
- "type-fest": "^2.3.4",
68
- "typescript": "^4.4.3",
69
- "vuepress": "^2.0.0-beta.26"
70
- },
71
22
  "scripts": {
72
23
  "dev": "run-s clean && tsc -p tsconfig.json --watch",
73
24
  "test": "run-s test:*",
@@ -88,6 +39,7 @@
88
39
  "@royli/hygen": "^5.0.4",
89
40
  "@surgio/eslint-config-surgio": "^1.0.3",
90
41
  "@surgio/logger": "^1.1.0",
42
+ "@types/eslint": "^7.2.0",
91
43
  "agentkeepalive": "^4.1.0",
92
44
  "ali-oss": "^6.7.0",
93
45
  "bluebird": "^3.7.2",
@@ -121,13 +73,62 @@
121
73
  "ora": "^5.1.0",
122
74
  "query-string": "^6.12.1",
123
75
  "rimraf": "^3.0.0",
124
- "shelljs": "^0.8.3",
76
+ "shelljs": "^0.8.5",
125
77
  "source-map-support": "^0.5.19",
126
78
  "update-notifier": "^5.0.0",
127
79
  "urlsafe-base64": "^1.0.0",
128
80
  "winston": "^3.2.1",
129
81
  "yaml": "^1.9.2"
130
82
  },
83
+ "devDependencies": {
84
+ "@commitlint/cli": "^11.0.0",
85
+ "@commitlint/config-angular": "^11.0.0",
86
+ "@istanbuljs/nyc-config-typescript": "^1.0.1",
87
+ "@types/bluebird": "^3.5.30",
88
+ "@types/bytes": "^3.1.0",
89
+ "@types/debug": "^4.1.5",
90
+ "@types/fs-extra": "^9.0.13",
91
+ "@types/hapi__joi": "^17.1.3",
92
+ "@types/inquirer": "^7.3.0",
93
+ "@types/listr": "^0.14.2",
94
+ "@types/lodash": "^4.14.174",
95
+ "@types/lru-cache": "^5.1.0",
96
+ "@types/node": "^16",
97
+ "@types/nunjucks": "^3.2.0",
98
+ "@types/sinon": "^10.0.6",
99
+ "@types/urlsafe-base64": "^1.0.28",
100
+ "@typescript-eslint/eslint-plugin": "^5.9.1",
101
+ "@typescript-eslint/parser": "^5.9.1",
102
+ "@vuepress/plugin-docsearch": "^2.0.0-beta.26",
103
+ "@vuepress/plugin-google-analytics": "^2.0.0-beta.26",
104
+ "@vuepress/plugin-register-components": "^2.0.0-beta.26",
105
+ "@vuepress/theme-default": "^2.0.0-beta.26",
106
+ "@vuepress/utils": "^2.0.0-beta.25",
107
+ "ava": "^4.0.1",
108
+ "benchmark": "^2.1.4",
109
+ "codecov": "^3.7.1",
110
+ "coffee": "^5.3.0",
111
+ "conventional-changelog-cli": "^2.0.31",
112
+ "eslint-config-prettier": "^8.3.0",
113
+ "eslint-plugin-prettier": "^4.0.0",
114
+ "husky": "^4.3.0",
115
+ "ini": "^1.3.5",
116
+ "jsdom": "^16.2.2",
117
+ "lint-staged": "^12.1.7",
118
+ "nock": "^13.0.0-beta.3",
119
+ "np": "^6.3.1",
120
+ "npm-debug-log-cleaner": "^1.0.3",
121
+ "npm-run-all": "^4.1.5",
122
+ "nyc": "^15.0.1",
123
+ "pkg": "^4.4.8",
124
+ "prettier": "^2.4.1",
125
+ "sinon": "^12.0.1",
126
+ "sitemap": "^3.0.0",
127
+ "ts-node": "^10.4.0",
128
+ "type-fest": "^2.3.4",
129
+ "typescript": "^4.4.3",
130
+ "vuepress": "^2.0.0-beta.26"
131
+ },
131
132
  "ava": {
132
133
  "failFast": false,
133
134
  "timeout": "30s",
@@ -153,7 +154,7 @@
153
154
  ]
154
155
  },
155
156
  "engines": {
156
- "node": ">=12.0.0"
157
+ "node": ">=12.22.0"
157
158
  },
158
159
  "lint-staged": {
159
160
  "*.js": "eslint",