bump to Koishi 4.8

dev/extras.ts

@@ -13,22 +13,18 @@ export default class ExtrasInDev {
       weight: 2,
     });
     ctx.plugin(PicSourceYandePlugin, {
-      instances: [
-        {
-          name: 'yande',
-          weight: 1,
-          endpoint: 'https://yande.re/post.json',
-          pageLimit: 200,
-          isDefault: true,
-        },
-        {
-          name: 'konachan',
-          weight: 1,
-          endpoint: 'https://konachan.com/post.json',
-          pageLimit: 200,
-          isDefault: true,
-        },
-      ],
+      name: 'yande',
+      weight: 1,
+      endpoint: 'https://yande.re/post.json',
+      pageLimit: 200,
+      isDefault: true,
+    });
+    ctx.plugin(PicSourceYandePlugin, {
+      name: 'konachan',
+      weight: 1,
+      endpoint: 'https://konachan.com/post.json',
+      pageLimit: 200,
+      isDefault: true,
     });
     ctx.plugin(PicSourceHeisi, { isDefault: true });
     ctx.plugin(PicSourceMiraikoi, { isDefault: true });

dev/index.ts

-import { App } from 'koishi';
+import { Context } from 'koishi';
 import TargetPlugin from '../src';
 import ConsolePlugin from '@koishijs/plugin-console';
 import SandboxPlugin from '@koishijs/plugin-sandbox';
-import * as DatabasePlugin from '@koishijs/plugin-database-memory';
-import CachePlugin from '@koishijs/plugin-cache-lru';
+import DatabasePlugin from '@koishijs/plugin-database-memory';
+// import CachePlugin from '@koishijs/plugin-cache-lru';
 import ExtrasInDev from './extras';
 
-const app = new App({
+const app = new Context({
   port: 14514,
   host: 'localhost',
   prefix: '.',
@@ -19,7 +19,7 @@ app.plugin(ConsolePlugin, {
 });
 
 // Some services
-app.plugin(CachePlugin);
+// app.plugin(CachePlugin);
 app.plugin(DatabasePlugin);
 
 // Some extras

package.json

@@ -47,31 +47,31 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "koishi-thirdeye": "^10.3.2",
+    "koishi-thirdeye": "^11.0.6",
     "moment": "^2.29.3"
   },
   "peerDependencies": {
-    "koishi": "^4.7.5",
-    "koishi-plugin-pics": "^9.4.1"
+    "koishi": "^4.8.2",
+    "koishi-plugin-pics": "^10.0.0"
   },
   "devDependencies": {
-    "@koishijs/plugin-cache-lru": "^1.0.0-rc.0",
-    "@koishijs/plugin-console": "^3.3.2",
-    "@koishijs/plugin-database-memory": "^1.3.0",
-    "@koishijs/plugin-sandbox": "^1.1.3",
+    "@koishijs/plugin-console": "^4.1.1",
+    "@koishijs/plugin-database-memory": "^1.4.1",
+    "@koishijs/plugin-sandbox": "^2.0.1",
     "@types/jest": "^27.5.0",
     "@types/node": "^17.0.31",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
+    "esbuild-loader": "^2.19.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^3.4.1",
     "jest": "^28.0.3",
-    "koishi-plugin-pics": "^9.4.1",
-    "koishi-plugin-picsource-heisi": "^6.0.3",
-    "koishi-plugin-picsource-lolicon": "^9.2.5",
-    "koishi-plugin-picsource-miraikoi": "^1.0.2",
-    "koishi-plugin-picsource-yande": "^2.0.3",
+    "koishi-plugin-pics": "^10.0.0",
+    "koishi-plugin-picsource-heisi": "^7.0.0",
+    "koishi-plugin-picsource-lolicon": "^10.0.0",
+    "koishi-plugin-picsource-miraikoi": "^2.0.0",
+    "koishi-plugin-picsource-yande": "^3.0.0",
     "prettier": "^2.6.2",
     "raw-loader": "^4.0.2",
     "ts-jest": "^28.0.1",

src/config.ts

@@ -35,9 +35,9 @@ export class EdgingProfile {
 
   bot: Bot;
 
-  getBot(bots: Adapter.BotList) {
+  getBot(bots: Bot[]) {
     if (this.from) {
-      return bots.get(this.from);
+      return bots.find(bot => bot.sid === this.from);
     } else {
       return this.session.bot;
     }
@@ -130,7 +130,7 @@ export class EdgingProfile {
     return this.failTriggerWord && message.startsWith(this.failTriggerWord);
   }
 
-  async initialize(config: EdgingPluginConfig, bots: Adapter.BotList) {
+  async initialize(config: EdgingPluginConfig, bots: Bot[]) {
     Object.keys(config.defaultProfile).forEach((key) => {
       if (!this[key] && config.defaultProfile[key]) {
         this[key] = config.defaultProfile[key];

src/index.ts

@@ -2,7 +2,7 @@
 import { EdgingPluginConfig, EdgingProfile } from './config';
 import {
   DefinePlugin,
-  BasePlugin,
+  StarterPlugin,
   Provide,
   Inject,
   LifecycleEvents,
@@ -22,11 +22,8 @@ import { dynamicInterval } from './utility';
 export * from './config';
 
 declare module 'koishi' {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace Context {
-    interface Services {
-      edging: EdgingPlugin;
-    }
+  interface Context {
+    edging: EdgingPlugin;
   }
 }
 
@@ -74,7 +71,7 @@ export class EdgingPanel {
 @Provide('edging', { immediate: true })
 @DefinePlugin({ name: 'edging', schema: EdgingPluginConfig })
 export default class EdgingPlugin
-  extends BasePlugin<EdgingPluginConfig>
+  extends StarterPlugin(EdgingPluginConfig)
   implements LifecycleEvents
 {
   onApply() {
@@ -94,7 +91,7 @@ export default class EdgingPlugin
   }
 
   @Inject()
-  private bots: Adapter.BotList;
+  private bots: Bot[];
 
   @Inject()
   private pics: PicsContainer;

tests/sample.spec.ts

-import { App } from 'koishi';
+import { Context } from 'koishi';
 import TargetPlugin from '../src';
 
 describe('Test of plugin.', () => {
-  let app: App;
+  let app: Context;
 
   beforeEach(async () => {
-    app = new App();
+    app = new Context();
     // app.plugin(TargetPlugin);
     await app.start();
   });

webpack.config.js

 const path = require('path');
 const packgeInfo = require('./package.json');
+const { ESBuildMinifyPlugin } = require('esbuild-loader');
 
 function externalsFromDep() {
   return Object.fromEntries(
@@ -43,4 +44,11 @@ module.exports = {
     koishi: 'koishi',
     ...(packAll ? {} : externalsFromDep()),
   },
+  optimization: {
+    minimizer: [
+      new ESBuildMinifyPlugin({
+        keepNames: true,
+      }),
+    ],
+  },
 };