react-resolver - npm Package Compare versions

Comparing version 1.2.2 to 1.3.0

CHANGELOG.md

@@ -8,4 +8,2 @@ # React Resolver Changelog
 - [React Native](https://github.com/ericclemmons/react-resolver/issues/18)
-- [Bootstrapping Client](https://github.com/ericclemmons/react-resolver/issues/22)
-  + <https://github.com/ericclemmons/react-resolver/pull/34>
 - [Owner/Parent Differ](https://github.com/ericclemmons/react-resolver/issues/29)
@@ -15,2 +13,7 @@ - [Support Callbacks](https://github.com/ericclemmons/react-resolver/issues/35)
 
+### v1.3.0 - (2015-08-10)
+
+- [Bootstrapping Client](https://github.com/ericclemmons/react-resolver/issues/22)
+  + <https://github.com/ericclemmons/react-resolver/pull/34>
+
 ### v1.2.2 - (2015-08-05)
@@ -17,0 +20,0 @@

dist/Resolver.js

@@ -9,3 +9,3 @@ "use strict";
 
-var _get = function get(_x6, _x7, _x8) { var _again = true; _function: while (_again) { var object = _x6, property = _x7, receiver = _x8; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x6 = parent; _x7 = property; _x8 = receiver; _again = true; continue _function; } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
+var _get = function get(_x7, _x8, _x9) { var _again = true; _function: while (_again) { var object = _x7, property = _x8, receiver = _x9; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x7 = parent; _x8 = property; _x9 = receiver; _again = true; continue _function; } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
 
@@ -54,14 +54,15 @@ var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
     key: "finish",
-    value: function finish() {
+    value: function finish(renderer) {
       var _this = this;
 
+      var values = arguments.length <= 1 || arguments[1] === undefined ? [] : arguments[1];
+
       var total = this.promises.length;
-
-      return Promise.all(this.promises).then(function (values) {
-        if (_this.promises.length > total) {
-          return _this.finish();
-        }
-
-        return values;
-      });
+      renderer();
+      if (this.promises.length > total) {
+        return Promise.all(this.promises).then(function (valueResults) {
+          return _this.finish(renderer, valueResults);
+        });
+      }
+      return Promise.resolve(values);
     }
@@ -91,3 +92,3 @@ }, {
 
-      var state = this.states[id] || {
+      var state = this.states[id] || this.rehydrate(id) || {
         fulfilled: false,
@@ -131,2 +132,10 @@ rejected: false,
   }, {
+    key: "rehydrate",
+    value: function rehydrate(id) {
+      if (typeof __resolver__ === "undefined") {
+        return null;
+      }
+      return __resolver__[id];
+    }
+  }, {
     key: "resolve",
@@ -240,8 +249,13 @@ value: function resolve(container, callback) {
 
-      _react2["default"].renderToString(context);
-
-      return resolver.finish().then(function () {
+      return resolver.finish(function () {
+        return _react2["default"].renderToString(context);
+      }).then(function () {
         resolver.freeze();
-
-        return _react2["default"].renderToString(context);
+        var html = _react2["default"].renderToString(context);
+        return {
+          data: resolver.states,
+          toString: function toString() {
+            return html;
+          }
+        };
       });
@@ -259,8 +273,14 @@ }
 
-      _react2["default"].renderToStaticMarkup(context);
-
-      return resolver.finish().then(function () {
+      return resolver.finish(function () {
+        return _react2["default"].renderToStaticMarkup(context);
+      }).then(function () {
         resolver.freeze();
 
-        return _react2["default"].renderToStaticMarkup(context);
+        var html = _react2["default"].renderToStaticMarkup(context);
+        return {
+          data: resolver.states,
+          toString: function toString() {
+            return html;
+          }
+        };
       });
@@ -267,0 +287,0 @@ }

package.json

 {
   "name": "react-resolver",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Isomorphic library to lazy-load data for React components",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

31196

increased by2.41%

Lines of code

433

increased by5.87%

No dependency changes