Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5496 from zpao/reactdomserverfollowup

Browse Source 
Followup to #5381
(cherry picked from commit 60cba8fcf7)
This commit is contained in:
Paul O’Shannessy
2015-11-18 13:18:26 -08:00
parent 294b50a695
commit c806ed1128
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.eslintignore
+1 -2
View File
@@ -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
vendor/*
.travis.yml
+2 -2
View File
@@ -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" \
vendor/react-dom-server.js
Vendored
+1 -1
View File
@@ -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) {