@@ -14,7 +14,6 @@ const packageName = "html5-boilerplate";
14
14
const tempDir = os . tmpdir ( ) + `/${ packageName } -staging` ;
15
15
const elapsed = require ( "elapsed-time-logger" ) ;
16
16
const compareVersions = require ( "compare-versions" ) ;
17
- let spinner ;
18
17
19
18
module . exports = async ( argvs ) => {
20
19
const argv = yargs_parser ( argvs , {
@@ -28,7 +27,7 @@ module.exports = async (argvs) => {
28
27
console . log ( chalk . red ( "Aborted" ) ) ;
29
28
return ;
30
29
}
31
- spinner = ora (
30
+ let spinner = ora (
32
31
`Downloading ${ packageName } version '${ version } ' to ${ targetDir } `
33
32
) . start ( ) ;
34
33
await fs . ensureDir ( tempDir ) ;
@@ -40,20 +39,24 @@ module.exports = async (argvs) => {
40
39
) ;
41
40
await fs . copy ( tempDir + "/dist" , targetDir ) ;
42
41
const timerDownloaded = timer . get ( ) ;
42
+ spinner . stop ( ) ;
43
43
await onLoad ( targetDir , version , argv ) ;
44
- spinner . succeed (
45
- `${ nameWithVersion } copied to ${ targetDir } in ${ timerDownloaded } . Have fun!`
44
+ console . log (
45
+ chalk . green ( "✔" ) +
46
+ ` ${ nameWithVersion } copied to ${ targetDir } in ${ timerDownloaded } . Have fun!`
46
47
) ;
47
48
return ;
48
49
} catch ( err ) {
50
+ spinner . stop ( ) ;
49
51
if ( err . code === "ETARGET" ) {
50
52
const msg = chalk . red (
51
- `version '${ err . wanted } ' not found in npm registry\navailable versions:\n`
53
+ `✖ version '${ err . wanted } ' not found in npm registry\navailable versions:\n`
52
54
) ;
53
- spinner . fail ( msg + err . versions . reverse ( ) . join ( " | " ) ) ;
55
+ console . log ( msg + err . versions . reverse ( ) . join ( " | " ) ) ;
54
56
throw err . code ;
55
57
}
56
- spinner . fail ( "Unexpected error" ) ;
58
+ console . error ( err ) ;
59
+ console . log ( chalk . red ( "✖ Unexpected error" ) ) ;
57
60
throw new Error ( err ) ;
58
61
} finally {
59
62
await fs . remove ( tempDir ) ;
@@ -90,7 +93,6 @@ const onLoad = async (targetDir, version, argv) => {
90
93
}
91
94
const skipPrompts = argv [ "yes" ] === true ;
92
95
93
- spinner . stop ( ) ;
94
96
if ( skipPrompts ) {
95
97
return ;
96
98
}
0 commit comments