diff --git a/.flowconfig b/.flowconfig index c05e58f597..4c85601032 100644 --- a/.flowconfig +++ b/.flowconfig @@ -36,4 +36,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError [version] -^0.37.0 +^0.41.0 diff --git a/.travis.yml b/.travis.yml index 2a56780f56..a1989ffb47 100644 --- 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 index 1782deee77..58c832e29c 100644 --- 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 index 7a9872b7c0..5f5e1e4c7b 100644 --- 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/docs/docs/optimizing-performance.md b/docs/docs/optimizing-performance.md index cbb1b9849b..185fb57873 100644 --- a/docs/docs/optimizing-performance.md +++ b/docs/docs/optimizing-performance.md @@ -248,9 +248,9 @@ If you're using Create React App, both `Object.assign` and the object spread syn Immutability makes tracking changes cheap. A change will always result in a new object so we only need to check if the reference to the object has changed. For example, in this regular JavaScript code: ```javascript -const x = { foo: "bar" }; +const x = { foo: 'bar' }; const y = x; -y.foo = "baz"; +y.foo = 'baz'; x === y; // true ``` @@ -258,7 +258,7 @@ Although `y` was edited, since it's a reference to the same object as `x`, this ```javascript const SomeRecord = Immutable.Record({ foo: null }); -const x = new SomeRecord({ foo: 'bar' }); +const x = new SomeRecord({ foo: 'bar' }); const y = x.set('foo', 'baz'); x === y; // false ``` diff --git a/fixtures/packaging/README.md b/fixtures/packaging/README.md index 4cfaa439ba..af59bcaa16 100644 --- 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 index d2b798e524..e010d6b31d 100644 --- a/fixtures/packaging/browserify/index.html +++ b/fixtures/packaging/browserify/index.html @@ -1,15 +1,5 @@
- diff --git a/fixtures/packaging/browserify/input.js b/fixtures/packaging/browserify/input.js index da6cc5d0ff..93a0e76d43 100644 --- 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 index da6cc5d0ff..93a0e76d43 100644 --- 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 index 859d98d0f2..5902a1a690 100644 --- a/fixtures/packaging/brunch/index.html +++ b/fixtures/packaging/brunch/index.html @@ -1,15 +1,5 @@ - diff --git a/fixtures/packaging/brunch/input.js b/fixtures/packaging/brunch/input.js index da6cc5d0ff..93a0e76d43 100644 --- 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 index 8799e2956e..4713d27c21 100644 --- 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" } } \ No newline at end of file diff --git a/fixtures/packaging/globals.html b/fixtures/packaging/globals.html index 1bc3ef5e4f..3c80fbfe8d 100644 --- a/fixtures/packaging/globals.html +++ b/fixtures/packaging/globals.html @@ -1,30 +1,11 @@ - + - diff --git a/fixtures/packaging/requirejs.html b/fixtures/packaging/requirejs.html index d181b28f4f..325a2f031a 100644 --- a/fixtures/packaging/requirejs.html +++ b/fixtures/packaging/requirejs.html @@ -1,37 +1,18 @@ - diff --git a/fixtures/packaging/rjs/input.js b/fixtures/packaging/rjs/input.js index 2b0deee96c..510e71da20 100644 --- 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 index 931a037bd9..4a4a2c0c3e 100644 --- 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 index d2b798e524..e010d6b31d 100644 --- a/fixtures/packaging/systemjs-builder/index.html +++ b/fixtures/packaging/systemjs-builder/index.html @@ -1,15 +1,5 @@ - diff --git a/fixtures/packaging/systemjs-builder/input.js b/fixtures/packaging/systemjs-builder/input.js index 27d5c10086..e919c6f098 100644 --- 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 index 7cd000c939..2f4125c702 100644 --- a/fixtures/packaging/systemjs.html +++ b/fixtures/packaging/systemjs.html @@ -1,21 +1,11 @@ - diff --git a/fixtures/packaging/webpack-alias/input.js b/fixtures/packaging/webpack-alias/input.js index f1e2d79e23..93a0e76d43 100644 --- a/fixtures/packaging/webpack-alias/input.js +++ b/fixtures/packaging/webpack-alias/input.js @@ -1,16 +1,7 @@ var React = require('react'); var ReactDOM = require('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/webpack/index.html b/fixtures/packaging/webpack/index.html index d2b798e524..e010d6b31d 100644 --- a/fixtures/packaging/webpack/index.html +++ b/fixtures/packaging/webpack/index.html @@ -1,15 +1,5 @@ - diff --git a/fixtures/packaging/webpack/input.js b/fixtures/packaging/webpack/input.js index da6cc5d0ff..93a0e76d43 100644 --- a/fixtures/packaging/webpack/input.js +++ b/fixtures/packaging/webpack/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/grunt/config/browserify.js b/grunt/config/browserify.js index 5cc3f1f840..4cbdef2b25 100644 --- a/grunt/config/browserify.js +++ b/grunt/config/browserify.js @@ -21,12 +21,6 @@ var shimSharedModules = aliasify.configure({ }, }); -var shimDOMModules = aliasify.configure({ - 'aliases': { - './ReactAddonsDOMDependencies': {relative: './ReactAddonsDOMDependenciesUMDShim'}, - }, -}); - var SIMPLE_TEMPLATE = grunt.file.read('./grunt/data/header-template-short.txt'); @@ -172,37 +166,6 @@ var min = { after: [minify, bannerify], }; -var addons = { - entries: [ - './build/node_modules/react/lib/ReactWithAddonsUMDEntry.js', - ], - outfile: './build/react-with-addons.js', - debug: false, - standalone: 'React', - packageName: 'React (with addons)', - transforms: [shimDOMModules], - globalTransforms: [envifyDev], - plugins: [collapser], - after: [derequire, simpleBannerify], -}; - -var addonsMin = { - entries: [ - './build/node_modules/react/lib/ReactWithAddonsUMDEntry.js', - ], - outfile: './build/react-with-addons.min.js', - debug: false, - standalone: 'React', - packageName: 'React (with addons)', - transforms: [shimDOMModules, envifyProd, uglifyify], - globalTransforms: [envifyProd], - plugins: [collapser], - // No need to derequire because the minifier will mangle - // the "require" calls. - - after: [minify, bannerify], -}; - // The DOM Builds var dom = { entries: [ @@ -303,8 +266,6 @@ var domFiberMin = { module.exports = { basic: basic, min: min, - addons: addons, - addonsMin: addonsMin, dom: dom, domMin: domMin, domServer: domServer, diff --git a/grunt/tasks/npm-react-addons.js b/grunt/tasks/npm-react-addons.js deleted file mode 100644 index c0818ff75f..0000000000 --- a/grunt/tasks/npm-react-addons.js +++ /dev/null @@ -1,151 +0,0 @@ -'use strict'; - -var fs = require('fs'); -var grunt = require('grunt'); -var path = require('path'); - -var addons = { - CSSTransitionGroup: { - peerDependency: 'react', - module: 'ReactCSSTransitionGroup', - name: 'css-transition-group', - docs: 'animation', - }, - LinkedStateMixin: { - peerDependency: 'react', - module: 'LinkedStateMixin', - name: 'linked-state-mixin', - docs: 'two-way-binding-helpers', - }, - Perf: { - peerDependency: 'react-dom', - module: 'ReactPerf', - name: 'perf', - docs: 'perf', - }, - PureRenderMixin: { - peerDependency: 'react', - module: 'ReactComponentWithPureRenderMixin', - name: 'pure-render-mixin', - docs: 'pure-render-mixin', - }, - TestUtils: { - peerDependency: 'react-dom', - module: 'ReactTestUtils', - name: 'test-utils', - docs: 'test-utils', - }, - TransitionGroup: { - peerDependency: 'react', - module: 'ReactTransitionGroup', - name: 'transition-group', - docs: 'animation', - }, - createFragment: { - peerDependency: 'react', - module: 'ReactFragment', - method: 'create', - name: 'create-fragment', - docs: 'create-fragment', - }, - shallowCompare: { - peerDependency: 'react', - module: 'shallowCompare', - name: 'shallow-compare', - docs: 'shallow-compare', - }, - updates: { - peerDependency: 'react', - module: 'update', - name: 'update', - docs: 'update', - }, -}; - -function generateSource(info) { - var pieces = [ - 'module.exports = require(\'', - info.peerDependency, - '/lib/', - info.module, - '\')', - ]; - if (info.method) { - pieces.push('.', info.method); - } - pieces.push(';'); - return pieces.join(''); -} - -function buildReleases() { - var pkgTemplate = grunt.file.readJSON('./packages/react-addons/package.json'); - - Object.keys(addons).map(function(k) { - var info = addons[k]; - var pkgName = 'react-addons-' + info.name; - var destDir = 'build/packages/' + pkgName; - var destLicense = path.join(destDir, 'LICENSE'); - var destPatents = path.join(destDir, 'PATENTS'); - - var pkgData = Object.assign({}, pkgTemplate); - pkgData.name = pkgName; - - var version = pkgTemplate.peerDependencies.react; - if (info.peerDependency !== 'react') { - pkgData.peerDependencies = {}; - pkgData.peerDependencies[info.peerDependency] = version; - } - - grunt.file.mkdir(destDir); - var link = info.docs ? info.docs : 'addons'; - link = `https://facebook.github.io/react/docs/${link}.html`; - fs.writeFileSync(path.join(destDir, 'index.js'), generateSource(info)); - fs.writeFileSync(path.join(destDir, 'package.json'), JSON.stringify(pkgData, null, 2)); - grunt.file.copy('LICENSE', destLicense); - grunt.file.copy('PATENTS', destPatents); - fs.writeFileSync( - path.join(destDir, 'README.md'), - ` -# ${pkgName} - -This package provides the React ${k} add-on. - -See <${link}> for more information.`.slice(1) - ); - }); - -} - -function packReleases() { - var done = this.async(); - var count = 0; - - var addonKeys = Object.keys(addons); - - addonKeys.forEach(function(k) { - var info = addons[k]; - var pkgName = 'react-addons-' + info.name; - var pkgDir = 'build/packages/' + pkgName; - - var spawnCmd = { - cmd: 'npm', - args: ['pack', pkgDir], - }; - grunt.util.spawn(spawnCmd, function() { - var buildSrc = pkgName + '-' + grunt.config.data.pkg.version + '.tgz'; - var buildDest = 'build/packages/' + pkgName + '.tgz'; - fs.rename(buildSrc, buildDest, maybeDone); - }); - }); - - function maybeDone() { - if (++count === addonKeys.length) { - done(); - } - } -} - -module.exports = { - buildReleases: buildReleases, - packReleases: packReleases, -}; diff --git a/grunt/tasks/npm-react.js b/grunt/tasks/npm-react.js index 038d2fec51..35c8a520ea 100644 --- a/grunt/tasks/npm-react.js +++ b/grunt/tasks/npm-react.js @@ -11,8 +11,6 @@ var dist = dest + 'dist/'; var distFiles = [ 'react.js', 'react.min.js', - 'react-with-addons.js', - 'react-with-addons.min.js', ]; function buildRelease() { diff --git a/grunt/tasks/release.js b/grunt/tasks/release.js index 0ddab043d8..87186227bb 100644 --- a/grunt/tasks/release.js +++ b/grunt/tasks/release.js @@ -7,8 +7,6 @@ var BOWER_GLOB = [BOWER_PATH + '*.{js}']; var BOWER_FILES = [ 'react.js', 'react.min.js', - 'react-with-addons.js', - 'react-with-addons.min.js', 'react-dom.js', 'react-dom.min.js', 'react-dom-server.js', diff --git a/gulp/tasks/version-check.js b/gulp/tasks/version-check.js index 9e0cb23667..31118527d4 100644 --- a/gulp/tasks/version-check.js +++ b/gulp/tasks/version-check.js @@ -15,7 +15,6 @@ module.exports = function(gulp, plugins) { return function(done) { var reactVersion = require('../../package.json').version; - var addonsData = require('../../packages/react-addons/package.json'); var versions = { 'packages/react/package.json': require('../../packages/react/package.json').version, @@ -23,10 +22,6 @@ module.exports = function(gulp, plugins) { require('../../packages/react-dom/package.json').version, 'packages/react-native-renderer/package.json': require('../../packages/react-native-renderer/package.json').version, - 'packages/react-addons/package.json (version)': addonsData.version, - 'packages/react-addons/package.json (react dependency)': - // Get the "version" without the range bit - addonsData.peerDependencies.react.slice(1), 'packages/react-test-renderer/package.json': require('../../packages/react-test-renderer/package.json').version, 'src/ReactVersion.js': require('../../src/ReactVersion'), diff --git a/gulpfile.js b/gulpfile.js index cea6003e62..f25bc585b5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -31,11 +31,9 @@ var paths = { react: { src: [ 'src/umd/ReactUMDEntry.js', - 'src/umd/ReactWithAddonsUMDEntry.js', 'src/umd/shims/**/*.js', 'src/isomorphic/**/*.js', - 'src/addons/**/*.js', 'src/ReactVersion.js', 'src/shared/**/*.js', diff --git a/package.json b/package.json index c8f830dfe1..498c5f9412 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "eslint-plugin-react-internal": "file:./eslint-rules", "fbjs": "^0.8.9", "fbjs-scripts": "^0.6.0", - "flow-bin": "^0.37.0", + "flow-bin": "^0.41.0", "glob": "^6.0.4", "glob-stream": "^6.1.0", "grunt": "^0.4.5", diff --git a/packages/jsx_orphaned_brackets_transformer/.gitignore b/packages/jsx_orphaned_brackets_transformer/.gitignore deleted file mode 100644 index 3c3629e647..0000000000 --- a/packages/jsx_orphaned_brackets_transformer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/packages/jsx_orphaned_brackets_transformer/README.md b/packages/jsx_orphaned_brackets_transformer/README.md deleted file mode 100644 index e0fa3908ed..0000000000 --- a/packages/jsx_orphaned_brackets_transformer/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# JSX Orphaned Brackets Transformer - -React 0.13 no longer parses orphaned > and } as text. - -Take this example block: - -```js -