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

Commit193bc7f

Browse files
committed
repair tutorial.config
1 parentc682dc4 commit193bc7f

File tree

10 files changed

+59
-35
lines changed

10 files changed

+59
-35
lines changed

‎lib/components/Tutorials/SelectTutorial/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ var SelectTutorial = (function (_super) {
3333
};
3434
SelectTutorial.prototype.render=function(){
3535
var_a=this.props,tutorial=_a.tutorial,selectTutorial=_a.selectTutorial;
36-
console.log('tutorial',tutorial);
3736
varname=tutorial.name;
3837
return(React.createElement(FlatButton_1.default,{label:this.displayName(name),primary:true,onTouchTap:selectTutorial.bind(this,name)}));
3938
};

‎lib/modules/page/task-actions/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
vartypes_1=require('../types');
33
varhandle_actions_1=require('./handle-actions');
44
vartaskPositionTracker=0;
5-
functiontaskActionsReducer(taskActions,action){
6-
if(taskActions===void0){taskActions=[];}
5+
functiontaskActionsReducer(t,action){
6+
if(t===void0){t=[];}
77
varactions=null;
88
switch(action.type){
99
casetypes_1.PAGE_SET:
@@ -21,18 +21,18 @@ function taskActionsReducer(taskActions, action) {
2121
handle_actions_1.default(actions);
2222
returnactions;
2323
case'TEST_RESULT':
24-
actions=action.payload.taskActions||[];
25-
varnextTaskPosition=action.payload.result.taskPosition;
24+
var_b=action.payload,taskActions=_b.taskActions,result=_b.result;
25+
varnextTaskPosition=result.taskPosition;
2626
vartimes=nextTaskPosition-taskPositionTracker;
2727
if(times>0){
2828
for(vari=0;i<times;i++){
2929
handle_actions_1.default(actions);
3030
}
3131
taskPositionTracker=nextTaskPosition;
3232
}
33-
returnactions;
34-
default:
3533
returntaskActions;
34+
default:
35+
returnt;
3636
}
3737
}
3838
Object.defineProperty(exports,"__esModule",{value:true});

‎lib/modules/tests/test-run/parse-loaders.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var path_1 = require('path');
33
varfs_1=require('fs');
44
varcomments={
55
py:'#',
6+
js:'\/{2,3}',
67
};
78
functionloaderRegex(fileType){
89
varcomment='\/{2,3}';
@@ -27,7 +28,7 @@ function parseLoaders(data, fileType, tutorial, dir) {
2728
}
2829
varpathToFile=null;
2930
if(loader[2]){
30-
vartutorialDir=tutorial.config.dir;
31+
vartutorialDir=tutorial.packageJson.config.dir||'tutorial';
3132
pathToFile=path_1.normalize(path_1.join(tutorialDir,fileToLoad));
3233
}
3334
else{

‎lib/modules/tutorial/reducer.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22
varpath_1=require('path');
3+
varconfig_1=require('./utils/config');
34
vartypes_1=require('./types');
45
varconfig_paths_1=require('./utils/config-paths');
56
var_tutorial={
@@ -8,24 +9,26 @@ var _tutorial = {
89
pages:[],
910
packageJson:null,
1011
};
11-
functiontutorialReducer(tutorial,action){
12-
if(tutorial===void0){tutorial=_tutorial;}
12+
functiontutorialReducer(t,action){
13+
if(t===void0){t=_tutorial;}
1314
switch(action.type){
1415
casetypes_1.TUTORIAL_SET:
1516
var_a=action.payload,name_1=_a.name,dir=_a.dir;
1617
varpackagePath=path_1.join(dir,'node_modules',name_1);
1718
varpackageJson=require(path_1.join(packagePath,'package.json'));
18-
console.log(packageJson);
19-
var_b=require(path_1.join(packagePath,packageJson.main)),info=_b.info,pages=_b.pages;
20-
pages=config_paths_1.default(dir,name_1,packageJson.config,pages||[]);
19+
varconfig=config_1.tutorialConfig(packageJson,dir);
20+
varcoderoadJsonPath=path_1.join(packagePath,packageJson.main);
21+
var_b=require(coderoadJsonPath),info=_b.info,pages=_b.pages;
22+
pages=config_paths_1.default(dir,name_1,config,pages||[]);
2123
return{
2224
name:packageJson.name,
2325
info:info,
2426
pages:pages,
2527
packageJson:packageJson,
28+
config:config,
2629
};
2730
default:
28-
returntutorial;
31+
returnt;
2932
}
3033
}
3134
Object.defineProperty(exports,"__esModule",{value:true});

‎lib/store.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var redux_thunk_1 = require('redux-thunk');
77
varmiddlewares=[redux_thunk_1.default];
88
varthrottleTestRun=redux_throttle_actions_1.default(['TEST_RUN'],800);
99
middlewares.push(throttleTestRun);
10-
vardevMode=false;
10+
vardevMode=true;
1111
if(devMode){
1212
varlogger=createLogger();
1313
middlewares.push(logger);

‎src/modules/page/page-position/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ export default function pagePosition(
88
casePAGE_SET:
99
returnaction.payload.pagePosition;
1010

11-
// allow access until before first incomplete tutorial
1211
case'PROGRESS_PAGE_POSITION':
12+
// allow access until before first incomplete tutorial
1313
constpages=action.payload.progress.pages;
1414
constfirstFail=pages.indexOf(false);
1515
returnfirstFail<0 ?pages.length-1 :firstFail;

‎src/modules/page/task-actions/index.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,50 @@ import handleTaskActions from './handle-actions';
55
lettaskPositionTracker=0;
66

77
exportdefaultfunctiontaskActionsReducer(
8-
taskActions=[],action:Action
8+
t=[],action:Action
99
):string[][]{
1010
letactions:string[][]=null;
1111
switch(action.type){
1212

13-
// load task actions
1413
casePAGE_SET:
14+
// load task actions
1515
const{tasks, pagePosition, progress}=action.payload;
16+
1617
constisCompleted=progress.pages[pagePosition];
1718
if(!isCompleted){
19+
// if page is completed, mark tasks as completed
1820
actions=tasks.map(task=>task.actions||[]);
1921
}else{
2022
// filter to only 'open' actions
2123
actions=tasks.map(task=>{
2224
returntask.actions.filter(a=>!!a.match(/^open/));
2325
});
2426
}
27+
// page loads - reset tracker
2528
taskPositionTracker=0;
26-
handleTaskActions(actions);// run first action
29+
// run first action
30+
handleTaskActions(actions);
2731
returnactions;
2832

29-
// run task actions
3033
case'TEST_RESULT':
31-
actions=action.payload.taskActions||[];
32-
constnextTaskPosition=action.payload.result.taskPosition;
34+
const{taskActions, result}=action.payload;
35+
// task position from test result
36+
constnextTaskPosition=result.taskPosition;
37+
// calculate task position difference
3338
consttimes:number=nextTaskPosition-taskPositionTracker;
39+
//
3440
if(times>0){
3541
// run actions for each task position passed
3642
for(leti=0;i<times;i++){
37-
handleTaskActions(actions);// run first action
43+
// run action
44+
handleTaskActions(actions);
3845
}
46+
// set current task position
3947
taskPositionTracker=nextTaskPosition;
4048
}
41-
returnactions;
49+
returntaskActions;
4250

4351
default:
44-
returntaskActions;
52+
returnt;
4553
}
4654
}

‎src/modules/page/task-tests/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@ export default function taskTestsReducer(
88

99
casePAGE_SET:
1010
const{tutorial, tasks}=action.payload;
11+
// map over task tests from coderoad.json
1112
return[].concat.apply([],tasks.map(
12-
task=>task.tests||[])
13+
task=>task.tests||[]
14+
)
15+
// concat test files together
1316
).reduce((output:string,file:string):string=>{
1417
try{
1518
output+=readFileSync(file,'utf8')+'\n';
1619
}catch(e){
1720
console.log('Error reading test file',e);
1821
}
22+
// return concatted test files
1923
returnoutput;
2024
},'');
2125

‎src/modules/tests/test-run/parse-loaders.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import{normalize,join}from'path';
22
import{readFileSync}from'fs';
33

4-
// other languages may handle comments differently
4+
// TODO: load comments from core-coderoad/lib/options
5+
56
constcomments={
67
py:'#',
8+
js:'\/{2,3}',
79
};
810

911
functionloaderRegex(fileType:string):RegExp{
@@ -40,9 +42,8 @@ export default function parseLoaders(
4042

4143
letpathToFile:string=null;
4244
if(loader[2]){
43-
// path to file from tutorial directory
44-
consttutorialDir=tutorial.config.dir;
45-
pathToFile=normalize(join(tutorialDir,fileToLoad));
45+
// path to file from config specified dir
46+
pathToFile=normalize(join(tutorial.config.dir,fileToLoad));
4647
}else{
4748
// path to file from working directory
4849
pathToFile=normalize(join(dir,fileToLoad));

‎src/modules/tutorial/reducer.ts

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,34 @@ const _tutorial: CR.Tutorial = {
1111
};
1212

1313
exportdefaultfunctiontutorialReducer(
14-
tutorial=_tutorial,action:Action
14+
t=_tutorial,action:Action
1515
):CR.Tutorial{
1616
switch(action.type){
1717

1818
caseTUTORIAL_SET:
1919
const{name, dir}=action.payload;
20+
21+
// get tutorial package.json
2022
constpackagePath:string=join(dir,'node_modules',name);
2123
constpackageJson:PackageJson=require(join(packagePath,'package.json'));
22-
// const config: Tutorial.Config = tutorialConfig(packageJson, dir);
23-
let{info, pages}=require(join(packagePath,packageJson.main));
24+
25+
constconfig:Tutorial.Config=tutorialConfig(packageJson,dir);
26+
constcoderoadJsonPath=join(packagePath,packageJson.main);
27+
let{info, pages}=require(coderoadJsonPath);
28+
2429
// configure test paths to absolute paths
25-
pages=configPaths(dir,name,packageJson.config,pages||[]);
30+
pages=configPaths(dir,name,config,pages||[]);
31+
32+
// return tutorial (info, pages) & tutorial package.json
2633
return{
2734
name:packageJson.name,
2835
info,
2936
pages,
3037
packageJson,
38+
config,
3139
};
3240

3341
default:
34-
returntutorial;
42+
returnt;
3543
}
3644
}

0 commit comments

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