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/picsource-localfs
+    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync --delete dist/full/ s3://nanahira/koishi-plugin/picsource-localfs
   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",
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/koishijs/koishi-plugin-picsource-localfs",
   "dependencies": {
-    "koishi-utils-schemagen": "^1.1.7",
+    "schemastery-gen": "^1.0.3",
     "source-map-support": "^0.5.20"
   },
   "peerDependencies": {
@@ -40,7 +40,7 @@
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.1",
-    "koishi": "^4.0.0-alpha.11",
+    "koishi": "^4.0.0-beta.2",
     "koishi-plugin-pics": "^1.0.4",
     "prettier": "^2.4.1",
     "raw-loader": "^4.0.2",

src/config.ts

 import 'source-map-support/register';
-import { DefineSchema, schemaFromClass } from 'koishi-utils-schemagen';
 import { PicSourceConfig, PicSourceInfo } from 'koishi-plugin-pics';
 import { Context } from 'koishi';
 import { LocalSource } from './LocalSource';
+import { DefineSchema, RegisterSchema } from 'schemastery-gen';
 
 export interface LocalSourceConfigLike extends PicSourceInfo {
   path: string;
@@ -11,6 +11,7 @@ export interface LocalSourceConfigLike extends PicSourceInfo {
   displayFilename?: boolean;
 }
 
+@RegisterSchema()
 export class LocalSourceConfig
   extends PicSourceConfig
   implements LocalSourceConfigLike {

src/index.ts

 import 'source-map-support/register';
 import { Context } from 'koishi';
 import { PicSourceLocalFSPlugin } from './plugin';
-import { PicSourceLocalFSPluginConfigLike } from './config';
+import { PicSourceLocalFSPluginConfig, PicSourceLocalFSPluginConfigLike } from './config';
 export * from './config';
 export * from './plugin';
 export * from './LocalSource';
@@ -9,6 +9,6 @@ export * from './LocalSource';
 export const name = 'picsource-localfs';
 const plugin = new PicSourceLocalFSPlugin();
 export const schema = plugin.schema;
-export function apply(ctx: Context, config: PicSourceLocalFSPluginConfigLike) {
+export function apply(ctx: Context, config: PicSourceLocalFSPluginConfig) {
   ctx.plugin(plugin, config);
 }

src/plugin.ts

@@ -4,7 +4,6 @@ import {
   PicSourceLocalFSPluginConfig,
   PicSourceLocalFSPluginConfigLike,
 } from './config';
-import { schemaFromClass, schemaTransform } from 'koishi-utils-schemagen';
 
 export class PicSourceLocalFSPlugin {
   private config: PicSourceLocalFSPluginConfig;
@@ -13,9 +12,9 @@ export class PicSourceLocalFSPlugin {
   schema: Schema<PicSourceLocalFSPluginConfigLike> = schemaFromClass(
     PicSourceLocalFSPluginConfig,
   );
-  apply(ctx: Context, config: PicSourceLocalFSPluginConfigLike) {
+  apply(ctx: Context, config: PicSourceLocalFSPluginConfig) {
     this.ctx = ctx;
-    this.config = schemaTransform(PicSourceLocalFSPluginConfig, config);
+    this.config = config;
     this.config.sources.forEach((s) => s.registerInstance(ctx));
   }
 }

webpack.config.js

 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',
@@ -23,11 +37,10 @@ module.exports = {
     library: {
       type: 'commonjs',
     },
-    path: path.resolve(__dirname, 'dist'),
+    path: path.resolve(__dirname, packAll ? 'dist/full' : 'dist'),
   },
   externals: {
     koishi: 'koishi',
-    'koishi-plugin-pics': 'koishi-plugin-pics',
-    'koishi-utils-schemagen': 'koishi-utils-schemagen',
+    ...(packAll ? {} : externalsFromDep()),
   },
 };