move actions/store out of subscriptions

Author: ShMcK

lib/editor/subscriptions.js

@@ -1,19 +1,17 @@
-import {alertReplay, testRun, windowToggle} from '../actions';
-import store from '../store';
 import {CompositeDisposable} from 'atom';
 
 export default class Subscriptions {
   private subscriptions = new CompositeDisposable();
 
-  public onActivate(store: Redux.Store<any>): AtomCore.Disposable {
+  public onActivate(store: Redux.Store<any>, actions): AtomCore.Disposable {
     this.subscriptions.add(
       atom.commands.add('atom-workspace', {
-        'cr-viewer:toggle': () => store.dispatch(windowToggle())
+        'cr-viewer:toggle': () => store.dispatch(actions.windowToggle())
       })
     );
     // run tests on save
     atom.workspace.observeTextEditors((editor: AtomCore.IEditor) => {
-      this.subscriptions.add(editor.onDidSave(() => store.dispatch(testRun())));
+      this.subscriptions.add(editor.onDidSave(() => store.dispatch(actions.testRun())));
     });
     // return all subscriptions
     return this.subscriptions;

lib/editor/subscriptions.js.map

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
-import {addRightPanel} from './editor/ui';
-
+import * as actions from './actions';
 import {SideRoot, sideElement} from './components/SidePanel';
 import addToStatusBar from './components/StatusBar';
 import Subscriptions from './editor/subscriptions';
+import {addRightPanel} from './editor/ui';
 import {setupVerify} from './modules/setup';
 import store from './store';
 import loadPolyfills from './utils/polyfills';
@@ -30,7 +30,7 @@ class Main {
     // create editor panel
     addRightPanel(this.side);
     // activate subscriptions
-    this.subscriptions.onActivate(store);
+    this.subscriptions.onActivate(store, actions);
     // render React component
     ReactDOM.render(SideRoot(store), this.side);
   }

lib/index.js

@@ -12,7 +12,10 @@
     "moduleResolution": "node",
     "strictNullChecks": true,
     "outDir": "./lib",
-    "rootDirs": ["src", "node_modules"]
+    "rootDirs": [
+      "src",
+      "node_modules"
+    ]
   },
   "filesGlob": [
     "**/*.d.ts",
@@ -28,58 +31,6 @@
     "node_modules"
   ],
   "files": [
-    "node_modules/ajv/lib/ajv.d.ts",
-    "node_modules/bowser/typings.d.ts",
-    "node_modules/immutable/contrib/cursor/index.d.ts",
-    "node_modules/immutable/dist/immutable-nonambient.d.ts",
-    "node_modules/immutable/dist/immutable.d.ts",
-    "node_modules/keycode/keycode.d.ts",
-    "node_modules/redux/index.d.ts",
-    "node_modules/redux/node_modules/symbol-observable/index.d.ts",
-    "node_modules/reselect/lib/reselect.d.ts",
-    "node_modules/reselect/src/reselect.d.ts",
-    "node_modules/rx/ts/core/es6-iterable.d.ts",
-    "node_modules/rx/ts/core/es6-promise.d.ts",
-    "node_modules/rx/ts/es6-promise.es6.d.ts",
-    "node_modules/rx/ts/iterable.es6.d.ts",
-    "node_modules/rx/ts/rx.aggregates.d.ts",
-    "node_modules/rx/ts/rx.aggregates.es6.d.ts",
-    "node_modules/rx/ts/rx.all.d.ts",
-    "node_modules/rx/ts/rx.all.es6.d.ts",
-    "node_modules/rx/ts/rx.async.d.ts",
-    "node_modules/rx/ts/rx.async.es6.d.ts",
-    "node_modules/rx/ts/rx.backpressure.d.ts",
-    "node_modules/rx/ts/rx.backpressure.es6.d.ts",
-    "node_modules/rx/ts/rx.binding.d.ts",
-    "node_modules/rx/ts/rx.binding.es6.d.ts",
-    "node_modules/rx/ts/rx.coincidence.d.ts",
-    "node_modules/rx/ts/rx.coincidence.es6.d.ts",
-    "node_modules/rx/ts/rx.core.binding.d.ts",
-    "node_modules/rx/ts/rx.core.binding.es6.d.ts",
-    "node_modules/rx/ts/rx.core.d.ts",
-    "node_modules/rx/ts/rx.core.es6.d.ts",
-    "node_modules/rx/ts/rx.core.testing.d.ts",
-    "node_modules/rx/ts/rx.core.testing.es6.d.ts",
-    "node_modules/rx/ts/rx.d.ts",
-    "node_modules/rx/ts/rx.es6.d.ts",
-    "node_modules/rx/ts/rx.experimental.d.ts",
-    "node_modules/rx/ts/rx.experimental.es6.d.ts",
-    "node_modules/rx/ts/rx.joinpatterns.d.ts",
-    "node_modules/rx/ts/rx.joinpatterns.es6.d.ts",
-    "node_modules/rx/ts/rx.lite.d.ts",
-    "node_modules/rx/ts/rx.lite.es6.d.ts",
-    "node_modules/rx/ts/rx.lite.extras.d.ts",
-    "node_modules/rx/ts/rx.lite.extras.es6.d.ts",
-    "node_modules/rx/ts/rx.sorting.d.ts",
-    "node_modules/rx/ts/rx.sorting.es6.d.ts",
-    "node_modules/rx/ts/rx.testing.d.ts",
-    "node_modules/rx/ts/rx.testing.es6.d.ts",
-    "node_modules/rx/ts/rx.time.d.ts",
-    "node_modules/rx/ts/rx.time.es6.d.ts",
-    "node_modules/rx/ts/rx.virtualtime.d.ts",
-    "node_modules/rx/ts/rx.virtualtime.es6.d.ts",
-    "node_modules/symbol-observable/index.d.ts",
-    "node_modules/testcheck/dist/testcheck.d.ts",
     "src/typings/cli/index.d.ts",
     "src/typings/coderoad/index.d.ts",
     "src/typings/common/action.d.ts",
@@ -117,6 +68,7 @@
     "src/typings/globals/redux-thunk/index.d.ts",
     "src/typings/globals/redux/index.d.ts",
     "src/typings/globals/reselect/index.d.ts",
+    "src/typings/globals/rx/index.d.ts",
     "src/typings/globals/sort-package-json/index.d.ts",
     "src/typings/globals/space-pen/index.d.ts",
     "src/typings/globals/status-bar/index.d.ts",
@@ -133,11 +85,24 @@
     "src/components/SidePanel/sideElement.ts",
     "src/components/StatusBar/index.ts",
     "src/components/styles/theme.ts",
+    "src/editor/actions/console.ts",
+    "src/editor/actions/editor.ts",
+    "src/editor/actions/file.ts",
+    "src/editor/actions/quit.ts",
+    "src/editor/actions/tabs.ts",
+    "src/editor/actions/terminal.ts",
+    "src/editor/actions/write.ts",
+    "src/editor/actions/writeFile.ts",
+    "src/editor/directory.ts",
+    "src/editor/grammar.ts",
+    "src/editor/subscriptions.ts",
+    "src/editor/ui.ts",
     "src/index.ts",
     "src/modules/alert/actions.ts",
     "src/modules/alert/index.ts",
     "src/modules/alert/types.ts",
     "src/modules/dir/index.ts",
+    "src/modules/editor/actions.ts",
     "src/modules/editor/index.ts",
     "src/modules/editor/reducer.ts",
     "src/modules/editor/types.ts",
@@ -256,6 +221,7 @@
     "src/components/Tutorials/index.tsx",
     "src/components/Tutorials/LoadTutorials/index.tsx",
     "src/components/Tutorials/SelectTutorial/index.tsx",
-    "src/components/Tutorials/UpdateTutorial/index.tsx"
+    "src/components/Tutorials/UpdateTutorial/index.tsx",
+    "src/editor/setup.tsx"
   ]
 }