Commit 5c36c908 authored by nanahira's avatar nanahira

Merge branch 'master' into puppeteer

parents 3613837a fe462e3b
This diff is collapsed.
{ {
"name": "koishi-bootstrap", "name": "koishi-bootstrap",
"description": "Koishi bootstraper, for Docker.", "description": "Koishi bootstraper, for Docker.",
"version": "7.5.2", "version": "7.5.5",
"scripts": { "scripts": {
"lint": "eslint --fix .", "lint": "eslint --fix .",
"build": "tsc", "build": "tsc",
......
...@@ -6,7 +6,9 @@ export interface PluginInstallConfig { ...@@ -6,7 +6,9 @@ export interface PluginInstallConfig {
} }
export type PluginEntries = { export type PluginEntries = {
[K in string]: K extends `+${string}` ? PluginEntries : PluginInstallConfig; [K in string]: K extends `group:${string}`
? PluginEntries
: PluginInstallConfig;
}; };
export interface KoishiConfig { export interface KoishiConfig {
......
...@@ -134,7 +134,7 @@ async function installPlugin(name: string, info: PluginInstallConfig) { ...@@ -134,7 +134,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<KoishiConfig>().readConfig(); const config = new ConfigLoader().readConfig() as KoishiConfig;
const plugins = config?.plugins; const plugins = config?.plugins;
if (!plugins) { if (!plugins) {
logger.warn(`No plugins found, exiting.`); logger.warn(`No plugins found, exiting.`);
......
...@@ -23,7 +23,7 @@ async function handlePackageEntry(packagePath: string) { ...@@ -23,7 +23,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<KoishiConfig>().readConfig(); const config = new ConfigLoader().readConfig() as KoishiConfig;
const plugins = config?.plugins; const plugins = config?.plugins;
if (!plugins) { if (!plugins) {
logger.warn(`No plugins found, exiting.`); 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