Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to react@15.4.0 #255

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -28,7 +28,7 @@
"deep-assign": "^2.0.0",
"fbjs": "^0.8.4",
"inline-style-prefixer": "^2.0.1",
"react-dom": "~15.3.2",
"react-dom": "^15.4.0",
"react-textarea-autosize": "^4.0.4",
"react-timer-mixin": "^0.13.3"
},
Expand All @@ -49,15 +49,15 @@
"file-loader": "^0.9.0",
"jest": "^16.0.2",
"node-libs-browser": "^0.5.3",
"react": "~15.3.2",
"react-addons-test-utils": "~15.3.2",
"react-test-renderer": "~15.3.2",
"react": "^15.4.0",
"react-addons-test-utils": "^15.4.0",
"react-test-renderer": "^15.4.0",
"url-loader": "^0.5.7",
"webpack": "^1.13.2",
"webpack-bundle-analyzer": "^1.5.3"
},
"peerDependencies": {
"react": "~15.3.2"
"react": "^15.4.0"
},
"author": "Nicolas Gallagher",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion src/apis/AppRegistry/index.js
Expand Up @@ -8,7 +8,7 @@

import { Component } from 'react';
import invariant from 'fbjs/lib/invariant';
import { unmountComponentAtNode } from 'react/lib/ReactMount';
import { unmountComponentAtNode } from 'react-dom/lib/ReactMount';
import renderApplication, { getApplication } from './renderApplication';

const runnables = {};
Expand Down
2 changes: 1 addition & 1 deletion src/apis/AppRegistry/renderApplication.js
Expand Up @@ -7,7 +7,7 @@
*/

import invariant from 'fbjs/lib/invariant';
import { render } from 'react/lib/ReactMount';
import { render } from 'react-dom/lib/ReactMount';
import ReactNativeApp from './ReactNativeApp';
import StyleSheet from '../../apis/StyleSheet';
import React, { Component } from 'react';
Expand Down
2 changes: 1 addition & 1 deletion src/apis/PanResponder/index.js
Expand Up @@ -6,7 +6,7 @@

"use strict";

var TouchHistoryMath = require('react/lib/TouchHistoryMath');
var TouchHistoryMath = require('react-dom/lib/TouchHistoryMath');

var currentCentroidXOfTouchesChangedAfter =
TouchHistoryMath.currentCentroidXOfTouchesChangedAfter;
Expand Down
4 changes: 2 additions & 2 deletions src/apis/StyleSheet/StyleSheetValidation.js
Expand Up @@ -9,8 +9,8 @@

import { PropTypes } from 'react'
import ImageStylePropTypes from '../../components/Image/ImageStylePropTypes'
import ReactPropTypeLocations from 'react/lib/ReactPropTypeLocations'
import ReactPropTypesSecret from 'react/lib/ReactPropTypesSecret'
import ReactPropTypeLocations from 'react-dom/lib/ReactPropTypeLocations'
import ReactPropTypesSecret from 'react-dom/lib/ReactPropTypesSecret'
import TextStylePropTypes from '../../components/Text/TextStylePropTypes'
import ViewStylePropTypes from '../../components/View/ViewStylePropTypes'
import warning from 'fbjs/lib/warning'
Expand Down
2 changes: 1 addition & 1 deletion src/apis/UIManager/index.js
@@ -1,5 +1,5 @@
import createReactStyleObject from '../StyleSheet/createReactStyleObject';
import CSSPropertyOperations from 'react/lib/CSSPropertyOperations';
import CSSPropertyOperations from 'react-dom/lib/CSSPropertyOperations';

const _measureLayout = (node, relativeToNativeNode, callback) => {
const relativeNode = relativeToNativeNode || node.parentNode;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Touchable/BoundingDimensions.js
Expand Up @@ -6,7 +6,7 @@

'use strict';

var PooledClass = require('react/lib/PooledClass');
var PooledClass = require('react-dom/lib/PooledClass');

var twoArgumentPooler = PooledClass.twoArgumentPooler;

Expand Down
2 changes: 1 addition & 1 deletion src/components/Touchable/Position.js
Expand Up @@ -6,7 +6,7 @@

'use strict';

var PooledClass = require('react/lib/PooledClass');
var PooledClass = require('react-dom/lib/PooledClass');

var twoArgumentPooler = PooledClass.twoArgumentPooler;

Expand Down
4 changes: 2 additions & 2 deletions src/core.js
@@ -1,6 +1,6 @@
import findNodeHandle from './modules/findNodeHandle';
import ReactDefaultInjection from 'react/lib/ReactDefaultInjection';
import { render, unmountComponentAtNode } from 'react/lib/ReactMount';
import ReactDefaultInjection from 'react-dom/lib/ReactDefaultInjection';
import { render, unmountComponentAtNode } from 'react-dom/lib/ReactMount';

ReactDefaultInjection.inject();

Expand Down
4 changes: 2 additions & 2 deletions src/index.js
@@ -1,6 +1,6 @@
import findNodeHandle from './modules/findNodeHandle';
import ReactDefaultInjection from 'react/lib/ReactDefaultInjection';
import { render, unmountComponentAtNode } from 'react/lib/ReactMount';
import ReactDefaultInjection from 'react-dom/lib/ReactDefaultInjection';
import { render, unmountComponentAtNode } from 'react-dom/lib/ReactMount';

ReactDefaultInjection.inject();

Expand Down
2 changes: 1 addition & 1 deletion src/modules/findNodeHandle/index.js
@@ -1,2 +1,2 @@
import findNodeHandle from 'react/lib/findDOMNode';
import findNodeHandle from 'react-dom/lib/findDOMNode';
export default findNodeHandle;
8 changes: 4 additions & 4 deletions src/modules/injectResponderEventPlugin.js
@@ -1,10 +1,10 @@
// based on https://github.com/facebook/react/pull/4303/files

import EventConstants from 'react/lib/EventConstants';
import EventPluginRegistry from 'react/lib/EventPluginRegistry';
import EventConstants from 'react-dom/lib/EventConstants';
import EventPluginRegistry from 'react-dom/lib/EventPluginRegistry';
import normalizeNativeEvent from './normalizeNativeEvent';
import ResponderEventPlugin from 'react/lib/ResponderEventPlugin';
import ResponderTouchHistoryStore from 'react/lib/ResponderTouchHistoryStore';
import ResponderEventPlugin from 'react-dom/lib/ResponderEventPlugin';
import ResponderTouchHistoryStore from 'react-dom/lib/ResponderTouchHistoryStore';

const {
topMouseDown,
Expand Down
2 changes: 1 addition & 1 deletion src/propTypes/ColorPropType.js
Expand Up @@ -14,7 +14,7 @@ import { PropTypes } from 'react'

var colorPropType = function(isRequired, props, propName, componentName, location, propFullName) {
var normalizeColor = require('../modules/normalizeColor');
var ReactPropTypeLocationNames = require('react/lib/ReactPropTypeLocationNames');
var ReactPropTypeLocationNames = require('react-dom/lib/ReactPropTypeLocationNames');
var color = props[propName];
if (color === undefined || color === null) {
if (isRequired) {
Expand Down
4 changes: 2 additions & 2 deletions src/propTypes/createStrictShapeTypeChecker.js
Expand Up @@ -12,8 +12,8 @@
*/

import invariant from 'fbjs/lib/invariant'
import ReactPropTypeLocationNames from 'react/lib/ReactPropTypeLocationNames'
import ReactPropTypesSecret from 'react/lib/ReactPropTypesSecret'
import ReactPropTypeLocationNames from 'react-dom/lib/ReactPropTypeLocationNames'
import ReactPropTypesSecret from 'react-dom/lib/ReactPropTypesSecret'

function createStrictShapeTypeChecker(
shapeTypes: {[key: string]: ReactPropsCheckType}
Expand Down