style: Update style for Prettier 1.8.0
This commit is contained in:
		
							parent
							
								
									470697c01d
								
							
						
					
					
						commit
						17a600672f
					
				| @ -59,7 +59,7 @@ | ||||
|     "npm-registry-couchapp": "^2.6.12", | ||||
|     "nyc": "^11.2.1", | ||||
|     "p-map-series": "^1.0.0", | ||||
|     "prettier": "^1.8.0", | ||||
|     "prettier": "~1.8.0", | ||||
|     "proxyquire": "^1.8.0", | ||||
|     "rimraf": "^2.5.0", | ||||
|     "sinon": "^4.0.0", | ||||
|  | ||||
| @ -68,13 +68,13 @@ module.exports = async ({version, gitHead}, branch) => { | ||||
|   } | ||||
| 
 | ||||
|   Object.assign(gitLogParser.fields, {hash: 'H', message: 'B', gitTags: 'd', committerDate: {key: 'ci', type: Date}}); | ||||
|   const commits = (await getStream.array( | ||||
|     gitLogParser.parse({_: `${gitHead ? gitHead + '..' : ''}HEAD`}) | ||||
|   )).map(commit => { | ||||
|     commit.message = commit.message.trim(); | ||||
|     commit.gitTags = commit.gitTags.trim(); | ||||
|     return commit; | ||||
|   }); | ||||
|   const commits = (await getStream.array(gitLogParser.parse({_: `${gitHead ? gitHead + '..' : ''}HEAD`}))).map( | ||||
|     commit => { | ||||
|       commit.message = commit.message.trim(); | ||||
|       commit.gitTags = commit.gitTags.trim(); | ||||
|       return commit; | ||||
|     } | ||||
|   ); | ||||
|   logger.log('Found %s commits since last release', commits.length); | ||||
|   debug('Parsed commits: %o', commits); | ||||
|   return {commits, lastRelease: {version, gitHead}}; | ||||
| @ -85,18 +85,24 @@ function noGitHeadMessage(branch, version) { | ||||
| This means semantic-release can not extract the commits between now and then. | ||||
| This is usually caused by releasing from outside the repository directory or with innaccessible git metadata. | ||||
| 
 | ||||
| You can recover from this error by creating a tag for the version "${version}" on the commit corresponding to this release: | ||||
| You can recover from this error by creating a tag for the version "${ | ||||
|     version | ||||
|   }" on the commit corresponding to this release: | ||||
| $ git tag -f v${version} <commit sha1 corresponding to last release> | ||||
| $ git push -f --tags origin ${branch} | ||||
| `;
 | ||||
| } | ||||
| 
 | ||||
| function notInHistoryMessage(gitHead, branch, version) { | ||||
|   return `The commit the last release of this package was derived from is not in the direct history of the "${branch}" branch.
 | ||||
|   return `The commit the last release of this package was derived from is not in the direct history of the "${ | ||||
|     branch | ||||
|   }" branch. | ||||
| This means semantic-release can not extract the commits between now and then. | ||||
| This is usually caused by force pushing, releasing from an unrelated branch, or using an already existing package name. | ||||
| 
 | ||||
| You can recover from this error by restoring the commit "${gitHead}" or by creating a tag for the version "${version}" on the commit corresponding to this release: | ||||
| You can recover from this error by restoring the commit "${gitHead}" or by creating a tag for the version "${ | ||||
|     version | ||||
|   }" on the commit corresponding to this release: | ||||
| $ git tag -f v${version || '<version>'} <commit sha1 corresponding to last release> | ||||
| $ git push -f --tags origin ${branch} | ||||
| `;
 | ||||
|  | ||||
| @ -7,9 +7,9 @@ module.exports = { | ||||
|   log(...args) { | ||||
|     const [format, ...rest] = args; | ||||
|     console.log( | ||||
|       `${chalk.grey('[Semantic release]:')}${typeof format === 'string' | ||||
|         ? ` ${format.replace(/%[^%]/g, seq => chalk.magenta(seq))}` | ||||
|         : ''}`,
 | ||||
|       `${chalk.grey('[Semantic release]:')}${ | ||||
|         typeof format === 'string' ? ` ${format.replace(/%[^%]/g, seq => chalk.magenta(seq))}` : '' | ||||
|       }`,
 | ||||
|       ...(typeof format === 'string' ? [] : [format]).concat(rest) | ||||
|     ); | ||||
|   }, | ||||
|  | ||||
| @ -13,13 +13,13 @@ import pMapSeries from 'p-map-series'; | ||||
|  */ | ||||
| 
 | ||||
| /** | ||||
|   * Create a temporary git repository and change the current working directory to the repository root. | ||||
|   * | ||||
|   * @method gitCommits | ||||
|   * @param {Array<Commit>} commits the created commits. | ||||
|   *  | ||||
|   * @return {string} The path of the repository. | ||||
|   */ | ||||
|  * Create a temporary git repository and change the current working directory to the repository root. | ||||
|  * | ||||
|  * @method gitCommits | ||||
|  * @param {Array<Commit>} commits the created commits. | ||||
|  * | ||||
|  * @return {string} The path of the repository. | ||||
|  */ | ||||
| export async function gitRepo() { | ||||
|   const dir = tempy.directory(); | ||||
| 
 | ||||
|  | ||||
| @ -408,7 +408,9 @@ test.serial('Create a tag as a recovery solution for "ENOTINHISTORY" error', asy | ||||
|   t.regex( | ||||
|     stderr, | ||||
|     new RegExp( | ||||
|       `You can recover from this error by restoring the commit "${head}" or by creating a tag for the version "${version}" on the commit corresponding to this release` | ||||
|       `You can recover from this error by restoring the commit "${head}" or by creating a tag for the version "${ | ||||
|         version | ||||
|       }" on the commit corresponding to this release` | ||||
|     ) | ||||
|   ); | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user