Skip to content

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

Merge branch 'master' into puppeteer

parents 3613837a fe462e3b
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 218 deletions
package-lock.json
View file @ 5c36c908
{
"name": "koishi-bootstrap",
"version": "7.5.2",
"version": "7.5.5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "koishi-bootstrap",
"version": "7.5.2",
"version": "7.5.5",
"license": "MIT",
"dependencies": {
<<<<<<< HEAD
"@koishijs/cli": "^4.10.10",
"@koishijs/loader": "^1.0.1",
"koishi": "^4.10.10",
=======
"@koishijs/loader": "^2.5.0",
"koishi": "^4.11.0",
>>>>>>> master
"load-json-file": "^6.2.0",
"ws": "^8.2.3",
"yaml": "^1.10.2"
......@@ -192,33 +186,6 @@
"node": ">= 8.0.0"
}
},
<<<<<<< HEAD
"node_modules/@koishijs/cli": {
"version": "4.10.10",
"resolved": "https://registry.npmjs.org/@koishijs/cli/-/cli-4.10.10.tgz",
"integrity": "sha512-85WFfrDjb0XZuCqgAJQPCuJgJFFzOW7RHdhCNtJbUWsrlA2aZjTWcBY6uHDQ7tItxTYhZhNTHtEOvD/q6IYXTw==",
"dependencies": {
"@koishijs/loader": "^2.4.3",
"cac": "^6.7.14",
"chokidar": "^3.5.3",
"kleur": "^4.1.5",
"throttle-debounce": "^3.0.1"
},
"bin": {
"koishi": "lib/bin.js"
},
"engines": {
"node": ">=12.0.0"
},
"peerDependencies": {
"koishi": "^4.10.10"
}
},
"node_modules/@koishijs/cli/node_modules/@koishijs/loader": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.4.3.tgz",
"integrity": "sha512-vk/W8TK2/AgKuvEmP6C90+V4vn51u5A3zwJMRKaPi+Sm6xVMRCtGqvUkIi1xaX00hK9EhQKEi18UbRRLKGXhWA==",
=======
"node_modules/@koishijs/core": {
"version": "4.11.0",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.0.tgz",
......@@ -236,55 +203,13 @@
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.0.tgz",
"integrity": "sha512-8StBIK7+/sDr65d+MEm8htXblVCrIZORXcEO/O7Wupn0eMyktm7GI0kL7C7uLhHT5Yoiby36T5LeNbaKWeKWlg==",
>>>>>>> master
"dependencies": {
"dotenv": "^16.0.3",
"js-yaml": "^4.1.0",
"ns-require": "^1.1.4"
},
"peerDependencies": {
<<<<<<< HEAD
"koishi": "^4.10.10"
}
},
"node_modules/@koishijs/cli/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/@koishijs/cli/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/@koishijs/core": {
"version": "4.10.10",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.10.10.tgz",
"integrity": "sha512-LooBZCQSm91TL7aBBECjaFaROn+udCAavOwi+AWzbFPBfcuF4ZHFGpQ112yWK70xbQ7YhHUueueqJpkAGOy4RA==",
"dependencies": {
"@koishijs/utils": "^6.3.4",
"@minatojs/core": "^2.0.3",
"@satorijs/core": "^1.4.11",
"cordis": "^2.6.0",
"cosmokit": "^1.3.6",
"fastest-levenshtein": "^1.0.16"
}
},
"node_modules/@koishijs/loader": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-1.0.1.tgz",
"integrity": "sha512-cuKYfsVY1Ok6sxDxvWP7ZWS0sUshKiUkno3TCRy/GX8EbB2NUYkTG9zbR7b1Sd1iQq9sh7am3qRwq1Bk/cyF/Q==",
"dependencies": {
"js-yaml": "^4.1.0"
=======
"@koishijs/core": "^4.11.0"
>>>>>>> master
}
},
"node_modules/@koishijs/loader/node_modules/argparse": {
......@@ -358,19 +283,11 @@
}
},
"node_modules/@satorijs/core": {
<<<<<<< HEAD
"version": "1.4.11",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.4.11.tgz",
"integrity": "sha512-8EsVA5esShEqYMwwXipGwx7obwVb3Lc0NwBmjZWNj2++WYKYg+jQ0Iatgd2jcJhNX2H9ziqnwu05aHtWo+mSsA==",
"dependencies": {
"@satorijs/element": "^2.2.2",
=======
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.5.2.tgz",
"integrity": "sha512-5hnqwI6mSpDyzSHHIaaJBCwoiDjvDDBeD81rIwYW4JDKEKBOGWgVqNi4g+ru2s8gyR+M8cTvH71a1B2iOQiQTQ==",
"dependencies": {
"@satorijs/element": "^2.3.1",
>>>>>>> master
"cordis": "^2.6.0",
"cordis-axios": "^2.2.0",
"cosmokit": "^1.4.0",
......@@ -380,35 +297,20 @@
}
},
"node_modules/@satorijs/element": {
<<<<<<< HEAD
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.2.2.tgz",
"integrity": "sha512-t6K0weO+GwqHhP/C9GTchck0jDk8c63kiAr9hHEVQX3nx/+fjGquTDGzBc4WzOVc105wePWRvV1UtvRaa0I9FQ==",
=======
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.3.1.tgz",
"integrity": "sha512-p1hQVy56nfJ2dw1noEHkV7hKpC9yqe5u3Vla+CSPqXU12uB4zqv96rjT9n4WulNGl8XTzqWxp8q8KWqhSI8JFA==",
>>>>>>> master
"dependencies": {
"cosmokit": "^1.4.0"
}
},
"node_modules/@satorijs/satori": {
<<<<<<< HEAD
"version": "1.4.11",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.11.tgz",
"integrity": "sha512-nQHch/Ya1ClsNO9anJYfNnpiMFHCc1ihxdWuVKKpGOXRxuGMOtnbkB/Qa+NuBT+887E2NsFfTBoFgt8vuExxew==",
"dependencies": {
"@koa/router": "^10.1.1",
"@satorijs/core": "1.4.11",
=======
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.5.2.tgz",
"integrity": "sha512-e5l1NH9VVU8+4CeyKUWtr0mZ0E8WutvUzzqSuA5NCYkMMJ8A8xjqlHDOZtoEjtbp/AF9vnYVGHZC25DJw0zhig==",
"dependencies": {
"@koa/router": "^10.1.1",
"@satorijs/core": "1.5.2",
>>>>>>> master
"@types/koa": "*",
"@types/koa__router": "*",
"@types/ws": "^8.5.3",
......@@ -1730,19 +1632,6 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true
},
"node_modules/fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"hasInstallScript": true,
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
}
},
"node_modules/function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
......@@ -2228,17 +2117,6 @@
}
},
"node_modules/koishi": {
<<<<<<< HEAD
"version": "4.10.10",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.10.10.tgz",
"integrity": "sha512-92VxR/7AL8l2eyd0MOWi5Nc/nLe2lX9ftglsMkqHvvImFkQma+2kSuexuxVLjcDmkAL6LWI27VxyuUH35jl5PQ==",
"dependencies": {
"@koishijs/core": "^4.10.10",
"@koishijs/utils": "^6.3.4",
"@satorijs/satori": "^1.4.11",
"file-type": "^16.5.4",
"ns-require": "^1.1.4"
=======
"version": "4.11.0",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.0.tgz",
"integrity": "sha512-1XGqZRRZxkUn3a0RYY8/hQ2B5/8T7eWyH8C93VYLiLKpYoPZleh47mx4rpd/fI1zBBQC3VEym0m8ApfEqwGIkg==",
......@@ -2255,7 +2133,6 @@
},
"bin": {
"koishi": "lib/cli/index.js"
>>>>>>> master
},
"engines": {
"node": ">=12.0.0"
......@@ -3490,53 +3367,6 @@
"path-to-regexp": "^6.1.0"
}
},
<<<<<<< HEAD
"@koishijs/cli": {
"version": "4.10.10",
"resolved": "https://registry.npmjs.org/@koishijs/cli/-/cli-4.10.10.tgz",
"integrity": "sha512-85WFfrDjb0XZuCqgAJQPCuJgJFFzOW7RHdhCNtJbUWsrlA2aZjTWcBY6uHDQ7tItxTYhZhNTHtEOvD/q6IYXTw==",
"requires": {
"@koishijs/loader": "^2.4.3",
"cac": "^6.7.14",
"chokidar": "^3.5.3",
"kleur": "^4.1.5",
"throttle-debounce": "^3.0.1"
},
"dependencies": {
"@koishijs/loader": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.4.3.tgz",
"integrity": "sha512-vk/W8TK2/AgKuvEmP6C90+V4vn51u5A3zwJMRKaPi+Sm6xVMRCtGqvUkIi1xaX00hK9EhQKEi18UbRRLKGXhWA==",
"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"
}
}
}
},
"@koishijs/core": {
"version": "4.10.10",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.10.10.tgz",
"integrity": "sha512-LooBZCQSm91TL7aBBECjaFaROn+udCAavOwi+AWzbFPBfcuF4ZHFGpQ112yWK70xbQ7YhHUueueqJpkAGOy4RA==",
"requires": {
"@koishijs/utils": "^6.3.4",
"@minatojs/core": "^2.0.3",
"@satorijs/core": "^1.4.11",
=======
"@koishijs/core": {
"version": "4.11.0",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.0.tgz",
......@@ -3545,7 +3375,6 @@
"@koishijs/utils": "^6.4.0",
"@minatojs/core": "^2.1.0",
"@satorijs/core": "^1.5.2",
>>>>>>> master
"cordis": "^2.6.0",
"cosmokit": "^1.4.0",
"fastest-levenshtein": "^1.0.16"
......@@ -3622,19 +3451,11 @@
}
},
"@satorijs/core": {
<<<<<<< HEAD
"version": "1.4.11",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.4.11.tgz",
"integrity": "sha512-8EsVA5esShEqYMwwXipGwx7obwVb3Lc0NwBmjZWNj2++WYKYg+jQ0Iatgd2jcJhNX2H9ziqnwu05aHtWo+mSsA==",
"requires": {
"@satorijs/element": "^2.2.2",
=======
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.5.2.tgz",
"integrity": "sha512-5hnqwI6mSpDyzSHHIaaJBCwoiDjvDDBeD81rIwYW4JDKEKBOGWgVqNi4g+ru2s8gyR+M8cTvH71a1B2iOQiQTQ==",
"requires": {
"@satorijs/element": "^2.3.1",
>>>>>>> master
"cordis": "^2.6.0",
"cordis-axios": "^2.2.0",
"cosmokit": "^1.4.0",
......@@ -3644,35 +3465,20 @@
}
},
"@satorijs/element": {
<<<<<<< HEAD
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.2.2.tgz",
"integrity": "sha512-t6K0weO+GwqHhP/C9GTchck0jDk8c63kiAr9hHEVQX3nx/+fjGquTDGzBc4WzOVc105wePWRvV1UtvRaa0I9FQ==",
=======
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.3.1.tgz",
"integrity": "sha512-p1hQVy56nfJ2dw1noEHkV7hKpC9yqe5u3Vla+CSPqXU12uB4zqv96rjT9n4WulNGl8XTzqWxp8q8KWqhSI8JFA==",
>>>>>>> master
"requires": {
"cosmokit": "^1.4.0"
}
},
"@satorijs/satori": {
<<<<<<< HEAD
"version": "1.4.11",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.11.tgz",
"integrity": "sha512-nQHch/Ya1ClsNO9anJYfNnpiMFHCc1ihxdWuVKKpGOXRxuGMOtnbkB/Qa+NuBT+887E2NsFfTBoFgt8vuExxew==",
"requires": {
"@koa/router": "^10.1.1",
"@satorijs/core": "1.4.11",
=======
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.5.2.tgz",
"integrity": "sha512-e5l1NH9VVU8+4CeyKUWtr0mZ0E8WutvUzzqSuA5NCYkMMJ8A8xjqlHDOZtoEjtbp/AF9vnYVGHZC25DJw0zhig==",
"requires": {
"@koa/router": "^10.1.1",
"@satorijs/core": "1.5.2",
>>>>>>> master
"@types/koa": "*",
"@types/koa__router": "*",
"@types/ws": "^8.5.3",
......@@ -4656,12 +4462,6 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true
},
"fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"optional": true
},
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
......@@ -5021,17 +4821,6 @@
}
},
"koishi": {
<<<<<<< HEAD
"version": "4.10.10",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.10.10.tgz",
"integrity": "sha512-92VxR/7AL8l2eyd0MOWi5Nc/nLe2lX9ftglsMkqHvvImFkQma+2kSuexuxVLjcDmkAL6LWI27VxyuUH35jl5PQ==",
"requires": {
"@koishijs/core": "^4.10.10",
"@koishijs/utils": "^6.3.4",
"@satorijs/satori": "^1.4.11",
"file-type": "^16.5.4",
"ns-require": "^1.1.4"
=======
"version": "4.11.0",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.0.tgz",
"integrity": "sha512-1XGqZRRZxkUn3a0RYY8/hQ2B5/8T7eWyH8C93VYLiLKpYoPZleh47mx4rpd/fI1zBBQC3VEym0m8ApfEqwGIkg==",
......@@ -5045,7 +4834,6 @@
"kleur": "^4.1.5",
"ns-require": "^1.1.4",
"throttle-debounce": "^3.0.1"
>>>>>>> master
}
},
"levn": {
......
package.json
View file @ 5c36c908
{
"name": "koishi-bootstrap",
"description": "Koishi bootstraper, for Docker.",
"version": "7.5.2",
"version": "7.5.5",
"scripts": {
"lint": "eslint --fix .",
"build": "tsc",
......
src/def/interfaces.ts
View file @ 5c36c908
......@@ -6,7 +6,9 @@ export interface PluginInstallConfig {
}
export type PluginEntries = {
[K in string]: K extends `+${string}` ? PluginEntries : PluginInstallConfig;
[K in string]: K extends `group:${string}`
? PluginEntries
: PluginInstallConfig;
};
export interface KoishiConfig {
......
src/install-plugin.ts
View file @ 5c36c908
......@@ -134,7 +134,7 @@ async function installPlugin(name: string, info: PluginInstallConfig) {
export async function installPluginEntry() {
logger.info(`Bootstrapping...`);
const config = new ConfigLoader<KoishiConfig>().readConfig();
const config = new ConfigLoader().readConfig() as KoishiConfig;
const plugins = config?.plugins;
if (!plugins) {
logger.warn(`No plugins found, exiting.`);
......
src/prod.ts
View file @ 5c36c908
......@@ -23,7 +23,7 @@ async function handlePackageEntry(packagePath: string) {
export async function prodEntry() {
logger.info(`Running production preparations...`);
const config = new ConfigLoader<KoishiConfig>().readConfig();
const config = new ConfigLoader().readConfig() as KoishiConfig;
const plugins = config?.plugins;
if (!plugins) {
logger.warn(`No plugins found, exiting.`);
......
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