From b76e223f072c5637da2ce262100a18536e5102cc Mon Sep 17 00:00:00 2001 From: PalmDevs Date: Mon, 22 Jul 2024 22:40:56 +0700 Subject: [PATCH] ci(release): don't patch MSR anymore, add npm semantic release plugin --- apis/websocket/.releaserc.js | 6 ++-- bots/discord/.releaserc.js | 6 ++-- bun.lockb | Bin 286936 -> 285856 bytes package.json | 6 +--- ...lilab%2Fmulti-semantic-release@1.1.3.patch | 16 --------- .releaserc.js => semantic-release-config.js | 31 +++++++++++++++--- 6 files changed, 36 insertions(+), 29 deletions(-) delete mode 100644 patches/@anolilab%2Fmulti-semantic-release@1.1.3.patch rename .releaserc.js => semantic-release-config.js (63%) diff --git a/apis/websocket/.releaserc.js b/apis/websocket/.releaserc.js index 2f2d58d..954c2cf 100644 --- a/apis/websocket/.releaserc.js +++ b/apis/websocket/.releaserc.js @@ -1,4 +1,6 @@ -export default { +import defineSubprojectReleaseConfig from '../../semantic-release-config.js' + +export default defineSubprojectReleaseConfig({ plugins: process.env.RELEASE_WORKFLOW_STEP === 'publish' ? [ @@ -27,4 +29,4 @@ export default { }, ], ], -} +}) diff --git a/bots/discord/.releaserc.js b/bots/discord/.releaserc.js index a1ed2f8..693e211 100644 --- a/bots/discord/.releaserc.js +++ b/bots/discord/.releaserc.js @@ -1,4 +1,6 @@ -export default { +import defineSubprojectReleaseConfig from '../../semantic-release-config.js' + +export default defineSubprojectReleaseConfig({ plugins: process.env.RELEASE_WORKFLOW_STEP === 'publish' ? [ @@ -27,4 +29,4 @@ export default { }, ], ], -} +}) diff --git a/bun.lockb b/bun.lockb index aa9c4468eaab812ed77c96351e187e9eab17e1d2..27e8610af7b2f6cc078b5cd1c4f41bd43d134fdc 100755 GIT binary patch delta 29148 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
  • 8<=-R(v0A%p_hZ9x*hei;UxGD}6s+&nmaUm3H6H0*w% z+s$cihSP2xM5th#{t@H|(dpdf%#zZu`-vu7zfsQWoz;O*XFJ`#oLSNodZSUpJZXbn zmtQ7FAr!#wJPNYApe-XSxEvu;t;gc-oZHK3_=0cSO7cZ=)viF zmCO>RH=*%#h~b^P+Dj$}gkG$%0M-kR1(E6fmCUTtu)Cp>#Qt#d%Zq$N=+~USzLHte z6n2@^iEj<^HA_M#BNSkb9k2yy)Bjd7OG?8osNxlOc{y)g*>QwcaO_Ajf+I#`dVCc# zD=2o-s+f(;U^gZ0^b~TC`jrSOwv6@6LD>g(N0Pqw##G<;b*c9cx_uV$7sgI(KXez1GnH0Ous z!HpkK(a8Y2>B)ZC%RfePd0)YK*ig@ef#KT4>GP_YC8TkvFk)cHn|=}Gi2CWTtC@Y7 zPF|R9Rl{t=^ykX-yc%W+Y4)p-D$7DMJm&BbS!b~04L~M~OkY^TEXk-geRmDBq%`d6 zr(8zPYwc5#7l1<5SkKUsfx&nT?_48Dqorr68Wk^qaNJzS6L(oo-#@t6CIxtcHm(&J5JpU|{H)?pVicEDgI2 zYr?ms3wFseH-Sq$Gd)WNhN;v0>zF0YV3$krth#W)ie(O{M_{05Xsl<<0K0xljoq%u zY5ONBCdN2ZJws58UA{5>ULCU$d0C~yUU7A-I^FbG6X zUlq&pkIMnHfC02}DH^PF`sFwlRjw6K!4qIb($i(*S-iQy%N#&DV_2r=Utv<6J|mt* KVERO9rU?L{R=EoR delta 29535 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 HVwwN|9Wm9s diff --git a/package.json b/package.json index c4c6c25..72440fb 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "@semantic-release/changelog": "^6.0.3", "@semantic-release/exec": "^6.0.3", "@semantic-release/git": "^10.0.1", - "@semantic-release/github": "^10.1.1", "@tsconfig/strictest": "^2.0.5", "@types/bun": "^1.1.6", "conventional-changelog-conventionalcommits": "^7.0.2", @@ -53,8 +52,5 @@ "@revanced/discord-bot", "esbuild", "lefthook" - ], - "patchedDependencies": { - "@anolilab/multi-semantic-release@1.1.3": "patches/@anolilab%2Fmulti-semantic-release@1.1.3.patch" - } + ] } diff --git a/patches/@anolilab%2Fmulti-semantic-release@1.1.3.patch b/patches/@anolilab%2Fmulti-semantic-release@1.1.3.patch deleted file mode 100644 index dd96e2a..0000000 --- a/patches/@anolilab%2Fmulti-semantic-release@1.1.3.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/multi-semantic-release.js b/lib/multi-semantic-release.js -index 1247e618244dc35f6d60d1e484fbd1a84e504b2a..fc8dbf1c418351f2c25698e3fc3fab478693f125 100644 ---- a/lib/multi-semantic-release.js -+++ b/lib/multi-semantic-release.js -@@ -114,6 +114,11 @@ async function releasePackage(package_, createInlinePlugin, multiContext, flags) - options.ci = flags.ci === undefined ? options.ci : flags.ci; - options.branches = flags.branches ? castArray(flags.branches) : options.branches; - -+ // Patching so plugins from globalOptions are also inherited. -+ // If the third element in the array is set to true, the plugin will not be inherited. -+ options.plugins = [...(multiContext.globalOptions.plugins || []), ...(options.plugins || [])] -+ .filter(plugin => Array.isArray(plugin) ? !plugin[2] : true) -+ - // This options are needed for plugins that do not rely on `pluginOptions` and extract them independently. - options._pkgOptions = packageOptions; - diff --git a/.releaserc.js b/semantic-release-config.js similarity index 63% rename from .releaserc.js rename to semantic-release-config.js index 175fde7..7812220 100644 --- a/.releaserc.js +++ b/semantic-release-config.js @@ -1,4 +1,9 @@ -export default { +// @ts-check + +/** + * @type {import('semantic-release').Options} + */ +const Options = { branches: [ 'main', { @@ -7,7 +12,7 @@ export default { }, ], plugins: - process.env.RELEASE_WORKFLOW_STEP === 'release' + process.env['RELEASE_WORKFLOW_STEP'] !== 'publish' ? [ [ '@semantic-release/commit-analyzer', @@ -17,10 +22,16 @@ export default { ], '@semantic-release/release-notes-generator', '@semantic-release/changelog', + [ + '@semantic-release/npm', + { + npmPublish: false, + } + ], [ '@semantic-release/git', { - assets: ['README.md', 'CHANGELOG.md', 'package.json'], + assets: ['CHANGELOG.md', 'package.json'], }, ], [ @@ -34,6 +45,7 @@ export default { successComment: false, }, ], + // This unfortunately has to run multiple times, even though it needs to run only once. [ '@saithodev/semantic-release-backmerge', { @@ -45,8 +57,19 @@ export default { ], clearWorkspace: true, }, - true, ], ] : [], } + +/** + * @param {import('semantic-release').Options} subprojectOptions + * @returns {import('semantic-release').Options} + */ +export default function defineSubprojectReleaseConfig(subprojectOptions) { + return { + ...Options, + ...subprojectOptions, + plugins: [...(subprojectOptions.plugins || []), ...(Options.plugins || [])], + } +}