Skip to content

Commit d678d64

Browse files
committed
Merge branch 'master'
Conflicts: @commitlint/load/package.json @commitlint/prompt/package.json @commitlint/travis-cli/package.json yarn.lock
2 parents 09dd193 + b39e1ad commit d678d64

25 files changed

+148
-33
lines changed

@alias/commitlint/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
**Note:** Version bump only for package commitlint
9+
10+
11+
12+
13+
614
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
715

816

@alias/commitlint/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "commitlint",
3-
"version": "8.3.4",
3+
"version": "8.3.5",
44
"description": "Lint your commit messages",
55
"files": [
66
"cli.js"
@@ -34,7 +34,7 @@
3434
},
3535
"license": "MIT",
3636
"dependencies": {
37-
"@commitlint/cli": "^8.3.4",
37+
"@commitlint/cli": "^8.3.5",
3838
"read-pkg": "5.2.0",
3939
"resolve-pkg": "2.0.0"
4040
},

@commitlint/cli/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
**Note:** Version bump only for package @commitlint/cli
9+
10+
11+
12+
13+
614
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
715

816
**Note:** Version bump only for package @commitlint/cli

@commitlint/cli/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@commitlint/cli",
3-
"version": "8.3.4",
3+
"version": "8.3.5",
44
"description": "Lint your commit messages",
55
"files": [
66
"index.js",
@@ -72,8 +72,8 @@
7272
},
7373
"dependencies": {
7474
"@commitlint/format": "^8.3.4",
75-
"@commitlint/lint": "^8.3.4",
76-
"@commitlint/load": "^8.3.4",
75+
"@commitlint/lint": "^8.3.5",
76+
"@commitlint/load": "^8.3.5",
7777
"@commitlint/read": "^8.3.4",
7878
"chalk": "2.4.2",
7979
"core-js": "^3.6.1",

@commitlint/core/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
**Note:** Version bump only for package @commitlint/core
9+
10+
11+
12+
13+
614
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
715

816
**Note:** Version bump only for package @commitlint/core

@commitlint/core/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@commitlint/core",
3-
"version": "8.3.4",
3+
"version": "8.3.5",
44
"description": "Lint your commit messages",
55
"files": [
66
"index.js"
@@ -33,8 +33,8 @@
3333
"license": "MIT",
3434
"dependencies": {
3535
"@commitlint/format": "^8.3.4",
36-
"@commitlint/lint": "^8.3.4",
37-
"@commitlint/load": "^8.3.4",
36+
"@commitlint/lint": "^8.3.5",
37+
"@commitlint/load": "^8.3.5",
3838
"@commitlint/read": "^8.3.4"
3939
}
4040
}

@commitlint/is-ignored/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
9+
### Bug Fixes
10+
11+
* **is-ignored:** move types to dev dependencies ([#897](https://github.com/conventional-changelog/commitlint/issues/897)) ([aabc549](https://github.com/conventional-changelog/commitlint/commit/aabc549))
12+
13+
14+
15+
16+
617
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
718

819
**Note:** Version bump only for package @commitlint/is-ignored

@commitlint/is-ignored/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@commitlint/is-ignored",
3-
"version": "8.3.4",
3+
"version": "8.3.5",
44
"description": "Lint your commit messages",
55
"main": "lib/index.js",
66
"types": "lib/index.d.ts",
@@ -36,10 +36,10 @@
3636
"devDependencies": {
3737
"@commitlint/parse": "^8.3.4",
3838
"@commitlint/test": "8.2.0",
39-
"@commitlint/utils": "^8.3.4"
39+
"@commitlint/utils": "^8.3.4",
40+
"@types/semver": "^6.0.1"
4041
},
4142
"dependencies": {
42-
"@types/semver": "^6.0.1",
4343
"semver": "6.3.0"
4444
}
4545
}

@commitlint/lint/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
**Note:** Version bump only for package @commitlint/lint
9+
10+
11+
12+
13+
614
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
715

816
**Note:** Version bump only for package @commitlint/lint

@commitlint/lint/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@commitlint/lint",
3-
"version": "8.3.4",
3+
"version": "8.3.5",
44
"description": "Lint a string against commitlint rules",
55
"main": "lib/index.js",
66
"files": [
@@ -76,7 +76,7 @@
7676
"proxyquire": "2.1.3"
7777
},
7878
"dependencies": {
79-
"@commitlint/is-ignored": "^8.3.4",
79+
"@commitlint/is-ignored": "^8.3.5",
8080
"@commitlint/parse": "^8.3.4",
8181
"@commitlint/rules": "^8.3.4",
8282
"lodash": "4.17.15"

@commitlint/load/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
**Note:** Version bump only for package @commitlint/load
9+
10+
11+
12+
13+
614
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
715

816
**Note:** Version bump only for package @commitlint/load

@commitlint/load/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@commitlint/load",
3-
"version": "8.3.4",
3+
"version": "8.3.5",
44
"description": "Load shared commitlint configuration",
55
"main": "lib/index.js",
66
"files": [
@@ -76,7 +76,7 @@
7676
},
7777
"dependencies": {
7878
"@commitlint/execute-rule": "^8.3.4",
79-
"@commitlint/resolve-extends": "^8.3.4",
79+
"@commitlint/resolve-extends": "^8.3.5",
8080
"chalk": "2.4.2",
8181
"cosmiconfig": "^5.2.0",
8282
"lodash": "4.17.15",

@commitlint/prompt-cli/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
**Note:** Version bump only for package @commitlint/prompt-cli
9+
10+
11+
12+
13+
614
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
715

816
**Note:** Version bump only for package @commitlint/prompt-cli

@commitlint/prompt-cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@commitlint/prompt-cli",
3-
"version": "8.3.4",
3+
"version": "8.3.5",
44
"description": "commit prompt using commitlint.config.js",
55
"files": [
66
"cli.js"
@@ -34,7 +34,7 @@
3434
"ava": "2.4.0"
3535
},
3636
"dependencies": {
37-
"@commitlint/prompt": "^8.3.4",
37+
"@commitlint/prompt": "^8.3.5",
3838
"execa": "0.11.0",
3939
"string-to-stream": "3.0.1"
4040
}

@commitlint/prompt/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
**Note:** Version bump only for package @commitlint/prompt
9+
10+
11+
12+
13+
614
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
715

816
**Note:** Version bump only for package @commitlint/prompt

@commitlint/prompt/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@commitlint/prompt",
3-
"version": "8.3.4",
3+
"version": "8.3.5",
44
"description": "commitizen prompt using commitlint.config.js",
55
"main": "./lib/index.js",
66
"files": [
@@ -72,7 +72,7 @@
7272
"cross-env": "6.0.3"
7373
},
7474
"dependencies": {
75-
"@commitlint/load": "^8.3.4",
75+
"@commitlint/load": "^8.3.5",
7676
"chalk": "^2.0.0",
7777
"lodash": "4.17.15",
7878
"throat": "^5.0.0",

@commitlint/resolve-extends/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
9+
### Bug Fixes
10+
11+
* **resolve-extends:** move node types to dev dependencies ([#883](https://github.com/conventional-changelog/commitlint/issues/883)) ([b131a18](https://github.com/conventional-changelog/commitlint/commit/b131a18)), closes [#874](https://github.com/conventional-changelog/commitlint/issues/874)
12+
13+
14+
15+
16+
617
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
718

819
**Note:** Version bump only for package @commitlint/resolve-extends

@commitlint/resolve-extends/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@commitlint/resolve-extends",
3-
"version": "8.3.4",
3+
"version": "8.3.5",
44
"description": "Lint your commit messages",
55
"main": "lib/index.js",
66
"types": "lib/index.d.ts",
@@ -37,10 +37,10 @@
3737
"@commitlint/parse": "^8.3.4",
3838
"@commitlint/utils": "^8.3.4",
3939
"@types/lodash": "4.14.144",
40+
"@types/node": "^12.12.22",
4041
"@types/resolve-from": "5.0.1"
4142
},
4243
"dependencies": {
43-
"@types/node": "^12.0.2",
4444
"import-fresh": "^3.0.0",
4545
"lodash": "4.17.15",
4646
"resolve-from": "^5.0.0",

@commitlint/travis-cli/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
**Note:** Version bump only for package @commitlint/travis-cli
9+
10+
11+
12+
13+
614
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
715

816
**Note:** Version bump only for package @commitlint/travis-cli

@commitlint/travis-cli/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@commitlint/travis-cli",
3-
"version": "8.3.4",
3+
"version": "8.3.5",
44
"description": "Lint all relevant commits for a change or PR on Travis CI",
55
"files": [
66
"lib/"
@@ -72,7 +72,7 @@
7272
"which": "2.0.1"
7373
},
7474
"dependencies": {
75-
"@commitlint/cli": "^8.3.4",
75+
"@commitlint/cli": "^8.3.5",
7676
"execa": "0.11.0"
7777
}
7878
}

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)
7+
8+
9+
### Bug Fixes
10+
11+
* **is-ignored:** move types to dev dependencies ([#897](https://github.com/conventional-changelog/commitlint/issues/897)) ([aabc549](https://github.com/conventional-changelog/commitlint/commit/aabc549))
12+
* **resolve-extends:** move node types to dev dependencies ([#883](https://github.com/conventional-changelog/commitlint/issues/883)) ([b131a18](https://github.com/conventional-changelog/commitlint/commit/b131a18)), closes [#874](https://github.com/conventional-changelog/commitlint/issues/874)
13+
14+
15+
16+
17+
618
## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)
719

820

docs/guides-ci-setup.md

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ npm install --save-dev @commitlint/travis-cli
1414
```yml
1515
# travis.yml
1616
language: node_js
17+
node_js:
18+
- node
1719
script:
1820
- commitlint-travis
1921
```

docs/reference-api.md

+16-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,18 @@ type Config = {
217217
rules: {[ruleName: string]: Rule};
218218
};
219219

220-
load(seed: Seed = {}) => Promise<Config>;
220+
type LoadOptions = {
221+
/*
222+
* Path to the config file to load.
223+
*/
224+
file?: string;
225+
/*
226+
* The cwd to use when loading config from file parameter.
227+
*/
228+
cwd: string;
229+
};
230+
231+
load(seed: Seed = {}, options?: LoadOptions = {cwd: process.cwd()}) => Promise<Config>;
221232
```
222233

223234
* **Example**
@@ -240,6 +251,10 @@ load({extends: ['./package']})
240251
load({parserPreset: './parser-preset.js'})
241252
.then(config => console.log(config));
242253
// => { extends: [], rules: {}, parserPreset: {name: './parser-preset.js', path: './parser-preset.js', opts: {}}}
254+
255+
load({}, {file: '.commitlintrc.yml', cwd: process.cwd()})
256+
.then(config => console.log(config));
257+
// => { extends: [], rules: { 'body-leading-blank': [ 1, 'always' ] }, formatter: '@commitlint/format', plugins: {} }
243258
```
244259

245260
### @commitlint/read

0 commit comments

Comments
 (0)