diff --git a/server/proxy/.npmignore b/server/proxy/.npmignore deleted file mode 100644 index 7e5fcbc..0000000 --- a/server/proxy/.npmignore +++ /dev/null @@ -1,2 +0,0 @@ -.DS_Store -tsconfig.tsbuildinfo diff --git a/server/proxy/index.cjs b/server/proxy/index.cjs new file mode 100644 index 0000000..c2e3313 --- /dev/null +++ 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 new file mode 100644 index 0000000..f398f51 --- /dev/null +++ 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 new file mode 100644 index 0000000..f398f51 --- /dev/null +++ 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 index aca9a43..a1133eb 100644 --- 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 ", "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 deleted file mode 100644 index 843cfdc..0000000 --- a/server/proxy/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import ProxyServer from '@satorijs/server-proxy' - -export default ProxyServer -export * from '@satorijs/server-proxy' diff --git a/server/proxy/tsconfig.json b/server/proxy/tsconfig.json deleted file mode 100644 index 74ac2c8..0000000 --- a/server/proxy/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.base", - "compilerOptions": { - "outDir": "lib", - "rootDir": "src", - }, - "include": [ - "src", - ], -} \ No newline at end of file diff --git a/server/satori/.npmignore b/server/satori/.npmignore deleted file mode 100644 index 7e5fcbc..0000000 --- a/server/satori/.npmignore +++ /dev/null @@ -1,2 +0,0 @@ -.DS_Store -tsconfig.tsbuildinfo diff --git a/server/satori/index.cjs b/server/satori/index.cjs new file mode 100644 index 0000000..3ee2523 --- /dev/null +++ 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 new file mode 100644 index 0000000..b849278 --- /dev/null +++ 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 new file mode 100644 index 0000000..b849278 --- /dev/null +++ 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 index a44c93d..4a0c81b 100644 --- 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 ", "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 deleted file mode 100644 index 1241a7e..0000000 --- a/server/satori/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@satorijs/server-satori' diff --git a/server/satori/tsconfig.json b/server/satori/tsconfig.json deleted file mode 100644 index 74ac2c8..0000000 --- a/server/satori/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.base", - "compilerOptions": { - "outDir": "lib", - "rootDir": "src", - }, - "include": [ - "src", - ], -} \ No newline at end of file diff --git a/server/temp/.npmignore b/server/temp/.npmignore deleted file mode 100644 index 7e5fcbc..0000000 --- a/server/temp/.npmignore +++ /dev/null @@ -1,2 +0,0 @@ -.DS_Store -tsconfig.tsbuildinfo diff --git a/server/temp/index.cjs b/server/temp/index.cjs new file mode 100644 index 0000000..83714da --- /dev/null +++ b/server/temp/index.cjs @@ -0,0 +1 @@ +module.exports = require('@cordisjs/plugin-server-temp') diff --git a/server/temp/src/index.ts b/server/temp/index.d.ts similarity index 100% rename from server/temp/src/index.ts rename to server/temp/index.d.ts diff --git a/server/temp/index.mjs b/server/temp/index.mjs new file mode 100644 index 0000000..6a2ae04 --- /dev/null +++ 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 index 475cee4..d015db5 100644 --- 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 ", "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 deleted file mode 100644 index 74ac2c8..0000000 --- a/server/temp/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.base", - "compilerOptions": { - "outDir": "lib", - "rootDir": "src", - }, - "include": [ - "src", - ], -} \ No newline at end of file