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/hisoutensoku-jammer
+    - aws s3 --endpoint=https://minio.mycard.moe:9000 sync --delete dist/full/ s3://nanahira/koishi-plugin/hisoutensoku-jammer
   only:
     - master
 

package.json

@@ -6,10 +6,13 @@
   "dependencies": {
     "source-map-support": "^0.5.19"
   },
+  "peerDependencies": {
+    "koishi": "^4.0.0-beta.2"
+  },
   "devDependencies": {
     "@types/lodash": "^4.14.175",
     "@types/node": "^15.0.1",
-    "koishi": "^4.0.0-alpha.8",
+    "koishi": "^4.0.0-beta.2",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "raw-loader": "^4.0.2",
@@ -20,7 +23,7 @@
     "webpack-cli": "^4.6.0"
   },
   "scripts": {
-    "build": "webpack"
+    "build": "webpack && env PACK_ALL=1 webpack"
   },
   "repository": {
     "type": "git",

src/index.ts

@@ -4,8 +4,8 @@ import { Attacker } from "./attacker";
 import moment from "moment";
 
 export interface HisoutensokuJammerConfig {
-  attackTimeout: number;
-  addressWhitelist: string[];
+  attackTimeout?: number;
+  addressWhitelist?: string[];
 }
 
 const chineseCharacterList = [
@@ -125,6 +125,6 @@ export function apply(
   ctx: Context,
   config: HisoutensokuJammerConfig
 ) {
-  const hisoutensokuJammer = new HisoutensokuJammer(ctx, Schema.validate(config, schema));
+  const hisoutensokuJammer = new HisoutensokuJammer(ctx, config);
   hisoutensokuJammer.apply();
 }

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()),
+  },
 };