Skip to content

Commit 37a37c2

Browse files
ShMcKShMcK
committed
update to react@15.2, style fixes
1 parent 2b4831a commit 37a37c2

File tree

6 files changed

+153
-144
lines changed

6 files changed

+153
-144
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [0.11.0] - 2016-06-28
6+
- rely on core-coderoad@0.5
7+
- require newer version of test runners
8+
- update to material-ui@0.15.1
9+
510
## [0.10.1] - 2016-06-18
611
- style fix for Atom 1.9
712
- rely on core-coderoad@0.4

‎lib/components/Page/Task/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var styles = {
2424
task: {
2525
margin: '5px',
2626
padding: '5px',
27-
position: 'relative'
27+
position: 'relative',
2828
},
2929
index: {
3030
position: 'absolute',

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"core-coderoad": "0.5.0",
3535
"material-ui": "0.15.1",
3636
"node-file-exists": "1.1.0",
37-
"react": "15.1.0",
38-
"react-dom": "15.1.0",
37+
"react": "15.2.0",
38+
"react-dom": "15.2.0",
3939
"react-redux": "4.4.5",
4040
"react-tap-event-plugin": "1.0.0",
4141
"redux": "3.5.2"

‎src/components/Page/Task/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const styles = {
1010
task: {
1111
margin: '5px',
1212
padding: '5px',
13-
position: 'relative'
13+
position: 'relative',
1414
},
1515
index: {
1616
position: 'absolute',

‎src/modules/progress/actions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export function progressLoad(): ReduxThunk.ThunkInterface {
1313
}
1414

1515
function _progressPagePosition() {
16-
return function(dispatch, getState) {
16+
return (dispatch, getState) => {
1717
const {progress} = getState();
1818
dispatch({ type: PROGRESS_PAGE_POSITION, payload: { progress } });
1919
};

‎tsconfig.json‎

Lines changed: 143 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,145 @@
11
{
2-
"compileOnSave": false,
3-
"buildOnSave": false,
4-
"compilerOptions": {
5-
"target": "ES5",
6-
"module": "commonjs",
7-
"declaration": false,
8-
"noImplicitAny": false,
9-
"removeComments": true,
10-
"noLib": false,
11-
"jsx": "react",
12-
"experimentalDecorators": true,
13-
"emitDecoratorMetadata": true,
14-
"outDir": "lib"
15-
},
16-
"filesGlob": [
17-
"src/typings/**/*.d.ts",
18-
"src/**/*.ts",
19-
"src/**/*.tsx",
20-
"!src/**/*.spec.ts",
21-
"!src/**/*.spec.tsx"
22-
],
23-
"files": [
24-
"src/actions.ts",
25-
"src/components/index.ts",
26-
"src/components/SidePanel/index.ts",
27-
"src/components/SidePanel/sideElement.ts",
28-
"src/components/StatusBar/index.ts",
29-
"src/components/styles/theme.ts",
30-
"src/index.ts",
31-
"src/modules/alert/actions.ts",
32-
"src/modules/alert/index.ts",
33-
"src/modules/alert/reducer.ts",
34-
"src/modules/alert/types.ts",
35-
"src/modules/hints/actions.ts",
36-
"src/modules/hints/index.ts",
37-
"src/modules/hints/reducer.ts",
38-
"src/modules/hints/types.ts",
39-
"src/modules/page/actions.ts",
40-
"src/modules/page/index.ts",
41-
"src/modules/page/page-position/index.ts",
42-
"src/modules/page/task-actions/handle-action-string.ts",
43-
"src/modules/page/task-actions/handle-actions.ts",
44-
"src/modules/page/task-actions/index.ts",
45-
"src/modules/page/task-actions/parse-params.ts",
46-
"src/modules/page/task-actions/parser.ts",
47-
"src/modules/page/task-tests/index.ts",
48-
"src/modules/page/types.ts",
49-
"src/modules/progress/actions.ts",
50-
"src/modules/progress/index.ts",
51-
"src/modules/progress/reducer.ts",
52-
"src/modules/progress/types.ts",
53-
"src/modules/progress/utils/local-storage.ts",
54-
"src/modules/setup/actions.ts",
55-
"src/modules/setup/checks/index.ts",
56-
"src/modules/setup/index.ts",
57-
"src/modules/setup/package-json/index.ts",
58-
"src/modules/setup/types.ts",
59-
"src/modules/setup/utils/action-setup.ts",
60-
"src/modules/setup/utils/action-system.ts",
61-
"src/modules/setup/utils/check-system.ts",
62-
"src/modules/setup/utils/verify.ts",
63-
"src/modules/tests/actions.ts",
64-
"src/modules/tests/index.ts",
65-
"src/modules/tests/task-position/index.ts",
66-
"src/modules/tests/test-run/handle-result.ts",
67-
"src/modules/tests/test-run/index.ts",
68-
"src/modules/tests/test-run/parse-loaders.ts",
69-
"src/modules/tests/test-run/run.ts",
70-
"src/modules/tests/types.ts",
71-
"src/modules/tutorial/actions.ts",
72-
"src/modules/tutorial/index.ts",
73-
"src/modules/tutorial/reducer.ts",
74-
"src/modules/tutorial/types.ts",
75-
"src/modules/tutorial/utils/config-paths.ts",
76-
"src/modules/tutorial/utils/config-repo.ts",
77-
"src/modules/tutorial/utils/config-runner.ts",
78-
"src/modules/tutorial/utils/config.ts",
79-
"src/modules/tutorial/utils/system.ts",
80-
"src/modules/tutorials/actions.ts",
81-
"src/modules/tutorials/index.ts",
82-
"src/modules/tutorials/reducer.ts",
83-
"src/modules/tutorials/types.ts",
84-
"src/reducers.ts",
85-
"src/store.ts",
86-
"src/subscriptions.ts",
87-
"src/typings.d.ts",
88-
"src/components/Alert/index.tsx",
89-
"src/components/AppMenu/CloseWindow.tsx",
90-
"src/components/AppMenu/index.tsx",
91-
"src/components/AppMenu/issuesLink.tsx",
92-
"src/components/AppMenu/menuIconRight.tsx",
93-
"src/components/AppMenu/MenuLink/index.tsx",
94-
"src/components/AppMenu/menuRight.tsx",
95-
"src/components/AppMenu/menuRightRouteOptions.tsx",
96-
"src/components/AppMenu/Quit/index.tsx",
97-
"src/components/common/ContentCard.tsx",
98-
"src/components/common/RouteButton.tsx",
99-
"src/components/FinalPage/index.tsx",
100-
"src/components/Page/EditPage/index.tsx",
101-
"src/components/Page/Hints/HintButton.tsx",
102-
"src/components/Page/Hints/index.tsx",
103-
"src/components/Page/index.tsx",
104-
"src/components/Page/PageToolbar/Continue/index.tsx",
105-
"src/components/Page/PageToolbar/index.tsx",
106-
"src/components/Page/PageToolbar/Save/index.tsx",
107-
"src/components/Page/PageToolbar/ToggleDevTools/index.tsx",
108-
"src/components/Page/ProgressBar/index.tsx",
109-
"src/components/Page/Task/index.tsx",
110-
"src/components/Page/Task/TaskCheckbox.tsx",
111-
"src/components/Page/Tasks/index.tsx",
112-
"src/components/Page/TasksComplete/index.tsx",
113-
"src/components/Progress/index.tsx",
114-
"src/components/Progress/progressIcon.tsx",
115-
"src/components/Progress/ProgressPage/index.tsx",
116-
"src/components/Routes/index.tsx",
117-
"src/components/SidePanel/SidePanel.tsx",
118-
"src/components/SidePanel/SideRoot.tsx",
119-
"src/components/Start/Checks/DynamicStepper.tsx",
120-
"src/components/Start/Checks/index.tsx",
121-
"src/components/Start/Checks/InstallGuide.tsx",
122-
"src/components/Start/Checks/SetupChecks.tsx",
123-
"src/components/Start/Checks/StepCheck.tsx",
124-
"src/components/Start/Checks/SystemChecks.tsx",
125-
"src/components/Start/Checks/VerifyButton.tsx",
126-
"src/components/Start/index.tsx",
127-
"src/components/Start/Welcome/index.tsx",
128-
"src/components/Tutorials/index.tsx",
129-
"src/components/Tutorials/LoadTutorials/index.tsx",
130-
"src/components/Tutorials/SelectTutorial/index.tsx",
131-
"src/components/Tutorials/UpdateTutorial/index.tsx",
132-
"src/modules/hints/Hints/HintButton.tsx",
133-
"src/modules/hints/Hints/index.tsx"
134-
],
135-
"exclude": [
136-
"node_modules"
137-
],
138-
"atom": {
139-
"rewriteTsconfig": true
140-
}
2+
"compileOnSave": false,
3+
"buildOnSave": false,
4+
"compilerOptions": {
5+
"target": "ES5",
6+
"module": "commonjs",
7+
"declaration": false,
8+
"noImplicitAny": false,
9+
"removeComments": true,
10+
"noLib": false,
11+
"jsx": "react",
12+
"experimentalDecorators": true,
13+
"emitDecoratorMetadata": true,
14+
"outDir": "lib",
15+
"moduleResolution": "node",
16+
"rootDirs": [
17+
"src"
18+
]
19+
},
20+
"filesGlob": [
21+
"typings/**/*.d.ts",
22+
"src/**/*.ts",
23+
"src/**/*.tsx",
24+
"!src/**/*.spec.ts",
25+
"!src/**/*.spec.tsx"
26+
],
27+
"files": [
28+
"src/actions.ts",
29+
"src/components/index.ts",
30+
"src/components/SidePanel/index.ts",
31+
"src/components/SidePanel/sideElement.ts",
32+
"src/components/StatusBar/index.ts",
33+
"src/components/styles/theme.ts",
34+
"src/index.ts",
35+
"src/modules/alert/actions.ts",
36+
"src/modules/alert/index.ts",
37+
"src/modules/alert/reducer.ts",
38+
"src/modules/alert/types.ts",
39+
"src/modules/hints/actions.ts",
40+
"src/modules/hints/index.ts",
41+
"src/modules/hints/reducer.ts",
42+
"src/modules/hints/types.ts",
43+
"src/modules/page/actions.ts",
44+
"src/modules/page/index.ts",
45+
"src/modules/page/page-position/index.ts",
46+
"src/modules/page/task-actions/handle-action-string.ts",
47+
"src/modules/page/task-actions/handle-actions.ts",
48+
"src/modules/page/task-actions/index.ts",
49+
"src/modules/page/task-actions/parse-params.ts",
50+
"src/modules/page/task-actions/parser.ts",
51+
"src/modules/page/task-tests/index.ts",
52+
"src/modules/page/types.ts",
53+
"src/modules/progress/actions.ts",
54+
"src/modules/progress/index.ts",
55+
"src/modules/progress/reducer.ts",
56+
"src/modules/progress/types.ts",
57+
"src/modules/progress/utils/local-storage.ts",
58+
"src/modules/setup/actions.ts",
59+
"src/modules/setup/checks/index.ts",
60+
"src/modules/setup/index.ts",
61+
"src/modules/setup/package-json/index.ts",
62+
"src/modules/setup/types.ts",
63+
"src/modules/setup/utils/action-setup.ts",
64+
"src/modules/setup/utils/action-system.ts",
65+
"src/modules/setup/utils/check-system.ts",
66+
"src/modules/setup/utils/verify.ts",
67+
"src/modules/tests/actions.ts",
68+
"src/modules/tests/index.ts",
69+
"src/modules/tests/task-position/index.ts",
70+
"src/modules/tests/test-run/handle-result.ts",
71+
"src/modules/tests/test-run/index.ts",
72+
"src/modules/tests/test-run/parse-loaders.ts",
73+
"src/modules/tests/test-run/run.ts",
74+
"src/modules/tests/types.ts",
75+
"src/modules/tutorial/actions.ts",
76+
"src/modules/tutorial/index.ts",
77+
"src/modules/tutorial/reducer.ts",
78+
"src/modules/tutorial/types.ts",
79+
"src/modules/tutorial/utils/config-paths.ts",
80+
"src/modules/tutorial/utils/config-repo.ts",
81+
"src/modules/tutorial/utils/config-runner.ts",
82+
"src/modules/tutorial/utils/config.ts",
83+
"src/modules/tutorial/utils/system.ts",
84+
"src/modules/tutorials/actions.ts",
85+
"src/modules/tutorials/index.ts",
86+
"src/modules/tutorials/reducer.ts",
87+
"src/modules/tutorials/types.ts",
88+
"src/reducers.ts",
89+
"src/store.ts",
90+
"src/subscriptions.ts",
91+
"src/typings.d.ts",
92+
"src/components/Alert/index.tsx",
93+
"src/components/AppMenu/CloseWindow.tsx",
94+
"src/components/AppMenu/index.tsx",
95+
"src/components/AppMenu/issuesLink.tsx",
96+
"src/components/AppMenu/menuIconRight.tsx",
97+
"src/components/AppMenu/MenuLink/index.tsx",
98+
"src/components/AppMenu/menuRight.tsx",
99+
"src/components/AppMenu/menuRightRouteOptions.tsx",
100+
"src/components/AppMenu/Quit/index.tsx",
101+
"src/components/common/ContentCard.tsx",
102+
"src/components/common/RouteButton.tsx",
103+
"src/components/FinalPage/index.tsx",
104+
"src/components/Page/EditPage/index.tsx",
105+
"src/components/Page/Hints/HintButton.tsx",
106+
"src/components/Page/Hints/index.tsx",
107+
"src/components/Page/index.tsx",
108+
"src/components/Page/PageToolbar/Continue/index.tsx",
109+
"src/components/Page/PageToolbar/index.tsx",
110+
"src/components/Page/PageToolbar/Save/index.tsx",
111+
"src/components/Page/PageToolbar/ToggleDevTools/index.tsx",
112+
"src/components/Page/ProgressBar/index.tsx",
113+
"src/components/Page/Task/index.tsx",
114+
"src/components/Page/Task/TaskCheckbox.tsx",
115+
"src/components/Page/Tasks/index.tsx",
116+
"src/components/Page/TasksComplete/index.tsx",
117+
"src/components/Progress/index.tsx",
118+
"src/components/Progress/progressIcon.tsx",
119+
"src/components/Progress/ProgressPage/index.tsx",
120+
"src/components/Routes/index.tsx",
121+
"src/components/SidePanel/SidePanel.tsx",
122+
"src/components/SidePanel/SideRoot.tsx",
123+
"src/components/Start/Checks/DynamicStepper.tsx",
124+
"src/components/Start/Checks/index.tsx",
125+
"src/components/Start/Checks/InstallGuide.tsx",
126+
"src/components/Start/Checks/SetupChecks.tsx",
127+
"src/components/Start/Checks/StepCheck.tsx",
128+
"src/components/Start/Checks/SystemChecks.tsx",
129+
"src/components/Start/Checks/VerifyButton.tsx",
130+
"src/components/Start/index.tsx",
131+
"src/components/Start/Welcome/index.tsx",
132+
"src/components/Tutorials/index.tsx",
133+
"src/components/Tutorials/LoadTutorials/index.tsx",
134+
"src/components/Tutorials/SelectTutorial/index.tsx",
135+
"src/components/Tutorials/UpdateTutorial/index.tsx",
136+
"src/modules/hints/Hints/HintButton.tsx",
137+
"src/modules/hints/Hints/index.tsx"
138+
],
139+
"exclude": [
140+
"node_modules"
141+
],
142+
"atom": {
143+
"rewriteTsconfig": true
144+
}
141145
}

0 commit comments

Comments
 (0)