Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions src/browser/ui/React.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ var ReactRef = require('ReactRef');
var ReactServerRendering = require('ReactServerRendering');

var assign = require('Object.assign');
var deprecated = require('deprecated');
var onlyChild = require('onlyChild');

ReactDefaultInjection.inject();
Expand Down Expand Up @@ -78,37 +77,7 @@ var React = {
withContext: ReactContext.withContext,

// Hook for JSX spread, don't use this for anything else.
__spread: assign,

// Deprecations (remove for 0.13)
renderComponent: deprecated(
'React',
'renderComponent',
'render',
this,
render
),
renderComponentToString: deprecated(
'React',
'renderComponentToString',
'renderToString',
this,
ReactServerRendering.renderToString
),
renderComponentToStaticMarkup: deprecated(
'React',
'renderComponentToStaticMarkup',
'renderToStaticMarkup',
this,
ReactServerRendering.renderToStaticMarkup
),
isValidComponent: deprecated(
'React',
'isValidComponent',
'isValidElement',
this,
ReactElement.isValidElement
)
__spread: assign
};

// Inject the runtime into a devtools global hook regardless of browser.
Expand Down
10 changes: 0 additions & 10 deletions src/browser/ui/ReactMount.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ var ReactUpdates = require('ReactUpdates');

var emptyObject = require('emptyObject');
var containsNode = require('containsNode');
var deprecated = require('deprecated');
var getReactRootElementInContainer = require('getReactRootElementInContainer');
var instantiateReactComponent = require('instantiateReactComponent');
var invariant = require('invariant');
Expand Down Expand Up @@ -816,13 +815,4 @@ ReactPerf.measureMethods(ReactMount, 'ReactMount', {
_mountImageIntoNode: '_mountImageIntoNode'
});

// Deprecations (remove for 0.13)
ReactMount.renderComponent = deprecated(
'ReactMount',
'renderComponent',
'render',
this,
ReactMount.render
);

module.exports = ReactMount;
18 changes: 1 addition & 17 deletions src/classic/propTypes/ReactPropTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
var ReactElement = require('ReactElement');
var ReactPropTypeLocationNames = require('ReactPropTypeLocationNames');

var deprecated = require('deprecated');
var emptyFunction = require('emptyFunction');

/**
Expand Down Expand Up @@ -85,22 +84,7 @@ var ReactPropTypes = {
objectOf: createObjectOfTypeChecker,
oneOf: createEnumTypeChecker,
oneOfType: createUnionTypeChecker,
shape: createShapeTypeChecker,

component: deprecated(
'React.PropTypes',
'component',
'element',
this,
elementTypeChecker
),
renderable: deprecated(
'React.PropTypes',
'renderable',
'node',
this,
nodeTypeChecker
)
shape: createShapeTypeChecker
};

function createChainableTypeChecker(validate) {
Expand Down
29 changes: 0 additions & 29 deletions src/classic/propTypes/__tests__/ReactPropTypes-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -405,35 +405,6 @@ describe('ReactPropTypes', function() {
it('should accept empty array for required props', function() {
typeCheckPass(PropTypes.node.isRequired, []);
});

it('should still work for deprecated typechecks', function() {
// We can't use typeCheckPass here because the warning module may do
// something different in some environments. Luckily they should be fine
// if they detect that console.warn is spied upon.
spyOn(console, 'warn');

// typeCheckPass(PropTypes.renderable, []);
var error = PropTypes.renderable(
{testProp: []},
'testProp',
'testComponent',
ReactPropTypeLocations.prop
);

expect(error).toBe(undefined);
expect(console.warn.calls.length).toBe(1);

// typeCheckPass(PropTypes.renderable.isRequired, []);
error = PropTypes.renderable.isRequired(
{testProp: []},
'testProp',
'testComponent',
ReactPropTypeLocations.prop
);

expect(error).toBe(undefined);
expect(console.warn.calls.length).toBe(1);
});
});

describe('ObjectOf Type', function() {
Expand Down