@thoughtbot/superglue 0.53.3 → 0.53.4

package/action_creators/index.js

@@ -11,27 +11,20 @@ exports.copyPage = copyPage;
 exports.handleGraft = handleGraft;
 exports.saveAndProcessPage = saveAndProcessPage;
 exports.saveResponse = saveResponse;
-
 var _utils = require("../utils");
-
 var _urlParse = _interopRequireDefault(require("url-parse"));
-
 var _actions = require("../actions");
-
 var _requests = require("./requests");
-
 Object.keys(_requests).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _requests[key]) return;
   exports[key] = _requests[key];
 });
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function copyPage(_ref) {
   var from = _ref.from,
-      to = _ref.to;
+    to = _ref.to;
   return {
     type: _actions.COPY_PAGE,
     payload: {
@@ -40,10 +33,9 @@ function copyPage(_ref) {
     }
   };
 }
-
 function saveResponse(_ref2) {
   var pageKey = _ref2.pageKey,
-      page = _ref2.page;
+    page = _ref2.page;
   pageKey = (0, _utils.urlToPageKey)(pageKey);
   return {
     type: _actions.SAVE_RESPONSE,
@@ -53,10 +45,9 @@ function saveResponse(_ref2) {
     }
   };
 }
-
 function handleGraft(_ref3) {
   var pageKey = _ref3.pageKey,
-      page = _ref3.page;
+    page = _ref3.page;
   pageKey = (0, _utils.urlToPageKey)(pageKey);
   return {
     type: _actions.HANDLE_GRAFT,
@@ -66,12 +57,10 @@ function handleGraft(_ref3) {
     }
   };
 }
-
 function fetchDeferments(pageKey, defers) {
   if (defers === void 0) {
     defers = [];
   }
-
   pageKey = (0, _utils.urlToPageKey)(pageKey);
   return function (dispatch) {
     var fetches = defers.filter(function (_ref4) {
@@ -79,10 +68,10 @@ function fetchDeferments(pageKey, defers) {
       return type === 'auto';
     }).map(function (_ref5) {
       var url = _ref5.url,
-          _ref5$successAction = _ref5.successAction,
-          successAction = _ref5$successAction === void 0 ? _actions.GRAFTING_SUCCESS : _ref5$successAction,
-          _ref5$failAction = _ref5.failAction,
-          failAction = _ref5$failAction === void 0 ? _actions.GRAFTING_ERROR : _ref5$failAction;
+        _ref5$successAction = _ref5.successAction,
+        successAction = _ref5$successAction === void 0 ? _actions.GRAFTING_SUCCESS : _ref5$successAction,
+        _ref5$failAction = _ref5.failAction,
+        failAction = _ref5$failAction === void 0 ? _actions.GRAFTING_ERROR : _ref5$failAction;
       var parsedUrl = new _urlParse["default"](url, true);
       var keyPath = parsedUrl.query.props_at;
       return dispatch((0, _requests.remote)(url, {
@@ -110,12 +99,11 @@ function fetchDeferments(pageKey, defers) {
     return Promise.all(fetches);
   };
 }
-
 function updateFragmentsUsing(page) {
   var changedFragments = {};
   page.fragments.forEach(function (fragment) {
     var type = fragment.type,
-        path = fragment.path;
+      path = fragment.path;
     changedFragments[type] = (0, _utils.getIn)(page, path);
   });
   return {
@@ -125,13 +113,11 @@ function updateFragmentsUsing(page) {
     }
   };
 }
-
 function saveAndProcessPage(pageKey, page) {
   return function (dispatch, getState) {
     pageKey = (0, _utils.urlToPageKey)(pageKey);
     var _page$defers = page.defers,
-        defers = _page$defers === void 0 ? [] : _page$defers;
-
+      defers = _page$defers === void 0 ? [] : _page$defers;
     if ((0, _utils.isGraft)(page)) {
       dispatch(handleGraft({
         pageKey: pageKey,
@@ -143,9 +129,7 @@ function saveAndProcessPage(pageKey, page) {
         page: page
       }));
     }
-
     var hasFetch = typeof fetch != 'undefined';
-
     if (hasFetch) {
       return dispatch(fetchDeferments(pageKey, defers)).then(function () {
         if (page.fragments.length > 0) {

package/action_creators/requests.js

@@ -3,34 +3,27 @@
 exports.__esModule = true;
 exports.remote = remote;
 exports.visit = visit;
-
 var _utils = require("../utils");
-
 var _actions = require("../actions");
-
 var _index = require("./index");
-
 function beforeVisit(payload) {
   return {
     type: _actions.BEFORE_VISIT,
     payload: payload
   };
 }
-
 function beforeRemote(payload) {
   return {
     type: _actions.BEFORE_REMOTE,
     payload: payload
   };
 }
-
 function beforeFetch(payload) {
   return {
     type: _actions.BEFORE_FETCH,
     payload: payload
   };
 }
-
 function handleError(err) {
   return {
     type: _actions.SUPERGLUE_ERROR,
@@ -39,7 +32,6 @@ function handleError(err) {
     }
   };
 }
-
 function handleFetchErr(err, fetchArgs, dispatch) {
   err.fetchArgs = fetchArgs;
   err.url = fetchArgs[0];
@@ -47,7 +39,6 @@ function handleFetchErr(err, fetchArgs, dispatch) {
   dispatch(handleError(err));
   throw err;
 }
-
 function buildMeta(pageKey, page, state) {
   var prevAssets = state.assets;
   var nextAssets = page.assets;
@@ -58,20 +49,18 @@ function buildMeta(pageKey, page, state) {
     needsRefresh: (0, _utils.needsRefresh)(prevAssets, nextAssets)
   };
 }
-
 function remote(path, _temp) {
   var _ref = _temp === void 0 ? {} : _temp,
-      _ref$method = _ref.method,
-      method = _ref$method === void 0 ? 'GET' : _ref$method,
-      headers = _ref.headers,
-      _ref$body = _ref.body,
-      body = _ref$body === void 0 ? '' : _ref$body,
-      pageKey = _ref.pageKey,
-      _ref$beforeSave = _ref.beforeSave,
-      beforeSave = _ref$beforeSave === void 0 ? function (prevPage, receivedPage) {
-    return receivedPage;
-  } : _ref$beforeSave;
-
+    _ref$method = _ref.method,
+    method = _ref$method === void 0 ? 'GET' : _ref$method,
+    headers = _ref.headers,
+    _ref$body = _ref.body,
+    body = _ref$body === void 0 ? '' : _ref$body,
+    pageKey = _ref.pageKey,
+    _ref$beforeSave = _ref.beforeSave,
+    beforeSave = _ref$beforeSave === void 0 ? function (prevPage, receivedPage) {
+      return receivedPage;
+    } : _ref$beforeSave;
   path = (0, _utils.withoutBusters)(path);
   pageKey = pageKey && (0, _utils.urlToPageKey)(pageKey);
   return function (dispatch, getState) {
@@ -91,15 +80,12 @@ function remote(path, _temp) {
     }));
     return fetch.apply(void 0, fetchArgs).then(_utils.parseResponse).then(function (_ref2) {
       var _pages$currentPageKey;
-
       var rsp = _ref2.rsp,
-          json = _ref2.json;
-
+        json = _ref2.json;
       var _getState = getState(),
-          superglue = _getState.superglue,
-          _getState$pages = _getState.pages,
-          pages = _getState$pages === void 0 ? {} : _getState$pages;
-
+        superglue = _getState.superglue,
+        _getState$pages = _getState.pages,
+        pages = _getState$pages === void 0 ? {} : _getState$pages;
       var meta = Object.assign({}, buildMeta(pageKey, json, superglue), {
         redirected: rsp.redirected,
         rsp: rsp,
@@ -108,11 +94,9 @@ function remote(path, _temp) {
       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;
@@ -123,49 +107,44 @@ function remote(path, _temp) {
     });
   };
 }
-
 var lastVisitController = {
-  abort: function abort() {}
+  abort: function abort() {
+    // noop
+  }
 };
-
 function visit(path, _temp2) {
   var _ref3 = _temp2 === void 0 ? {} : _temp2,
-      _ref3$method = _ref3.method,
-      method = _ref3$method === void 0 ? 'GET' : _ref3$method,
-      headers = _ref3.headers,
-      _ref3$body = _ref3.body,
-      body = _ref3$body === void 0 ? '' : _ref3$body,
-      placeholderKey = _ref3.placeholderKey,
-      _ref3$beforeSave = _ref3.beforeSave,
-      beforeSave = _ref3$beforeSave === void 0 ? function (prevPage, receivedPage) {
-    return receivedPage;
-  } : _ref3$beforeSave,
-      _ref3$revisit = _ref3.revisit,
-      revisit = _ref3$revisit === void 0 ? false : _ref3$revisit;
-
+    _ref3$method = _ref3.method,
+    method = _ref3$method === void 0 ? 'GET' : _ref3$method,
+    headers = _ref3.headers,
+    _ref3$body = _ref3.body,
+    body = _ref3$body === void 0 ? '' : _ref3$body,
+    placeholderKey = _ref3.placeholderKey,
+    _ref3$beforeSave = _ref3.beforeSave,
+    beforeSave = _ref3$beforeSave === void 0 ? function (prevPage, receivedPage) {
+      return receivedPage;
+    } : _ref3$beforeSave,
+    _ref3$revisit = _ref3.revisit,
+    revisit = _ref3$revisit === void 0 ? false : _ref3$revisit;
   path = (0, _utils.withoutBusters)(path);
   var pageKey = (0, _utils.urlToPageKey)(path);
   return function (dispatch, getState) {
     placeholderKey = placeholderKey && (0, _utils.urlToPageKey)(placeholderKey);
     var hasPlaceholder = !!getState().pages[placeholderKey];
-
     if (placeholderKey && hasPlaceholder) {
       dispatch((0, _index.copyPage)({
         from: placeholderKey,
         to: pageKey
       }));
     }
-
     if (placeholderKey && !hasPlaceholder) {
       console.warn("Could not find placeholder with key " + placeholderKey + " in state. The props_at param will be ignored");
       path = (0, _utils.removePropsAt)(path);
     }
-
     if (!placeholderKey && (0, _utils.hasPropsAt)(path)) {
       console.warn("visit was called with props_at param in the path " + path + ", this will be ignore unless you provide a placeholder.");
       path = (0, _utils.removePropsAt)(path);
     }
-
     var controller = new AbortController();
     var signal = controller.signal;
     var fetchArgs = (0, _utils.argsForFetch)(getState, path, {
@@ -186,44 +165,36 @@ function visit(path, _temp2) {
     lastVisitController = controller;
     return fetch.apply(void 0, fetchArgs).then(_utils.parseResponse).then(function (_ref4) {
       var rsp = _ref4.rsp,
-          json = _ref4.json;
-
+        json = _ref4.json;
       var _getState2 = getState(),
-          superglue = _getState2.superglue,
-          _getState2$pages = _getState2.pages,
-          pages = _getState2$pages === void 0 ? {} : _getState2$pages;
-
+        superglue = _getState2.superglue,
+        _getState2$pages = _getState2.pages,
+        pages = _getState2$pages === void 0 ? {} : _getState2$pages;
       var meta = Object.assign({}, buildMeta(pageKey, json, superglue), {
         redirected: rsp.redirected,
         rsp: rsp,
         fetchArgs: fetchArgs
       });
+      var isGet = fetchArgs[1].method === 'GET';
       meta.suggestedAction = 'push';
-
-      if (!rsp.redirected && fetchArgs[1].method != 'GET') {
+      if (!rsp.redirected && !isGet) {
         meta.suggestedAction = 'replace';
       }
-
-      if (revisit && fetchArgs[1].method == 'GET') {
+      if (revisit && isGet) {
         if (rsp.redirected) {
           meta.suggestedAction = 'replace';
         } else {
           meta.suggestedAction = 'none';
         }
       }
-
-      if (method !== 'GET') {
-        var contentLocation = rsp.headers.get('content-location');
-
-        if (contentLocation) {
-          pageKey = (0, _utils.urlToPageKey)(contentLocation);
-        }
+      pageKey = (0, _utils.urlToPageKey)(rsp.url);
+      if (!isGet && !rsp.redirected) {
+        pageKey = currentPageKey;
       }
-
-      if (rsp.redirected) {
-        pageKey = (0, _utils.urlToPageKey)(rsp.url);
+      var contentLocation = rsp.headers.get('content-location');
+      if (contentLocation) {
+        pageKey = (0, _utils.urlToPageKey)(contentLocation);
       }
-
       var page = beforeSave(pages[pageKey], json);
       return dispatch((0, _index.saveAndProcessPage)(pageKey, page)).then(function () {
         meta.pageKey = pageKey;

package/components/Nav.js

@@ -2,33 +2,22 @@
 
 exports.__esModule = true;
 exports["default"] = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _utils = require("../utils");
-
 var _actions = require("../actions");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
 function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 var Nav = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose(Nav, _React$Component);
-
   function Nav(props) {
     var _this;
-
     _this = _React$Component.call(this, props) || this;
     var _this$props = _this.props,
-        history = _this$props.history,
-        initialPageKey = _this$props.initialPageKey;
+      history = _this$props.history,
+      initialPageKey = _this$props.initialPageKey;
     _this.history = history;
     _this.navigateTo = _this.navigateTo.bind(_assertThisInitialized(_this));
     _this.scrollTo = _this.scrollTo.bind(_assertThisInitialized(_this));
@@ -40,34 +29,27 @@ var Nav = /*#__PURE__*/function (_React$Component) {
     _this.hasWindow = typeof window !== 'undefined';
     return _this;
   }
-
   var _proto = Nav.prototype;
-
   _proto.componentDidMount = function componentDidMount() {
     this.unsubscribeHistory = this.history.listen(this.onHistoryChange);
   };
-
   _proto.componentWillUnmount = function componentWillUnmount() {
     this.unsubscribeHistory();
   };
-
   _proto.navigateTo = function navigateTo(path, _temp) {
     var _ref = _temp === void 0 ? {
-      action: 'push',
-      ownProps: {}
-    } : _temp,
-        action = _ref.action,
-        ownProps = _ref.ownProps;
-
+        action: 'push',
+        ownProps: {}
+      } : _temp,
+      action = _ref.action,
+      ownProps = _ref.ownProps;
     if (action === 'none') {
       return false;
     }
-
     path = (0, _utils.pathWithoutBZParams)(path);
     var nextPageKey = (0, _utils.urlToPageKey)(path);
     var store = this.props.store;
     var hasPage = !!store.getState().pages[nextPageKey];
-
     if (hasPage) {
       var location = this.history.location;
       var prevPageKey = location.state.pageKey;
@@ -77,10 +59,8 @@ var Nav = /*#__PURE__*/function (_React$Component) {
         posY: 0,
         posX: 0
       }];
-
       if (action === 'push') {
         var _this$history;
-
         if (this.hasWindow) {
           this.history.replace({
             pathname: location.pathname,
@@ -91,22 +71,17 @@ var Nav = /*#__PURE__*/function (_React$Component) {
             posX: window.pageXOffset
           }));
         }
-
         (_this$history = this.history).push.apply(_this$history, historyArgs);
       }
-
       if (action === 'replace') {
         var _this$history2;
-
         (_this$history2 = this.history).replace.apply(_this$history2, historyArgs);
       }
-
       this.setState({
         pageKey: nextPageKey,
         ownProps: ownProps
       });
       this.scrollTo(0, 0);
-
       if (action === 'replace' && prevPageKey && prevPageKey !== nextPageKey) {
         store.dispatch({
           type: _actions.REMOVE_PAGE,
@@ -115,31 +90,26 @@ var Nav = /*#__PURE__*/function (_React$Component) {
           }
         });
       }
-
       return true;
     } else {
       console.warn("`navigateTo` was called , but could not find.\n        the pageKey in the store. This may happen when the wrong\n        content_location was set in your non-get controller action.\n        No navigation will take place");
       return false;
     }
   };
-
   _proto.scrollTo = function scrollTo(posX, posY) {
     this.hasWindow && window.scrollTo(posX, posY);
   };
-
   _proto.onHistoryChange = function onHistoryChange(_ref2) {
     var _this2 = this;
-
     var location = _ref2.location,
-        action = _ref2.action;
+      action = _ref2.action;
     var _this$props2 = this.props,
-        store = _this$props2.store,
-        visit = _this$props2.visit;
+      store = _this$props2.store,
+      visit = _this$props2.visit;
     var pathname = location.pathname,
-        search = location.search,
-        hash = location.hash,
-        state = location.state;
-
+      search = location.search,
+      hash = location.hash,
+      state = location.state;
     if (state && state.superglue) {
       store.dispatch({
         type: _actions.HISTORY_CHANGE,
@@ -149,19 +119,15 @@ var Nav = /*#__PURE__*/function (_React$Component) {
           hash: hash
         }
       });
-
       if (action !== 'POP') {
         return;
       }
-
       var pageKey = state.pageKey,
-          posX = state.posX,
-          posY = state.posY;
+        posX = state.posX,
+        posY = state.posY;
       var containsKey = !!store.getState().pages[pageKey];
-
       if (containsKey) {
         var restoreStrategy = store.getState().pages[pageKey].restoreStrategy;
-
         switch (restoreStrategy) {
           case 'fromCacheOnly':
             this.setState({
@@ -169,7 +135,6 @@ var Nav = /*#__PURE__*/function (_React$Component) {
             });
             this.scrollTo(posX, posY);
             break;
-
           case 'fromCacheAndRevisitInBackground':
             this.setState({
               pageKey: pageKey
@@ -179,7 +144,6 @@ var Nav = /*#__PURE__*/function (_React$Component) {
               revisit: true
             });
             break;
-
           case 'revisitOnly':
           default:
             visit(pageKey, {
@@ -188,12 +152,10 @@ var Nav = /*#__PURE__*/function (_React$Component) {
               if (meta === undefined) {
                 console.warn("scoll restoration was skipped. Your visit's then funtion\n                  should return the meta object it recieved if you want your\n                  application to restore the page's previous scroll.");
               }
-
               if (!!meta && meta.suggestedAction === 'none') {
                 _this2.setState({
                   pageKey: pageKey
                 });
-
                 _this2.scrollTo(posX, posY);
               }
             });
@@ -205,41 +167,34 @@ var Nav = /*#__PURE__*/function (_React$Component) {
           if (meta === undefined) {
             console.warn("scoll restoration was skipped. Your visit's then funtion\n              should return the meta object it recieved if you want your\n              application to restore the page's previous scroll.");
           }
-
           if (!!meta && meta.suggestedAction === 'none') {
             _this2.setState({
               pageKey: pageKey
             });
-
             _this2.scrollTo(posX, posY);
           }
         });
       }
     }
   };
-
   _proto.notFound = function notFound(identifier) {
     var reminder = '';
-
     if (!identifier) {
       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);
     throw error;
   };
-
   _proto.render = function render() {
     var _this$props3 = this.props,
-        store = _this$props3.store,
-        visit = _this$props3.visit,
-        remote = _this$props3.remote;
+      store = _this$props3.store,
+      visit = _this$props3.visit,
+      remote = _this$props3.remote;
     var _this$state = this.state,
-        pageKey = _this$state.pageKey,
-        ownProps = _this$state.ownProps;
+      pageKey = _this$state.pageKey,
+      ownProps = _this$state.ownProps;
     var componentIdentifier = store.getState().pages[pageKey].componentIdentifier;
     var Component = this.props.mapping[componentIdentifier];
-
     if (Component) {
       return /*#__PURE__*/_react["default"].createElement(Component, _extends({
         pageKey: pageKey,
@@ -251,8 +206,6 @@ var Nav = /*#__PURE__*/function (_React$Component) {
       this.notFound(componentIdentifier);
     }
   };
-
   return Nav;
 }(_react["default"].Component);
-
 var _default = exports["default"] = Nav;