Skip to content

Commit 97129c4

Browse files
committed
Merge branch 'master' into release-0-2-0
2 parents 15ed99d + 4086218 commit 97129c4

File tree

5 files changed

+449
-553
lines changed

5 files changed

+449
-553
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Create HTML5 Boilerplate
22

33
[![Coverage Status](https://coveralls.io/repos/github/h5bp/create-html5-boilerplate/badge.svg?branch=master)](https://coveralls.io/github/h5bp/create-html5-boilerplate?branch=master)
4+
[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
45

56
Quick start for HTML5 Boilerplate. Get up and running with one command.
67

lib/cli.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const packageName = "html5-boilerplate";
1414
const tempDir = os.tmpdir() + `/${packageName}-staging`;
1515
const elapsed = require("elapsed-time-logger");
1616
const compareVersions = require("compare-versions");
17-
let spinner;
1817

1918
module.exports = async (argvs) => {
2019
const argv = yargs_parser(argvs, {
@@ -28,7 +27,7 @@ module.exports = async (argvs) => {
2827
console.log(chalk.red("Aborted"));
2928
return;
3029
}
31-
spinner = ora(
30+
let spinner = ora(
3231
`Downloading ${packageName} version '${version}' to ${targetDir}`
3332
).start();
3433
await fs.ensureDir(tempDir);
@@ -40,20 +39,24 @@ module.exports = async (argvs) => {
4039
);
4140
await fs.copy(tempDir + "/dist", targetDir);
4241
const timerDownloaded = timer.get();
42+
spinner.stop();
4343
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!`
4647
);
4748
return;
4849
} catch (err) {
50+
spinner.stop();
4951
if (err.code === "ETARGET") {
5052
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`
5254
);
53-
spinner.fail(msg + err.versions.reverse().join(" | "));
55+
console.log(msg + err.versions.reverse().join(" | "));
5456
throw err.code;
5557
}
56-
spinner.fail("Unexpected error");
58+
console.error(err);
59+
console.log(chalk.red("✖ Unexpected error"));
5760
throw new Error(err);
5861
} finally {
5962
await fs.remove(tempDir);
@@ -90,7 +93,6 @@ const onLoad = async (targetDir, version, argv) => {
9093
}
9194
const skipPrompts = argv["yes"] === true;
9295

93-
spinner.stop();
9496
if (skipPrompts) {
9597
return;
9698
}

0 commit comments

Comments
 (0)