Merge pull request #4 from flybayer/fix-ssr

Use dangerouslySetInnerHTML to ensure everything renders properly

Author: Ben Taylor

dist/JSONLD.js

@@ -34,7 +34,8 @@ var JSONLD = function JSONLD(props) {
     var firstChild = new ChildClass(props.children.props).getJSON(true, schema);
     json = ChildClass.name === 'JSONLDNodeCollection' ? _extends({ '@context': 'http://schema.org/' }, _defineProperty({}, type, firstChild)) : _extends({ '@context': 'http://schema.org/' }, firstChild);
   }
-  return _react2.default.createElement(
+
+  return props.dangerouslyExposeHtml ? _react2.default.createElement('script', { type: 'application/ld+json', dangerouslySetInnerHTML: { __html: JSON.stringify(json) } }) : _react2.default.createElement(
     'script',
     { type: 'application/ld+json' },
     JSON.stringify(json)
@@ -43,7 +44,12 @@ var JSONLD = function JSONLD(props) {
 
 exports.JSONLD = JSONLD;
 JSONLD.propTypes = {
-  additionalType: _propTypes2.default.object
+  additionalType: _propTypes2.default.object,
+  dangerouslyExposeHtml: _propTypes2.default.bool
+};
+
+JSONLD.defaultProps = {
+  dangerouslyExposeHtml: false
 };
 
 exports.default = JSONLD;

dist/schemas/Generic.js

@@ -16,8 +16,6 @@ var _JSONLDAbstractNode3 = _interopRequireDefault(_JSONLDAbstractNode2);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -45,7 +43,8 @@ var ChildNode = function (_JSONLDAbstractNode) {
       var details = {
         '@type': this.props.jsonldtype
       };
-      return isFirstChildNode ? _extends.apply(undefined, [_extends({}, details, schema)].concat(_toConsumableArray(parseChildren))) : _extends(_defineProperty({}, this.props.id, _extends({}, details, schema, parseChildren)));
+
+      return _extends.apply(undefined, [_extends({}, details, schema)].concat(_toConsumableArray(parseChildren)));
     }
   }]);
 

src/core/JSONLD.js

@@ -11,13 +11,20 @@ export const JSONLD = props => {
       ? Object.assign({'@context': 'http://schema.org/'}, {[type]: firstChild})
       : Object.assign({'@context': 'http://schema.org/'}, firstChild)
   }
-  return (
-    <script type="application/ld+json">{ JSON.stringify(json) }</script>
+
+  return (props.dangerouslyExposeHtml
+    ? <script type="application/ld+json" dangerouslySetInnerHTML={{__html: JSON.stringify(json)}} />
+    : <script type="application/ld+json">{ JSON.stringify(json) }</script>
   );
 }
 
 JSONLD.propTypes = {
-  additionalType: PropTypes.object
+  additionalType: PropTypes.object,
+  dangerouslyExposeHtml: PropTypes.bool
+};
+
+JSONLD.defaultProps = {
+  dangerouslyExposeHtml: false
 };
 
 export default JSONLD;

src/example/containers/Example.js

@@ -8,7 +8,8 @@ import {
   Review,
   Author,
   Location,
-  Rating
+  Rating,
+  Generic
 } from 'react-structured-data';