fix: race condition between normalize-packages and usage-to-readme
The first was writting `package.json` at the same time the second one was reading it. The file is now read only once by `normalize-packages`.
This commit is contained in:
parent
1026d18e4b
commit
7864c05ee1
|
@ -126,7 +126,7 @@ require('exec-promise')(() =>
|
||||||
|
|
||||||
return Promise.all([
|
return Promise.all([
|
||||||
forceRelativeSymlink(NPMIGNORE_PATH, `${dir}/.npmignore`),
|
forceRelativeSymlink(NPMIGNORE_PATH, `${dir}/.npmignore`),
|
||||||
usageToReadme(`${dir}/.USAGE.md`).catch(error => {
|
usageToReadme(`${dir}/.USAGE.md`, dir, pkg).catch(error => {
|
||||||
if (error.code !== 'ENOENT') {
|
if (error.code !== 'ENOENT') {
|
||||||
console.error('Error while handling README', error)
|
console.error('Error while handling README', error)
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,41 +9,40 @@ const { execFile } = require('node:child_process')
|
||||||
|
|
||||||
const generateReadme = readFile(join(__dirname, 'README.md.tpl'), 'utf8').then(compile)
|
const generateReadme = readFile(join(__dirname, 'README.md.tpl'), 'utf8').then(compile)
|
||||||
|
|
||||||
async function usageToReadme(...args) {
|
async function usageToReadme(usagePath, pkgDir, pkg, gitAdd = false) {
|
||||||
const gitAdd = args[0] === '--git-add'
|
const usage = await readFile(usagePath, 'utf8')
|
||||||
|
|
||||||
|
const readmePath = join(pkgDir, 'README.md')
|
||||||
|
await writeFile(readmePath, (await generateReadme)({ pkg, usage: usage.trim() }))
|
||||||
|
|
||||||
if (gitAdd) {
|
if (gitAdd) {
|
||||||
args.shift()
|
await new Promise((resolve, reject) => {
|
||||||
|
execFile('git', ['add', '--', readmePath])
|
||||||
|
.on('error', reject)
|
||||||
|
.on('exit', code => {
|
||||||
|
if (code !== 0) {
|
||||||
|
reject(new Error('command exited with non-zero status code: ' + code))
|
||||||
|
} else {
|
||||||
|
resolve()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
module.exports = usageToReadme
|
||||||
|
|
||||||
for (const usagePath of args) {
|
if (module.parent === null) {
|
||||||
const dir = dirname(usagePath)
|
async function main(...args) {
|
||||||
|
const gitAdd = args[0] === '--git-add'
|
||||||
const [usage, pkg] = await Promise.all([
|
|
||||||
readFile(usagePath, 'utf8'),
|
|
||||||
readFile(join(dir, 'package.json')).then(JSON.parse),
|
|
||||||
])
|
|
||||||
|
|
||||||
const readmePath = join(dir, 'README.md')
|
|
||||||
await writeFile(readmePath, (await generateReadme)({ pkg, usage: usage.trim() }))
|
|
||||||
|
|
||||||
if (gitAdd) {
|
if (gitAdd) {
|
||||||
await new Promise((resolve, reject) => {
|
args.shift()
|
||||||
execFile('git', ['add', '--', readmePath])
|
}
|
||||||
.on('error', reject)
|
|
||||||
.on('exit', code => {
|
for (const usagePath of args) {
|
||||||
if (code !== 0) {
|
const dir = dirname(usagePath)
|
||||||
reject(new Error('command exited with non-zero status code: ' + code))
|
|
||||||
} else {
|
await usageToReadme(usagePath, dir, await readFile(join(dir, 'package.json')).then(JSON.parse), gitAdd)
|
||||||
resolve()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
main(...process.argv.slice(2))
|
||||||
|
|
||||||
if (module.parent !== null) {
|
|
||||||
module.exports = usageToReadme
|
|
||||||
} else {
|
|
||||||
usageToReadme(...process.argv.slice(2))
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user