Move prettify command to utils and also call it on CHANGELOG.md

This commit is contained in:
Fabio Berger
2018-04-02 15:53:31 +09:00
parent 2a6a71ea6c
commit 3f230a8fdb
3 changed files with 12 additions and 9 deletions

View File

@@ -77,12 +77,10 @@ const HEADER_PRAGMA = '##';
changelog.changes.push(changes);
}
}
const changelogJson = JSON.stringify(changelogs);
const changelogJsonPath = `${lernaPackage.location}/CHANGELOG.json`;
fs.writeFileSync(changelogJsonPath, changelogJson);
await execAsync(`prettier --write ${changelogJsonPath} --config .prettierrc`, {
cwd: constants.monorepoRootPath,
});
const changelogJSONPath = JSON.stringify(changelogs);
const changelogJSONPathPath = `${lernaPackage.location}/CHANGELOG.json`;
fs.writeFileSync(changelogJSONPathPath, changelogJSONPath);
await utils.prettifyAsync(changelogJSONPath, constants.monorepoRootPath);
}
})().catch(err => {
utils.log(err.stdout);

View File

@@ -78,14 +78,13 @@ const semverNameToIndex: { [semver: string]: number } = {
// Save updated CHANGELOG.json
fs.writeFileSync(changelogJSONPath, JSON.stringify(changelogs));
await execAsync(`prettier --write ${changelogJSONPath} --config .prettierrc`, {
cwd: constants.monorepoRootPath,
});
await utils.prettifyAsync(changelogJSONPath, constants.monorepoRootPath);
utils.log(`${packageName}: Updated CHANGELOG.json`);
// Generate updated CHANGELOG.md
const changelogMd = generateChangelogMd(changelogs);
const changelogMdPath = path.join(lernaPackage.location, 'CHANGELOG.md');
fs.writeFileSync(changelogMdPath, changelogMd);
await utils.prettifyAsync(changelogMdPath, constants.monorepoRootPath);
utils.log(`${packageName}: Updated CHANGELOG.md`);
}

View File

@@ -1,4 +1,5 @@
import * as _ from 'lodash';
import { exec as execAsync, spawn } from 'promisify-child-process';
export const utils = {
log(...args: any[]): void {
@@ -11,4 +12,9 @@ export const utils = {
const newPatchVersion = `${versionSegments[0]}.${versionSegments[1]}.${newPatch}`;
return newPatchVersion;
},
async prettifyAsync(filePath: string, cwd: string) {
await execAsync(`prettier --write ${filePath} --config .prettierrc`, {
cwd,
});
},
};