ff-stream-web

commit 0e6a5203e6fa556db2e4769db839701ae82de7d6
parent d1f5e9125fb3831c35cce01309caa62a6b02cd72
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Mon,  3 Aug 2015 12:17:55 +0300

Merge branch 'nobesnickr-master'

Diffstat:
M
package.json
 | 
19
++++++++++---------
M
src/constants/ActionTypes.js
 | 
2
+-
M
src/core/Location.js
 | 
2
+-
M
src/core/http.js
 | 
2
+-
M
src/decorators/withContext.js
 | 
2
+-
M
src/decorators/withStyles.js
 | 
4
++--
M
src/decorators/withViewport.js
 | 
2
+-
M
src/utils/Link.js
 | 
2
+-

8 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/package.json b/package.json
@@ -5,40 +5,40 @@
     "npm": ">= 2.1"
   },
   "dependencies": {
-    "babel": "5.8.19",
+    "babel": "5.8.20",
     "classnames": "2.1.3",
     "eventemitter3": "1.1.1",
-    "express": "4.13.1",
+    "express": "4.13.3",
     "fastclick": "1.0.6",
     "flux": "2.0.3",
     "front-matter": "1.0.0",
     "jade": "1.11.0",
     "lodash": "3.10.0",
     "normalize.css": "3.0.3",
-    "react": "^0.14.0-beta1",
-    "react-dom": "^0.14.0-beta1",
+    "react": "^0.14.0-beta2",
+    "react-dom": "^0.14.0-beta2",
     "react-routing": "0.0.4",
     "source-map-support": "0.3.2",
     "superagent": "1.2.0"
   },
   "devDependencies": {
     "autoprefixer-core": "^5.2.1",
-    "babel-core": "^5.8.19",
+    "babel-core": "^5.8.20",
     "babel-eslint": "^4.0.5",
     "babel-loader": "^5.3.2",
-    "browser-sync": "^2.8.1",
+    "browser-sync": "^2.8.2",
     "css-loader": "^0.15.6",
     "csscomb": "^3.1.8",
     "cssnext": "^1.8.2",
     "del": "^1.2.0",
-    "eslint": "^0.24.1",
+    "eslint": "^1.0.0",
     "eslint-loader": "^0.14.2",
     "eslint-plugin-react": "^3.1.0",
     "git-push": "^0.1.1",
     "gulp": "^3.9.0",
     "gulp-changed": "^1.2.1",
     "gulp-if": "^1.2.5",
-    "gulp-load-plugins": "^1.0.0-rc",
+    "gulp-load-plugins": "^1.0.0-rc.1",
     "gulp-rename": "^1.2.2",
     "gulp-size": "^1.2.3",
     "gulp-util": "^3.0.6",
@@ -52,7 +52,8 @@
     "run-sequence": "^1.1.2",
     "style-loader": "^0.12.3",
     "url-loader": "^0.5.6",
-    "webpack": "^1.10.5"
+    "webpack": "^1.10.5",
+    "fbjs": "^0.1.0-alpha.4"
   },
   "jest": {
     "rootDir": "./src",
diff --git a/src/constants/ActionTypes.js b/src/constants/ActionTypes.js
@@ -1,6 +1,6 @@
 /*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
 
-import keyMirror from 'react/lib/keyMirror';
+import keyMirror from 'fbjs/lib/keyMirror';
 
 export default keyMirror({
   CHANGE_LOCATION: null
diff --git a/src/core/Location.js b/src/core/Location.js
@@ -1,6 +1,6 @@
 /*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
 
-import { canUseDOM } from 'react/lib/ExecutionEnvironment';
+import { canUseDOM } from 'fbjs/lib/ExecutionEnvironment';
 import Dispatcher from '../core/Dispatcher';
 import ActionTypes from '../constants/ActionTypes';
 
diff --git a/src/core/http.js b/src/core/http.js
@@ -1,7 +1,7 @@
 /*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
 
 import request from 'superagent';
-import ExecutionEnvironment from 'react/lib/ExecutionEnvironment';
+import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 
 const getBaseUrl = (() => {
   let baseUrl;
diff --git a/src/decorators/withContext.js b/src/decorators/withContext.js
@@ -1,7 +1,7 @@
 /*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
 
 import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars
-import emptyFunction from '../../node_modules/react/lib/emptyFunction';
+import emptyFunction from 'fbjs/lib/emptyFunction';
 
 function withContext(ComposedComponent) {
   return class WithContext {
diff --git a/src/decorators/withStyles.js b/src/decorators/withStyles.js
@@ -1,8 +1,8 @@
 /*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
 
 import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars
-import invariant from '../../node_modules/react/lib/invariant';
-import { canUseDOM } from '../../node_modules/react/lib/ExecutionEnvironment';
+import invariant from 'fbjs/lib/invariant';
+import { canUseDOM } from 'fbjs/lib/ExecutionEnvironment';
 
 let count = 0;
 
diff --git a/src/decorators/withViewport.js b/src/decorators/withViewport.js
@@ -2,7 +2,7 @@
 
 import React, { Component } from 'react'; // eslint-disable-line no-unused-vars
 import EventEmitter from 'eventemitter3';
-import { canUseDOM } from '../../node_modules/react/lib/ExecutionEnvironment';
+import { canUseDOM } from 'fbjs/lib/ExecutionEnvironment';
 
 let EE;
 let viewport = {width: 1366, height: 768}; // Default size for server-side rendering
diff --git a/src/utils/Link.js b/src/utils/Link.js
@@ -1,6 +1,6 @@
 /*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
 
-import invariant from 'react/lib/invariant';
+import invariant from 'fbjs/lib/invariant';
 import Location from '../core/Location';
 
 function handleClick(event) {