renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-26 14:36:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

chore(deps): update dependency prettier to v1.7.0 (#752)

Browse source 
* chore(deps): update dependency prettier to v1.6.1

* chore(deps): update dependency prettier to v1.7.0

* run lint
This commit is contained in:
renovate[bot] 2017-09-15 20:20:25 +02:00 committed by Rhys Arkins
parent cfc6c5ccdf
commit f8589fa836
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/config/index.js
View file

@ -125,8 +125,9 @@ function mergeChildConfig(parentConfig, childConfig) {
) { ) {
logger.trace(`mergeable option: ${option.name}`); logger.trace(`mergeable option: ${option.name}`);
if (option.type === 'list') { if (option.type === 'list') {
config[option.name] = (parentConfig[option.name] || []) config[option.name] = (parentConfig[option.name] || []).concat(
.concat(config[option.name] || []); config[option.name] || []
);
} else { } else {
config[option.name] = { config[option.name] = {
...parentConfig[option.name], ...parentConfig[option.name],

2
package.json
View file

@ -87,7 +87,7 @@
"jest": "20.0.4", "jest": "20.0.4",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"mockdate": "2.0.2", "mockdate": "2.0.2",
"prettier": "1.5.3", "prettier": "1.7.0",
"rimraf": "2.6.2", "rimraf": "2.6.2",
"semantic-release": "7.0.2" "semantic-release": "7.0.2"
}, },

6
yarn.lock
View file

@ -4136,9 +4136,9 @@ preserve@^0.2.0:
version "0.2.0" version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
prettier@1.5.3: prettier@1.7.0:
version "1.5.3" version "1.7.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.5.3.tgz#59dadc683345ec6b88f88b94ed4ae7e1da394bfe" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.0.tgz#47481588f41f7c90f63938feb202ac82554e7150"
pretty-format@^20.0.3: pretty-format@^20.0.3:
version "20.0.3" version "20.0.3"