ppx-inject 0.3.5 → 0.3.9
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.
- package/CHANGELOG.md +8 -0
- package/lib/cli.js +15 -15
- package/lib/cli.js.map +1 -1
- package/lib/profile.js +3 -3
- package/lib/profile.js.map +1 -1
- package/lib/split-string-according-to-length-and-delimiter.js +1 -1
- package/lib/split-string-according-to-length-and-delimiter.js.map +1 -1
- package/lib/statistics-file.js +3 -3
- package/lib/statistics-file.js.map +1 -1
- package/package.json +22 -22
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [0.3.9](https://github.com/BlackGlory/ppx-inject/compare/v0.3.8...v0.3.9) (2021-12-12)
|
|
6
|
+
|
|
7
|
+
### [0.3.8](https://github.com/BlackGlory/ppx-inject/compare/v0.3.7...v0.3.8) (2021-10-14)
|
|
8
|
+
|
|
9
|
+
### [0.3.7](https://github.com/BlackGlory/ppx-inject/compare/v0.3.6...v0.3.7) (2021-05-16)
|
|
10
|
+
|
|
11
|
+
### [0.3.6](https://github.com/BlackGlory/ppx-inject/compare/v0.3.5...v0.3.6) (2021-05-16)
|
|
12
|
+
|
|
5
13
|
### [0.3.5](https://github.com/BlackGlory/ppx-inject/compare/v0.3.4...v0.3.5) (2021-05-14)
|
|
6
14
|
|
|
7
15
|
### [0.3.4](https://github.com/BlackGlory/ppx-inject/compare/v0.3.3...v0.3.4) (2021-05-08)
|
package/lib/cli.js
CHANGED
|
@@ -23,7 +23,7 @@ commander_1.program
|
|
|
23
23
|
async function inject(cc, profileFilename) {
|
|
24
24
|
if (await isDataFilesExisted()) {
|
|
25
25
|
console.info('Checking for updates...');
|
|
26
|
-
const checksum = await internet_number_1.fetchLatestChecksum(internet_number_1.Domain.APNIC, internet_number_1.Registry.APNIC);
|
|
26
|
+
const checksum = await (0, internet_number_1.fetchLatestChecksum)(internet_number_1.Domain.APNIC, internet_number_1.Registry.APNIC);
|
|
27
27
|
if (await getExistedChecksum() !== checksum) {
|
|
28
28
|
console.info('Cleaning expired files...');
|
|
29
29
|
await cleanExpiredFiles();
|
|
@@ -40,18 +40,18 @@ async function inject(cc, profileFilename) {
|
|
|
40
40
|
await downloadStatisticsFile();
|
|
41
41
|
}
|
|
42
42
|
console.info('Updating the profile...');
|
|
43
|
-
const ipRanges = await statistics_file_1.parseAddressRangesFromStatisticsFile(getStatisticsPath(), cc);
|
|
44
|
-
const targets = profile_1.createTargetsFromAddressRanges(ipRanges);
|
|
45
|
-
const profile = await profile_1.readProfileFile(profileFilename);
|
|
46
|
-
const newRuleList = profile_1.mergeRuleList(profile_1.getRuleList(profile), profile_1.createDirectRules(targets));
|
|
47
|
-
const newProfile = profile_1.updateProfile(profile, newRuleList);
|
|
48
|
-
await profile_1.writeProfileFile(profileFilename, newProfile);
|
|
43
|
+
const ipRanges = await (0, statistics_file_1.parseAddressRangesFromStatisticsFile)(getStatisticsPath(), cc);
|
|
44
|
+
const targets = (0, profile_1.createTargetsFromAddressRanges)(ipRanges);
|
|
45
|
+
const profile = await (0, profile_1.readProfileFile)(profileFilename);
|
|
46
|
+
const newRuleList = (0, profile_1.mergeRuleList)((0, profile_1.getRuleList)(profile), (0, profile_1.createDirectRules)(targets));
|
|
47
|
+
const newProfile = (0, profile_1.updateProfile)(profile, newRuleList);
|
|
48
|
+
await (0, profile_1.writeProfileFile)(profileFilename, newProfile);
|
|
49
49
|
console.info('Done.\n');
|
|
50
50
|
console.info('Please run the command to load the new profile file:');
|
|
51
51
|
console.info(`Proxifier ${path.resolve(profileFilename)} silent-load`);
|
|
52
52
|
}
|
|
53
53
|
async function ensureDataPath() {
|
|
54
|
-
return await extra_filesystem_1.ensureDir(getDataPath());
|
|
54
|
+
return await (0, extra_filesystem_1.ensureDir)(getDataPath());
|
|
55
55
|
}
|
|
56
56
|
function getStatisticsPath() {
|
|
57
57
|
return getDataPath('statistics');
|
|
@@ -60,9 +60,9 @@ function getChecksumPath() {
|
|
|
60
60
|
return getDataPath('checksum');
|
|
61
61
|
}
|
|
62
62
|
async function isDataFilesExisted() {
|
|
63
|
-
return await extra_filesystem_1.pathExists(getDataPath())
|
|
64
|
-
&& await extra_filesystem_1.pathExists(getChecksumPath())
|
|
65
|
-
&& await extra_filesystem_1.pathExists(getStatisticsPath());
|
|
63
|
+
return await (0, extra_filesystem_1.pathExists)(getDataPath())
|
|
64
|
+
&& await (0, extra_filesystem_1.pathExists)(getChecksumPath())
|
|
65
|
+
&& await (0, extra_filesystem_1.pathExists)(getStatisticsPath());
|
|
66
66
|
}
|
|
67
67
|
async function cleanExpiredFiles() {
|
|
68
68
|
await fs_1.promises.rm(getChecksumPath());
|
|
@@ -75,15 +75,15 @@ async function saveChecksum(checksum) {
|
|
|
75
75
|
await fs_1.promises.writeFile(getChecksumPath(), checksum);
|
|
76
76
|
}
|
|
77
77
|
async function downloadChecksum() {
|
|
78
|
-
const checksum = await internet_number_1.fetchLatestChecksum(internet_number_1.Domain.APNIC, internet_number_1.Registry.APNIC);
|
|
78
|
+
const checksum = await (0, internet_number_1.fetchLatestChecksum)(internet_number_1.Domain.APNIC, internet_number_1.Registry.APNIC);
|
|
79
79
|
await saveChecksum(checksum);
|
|
80
80
|
}
|
|
81
81
|
async function downloadStatisticsFile() {
|
|
82
|
-
const rs = await internet_number_1.fetchLatestStatisticsFile(internet_number_1.Domain.APNIC, internet_number_1.Registry.APNIC);
|
|
82
|
+
const rs = await (0, internet_number_1.fetchLatestStatisticsFile)(internet_number_1.Domain.APNIC, internet_number_1.Registry.APNIC);
|
|
83
83
|
const tempFilename = getStatisticsPath() + '.downloading';
|
|
84
|
-
const ws = fs_1.createWriteStream(tempFilename);
|
|
84
|
+
const ws = (0, fs_1.createWriteStream)(tempFilename);
|
|
85
85
|
await pipePromise(rs, ws);
|
|
86
|
-
await extra_filesystem_1.move(tempFilename, getStatisticsPath());
|
|
86
|
+
await (0, extra_filesystem_1.move)(tempFilename, getStatisticsPath());
|
|
87
87
|
}
|
|
88
88
|
function getDataPath(file) {
|
|
89
89
|
const dataDir = path.resolve(__dirname, '../data');
|
package/lib/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AACA,yCAAmC;AACnC,uCAQkB;AAClB,2BAAsD;AACtD,uDAA8D;AAC9D,uDAAwE;AACxE,qDAKwB;AACxB,6BAA4B;AAE5B,mBAAO;KACJ,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC;KACrC,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC;KAC3C,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,WAAW,CAAC;KACnD,MAAM,CAAC,cAAc,EAAE,4FAA4F,CAAC;KACpH,SAAS,CAAC,WAAW,CAAC;KACtB,MAAM,CAAC,KAAK,EAAE,OAAe,EAAE,EAAE;IAChC,MAAM,IAAI,GAAG,mBAAO,CAAC,IAAI,EAAE,CAAA;IAC3B,MAAM,EAAE,GAAa,IAAI,CAAC,EAAE,CAAA;IAE5B,MAAM,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;AAC3B,CAAC,CAAC;KACD,KAAK,EAAE,CAAA;AAEV,KAAK,UAAU,MAAM,CAAC,EAAY,EAAE,eAAuB;IACzD,IAAI,MAAM,kBAAkB,EAAE,EAAE;QAC9B,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,MAAM,qCAAmB,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/lib/profile.js
CHANGED
|
@@ -51,12 +51,12 @@ function mergeRuleList(oldRuleList, newRuleList) {
|
|
|
51
51
|
exports.mergeRuleList = mergeRuleList;
|
|
52
52
|
function createDirectRules(targets) {
|
|
53
53
|
const LIMIT_PER_RULE = 32767;
|
|
54
|
-
const group = split_string_according_to_length_and_delimiter_1.splitStringAccordingToLengthAndDelimiter(targets, LIMIT_PER_RULE, ';');
|
|
54
|
+
const group = (0, split_string_according_to_length_and_delimiter_1.splitStringAccordingToLengthAndDelimiter)(targets, LIMIT_PER_RULE, ';');
|
|
55
55
|
return group.map(rule => createDirectRule('directips', rule));
|
|
56
56
|
function createDirectRule(prefix, target) {
|
|
57
57
|
return {
|
|
58
58
|
$: { enabled: 'true' },
|
|
59
|
-
Name: [prefix + '-' + nanoid_1.nanoid() + ' ' + getProgramCreatedFlag()],
|
|
59
|
+
Name: [prefix + '-' + (0, nanoid_1.nanoid)() + ' ' + getProgramCreatedFlag()],
|
|
60
60
|
Targets: [target],
|
|
61
61
|
Action: [{
|
|
62
62
|
$: { type: 'Direct' }
|
|
@@ -66,7 +66,7 @@ function createDirectRules(targets) {
|
|
|
66
66
|
}
|
|
67
67
|
exports.createDirectRules = createDirectRules;
|
|
68
68
|
function replaceRuleList(profile, ruleList) {
|
|
69
|
-
return immer_1.default(profile, (profile => {
|
|
69
|
+
return (0, immer_1.default)(profile, (profile => {
|
|
70
70
|
profile.ProxifierProfile.RuleList[0].Rule = ruleList;
|
|
71
71
|
}));
|
|
72
72
|
}
|
package/lib/profile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../src/profile.ts"],"names":[],"mappings":";;;AACA,qHAA2G;AAC3G,2BAAmC;AACnC,iCAAgC;AAChC,mCAA+B;AAC/B,iCAA2B;AAkBpB,KAAK,UAAU,eAAe,CAAC,QAAgB;IACpD,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;IAC9D,OAAO,MAAM,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;AAC9C,CAAC;AAHD,0CAGC;AAEM,KAAK,UAAU,gBAAgB,CAAC,QAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../src/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.splitStringAccordingToLengthAndDelimiter = void 0;
|
|
4
4
|
const structures_1 = require("@blackglory/structures");
|
|
5
5
|
function splitStringAccordingToLengthAndDelimiter(str, sliceMaximumLength, delimiter) {
|
|
6
|
-
return structures_1.convertConsToArray(slice(str));
|
|
6
|
+
return (0, structures_1.convertConsToArray)(slice(str));
|
|
7
7
|
function slice(str) {
|
|
8
8
|
if (str.length > sliceMaximumLength) {
|
|
9
9
|
const endIndex = str.lastIndexOf(delimiter, sliceMaximumLength - 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"split-string-according-to-length-and-delimiter.js","sourceRoot":"","sources":["../src/split-string-according-to-length-and-delimiter.ts"],"names":[],"mappings":";;;AAAA,uDAAiE;AAEjE,SAAgB,wCAAwC,CACtD,GAAW,EACX,kBAA0B,EAC1B,SAAiB;IAEjB,OAAO,+BAAkB,
|
|
1
|
+
{"version":3,"file":"split-string-according-to-length-and-delimiter.js","sourceRoot":"","sources":["../src/split-string-according-to-length-and-delimiter.ts"],"names":[],"mappings":";;;AAAA,uDAAiE;AAEjE,SAAgB,wCAAwC,CACtD,GAAW,EACX,kBAA0B,EAC1B,SAAiB;IAEjB,OAAO,IAAA,+BAAkB,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IAErC,SAAS,KAAK,CAAC,GAAW;QACxB,IAAI,GAAG,CAAC,MAAM,GAAG,kBAAkB,EAAE;YACnC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,CAAC,SAAS,EAAE,kBAAkB,GAAG,CAAC,CAAC,CAAA;YACnE,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAA;YACpC,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;YAC1D,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;SACrB;aAAM;YACL,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;SACnB;IACH,CAAC;AACH,CAAC;AAjBD,4FAiBC"}
|
package/lib/statistics-file.js
CHANGED
|
@@ -5,7 +5,7 @@ const address_range_1 = require("address-range");
|
|
|
5
5
|
const internet_number_1 = require("internet-number");
|
|
6
6
|
const chaining_1 = require("iterable-operator/lib/es2018/style/chaining");
|
|
7
7
|
async function parseAddressRangesFromStatisticsFile(filename, cc) {
|
|
8
|
-
const records = await new chaining_1.AsyncIterableOperator(internet_number_1.parseStatisticsFile(filename))
|
|
8
|
+
const records = await new chaining_1.AsyncIterableOperator((0, internet_number_1.parseStatisticsFile)(filename))
|
|
9
9
|
.filterAsync(internet_number_1.isRecord)
|
|
10
10
|
.filterAsync(record => cc.includes(record.cc))
|
|
11
11
|
.toArrayAsync();
|
|
@@ -27,8 +27,8 @@ function convertRecordsToRanges(records) {
|
|
|
27
27
|
const cidr = Number.parseInt(x.value, 10);
|
|
28
28
|
return address_range_1.IPv6AddressRange.from(startAddress, cidr);
|
|
29
29
|
});
|
|
30
|
-
const cleanIPv4Ranges = address_range_1.compress(ipv4Ranges, address_range_1.IPv4AddressRange);
|
|
31
|
-
const cleanIPv6Ranges = address_range_1.compress(ipv6Ranges, address_range_1.IPv6AddressRange);
|
|
30
|
+
const cleanIPv4Ranges = (0, address_range_1.compress)(ipv4Ranges, address_range_1.IPv4AddressRange);
|
|
31
|
+
const cleanIPv6Ranges = (0, address_range_1.compress)(ipv6Ranges, address_range_1.IPv6AddressRange);
|
|
32
32
|
return [...cleanIPv4Ranges, ...cleanIPv6Ranges];
|
|
33
33
|
}
|
|
34
34
|
exports.convertRecordsToRanges = convertRecordsToRanges;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statistics-file.js","sourceRoot":"","sources":["../src/statistics-file.ts"],"names":[],"mappings":";;;AAAA,iDAA4E;AAC5E,qDAAwE;AACxE,0EAAmF;AAE5E,KAAK,UAAU,oCAAoC,CACxD,QAAgB,EAChB,EAAY;IAEZ,MAAM,OAAO,GAAG,MAAM,IAAI,gCAAqB,CAAC,qCAAmB,
|
|
1
|
+
{"version":3,"file":"statistics-file.js","sourceRoot":"","sources":["../src/statistics-file.ts"],"names":[],"mappings":";;;AAAA,iDAA4E;AAC5E,qDAAwE;AACxE,0EAAmF;AAE5E,KAAK,UAAU,oCAAoC,CACxD,QAAgB,EAChB,EAAY;IAEZ,MAAM,OAAO,GAAG,MAAM,IAAI,gCAAqB,CAAC,IAAA,qCAAmB,EAAC,QAAQ,CAAC,CAAC;SAC3E,WAAW,CAAU,0BAAQ,CAAC;SAC9B,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;SAC7C,YAAY,EAAE,CAAA;IAEjB,OAAO,sBAAsB,CAAC,OAAO,CAAC,CAAA;AACxC,CAAC;AAVD,oFAUC;AAED,SAAgB,sBAAsB,CACpC,OAAkB;IAElB,MAAM,UAAU,GAAG,OAAO;SACvB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;SAC9B,GAAG,CAAC,CAAC,CAAC,EAAE;QACP,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAA;QAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAC1C,OAAO,gCAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;IACnD,CAAC,CAAC,CAAA;IAEJ,MAAM,UAAU,GAAG,OAAO;SACvB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;SAC9B,GAAG,CAAC,CAAC,CAAC,EAAE;QACP,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAA;QAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QACzC,OAAO,gCAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;IAEJ,MAAM,eAAe,GAAG,IAAA,wBAAQ,EAAC,UAAU,EAAE,gCAAgB,CAAC,CAAA;IAC9D,MAAM,eAAe,GAAG,IAAA,wBAAQ,EAAC,UAAU,EAAE,gCAAgB,CAAC,CAAA;IAE9D,OAAO,CAAC,GAAG,eAAe,EAAE,GAAG,eAAe,CAAC,CAAA;AACjD,CAAC;AAvBD,wDAuBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ppx-inject",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.9",
|
|
4
4
|
"description": "The CLI program that inject Direct access rules into Proxifier's profile.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"profixier"
|
|
@@ -36,34 +36,34 @@
|
|
|
36
36
|
"node": ">= 14"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@blackglory/structures": "^0.
|
|
40
|
-
"address-range": "^0.2.
|
|
41
|
-
"commander": "^
|
|
42
|
-
"extra-filesystem": "^0.3.
|
|
43
|
-
"immer": "^9.0.
|
|
44
|
-
"internet-number": "^2.2.
|
|
45
|
-
"iterable-operator": "^0.
|
|
46
|
-
"nanoid": "^3.1.
|
|
39
|
+
"@blackglory/structures": "^0.2.6",
|
|
40
|
+
"address-range": "^0.2.9",
|
|
41
|
+
"commander": "^8.3.0",
|
|
42
|
+
"extra-filesystem": "^0.3.14",
|
|
43
|
+
"immer": "^9.0.7",
|
|
44
|
+
"internet-number": "^2.2.16",
|
|
45
|
+
"iterable-operator": "^0.14.4",
|
|
46
|
+
"nanoid": "^3.1.30",
|
|
47
47
|
"xml2js": "^0.4.23"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@commitlint/cli": "^
|
|
51
|
-
"@commitlint/config-conventional": "^
|
|
52
|
-
"@types/jest": "^
|
|
50
|
+
"@commitlint/cli": "^15.0.0",
|
|
51
|
+
"@commitlint/config-conventional": "^15.0.0",
|
|
52
|
+
"@types/jest": "^27.0.3",
|
|
53
53
|
"@types/jsbn": "^1.2.29",
|
|
54
|
-
"@types/node": "^
|
|
55
|
-
"@types/xml2js": "^0.4.
|
|
56
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
57
|
-
"@typescript-eslint/parser": "^
|
|
58
|
-
"eslint": "^
|
|
54
|
+
"@types/node": "^16.11.12",
|
|
55
|
+
"@types/xml2js": "^0.4.9",
|
|
56
|
+
"@typescript-eslint/eslint-plugin": "^5.6.0",
|
|
57
|
+
"@typescript-eslint/parser": "^5.6.0",
|
|
58
|
+
"eslint": "^8.4.1",
|
|
59
59
|
"husky": "4",
|
|
60
|
-
"jest": "^
|
|
60
|
+
"jest": "^27.4.4",
|
|
61
61
|
"npm-run-all": "^4.1.5",
|
|
62
62
|
"rimraf": "^3.0.2",
|
|
63
|
-
"standard-version": "^9.3.
|
|
64
|
-
"ts-jest": "^
|
|
65
|
-
"ts-node": "^
|
|
63
|
+
"standard-version": "^9.3.2",
|
|
64
|
+
"ts-jest": "^27.1.1",
|
|
65
|
+
"ts-node": "^10.4.0",
|
|
66
66
|
"tscpaths": "^0.0.9",
|
|
67
|
-
"typescript": "^4.
|
|
67
|
+
"typescript": "^4.5.3"
|
|
68
68
|
}
|
|
69
69
|
}
|