updated for core-coderoad 0.3.0

ShMcK · ShMcK · commit 7d8152dbd6ca · 2016-06-14T13:34:42.000-07:00
diff --git a/lib/actions.js b/lib/actions.js
@@ -19,17 +19,14 @@ exports.tutorialSet = tutorial_1.tutorialSet;
 var tutorials_1 = require('./modules/tutorials');
 exports.tutorialsFind = tutorials_1.tutorialsFind;
 exports.tutorialUpdate = tutorials_1.tutorialUpdate;
-var alert_1 = require('core-coderoad/lib/alert');
-exports.alertOpen = alert_1.alertOpen;
-exports.alertClose = alert_1.alertClose;
-exports.alertReplay = alert_1.alertReplay;
-var editor_1 = require('core-coderoad/lib/editor');
-exports.editorDevToolsToggle = editor_1.editorDevToolsToggle;
-exports.editorOpen = editor_1.editorOpen;
-exports.editorInsert = editor_1.editorInsert;
-exports.editorSave = editor_1.editorSave;
-exports.editorSet = editor_1.editorSet;
-var route_1 = require('core-coderoad/lib/route');
-exports.routeSet = route_1.routeSet;
-var window_1 = require('core-coderoad/lib/window');
-exports.windowToggle = window_1.windowToggle;
+var core_coderoad_1 = require('core-coderoad');
+exports.alertOpen = core_coderoad_1.alertOpen;
+exports.alertClose = core_coderoad_1.alertClose;
+exports.alertReplay = core_coderoad_1.alertReplay;
+exports.editorDevToolsToggle = core_coderoad_1.editorDevToolsToggle;
+exports.editorOpen = core_coderoad_1.editorOpen;
+exports.editorInsert = core_coderoad_1.editorInsert;
+exports.editorSave = core_coderoad_1.editorSave;
+exports.editorSet = core_coderoad_1.editorSet;
+exports.routeSet = core_coderoad_1.routeSet;
+exports.windowToggle = core_coderoad_1.windowToggle;
diff --git a/lib/components/Page/Hints/HintButton.js b/lib/components/Page/Hints/HintButton.js
@@ -17,7 +17,7 @@ var React = require('react');
 var react_redux_1 = require('react-redux');
 var FlatButton_1 = require('material-ui/FlatButton');
 var actions_1 = require('../../../actions');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var HintButton = (function (_super) {
     __extends(HintButton, _super);
     function HintButton() {
@@ -35,7 +35,7 @@ var HintButton = (function (_super) {
     HintButton = __decorate([
         react_redux_1.connect(function (state) { return ({
             hintPosition: state.hintPosition,
-            hintsLength: selectors_1.hintsSelector(state).length,
+            hintsLength: core_coderoad_1.hintsSelector(state).length,
         }); }, { hintPositionSet: actions_1.hintPositionSet }), 
         __metadata('design:paramtypes', [])
     ], HintButton);
diff --git a/lib/components/Page/Hints/index.js b/lib/components/Page/Hints/index.js
@@ -19,7 +19,7 @@ var Card_1 = require('material-ui/Card');
 var index_1 = require('../../index');
 var HintButton_1 = require('./HintButton');
 var help_1 = require('material-ui/svg-icons/action/help');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var styles = {
     position: 'relative',
     margin: '5px auto 10px',
@@ -40,7 +40,7 @@ var Hints = (function (_super) {
     };
     Hints = __decorate([
         react_redux_1.connect(function (state) { return ({
-            hint: selectors_1.hintSelector(state),
+            hint: core_coderoad_1.hintSelector(state),
         }); }), 
         __metadata('design:paramtypes', [])
     ], Hints);
diff --git a/lib/components/Page/PageToolbar/index.js b/lib/components/Page/PageToolbar/index.js
@@ -19,7 +19,7 @@ var Toolbar_1 = require('material-ui/Toolbar');
 var Save_1 = require('./Save');
 var Continue_1 = require('./Continue');
 var ToggleDevTools_1 = require('./ToggleDevTools');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var styles = {
     zIndex: '5',
     position: 'relative',
@@ -40,7 +40,7 @@ var PageToolbar = (function (_super) {
     };
     PageToolbar = __decorate([
         react_redux_1.connect(function (state) { return ({
-            tasksComplete: selectors_1.taskProgressSelector(state) === 100
+            tasksComplete: core_coderoad_1.taskProgressSelector(state) === 100
         }); }), 
         __metadata('design:paramtypes', [])
     ], PageToolbar);
diff --git a/lib/components/Page/Task/index.js b/lib/components/Page/Task/index.js
@@ -19,7 +19,7 @@ var index_1 = require('../../index');
 var taskCheckbox_1 = require('./taskCheckbox');
 var List_1 = require('material-ui/List');
 var colors_1 = require('material-ui/styles/colors');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var styles = {
     task: {
         margin: '5px',
@@ -53,7 +53,7 @@ var Task = (function (_super) {
         react_redux_1.connect(function (state, props) { return ({
             testRun: state.testRun,
             isCompletedTask: state.taskPosition > props.index,
-            task: selectors_1.taskByIndexSelector(state, props)
+            task: core_coderoad_1.taskByIndexSelector(state, props)
         }); }), 
         __metadata('design:paramtypes', [])
     ], Task);
diff --git a/lib/components/Page/Tasks/index.js b/lib/components/Page/Tasks/index.js
@@ -21,7 +21,7 @@ var Card_1 = require('material-ui/Card');
 var Subheader_1 = require('material-ui/Subheader');
 var Task_1 = require('../Task');
 var colors_1 = require('material-ui/styles/colors');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var margin = '10px 5px';
 var Tasks = (function (_super) {
     __extends(Tasks, _super);
@@ -40,8 +40,8 @@ var Tasks = (function (_super) {
     };
     Tasks = __decorate([
         react_redux_1.connect(function (state) { return ({
-            tasks: selectors_1.visibleTasksSelector(state),
-            completed: selectors_1.pageCompletedSelector(state),
+            tasks: core_coderoad_1.visibleTasksSelector(state),
+            completed: core_coderoad_1.pageCompletedSelector(state),
         }); }), 
         __metadata('design:paramtypes', [])
     ], Tasks);
diff --git a/lib/components/Page/TasksComplete/index.js b/lib/components/Page/TasksComplete/index.js
@@ -18,7 +18,7 @@ var react_redux_1 = require('react-redux');
 var Card_1 = require('material-ui/Card');
 var index_1 = require('../../index');
 var colors_1 = require('material-ui/styles/colors');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var styles = {
     card: {
         backgroundColor: colors_1.cyan500,
@@ -40,7 +40,7 @@ var TasksComplete = (function (_super) {
     };
     TasksComplete = __decorate([
         react_redux_1.connect(function (state) { return ({
-            onPageComplete: selectors_1.pageSelector(state).onPageComplete,
+            onPageComplete: core_coderoad_1.pageSelector(state).onPageComplete,
         }); }), 
         __metadata('design:paramtypes', [])
     ], TasksComplete);
diff --git a/lib/components/Page/index.js b/lib/components/Page/index.js
@@ -21,7 +21,7 @@ var Hints_1 = require('./Hints');
 var PageToolbar_1 = require('./PageToolbar');
 var ProgressBar_1 = require('./ProgressBar');
 var TasksComplete_1 = require('./TasksComplete');
-var selectors_1 = require('core-coderoad/lib/selectors');
+var core_coderoad_1 = require('core-coderoad');
 var styles = {
     page: {
         width: '100%',
@@ -39,8 +39,8 @@ var Page = (function (_super) {
     };
     Page = __decorate([
         react_redux_1.connect(function (state) { return ({
-            page: selectors_1.pageSelector(state),
-            tasksCompleted: selectors_1.taskProgressSelector(state) === 100,
+            page: core_coderoad_1.pageSelector(state),
+            tasksCompleted: core_coderoad_1.taskProgressSelector(state) === 100,
         }); }), 
         __metadata('design:paramtypes', [])
     ], Page);
diff --git a/lib/index.js b/lib/index.js
@@ -1,15 +1,15 @@
 "use strict";
 var render_1 = require('./components/render');
 var element_1 = require('./components/SidePanel/element');
-var polyfills_1 = require('core-coderoad/lib/polyfills');
+var core_coderoad_1 = require('core-coderoad');
 var subscriptions_1 = require('./subscriptions');
 var store_1 = require('./store');
 var setup_1 = require('./modules/setup');
 var injectTapEventPlugin = require('react-tap-event-plugin');
 var Main = (function () {
     function Main() {
         injectTapEventPlugin();
-        polyfills_1.default();
+        core_coderoad_1.loadPolyfills();
         store_1.default.dispatch(setup_1.setupVerify());
         this.root = element_1.default.init();
     }
diff --git a/lib/modules/setup/utils/action-setup.js b/lib/modules/setup/utils/action-setup.js
@@ -1,18 +1,18 @@
 "use strict";
 var path_1 = require('path');
-var editor_1 = require('core-coderoad/lib/editor');
+var core_coderoad_1 = require('core-coderoad');
 var packageData = "{\n  \"name\": \"demo\",\n  \"dependencies\": {\n    \"coderoad-functional-school\": \"^0.2.2\"\n  }\n}";
 function createPackageJson(dir) {
     var packagePath = path_1.join(dir, 'package.json');
     return new Promise(function (resolve, reject) {
-        editor_1.open(packagePath);
+        core_coderoad_1.open(packagePath);
         setTimeout(function () { return resolve(); });
     }).then(function () {
-        editor_1.set(packageData);
+        core_coderoad_1.set(packageData);
     });
 }
 exports.createPackageJson = createPackageJson;
 function openDirectory() {
-    editor_1.openFolder();
+    core_coderoad_1.openFolder();
 }
 exports.openDirectory = openDirectory;
diff --git a/lib/modules/tutorial/actions.js b/lib/modules/tutorial/actions.js
@@ -1,11 +1,11 @@
 "use strict";
 var types_1 = require('./types');
-var route_1 = require('core-coderoad/lib/route');
+var core_coderoad_1 = require('core-coderoad');
 function tutorialSet(name) {
     return function (dispatch, getState) {
         var dir = getState().dir;
         dispatch({ type: types_1.TUTORIAL_SET, payload: { name: name, dir: dir } });
-        dispatch(route_1.routeSet('progress'));
+        dispatch(core_coderoad_1.routeSet('progress'));
     };
 }
 exports.tutorialSet = tutorialSet;
diff --git a/lib/modules/tutorials/actions.js b/lib/modules/tutorials/actions.js
@@ -1,6 +1,6 @@
 "use strict";
 var types_1 = require('./types');
-var alert_1 = require('core-coderoad/lib/alert');
+var core_coderoad_1 = require('core-coderoad');
 var actions_1 = require('../tutorial/actions');
 exports.tutorialSet = actions_1.tutorialSet;
 function tutorialUpdate(title) {
@@ -11,7 +11,7 @@ function tutorialUpdate(title) {
             duration: 3000,
         };
         dispatch({ type: types_1.TUTORIAL_UPDATE, payload: { title: title } });
-        dispatch(alert_1.alertOpen(alert));
+        dispatch(core_coderoad_1.alertOpen(alert));
     };
 }
 exports.tutorialUpdate = tutorialUpdate;
diff --git a/lib/reducers.js b/lib/reducers.js
@@ -7,14 +7,11 @@ var setup_1 = require('./modules/setup');
 var tests_1 = require('./modules/tests');
 var tutorial_1 = require('./modules/tutorial');
 var tutorials_1 = require('./modules/tutorials');
-var alert_1 = require('core-coderoad/lib/alert');
-var editor_1 = require('core-coderoad/lib/editor');
-var route_1 = require('core-coderoad/lib/route');
-var window_1 = require('core-coderoad/lib/window');
+var core_coderoad_1 = require('core-coderoad');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
-    alert: alert_1.reducer, checks: setup_1.checks, editor: editor_1.reducer, dir: editor_1.dir, hintPosition: hints_1.reducer,
-    packageJson: setup_1.packageJson, pagePosition: page_1.pagePosition, progress: progress_1.reducer, route: route_1.reducer,
+    alert: core_coderoad_1.alertReducer, checks: setup_1.checks, editor: core_coderoad_1.editorReducer, dir: core_coderoad_1.dirReducer, hintPosition: hints_1.reducer,
+    packageJson: setup_1.packageJson, pagePosition: page_1.pagePosition, progress: progress_1.reducer, route: core_coderoad_1.routeReducer,
     tutorial: tutorial_1.reducer, tutorials: tutorials_1.reducer,
-    taskActions: page_1.taskActions, taskPosition: tests_1.taskPosition, taskTests: page_1.taskTests, testRun: tests_1.testRun, windowToggle: window_1.reducer
+    taskActions: page_1.taskActions, taskPosition: tests_1.taskPosition, taskTests: page_1.taskTests, testRun: tests_1.testRun, windowToggle: core_coderoad_1.windowToggle
 });
diff --git a/lib/store.js b/lib/store.js
@@ -1,17 +1,5 @@
 "use strict";
-var redux_1 = require('redux');
 var reducers_1 = require('./reducers');
-var createLogger = require('redux-logger');
-var redux_throttle_actions_1 = require('redux-throttle-actions');
-var redux_thunk_1 = require('redux-thunk');
-var middlewares = [redux_thunk_1.default];
-var throttleTestRun = redux_throttle_actions_1.default(['TEST_RUN'], 800);
-middlewares.push(throttleTestRun);
-var devMode = false;
-if (devMode) {
-    var logger = createLogger();
-    middlewares.push(logger);
-}
-var store = redux_1.createStore(reducers_1.default, redux_1.applyMiddleware.apply(void 0, middlewares));
+var core_coderoad_1 = require('core-coderoad');
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = store;
+exports.default = core_coderoad_1.configureStore(reducers_1.default, true, { TEST_RUN: 800 });
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "atom-plugin-command-line": "1.0.2",
     "coderoad-cli": "0.6.0",
-    "core-coderoad": "0.2.0",
+    "core-coderoad": "0.3.0",
     "highlights": "1.3.1",
     "marked": "0.3.5",
     "material-ui": "0.15.0",
diff --git a/src/actions.ts b/src/actions.ts
@@ -6,8 +6,10 @@ export {setupVerify, setupPackage} from './modules/setup/actions';
 export {tutorialSet} from './modules/tutorial';
 export {tutorialsFind, tutorialUpdate} from './modules/tutorials';
 
-export {alertOpen, alertClose, alertReplay} from 'core-coderoad/lib/alert';
-export {editorDevToolsToggle, editorOpen, editorInsert,
-editorSave, editorSet} from 'core-coderoad/lib/editor';
-export {routeSet} from 'core-coderoad/lib/route';
-export {windowToggle} from 'core-coderoad/lib/window';
+export {
+  alertOpen, alertClose, alertReplay,
+  editorDevToolsToggle, editorOpen, editorInsert,
+  editorSave, editorSet,
+  routeSet,
+  windowToggle
+} from 'core-coderoad';
diff --git a/src/components/AppMenu/Quit/index.tsx b/src/components/AppMenu/Quit/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {quit} from 'core-coderoad/lib/editor';
+import {quit} from 'core-coderoad';
 import {onDeactivate} from '../../../subscriptions';
 import MenuItem from 'material-ui/MenuItem';
 
diff --git a/src/components/Page/Hints/HintButton.tsx b/src/components/Page/Hints/HintButton.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import {connect} from 'react-redux';
 import FlatButton from 'material-ui/FlatButton';
 import {hintPositionSet} from '../../../actions';
-import {hintsSelector} from 'core-coderoad/lib/selectors';
+import {hintsSelector} from 'core-coderoad';
 
 @connect(state => ({
   hintPosition: state.hintPosition,
diff --git a/src/components/Page/Hints/index.tsx b/src/components/Page/Hints/index.tsx
@@ -4,7 +4,7 @@ import {Card, CardActions, CardHeader, CardText} from 'material-ui/Card';
 import {Markdown} from '../../index';
 import HintButton from './HintButton';
 import Help from 'material-ui/svg-icons/action/help';
-import {hintSelector} from 'core-coderoad/lib/selectors';
+import {hintSelector} from 'core-coderoad';
 
 const styles = {
   position: 'relative',
diff --git a/src/components/Page/PageToolbar/index.tsx b/src/components/Page/PageToolbar/index.tsx
@@ -4,7 +4,7 @@ import {Toolbar, ToolbarGroup} from 'material-ui/Toolbar';
 import Save from './Save';
 import Continue from './Continue';
 import ToggleDevTools from './ToggleDevTools';
-import {taskProgressSelector} from 'core-coderoad/lib/selectors';
+import {taskProgressSelector} from 'core-coderoad';
 
 const styles = {
     zIndex: '5',
diff --git a/src/components/Page/ProgressBar/index.tsx b/src/components/Page/ProgressBar/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import LinearProgress from 'material-ui/LinearProgress';
-import {taskProgressSelector} from 'core-coderoad/lib/selectors';
+import {taskProgressSelector} from 'core-coderoad';
 
 const style = {
   height: '10px',
diff --git a/src/components/Page/Task/index.tsx b/src/components/Page/Task/index.tsx
@@ -4,7 +4,7 @@ import {Markdown} from '../../index';
 import TaskCheckbox from './taskCheckbox';
 import {ListItem} from 'material-ui/List';
 import {lightGreen200, orange200} from 'material-ui/styles/colors';
-import {taskByIndexSelector} from 'core-coderoad/lib/selectors';
+import {taskByIndexSelector} from 'core-coderoad';
 
 const styles = {
   task: {
diff --git a/src/components/Page/Tasks/index.tsx b/src/components/Page/Tasks/index.tsx
@@ -6,7 +6,7 @@ import {Card} from 'material-ui/Card';
 import Subheader from 'material-ui/Subheader';
 import Task from '../Task';
 import {lightGreen200} from 'material-ui/styles/colors';
-import {pageCompletedSelector, visibleTasksSelector} from 'core-coderoad/lib/selectors';
+import {pageCompletedSelector, visibleTasksSelector} from 'core-coderoad';
 
 const margin = '10px 5px';
 
diff --git a/src/components/Page/TasksComplete/index.tsx b/src/components/Page/TasksComplete/index.tsx
@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import {Card, CardText} from 'material-ui/Card';
 import {Markdown} from '../../index';
 import {cyan500, grey100} from 'material-ui/styles/colors';
-import {pageSelector} from 'core-coderoad/lib/selectors';
+import {pageSelector} from 'core-coderoad';
 
 const styles = {
   card: {
diff --git a/src/components/Page/index.tsx b/src/components/Page/index.tsx
@@ -8,7 +8,7 @@ import Hints from './Hints';
 import PageToolbar from './PageToolbar';
 import ProgressBar from './ProgressBar';
 import TasksComplete from './TasksComplete';
-import {pageSelector, taskProgressSelector} from 'core-coderoad/lib/selectors';
+import {pageSelector, taskProgressSelector} from 'core-coderoad';
 
 const styles = {
   page: {
diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import render from './components/render';
 import sidePanelElement from './components/SidePanel/element';
-import loadPolyfills from 'core-coderoad/lib/polyfills';
+import {loadPolyfills} from 'core-coderoad';
 import {onActivate, onDeactivate, addToStatusBar} from './subscriptions';
 // activate Redux
 import store from './store';
diff --git a/src/modules/setup/utils/action-setup.ts b/src/modules/setup/utils/action-setup.ts
@@ -1,5 +1,5 @@
 import {join} from 'path';
-import {open, set, openFolder, openTerminal} from 'core-coderoad/lib/editor';
+import {open, set, openFolder, openTerminal} from 'core-coderoad';
 import {setupVerify} from '../actions';
 
 const packageData = `{
diff --git a/src/modules/tests/test-run/parse-loaders.ts b/src/modules/tests/test-run/parse-loaders.ts
@@ -1,7 +1,7 @@
 import {normalize, join} from 'path';
 import {readFileSync} from 'fs';
 
-// TODO: load comments from core-coderoad/lib/options
+// TODO: load comments from core-coderoad
 
 const comments = {
   py: '#',
diff --git a/src/modules/tutorial/actions.ts b/src/modules/tutorial/actions.ts
diff --git a/src/modules/tutorials/actions.ts b/src/modules/tutorials/actions.ts
diff --git a/src/reducers.ts b/src/reducers.ts
diff --git a/src/store.ts b/src/store.ts
