From 202fd5432e7aeaa90dfb0284de33cf262e7ebbc2 Mon Sep 17 00:00:00 2001 From: Dominic Gannaway Date: Tue, 4 Apr 2017 15:27:29 +0100 Subject: [PATCH] added react-dom-server --- packages/react-dom/server.js | 7 +++++++ scripts/rollup/build.js | 12 +++++++++++- scripts/rollup/bundles.js | 5 ++--- scripts/rollup/results.json | 2 +- 4 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 packages/react-dom/server.js diff --git a/packages/react-dom/server.js b/packages/react-dom/server.js new file mode 100644 index 0000000000..1354ce8514 --- /dev/null +++ b/packages/react-dom/server.js @@ -0,0 +1,7 @@ +'use strict'; + +if (process.env.NODE_ENV === 'production') { + module.exports = require('./cjs/react-dom-server.production.min.js'); +} else { + module.exports = require('./cjs/react-dom-server.development.js'); +} diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index a7e221eebb..90d3118cf3 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -197,6 +197,8 @@ function getFormat(bundleType) { } function getFilename(name, hasteName, bundleType) { + // we do this to replace / to -, for react-dom/server + name = name.replace('/', '-'); switch (bundleType) { case UMD_DEV: return `${name}.development.js`; @@ -446,6 +448,13 @@ function printResults() { ); } +function getPackageName(name) { + if (name.indexOf('/') !== -1) { + return name.split('/')[0]; + } + return name; +} + function getPlugins(entry, babelOpts, paths, filename, bundleType, isRenderer, manglePropertiesOnProd) { const plugins = [ replace( @@ -515,6 +524,7 @@ function createBundle({ } const filename = getFilename(name, hasteName, bundleType); const format = getFormat(bundleType); + const packageName = getPackageName(name); console.log(`${chalk.bgYellow.black(' STARTING ')} ${chalk.white.bold(filename)}`); return rollup({ @@ -533,7 +543,7 @@ function createBundle({ }).then(({write}) => write( updateBundleConfig(config, filename, format, bundleType, hasteName) )).then(() => ( - createNodePackage(bundleType, name, filename) + createNodePackage(bundleType, packageName, filename) )).then(() => { console.log(`${chalk.bgGreen.black(' COMPLETE ')} ${chalk.white.bold(filename)}\n`); }).catch(error => { diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index e1a376e039..6b7cd6fec6 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -118,7 +118,7 @@ const bundles = [ { babelOpts: babelOptsReact, // TODO: deal with the Node version of react-dom-server package - bundleTypes: [UMD_DEV, UMD_PROD, FB_DEV, FB_PROD], + bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD], config: { destDir: 'build/', globals: { @@ -135,7 +135,7 @@ const bundles = [ manglePropertiesOnProd: false, // TODO: this is taken. Do we change the build task // to understand react-dom/server? - name: 'react-dom-server', + name: 'react-dom/server', paths: [ 'src/umd/ReactDOMServerUMDEntry.js', @@ -173,7 +173,6 @@ const bundles = [ isRenderer: true, manglePropertiesOnProd: false, name: 'react-art', - nodePackageName: 'react-art', paths: [ // TODO: it relies on ReactDOMFrameScheduling. Need to move to shared/? 'src/renderers/dom/**/*.js', diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json index c0e6d25382..0e8f6ab25d 100644 --- a/scripts/rollup/results.json +++ b/scripts/rollup/results.json @@ -1 +1 @@ -{"branch":"rollup","ReactNative.js":{"filename":"ReactNative.js","gzip":555,"size":1569}} \ No newline at end of file +{"branch":"rollup","react.production.min.js":{"filename":"react.production.min.js","gzip":4693,"size":12742},"react-dom.production.min.js":{"filename":"react-dom.production.min.js","gzip":35646,"size":112823},"react-dom-server.production.min.js":{"filename":"react-dom-server.production.min.js","gzip":31190,"size":101538}} \ No newline at end of file