Skip to content

Commit 902d8f5

Browse files
committed
Merge branch 'main' into github-changelog
2 parents 5a404ea + 256092c commit 902d8f5

File tree

8 files changed

+17
-19
lines changed

8 files changed

+17
-19
lines changed

.github/renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"commands": [
2121
"yarn --frozen-lockfile --no-progress --non-interactive --prefer-offline",
2222
"yarn nx migrate @nrwl/workspace",
23-
"[ -f migrations.json ] && npx nx migrate --run-migrations=migrations.json"
23+
"[ -f migrations.json ] && yarn nx migrate --run-migrations"
2424
],
2525
"fileFilters": ["**/**"]
2626
}

commitlint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = {
44
'scope-enum': [
55
2,
66
'always',
7-
['semver', 'github']
7+
['semver']
88
]
99
},
1010
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"jest": "27.4.3",
5252
"jest-extended": "^0.11.5",
5353
"ngx-deploy-npm": "^3.0.2",
54-
"prettier": "2.5.0",
54+
"prettier": "2.5.1",
5555
"tmp": "^0.2.1",
5656
"ts-jest": "27.0.7",
5757
"ts-node": "10.4.0",

packages/semver/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
44

5+
## [2.14.4](https://github.com/jscutlery/semver/compare/semver-2.14.3...semver-2.14.4) (2021-12-05)
6+
7+
8+
59
## [2.14.3](https://github.com/jscutlery/semver/compare/semver-2.14.2...semver-2.14.3) (2021-11-29)
610

711

packages/semver/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jscutlery/semver",
3-
"version": "2.14.3",
3+
"version": "2.14.4",
44
"description": "Nx plugin for automate versioning and CHANGELOG generation.",
55
"private": false,
66
"license": "MIT",

packages/semver/project.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"options": {
1010
"push": true,
1111
"noVerify": true,
12-
"postTargets": ["semver:publish", "semver:github"]
12+
"postTargets": ["semver:publish", "semver:github"],
13+
"commitMessageFormat": "release(${projectName}): 🎸 cut release to ${version}"
1314
}
1415
},
1516
"github": {

packages/semver/src/executors/version/utils/workspace.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1-
import { ExecutorContext } from '@nrwl/devkit';
21
import { resolve } from 'path';
3-
import { Observable } from 'rxjs';
42
import { catchError, map } from 'rxjs/operators';
53

64
import { readJsonFile } from './filesystem';
75

8-
export interface WorkspaceDefinition {
9-
projects: {
10-
[key: string]: {
11-
root: string;
12-
};
13-
};
14-
}
6+
import type { Observable } from 'rxjs';
7+
import type { ExecutorContext, WorkspaceJsonConfiguration } from '@nrwl/devkit';
158

169
export function getPackageFiles(workspaceRoot: string): Observable<string[]> {
1710
return getProjectRoots(workspaceRoot).pipe(
@@ -39,7 +32,7 @@ export function getProjectRoots(workspaceRoot: string): Observable<string[]> {
3932

4033
export function _getWorkspaceDefinition(
4134
workspaceRoot: string
42-
): Observable<WorkspaceDefinition> {
35+
): Observable<WorkspaceJsonConfiguration> {
4336
return readJsonFile(resolve(workspaceRoot, 'workspace.json')).pipe(
4437
catchError(() => readJsonFile(resolve(workspaceRoot, 'angular.json')))
4538
);

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5994,10 +5994,10 @@ prelude-ls@~1.1.2:
59945994
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
59955995
integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
59965996

5997-
5998-
version "2.5.0"
5999-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.0.tgz#a6370e2d4594e093270419d9cc47f7670488f893"
6000-
integrity sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg==
5997+
5998+
version "2.5.1"
5999+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
6000+
integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
60016001

60026002
pretty-format@^22.4.3:
60036003
version "22.4.3"

0 commit comments

Comments
 (0)