refactor server-related plugins

koishijs · May 26, 2024 · ea93aa3 · ea93aa3
1 parent 9a3b75d
commit ea93aa3
Show file tree

Hide file tree

Showing 20 changed files with 67 additions and 69 deletions.
diff --git a/server/proxy/.npmignore b/server/proxy/.npmignore
diff --git a/server/proxy/index.cjs b/server/proxy/index.cjs
@@ -0,0 +1 @@
+module.exports = require('@cordisjs/plugin-server-proxy')
diff --git a/server/proxy/index.d.ts b/server/proxy/index.d.ts
@@ -0,0 +1,4 @@
+import ProxyServer from '@cordisjs/plugin-server-proxy'
+
+export default ProxyServer
+export * from '@cordisjs/plugin-server-proxy'
diff --git a/server/proxy/index.mjs b/server/proxy/index.mjs
@@ -0,0 +1,4 @@
+import ProxyServer from '@cordisjs/plugin-server-proxy'
+
+export default ProxyServer
+export * from '@cordisjs/plugin-server-proxy'
diff --git a/server/proxy/package.json b/server/proxy/package.json
@@ -1,13 +1,20 @@
 {
   "name": "@koishijs/plugin-server-proxy",
   "description": "Proxy service for Koishi",
-  "version": "1.1.0",
-  "main": "lib/index.js",
-  "module": "lib/index.mjs",
-  "typings": "lib/index.d.ts",
+  "version": "1.2.0",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "require": "./index.cjs",
+      "default": "./index.mjs"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
-    "lib",
-    "src"
+    "index.cjs",
+    "index.mjs",
+    "index.d.ts"
   ],
   "author": "Shigma <shigma10826@gmail.com>",
   "license": "MIT",
@@ -31,6 +38,10 @@
   ],
   "koishi": {
     "service": {
+      "required": [
+        "server",
+        "http"
+      ],
       "implements": [
         "server.proxy"
       ]
@@ -41,12 +52,12 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.17.5"
+    "koishi": "^4.17.7"
   },
   "devDependencies": {
-    "koishi": "^4.17.5"
+    "koishi": "^4.17.7"
   },
   "dependencies": {
-    "@satorijs/server-proxy": "^1.1.0"
+    "@cordisjs/plugin-server-proxy": "^0.2.0"
   }
 }
diff --git a/server/proxy/src/index.ts b/server/proxy/src/index.ts
diff --git a/server/proxy/tsconfig.json b/server/proxy/tsconfig.json
diff --git a/server/satori/.npmignore b/server/satori/.npmignore
diff --git a/server/satori/index.cjs b/server/satori/index.cjs
@@ -0,0 +1 @@
+module.exports = require('@satorijs/plugin-server')
diff --git a/server/satori/index.d.ts b/server/satori/index.d.ts
@@ -0,0 +1,4 @@
+import SatoriServer from '@satorijs/plugin-server'
+
+export default SatoriServer
+export * from '@satorijs/plugin-server'
diff --git a/server/satori/index.mjs b/server/satori/index.mjs
@@ -0,0 +1,4 @@
+import SatoriServer from '@satorijs/plugin-server'
+
+export default SatoriServer
+export * from '@satorijs/plugin-server'
diff --git a/server/satori/package.json b/server/satori/package.json
@@ -1,22 +1,20 @@
 {
   "name": "@koishijs/plugin-server-satori",
   "description": "Satori Server for Koishi",
-  "version": "2.4.3",
+  "version": "2.6.2",
   "type": "module",
-  "main": "lib/index.cjs",
-  "module": "lib/index.mjs",
-  "typings": "lib/index.d.ts",
   "exports": {
     ".": {
-      "require": "./lib/index.cjs",
-      "import": "./lib/index.mjs",
-      "types": "./lib/index.d.ts"
+      "types": "./index.d.ts",
+      "require": "./index.cjs",
+      "default": "./index.mjs"
     },
     "./package.json": "./package.json"
   },
   "files": [
-    "lib",
-    "src"
+    "index.cjs",
+    "index.mjs",
+    "index.d.ts"
   ],
   "author": "Shigma <shigma10826@gmail.com>",
   "license": "MIT",
@@ -46,12 +44,12 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.17.5"
+    "koishi": "^4.17.7"
   },
   "devDependencies": {
-    "koishi": "^4.17.5"
+    "koishi": "^4.17.7"
   },
   "dependencies": {
-    "@satorijs/server-satori": "^2.4.3"
+    "@satorijs/plugin-server": "^2.6.2"
   }
 }
diff --git a/server/satori/src/index.ts b/server/satori/src/index.ts
diff --git a/server/satori/tsconfig.json b/server/satori/tsconfig.json
diff --git a/server/temp/.npmignore b/server/temp/.npmignore
diff --git a/server/temp/index.cjs b/server/temp/index.cjs
@@ -0,0 +1 @@
+module.exports = require('@cordisjs/plugin-server-temp')
diff --git a/server/temp/src/index.ts → server/temp/index.d.ts b/server/temp/src/index.ts → server/temp/index.d.ts
diff --git a/server/temp/index.mjs b/server/temp/index.mjs
@@ -0,0 +1,4 @@
+import TempServer from '@cordisjs/plugin-server-temp'
+
+export default TempServer
+export * from '@cordisjs/plugin-server-temp'
diff --git a/server/temp/package.json b/server/temp/package.json
@@ -2,12 +2,19 @@
   "name": "@koishijs/plugin-server-temp",
   "description": "Temporary file server for Koishi",
   "version": "1.4.0",
-  "main": "lib/index.js",
-  "module": "lib/index.mjs",
-  "typings": "lib/index.d.ts",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "require": "./index.cjs",
+      "default": "./index.mjs"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
-    "lib",
-    "src"
+    "index.cjs",
+    "index.mjs",
+    "index.d.ts"
   ],
   "author": "Shigma <shigma10826@gmail.com>",
   "license": "MIT",
@@ -46,10 +53,10 @@
     }
   },
   "peerDependencies": {
-    "koishi": "^4.17.5"
+    "koishi": "^4.17.7"
   },
   "devDependencies": {
-    "koishi": "^4.17.5"
+    "koishi": "^4.17.7"
   },
   "dependencies": {
     "@cordisjs/plugin-server-temp": "^0.4.0"

diff --git a/server/temp/tsconfig.json b/server/temp/tsconfig.json