Merge branch 'master' into pics

.dockerignore

@@ -40,4 +40,5 @@ lerna-debug.log*
 .git*
 Dockerfile
 .dockerignore
-/koishi.config.*
+/koishi.config.*
\ No newline at end of file
+/koishi-plugins

.eslintignore

@@ -2,4 +2,5 @@ webpack.config.js
 dist/*
 build/*
 *.js
-/koishi.config.*
+/koishi.config.*
\ No newline at end of file
+/koishi-plugins

.gitignore

@@ -36,4 +36,5 @@ lerna-debug.log*
 /data
 /output
 /config.yaml
-/koishi.config.*
+/koishi.config.*
\ No newline at end of file
+/koishi-plugins

.npmignore

@@ -6,4 +6,5 @@
 .idea
 .dockerignore
 Dockerfile
-/koishi.config.*
+/koishi.config.*
\ No newline at end of file
+/koishi-plugins

README.md

@@ -28,10 +28,10 @@ logger:
 
 allowWrite: false
 
-# 插件设置
 plugins:
   act:
     $install: latest
+    $community: true # Will prefer koishi-plugin-act over @koishijs/plugin-act
   adapter-onebot:
     $install: true # Will always install the latest version
     bots:
@@ -41,4 +41,4 @@ plugins:
         token: 'token'
   verifer:
     $install: '1.0.0-beta.0' # Will install this version. NPM format is also supported.
-```
+```
\ No newline at end of file

package-lock.json

 {
   "name": "koishi-bootstrap",
-  "version": "5.2.0",
+  "version": "5.3.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "koishi-bootstrap",
-      "version": "5.2.0",
+      "version": "5.3.1",
       "license": "MIT",
       "dependencies": {
         "@koishijs/cli": "^4.2.0",

package.json

 {
   "name": "koishi-bootstrap",
   "description": "Koishi bootstraper, for Docker.",
-  "version": "5.2.0",
+  "version": "5.3.1",
   "scripts": {
     "lint": "eslint --fix .",
     "build": "tsc",

src/def/interfaces.ts

@@ -8,4 +8,6 @@ export interface KoishiConfig {
 
 export interface PackageConfig {
   dependencies: Record<string, string>;
+  devDependencies: Record<string, string>;
+  peerDependencies: Record<string, string>;
 }

src/prod.ts

@@ -16,7 +16,7 @@ async function handlePackageEntry(packageName: string, versionString: string) {
       try {
         await fs.promises.access(path);
         console.log(`Removing ${path} ...`);
-        // await fs.promises.rmdir(path, { recursive: true });
+        await fs.promises.rmdir(path, { recursive: true });
       } catch (e) {}
     }),
   );

src/utils/read-package-json.ts

 import loadJsonFile from 'load-json-file';
 import { PackageConfig } from '../def/interfaces';
 
-export async function getPackageJsonPackages() {
-  const { dependencies } = await loadJsonFile<PackageConfig>('./package.json');
-  return dependencies;
+export async function getPackageJsonPackages(
+  path = './package.json',
+  type: keyof PackageConfig = 'dependencies',
+) {
+  const json = await loadJsonFile<PackageConfig>(path);
+  return json[type];
 }