npm - @atlaskit/node-data-provider - Versions diffs - 7.4.0 → 7.5.0 - Mend

@atlaskit/node-data-provider 7.4.0 → 7.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/CHANGELOG.md +8 -0
package/dist/cjs/node-data-provider.js +30 -32
package/dist/es2019/node-data-provider.js +5 -4
package/dist/esm/node-data-provider.js +30 -32
package/package.json +2 -2

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,13 @@
 # @atlaskit/node-data-provider
+## 7.5.0
+### Minor Changes
+- [`e3f45edd75547`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e3f45edd75547) -
+  [https://product-fabric.atlassian.net/browse/ED-29647](ED-29647) - OTP will not use network data
+  if preloaded data is unavailable during SSR rendering
 ## 7.4.0
 ### Minor Changes

package/dist/cjs/node-data-provider.js CHANGED Viewed

@@ -151,22 +151,20 @@ var NodeDataProvider = exports.NodeDataProvider = /*#__PURE__*/function () {
             case 4:
               dataKey = this.nodeDataKey(jsonNode);
               dataFromCache = this.cache[dataKey];
-              if (!(dataFromCache !== undefined)) {
-                _context.next = 10;
-                break;
+              if (dataFromCache !== undefined) {
+                // If we have the data in the SSR data, we can use it directly
+                callback({
+                  data: dataFromCache.data
+                });
               }
-              // If we have the data in the SSR data, we can use it directly
-              callback({
-                data: dataFromCache.data
-              });
               if (!(0, _coreUtils.isSSR)()) {
-                _context.next = 10;
+                _context.next = 9;
                 break;
               }
               return _context.abrupt("return");
-            case 10:
+            case 9:
               if (!((dataFromCache === null || dataFromCache === void 0 ? void 0 : dataFromCache.source) !== 'network')) {
-                _context.next = 42;
+                _context.next = 41;
                 break;
               }
               // Store the current cache version before making the request,
@@ -177,38 +175,38 @@ var NodeDataProvider = exports.NodeDataProvider = /*#__PURE__*/function () {
               // to avoid duplicate requests.
               networkRequestInFlight = this.networkRequestsInFlight[networkRequestInFlightKey];
               if (!networkRequestInFlight) {
-                _context.next = 26;
+                _context.next = 25;
                 break;
               }
-              _context.prev = 15;
-              _context.next = 18;
+              _context.prev = 14;
+              _context.next = 17;
               return networkRequestInFlight;
-            case 18:
+            case 17:
               data = _context.sent;
               callback({
                 data: data
               });
-              _context.next = 25;
+              _context.next = 24;
               break;
-            case 22:
-              _context.prev = 22;
-              _context.t0 = _context["catch"](15);
+            case 21:
+              _context.prev = 21;
+              _context.t0 = _context["catch"](14);
               callback({
                 error: _context.t0 instanceof Error ? _context.t0 : new Error(String(_context.t0))
               });
-            case 25:
+            case 24:
               return _context.abrupt("return");
-            case 26:
-              _context.prev = 26;
+            case 25:
+              _context.prev = 25;
               dataPromise = this.fetchNodesData([jsonNode]).then(function (_ref3) {
                 var _ref4 = (0, _slicedToArray2.default)(_ref3, 1),
                   value = _ref4[0];
                 return value;
               }); // Store the promise in the in-flight requests map
               this.networkRequestsInFlight[networkRequestInFlightKey] = dataPromise;
-              _context.next = 31;
+              _context.next = 30;
               return dataPromise;
-            case 31:
+            case 30:
               _data = _context.sent;
               // We need to call the callback with the data with result even if the cache version has changed,
               // so all promises that are waiting for the data can resolve.
@@ -225,25 +223,25 @@ var NodeDataProvider = exports.NodeDataProvider = /*#__PURE__*/function () {
                   data: _data
                 };
               }
-              _context.next = 39;
+              _context.next = 38;
               break;
-            case 36:
-              _context.prev = 36;
-              _context.t1 = _context["catch"](26);
+            case 35:
+              _context.prev = 35;
+              _context.t1 = _context["catch"](25);
               // If an error occurs, we call the callback with the error
               callback({
                 error: _context.t1 instanceof Error ? _context.t1 : new Error(String(_context.t1))
               });
-            case 39:
-              _context.prev = 39;
+            case 38:
+              _context.prev = 38;
               // Ensure we clean up the in-flight request entry
               delete this.networkRequestsInFlight[networkRequestInFlightKey];
-              return _context.finish(39);
-            case 42:
+              return _context.finish(38);
+            case 41:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[15, 22], [26, 36, 39, 42]]);
+        }, _callee, this, [[14, 21], [25, 35, 38, 41]]);
       }));
       function getDataAsync(_x, _x2) {
         return _getDataAsync.apply(this, arguments);

package/dist/es2019/node-data-provider.js CHANGED Viewed

@@ -151,10 +151,11 @@ export class NodeDataProvider {
       callback({
         data: dataFromCache.data
       });
-      if (isSSR()) {
-        // If we are in SSR, we don't want to fetch the data again, as it is already available in the SSR data
-        return;
-      }
+    }
+    if (isSSR()) {
+      // During SSR, we only use the cache and never fetch from the network.
+      // Use loading state instead.
+      return;
     }
     // If no data is available in the cache, or the data is from the network,

package/dist/esm/node-data-provider.js CHANGED Viewed

@@ -148,22 +148,20 @@ export var NodeDataProvider = /*#__PURE__*/function () {
             case 4:
               dataKey = this.nodeDataKey(jsonNode);
               dataFromCache = this.cache[dataKey];
-              if (!(dataFromCache !== undefined)) {
-                _context.next = 10;
-                break;
+              if (dataFromCache !== undefined) {
+                // If we have the data in the SSR data, we can use it directly
+                callback({
+                  data: dataFromCache.data
+                });
               }
-              // If we have the data in the SSR data, we can use it directly
-              callback({
-                data: dataFromCache.data
-              });
               if (!isSSR()) {
-                _context.next = 10;
+                _context.next = 9;
                 break;
               }
               return _context.abrupt("return");
-            case 10:
+            case 9:
               if (!((dataFromCache === null || dataFromCache === void 0 ? void 0 : dataFromCache.source) !== 'network')) {
-                _context.next = 42;
+                _context.next = 41;
                 break;
               }
               // Store the current cache version before making the request,
@@ -174,38 +172,38 @@ export var NodeDataProvider = /*#__PURE__*/function () {
               // to avoid duplicate requests.
               networkRequestInFlight = this.networkRequestsInFlight[networkRequestInFlightKey];
               if (!networkRequestInFlight) {
-                _context.next = 26;
+                _context.next = 25;
                 break;
               }
-              _context.prev = 15;
-              _context.next = 18;
+              _context.prev = 14;
+              _context.next = 17;
               return networkRequestInFlight;
-            case 18:
+            case 17:
               data = _context.sent;
               callback({
                 data: data
               });
-              _context.next = 25;
+              _context.next = 24;
               break;
-            case 22:
-              _context.prev = 22;
-              _context.t0 = _context["catch"](15);
+            case 21:
+              _context.prev = 21;
+              _context.t0 = _context["catch"](14);
               callback({
                 error: _context.t0 instanceof Error ? _context.t0 : new Error(String(_context.t0))
               });
-            case 25:
+            case 24:
               return _context.abrupt("return");
-            case 26:
-              _context.prev = 26;
+            case 25:
+              _context.prev = 25;
               dataPromise = this.fetchNodesData([jsonNode]).then(function (_ref3) {
                 var _ref4 = _slicedToArray(_ref3, 1),
                   value = _ref4[0];
                 return value;
               }); // Store the promise in the in-flight requests map
               this.networkRequestsInFlight[networkRequestInFlightKey] = dataPromise;
-              _context.next = 31;
+              _context.next = 30;
               return dataPromise;
-            case 31:
+            case 30:
               _data = _context.sent;
               // We need to call the callback with the data with result even if the cache version has changed,
               // so all promises that are waiting for the data can resolve.
@@ -222,25 +220,25 @@ export var NodeDataProvider = /*#__PURE__*/function () {
                   data: _data
                 };
               }
-              _context.next = 39;
+              _context.next = 38;
               break;
-            case 36:
-              _context.prev = 36;
-              _context.t1 = _context["catch"](26);
+            case 35:
+              _context.prev = 35;
+              _context.t1 = _context["catch"](25);
               // If an error occurs, we call the callback with the error
               callback({
                 error: _context.t1 instanceof Error ? _context.t1 : new Error(String(_context.t1))
               });
-            case 39:
-              _context.prev = 39;
+            case 38:
+              _context.prev = 38;
               // Ensure we clean up the in-flight request entry
               delete this.networkRequestsInFlight[networkRequestInFlightKey];
-              return _context.finish(39);
-            case 42:
+              return _context.finish(38);
+            case 41:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[15, 22], [26, 36, 39, 42]]);
+        }, _callee, this, [[14, 21], [25, 35, 38, 41]]);
       }));
       function getDataAsync(_x, _x2) {
         return _getDataAsync.apply(this, arguments);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/node-data-provider",
-	"version": "7.4.0",
+	"version": "7.5.0",
 	"description": "Node data provider for @atlaskit/editor-core plugins and @atlaskit/renderer",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -26,7 +26,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.21.0"
+		"@atlaskit/editor-common": "^110.22.0"
 	},
 	"techstack": {
 		"@atlassian/frontend": {