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

Commit092c946

Browse files
committed
fix tutorial loading
1 parentb16dffb commit092c946

File tree

6 files changed

+11
-16
lines changed

6 files changed

+11
-16
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ function minVersion(command, minVersion) {
44
returnnewPromise(function(resolve,reject){
55
varminOrLater=command_line_1.default(command,'-v')
66
.then(function(res){
7-
console.log(res);
87
if(parseInt(res,10).toString()==='NaN'){
98
returnfalse;
109
}

‎lib/reducers/tutorials/check-tutorials.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function _isTutorial(name) {
4141
}
4242
functionsearchForTutorials(deps){
4343
if(!!deps&&Object.keys(deps).length>0){
44-
returnObject.keys(deps)
44+
return(Object.keys(deps)
4545
.filter(function(name){return_isTutorial(name);})
4646
.map(function(name){
4747
varpathToTutorialPackageJson=path.join(window.coderoad.dir,'node_modules',name,'package.json');
@@ -58,7 +58,7 @@ function searchForTutorials(deps) {
5858
version:packageJson.version,
5959
latest:true
6060
};
61-
});
61+
}));
6262
}
6363
else{
6464
return[];

‎lib/reducers/tutorials/tutorials.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ function tutorialsReducer(tutorials, action) {
55
if(tutorials===void0){tutorials=[];}
66
switch(action.type){
77
caseType.LOAD_TUTORIALS:
8-
vartut=[];
98
varpackageJson=check_tutorials_1.loadRootPackageJson();
10-
if(window.coderoad.dir&&!!packageJson){
11-
tut.concat(check_tutorials_1.searchForTutorials(packageJson.dependencies))
9+
if(!!packageJson){
10+
return[].concat(check_tutorials_1.searchForTutorials(packageJson.dependencies))
1211
.concat(check_tutorials_1.searchForTutorials(packageJson.devDependencies));
1312
}
14-
returntut;
13+
return[];
1514
default:
1615
returntutorials;
1716
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{fileExists}from'../../services/exists';
22
import{packageJsonExists,loadRootPackageJson,searchForTutorials}from'../tutorials/check-tutorials';
3-
import{createPackageJson,openDirectory,installTutorial}from'./setup-actions';
3+
import{createPackageJson,openDirectory,installTutorial}from'./action-setup';
44
import*aspathfrom'path';
55

66
exportfunctionhasDirectory():Promise<boolean>{

‎src/reducers/tutorials/check-tutorials.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ function _isTutorial(name: string): boolean {
5656

5757
exportfunctionsearchForTutorials(deps:Object):CR.Tutorial[]{
5858
if(!!deps&&Object.keys(deps).length>0){
59-
returnObject.keys(deps)
59+
return(Object.keys(deps)
6060
.filter((name:string)=>_isTutorial(name))
6161
.map(function(name:string){
62-
6362
constpathToTutorialPackageJson=path.join(window.coderoad.dir,'node_modules',name,'package.json');
6463
if(!fileExists(pathToTutorialPackageJson)){
6564
console.log(`Error with${name}: no package.json file found.${tutorialError}`);
@@ -70,13 +69,12 @@ export function searchForTutorials(deps: Object): CR.Tutorial[] {
7069
}
7170

7271
letpackageJson=JSON.parse(fs.readFileSync(pathToTutorialPackageJson,'utf8'));
73-
7472
return{
7573
name,
7674
version:packageJson.version,
7775
latest:true
7876
};
79-
});
77+
}));
8078
}else{
8179
return[];
8280
}

‎src/reducers/tutorials/tutorials.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ import {loadRootPackageJson, searchForTutorials} from './check-tutorials';
44
exportdefaultfunctiontutorialsReducer(tutorials=[],action:CR.Action):CR.Tutorial[]{
55
switch(action.type){
66
caseType.LOAD_TUTORIALS:
7-
lettut=[];
87
letpackageJson:PackageJson=loadRootPackageJson();
9-
if(window.coderoad.dir&&!!packageJson){
10-
tut.concat(searchForTutorials(packageJson.dependencies))
8+
if(!!packageJson){
9+
return[].concat(searchForTutorials(packageJson.dependencies))
1110
.concat(searchForTutorials(packageJson.devDependencies));
1211
}
13-
returntut;
12+
return[];
1413
default:
1514
returntutorials;
1615
}

0 commit comments

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