catchup

.gitlab-ci.yml

@@ -23,7 +23,7 @@ upload_to_minio:
   tags:
     - linux
   script:
-    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync --delete dist/ s3://nanahira/koishi-plugin/thesaurus
+    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync --delete dist/full/ s3://nanahira/koishi-plugin/thesaurus
   only:
     - master
 

package.json

@@ -6,7 +6,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "lint": "eslint --fix .",
-    "build": "webpack"
+    "build": "webpack && env PACK_ALL=1 webpack"
   },
   "repository": {
     "type": "git",
@@ -25,10 +25,12 @@
   },
   "homepage": "https://code.mycard.moe/3rdeye/koishi-plugin-thesaurus",
   "dependencies": {
-    "source-map-support": "^0.5.20"
+    "schemastery-gen": "^1.0.3",
+    "source-map-support": "^0.5.20",
+    "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "koishi": "^4.0.0-alpha.12"
+    "koishi": "^4.0.0-beta.2"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.175",
@@ -38,11 +40,8 @@
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.1",
-    "koishi": "^4.0.0-beta.0",
-    "koishi-utils-schemagen": "^1.1.7",
-    "lodash": "^4.17.21",
+    "koishi": "^4.0.0-beta.2",
     "prettier": "^2.4.1",
-    "proxy-agent": "^5.0.0",
     "raw-loader": "^4.0.2",
     "ts-loader": "^9.2.6",
     "typescript": "^4.4.4",

src/config.ts

 import 'source-map-support/register';
-import { DefineSchema } from 'koishi-utils-schemagen';
+import { DefineSchema, RegisterSchema } from 'schemastery-gen';
 
+@RegisterSchema()
 export class MyPluginConfig {
   @DefineSchema({
     desc: '词库本地路径或 URL。',

src/index.ts

 import 'source-map-support/register';
 import { Context } from 'koishi';
 import { MyPlugin } from './plugin';
-import { MyPluginConfigLike } from './config';
+import { MyPluginConfig } from './config';
 export { MyPluginConfig } from './config';
 export { ChatSession } from './plugin';
 
@@ -14,6 +14,6 @@ declare module 'koishi' {
 export const name = 'thesaurus';
 const plugin = new MyPlugin();
 export const schema = plugin.schema;
-export function apply(ctx: Context, config: Partial<MyPluginConfigLike>) {
+export function apply(ctx: Context, config: MyPluginConfig) {
   ctx.plugin(plugin, config);
 }

src/plugin.ts

@@ -143,10 +143,10 @@ export class MyPlugin {
     return name;
   }
   name = 'thesaurus-main';
-  schema: Schema<MyPluginConfigLike> = schemaFromClass(MyPluginConfig);
-  async apply(ctx: Context, config: MyPluginConfigLike) {
+  schema = MyPluginConfig;
+  async apply(ctx: Context, config: MyPluginConfig) {
     this.ctx = ctx;
-    this.config = schemaTransform(MyPluginConfig, config);
+    this.config = config;
     ctx.on('service/database', () => {
       if (this.config.useDatabase) this.useDatabase = !!ctx.database;
     });

webpack.config.js

-const path = require("path");
+const path = require('path');
+const packgeInfo = require('./package.json');
+
+function externalsFromDep() {
+  return Object.fromEntries(
+    [
+      ...Object.keys(packgeInfo.dependencies || {}),
+      ...Object.keys(packgeInfo.peerDependencies || {}),
+    ]
+      .filter((dep) => dep !== 'source-map-support')
+      .map((dep) => [dep, dep]),
+  );
+}
+
+const packAll = !!process.env.PACK_ALL;
 
 module.exports = {
-  entry: "./src/index.ts",
-  mode: "production",
-  target: "node",
-  devtool: "source-map",
+  entry: './src/index.ts',
+  mode: 'production',
+  target: 'node',
+  devtool: 'source-map',
   module: {
     rules: [
       {
         test: /\.tsx?$/,
-        use: "ts-loader",
+        use: 'ts-loader',
         exclude: /node_modules/,
       },
-      { test: /\.mustache$/, use: "raw-loader" },
+      { test: /\.mustache$/, use: 'raw-loader' },
     ],
   },
   resolve: {
-    extensions: [".tsx", ".ts", ".js"],
+    extensions: ['.tsx', '.ts', '.js'],
   },
   output: {
-    filename: "index.js",
+    filename: 'index.js',
     library: {
-      type: "commonjs",
+      type: 'commonjs',
     },
-    path: path.resolve(__dirname, "dist"),
+    path: path.resolve(__dirname, packAll ? 'dist/full' : 'dist'),
   },
   externals: {
-    'koishi': 'koishi',
-  }
+    koishi: 'koishi',
+    ...(packAll ? {} : externalsFromDep()),
+  },
 };