Skip to content

Commit

Permalink
update dev to react 0.15
Browse files Browse the repository at this point in the history
  • Loading branch information
ariabuckles committed May 26, 2016
1 parent 8b48fcd commit 5922a2a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
3 changes: 2 additions & 1 deletion __tests__/simple-markdown-test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var assert = require("assert");
var _ = require("underscore");
var React = require("react");
var ReactDOMServer = require("react-dom/server");

var SimpleMarkdown = require("../simple-markdown.js");
var blockParse = SimpleMarkdown.defaultBlockParse;
Expand Down Expand Up @@ -41,7 +42,7 @@ var validateParse = function(parsed, expected) {

var htmlThroughReact = function(parsed) {
var output = defaultOutput(parsed);
var rawHtml = React.renderToStaticMarkup(
var rawHtml = ReactDOMServer.renderToStaticMarkup(
React.DOM.div(null, output)
);
var innerHtml = rawHtml
Expand Down
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@
"homepage": "https://github.com/Khan/simple-markdown",
"devDependencies": {
"mocha": "^2.5.3",
"react-tools": ">=0.13.0-rc2",
"underscore": "^1.4.4",
"react": ">=0.14.0-rc1"
},
"dependencies": {
"uglify-js": "^2.6.2"
"react": "^15.1.0",
"react-dom": "^15.1.0",
"uglify-js": "^2.6.2",
"underscore": "^1.4.4"
}
}

0 comments on commit 5922a2a

Please sign in to comment.