Skip to content

Commit 8404d06

Browse files
committed
deps: init-package-json@5.0.0
1 parent 7018b3d commit 8404d06

36 files changed

Lines changed: 849 additions & 1653 deletions

lib/commands/init.js

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -154,24 +154,21 @@ class Init extends BaseCommand {
154154
].join('\n'))
155155
}
156156

157-
// XXX promisify init-package-json
158-
await new Promise((res, rej) => {
159-
initJson(path, initFile, this.npm.config, (er, data) => {
160-
log.resume()
161-
log.enableProgress()
162-
log.silly('package data', data)
163-
if (er && er.message === 'canceled') {
164-
log.warn('init', 'canceled')
165-
return res()
166-
}
167-
if (er) {
168-
rej(er)
169-
} else {
170-
log.info('init', 'written successfully')
171-
res(data)
172-
}
173-
})
174-
})
157+
let data
158+
try {
159+
data = await initJson(path, initFile, this.npm.config)
160+
} catch (er) {
161+
if (er.message === 'canceled') {
162+
log.warn('init', 'canceled')
163+
} else {
164+
throw er
165+
}
166+
} finally {
167+
log.resume()
168+
log.enableProgress()
169+
log.silly('package data', data)
170+
}
171+
return data
175172
}
176173

177174
async setWorkspace ({ pkg, workspacePath }) {

lib/utils/read-user-info.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
const { promisify } = require('util')
2-
const readAsync = promisify(require('read'))
1+
const readAsync = require('read')
32
const userValidate = require('npm-user-validate')
43
const log = require('./log-shim.js')
54

0 commit comments

Comments
 (0)