From 17786c7f261012a72dee8f20ace72f5c6106c53a Mon Sep 17 00:00:00 2001 From: Dmitriy Sobolev Date: Sat, 18 Feb 2017 14:54:25 +0300 Subject: [PATCH 1/4] Switch ReactDOM UMD bundles to Fiber entry points --- grunt/config/browserify.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grunt/config/browserify.js b/grunt/config/browserify.js index 5cc3f1f840a7..749ca890223d 100644 --- a/grunt/config/browserify.js +++ b/grunt/config/browserify.js @@ -206,7 +206,7 @@ var addonsMin = { // The DOM Builds var dom = { entries: [ - './build/node_modules/react-dom/lib/ReactDOMUMDEntry.js', + './build/node_modules/react-dom/lib/ReactDOMFiber.js', ], outfile: './build/react-dom.js', debug: false, @@ -220,7 +220,7 @@ var dom = { var domMin = { entries: [ - './build/node_modules/react-dom/lib/ReactDOMUMDEntry.js', + './build/node_modules/react-dom/lib/ReactDOMFiber.js', ], outfile: './build/react-dom.min.js', debug: false, From e7fe688327d98b8aaa3c98940fc7562c547631dd Mon Sep 17 00:00:00 2001 From: Dmitriy Sobolev Date: Sat, 18 Feb 2017 15:22:34 +0300 Subject: [PATCH 2/4] Remove Fiber UMD builds --- Gruntfile.js | 12 ------------ grunt/config/browserify.js | 34 ---------------------------------- 2 files changed, 46 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 1782deee778b..c1630afa916f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -139,16 +139,6 @@ module.exports = function(grunt) { 'version-check', 'browserify:domServerMin', ]); - grunt.registerTask('build:dom-fiber', [ - 'build-modules', - 'version-check', - 'browserify:domFiber', - ]); - grunt.registerTask('build:dom-fiber-min', [ - 'build-modules', - 'version-check', - 'browserify:domFiberMin', - ]); grunt.registerTask('build:npm-react', [ 'version-check', 'build-modules', @@ -176,8 +166,6 @@ module.exports = function(grunt) { 'browserify:domMin', 'browserify:domServer', 'browserify:domServerMin', - 'browserify:domFiber', - 'browserify:domFiberMin', 'npm-react:release', 'npm-react:pack', 'npm-react-dom:release', diff --git a/grunt/config/browserify.js b/grunt/config/browserify.js index 749ca890223d..847a5f3e923f 100644 --- a/grunt/config/browserify.js +++ b/grunt/config/browserify.js @@ -268,38 +268,6 @@ var domServerMin = { after: [wrapperify, minify, bannerify], }; -var domFiber = { - entries: [ - './build/node_modules/react-dom/lib/ReactDOMFiber.js', - ], - outfile: './build/react-dom-fiber.js', - debug: false, - standalone: 'ReactDOMFiber', - // Apply as global transform so that we also envify fbjs and any other deps - transforms: [shimSharedModules], - globalTransforms: [envifyDev], - plugins: [collapser], - after: [derequire, wrapperify, simpleBannerify], -}; - -var domFiberMin = { - entries: [ - './build/node_modules/react-dom/lib/ReactDOMFiber.js', - ], - outfile: './build/react-dom-fiber.min.js', - debug: false, - standalone: 'ReactDOMFiber', - // Envify twice. The first ensures that when we uglifyify, we have the right - // conditions to exclude requires. The global transform runs on deps. - transforms: [shimSharedModules, envifyProd, uglifyify], - globalTransforms: [envifyProd], - plugins: [collapser], - // No need to derequire because the minifier will mangle - // the "require" calls. - - after: [wrapperify, minify, bannerify], -}; - module.exports = { basic: basic, min: min, @@ -309,6 +277,4 @@ module.exports = { domMin: domMin, domServer: domServer, domServerMin: domServerMin, - domFiber: domFiber, - domFiberMin: domFiberMin, }; From f17fe675651c7d017b089378dbf5a97de7631b17 Mon Sep 17 00:00:00 2001 From: Dmitriy Sobolev Date: Sat, 18 Feb 2017 17:25:13 +0300 Subject: [PATCH 3/4] Revert "Switch ReactDOM UMD bundles to Fiber entry points" This reverts commit 17786c7f261012a72dee8f20ace72f5c6106c53a. --- grunt/config/browserify.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grunt/config/browserify.js b/grunt/config/browserify.js index 847a5f3e923f..c4a3231e8442 100644 --- a/grunt/config/browserify.js +++ b/grunt/config/browserify.js @@ -206,7 +206,7 @@ var addonsMin = { // The DOM Builds var dom = { entries: [ - './build/node_modules/react-dom/lib/ReactDOMFiber.js', + './build/node_modules/react-dom/lib/ReactDOMUMDEntry.js', ], outfile: './build/react-dom.js', debug: false, @@ -220,7 +220,7 @@ var dom = { var domMin = { entries: [ - './build/node_modules/react-dom/lib/ReactDOMFiber.js', + './build/node_modules/react-dom/lib/ReactDOMUMDEntry.js', ], outfile: './build/react-dom.min.js', debug: false, From cab1c193fe2c743eae2ba5238b8d7e51820970b3 Mon Sep 17 00:00:00 2001 From: Dmitriy Sobolev Date: Sat, 18 Feb 2017 17:33:10 +0300 Subject: [PATCH 4/4] Require ReactDOMFiber for UMD build --- src/umd/ReactDOMUMDEntry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/umd/ReactDOMUMDEntry.js b/src/umd/ReactDOMUMDEntry.js index 03a0318a1050..3b1cb91c7b41 100644 --- a/src/umd/ReactDOMUMDEntry.js +++ b/src/umd/ReactDOMUMDEntry.js @@ -12,7 +12,7 @@ 'use strict'; var React = require('React'); -var ReactDOM = require('ReactDOM'); +var ReactDOM = require('ReactDOMFiber'); var ReactDOMUMDEntry = ReactDOM;