update to ts 2.0

Author: ShMcK

lib/actions.js

@@ -23,3 +23,12 @@ exports.tutorialSet = tutorial_1.tutorialSet;
 var tutorials_1 = require('./modules/tutorials');
 exports.tutorialsFind = tutorials_1.tutorialsFind;
 exports.tutorialUpdate = tutorials_1.tutorialUpdate;
+var core_coderoad_1 = require('core-coderoad');
+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;
+exports.quit = core_coderoad_1.quit;

lib/components/index.js

@@ -1,4 +1,6 @@
 "use strict";
+var core_coderoad_1 = require('core-coderoad');
+exports.Markdown = core_coderoad_1.Markdown;
 var Alert_1 = require('./Alert');
 exports.Alert = Alert_1.default;
 var AppMenu_1 = require('./AppMenu');

lib/index.js

@@ -1,19 +1,19 @@
 "use strict";
 var ReactDOM = require('react-dom');
 var SidePanel_1 = require('./components/SidePanel');
-var core_coderoad_1 = require('core-coderoad');
-var subscriptions_1 = require('./subscriptions');
 var StatusBar_1 = require('./components/StatusBar');
-var store_1 = require('./store');
 var setup_1 = require('./modules/setup');
+var store_1 = require('./store');
+var subscriptions_1 = require('./subscriptions');
+var core_coderoad_1 = require('core-coderoad');
 var injectTapEventPlugin = require('react-tap-event-plugin');
 var Main = (function () {
     function Main() {
         injectTapEventPlugin();
         core_coderoad_1.loadPolyfills();
         store_1.default.dispatch(setup_1.setupVerify());
         this.side = SidePanel_1.sideElement.init();
-        this.subscriptions = new subscriptions_1.default;
+        this.subscriptions = new subscriptions_1.default();
     }
     Main.prototype.activate = function () {
         atom.workspace.addRightPanel({
@@ -23,9 +23,6 @@ var Main = (function () {
         this.subscriptions.onActivate(store_1.default);
         ReactDOM.render(SidePanel_1.SideRoot(store_1.default), this.side);
     };
-    Main.prototype.consumeStatusBar = function (statusBar) {
-        this.statusBarTile = StatusBar_1.default(store_1.default, statusBar);
-    };
     Main.prototype.deactivate = function () {
         if (this.statusBarTile) {
             this.statusBarTile.destroy();
@@ -34,6 +31,9 @@ var Main = (function () {
         this.subscriptions.onDeactivate(store_1.default);
         SidePanel_1.sideElement.unmount();
     };
+    Main.prototype.consumeStatusBar = function (statusBar) {
+        this.statusBarTile = StatusBar_1.default(store_1.default, statusBar);
+    };
     return Main;
 }());
 ;

lib/subscriptions.js

@@ -1,9 +1,9 @@
 "use strict";
-var atom_1 = require('atom');
 var actions_1 = require('./actions');
+var atom_1 = require('atom');
 var Subscriptions = (function () {
     function Subscriptions() {
-        this.subscriptions = new atom_1.CompositeDisposable;
+        this.subscriptions = new atom_1.CompositeDisposable();
     }
     Subscriptions.prototype.onActivate = function (store) {
         var _this = this;

src/actions.ts

@@ -7,9 +7,4 @@ export {setupVerify, setupPackage} from './modules/setup/actions';
 export {tutorialSet} from './modules/tutorial';
 export {tutorialsFind, tutorialUpdate} from './modules/tutorials';
 
-export {
-  editorDevToolsToggle, editorOpen, editorInsert,
-  editorSave, editorSet,
-  routeSet,
-  windowToggle, quit
-} from 'core-coderoad';
+export {editorDevToolsToggle, editorOpen, editorInsert, editorSave, editorSet, routeSet, windowToggle, quit} from 'core-coderoad';

src/index.ts

@@ -1,27 +1,27 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import {sideElement, SideRoot} from './components/SidePanel';
-import {loadPolyfills, render} from 'core-coderoad';
-import Subscriptions from './subscriptions';
+
+import {SideRoot, sideElement} from './components/SidePanel';
 import addToStatusBar from './components/StatusBar';
-// activate Redux
-import store from './store';
 import {setupVerify} from './modules/setup';
+import store from './store';
+import Subscriptions from './subscriptions';
+import {loadPolyfills, render} from 'core-coderoad';
 import * as injectTapEventPlugin from 'react-tap-event-plugin';
 
 class Main {
-  side: HTMLElement;
-  statusBarTile: StatusBar.IStatusBarView;
-  subscriptions: any;
+  private side: HTMLElement;
+  private statusBarTile: StatusBar.IStatusBarView;
+  private subscriptions: any;
   constructor() {
     injectTapEventPlugin(); // remove later
     loadPolyfills();
     // run startup checks
     store.dispatch(setupVerify());
     this.side = sideElement.init();
-    this.subscriptions = new Subscriptions;
+    this.subscriptions = new Subscriptions();
   }
-  activate(): void {
+  public activate(): void {
     // create atom panel
     atom.workspace.addRightPanel({
       item: this.side,
@@ -32,10 +32,7 @@ class Main {
     // render React component
     ReactDOM.render(SideRoot(store), this.side);
   }
-  consumeStatusBar(statusBar) {
-    this.statusBarTile = addToStatusBar(store, statusBar);
-  }
-  deactivate(): void {
+  public deactivate(): void {
     // remove bottom status bar icon
     if (this.statusBarTile) {
       this.statusBarTile.destroy();
@@ -46,5 +43,8 @@ class Main {
     // unmount React
     sideElement.unmount();
   }
+  private consumeStatusBar(statusBar) {
+    this.statusBarTile = addToStatusBar(store, statusBar);
+  }
 };
 export = new Main();

src/reducers.ts

@@ -5,14 +5,13 @@ import {reducer as hintPosition} from './modules/hints';
 import {pagePosition, taskActions, taskTests} from './modules/page';
 import {reducer as progress} from './modules/progress';
 import {checks, packageJson} from './modules/setup';
-import {testRun, taskPosition} from './modules/tests';
+import {taskPosition, testRun} from './modules/tests';
 import {reducer as tutorial} from './modules/tutorial';
 import {reducer as tutorials} from './modules/tutorials';
-
 import {
   alertReducer as alert,
-  editorReducer as editor,
   dirReducer as dir,
+  editorReducer as editor,
   routeReducer as route,
   windowReducer as window
 } from 'core-coderoad';

src/subscriptions.ts

@@ -1,11 +1,11 @@
-import {CompositeDisposable} from 'atom';
+import {alertReplay, testRun, windowToggle} from './actions';
 import store from './store';
-import {testRun, alertReplay, windowToggle} from './actions';
+import {CompositeDisposable} from 'atom';
 
 export default class Subscriptions {
-  public subscriptions = new CompositeDisposable;
+  private subscriptions = new CompositeDisposable();
 
-  onActivate(store: Redux.Store): AtomCore.Disposable {
+  public onActivate(store: Redux.Store): AtomCore.Disposable {
     this.subscriptions.add(
       atom.commands.add('atom-workspace', {
         'cr-viewer:toggle': () => store.dispatch(windowToggle())
@@ -19,7 +19,7 @@ export default class Subscriptions {
     return this.subscriptions;
   }
 
-  onDeactivate(store: Redux.Store): void {
+  public onDeactivate(store: Redux.Store): void {
     // unsubscribe from Redux store
     store.subscribe(() => null);
     // cleanup subscriptions

src/typings.d.ts

@@ -1 +1,3 @@
-/// <reference path="../node_modules/core-coderoad/src/typings/tsd.d.ts" />
+/// <reference path="../node_modules/core-coderoad/src/typings/index.d.ts" />
+
+declare module 'core-coderoad' {}

tsconfig.json

@@ -16,7 +16,8 @@
   "rootDir": "src"
  },
  "filesGlob": [
-  "typings/**/*.d.ts",
+  "typings.d.ts",
+  "*.ts",
   "**/*.tsx?",
   "!**/*.spec.tsx?"
  ],