Updated to latest React infrastructure

anvaka · anvaka · commit 79a1407872e5 · 2016-01-02T16:33:30.000-08:00
diff --git a/package.json b/package.json
@@ -43,18 +43,20 @@
     "css-loader": "^0.12.0",
     "extract-text-webpack-plugin": "^0.8.0",
     "file-loader": "^0.8.1",
+    "history": "^1.17.0",
     "keymirror": "^0.1.1",
     "less": "^2.5.0",
     "less-loader": "^2.2.0",
-    "maco": "^1.0.2",
+    "maco": "^2.0.3",
     "ngraph.events": "0.0.3",
     "node-libs-browser": "^0.5.0",
     "qs": "^4.0.0",
     "rafor": "^1.0.2",
-    "react": "^0.13.3",
-    "react-bootstrap": "^0.23.4",
-    "react-list": "^0.6.0",
-    "react-router": "^0.13.3",
+    "react": "^0.14.5",
+    "react-bootstrap": "^0.28.1",
+    "react-dom": "^0.14.5",
+    "react-list": "^0.7.10",
+    "react-router": "^1.0.3",
     "style-loader": "^0.12.2",
     "three.orientation": "^1.1.0",
     "unrender": "git+https://github.com/anvaka/unrender.git",
diff --git a/src/galaxy/about.jsx b/src/galaxy/about.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-export default require('maco').template(about);
+export default require('maco').template(about, React);
 
 function about() {
   return (
diff --git a/src/galaxy/galaxyPage.jsx b/src/galaxy/galaxyPage.jsx
@@ -3,7 +3,7 @@ import LoadingIndicator from './loadingIndicator.jsx';
 import Scene from './scene.jsx';
 import appEvents from './service/appEvents.js';
 
-module.exports = require('maco')(galaxyPage);
+module.exports = require('maco')(galaxyPage, React);
 
 function galaxyPage(x) {
   var currentPath;
@@ -19,7 +19,7 @@ function galaxyPage(x) {
         <Scene />
       </div>
     );
-  }
+  };
 
   function loadGraphIfRouteChanged() {
     var routeChanged = x.props.params.name !== currentPath;
diff --git a/src/galaxy/help.jsx b/src/galaxy/help.jsx
@@ -10,7 +10,7 @@ import React from 'react';
 import appEvents from './service/appEvents.js';
 import Key from './utils/key.js';
 
-export default require('maco')(help);
+export default require('maco')(help, React);
 
 var helpWasShown = false;
 
diff --git a/src/galaxy/hoverInfo.jsx b/src/galaxy/hoverInfo.jsx
@@ -2,7 +2,7 @@ import scene from './store/scene.js';
 import React from 'react';
 import hoverModel from './store/hover.js';
 
-module.exports = require('maco')(hoverInfo);
+module.exports = require('maco')(hoverInfo, React);
 
 function hoverInfo(x) {
   var hoverTemplate = null;
@@ -13,11 +13,11 @@ function hoverInfo(x) {
 
   x.componentDidMount = function() {
     hoverModel.on('changed', updateView);
-  }
+  };
 
   x.componentWillUnmount = function () {
     hoverModel.off('changed', updateView);
-  }
+  };
 
   function updateView(viewTemplate) {
     hoverTemplate = viewTemplate;
diff --git a/src/galaxy/loadingIndicator.jsx b/src/galaxy/loadingIndicator.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import scene from './store/scene.js';
 
-module.exports = require('maco')(loadingIndicator);
+module.exports = require('maco')(loadingIndicator, React);
 
 function loadingIndicator(x) {
   var loadingMessage = '';
@@ -10,15 +10,15 @@ function loadingIndicator(x) {
     return scene.isLoading() ?
         <div className='label loading'>{loadingMessage}</div> :
         null;
-  }
+  };
 
   x.componentDidMount = function() {
     scene.on('loadProgress', updateLoadingIndicator);
-  }
+  };
 
   x.componentWillUnmount = function () {
     scene.off('loadProgress', updateLoadingIndicator);
-  }
+  };
 
   function updateLoadingIndicator(progress) {
     loadingMessage = `${progress.message} - ${progress.completed}`;
diff --git a/src/galaxy/noWebgl.jsx b/src/galaxy/noWebgl.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-export default require('maco').template(noWebGL);
+export default require('maco').template(noWebGL, React);
 
 function noWebGL() {
   return (
diff --git a/src/galaxy/nodeDetails/nodeDetailsView.jsx b/src/galaxy/nodeDetails/nodeDetailsView.jsx
@@ -1,10 +1,9 @@
-import detailModel from './nodeDetailsStore.js';
-
 import React from 'react';
+import detailModel from './nodeDetailsStore.js';
 import specialNodeDetails from './templates/all.js';
 import scene from '../store/scene.js';
 
-module.exports = require('maco')(detailedNodeView);
+module.exports = require('maco')(detailedNodeView, React);
 
 function detailedNodeView(x) {
   x.render = function () {
@@ -17,15 +16,15 @@ function detailedNodeView(x) {
         <NodeDetails model={selectedNode} />
       </div>
     );
-  }
+  };
 
   x.componentDidMount = function() {
     detailModel.on('changed', updateView);
-  }
+  };
 
   x.componentWillUnmount = function () {
     detailModel.off('changed', updateView);
-  }
+  };
 
   function getNodeDetails(viewModel) {
     var Template = specialNodeDetails[scene.getGraphName()] || specialNodeDetails.default;
diff --git a/src/galaxy/nodeDetails/templates/bower.jsx b/src/galaxy/nodeDetails/templates/bower.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(bower);
+export default require('maco').template(bower, React);
 
 function bower(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/brew.jsx b/src/galaxy/nodeDetails/templates/brew.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(brew);
+export default require('maco').template(brew, React);
 
 function brew(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/composer.jsx b/src/galaxy/nodeDetails/templates/composer.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(composer);
+export default require('maco').template(composer, React);
 
 function composer(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/cran.jsx b/src/galaxy/nodeDetails/templates/cran.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(cran);
+export default require('maco').template(cran, React);
 
 function cran(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/debian.jsx b/src/galaxy/nodeDetails/templates/debian.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(debian);
+export default require('maco').template(debian, React);
 
 function debian(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/default.jsx b/src/galaxy/nodeDetails/templates/default.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-export default require('maco').template(template);
+export default require('maco').template(template, React);
 
 function template(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/fedora.jsx b/src/galaxy/nodeDetails/templates/fedora.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(fedora);
+export default require('maco').template(fedora, React);
 
 function fedora(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/github.jsx b/src/galaxy/nodeDetails/templates/github.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(github);
+export default require('maco').template(github, React);
 
 function github(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/gosearch.jsx b/src/galaxy/nodeDetails/templates/gosearch.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(goSearch);
+export default require('maco').template(goSearch, React);
 
 function goSearch(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/npm.jsx b/src/galaxy/nodeDetails/templates/npm.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(npmTempalte);
+export default require('maco').template(npmTempalte, React);
 
 function npmTempalte(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/nuget.jsx b/src/galaxy/nodeDetails/templates/nuget.jsx
@@ -1,7 +1,7 @@
-
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(nuget);
+export default require('maco').template(nuget, React);
 
 function nuget(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/python.jsx b/src/galaxy/nodeDetails/templates/python.jsx
@@ -1,7 +1,7 @@
-
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(python);
+export default require('maco').template(python, React);
 
 function python(props) {
   var model = props.model;
diff --git a/src/galaxy/nodeDetails/templates/rubygems.jsx b/src/galaxy/nodeDetails/templates/rubygems.jsx
@@ -1,6 +1,7 @@
+import React from 'react';
 import commonPackageTemplate from './commonPackageTempalte.jsx';
 
-export default require('maco').template(ruby);
+export default require('maco').template(ruby, React);
 
 function ruby(props) {
   var model = props.model;
diff --git a/src/galaxy/scene.jsx b/src/galaxy/scene.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import {findDOMNode} from 'react-dom';
 import HoverInfo from './hoverInfo.jsx';
 import NodeDetails from './nodeDetails/nodeDetailsView.jsx';
 
@@ -14,7 +15,7 @@ import createKeyboardBindings from './native/sceneKeyboardBinding.js';
 
 import appEvents from './service/appEvents.js';
 var webglEnabled = require('webgl-enabled')();
-module.exports = require('maco')(scene);
+module.exports = require('maco')(scene, React);
 
 function scene(x) {
   var nativeRenderer, keyboard;
@@ -41,7 +42,7 @@ function scene(x) {
 
   x.componentDidMount = function() {
     if (!webglEnabled) return;
-    var container = React.findDOMNode(x.refs.graphContainer);
+    var container = findDOMNode(x.refs.graphContainer);
     nativeRenderer = createNativeRenderer(container);
     keyboard = createKeyboardBindings(container);
     delegateClickHandler = container.parentNode;
@@ -55,23 +56,23 @@ function scene(x) {
   };
 
   function handleDelegateClick(e) {
-      var clickedEl = e.target;
+    var clickedEl = e.target;
 
-      // since we are handling all clicks, we should avoid excessive work and
-      // talk with DOM only when absolutely necessary:
-      var classList = clickedEl.classList;
-      var isInDegree = classList.contains('in-degree');
-      var isOutDegree = !isInDegree && classList.contains('out-degree');
-      var nodeId;
-      if (isInDegree || isOutDegree) {
-        nodeId = parseInt(clickedEl.id, 10);
-        var connectionType = isInDegree ? 'in' : 'out';
+    // since we are handling all clicks, we should avoid excessive work and
+    // talk with DOM only when absolutely necessary:
+    var classList = clickedEl.classList;
+    var isInDegree = classList.contains('in-degree');
+    var isOutDegree = !isInDegree && classList.contains('out-degree');
+    var nodeId;
+    if (isInDegree || isOutDegree) {
+      nodeId = parseInt(clickedEl.id, 10);
+      var connectionType = isInDegree ? 'in' : 'out';
 
-        appEvents.showDegree.fire(nodeId, connectionType);
-      }
-      if (classList.contains('node-focus')) {
-        nodeId = parseInt(clickedEl.id, 10);
-        appEvents.focusOnNode.fire(nodeId);
-      }
+      appEvents.showDegree.fire(nodeId, connectionType);
     }
+    if (classList.contains('node-focus')) {
+      nodeId = parseInt(clickedEl.id, 10);
+      appEvents.focusOnNode.fire(nodeId);
+    }
+  }
 }
diff --git a/src/galaxy/search/searchBoxView.jsx b/src/galaxy/search/searchBoxView.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import searchBoxModel from './searchBoxModel.js';
 
-module.exports = require('maco')(searchBar);
+module.exports = require('maco')(searchBar, React);
 
 function searchBar(x) {
   x.render = function () {
@@ -24,7 +24,7 @@ function searchBar(x) {
         </div>
       </div>
     );
-  }
+  };
 
   function runSearch(e) {
     searchBoxModel.search(e.target.value);
diff --git a/src/galaxy/steeringIndicator.jsx b/src/galaxy/steeringIndicator.jsx
@@ -5,7 +5,7 @@
 import appEvents from './service/appEvents.js';
 import React from 'react';
 
-module.exports = require('maco')(steeringIndicator);
+module.exports = require('maco')(steeringIndicator, React);
 
 function steeringIndicator(x) {
   var showSteeringMode = false;
@@ -20,7 +20,7 @@ function steeringIndicator(x) {
         <div className="steering-help">Press SPACE to deactivate steering mode</div>
       </div>
     );
-  }
+  };
 
   function updateSteering(isVisible) {
     showSteeringMode = isVisible;
diff --git a/src/galaxy/windows/nodeInfoRow.jsx b/src/galaxy/windows/nodeInfoRow.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import formatNumber from '../utils/formatNumber.js';
 
-module.exports = require('maco').template(windowTitle);
+module.exports = require('maco').template(windowTitle, React);
 
 function windowTitle(props) {
   var item = props.viewModel;
diff --git a/src/galaxy/windows/nodeListView.jsx b/src/galaxy/windows/nodeListView.jsx
diff --git a/src/galaxy/windows/windowCollectionView.jsx b/src/galaxy/windows/windowCollectionView.jsx
diff --git a/src/galaxy/windows/windowTitle.jsx b/src/galaxy/windows/windowTitle.jsx
diff --git a/src/main.jsx b/src/main.jsx
