Skip to content

Commit

Permalink
Merge branch 'master'
Browse files Browse the repository at this point in the history
Conflicts:
	@commitlint/load/package.json
	@commitlint/prompt/package.json
	@commitlint/travis-cli/package.json
	yarn.lock
  • Loading branch information
armano2 committed Jan 18, 2020
2 parents 09dd193 + b39e1ad commit d678d64
Show file tree
Hide file tree
Showing 25 changed files with 148 additions and 33 deletions.
8 changes: 8 additions & 0 deletions @alias/commitlint/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)

**Note:** Version bump only for package commitlint





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)


Expand Down
4 changes: 2 additions & 2 deletions @alias/commitlint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "commitlint",
"version": "8.3.4",
"version": "8.3.5",
"description": "Lint your commit messages",
"files": [
"cli.js"
Expand Down Expand Up @@ -34,7 +34,7 @@
},
"license": "MIT",
"dependencies": {
"@commitlint/cli": "^8.3.4",
"@commitlint/cli": "^8.3.5",
"read-pkg": "5.2.0",
"resolve-pkg": "2.0.0"
},
Expand Down
8 changes: 8 additions & 0 deletions @commitlint/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)

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





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)

**Note:** Version bump only for package @commitlint/cli
Expand Down
6 changes: 3 additions & 3 deletions @commitlint/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@commitlint/cli",
"version": "8.3.4",
"version": "8.3.5",
"description": "Lint your commit messages",
"files": [
"index.js",
Expand Down Expand Up @@ -72,8 +72,8 @@
},
"dependencies": {
"@commitlint/format": "^8.3.4",
"@commitlint/lint": "^8.3.4",
"@commitlint/load": "^8.3.4",
"@commitlint/lint": "^8.3.5",
"@commitlint/load": "^8.3.5",
"@commitlint/read": "^8.3.4",
"chalk": "2.4.2",
"core-js": "^3.6.1",
Expand Down
8 changes: 8 additions & 0 deletions @commitlint/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)

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





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)

**Note:** Version bump only for package @commitlint/core
Expand Down
6 changes: 3 additions & 3 deletions @commitlint/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@commitlint/core",
"version": "8.3.4",
"version": "8.3.5",
"description": "Lint your commit messages",
"files": [
"index.js"
Expand Down Expand Up @@ -33,8 +33,8 @@
"license": "MIT",
"dependencies": {
"@commitlint/format": "^8.3.4",
"@commitlint/lint": "^8.3.4",
"@commitlint/load": "^8.3.4",
"@commitlint/lint": "^8.3.5",
"@commitlint/load": "^8.3.5",
"@commitlint/read": "^8.3.4"
}
}
11 changes: 11 additions & 0 deletions @commitlint/is-ignored/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)


### Bug Fixes

* **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))





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)

**Note:** Version bump only for package @commitlint/is-ignored
Expand Down
6 changes: 3 additions & 3 deletions @commitlint/is-ignored/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@commitlint/is-ignored",
"version": "8.3.4",
"version": "8.3.5",
"description": "Lint your commit messages",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -36,10 +36,10 @@
"devDependencies": {
"@commitlint/parse": "^8.3.4",
"@commitlint/test": "8.2.0",
"@commitlint/utils": "^8.3.4"
"@commitlint/utils": "^8.3.4",
"@types/semver": "^6.0.1"
},
"dependencies": {
"@types/semver": "^6.0.1",
"semver": "6.3.0"
}
}
8 changes: 8 additions & 0 deletions @commitlint/lint/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)

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





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)

**Note:** Version bump only for package @commitlint/lint
Expand Down
4 changes: 2 additions & 2 deletions @commitlint/lint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@commitlint/lint",
"version": "8.3.4",
"version": "8.3.5",
"description": "Lint a string against commitlint rules",
"main": "lib/index.js",
"files": [
Expand Down Expand Up @@ -76,7 +76,7 @@
"proxyquire": "2.1.3"
},
"dependencies": {
"@commitlint/is-ignored": "^8.3.4",
"@commitlint/is-ignored": "^8.3.5",
"@commitlint/parse": "^8.3.4",
"@commitlint/rules": "^8.3.4",
"lodash": "4.17.15"
Expand Down
8 changes: 8 additions & 0 deletions @commitlint/load/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)

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





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)

**Note:** Version bump only for package @commitlint/load
Expand Down
4 changes: 2 additions & 2 deletions @commitlint/load/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@commitlint/load",
"version": "8.3.4",
"version": "8.3.5",
"description": "Load shared commitlint configuration",
"main": "lib/index.js",
"files": [
Expand Down Expand Up @@ -76,7 +76,7 @@
},
"dependencies": {
"@commitlint/execute-rule": "^8.3.4",
"@commitlint/resolve-extends": "^8.3.4",
"@commitlint/resolve-extends": "^8.3.5",
"chalk": "2.4.2",
"cosmiconfig": "^5.2.0",
"lodash": "4.17.15",
Expand Down
8 changes: 8 additions & 0 deletions @commitlint/prompt-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)

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





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)

**Note:** Version bump only for package @commitlint/prompt-cli
Expand Down
4 changes: 2 additions & 2 deletions @commitlint/prompt-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@commitlint/prompt-cli",
"version": "8.3.4",
"version": "8.3.5",
"description": "commit prompt using commitlint.config.js",
"files": [
"cli.js"
Expand Down Expand Up @@ -34,7 +34,7 @@
"ava": "2.4.0"
},
"dependencies": {
"@commitlint/prompt": "^8.3.4",
"@commitlint/prompt": "^8.3.5",
"execa": "0.11.0",
"string-to-stream": "3.0.1"
}
Expand Down
8 changes: 8 additions & 0 deletions @commitlint/prompt/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)

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





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)

**Note:** Version bump only for package @commitlint/prompt
Expand Down
4 changes: 2 additions & 2 deletions @commitlint/prompt/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@commitlint/prompt",
"version": "8.3.4",
"version": "8.3.5",
"description": "commitizen prompt using commitlint.config.js",
"main": "./lib/index.js",
"files": [
Expand Down Expand Up @@ -72,7 +72,7 @@
"cross-env": "6.0.3"
},
"dependencies": {
"@commitlint/load": "^8.3.4",
"@commitlint/load": "^8.3.5",
"chalk": "^2.0.0",
"lodash": "4.17.15",
"throat": "^5.0.0",
Expand Down
11 changes: 11 additions & 0 deletions @commitlint/resolve-extends/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)


### Bug Fixes

* **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)





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)

**Note:** Version bump only for package @commitlint/resolve-extends
Expand Down
4 changes: 2 additions & 2 deletions @commitlint/resolve-extends/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@commitlint/resolve-extends",
"version": "8.3.4",
"version": "8.3.5",
"description": "Lint your commit messages",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -37,10 +37,10 @@
"@commitlint/parse": "^8.3.4",
"@commitlint/utils": "^8.3.4",
"@types/lodash": "4.14.144",
"@types/node": "^12.12.22",
"@types/resolve-from": "5.0.1"
},
"dependencies": {
"@types/node": "^12.0.2",
"import-fresh": "^3.0.0",
"lodash": "4.17.15",
"resolve-from": "^5.0.0",
Expand Down
8 changes: 8 additions & 0 deletions @commitlint/travis-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)

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





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)

**Note:** Version bump only for package @commitlint/travis-cli
Expand Down
4 changes: 2 additions & 2 deletions @commitlint/travis-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@commitlint/travis-cli",
"version": "8.3.4",
"version": "8.3.5",
"description": "Lint all relevant commits for a change or PR on Travis CI",
"files": [
"lib/"
Expand Down Expand Up @@ -72,7 +72,7 @@
"which": "2.0.1"
},
"dependencies": {
"@commitlint/cli": "^8.3.4",
"@commitlint/cli": "^8.3.5",
"execa": "0.11.0"
}
}
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [8.3.5](https://github.com/conventional-changelog/commitlint/compare/v8.3.4...v8.3.5) (2020-01-15)


### Bug Fixes

* **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))
* **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)





## [8.3.4](https://github.com/conventional-changelog/commitlint/compare/v8.3.3...v8.3.4) (2020-01-03)


Expand Down
2 changes: 2 additions & 0 deletions docs/guides-ci-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ npm install --save-dev @commitlint/travis-cli
```yml
# travis.yml
language: node_js
node_js:
- node
script:
- commitlint-travis
```
Expand Down
17 changes: 16 additions & 1 deletion docs/reference-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,18 @@ type Config = {
rules: {[ruleName: string]: Rule};
};

load(seed: Seed = {}) => Promise<Config>;
type LoadOptions = {
/*
* Path to the config file to load.
*/
file?: string;
/*
* The cwd to use when loading config from file parameter.
*/
cwd: string;
};

load(seed: Seed = {}, options?: LoadOptions = {cwd: process.cwd()}) => Promise<Config>;
```

* **Example**
Expand All @@ -240,6 +251,10 @@ load({extends: ['./package']})
load({parserPreset: './parser-preset.js'})
.then(config => console.log(config));
// => { extends: [], rules: {}, parserPreset: {name: './parser-preset.js', path: './parser-preset.js', opts: {}}}

load({}, {file: '.commitlintrc.yml', cwd: process.cwd()})
.then(config => console.log(config));
// => { extends: [], rules: { 'body-leading-blank': [ 1, 'always' ] }, formatter: '@commitlint/format', plugins: {} }
```

### @commitlint/read
Expand Down
Loading

0 comments on commit d678d64

Please sign in to comment.