ff-stream-web

git clone git://archive.git.mtrnord.blog/MTRNord/ff-stream-web.git
Log | Files | Refs | README | LICENSE

commit 949d349b6456f8e25c0348d2d0e9eea5b7f9f887
parent d1f5e9125fb3831c35cce01309caa62a6b02cd72
Author: Phillip McCaffrey <pmccaffrey@synrgtech.com>
Date:   Sat,  1 Aug 2015 15:05:54 -0700

The React Library seems to have been split into a separate fbjs package. Including the new package and changing the requires

Diffstat:
M.gitignore | 1+
Mpackage.json | 3++-
Msrc/constants/ActionTypes.js | 2+-
Msrc/core/Location.js | 2+-
Msrc/core/http.js | 2+-
Msrc/decorators/withContext.js | 2+-
Msrc/decorators/withStyles.js | 4++--
Msrc/decorators/withViewport.js | 2+-
Msrc/utils/Link.js | 2+-
9 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore @@ -3,4 +3,5 @@ build node_modules +.idea/ npm-debug.log diff --git a/package.json b/package.json @@ -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 '../../node_modules/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 '../../node_modules/fbjs/lib/invariant'; +import { canUseDOM } from '../../node_modules/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 '../../node_modules/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) {