Skip to content

Commit 4a265ff

Browse files
committed
check system & setup passed
1 parent ffa81b0 commit 4a265ff

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

lib/reducers/checks/setup.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ var check_setup_1 = require('./check-setup');
44
function allTrue(obj) {
55
return Object.values(obj).every(function (x) { return x === true; });
66
}
7-
function verified(checks) {
8-
return allTrue(checks.system) && allTrue(checks.setup);
9-
}
107
function result(x) {
118
return x;
129
}
@@ -22,7 +19,9 @@ function verifySetup() {
2219
tutorial: !!check_setup_1.hasTutorialDep()
2320
}
2421
};
25-
checks.passed = verified(checks);
22+
checks.system.passed = allTrue(checks.system);
23+
checks.setup.passed = allTrue(checks.system);
24+
checks.passed = checks.system.passed && checks.setup.passed;
2625
return checks;
2726
}
2827
Object.defineProperty(exports, "__esModule", { value: true });

src/reducers/checks/setup.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ function allTrue(obj: Object): boolean {
99
return Object.values(obj).every((x) => x === true);
1010
}
1111

12-
function verified(checks: CR.Checks): boolean {
13-
return allTrue(checks.system) && allTrue(checks.setup);
14-
}
15-
1612
function result(x) {
1713
return x;
1814
}
@@ -30,6 +26,8 @@ export default function verifySetup(): CR.Checks {
3026
}
3127
};
3228

33-
checks.passed = verified(checks);
29+
checks.system.passed = allTrue(checks.system);
30+
checks.setup.passed = allTrue(checks.system);
31+
checks.passed = checks.system.passed && checks.setup.passed;
3432
return checks;
3533
}

src/typings/cr/cr.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,12 @@ declare namespace CR {
8181
interface Checks {
8282
passed?: boolean;
8383
system: {
84+
passed?: boolean;
8485
node: boolean;
8586
npm: boolean;
8687
};
8788
setup: {
89+
passed?: boolean;
8890
dir: boolean;
8991
packageJson: boolean;
9092
tutorial: boolean;

0 commit comments

Comments
 (0)