From dc9d7f4c992aec4a2d84e2d53ea48843217ae2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ro=C5=BCek?= Date: Wed, 24 May 2023 00:37:41 +0200 Subject: [PATCH] chore(repo): avoid global extends --- .circleci/config.yml | 1 - package.json | 5 ++--- packages/cli/package.json | 2 +- packages/core/package.json | 2 +- packages/formats/package.json | 2 +- packages/formatters/package.json | 2 +- packages/functions/package.json | 2 +- packages/parsers/package.json | 2 +- packages/ref-resolver/package.json | 2 +- packages/ruleset-bundler/package.json | 2 +- packages/ruleset-migrator/package.json | 2 +- packages/rulesets/package.json | 2 +- packages/runtime/package.json | 2 +- yarn.lock | 30 +++++--------------------- 14 files changed, 18 insertions(+), 40 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a1f0d4b1..34641897c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,7 +145,6 @@ commands: steps: - checkout - cached-dependencies - - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc - build jobs: diff --git a/package.json b/package.json index 9881320b2..3710fb8b1 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ ] }, "release": { - "extends": "semantic-release-monorepo", "branches": [ { "name": "develop", @@ -59,7 +58,7 @@ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", "@semantic-release/changelog", - "semantic-release-yarn", + "@semantic-release/npm", [ "@semantic-release/github", { @@ -76,6 +75,7 @@ "@semantic-release/changelog": "^6.0.3", "@semantic-release/git": "^10.0.1", "@semantic-release/github": "https://registry.npmjs.org/@achingbrain/semantic-release-github/-/semantic-release-github-0.0.2.tgz", + "@semantic-release/npm": "^10.0.3", "@semantic-release/release-notes-generator": "^10.0.3", "@swc/core": "^1.2.210", "@swc/jest": "^0.2.21", @@ -113,7 +113,6 @@ "prettier": "^2.4.1", "semantic-release": "^21.0.2", "semantic-release-monorepo": "https://registry.npmjs.org/@achingbrain/semantic-release-monorepo/-/semantic-release-monorepo-8.0.0.tgz", - "semantic-release-yarn": "^1.0.0", "ts-jest": "^28.0.5", "ts-node": "^10.8.2", "typescript": "^4.4.4" diff --git a/packages/cli/package.json b/packages/cli/package.json index e1405150f..c65065b0e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -29,7 +29,7 @@ "build.nix": "pkg . --targets linux,macos,alpine --out-path ./binaries", "cli": "node -r ts-node/register/transpile-only -r tsconfig-paths/register src/index.ts", "cli:debug": "node -r ts-node/register/transpile-only -r tsconfig-paths/register --inspect-brk src/index.ts", - "release": "semantic-release" + "release": "semantic-release -e semantic-release-monorepo" }, "dependencies": { "@stoplight/json": "~3.20.1", diff --git a/packages/core/package.json b/packages/core/package.json index 1be864291..89c4d8d4c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -34,7 +34,7 @@ "node": "^12.20 || >= 14.13" }, "scripts": { - "release": "semantic-release" + "release": "semantic-release -e semantic-release-monorepo" }, "dependencies": { "@stoplight/better-ajv-errors": "1.0.3", diff --git a/packages/formats/package.json b/packages/formats/package.json index bc5f83293..24c4ed53f 100644 --- a/packages/formats/package.json +++ b/packages/formats/package.json @@ -19,7 +19,7 @@ "node": ">=12" }, "scripts": { - "release": "semantic-release" + "release": "semantic-release -e semantic-release-monorepo" }, "dependencies": { "@stoplight/json": "^3.17.0", diff --git a/packages/formatters/package.json b/packages/formatters/package.json index a2d71050b..08155a757 100644 --- a/packages/formatters/package.json +++ b/packages/formatters/package.json @@ -22,7 +22,7 @@ "url": "https://github.com/stoplightio/spectral.git" }, "scripts": { - "release": "semantic-release", + "release": "semantic-release -e semantic-release-monorepo", "pretest": "yarn prebuild", "prelint": "yarn prebuild", "prebuild": "node scripts/bundle-html-templates.mjs" diff --git a/packages/functions/package.json b/packages/functions/package.json index 2c2561d9c..78c6f8c5a 100644 --- a/packages/functions/package.json +++ b/packages/functions/package.json @@ -19,7 +19,7 @@ "node": ">=12" }, "scripts": { - "release": "semantic-release" + "release": "semantic-release -e semantic-release-monorepo" }, "dependencies": { "@stoplight/better-ajv-errors": "1.0.3", diff --git a/packages/parsers/package.json b/packages/parsers/package.json index 2ea9f23ba..3899a5a8d 100644 --- a/packages/parsers/package.json +++ b/packages/parsers/package.json @@ -18,7 +18,7 @@ "url": "https://github.com/stoplightio/spectral.git" }, "scripts": { - "release": "semantic-release" + "release": "semantic-release -e semantic-release-monorepo" }, "dependencies": { "@stoplight/json": "~3.20.1", diff --git a/packages/ref-resolver/package.json b/packages/ref-resolver/package.json index 0227ae203..294c0a958 100644 --- a/packages/ref-resolver/package.json +++ b/packages/ref-resolver/package.json @@ -18,7 +18,7 @@ "url": "https://github.com/stoplightio/spectral.git" }, "scripts": { - "release": "semantic-release" + "release": "semantic-release -e semantic-release-monorepo" }, "dependencies": { "@stoplight/json-ref-readers": "1.2.2", diff --git a/packages/ruleset-bundler/package.json b/packages/ruleset-bundler/package.json index 9e8b84b8c..eafd03391 100644 --- a/packages/ruleset-bundler/package.json +++ b/packages/ruleset-bundler/package.json @@ -35,7 +35,7 @@ "url": "https://github.com/stoplightio/spectral.git" }, "scripts": { - "release": "semantic-release" + "release": "semantic-release -e semantic-release-monorepo" }, "dependencies": { "@rollup/plugin-commonjs": "~22.0.2", diff --git a/packages/ruleset-migrator/package.json b/packages/ruleset-migrator/package.json index 393cb9c19..3e9e22c0b 100644 --- a/packages/ruleset-migrator/package.json +++ b/packages/ruleset-migrator/package.json @@ -47,6 +47,6 @@ "scripts": { "pretest": "ts-node -T ./scripts/generate-test-fixtures.ts && yarn prebuild", "prebuild": "ts-node -T ./scripts/compile-schemas.ts", - "release": "semantic-release" + "release": "semantic-release -e semantic-release-monorepo" } } diff --git a/packages/rulesets/package.json b/packages/rulesets/package.json index 972c7242d..fd2bf92aa 100644 --- a/packages/rulesets/package.json +++ b/packages/rulesets/package.json @@ -18,7 +18,7 @@ "url": "https://github.com/stoplightio/spectral.git" }, "scripts": { - "release": "semantic-release" + "release": "semantic-release -e semantic-release-monorepo" }, "dependencies": { "@asyncapi/specs": "^4.1.0", diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 4bab71440..e24b43495 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -18,7 +18,7 @@ "url": "https://github.com/stoplightio/spectral.git" }, "scripts": { - "release": "semantic-release" + "release": "semantic-release -e semantic-release-monorepo" }, "dependencies": { "@stoplight/json": "^3.20.1", diff --git a/yarn.lock b/yarn.lock index 6d762f83b..35c07ab9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2539,7 +2539,7 @@ __metadata: languageName: node linkType: hard -"@semantic-release/npm@npm:^10.0.2": +"@semantic-release/npm@npm:^10.0.2, @semantic-release/npm@npm:^10.0.3": version: 10.0.3 resolution: "@semantic-release/npm@npm:10.0.3" dependencies: @@ -5203,7 +5203,7 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^8.0.0, cosmiconfig@npm:^8.1.0": +"cosmiconfig@npm:^8.0.0": version: 8.1.3 resolution: "cosmiconfig@npm:8.1.3" dependencies: @@ -6762,7 +6762,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^11.0.0, fs-extra@npm:^11.1.0": +"fs-extra@npm:^11.0.0": version: 11.1.1 resolution: "fs-extra@npm:11.1.1" dependencies: @@ -12113,6 +12113,7 @@ __metadata: "@semantic-release/changelog": ^6.0.3 "@semantic-release/git": ^10.0.1 "@semantic-release/github": "https://registry.npmjs.org/@achingbrain/semantic-release-github/-/semantic-release-github-0.0.2.tgz" + "@semantic-release/npm": ^10.0.3 "@semantic-release/release-notes-generator": ^10.0.3 "@swc/core": ^1.2.210 "@swc/jest": ^0.2.21 @@ -12150,7 +12151,6 @@ __metadata: prettier: ^2.4.1 semantic-release: ^21.0.2 semantic-release-monorepo: "https://registry.npmjs.org/@achingbrain/semantic-release-monorepo/-/semantic-release-monorepo-8.0.0.tgz" - semantic-release-yarn: ^1.0.0 ts-jest: ^28.0.5 ts-node: ^10.8.2 typescript: ^4.4.4 @@ -12241,26 +12241,6 @@ __metadata: languageName: node linkType: hard -"semantic-release-yarn@npm:^1.0.0": - version: 1.0.0 - resolution: "semantic-release-yarn@npm:1.0.0" - dependencies: - "@semantic-release/error": ^3.0.0 - aggregate-error: ^4.0.1 - cosmiconfig: ^8.1.0 - execa: ^7.0.0 - fs-extra: ^11.1.0 - js-yaml: ^4.1.0 - lodash: ^4.17.21 - nerf-dart: ^1.0.0 - read-pkg: ^7.1.0 - semver: ^7.3.8 - peerDependencies: - semantic-release: ">=19.0.0" - checksum: 5eb38a09c708dad9d1680a58fd2d0049664331fbdeb7947d79b9bc2a17f0a9e48f85d1181f2857d8fa3c1dddb205f6ca7f661b983378f9f52168fa88037a87ce - languageName: node - linkType: hard - "semantic-release@npm:^21.0.2": version: 21.0.2 resolution: "semantic-release@npm:21.0.2" @@ -12351,7 +12331,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1": +"semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.1": version: 7.5.1 resolution: "semver@npm:7.5.1" dependencies: