Skip to content
This repository was archived by the owner on Jun 27, 2019. It is now read-only.

Commit 043a8b5

Browse files
committed
Adding better progress indicator. Remove overwrite checks
1 parent c696a6a commit 043a8b5

File tree

4 files changed

+13
-33
lines changed

4 files changed

+13
-33
lines changed

bin/check-overwrites.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

bin/cli-actions/init.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const installEdition = require('../install-edition');
55
const installStarterkit = require('../install-starterkit');
66
const defaultPatternlabConfig = require('../default-config');
77
const replaceConfigPaths = require('../replace-config');
8+
const ora = require('ora');
89
const path = require('path');
910
const wrapAsync = require('../utils').wrapAsync;
1011
const writeJsonAsync = require('../utils').writeJsonAsync;
@@ -28,24 +29,26 @@ const init = options => wrapAsync(function*() {
2829
* 4. If `starterkit` is present install it and copy over the mandatory starterkit files to sourceDir
2930
* 5. Save patternlab-config.json in projectDir
3031
*/
32+
const spinner = ora(`Setting up PatternLab project in ${projectDir}`).start();
3133
let patternlabConfig = replaceConfigPaths(defaultPatternlabConfig, projectDir, sourceDir, publicDir, exportDir); // 1
3234

3335
yield scaffold(projectDir, sourceDir, publicDir, exportDir); // 2
3436

3537
if (edition) {
38+
spinner.text = `Installing edition: ${edition}`;
3639
const newConf = yield installEdition(edition, patternlabConfig); // 3.1
3740
patternlabConfig = Object.assign(patternlabConfig, newConf); // 3.2
41+
spinner.succeed(`Installed edition: ${edition}`);
3842
}
39-
if (starterkit) yield installStarterkit(starterkit, patternlabConfig); // 4
43+
if (starterkit) {
44+
spinner.text = `Installing starterkit ${starterkit}`;
45+
spinner.start();
46+
yield installStarterkit(starterkit, patternlabConfig);
47+
spinner.succeed(`Installed starterkit: ${starterkit}`);
48+
} // 4
4049
yield writeJsonAsync(path.resolve(projectDir, 'patternlab-config.json'), patternlabConfig); // 5
4150

42-
// Finally :>
43-
if (!edition && !starterkit) {
44-
console.log(`patternlab→init: You haven't picked an edition nor a starterkit. PatternLab won't work without those. Please add them manually.`); // eslint-disable-line
45-
} else {
46-
console.log(`patternlab→init: Additional packages installed - ${edition ? 'edition: ' + edition : ''} ${starterkit ? ', starterkit: ' + starterkit.name : ''}`); // eslint-disable-line
47-
}
48-
console.log(`patternlab→init: Yay ☺. PatternLab Node was successfully initialised in ${projectDir}`); // eslint-disable-line
51+
spinner.succeed(`Yay ☺. PatternLab Node was successfully initialised in ${projectDir}`);
4952
return true;
5053
});
5154

bin/inquiries/edition.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
'use strict';
22
const inquirer = require('inquirer');
3-
const checkOverwrites = require('../check-overwrites');
43

54
/** editionSetup {Array} - Inquirer question logic for first question regarding editions */
65
const editionSetup = [
76
{
87
type: 'input',
98
name: 'project_root',
109
message: 'Please specify a directory for your PatternLab project.',
11-
default: () => './',
12-
validate: input => checkOverwrites(input)
10+
default: () => './'
1311
},
1412
{
1513
type: 'list',

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"glob": "7.1.1",
2121
"inquirer": "2.0.0",
2222
"lodash": "4.17.4",
23+
"ora": "1.1.0",
2324
"path-exists": "3.0.0",
2425
"patternlab-node": "2.8.0",
2526
"sanitize-filename": "1.6.1"

0 commit comments

Comments
 (0)