Commit e3e60e53 authored by nanahira's avatar nanahira

migrate to latest loader

parent 90bbbc23
This diff is collapsed.
...@@ -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"
......
...@@ -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.`);
......
...@@ -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.`);
......
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