Skip to content

Commit 84faec8

Browse files
committed
chore(repo): use multi-semantic-release
1 parent d9ca009 commit 84faec8

17 files changed

+973
-1628
lines changed

.circleci/config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ commands:
145145
steps:
146146
- checkout
147147
- cached-dependencies
148+
- run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
148149
- build
149150

150151
jobs:

package.json

+5-7
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
"test.karma": "karma start",
4040
"prepare": "husky install",
4141
"prerelease": "patch-package",
42-
"release": "yarn prerelease && yarn workspaces foreach run release",
43-
"publish:release": "yarn npm publish",
42+
"release": "yarn prerelease && multi-semantic-release --deps.bump=satisfy",
4443
"jest": "jest"
4544
},
4645
"workspaces": {
@@ -75,8 +74,8 @@
7574
"@octokit/core": "^3.5.1",
7675
"@semantic-release/changelog": "^6.0.3",
7776
"@semantic-release/git": "^10.0.1",
78-
"@semantic-release/github": "https://registry.npmjs.org/@achingbrain/semantic-release-github/-/semantic-release-github-0.0.2.tgz",
79-
"@semantic-release/npm": "^10.0.3",
77+
"@semantic-release/github": "^8.1.0",
78+
"@semantic-release/npm": "^9.0.2",
8079
"@semantic-release/release-notes-generator": "^10.0.3",
8180
"@swc/core": "^1.2.210",
8281
"@swc/jest": "^0.2.21",
@@ -90,7 +89,6 @@
9089
"@types/text-table": "^0.2.2",
9190
"@typescript-eslint/eslint-plugin": "^5.34.0",
9291
"@typescript-eslint/parser": "^5.34.0",
93-
"@w4rlock/semantic-release-plugin-decorators": "^1.0.3",
9492
"eslint": "^8.22.0",
9593
"eslint-config-prettier": "^8.5.0",
9694
"eslint-plugin-import": "^2.26.0",
@@ -109,11 +107,11 @@
109107
"karma-typescript-es6-transform": "^5.5.3",
110108
"lint-staged": "^11.2.6",
111109
"memfs": "^3.3.0",
110+
"multi-semantic-release": "^3.0.2",
112111
"node-powershell": "^4.0.0",
113112
"patch-package": "^6.4.7",
114113
"prettier": "^2.4.1",
115-
"semantic-release": "^21.0.2",
116-
"semantic-release-monorepo": "https://registry.npmjs.org/@achingbrain/semantic-release-monorepo/-/semantic-release-monorepo-8.0.0.tgz",
114+
"semantic-release": "^19.0.5",
117115
"ts-jest": "^28.0.5",
118116
"ts-node": "^10.8.2",
119117
"typescript": "^4.4.4"

packages/cli/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
"build.windows": "pkg . --targets windows --out-path ./binaries",
2929
"build.nix": "pkg . --targets linux,macos,alpine --out-path ./binaries",
3030
"cli": "node -r ts-node/register/transpile-only -r tsconfig-paths/register src/index.ts",
31-
"cli:debug": "node -r ts-node/register/transpile-only -r tsconfig-paths/register --inspect-brk src/index.ts",
32-
"release": "semantic-release -e semantic-release-monorepo"
31+
"cli:debug": "node -r ts-node/register/transpile-only -r tsconfig-paths/register --inspect-brk src/index.ts"
3332
},
3433
"dependencies": {
3534
"@stoplight/json": "~3.20.1",

packages/core/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
"engines": {
3434
"node": "^12.20 || >= 14.13"
3535
},
36-
"scripts": {
37-
"release": "semantic-release -e semantic-release-monorepo"
38-
},
3936
"dependencies": {
4037
"@stoplight/better-ajv-errors": "1.0.3",
4138
"@stoplight/json": "~3.20.1",

packages/formats/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
"engines": {
1919
"node": ">=12"
2020
},
21-
"scripts": {
22-
"release": "semantic-release -e semantic-release-monorepo"
23-
},
2421
"dependencies": {
2522
"@stoplight/json": "^3.17.0",
2623
"@stoplight/spectral-core": "^1.8.0",

packages/formatters/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"url": "https://github.com/stoplightio/spectral.git"
3030
},
3131
"scripts": {
32-
"release": "semantic-release -e semantic-release-monorepo",
3332
"pretest": "yarn prebuild",
3433
"prelint": "yarn prebuild",
3534
"prebuild": "node scripts/bundle-html-templates.mjs"

packages/functions/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
"engines": {
1919
"node": ">=12"
2020
},
21-
"scripts": {
22-
"release": "semantic-release -e semantic-release-monorepo"
23-
},
2421
"dependencies": {
2522
"@stoplight/better-ajv-errors": "1.0.3",
2623
"@stoplight/json": "^3.17.1",

packages/parsers/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
"type": "git",
1818
"url": "https://github.com/stoplightio/spectral.git"
1919
},
20-
"scripts": {
21-
"release": "semantic-release -e semantic-release-monorepo"
22-
},
2320
"dependencies": {
2421
"@stoplight/json": "~3.20.1",
2522
"@stoplight/types": "^13.6.0",

packages/ref-resolver/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
"type": "git",
1818
"url": "https://github.com/stoplightio/spectral.git"
1919
},
20-
"scripts": {
21-
"release": "semantic-release -e semantic-release-monorepo"
22-
},
2320
"dependencies": {
2421
"@stoplight/json-ref-readers": "1.2.2",
2522
"@stoplight/json-ref-resolver": "~3.1.5",

packages/ruleset-bundler/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
"type": "git",
3535
"url": "https://github.com/stoplightio/spectral.git"
3636
},
37-
"scripts": {
38-
"release": "semantic-release -e semantic-release-monorepo"
39-
},
4037
"dependencies": {
4138
"@rollup/plugin-commonjs": "~22.0.2",
4239
"@stoplight/path": "1.3.2",

packages/ruleset-migrator/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
},
4747
"scripts": {
4848
"pretest": "ts-node -T ./scripts/generate-test-fixtures.ts && yarn prebuild",
49-
"prebuild": "ts-node -T ./scripts/compile-schemas.ts",
50-
"release": "semantic-release -e semantic-release-monorepo"
49+
"prebuild": "ts-node -T ./scripts/compile-schemas.ts"
5150
}
5251
}

packages/rulesets/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
"type": "git",
1818
"url": "https://github.com/stoplightio/spectral.git"
1919
},
20-
"scripts": {
21-
"release": "semantic-release -e semantic-release-monorepo"
22-
},
2320
"dependencies": {
2421
"@asyncapi/specs": "^4.1.0",
2522
"@stoplight/better-ajv-errors": "1.0.3",

packages/runtime/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
"type": "git",
1818
"url": "https://github.com/stoplightio/spectral.git"
1919
},
20-
"scripts": {
21-
"release": "semantic-release -e semantic-release-monorepo"
22-
},
2320
"dependencies": {
2421
"@stoplight/json": "^3.20.1",
2522
"@stoplight/path": "^1.3.2",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/node_modules/@semantic-release/github/index.js b/node_modules/@semantic-release/github/index.js
2+
index fa549f0..7cf7f61 100644
3+
--- a/node_modules/@semantic-release/github/index.js
4+
+++ b/node_modules/@semantic-release/github/index.js
5+
@@ -3,7 +3,6 @@
6+
const {defaultTo, castArray} = require('lodash');
7+
const verifyGitHub = require('./lib/verify');
8+
const addChannelGitHub = require('./lib/add-channel');
9+
-const publishGitHub = require('./lib/publish');
10+
const successGitHub = require('./lib/success');
11+
const failGitHub = require('./lib/fail');
12+
13+
@@ -28,15 +27,6 @@ async function verifyConditions(pluginConfig, context) {
14+
verified = true;
15+
}
16+
17+
-async function publish(pluginConfig, context) {
18+
- if (!verified) {
19+
- await verifyGitHub(pluginConfig, context);
20+
- verified = true;
21+
- }
22+
-
23+
- return publishGitHub(pluginConfig, context);
24+
-}
25+
-
26+
async function addChannel(pluginConfig, context) {
27+
if (!verified) {
28+
await verifyGitHub(pluginConfig, context);
29+
@@ -64,4 +54,4 @@ async function fail(pluginConfig, context) {
30+
await failGitHub(pluginConfig, context);
31+
}
32+
33+
-module.exports = {verifyConditions, addChannel, publish, success, fail};
34+
+module.exports = {verifyConditions, addChannel, success, fail};
+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/node_modules/multi-semantic-release/lib/multiSemanticRelease.js b/node_modules/multi-semantic-release/lib/multiSemanticRelease.js
2+
index 912a363..e651119 100644
3+
--- a/node_modules/multi-semantic-release/lib/multiSemanticRelease.js
4+
+++ b/node_modules/multi-semantic-release/lib/multiSemanticRelease.js
5+
@@ -191,7 +191,7 @@ async function releasePackage(pkg, createInlinePlugin, multiContext, flags) {
6+
// Add the package name into tagFormat.
7+
// Thought about doing a single release for the tag (merging several packages), but it's impossible to prevent Github releasing while allowing NPM to continue.
8+
// It'd also be difficult to merge all the assets into one release without full editing/overriding the plugins.
9+
- options.tagFormat = name + "@${version}";
10+
+ options.tagFormat = name + "-${version}";
11+
12+
// This options are needed for plugins that do not rely on `pluginOptions` and extract them independently.
13+
options._pkgOptions = pkgOptions;

patches/semantic-release+21.0.2.patch

-28
This file was deleted.

0 commit comments

Comments
 (0)