From c806ed11286276a20f4a6b4bd5049ad3cfd013e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Tue, 17 Nov 2015 21:57:51 -0800
Subject: [PATCH] Merge pull request #5496 from zpao/reactdomserverfollowup

Followup to #5381
(cherry picked from commit 60cba8fcf74d10107ff8978b225a9b06865bba17)
---
 .eslintignore              | 3 +--
 .travis.yml                | 4 ++--
 vendor/react-dom-server.js | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index fe241d840d..11bddecc6c 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -16,5 +16,4 @@ packages/react-codemod/test/
 packages/react-codemod/scripts/
 packages/react-codemod/build/
 packages/react-codemod/node_modules/
-vendor/react-dom.js
-vendor/react-dom-server.js
\ No newline at end of file
+vendor/*
diff --git a/.travis.yml b/.travis.yml
index c1e782d3d7..ba63714af4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,8 +54,8 @@ script:
           -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"
-          -F "react-dom-server.min=@build/react-dom-server.min.js"
+          -F "react-dom-server=@build/react-dom-server.js" \
+          -F "react-dom-server.min=@build/react-dom-server.min.js" \
           -F "npm-react=@build/packages/react.tgz" \
           -F "npm-react-dom=@build/packages/react-dom.tgz" \
           -F "commit=$TRAVIS_COMMIT" \
diff --git a/vendor/react-dom-server.js b/vendor/react-dom-server.js
index c24756dc4b..70ca07e8aa 100644
--- a/vendor/react-dom-server.js
+++ b/vendor/react-dom-server.js
@@ -23,7 +23,7 @@
       // see https://github.com/facebook/react/issues/3037
       g = this;
     }
-    g.ReactDOM = f(g.React);
+    g.ReactDOMServer = f(g.React);
   }
 
 })(function(React) {