diff --git a/build/publish.ts b/build/publish.ts index 2d410aa6d0..2fb7705679 100644 --- a/build/publish.ts +++ b/build/publish.ts @@ -57,7 +57,7 @@ if (CI && (GITHUB_REF !== 'refs/heads/master' || GITHUB_EVENT_NAME !== 'push')) return console.log(`Tag ${version} already exists.`) } - const body = draft(tags[tags.length - 1]) + const body = draft(tags[tags.length - 1], bumpMap) console.log(body) if (!GITHUB_TOKEN) return diff --git a/build/release.ts b/build/release.ts index ad864bbb20..50437298a7 100644 --- a/build/release.ts +++ b/build/release.ts @@ -4,30 +4,34 @@ const headerMap = { feat: 'Features', fix: 'Bug Fixes', dep: 'Dependencies', + '': 'Other Changes', } const prefixes = Object.keys(headerMap) const prefixRegExp = new RegExp(`^(${prefixes.join('|')})(?:\\((\\S+)\\))?: (.+)$`) -export function draft(base: string) { +export function draft(base: string, bumpMap: Record = {}) { const updates = {} const commits = spawnSync(['git', 'log', `${base}..HEAD`, '--format=%H %s']).split(/\r?\n/).reverse() for (const commit of commits) { const hash = commit.slice(0, 40) - const details = prefixRegExp.exec(commit.slice(41)) - if (!details) continue - let message = details[3] - if (details[2]) message = `**${details[2]}:** ${message}` + const message = commit.slice(41) + // skip merge commits + if (message.startsWith('Merge')) continue + + const details = prefixRegExp.exec(message) || ['', '', '', message] + let body = details[3] + if (details[2]) body = `**${details[2]}:** ${body}` if (!updates[details[1]]) updates[details[1]] = '' - updates[details[1]] += `- ${message} (${hash})\n` + updates[details[1]] += `- ${body} (${hash})\n` } - let body = '' + let output = Object.entries(bumpMap).map(([name, version]) => `- ${name}@${version}`).join('\n') + '\n' for (const type in headerMap) { if (!updates[type]) continue - body += `## ${headerMap[type]}\n\n${updates[type]}\n` + output += `\n## ${headerMap[type]}\n\n${updates[type]}` } - return body + return output } if (require.main === module) { diff --git a/packages/adapter-discord/package.json b/packages/adapter-discord/package.json index 3a1acef90f..0e09d6c28b 100644 --- a/packages/adapter-discord/package.json +++ b/packages/adapter-discord/package.json @@ -1,7 +1,7 @@ { "name": "koishi-adapter-discord", "description": "Discord adapter for Koishi", - "version": "1.0.0", + "version": "1.0.1", "main": "dist/index.js", "typings": "dist/index.d.ts", "files": [ @@ -28,11 +28,11 @@ "koishi" ], "peerDependencies": { - "koishi-core": "^3.0.0" + "koishi-core": "^3.0.1" }, "devDependencies": { "@types/ws": "^7.4.0", - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "dependencies": { "axios": "^0.21.1", diff --git a/packages/adapter-kaiheila/package.json b/packages/adapter-kaiheila/package.json index c7d040547a..101e514910 100644 --- a/packages/adapter-kaiheila/package.json +++ b/packages/adapter-kaiheila/package.json @@ -24,10 +24,10 @@ "koishi" ], "peerDependencies": { - "koishi-core": "^3.0.0" + "koishi-core": "^3.0.1" }, "devDependencies": { - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "dependencies": { "axios": "^0.21.1", diff --git a/packages/adapter-onebot/package.json b/packages/adapter-onebot/package.json index 160e10b107..64686a4061 100644 --- a/packages/adapter-onebot/package.json +++ b/packages/adapter-onebot/package.json @@ -27,12 +27,12 @@ "koishi" ], "peerDependencies": { - "koishi-core": "^3.0.0" + "koishi-core": "^3.0.1" }, "devDependencies": { "@types/ws": "^7.4.0", "get-port": "^5.1.1", - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "dependencies": { "axios": "^0.21.1", diff --git a/packages/adapter-telegram/package.json b/packages/adapter-telegram/package.json index 8404f96840..18a742cd78 100644 --- a/packages/adapter-telegram/package.json +++ b/packages/adapter-telegram/package.json @@ -28,10 +28,10 @@ "koishi" ], "peerDependencies": { - "koishi-core": "^3.0.0" + "koishi-core": "^3.0.1" }, "devDependencies": { - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "dependencies": { "axios": "^0.21.1", diff --git a/packages/adapter-tomon/package.json b/packages/adapter-tomon/package.json index 5a4ac2629b..5578028109 100644 --- a/packages/adapter-tomon/package.json +++ b/packages/adapter-tomon/package.json @@ -24,11 +24,11 @@ "koishi" ], "peerDependencies": { - "koishi-core": "^3.0.0" + "koishi-core": "^3.0.1" }, "devDependencies": { "@types/pako": "^1.0.1", - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "dependencies": { "axios": "^0.21.1", diff --git a/packages/koishi-core/package.json b/packages/koishi-core/package.json index e06337130a..334734640c 100644 --- a/packages/koishi-core/package.json +++ b/packages/koishi-core/package.json @@ -1,7 +1,7 @@ { "name": "koishi-core", "description": "Core features for Koishi", - "version": "3.0.0", + "version": "3.0.1", "main": "dist/index.js", "typings": "dist/index.d.ts", "engines": { @@ -30,7 +30,7 @@ ], "devDependencies": { "@types/koa": "^2.13.1", - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "dependencies": { "@koa/router": "^10.0.0", diff --git a/packages/koishi-test-utils/package.json b/packages/koishi-test-utils/package.json index 77a7be569d..26405734a9 100644 --- a/packages/koishi-test-utils/package.json +++ b/packages/koishi-test-utils/package.json @@ -1,7 +1,7 @@ { "name": "koishi-test-utils", "description": "Test utilities for Koishi", - "version": "6.0.0-beta.9", + "version": "6.0.0-beta.10", "main": "dist/index.js", "typings": "dist/index.d.ts", "engines": { @@ -37,7 +37,7 @@ "dependencies": { "chai": "^4.3.3", "chai-as-promised": "^7.1.1", - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" }, "devDependencies": { diff --git a/packages/koishi-utils/package.json b/packages/koishi-utils/package.json index cf020d890d..6869cac482 100644 --- a/packages/koishi-utils/package.json +++ b/packages/koishi-utils/package.json @@ -29,7 +29,7 @@ ], "devDependencies": { "@types/supports-color": "^7.2.0", - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "dependencies": { "supports-color": "^8.1.1" diff --git a/packages/koishi/ecosystem.json b/packages/koishi/ecosystem.json index 1ca3158f2e..7821436a5a 100644 --- a/packages/koishi/ecosystem.json +++ b/packages/koishi/ecosystem.json @@ -1,6 +1,6 @@ { "koishi-adapter-discord": { - "version": "1.0.0", + "version": "1.0.1", "description": "Discord adapter for Koishi" }, "koishi-adapter-kaiheila": { @@ -20,15 +20,15 @@ "description": "Tomon adapter for Koishi" }, "koishi-plugin-adventure": { - "version": "0.1.12", + "version": "0.1.13", "description": "Adventure Game for Koishi" }, "koishi-plugin-chess": { - "version": "3.0.0-beta.10", + "version": "3.0.0-beta.11", "description": "Chess Plugin for Koishi" }, "koishi-plugin-common": { - "version": "4.0.0-beta.19", + "version": "4.0.0", "description": "Common plugins for Koishi" }, "koishi-plugin-dice": { @@ -40,7 +40,7 @@ "description": "Execute JavaScript in Koishi" }, "koishi-plugin-github": { - "version": "3.0.0-beta.10", + "version": "3.0.0-beta.11", "description": "GitHub webhook plugin for Koishi" }, "koishi-plugin-image-search": { @@ -59,7 +59,7 @@ "description": "MySQL support for Koishi" }, "koishi-plugin-puppeteer": { - "version": "2.0.0-beta.10", + "version": "2.0.0", "description": "Take Screenshots in Koishi" }, "koishi-plugin-rss": { @@ -67,7 +67,7 @@ "description": "Subscribe RSS Url for Koishi" }, "koishi-plugin-schedule": { - "version": "3.0.0-beta.10", + "version": "3.0.0", "description": "Schedule plugin for Koishi" }, "koishi-plugin-status": { @@ -83,7 +83,7 @@ "description": "Some simple tools for Koishi" }, "koishi-plugin-webui": { - "version": "0.1.2", + "version": "0.1.3", "description": "Web UI for Koishi" } } diff --git a/packages/koishi/package.json b/packages/koishi/package.json index fae0f3fed9..734b19f1f4 100644 --- a/packages/koishi/package.json +++ b/packages/koishi/package.json @@ -1,7 +1,7 @@ { "name": "koishi", "description": "A QQ bot framework based on CQHTTP", - "version": "3.0.0", + "version": "3.0.1", "main": "index.js", "typings": "index.d.ts", "engines": { @@ -38,7 +38,7 @@ "cac": "^6.7.2", "chokidar": "^3.5.1", "kleur": "^4.1.4", - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1", "prompts": "^2.4.0" } diff --git a/packages/plugin-adventure/package.json b/packages/plugin-adventure/package.json index 98440d221f..de9dd858e0 100644 --- a/packages/plugin-adventure/package.json +++ b/packages/plugin-adventure/package.json @@ -1,6 +1,6 @@ { "name": "koishi-plugin-adventure", - "version": "0.1.12", + "version": "0.1.13", "description": "Adventure Game for Koishi", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -28,13 +28,13 @@ "adventure" ], "peerDependencies": { - "koishi-core": "^3.0.0", - "koishi-plugin-common": "^4.0.0-beta.19", + "koishi-core": "^3.0.1", + "koishi-plugin-common": "^4.0.0", "koishi-plugin-mysql": "^3.0.0-beta.16", "koishi-plugin-teach": "^2.0.0-beta.15", "koishi-utils": "^4.0.1" }, "devDependencies": { - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" } } diff --git a/packages/plugin-chess/package.json b/packages/plugin-chess/package.json index 13afdeec8d..47bc9d2056 100644 --- a/packages/plugin-chess/package.json +++ b/packages/plugin-chess/package.json @@ -1,7 +1,7 @@ { "name": "koishi-plugin-chess", "description": "Chess Plugin for Koishi", - "version": "3.0.0-beta.10", + "version": "3.0.0-beta.11", "main": "dist/index.js", "typings": "dist/index.d.ts", "files": [ @@ -29,8 +29,8 @@ "game" ], "peerDependencies": { - "koishi-core": "^3.0.0", - "koishi-plugin-puppeteer": "^2.0.0-beta.10", + "koishi-core": "^3.0.1", + "koishi-plugin-puppeteer": "^2.0.0", "koishi-utils": "^4.0.1" } } diff --git a/packages/plugin-common/package.json b/packages/plugin-common/package.json index e275238471..ba50b3223b 100644 --- a/packages/plugin-common/package.json +++ b/packages/plugin-common/package.json @@ -1,7 +1,7 @@ { "name": "koishi-plugin-common", "description": "Common plugins for Koishi", - "version": "4.0.0-beta.19", + "version": "4.0.0", "main": "dist/index.js", "typings": "dist/index.d.ts", "files": [ @@ -30,10 +30,10 @@ "plugin" ], "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" }, "devDependencies": { - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" } } diff --git a/packages/plugin-dice/package.json b/packages/plugin-dice/package.json index d00eb0ba46..023a1389ed 100644 --- a/packages/plugin-dice/package.json +++ b/packages/plugin-dice/package.json @@ -31,10 +31,10 @@ "dice" ], "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" }, "devDependencies": { - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" } } diff --git a/packages/plugin-eval/package.json b/packages/plugin-eval/package.json index e921f5baca..00187e20e6 100644 --- a/packages/plugin-eval/package.json +++ b/packages/plugin-eval/package.json @@ -33,7 +33,7 @@ "code" ], "peerDependencies": { - "koishi-core": "^3.0.0" + "koishi-core": "^3.0.1" }, "dependencies": { "js-yaml": "^4.0.0", @@ -43,6 +43,6 @@ }, "devDependencies": { "@types/js-yaml": "^4.0.0", - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" } } diff --git a/packages/plugin-github/package.json b/packages/plugin-github/package.json index f819683c20..fec1ae2d88 100644 --- a/packages/plugin-github/package.json +++ b/packages/plugin-github/package.json @@ -1,7 +1,7 @@ { "name": "koishi-plugin-github", "description": "GitHub webhook plugin for Koishi", - "version": "3.0.0-beta.10", + "version": "3.0.0-beta.11", "main": "dist/index.js", "typings": "dist/index.d.ts", "files": [ @@ -29,11 +29,11 @@ "webhook" ], "devDependencies": { - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "peerDependencies": { - "koishi-core": "^3.0.0", - "koishi-plugin-puppeteer": "^2.0.0-beta.10", + "koishi-core": "^3.0.1", + "koishi-plugin-puppeteer": "^2.0.0", "koishi-utils": "^4.0.1" }, "dependencies": { diff --git a/packages/plugin-image-search/package.json b/packages/plugin-image-search/package.json index 8c0d38bd70..7d872a188e 100644 --- a/packages/plugin-image-search/package.json +++ b/packages/plugin-image-search/package.json @@ -33,7 +33,7 @@ "pixiv" ], "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" }, "dependencies": { diff --git a/packages/plugin-mongo/package.json b/packages/plugin-mongo/package.json index e989c92a48..f539507773 100644 --- a/packages/plugin-mongo/package.json +++ b/packages/plugin-mongo/package.json @@ -35,7 +35,7 @@ "@types/mongodb": "^3.6.8" }, "peerDependencies": { - "koishi-core": "^3.0.0" + "koishi-core": "^3.0.1" }, "dependencies": { "mongodb": "^3.6.4" diff --git a/packages/plugin-monitor/package.json b/packages/plugin-monitor/package.json index f47a1a4ca6..72c9640603 100644 --- a/packages/plugin-monitor/package.json +++ b/packages/plugin-monitor/package.json @@ -17,7 +17,7 @@ }, "homepage": "https://github.com/koishijs/koishi#readme", "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" } } diff --git a/packages/plugin-mysql/package.json b/packages/plugin-mysql/package.json index 74ba80a54e..22f5f51276 100644 --- a/packages/plugin-mysql/package.json +++ b/packages/plugin-mysql/package.json @@ -35,7 +35,7 @@ "@types/mysql": "^2.15.18" }, "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" }, "dependencies": { diff --git a/packages/plugin-puppeteer/package.json b/packages/plugin-puppeteer/package.json index db714bc837..90781be6e4 100644 --- a/packages/plugin-puppeteer/package.json +++ b/packages/plugin-puppeteer/package.json @@ -1,7 +1,7 @@ { "name": "koishi-plugin-puppeteer", "description": "Take Screenshots in Koishi", - "version": "2.0.0-beta.10", + "version": "2.0.0", "main": "dist/index.js", "typings": "dist/index.d.ts", "files": [ @@ -30,10 +30,10 @@ ], "devDependencies": { "@types/pngjs": "^6.0.0", - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" }, "dependencies": { diff --git a/packages/plugin-rss/package.json b/packages/plugin-rss/package.json index e02103b105..180258f2d3 100644 --- a/packages/plugin-rss/package.json +++ b/packages/plugin-rss/package.json @@ -31,11 +31,11 @@ "rss" ], "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" }, "devDependencies": { - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "dependencies": { "rss-feed-emitter": "^3.2.2" diff --git a/packages/plugin-schedule/package.json b/packages/plugin-schedule/package.json index 6f4cb4a5b7..262774c1c1 100644 --- a/packages/plugin-schedule/package.json +++ b/packages/plugin-schedule/package.json @@ -1,7 +1,7 @@ { "name": "koishi-plugin-schedule", "description": "Schedule plugin for Koishi", - "version": "3.0.0-beta.10", + "version": "3.0.0", "main": "dist/index.js", "typings": "dist/index.d.ts", "files": [ @@ -31,10 +31,10 @@ "devDependencies": { "koishi-plugin-mongo": "^2.0.0-beta.8", "koishi-plugin-mysql": "^3.0.0-beta.16", - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" } } diff --git a/packages/plugin-status/package.json b/packages/plugin-status/package.json index 2eaba279f0..7cd525e38d 100644 --- a/packages/plugin-status/package.json +++ b/packages/plugin-status/package.json @@ -28,12 +28,12 @@ "status" ], "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" }, "devDependencies": { "koishi-plugin-mongo": "^2.0.0-beta.8", "koishi-plugin-mysql": "^3.0.0-beta.16", - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" } } diff --git a/packages/plugin-teach/package.json b/packages/plugin-teach/package.json index 98d60cb3d9..8326d00201 100644 --- a/packages/plugin-teach/package.json +++ b/packages/plugin-teach/package.json @@ -33,13 +33,13 @@ "conversation" ], "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" }, "devDependencies": { "koishi-plugin-mongo": "^2.0.0-beta.8", "koishi-plugin-mysql": "^3.0.0-beta.16", - "koishi-test-utils": "^6.0.0-beta.9" + "koishi-test-utils": "^6.0.0-beta.10" }, "dependencies": { "axios": "^0.21.1", diff --git a/packages/plugin-tools/package.json b/packages/plugin-tools/package.json index 87b8182788..3c1c4278d4 100644 --- a/packages/plugin-tools/package.json +++ b/packages/plugin-tools/package.json @@ -21,7 +21,7 @@ "@types/qrcode": "^1.4.0" }, "peerDependencies": { - "koishi-core": "^3.0.0", + "koishi-core": "^3.0.1", "koishi-utils": "^4.0.1" }, "dependencies": { diff --git a/packages/plugin-webui/package.json b/packages/plugin-webui/package.json index d2561505eb..1e05fcb46c 100644 --- a/packages/plugin-webui/package.json +++ b/packages/plugin-webui/package.json @@ -1,6 +1,6 @@ { "name": "koishi-plugin-webui", - "version": "0.1.2", + "version": "0.1.3", "description": "Web UI for Koishi", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/koishijs/koishi#readme", "peerDependencies": { - "koishi-core": "^3.0.0" + "koishi-core": "^3.0.1" }, "dependencies": { "element-plus": "^1.0.2-beta.33",