facebook · gaearon · Mar 20, 2017 · Mar 17, 2017 · Mar 17, 2017 · Mar 18, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -63,8 +63,6 @@ script:
         curl \
           -F "react=@build/react.js" \
           -F "react.min=@build/react.min.js" \
-          -F "react-with-addons=@build/react-with-addons.js" \
-          -F "react-with-addons.min=@build/react-with-addons.min.js" \
           -F "react-dom=@build/react-dom.js" \
           -F "react-dom.min=@build/react-dom.min.js" \
           -F "react-dom-server=@build/react-dom-server.js" \

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -84,10 +84,6 @@ module.exports = function(grunt) {
   grunt.registerTask('npm-react-native:release', npmReactNativeTasks.buildRelease);
   grunt.registerTask('npm-react-native:pack', npmReactNativeTasks.packRelease);
 
-  var npmReactAddonsTasks = require('./grunt/tasks/npm-react-addons');
-  grunt.registerTask('npm-react-addons:release', npmReactAddonsTasks.buildReleases);
-  grunt.registerTask('npm-react-addons:pack', npmReactAddonsTasks.packReleases);
-
   var npmReactTestRendererTasks = require('./grunt/tasks/npm-react-test');
   grunt.registerTask('npm-react-test:release', npmReactTestRendererTasks.buildRelease);
   grunt.registerTask('npm-react-test:pack', npmReactTestRendererTasks.packRelease);
@@ -106,19 +102,11 @@ module.exports = function(grunt) {
     'version-check',
     'browserify:basic',
   ]);
-  grunt.registerTask('build:addons', [
-    'build-modules',
-    'browserify:addons',
-  ]);
   grunt.registerTask('build:min', [
     'build-modules',
     'version-check',
     'browserify:min',
   ]);
-  grunt.registerTask('build:addons-min', [
-    'build-modules',
-    'browserify:addonsMin',
-  ]);
   grunt.registerTask('build:dom', [
     'build-modules',
     'version-check',
@@ -169,9 +157,7 @@ module.exports = function(grunt) {
     'build-modules',
     'version-check',
     'browserify:basic',
-    'browserify:addons',
     'browserify:min',
-    'browserify:addonsMin',
     'browserify:dom',
     'browserify:domMin',
     'browserify:domServer',
@@ -184,8 +170,6 @@ module.exports = function(grunt) {
     'npm-react-dom:pack',
     'npm-react-native:release',
     'npm-react-native:pack',
-    'npm-react-addons:release',
-    'npm-react-addons:pack',
     'npm-react-test:release',
     'npm-react-test:pack',
     'npm-react-noop:release',

diff --git a/docs/Rakefile b/docs/Rakefile
@@ -37,8 +37,6 @@ task :update_hashes do
   map = {
     'react.js' => 'dev',
     'react.min.js' => 'prod',
-    'react-with-addons.js' => 'addons_dev',
-    'react-with-addons.min.js' => 'addons_prod',
     'react-dom.js' => 'dom_dev',
     'react-dom.min.js' => 'dom_prod',
     'react-dom-server.js' => 'dom_server_dev',

diff --git a/fixtures/packaging/README.md b/fixtures/packaging/README.md
@@ -6,7 +6,7 @@ If you use React you don't need to worry about it.
 These fixtures verify that the built React distributions are usable in different environments.  
 **They are not running automatically.** (At least not yet, feel free to contribute to automate them.)
 
-Run them when you make changes to how we package React, ReactDOM, and addons.
+Run them when you make changes to how we package React and ReactDOM.
 
 ## How to Run
 
@@ -46,5 +46,5 @@ open http://localhost:9000/fixtures/webpack-alias/index.html
 
 You should see two things:
 
-* "Hello World" fading in with an animation.
+* "Hello World" is rendered.
 * No errors in the console.
diff --git a/fixtures/packaging/browserify/index.html b/fixtures/packaging/browserify/index.html
@@ -1,15 +1,5 @@
 <html>
   <body>
-    <style>
-      .example-appear {
-        opacity: 0.01;
-      }
-
-      .example-appear.example-appear-active {
-        opacity: 1;
-        transition: opacity .5s ease-in;
-      }
-    </style>
     <div id="container"></div>
     <script src="output.js"></script>
   </body>

diff --git a/fixtures/packaging/browserify/input.js b/fixtures/packaging/browserify/input.js
@@ -1,16 +1,7 @@
 var React = require('react');
-var CSSTransitionGroup = require('react-addons-css-transition-group');
 var ReactDOM = require('react-dom');
 
 ReactDOM.render(
-  React.createElement(CSSTransitionGroup, {
-    transitionName: 'example',
-    transitionAppear: true,
-    transitionAppearTimeout: 500,
-    transitionEnterTimeout: 0,
-    transitionLeaveTimeout: 0,
-  }, React.createElement('h1', null,
-    'Hello World!'
-  )),
+  React.createElement('h1', null, 'Hello World!'),
   document.getElementById('container')
 );
diff --git a/fixtures/packaging/brunch/app/initialize.js b/fixtures/packaging/brunch/app/initialize.js
@@ -1,16 +1,7 @@
 var React = require('react');
-var CSSTransitionGroup = require('react-addons-css-transition-group');
 var ReactDOM = require('react-dom');
 
 ReactDOM.render(
-  React.createElement(CSSTransitionGroup, {
-    transitionName: 'example',
-    transitionAppear: true,
-    transitionAppearTimeout: 500,
-    transitionEnterTimeout: 0,
-    transitionLeaveTimeout: 0,
-  }, React.createElement('h1', null,
-    'Hello World!'
-  )),
+  React.createElement('h1', null, 'Hello World!'),
   document.getElementById('container')
 );
diff --git a/fixtures/packaging/brunch/index.html b/fixtures/packaging/brunch/index.html
@@ -1,15 +1,5 @@
 <html>
   <body>
-    <style>
-      .example-appear {
-        opacity: 0.01;
-      }
-
-      .example-appear.example-appear-active {
-        opacity: 1;
-        transition: opacity .5s ease-in;
-      }
-    </style>
     <div id="container"></div>
     <script src="output.js"></script>
     <script>require('initialize');</script>

diff --git a/fixtures/packaging/brunch/input.js b/fixtures/packaging/brunch/input.js
@@ -1,16 +1,7 @@
 var React = require('react');
-var CSSTransitionGroup = require('react-addons-css-transition-group');
 var ReactDOM = require('react-dom');
 
 ReactDOM.render(
-  React.createElement(CSSTransitionGroup, {
-    transitionName: 'example',
-    transitionAppear: true,
-    transitionAppearTimeout: 500,
-    transitionEnterTimeout: 0,
-    transitionLeaveTimeout: 0,
-  }, React.createElement('h1', null,
-    'Hello World!'
-  )),
+  React.createElement('h1', null, 'Hello World!'),
   document.getElementById('container')
 );
diff --git a/fixtures/packaging/brunch/package.json b/fixtures/packaging/brunch/package.json
@@ -5,6 +5,6 @@
       "javascript-brunch": "^2.0.0"
   },
   "scripts": {
-    "build": "rm -rf public && ln -fs ../../../../build/packages/react node_modules/react && ln -fs ../../../../build/packages/react-dom node_modules/react-dom && ln -fs ../../../../build/packages/react-addons-css-transition-group node_modules/react-addons-css-transition-group && brunch build"
+    "build": "rm -rf public && ln -fs ../../../../build/packages/react node_modules/react && ln -fs ../../../../build/packages/react-dom node_modules/react-dom && brunch build"
   }
 }
diff --git a/fixtures/packaging/globals.html b/fixtures/packaging/globals.html
@@ -1,30 +1,11 @@
 <html>
   <body>
-    <script src="../../build/react-with-addons.js"></script>
+    <script src="../../build/react.js"></script>
     <script src="../../build/react-dom.js"></script>
-    <style>
-      .example-appear {
-        opacity: 0.01;
-      }
-
-      .example-appear.example-appear-active {
-        opacity: 1;
-        transition: opacity .5s ease-in;
-      }
-    </style>
     <div id="container"></div>
     <script>
-      var CSSTransitionGroup = React.addons.CSSTransitionGroup;
       ReactDOM.render(
-        React.createElement(CSSTransitionGroup, {
-          transitionName: 'example',
-          transitionAppear: true,
-          transitionAppearTimeout: 500,
-          transitionEnterTimeout: 0,
-          transitionLeaveTimeout: 0,
-        }, React.createElement('h1', null,
-          'Hello World!'
-        )),
+        React.createElement('h1', null, 'Hello World!'),
         document.getElementById('container')
       );
     </script>

diff --git a/fixtures/packaging/requirejs.html b/fixtures/packaging/requirejs.html
@@ -1,37 +1,18 @@
 <html>
   <body>
     <script src="https://unpkg.com/requirejs@2.3.2/require.js"></script>
-    <style>
-      .example-appear {
-        opacity: 0.01;
-      }
-
-      .example-appear.example-appear-active {
-        opacity: 1;
-        transition: opacity .5s ease-in;
-      }
-    </style>
     <div id="container"></div>
     <script>
       requirejs.config({
         paths: {
-          react: '../../build/react-with-addons',
+          react: '../../build/react',
           'react-dom': '../../build/react-dom'
         }
       });
 
       require(['react', 'react-dom'], function(React, ReactDOM) {
-        var CSSTransitionGroup = React.addons.CSSTransitionGroup;
         ReactDOM.render(
-          React.createElement(CSSTransitionGroup, {
-            transitionName: 'example',
-            transitionAppear: true,
-            transitionAppearTimeout: 500,
-            transitionEnterTimeout: 0,
-            transitionLeaveTimeout: 0,
-          }, React.createElement('h1', null,
-            'Hello World!'
-          )),
+          React.createElement('h1', null, 'Hello World!'),
           document.getElementById('container')
         );
       });

diff --git a/fixtures/packaging/rjs/config.js b/fixtures/packaging/rjs/config.js
@@ -4,7 +4,7 @@ module.exports = {
   out: 'output.js',
   optimize: 'none',
   paths: {
-    react: '../../../build/react-with-addons',
+    react: '../../../build/react',
     'react-dom': '../../../build/react-dom',
   },
 };
diff --git a/fixtures/packaging/rjs/index.html b/fixtures/packaging/rjs/index.html
@@ -1,15 +1,5 @@
 <html>
   <body>
-    <style>
-      .example-appear {
-        opacity: 0.01;
-      }
-
-      .example-appear.example-appear-active {
-        opacity: 1;
-        transition: opacity .5s ease-in;
-      }
-    </style>
     <div id="container"></div>
     <script src="https://unpkg.com/requirejs@2.3.2/require.js"></script>
     <script src="output.js"></script>

diff --git a/fixtures/packaging/rjs/input.js b/fixtures/packaging/rjs/input.js
@@ -1,15 +1,6 @@
 require(['react', 'react-dom'], function(React, ReactDOM) {
-  var CSSTransitionGroup = React.addons.CSSTransitionGroup;
   ReactDOM.render(
-    React.createElement(CSSTransitionGroup, {
-      transitionName: 'example',
-      transitionAppear: true,
-      transitionAppearTimeout: 500,
-      transitionEnterTimeout: 0,
-      transitionLeaveTimeout: 0,
-    }, React.createElement('h1', null,
-      'Hello World!'
-    )),
+    React.createElement('h1', null, 'Hello World!'),
     document.getElementById('container')
   );
 });
diff --git a/fixtures/packaging/systemjs-builder/config.js b/fixtures/packaging/systemjs-builder/config.js
@@ -1,6 +1,6 @@
 System.config({
   paths: {
-    react: '../../../build/react-with-addons.js',
+    react: '../../../build/react.js',
     'react-dom': '../../../build/react-dom.js',
   },
 });
diff --git a/fixtures/packaging/systemjs-builder/index.html b/fixtures/packaging/systemjs-builder/index.html
@@ -1,15 +1,5 @@
 <html>
   <body>
-    <style>
-      .example-appear {
-        opacity: 0.01;
-      }
-
-      .example-appear.example-appear-active {
-        opacity: 1;
-        transition: opacity .5s ease-in;
-      }
-    </style>
     <div id="container"></div>
     <script src="output.js"></script>
   </body>

diff --git a/fixtures/packaging/systemjs-builder/input.js b/fixtures/packaging/systemjs-builder/input.js
@@ -1,16 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-var CSSTransitionGroup = React.addons.CSSTransitionGroup;
 ReactDOM.render(
-  React.createElement(CSSTransitionGroup, {
-    transitionName: 'example',
-    transitionAppear: true,
-    transitionAppearTimeout: 500,
-    transitionEnterTimeout: 0,
-    transitionLeaveTimeout: 0,
-  }, React.createElement('h1', null,
-    'Hello World!'
-  )),
+  React.createElement('h1', null, 'Hello World!'),
   document.getElementById('container')
 );
diff --git a/fixtures/packaging/systemjs.html b/fixtures/packaging/systemjs.html
@@ -1,21 +1,11 @@
 <html>
   <body>
     <script src="https://unpkg.com/systemjs@0.19.41/dist/system.js"></script>
-    <style>
-      .example-appear {
-        opacity: 0.01;
-      }
-
-      .example-appear.example-appear-active {
-        opacity: 1;
-        transition: opacity .5s ease-in;
-      }
-    </style>
     <div id="container"></div>
     <script>
       System.config({
         paths: {
-          react: '../../build/react-with-addons.js',
+          react: '../../build/react.js',
           'react-dom': '../../build/react-dom.js'
         }
       });
@@ -27,17 +17,8 @@
         var React = deps[0];
         var ReactDOM = deps[1];
 
-        var CSSTransitionGroup = React.addons.CSSTransitionGroup;
         ReactDOM.render(
-          React.createElement(CSSTransitionGroup, {
-            transitionName: 'example',
-            transitionAppear: true,
-            transitionAppearTimeout: 500,
-            transitionEnterTimeout: 0,
-            transitionLeaveTimeout: 0,
-          }, React.createElement('h1', null,
-            'Hello World!'
-          )),
+          React.createElement('h1', null, 'Hello World!'),
           document.getElementById('container')
         );
       });

diff --git a/fixtures/packaging/webpack-alias/config.js b/fixtures/packaging/webpack-alias/config.js
@@ -8,7 +8,7 @@ module.exports = {
   resolve: {
     root: path.resolve('../../../build/packages'),
     alias: {
-      'react': 'react/dist/react-with-addons',
+      'react': 'react/dist/react',
       'react-dom': 'react-dom/dist/react-dom',
     },
   },