Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit56e2ffb

Browse files
committed
catch early no-dir failures
1 parent8f06ff2 commit56e2ffb

File tree

4 files changed

+22
-56
lines changed

4 files changed

+22
-56
lines changed

‎lib/reducers/checks/check-setup.js

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,17 @@
11
"use strict";
22
varcheck_tutorials_1=require('../tutorials/check-tutorials');
33
functionhasDirectory(){
4-
returnnewPromise(function(resolve,reject){
5-
varhasDirectory=!!window.coderoad.dir;
6-
if(!hasDirectory){
7-
resolve(true);
8-
}
9-
else{
10-
resolve(false);
11-
}
12-
});
4+
return!!window.coderoad.dir;
135
}
146
exports.hasDirectory=hasDirectory;
157
functionhasPackageJson(){
16-
returnnewPromise(function(resolve,reject){
17-
varhasPackageJson=check_tutorials_1.packageJsonExists();
18-
if(!hasPackageJson){
19-
resolve(true);
20-
}
21-
resolve(false);
22-
});
8+
returncheck_tutorials_1.packageJsonExists();
239
}
2410
exports.hasPackageJson=hasPackageJson;
2511
functionhasTutorialDep(){
26-
returnnewPromise(function(resolve,reject){
27-
varpackageJson=hasPackageJson ?check_tutorials_1.loadRootPackageJson() :null;
28-
varhasTutorialDep=!!packageJson&&_tutorialInstalled(packageJson.dependencies)||
29-
_tutorialInstalled(packageJson.devDependencies);
30-
if(!hasTutorialDep){
31-
resolve(true);
32-
}
33-
resolve(false);
34-
});
12+
varpackageJson=hasPackageJson ?check_tutorials_1.loadRootPackageJson() :null;
13+
return!!packageJson&&_tutorialInstalled(packageJson.dependencies)||
14+
_tutorialInstalled(packageJson.devDependencies);
3515
}
3616
exports.hasTutorialDep=hasTutorialDep;
3717
function_hasKeys(obj){

‎lib/reducers/checks/verify.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,22 @@ function allTrue(obj) {
66
returnObject.values(obj).every(function(x){returnx===true;});
77
}
88
functionverifySetup(){
9+
varhasDir=!!check_setup_1.hasDirectory();
910
varchecks={
1011
system:{
1112
node:!!check_system_1.nodeMinVersion(),
1213
npm:!!check_system_1.npmMinVersion()
1314
},
1415
setup:{
15-
dir:!!check_setup_1.hasDirectory(),
16-
packageJson:!!check_setup_1.hasPackageJson(),
17-
tutorial:!!check_setup_1.hasTutorialDep()
16+
dir:hasDir,
17+
packageJson:hasDir ?!!check_setup_1.hasPackageJson() :false,
18+
tutorial:hasDir ?!!check_setup_1.hasTutorialDep() :false
1819
}
1920
};
2021
checks.system.passed=allTrue(checks.system);
2122
checks.setup.passed=allTrue(checks.setup);
2223
checks.passed=checks.system.passed&&checks.setup.passed;
24+
console.log('checks',checks);
2325
returnchecks;
2426
}
2527
Object.defineProperty(exports,"__esModule",{value:true});

‎src/reducers/checks/check-setup.ts

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,18 @@ import {packageJsonExists, loadRootPackageJson, searchForTutorials} from '../tut
33
import{createPackageJson,openDirectory,installTutorial}from'./action-setup';
44
import*aspathfrom'path';
55

6-
exportfunctionhasDirectory():Promise<boolean>{
7-
returnnewPromise((resolve,reject)=>{
8-
consthasDirectory=!!window.coderoad.dir;
9-
if(!hasDirectory){
10-
resolve(true);
11-
}else{
12-
resolve(false);
13-
}
14-
});
6+
exportfunctionhasDirectory():boolean{
7+
return!!window.coderoad.dir;
158
}
169

17-
exportfunctionhasPackageJson():Promise<boolean>{
18-
returnnewPromise((resolve,reject)=>{
19-
consthasPackageJson=packageJsonExists();
20-
if(!hasPackageJson){
21-
resolve(true);
22-
}
23-
resolve(false);
24-
});
10+
exportfunctionhasPackageJson():boolean{
11+
returnpackageJsonExists();
2512
}
2613

27-
exportfunctionhasTutorialDep():Promise<boolean>{
28-
returnnewPromise((resolve,reject)=>{
14+
exportfunctionhasTutorialDep():boolean{
2915
constpackageJson=hasPackageJson ?loadRootPackageJson() :null;
30-
consthasTutorialDep=!!packageJson&&_tutorialInstalled(packageJson.dependencies)||
16+
return!!packageJson&&_tutorialInstalled(packageJson.dependencies)||
3117
_tutorialInstalled(packageJson.devDependencies);
32-
if(!hasTutorialDep){
33-
resolve(true);
34-
}
35-
resolve(false);
36-
});
3718
}
3819

3920
function_hasKeys(obj:Object):boolean{

‎src/reducers/checks/verify.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,23 @@ function allTrue(obj: Object): boolean {
1111
}
1212

1313
exportdefaultfunctionverifySetup():CR.Checks{
14+
lethasDir=!!hasDirectory();
15+
1416
letchecks:CR.Checks={
1517
system:{
1618
node:!!nodeMinVersion(),
1719
npm:!!npmMinVersion()
1820
},
1921
setup:{
20-
dir:!!hasDirectory(),
21-
packageJson:!!hasPackageJson(),
22-
tutorial:!!hasTutorialDep()
22+
dir:hasDir,
23+
packageJson:hasDir ?!!hasPackageJson() :false,
24+
tutorial:hasDir ?!!hasTutorialDep() :false
2325
}
2426
};
2527

2628
checks.system.passed=allTrue(checks.system);
2729
checks.setup.passed=allTrue(checks.setup);
2830
checks.passed=checks.system.passed&&checks.setup.passed;
31+
console.log('checks',checks);
2932
returnchecks;
3033
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp