Skip to content

K
Koishi Bootstrap
Commit e3e60e53 authored by nanahira's avatar nanahira
Browse files
Options

migrate to latest loader

parent 90bbbc23
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 163 deletions
package-lock.json
View file @ e3e60e53
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
"version": "7.6.1", "version": "7.6.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@koishijs/loader": "^2.5.0", "@koishijs/loader": "^3.0.1",
"koishi": "^4.11.6", "koishi": "^4.11.7",
"load-json-file": "^6.2.0", "load-json-file": "^6.2.0",
"ws": "^8.2.3", "ws": "^8.2.3",
"yaml": "^1.10.2" "yaml": "^1.10.2"
...@@ -187,30 +187,29 @@ ...@@ -187,30 +187,29 @@
} }
}, },
"node_modules/@koishijs/core": { "node_modules/@koishijs/core": {
"version": "4.11.4", "version": "4.11.7",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.4.tgz", "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.7.tgz",
"integrity": "sha512-biwbprUTBreFgCyRaJc46Oenp/xcrWkxrrQ/9+YxWgSTQ7AF/a1Qz5XW3fN5wGdeHV/MhBTNdoS2y/+0V8Ew0g==", "integrity": "sha512-DqRRgiDFKSAhSt1608zjiA3P1cAtne8RuMkbPMX43GmwndCGpa433eY0rRn2OvbKV4woUppkjIeVXjoVusMbxQ==",
"peer": true,
"dependencies": { "dependencies": {
"@koishijs/utils": "^7.0.0", "@koishijs/utils": "^7.0.0",
"@minatojs/core": "^2.1.2", "@minatojs/core": "^2.2.2",
"@satorijs/core": "^2.1.0", "@satorijs/core": "^2.1.6",
"cordis": "^2.7.2", "cordis": "^2.7.3",
"cosmokit": "^1.4.0", "cosmokit": "^1.4.0",
"fastest-levenshtein": "^1.0.16" "fastest-levenshtein": "^1.0.16"
} }
}, },
"node_modules/@koishijs/loader": { "node_modules/@koishijs/loader": {
"version": "2.5.4", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.4.tgz", "resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-3.0.1.tgz",
"integrity": "sha512-MAXhmVsXch7d4RkO3enXC/RG2GXcdu8wm/Vsmv1/G7B21e3UUSr6fubY/b84NA8mfxlpW11jYPh8Y51j7vCsVQ==", "integrity": "sha512-BzEspiHgL5M70xdmnQhT14y72ZMs9Go/rfoKzHw8L3+KCQ5OnJaFvgPJ9+QdDm8bXNWgXWHn1IiX+cLABHYx4A==",
"dependencies": { "dependencies": {
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"ns-require": "^1.1.4" "ns-require": "^1.1.4"
}, },
"peerDependencies": { "peerDependencies": {
"@koishijs/core": "4.11.4" "@koishijs/core": "4.11.7"
} }
}, },
"node_modules/@koishijs/loader/node_modules/argparse": { "node_modules/@koishijs/loader/node_modules/argparse": {
...@@ -282,34 +281,34 @@ ...@@ -282,34 +281,34 @@
} }
}, },
"node_modules/@satorijs/core": { "node_modules/@satorijs/core": {
"version": "2.1.3", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-2.1.3.tgz", "resolved": "https://registry.npmjs.org/@satorijs/core/-/core-2.2.0.tgz",
"integrity": "sha512-YTX4VohtHl8kHEZmQDWzxGTI0+m5fDPTu8czBeztlTQofqouW6tUtP5h1TRJC7JqvjN/+Du6o0ilyIgIcl0Snw==", "integrity": "sha512-6NAY0twLIQ9RWVxXaODneu7AVn1PUvsCL2ecKOO8P2qiGZ4EIriTTgT65ibsoU0qhByvtr/3CCC9D6dUgIJodw==",
"dependencies": { "dependencies": {
"@satorijs/element": "^2.3.2", "@satorijs/element": "^2.3.4",
"cordis": "^2.7.2", "cordis": "^2.7.3",
"cordis-axios": "^3.0.0", "cordis-axios": "^3.0.0",
"cosmokit": "^1.4.0", "cosmokit": "^1.4.0",
"reggol": "^1.3.5", "reggol": "^1.3.5",
"schemastery": "^3.7.0", "schemastery": "^3.7.1",
"ws": "^8.11.0" "ws": "^8.11.0"
} }
}, },
"node_modules/@satorijs/element": { "node_modules/@satorijs/element": {
"version": "2.3.2", "version": "2.3.4",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.3.2.tgz", "resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.3.4.tgz",
"integrity": "sha512-XOA5/2NGFjlD7Vb/qqkesqFY3PdP7Xvbg72MspSodYbSQVJoPSPuQooa9EWB8GBkxGPDA1y8GRQoL0jlLqcm2w==", "integrity": "sha512-ad5uv4ELfDmd+2oD+kR9MMEEuw5VhQLEGDQu4qRBk7G+t7yqWoDz5nbGX7POfhCsYFHuc3CVHSjIxt+dRru63w==",
"dependencies": { "dependencies": {
"cosmokit": "^1.4.0" "cosmokit": "^1.4.0"
} }
}, },
"node_modules/@satorijs/satori": { "node_modules/@satorijs/satori": {
"version": "2.1.3", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-2.1.3.tgz", "resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-2.2.0.tgz",
"integrity": "sha512-7gd4q/ACRrBvCyTvODvxgf/iKxNpDg9BJy3PtbmB4dMDRixISUPmqOLVV1B1Q8XBVrtTWAuEivpOucgw7BZ8qQ==", "integrity": "sha512-gXtRDjlABGvT5rItCgMxAb+HDLtXvXx8Fub2HdXw2v/DR07ubK0n49OHLBoEnmxBbEotbnCXgnW0GIKXNtzhCg==",
"dependencies": { "dependencies": {
"@koa/router": "^10.1.1", "@koa/router": "^10.1.1",
"@satorijs/core": "2.1.3", "@satorijs/core": "2.2.0",
"@types/koa": "*", "@types/koa": "*",
"@types/koa__router": "*", "@types/koa__router": "*",
"@types/ws": "^8.5.3", "@types/ws": "^8.5.3",
...@@ -1040,9 +1039,9 @@ ...@@ -1040,9 +1039,9 @@
"integrity": "sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==" "integrity": "sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="
}, },
"node_modules/cordis": { "node_modules/cordis": {
"version": "2.7.2", "version": "2.7.3",
"resolved": "https://registry.npmjs.org/cordis/-/cordis-2.7.2.tgz", "resolved": "https://registry.npmjs.org/cordis/-/cordis-2.7.3.tgz",
"integrity": "sha512-bM+4P1bhIawrXRLvBMoxfWwSHebm0B3n0sM+T/FCED/iMUnEs6N9Y7lwJ2gDo2fm0wvu4JzU8cuMKrxqroq16Q==", "integrity": "sha512-iu4lsYrGhPlK19UHEp2eAdJ/H2RhEYvnIHxkz9M5DNje+L7GTDpOo6loR7u8QAbpNFNc1azz5MKRLIRVX3K/cQ==",
"dependencies": { "dependencies": {
"cosmokit": "^1.4.0" "cosmokit": "^1.4.0"
} }
...@@ -2127,14 +2126,14 @@ ...@@ -2127,14 +2126,14 @@
} }
}, },
"node_modules/koishi": { "node_modules/koishi": {
"version": "4.11.6", "version": "4.11.7",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.6.tgz", "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.7.tgz",
"integrity": "sha512-XvsBmdVXHIzgU2v3IFe4wJakzqpKBH/dZtYCScDkq13zn/pLamI88rMxs7BYUd131lyJndzxa6jMwFVMvtYyUA==", "integrity": "sha512-5jLXI6C+1hBKOkD3cCh3vg4VsPBhcD/Dh264k1jRKvAQVFMFRzA3IE55A9eEgYjAFQ/g9DyIO58jmY+ITZ7GhA==",
"dependencies": { "dependencies": {
"@koishijs/core": "4.11.6", "@koishijs/core": "4.11.7",
"@koishijs/loader": "2.5.6", "@koishijs/loader": "3.0.1",
"@koishijs/utils": "^7.0.0", "@koishijs/utils": "^7.0.0",
"@satorijs/satori": "^2.1.2", "@satorijs/satori": "^2.1.6",
"cac": "^6.7.14", "cac": "^6.7.14",
"chokidar": "^3.5.3", "chokidar": "^3.5.3",
"kleur": "^4.1.5", "kleur": "^4.1.5",
...@@ -2148,48 +2147,6 @@ ...@@ -2148,48 +2147,6 @@
"node": ">=12.0.0" "node": ">=12.0.0"
} }
}, },
"node_modules/koishi/node_modules/@koishijs/core": {
"version": "4.11.6",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.6.tgz",
"integrity": "sha512-7Ky1q+9wPSACk5T5Oi+UjWQIQfwgZao/QnHmZjK7NaW+17NSG6MBRvu9davcayMKrs9HVcnP0kaqvS2n9z7+bA==",
"dependencies": {
"@koishijs/utils": "^7.0.0",
"@minatojs/core": "^2.2.2",
"@satorijs/core": "^2.1.2",
"cordis": "^2.7.2",
"cosmokit": "^1.4.0",
"fastest-levenshtein": "^1.0.16"
}
},
"node_modules/koishi/node_modules/@koishijs/loader": {
"version": "2.5.6",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.6.tgz",
"integrity": "sha512-2LswjTMsfqO0TCZpRs69ZbRI3RHh97/9KSitFFhplO++ZkKuqFHUwVnmFi7AbgtobybUZ+2llGtvO1cNZL13Kw==",
"dependencies": {
"dotenv": "^16.0.3",
"js-yaml": "^4.1.0",
"ns-require": "^1.1.4"
},
"peerDependencies": {
"@koishijs/core": "4.11.6"
}
},
"node_modules/koishi/node_modules/argparse": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
},
"node_modules/koishi/node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
"dependencies": {
"argparse": "^2.0.1"
},
"bin": {
"js-yaml": "bin/js-yaml.js"
}
},
"node_modules/levn": { "node_modules/levn": {
"version": "0.4.1", "version": "0.4.1",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
...@@ -2588,9 +2545,9 @@ ...@@ -2588,9 +2545,9 @@
] ]
}, },
"node_modules/raw-body": { "node_modules/raw-body": {
"version": "2.5.1", "version": "2.5.2",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
"dependencies": { "dependencies": {
"bytes": "3.1.2", "bytes": "3.1.2",
"http-errors": "2.0.0", "http-errors": "2.0.0",
...@@ -2798,9 +2755,9 @@ ...@@ -2798,9 +2755,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"node_modules/schemastery": { "node_modules/schemastery": {
"version": "3.7.0", "version": "3.7.1",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-3.7.0.tgz", "resolved": "https://registry.npmjs.org/schemastery/-/schemastery-3.7.1.tgz",
"integrity": "sha512-vUs5HcWdtpqlL/Z1AwvFApllJk0jLtuItkwH5DDpie3Lw71DIA0Z7ohlnPF+fVN17QxJAI5xJtud62E3/EBoBQ==", "integrity": "sha512-yrCRpraZtUcIxW5wYqIXgYQULVfHKKsf7iGvmdMymoAyuM/1Lley17yEIizgDT6Iy/iXDDv3auopzNIaFPEN3w==",
"dependencies": { "dependencies": {
"cosmokit": "^1.4.0" "cosmokit": "^1.4.0"
} }
...@@ -3420,23 +3377,22 @@ ...@@ -3420,23 +3377,22 @@
} }
}, },
"@koishijs/core": { "@koishijs/core": {
"version": "4.11.4", "version": "4.11.7",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.4.tgz", "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.7.tgz",
"integrity": "sha512-biwbprUTBreFgCyRaJc46Oenp/xcrWkxrrQ/9+YxWgSTQ7AF/a1Qz5XW3fN5wGdeHV/MhBTNdoS2y/+0V8Ew0g==", "integrity": "sha512-DqRRgiDFKSAhSt1608zjiA3P1cAtne8RuMkbPMX43GmwndCGpa433eY0rRn2OvbKV4woUppkjIeVXjoVusMbxQ==",
"peer": true,
"requires": { "requires": {
"@koishijs/utils": "^7.0.0", "@koishijs/utils": "^7.0.0",
"@minatojs/core": "^2.1.2", "@minatojs/core": "^2.2.2",
"@satorijs/core": "^2.1.0", "@satorijs/core": "^2.1.6",
"cordis": "^2.7.2", "cordis": "^2.7.3",
"cosmokit": "^1.4.0", "cosmokit": "^1.4.0",
"fastest-levenshtein": "^1.0.16" "fastest-levenshtein": "^1.0.16"
} }
}, },
"@koishijs/loader": { "@koishijs/loader": {
"version": "2.5.4", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.4.tgz", "resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-3.0.1.tgz",
"integrity": "sha512-MAXhmVsXch7d4RkO3enXC/RG2GXcdu8wm/Vsmv1/G7B21e3UUSr6fubY/b84NA8mfxlpW11jYPh8Y51j7vCsVQ==", "integrity": "sha512-BzEspiHgL5M70xdmnQhT14y72ZMs9Go/rfoKzHw8L3+KCQ5OnJaFvgPJ9+QdDm8bXNWgXWHn1IiX+cLABHYx4A==",
"requires": { "requires": {
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
...@@ -3502,34 +3458,34 @@ ...@@ -3502,34 +3458,34 @@
} }
}, },
"@satorijs/core": { "@satorijs/core": {
"version": "2.1.3", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-2.1.3.tgz", "resolved": "https://registry.npmjs.org/@satorijs/core/-/core-2.2.0.tgz",
"integrity": "sha512-YTX4VohtHl8kHEZmQDWzxGTI0+m5fDPTu8czBeztlTQofqouW6tUtP5h1TRJC7JqvjN/+Du6o0ilyIgIcl0Snw==", "integrity": "sha512-6NAY0twLIQ9RWVxXaODneu7AVn1PUvsCL2ecKOO8P2qiGZ4EIriTTgT65ibsoU0qhByvtr/3CCC9D6dUgIJodw==",
"requires": { "requires": {
"@satorijs/element": "^2.3.2", "@satorijs/element": "^2.3.4",
"cordis": "^2.7.2", "cordis": "^2.7.3",
"cordis-axios": "^3.0.0", "cordis-axios": "^3.0.0",
"cosmokit": "^1.4.0", "cosmokit": "^1.4.0",
"reggol": "^1.3.5", "reggol": "^1.3.5",
"schemastery": "^3.7.0", "schemastery": "^3.7.1",
"ws": "^8.11.0" "ws": "^8.11.0"
} }
}, },
"@satorijs/element": { "@satorijs/element": {
"version": "2.3.2", "version": "2.3.4",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.3.2.tgz", "resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.3.4.tgz",
"integrity": "sha512-XOA5/2NGFjlD7Vb/qqkesqFY3PdP7Xvbg72MspSodYbSQVJoPSPuQooa9EWB8GBkxGPDA1y8GRQoL0jlLqcm2w==", "integrity": "sha512-ad5uv4ELfDmd+2oD+kR9MMEEuw5VhQLEGDQu4qRBk7G+t7yqWoDz5nbGX7POfhCsYFHuc3CVHSjIxt+dRru63w==",
"requires": { "requires": {
"cosmokit": "^1.4.0" "cosmokit": "^1.4.0"
} }
}, },
"@satorijs/satori": { "@satorijs/satori": {
"version": "2.1.3", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-2.1.3.tgz", "resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-2.2.0.tgz",
"integrity": "sha512-7gd4q/ACRrBvCyTvODvxgf/iKxNpDg9BJy3PtbmB4dMDRixISUPmqOLVV1B1Q8XBVrtTWAuEivpOucgw7BZ8qQ==", "integrity": "sha512-gXtRDjlABGvT5rItCgMxAb+HDLtXvXx8Fub2HdXw2v/DR07ubK0n49OHLBoEnmxBbEotbnCXgnW0GIKXNtzhCg==",
"requires": { "requires": {
"@koa/router": "^10.1.1", "@koa/router": "^10.1.1",
"@satorijs/core": "2.1.3", "@satorijs/core": "2.2.0",
"@types/koa": "*", "@types/koa": "*",
"@types/koa__router": "*", "@types/koa__router": "*",
"@types/ws": "^8.5.3", "@types/ws": "^8.5.3",
...@@ -4076,9 +4032,9 @@ ...@@ -4076,9 +4032,9 @@
"integrity": "sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==" "integrity": "sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="
}, },
"cordis": { "cordis": {
"version": "2.7.2", "version": "2.7.3",
"resolved": "https://registry.npmjs.org/cordis/-/cordis-2.7.2.tgz", "resolved": "https://registry.npmjs.org/cordis/-/cordis-2.7.3.tgz",
"integrity": "sha512-bM+4P1bhIawrXRLvBMoxfWwSHebm0B3n0sM+T/FCED/iMUnEs6N9Y7lwJ2gDo2fm0wvu4JzU8cuMKrxqroq16Q==", "integrity": "sha512-iu4lsYrGhPlK19UHEp2eAdJ/H2RhEYvnIHxkz9M5DNje+L7GTDpOo6loR7u8QAbpNFNc1azz5MKRLIRVX3K/cQ==",
"requires": { "requires": {
"cosmokit": "^1.4.0" "cosmokit": "^1.4.0"
} }
...@@ -4876,57 +4832,19 @@ ...@@ -4876,57 +4832,19 @@
} }
}, },
"koishi": { "koishi": {
"version": "4.11.6", "version": "4.11.7",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.6.tgz", "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.7.tgz",
"integrity": "sha512-XvsBmdVXHIzgU2v3IFe4wJakzqpKBH/dZtYCScDkq13zn/pLamI88rMxs7BYUd131lyJndzxa6jMwFVMvtYyUA==", "integrity": "sha512-5jLXI6C+1hBKOkD3cCh3vg4VsPBhcD/Dh264k1jRKvAQVFMFRzA3IE55A9eEgYjAFQ/g9DyIO58jmY+ITZ7GhA==",
"requires": { "requires": {
"@koishijs/core": "4.11.6", "@koishijs/core": "4.11.7",
"@koishijs/loader": "2.5.6", "@koishijs/loader": "3.0.1",
"@koishijs/utils": "^7.0.0", "@koishijs/utils": "^7.0.0",
"@satorijs/satori": "^2.1.2", "@satorijs/satori": "^2.1.6",
"cac": "^6.7.14", "cac": "^6.7.14",
"chokidar": "^3.5.3", "chokidar": "^3.5.3",
"kleur": "^4.1.5", "kleur": "^4.1.5",
"ns-require": "^1.1.4", "ns-require": "^1.1.4",
"throttle-debounce": "^3.0.1" "throttle-debounce": "^3.0.1"
},
"dependencies": {
"@koishijs/core": {
"version": "4.11.6",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.6.tgz",
"integrity": "sha512-7Ky1q+9wPSACk5T5Oi+UjWQIQfwgZao/QnHmZjK7NaW+17NSG6MBRvu9davcayMKrs9HVcnP0kaqvS2n9z7+bA==",
"requires": {
"@koishijs/utils": "^7.0.0",
"@minatojs/core": "^2.2.2",
"@satorijs/core": "^2.1.2",
"cordis": "^2.7.2",
"cosmokit": "^1.4.0",
"fastest-levenshtein": "^1.0.16"
}
},
"@koishijs/loader": {
"version": "2.5.6",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.6.tgz",
"integrity": "sha512-2LswjTMsfqO0TCZpRs69ZbRI3RHh97/9KSitFFhplO++ZkKuqFHUwVnmFi7AbgtobybUZ+2llGtvO1cNZL13Kw==",
"requires": {
"dotenv": "^16.0.3",
"js-yaml": "^4.1.0",
"ns-require": "^1.1.4"
}
},
"argparse": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
},
"js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
"requires": {
"argparse": "^2.0.1"
}
}
} }
}, },
"levn": { "levn": {
...@@ -5209,9 +5127,9 @@ ...@@ -5209,9 +5127,9 @@
"dev": true "dev": true
}, },
"raw-body": { "raw-body": {
"version": "2.5.1", "version": "2.5.2",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
"requires": { "requires": {
"bytes": "3.1.2", "bytes": "3.1.2",
"http-errors": "2.0.0", "http-errors": "2.0.0",
...@@ -5342,9 +5260,9 @@ ...@@ -5342,9 +5260,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"schemastery": { "schemastery": {
"version": "3.7.0", "version": "3.7.1",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-3.7.0.tgz", "resolved": "https://registry.npmjs.org/schemastery/-/schemastery-3.7.1.tgz",
"integrity": "sha512-vUs5HcWdtpqlL/Z1AwvFApllJk0jLtuItkwH5DDpie3Lw71DIA0Z7ohlnPF+fVN17QxJAI5xJtud62E3/EBoBQ==", "integrity": "sha512-yrCRpraZtUcIxW5wYqIXgYQULVfHKKsf7iGvmdMymoAyuM/1Lley17yEIizgDT6Iy/iXDDv3auopzNIaFPEN3w==",
"requires": { "requires": {
"cosmokit": "^1.4.0" "cosmokit": "^1.4.0"
} }
......
package.json
View file @ e3e60e53
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
"typescript": "^4.8.2" "typescript": "^4.8.2"
}, },
"dependencies": { "dependencies": {
"@koishijs/loader": "^2.5.0", "@koishijs/loader": "^3.0.1",
"koishi": "^4.11.6", "koishi": "^4.11.7",
"load-json-file": "^6.2.0", "load-json-file": "^6.2.0",
"ws": "^8.2.3", "ws": "^8.2.3",
"yaml": "^1.10.2" "yaml": "^1.10.2"
......
src/install-plugin.ts
View file @ e3e60e53
...@@ -6,6 +6,7 @@ import path from 'path'; ...@@ -6,6 +6,7 @@ import path from 'path';
import { getPackageJsonPackages } from './utils/read-package-json'; import { getPackageJsonPackages } from './utils/read-package-json';
import ConfigLoader from '@koishijs/loader'; import ConfigLoader from '@koishijs/loader';
import { KoishiConfig, PluginInstallConfig } from './def/interfaces'; import { KoishiConfig, PluginInstallConfig } from './def/interfaces';
import { loadConfig } from './utils/read-config';
const execFileAsync = promisify(execFile); const execFileAsync = promisify(execFile);
const logger = new Logger('bootstrap-install-plugin'); const logger = new Logger('bootstrap-install-plugin');
...@@ -134,7 +135,7 @@ async function installPlugin(name: string, info: PluginInstallConfig) { ...@@ -134,7 +135,7 @@ async function installPlugin(name: string, info: PluginInstallConfig) {
export async function installPluginEntry() { export async function installPluginEntry() {
logger.info(`Bootstrapping...`); logger.info(`Bootstrapping...`);
const config = new ConfigLoader().readConfig() as KoishiConfig; const config = await loadConfig();
const plugins = config?.plugins; const plugins = config?.plugins;
if (!plugins) { if (!plugins) {
logger.warn(`No plugins found, exiting.`); logger.warn(`No plugins found, exiting.`);
......
src/prod.ts
View file @ e3e60e53
...@@ -3,6 +3,7 @@ import fs from 'fs'; ...@@ -3,6 +3,7 @@ import fs from 'fs';
import { Logger } from 'koishi'; import { Logger } from 'koishi';
import ConfigLoader from '@koishijs/loader'; import ConfigLoader from '@koishijs/loader';
import { KoishiConfig } from './def/interfaces'; import { KoishiConfig } from './def/interfaces';
import { loadConfig } from './utils/read-config';
const logger = new Logger('bootstrap-prod'); const logger = new Logger('bootstrap-prod');
...@@ -23,7 +24,7 @@ async function handlePackageEntry(packagePath: string) { ...@@ -23,7 +24,7 @@ async function handlePackageEntry(packagePath: string) {
export async function prodEntry() { export async function prodEntry() {
logger.info(`Running production preparations...`); logger.info(`Running production preparations...`);
const config = new ConfigLoader().readConfig() as KoishiConfig; const config = await loadConfig();
const plugins = config?.plugins; const plugins = config?.plugins;
if (!plugins) { if (!plugins) {
logger.warn(`No plugins found, exiting.`); logger.warn(`No plugins found, exiting.`);
......
src/utils/read-config.ts 0 → 100644
View file @ e3e60e53
import { KoishiConfig } from '../def/interfaces';
import ConfigLoader from '@koishijs/loader';
export async function loadConfig(): Promise<KoishiConfig> {
const loader = new ConfigLoader();
await loader.init(process.env.KOISHI_CONFIG_FILE);
return loader.readConfig() as unknown as KoishiConfig;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment