Remove createClass, PropTypes, DOM factories, and createMixin from React object (#9788)

2026-02-26 18:58:05 +00:00 · 2017-05-30 15:35:30 +01:00
parent 319ba0bba9
commit fedb2ff8ec
12 changed files with 75 additions and 1769 deletions
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -22,7 +22,6 @@
    "node": ">=0.10.0"
  },
  "dependencies": {
-    "create-react-class": "^15.5.2",
    "fbjs": "^0.8.9",
    "loose-envify": "^1.1.0",
    "object-assign": "^4.1.0",
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -40,16 +40,6 @@ scripts/shared/__tests__/evalToString-test.js
 * should support string concat (`+`)
 * should throw when it finds other types

-src/addons/__tests__/ReactDOMFactories-test.js
-* allow factories to be called without warnings
-* warns once when accessing React.DOM methods
-
-src/isomorphic/__tests__/React-test.js
-* should log a deprecation warning once when using React.createMixin
-* should warn once when attempting to access React.createClass
-* should warn once when attempting to access React.PropTypes
-* should warn once when attempting to access React.checkPropTypes
-
 src/isomorphic/children/__tests__/ReactChildren-test.js
 * should support identity for simple
 * should treat single arrayless child as being in array
@@ -98,7 +88,7 @@ src/isomorphic/classic/__tests__/ReactContextValidator-test.js
 * should warn (but not error) if getChildContext method is missing
 * should pass parent context if getChildContext method is missing

-src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
+src/isomorphic/classic/__tests__/createReactClassIntegration-test.js
 * should throw when `render` is not specified
 * should copy prop types onto the Constructor
 * should warn on invalid prop types
@@ -203,89 +193,6 @@ src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
 * does not blow up with inlined children
 * does not blow up on key warning with undefined type

-src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
-* does not return a value from a validator
-* does not throw if validator throws
-* should warn for invalid strings
-* should fail date and regexp correctly
-* should not warn for valid values
-* should be implicitly optional and not warn without values
-* should warn for missing required values
-* should throw if called manually in development
-* should should accept any value
-* should be implicitly optional and not warn without values
-* should warn for missing required values
-* should throw if called manually in development
-* should fail for invalid argument
-* should support the arrayOf propTypes
-* should support arrayOf with complex types
-* should warn with invalid items in the array
-* should warn with invalid complex types
-* should warn when passed something other than an array
-* should not warn when passing an empty array
-* should be implicitly optional and not warn without values
-* should warn for missing required values
-* should throw if called manually in development
-* should support components
-* should not support multiple components or scalar values
-* should be able to define a single child as label
-* should warn when passing no label and isRequired is set
-* should be implicitly optional and not warn without values
-* should warn for missing required values
-* should throw if called manually in development
-* should warn for invalid instances
-* should not warn for valid values
-* should be implicitly optional and not warn without values
-* should warn for missing required values
-* should throw if called manually in development
-* should warn for invalid values
-* should not warn for valid values
-* should not warn for iterables
-* should not warn for entry iterables
-* should not warn for null/undefined if not required
-* should warn for missing required values
-* should accept empty array for required props
-* should throw if called manually in development
-* should fail for invalid argument
-* should support the objectOf propTypes
-* should support objectOf with complex types
-* should warn with invalid items in the object
-* should warn with invalid complex types
-* should warn when passed something other than an object
-* should not warn when passing an empty object
-* should be implicitly optional and not warn without values
-* should warn for missing required values
-* should throw if called manually in development
-* should warn but not error for invalid argument
-* should warn for invalid values
-* should not warn for valid values
-* should be implicitly optional and not warn without values
-* should warn for missing required values
-* should throw if called manually in development
-* should warn but not error for invalid argument
-* should warn if none of the types are valid
-* should not warn if one of the types are valid
-* should be implicitly optional and not warn without values
-* should warn for missing required values
-* should throw if called manually in development
-* should warn for non objects
-* should not warn for empty values
-* should not warn for an empty object
-* should not warn for non specified types
-* should not warn for valid types
-* should warn for required valid types
-* should warn for the first required type
-* should warn for invalid key types
-* should be implicitly optional and not warn without values
-* should warn for missing required values
-* should throw if called manually in development
-* should warn for non-symbol
-* should not warn for a polyfilled Symbol
-* should have been called with the right params
-* should have been called even if the prop is not present
-* should have received the validator's return value
-* should not warn if the validator returned null
-
 src/isomorphic/modern/class/__tests__/ReactClassEquivalence-test.js
 * tests the same thing for es6 classes and CoffeeScript
 * tests the same thing for es6 classes and TypeScript
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -1,28 +1,28 @@
 {
  "bundleSizes": {
    "react.development.js (UMD_DEV)": {
-      "size": 125800,
-      "gzip": 31378
+      "size": 73848,
+      "gzip": 18852
    },
    "react.production.min.js (UMD_PROD)": {
-      "size": 15753,
-      "gzip": 5824
+      "size": 7756,
+      "gzip": 3089
    },
    "react-dom.development.js (UMD_DEV)": {
-      "size": 605005,
-      "gzip": 139056
+      "size": 605435,
+      "gzip": 139358
    },
    "react-dom.production.min.js (UMD_PROD)": {
-      "size": 125182,
-      "gzip": 39533
+      "size": 125246,
+      "gzip": 39624
    },
    "react-dom-server.development.js (UMD_DEV)": {
-      "size": 525947,
-      "gzip": 126689
+      "size": 534438,
+      "gzip": 129160
    },
    "react-dom-server.production.min.js (UMD_PROD)": {
-      "size": 111505,
-      "gzip": 34936
+      "size": 113386,
+      "gzip": 35642
    },
    "react-art.development.js (UMD_DEV)": {
      "size": 359125,
@@ -33,60 +33,60 @@
      "gzip": 29993
    },
    "react.development.js (NODE_DEV)": {
-      "size": 72595,
-      "gzip": 18499
+      "size": 64064,
+      "gzip": 16441
    },
    "react.production.min.js (NODE_PROD)": {
-      "size": 9195,
-      "gzip": 3614
+      "size": 6650,
+      "gzip": 2671
    },
    "React-dev.js (FB_DEV)": {
-      "size": 71806,
-      "gzip": 18233
+      "size": 63268,
+      "gzip": 16164
    },
    "React-prod.js (FB_PROD)": {
-      "size": 36172,
-      "gzip": 9226
+      "size": 30387,
+      "gzip": 7986
    },
    "ReactDOMStack-dev.js (FB_DEV)": {
-      "size": 495315,
-      "gzip": 118265
+      "size": 503788,
+      "gzip": 120786
    },
    "ReactDOMStack-prod.js (FB_PROD)": {
-      "size": 353140,
-      "gzip": 84785
+      "size": 360176,
+      "gzip": 86700
    },
    "react-dom.development.js (NODE_DEV)": {
-      "size": 562575,
-      "gzip": 128975
+      "size": 563003,
+      "gzip": 129288
    },
    "react-dom.production.min.js (NODE_PROD)": {
-      "size": 121395,
-      "gzip": 38183
+      "size": 121459,
+      "gzip": 38279
    },
    "ReactDOMFiber-dev.js (FB_DEV)": {
-      "size": 563564,
-      "gzip": 129481
+      "size": 563992,
+      "gzip": 129811
    },
    "ReactDOMFiber-prod.js (FB_PROD)": {
-      "size": 422947,
-      "gzip": 96357
+      "size": 423415,
+      "gzip": 96616
    },
    "react-dom-server.development.js (NODE_DEV)": {
-      "size": 474510,
-      "gzip": 114092
+      "size": 482987,
+      "gzip": 116600
    },
    "react-dom-server.production.min.js (NODE_PROD)": {
-      "size": 105880,
-      "gzip": 32763
+      "size": 107761,
+      "gzip": 33495
    },
    "ReactDOMServerStack-dev.js (FB_DEV)": {
-      "size": 455996,
-      "gzip": 109840
+      "size": 464469,
+      "gzip": 112326
    },
    "ReactDOMServerStack-prod.js (FB_PROD)": {
-      "size": 334101,
-      "gzip": 80467
+      "size": 341137,
+      "gzip": 82395
    },
    "ReactARTStack-dev.js (FB_DEV)": {
      "size": 143177,
@@ -157,12 +157,12 @@
      "gzip": 2234
    },
    "ReactDOMServerStream-dev.js (FB_DEV)": {
-      "size": 472979,
-      "gzip": 113937
+      "size": 481456,
+      "gzip": 116430
    },
    "ReactDOMServerStream-prod.js (FB_PROD)": {
-      "size": 345258,
-      "gzip": 83320
+      "size": 352294,
+      "gzip": 85249
    },
    "ReactNativeStack-dev.js (RN_DEV)": {
      "size": 182305,
--- a/src/addons/ReactDOMFactories.js
+++ b/src/addons/ReactDOMFactories.js
@@ -1,169 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactDOMFactories
- */
-
-'use strict';
-
-var ReactElement = require('ReactElement');
-
-/**
- * Create a factory that creates HTML tag elements.
- *
- * @private
- */
-var createDOMFactory = ReactElement.createFactory;
-if (__DEV__) {
-  var ReactElementValidator = require('ReactElementValidator');
-  createDOMFactory = ReactElementValidator.createFactory;
-}
-
-/**
- * Creates a mapping from supported HTML tags to `ReactDOMComponent` classes.
- *
- * @public
- */
-var ReactDOMFactories = {
-  a: createDOMFactory('a'),
-  abbr: createDOMFactory('abbr'),
-  address: createDOMFactory('address'),
-  area: createDOMFactory('area'),
-  article: createDOMFactory('article'),
-  aside: createDOMFactory('aside'),
-  audio: createDOMFactory('audio'),
-  b: createDOMFactory('b'),
-  base: createDOMFactory('base'),
-  bdi: createDOMFactory('bdi'),
-  bdo: createDOMFactory('bdo'),
-  big: createDOMFactory('big'),
-  blockquote: createDOMFactory('blockquote'),
-  body: createDOMFactory('body'),
-  br: createDOMFactory('br'),
-  button: createDOMFactory('button'),
-  canvas: createDOMFactory('canvas'),
-  caption: createDOMFactory('caption'),
-  cite: createDOMFactory('cite'),
-  code: createDOMFactory('code'),
-  col: createDOMFactory('col'),
-  colgroup: createDOMFactory('colgroup'),
-  data: createDOMFactory('data'),
-  datalist: createDOMFactory('datalist'),
-  dd: createDOMFactory('dd'),
-  del: createDOMFactory('del'),
-  details: createDOMFactory('details'),
-  dfn: createDOMFactory('dfn'),
-  dialog: createDOMFactory('dialog'),
-  div: createDOMFactory('div'),
-  dl: createDOMFactory('dl'),
-  dt: createDOMFactory('dt'),
-  em: createDOMFactory('em'),
-  embed: createDOMFactory('embed'),
-  fieldset: createDOMFactory('fieldset'),
-  figcaption: createDOMFactory('figcaption'),
-  figure: createDOMFactory('figure'),
-  footer: createDOMFactory('footer'),
-  form: createDOMFactory('form'),
-  h1: createDOMFactory('h1'),
-  h2: createDOMFactory('h2'),
-  h3: createDOMFactory('h3'),
-  h4: createDOMFactory('h4'),
-  h5: createDOMFactory('h5'),
-  h6: createDOMFactory('h6'),
-  head: createDOMFactory('head'),
-  header: createDOMFactory('header'),
-  hgroup: createDOMFactory('hgroup'),
-  hr: createDOMFactory('hr'),
-  html: createDOMFactory('html'),
-  i: createDOMFactory('i'),
-  iframe: createDOMFactory('iframe'),
-  img: createDOMFactory('img'),
-  input: createDOMFactory('input'),
-  ins: createDOMFactory('ins'),
-  kbd: createDOMFactory('kbd'),
-  keygen: createDOMFactory('keygen'),
-  label: createDOMFactory('label'),
-  legend: createDOMFactory('legend'),
-  li: createDOMFactory('li'),
-  link: createDOMFactory('link'),
-  main: createDOMFactory('main'),
-  map: createDOMFactory('map'),
-  mark: createDOMFactory('mark'),
-  menu: createDOMFactory('menu'),
-  menuitem: createDOMFactory('menuitem'),
-  meta: createDOMFactory('meta'),
-  meter: createDOMFactory('meter'),
-  nav: createDOMFactory('nav'),
-  noscript: createDOMFactory('noscript'),
-  object: createDOMFactory('object'),
-  ol: createDOMFactory('ol'),
-  optgroup: createDOMFactory('optgroup'),
-  option: createDOMFactory('option'),
-  output: createDOMFactory('output'),
-  p: createDOMFactory('p'),
-  param: createDOMFactory('param'),
-  picture: createDOMFactory('picture'),
-  pre: createDOMFactory('pre'),
-  progress: createDOMFactory('progress'),
-  q: createDOMFactory('q'),
-  rp: createDOMFactory('rp'),
-  rt: createDOMFactory('rt'),
-  ruby: createDOMFactory('ruby'),
-  s: createDOMFactory('s'),
-  samp: createDOMFactory('samp'),
-  script: createDOMFactory('script'),
-  section: createDOMFactory('section'),
-  select: createDOMFactory('select'),
-  small: createDOMFactory('small'),
-  source: createDOMFactory('source'),
-  span: createDOMFactory('span'),
-  strong: createDOMFactory('strong'),
-  style: createDOMFactory('style'),
-  sub: createDOMFactory('sub'),
-  summary: createDOMFactory('summary'),
-  sup: createDOMFactory('sup'),
-  table: createDOMFactory('table'),
-  tbody: createDOMFactory('tbody'),
-  td: createDOMFactory('td'),
-  textarea: createDOMFactory('textarea'),
-  tfoot: createDOMFactory('tfoot'),
-  th: createDOMFactory('th'),
-  thead: createDOMFactory('thead'),
-  time: createDOMFactory('time'),
-  title: createDOMFactory('title'),
-  tr: createDOMFactory('tr'),
-  track: createDOMFactory('track'),
-  u: createDOMFactory('u'),
-  ul: createDOMFactory('ul'),
-  var: createDOMFactory('var'),
-  video: createDOMFactory('video'),
-  wbr: createDOMFactory('wbr'),
-
-  // SVG
-  circle: createDOMFactory('circle'),
-  clipPath: createDOMFactory('clipPath'),
-  defs: createDOMFactory('defs'),
-  ellipse: createDOMFactory('ellipse'),
-  g: createDOMFactory('g'),
-  image: createDOMFactory('image'),
-  line: createDOMFactory('line'),
-  linearGradient: createDOMFactory('linearGradient'),
-  mask: createDOMFactory('mask'),
-  path: createDOMFactory('path'),
-  pattern: createDOMFactory('pattern'),
-  polygon: createDOMFactory('polygon'),
-  polyline: createDOMFactory('polyline'),
-  radialGradient: createDOMFactory('radialGradient'),
-  rect: createDOMFactory('rect'),
-  stop: createDOMFactory('stop'),
-  svg: createDOMFactory('svg'),
-  text: createDOMFactory('text'),
-  tspan: createDOMFactory('tspan'),
-};
-
-module.exports = ReactDOMFactories;
--- a/src/addons/tests/ReactDOMFactories-test.js
+++ b/src/addons/tests/ReactDOMFactories-test.js
@@ -1,41 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @emails react-core
- */
-
-'use strict';
-
-var React = require('React');
-var {div} = require('ReactDOMFactories');
-
-describe('ReactDOMFactories', () => {
-  it('allow factories to be called without warnings', () => {
-    spyOn(console, 'error');
-    spyOn(console, 'warn');
-    var element = div();
-    expect(element.type).toBe('div');
-    expect(console.error).not.toHaveBeenCalled();
-    expect(console.warn).not.toHaveBeenCalled();
-  });
-
-  it('warns once when accessing React.DOM methods', () => {
-    spyOn(console, 'warn');
-
-    var a = React.DOM.a();
-    var p = React.DOM.p();
-
-    expect(a.type).toBe('a');
-    expect(p.type).toBe('p');
-
-    expect(console.warn).toHaveBeenCalledTimes(1);
-    expect(console.warn.calls.first().args[0]).toContain(
-      'Warning: Accessing factories like React.DOM.a has been deprecated',
-    );
-  });
-});
--- a/src/isomorphic/React.js
+++ b/src/isomorphic/React.js
@@ -13,35 +13,23 @@

 var ReactBaseClasses = require('ReactBaseClasses');
 var ReactChildren = require('ReactChildren');
-var ReactDOMFactories = require('ReactDOMFactories');
 var ReactElement = require('ReactElement');
-var ReactPropTypes = require('ReactPropTypes');
 var ReactVersion = require('ReactVersion');

 var onlyChild = require('onlyChild');
-var checkPropTypes = require('prop-types/checkPropTypes');
-var createReactClass = require('createClass');

 var createElement = ReactElement.createElement;
 var createFactory = ReactElement.createFactory;
 var cloneElement = ReactElement.cloneElement;

 if (__DEV__) {
-  var lowPriorityWarning = require('lowPriorityWarning');
-  var canDefineProperty = require('canDefineProperty');
  var ReactElementValidator = require('ReactElementValidator');
  createElement = ReactElementValidator.createElement;
  createFactory = ReactElementValidator.createFactory;
  cloneElement = ReactElementValidator.cloneElement;
 }

-var createMixin = function(mixin) {
-  return mixin;
-};
-
 var React = {
-  // Modern
-
  Children: {
    map: ReactChildren.map,
    forEach: ReactChildren.forEach,
@@ -57,19 +45,7 @@ var React = {
  cloneElement: cloneElement,
  isValidElement: ReactElement.isValidElement,

-  // TODO (bvaughn) Remove these getters before 16.0.0
-  PropTypes: ReactPropTypes,
-  checkPropTypes: checkPropTypes,
-  createClass: createReactClass,
-
-  // Classic
-
  createFactory: createFactory,
-  createMixin: createMixin,
-
-  // This looks DOM specific but these are actually isomorphic helpers
-  // since they are just generating DOM strings.
-  DOM: ReactDOMFactories,

  version: ReactVersion,

@@ -84,89 +60,6 @@ if (__DEV__) {
    ReactComponentTreeHook: require('ReactComponentTreeHook'),
    ReactDebugCurrentFrame: require('ReactDebugCurrentFrame'),
  });
-
-  let warnedForCheckPropTypes = false;
-  let warnedForCreateMixin = false;
-  let warnedForCreateClass = false;
-  let warnedForPropTypes = false;
-
-  React.createMixin = function(mixin) {
-    lowPriorityWarning(
-      warnedForCreateMixin,
-      'React.createMixin is deprecated and should not be used. You ' +
-        'can use this mixin directly instead.',
-    );
-    warnedForCreateMixin = true;
-    return mixin;
-  };
-
-  // TODO (bvaughn) Remove all of these accessors before 16.0.0
-  if (canDefineProperty) {
-    Object.defineProperty(React, 'checkPropTypes', {
-      get() {
-        lowPriorityWarning(
-          warnedForCheckPropTypes,
-          'checkPropTypes has been moved to a separate package. ' +
-            'Accessing React.checkPropTypes is no longer supported ' +
-            'and will be removed completely in React 16. ' +
-            'Use the prop-types package on npm instead. ' +
-            '(https://fb.me/migrating-from-react-proptypes)',
-        );
-        warnedForCheckPropTypes = true;
-        return checkPropTypes;
-      },
-    });
-
-    Object.defineProperty(React, 'createClass', {
-      get: function() {
-        lowPriorityWarning(
-          warnedForCreateClass,
-          'React.createClass is no longer supported. Use a plain JavaScript ' +
-            "class instead. If you're not yet ready to migrate, " +
-            'create-react-class is available on npm as a drop-in replacement. ' +
-            '(https://fb.me/migrating-from-react-create-class)',
-        );
-        warnedForCreateClass = true;
-        return createReactClass;
-      },
-    });
-
-    Object.defineProperty(React, 'PropTypes', {
-      get() {
-        lowPriorityWarning(
-          warnedForPropTypes,
-          'PropTypes has been moved to a separate package. ' +
-            'Accessing React.PropTypes is no longer supported ' +
-            'and will be removed completely in React 16. ' +
-            'Use the prop-types package on npm instead. ' +
-            '(https://fb.me/migrating-from-react-proptypes)',
-        );
-        warnedForPropTypes = true;
-        return ReactPropTypes;
-      },
-    });
-  }
-
-  // React.DOM factories are deprecated. Wrap these methods so that
-  // invocations of the React.DOM namespace and alert users to switch
-  // to the `react-addons-dom-factories` package.
-  React.DOM = {};
-  var warnedForFactories = false;
-  Object.keys(ReactDOMFactories).forEach(function(factory) {
-    React.DOM[factory] = function(...args) {
-      if (!warnedForFactories) {
-        lowPriorityWarning(
-          false,
-          'Accessing factories like React.DOM.%s has been deprecated ' +
-            'and will be removed in the future. Use the ' +
-            'react-addons-dom-factories package instead.',
-          factory,
-        );
-        warnedForFactories = true;
-      }
-      return ReactDOMFactories[factory](...args);
-    };
-  });
 }

 module.exports = React;
--- a/src/isomorphic/tests/React-test.js
+++ b/src/isomorphic/tests/React-test.js
@@ -1,74 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @emails react-core
- */
-
-'use strict';
-
-describe('React', () => {
-  var React;
-
-  beforeEach(() => {
-    React = require('react');
-  });
-
-  it('should log a deprecation warning once when using React.createMixin', () => {
-    spyOn(console, 'warn');
-    React.createMixin();
-    React.createMixin();
-    expectDev(console.warn.calls.count()).toBe(1);
-    expectDev(console.warn.calls.argsFor(0)[0]).toContain(
-      'React.createMixin is deprecated and should not be used',
-    );
-  });
-
-  it('should warn once when attempting to access React.createClass', () => {
-    spyOn(console, 'warn');
-    let createClass = React.createClass;
-    createClass = React.createClass;
-    expect(createClass).not.toBe(undefined);
-    expectDev(console.warn.calls.count()).toBe(1);
-    expectDev(console.warn.calls.argsFor(0)[0]).toContain(
-      'React.createClass is no longer supported. Use a plain JavaScript ' +
-        "class instead. If you're not yet ready to migrate, " +
-        'create-react-class is available on npm as a drop-in replacement. ' +
-        '(https://fb.me/migrating-from-react-create-class)',
-    );
-  });
-
-  it('should warn once when attempting to access React.PropTypes', () => {
-    spyOn(console, 'warn');
-    let PropTypes = React.PropTypes;
-    PropTypes = React.PropTypes;
-    expect(PropTypes).not.toBe(undefined);
-    expectDev(console.warn.calls.count()).toBe(1);
-    expectDev(console.warn.calls.argsFor(0)[0]).toContain(
-      'PropTypes has been moved to a separate package. ' +
-        'Accessing React.PropTypes is no longer supported ' +
-        'and will be removed completely in React 16. ' +
-        'Use the prop-types package on npm instead. ' +
-        '(https://fb.me/migrating-from-react-proptypes)',
-    );
-  });
-
-  it('should warn once when attempting to access React.checkPropTypes', () => {
-    spyOn(console, 'warn');
-    let checkPropTypes = React.checkPropTypes;
-    checkPropTypes = React.checkPropTypes;
-    expect(checkPropTypes).not.toBe(undefined);
-    expectDev(console.warn.calls.count()).toBe(1);
-    expectDev(console.warn.calls.argsFor(0)[0]).toContain(
-      'checkPropTypes has been moved to a separate package. ' +
-        'Accessing React.checkPropTypes is no longer supported ' +
-        'and will be removed completely in React 16. ' +
-        'Use the prop-types package on npm instead. ' +
-        '(https://fb.me/migrating-from-react-proptypes)',
-    );
-  });
-});
--- a/src/isomorphic/classic/class/tests/create-react-class-integration-test.js
+++ b/src/isomorphic/classic/class/tests/create-react-class-integration-test.js
@@ -23,11 +23,10 @@ describe('create-react-class-integration', () => {
    React = require('react');
    ReactDOM = require('react-dom');
    ReactTestUtils = require('ReactTestUtils');
-    var createReactClassFactory = require('create-react-class/factory');
-    createReactClass = createReactClassFactory(
+    createReactClass = require('create-react-class/factory')(
      React.Component,
      React.isValidElement,
-      require('ReactNoopUpdateQueue'),
+      new React.Component().updater,
    );
  });

--- a/src/isomorphic/classic/class/createClass.js
+++ b/src/isomorphic/classic/class/createClass.js
@@ -1,19 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule createClass
- */
-
-'use strict';
-
-var {Component} = require('ReactBaseClasses');
-var {isValidElement} = require('ReactElement');
-var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');
-var factory = require('create-react-class/factory');
-
-module.exports = factory(Component, isValidElement, ReactNoopUpdateQueue);
--- a/src/isomorphic/classic/types/ReactPropTypes.js
+++ b/src/isomorphic/classic/types/ReactPropTypes.js
@@ -1,14 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactPropTypes
- */
-
-'use strict';
-
-module.exports = require('prop-types');
--- a/src/isomorphic/classic/types/tests/ReactPropTypes-test.js
+++ b/src/isomorphic/classic/types/tests/ReactPropTypes-test.js
--- a/src/renderers/tests/ReactCompositeComponent-test.js
+++ b/src/renderers/tests/ReactCompositeComponent-test.js
@@ -17,8 +17,8 @@ var React;
 var ReactDOM;
 var ReactDOMServer;
 var ReactCurrentOwner;
-var ReactPropTypes;
 var ReactTestUtils;
+var PropTypes;
 var shallowEqual;
 var shallowCompare;

@@ -29,8 +29,8 @@ describe('ReactCompositeComponent', () => {
    ReactDOM = require('react-dom');
    ReactDOMServer = require('react-dom/server');
    ReactCurrentOwner = require('ReactCurrentOwner');
-    ReactPropTypes = require('ReactPropTypes');
    ReactTestUtils = require('ReactTestUtils');
+    PropTypes = require('prop-types');
    shallowEqual = require('fbjs/lib/shallowEqual');

    shallowCompare = function(instance, nextProps, nextState) {
@@ -518,7 +518,7 @@ describe('ReactCompositeComponent', () => {

    class Child extends React.Component {
      static childContextTypes = {
-        foo: ReactPropTypes.string,
+        foo: PropTypes.string,
      };

      getChildContext() {
@@ -534,7 +534,7 @@ describe('ReactCompositeComponent', () => {

    class Grandchild extends React.Component {
      static contextTypes = {
-        foo: ReactPropTypes.string,
+        foo: PropTypes.string,
      };

      render() {
@@ -576,8 +576,8 @@ describe('ReactCompositeComponent', () => {

    class Parent extends React.Component {
      static childContextTypes = {
-        foo: ReactPropTypes.string,
-        flag: ReactPropTypes.bool,
+        foo: PropTypes.string,
+        flag: PropTypes.bool,
      };

      state = {
@@ -604,8 +604,8 @@ describe('ReactCompositeComponent', () => {

    class Child extends React.Component {
      static contextTypes = {
-        foo: ReactPropTypes.string,
-        flag: ReactPropTypes.bool,
+        foo: PropTypes.string,
+        flag: PropTypes.bool,
      };

      render() {
@@ -629,7 +629,7 @@ describe('ReactCompositeComponent', () => {
  it('should pass context when re-rendered for static child within a composite component', () => {
    class Parent extends React.Component {
      static childContextTypes = {
-        flag: ReactPropTypes.bool,
+        flag: PropTypes.bool,
      };

      state = {
@@ -649,7 +649,7 @@ describe('ReactCompositeComponent', () => {

    class Child extends React.Component {
      static contextTypes = {
-        flag: ReactPropTypes.bool,
+        flag: PropTypes.bool,
      };

      render() {
@@ -685,8 +685,8 @@ describe('ReactCompositeComponent', () => {

    class Parent extends React.Component {
      static childContextTypes = {
-        foo: ReactPropTypes.string,
-        depth: ReactPropTypes.number,
+        foo: PropTypes.string,
+        depth: PropTypes.number,
      };

      getChildContext() {
@@ -703,12 +703,12 @@ describe('ReactCompositeComponent', () => {

    class Child extends React.Component {
      static contextTypes = {
-        foo: ReactPropTypes.string,
-        depth: ReactPropTypes.number,
+        foo: PropTypes.string,
+        depth: PropTypes.number,
      };

      static childContextTypes = {
-        depth: ReactPropTypes.number,
+        depth: PropTypes.number,
      };

      getChildContext() {
@@ -725,8 +725,8 @@ describe('ReactCompositeComponent', () => {

    class Grandchild extends React.Component {
      static contextTypes = {
-        foo: ReactPropTypes.string,
-        depth: ReactPropTypes.number,
+        foo: PropTypes.string,
+        depth: PropTypes.number,
      };

      render() {
@@ -746,8 +746,8 @@ describe('ReactCompositeComponent', () => {

    class Parent extends React.Component {
      static childContextTypes = {
-        foo: ReactPropTypes.string,
-        depth: ReactPropTypes.number,
+        foo: PropTypes.string,
+        depth: PropTypes.number,
      };

      state = {
@@ -772,8 +772,8 @@ describe('ReactCompositeComponent', () => {

    class Child extends React.Component {
      static contextTypes = {
-        foo: ReactPropTypes.string,
-        depth: ReactPropTypes.number,
+        foo: PropTypes.string,
+        depth: PropTypes.number,
      };

      render() {
@@ -797,7 +797,7 @@ describe('ReactCompositeComponent', () => {
  it('unmasked context propagates through updates', () => {
    class Leaf extends React.Component {
      static contextTypes = {
-        foo: ReactPropTypes.string.isRequired,
+        foo: PropTypes.string.isRequired,
      };

      componentWillReceiveProps(nextProps, nextContext) {
@@ -831,7 +831,7 @@ describe('ReactCompositeComponent', () => {

    class Parent extends React.Component {
      static childContextTypes = {
-        foo: ReactPropTypes.string,
+        foo: PropTypes.string,
      };

      getChildContext() {
@@ -863,7 +863,7 @@ describe('ReactCompositeComponent', () => {

    class GrandChild extends React.Component {
      static contextTypes = {
-        foo: ReactPropTypes.string.isRequired,
+        foo: PropTypes.string.isRequired,
      };

      componentWillReceiveProps(nextProps, nextContext) {
@@ -885,7 +885,7 @@ describe('ReactCompositeComponent', () => {

    class ChildWithContext extends React.Component {
      static contextTypes = {
-        foo: ReactPropTypes.string.isRequired,
+        foo: PropTypes.string.isRequired,
      };

      componentWillReceiveProps(nextProps, nextContext) {
@@ -925,7 +925,7 @@ describe('ReactCompositeComponent', () => {

    class Parent extends React.Component {
      static childContextTypes = {
-        foo: ReactPropTypes.string,
+        foo: PropTypes.string,
      };

      state = {
@@ -1126,7 +1126,7 @@ describe('ReactCompositeComponent', () => {
  it('context should be passed down from the parent', () => {
    class Parent extends React.Component {
      static childContextTypes = {
-        foo: ReactPropTypes.string,
+        foo: PropTypes.string,
      };

      getChildContext() {
@@ -1142,7 +1142,7 @@ describe('ReactCompositeComponent', () => {

    class Component extends React.Component {
      static contextTypes = {
-        foo: ReactPropTypes.string.isRequired,
+        foo: PropTypes.string.isRequired,
      };

      render() {