@thoughtbot/superglue 0.50.0 → 0.51.1

package/action_creators/requests.js

@@ -90,6 +90,8 @@ function remote(path, _temp) {
       fetchArgs: fetchArgs
     }));
     return fetch.apply(void 0, fetchArgs).then(_utils.parseResponse).then(function (_ref2) {
+      var _pages$currentPageKey;
+
       var rsp = _ref2.rsp,
           json = _ref2.json;
 
@@ -103,6 +105,14 @@ function remote(path, _temp) {
         rsp: rsp,
         fetchArgs: fetchArgs
       });
+      var willReplaceCurrent = pageKey == currentPageKey;
+      var existingId = (_pages$currentPageKey = pages[currentPageKey]) == null ? void 0 : _pages$currentPageKey.componentIdentifier;
+      var receivedId = json.componentIdentifier;
+
+      if (willReplaceCurrent && !!existingId && existingId != receivedId) {
+        console.warn("You're about replace an existing page located at pages[\"" + currentPageKey + "\"]\nthat has the componentIdentifier \"" + existingId + "\" with the contents of a\nreceived page that has a componentIdentifier of \"" + receivedId + "\".\n\nThis can happen if you're using data-sg-remote or remote but your response\nredirected to a completely different page. Since remote requests do not\nnavigate or change the current page component, your current page component may\nreceive a shape that is unexpected and cause issues with rendering.\n\nConsider using data-sg-visit, the visit function, or redirect_back.");
+      }
+
       var page = beforeSave(pages[pageKey], json);
       return dispatch((0, _index.saveAndProcessPage)(pageKey, page)).then(function () {
         meta.pageKey = pageKey;

package/components/Nav.js

@@ -222,7 +222,7 @@ var Nav = /*#__PURE__*/function (_React$Component) {
     var reminder = '';
 
     if (!identifier) {
-      reminder = 'Did you forget to add `json.component_identifier` in your application.json.props layout?';
+      reminder = 'Did you forget to add `json.componentIdentifier` in your application.json.props layout?';
     }
 
     var error = new Error("Superglue Nav component was looking for " + identifier + " but could not find it in your mapping. " + reminder);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thoughtbot/superglue",
-  "version": "0.50.0",
+  "version": "0.51.1",
   "description": "Use a vanilla Rails with React and Redux",
   "repository": {
     "type": "git",

package/utils/url.js

@@ -8,8 +8,7 @@ exports.pathQueryHash = pathQueryHash;
 exports.pathWithoutBZParams = pathWithoutBZParams;
 exports.removePropsAt = removePropsAt;
 exports.urlToPageKey = urlToPageKey;
-exports.withAntiCache = withAntiCache;
-exports.withMimeBust = withMimeBust;
+exports.withFormatJson = withFormatJson;
 exports.withoutBusters = withoutBusters;
 exports.withoutHash = withoutHash;
 
@@ -17,10 +16,6 @@ var _urlParse = _interopRequireDefault(require("url-parse"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var uniqueId = function uniqueId() {
-  return Math.random().toString(36).substring(2, 10);
-};
-
 function pathQuery(url) {
   var _parse = new _urlParse["default"](url, {}),
       pathname = _parse.pathname,
@@ -44,43 +39,17 @@ function hasPropsAt(url) {
   return !!query['props_at'];
 }
 
-function withAntiCache(url) {
-  url = new _urlParse["default"](url, {}, true);
-
-  if (Object.prototype.hasOwnProperty.call(url.query, '_')) {
-    return url.toString();
-  } else {
-    url.query['_'] = uniqueId();
-    return url.toString();
-  }
-}
-
-function withMimeBust(url) {
+function withFormatJson(url) {
   url = new _urlParse["default"](url, {}, true);
-
-  if (Object.prototype.hasOwnProperty.call(url.query, '__')) {
-    return url.toString();
-  } else {
-    url.query['__'] = '0';
-    return url.toString();
-  }
-}
-
-function withoutBusters(url) {
-  url = new _urlParse["default"](url, {}, true);
-  var query = url.query;
-  delete query['__'];
-  delete query['_'];
-  url.query = query;
-  return pathQuery(url.toString());
+  url.query['format'] = 'json';
+  return url.toString();
 }
 
 function pathWithoutBZParams(url) {
   url = new _urlParse["default"](url, {}, true);
   var query = url.query;
-  delete query['__'];
-  delete query['_'];
   delete query['props_at'];
+  delete query['format'];
   url.query = query;
   return pathQueryHash(url.toString());
 }
@@ -96,9 +65,8 @@ function removePropsAt(url) {
 function urlToPageKey(url) {
   url = new _urlParse["default"](url, {}, true);
   var query = url.query;
-  delete query['__'];
-  delete query['_'];
   delete query['props_at'];
+  delete query['format'];
   url.query = query;
   return pathQuery(url.toString());
 }
@@ -109,17 +77,16 @@ function withoutHash(url) {
   return url.toString();
 }
 
-function formatForXHR(url, opts) {
-  if (opts === void 0) {
-    opts = {};
-  }
-
-  var formats = [withMimeBust, withoutHash];
-
-  if (opts.cacheRequest) {
-    formats.push(withAntiCache);
-  }
+function withoutBusters(url) {
+  url = new _urlParse["default"](url, {}, true);
+  var query = url.query;
+  delete query['format'];
+  url.query = query;
+  return pathQuery(url.toString());
+}
 
+function formatForXHR(url) {
+  var formats = [withoutHash, withFormatJson];
   return formats.reduce(function (memo, f) {
     return f(memo);
   }, url);