@thoughtbot/superglue 0.53.2 → 0.53.4

package/utils/immutability.js

@@ -4,127 +4,91 @@ exports.__esModule = true;
 exports.KeyPathError = void 0;
 exports.getIn = getIn;
 exports.setIn = setIn;
-
 function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
 function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); }
-
 function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; }
-
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
 // These were taken from Scour.js
 // Then, modified to respect the id=0 keypath
-var isSearchable = /^[\da-zA-Z\-_=.]+$/;
 
-var KeyPathError = /*#__PURE__*/function (_Error) {
+var isSearchable = /^[\da-zA-Z\-_=.]+$/;
+var KeyPathError = exports.KeyPathError = /*#__PURE__*/function (_Error) {
   _inheritsLoose(KeyPathError, _Error);
-
   function KeyPathError(message) {
     var _this;
-
     _this = _Error.call(this, message) || this;
     _this.name = 'KeyPathError';
     return _this;
   }
-
   return KeyPathError;
 }( /*#__PURE__*/_wrapNativeSuper(Error));
-
-exports.KeyPathError = KeyPathError;
-
 function getIn(obj, path) {
   var keyPath = normalizeKeyPath(path);
   var result = obj;
-
   for (var i = 0; i < keyPath.length; i++) {
     var key = keyPath[i];
-
     if (!result) {
       break;
     }
-
     result = atKey(result, key);
   }
-
   return result;
 }
-
 function clone(object) {
   return Array.isArray(object) ? [].slice.call(object) : Object.assign({}, object);
 }
-
 function getKey(node, key) {
   if (Array.isArray(node) && isNaN(key)) {
     var key_parts = Array.from(key.split('='));
     var attr = key_parts[0];
     var id = key_parts[1];
     var i, child;
-
     if (!id) {
       return key;
     }
-
     for (i = 0; i < node.length; i++) {
       child = node[i];
-
       if (child[attr].toString() === id) {
         break;
       }
     }
-
     return i;
   } else {
     return key;
   }
 }
-
 function isArray(ary) {
   return Array.isArray(ary);
 }
-
 function isObject(obj) {
   return !isArray(obj) && obj === Object(obj);
 }
-
 function atKey(node, key) {
   var id, attr;
-
   if (isSearchable.test(key)) {
     // eslint-disable-next-line
     ;
-
     var _Array$from = Array.from(key.split('='));
-
     attr = _Array$from[0];
     id = _Array$from[1];
   }
-
   if (!isArray(node) && !isObject(node)) {
     throw new KeyPathError("Expected to traverse an Array or Obj, got " + JSON.stringify(node));
   }
-
   if (isObject(node) && id) {
     throw new KeyPathError("Expected to find an Array when using the key: " + key);
   }
-
   if (Array.isArray(node) && id) {
     var child;
-
     for (var i = 0; i < node.length; i++) {
       child = node[i];
-
       if (child[attr].toString() === id) {
         break;
       }
     }
-
     if (child[attr].toString() === id) {
       return child;
     } else {
@@ -134,39 +98,31 @@ function atKey(node, key) {
     return node[key];
   }
 }
-
 function normalizeKeyPath(path) {
   if (typeof path === 'string') {
     path = path.replace(/ /g, '');
-
     if (path === '') {
       return [];
     }
-
     return path.split('.');
   } else {
     return path;
   }
 }
-
 function setIn(object, keypath, value) {
   keypath = normalizeKeyPath(keypath);
   var results = {};
   var parents = {};
   var i;
   parents[0] = object;
-
   for (i = 0; i < keypath.length; i++) {
     parents[i + 1] = atKey(parents[i], keypath[i]);
   }
-
   results[keypath.length] = value;
-
   for (i = keypath.length - 1; i >= 0; i--) {
     results[i] = clone(parents[i]);
     var key = getKey(results[i], keypath[i]);
     results[i][key] = results[i + 1];
   }
-
   return results[0];
 }

package/utils/index.js

@@ -1,57 +1,43 @@
 "use strict";
 
 exports.__esModule = true;
-
 var _helpers = require("./helpers");
-
 Object.keys(_helpers).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _helpers[key]) return;
   exports[key] = _helpers[key];
 });
-
 var _immutability = require("./immutability");
-
 Object.keys(_immutability).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _immutability[key]) return;
   exports[key] = _immutability[key];
 });
-
 var _react = require("./react");
-
 Object.keys(_react).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _react[key]) return;
   exports[key] = _react[key];
 });
-
 var _request = require("./request");
-
 Object.keys(_request).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _request[key]) return;
   exports[key] = _request[key];
 });
-
 var _ujs = require("./ujs");
-
 Object.keys(_ujs).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _ujs[key]) return;
   exports[key] = _ujs[key];
 });
-
 var _url = require("./url");
-
 Object.keys(_url).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _url[key]) return;
   exports[key] = _url[key];
 });
-
 var _window = require("./window");
-
 Object.keys(_window).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _window[key]) return;

package/utils/react.js

@@ -3,11 +3,8 @@
 exports.__esModule = true;
 exports.mapDispatchToPropsIncludingVisitAndRemote = exports.mapDispatchToProps = void 0;
 exports.mapStateToProps = mapStateToProps;
-
 var _action_creators = require("../action_creators");
-
 var _url = require("./url");
-
 function mapStateToProps(state, ownProps) {
   if (state === void 0) {
     state = {
@@ -15,35 +12,29 @@ function mapStateToProps(state, ownProps) {
       superglue: {}
     };
   }
-
   var pageKey = ownProps.pageKey;
   var params = ownProps;
   var csrfToken = state.superglue.csrfToken;
   pageKey = (0, _url.urlToPageKey)(pageKey);
-
   var _ref = state.pages[pageKey] || {
-    data: {},
-    fragments: []
-  },
-      data = _ref.data,
-      fragments = _ref.fragments;
-
+      data: {},
+      fragments: []
+    },
+    data = _ref.data,
+    fragments = _ref.fragments;
   return Object.assign({}, data, params, {
     pageKey: pageKey,
     csrfToken: csrfToken,
     fragments: fragments
   });
 }
-
-var mapDispatchToProps = {
+var mapDispatchToProps = exports.mapDispatchToProps = {
   saveAndProcessPage: _action_creators.saveAndProcessPage,
   copyPage: _action_creators.copyPage
 };
-exports.mapDispatchToProps = mapDispatchToProps;
-var mapDispatchToPropsIncludingVisitAndRemote = {
+var mapDispatchToPropsIncludingVisitAndRemote = exports.mapDispatchToPropsIncludingVisitAndRemote = {
   visit: _action_creators.visit,
   remote: _action_creators.remote,
   saveAndProcessPage: _action_creators.saveAndProcessPage,
   copyPage: _action_creators.copyPage
-};
-exports.mapDispatchToPropsIncludingVisitAndRemote = mapDispatchToPropsIncludingVisitAndRemote;
+};

package/utils/request.js

@@ -8,33 +8,24 @@ exports.isValidContent = isValidContent;
 exports.isValidResponse = isValidResponse;
 exports.parseResponse = parseResponse;
 exports.validateResponse = validateResponse;
-
 var _urlParse = _interopRequireDefault(require("url-parse"));
-
 var _url = require("./url");
-
 var _config = require("../config");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function isValidResponse(xhr) {
   return isValidContent(xhr) && !downloadingFile(xhr);
 }
-
 function isValidContent(rsp) {
   var contentType = rsp.headers.get('content-type');
   var jsContent = /^(?:application\/json)(?:;|$)/;
   return !!(contentType !== undefined && contentType.match(jsContent));
 }
-
 function downloadingFile(xhr) {
   var disposition = xhr.headers.get('content-disposition');
   return disposition !== undefined && disposition !== null && disposition.match(/^attachment/);
 }
-
 function validateResponse(args) {
   var rsp = args.rsp;
-
   if (isValidResponse(rsp)) {
     return args;
   } else {
@@ -43,29 +34,27 @@ function validateResponse(args) {
     throw error;
   }
 }
-
 function handleServerErrors(args) {
   var rsp = args.rsp;
-
   if (!rsp.ok) {
+    if (rsp.status === 406) {
+      console.error("Superglue encountered a 406 Not Acceptable response. This can happen if you used respond_to and didn't specify format.json in the block. Try adding it to your respond_to. For example:\n\n" + 'respond_to do |format|\n' + '  format.html\n' + '  format.json\n' + '  format.csv\n' + 'end');
+    }
     var error = new Error(rsp.statusText);
     error.response = rsp;
     throw error;
   }
-
   return args;
 }
-
 function argsForFetch(getState, pathQuery, _temp) {
   var _ref = _temp === void 0 ? {} : _temp,
-      _ref$method = _ref.method,
-      method = _ref$method === void 0 ? 'GET' : _ref$method,
-      _ref$headers = _ref.headers,
-      headers = _ref$headers === void 0 ? {} : _ref$headers,
-      _ref$body = _ref.body,
-      body = _ref$body === void 0 ? '' : _ref$body,
-      signal = _ref.signal;
-
+    _ref$method = _ref.method,
+    method = _ref$method === void 0 ? 'GET' : _ref$method,
+    _ref$headers = _ref.headers,
+    headers = _ref$headers === void 0 ? {} : _ref$headers,
+    _ref$body = _ref.body,
+    body = _ref$body === void 0 ? '' : _ref$body,
+    signal = _ref.signal;
   method = method.toUpperCase();
   var currentState = getState().superglue || {};
   var jsAccept = 'application/json';
@@ -75,26 +64,25 @@ function argsForFetch(getState, pathQuery, _temp) {
     'x-superglue-request': true
   });
 
+  // This needs to be done better. This is saying to
+  // remove the content-type header from UJS form
+  // submissions.
+  var fromUJSForm = headers['content-type'] === null;
   if (method != 'GET' && method != 'HEAD') {
-    if (headers['content-type'] === null) {
-      delete headers['content-type'];
-    } else {
-      headers['content-type'] = 'application/json';
-    }
+    headers['content-type'] = 'application/json';
+  }
+  if (fromUJSForm) {
+    delete headers['content-type'];
   }
-
   if (currentState.csrfToken) {
     headers['x-csrf-token'] = currentState.csrfToken;
   }
-
-  var href = new _urlParse["default"](pathQuery, _config.config.baseUrl || {}, false).href;
+  var fetchPath = new _urlParse["default"]((0, _url.formatForXHR)(pathQuery), _config.config.baseUrl || {}, false);
   var credentials = 'same-origin';
-
   if (!(method == 'GET' || method == 'HEAD')) {
     headers['x-http-method-override'] = method;
     method = 'POST';
   }
-
   var options = {
     method: method,
     headers: headers,
@@ -102,19 +90,20 @@ function argsForFetch(getState, pathQuery, _temp) {
     credentials: credentials,
     signal: signal
   };
-
   if (currentState.currentPageKey) {
     var referrer = new _urlParse["default"](currentState.currentPageKey, _config.config.baseUrl || {}, false).href;
     options.referrer = referrer;
   }
-
   if (method == 'GET' || method == 'HEAD') {
+    if (options.body instanceof FormData) {
+      var allData = new URLSearchParams(options.body).toString();
+      // fetchPath will always have atleast /?format=json
+      fetchPath.query = fetchPath.query + '&' + allData;
+    }
     delete options.body;
   }
-
-  return [(0, _url.formatForXHR)(href), options];
+  return [fetchPath.toString(), options];
 }
-
 function extractJSON(rsp) {
   return rsp.json().then(function (json) {
     return {
@@ -126,7 +115,6 @@ function extractJSON(rsp) {
     throw e;
   });
 }
-
 function parseResponse(prm) {
   return Promise.resolve(prm).then(extractJSON).then(handleServerErrors).then(validateResponse);
 }

package/utils/ujs.js

@@ -2,14 +2,12 @@
 
 exports.__esModule = true;
 exports.ujsHandlers = exports.HandlerBuilder = void 0;
-
 var _url = require("./url");
-
-var HandlerBuilder = /*#__PURE__*/function () {
+var HandlerBuilder = exports.HandlerBuilder = /*#__PURE__*/function () {
   function HandlerBuilder(_ref) {
     var ujsAttributePrefix = _ref.ujsAttributePrefix,
-        visit = _ref.visit,
-        remote = _ref.remote;
+      visit = _ref.visit,
+      remote = _ref.remote;
     this.attributePrefix = ujsAttributePrefix;
     this.isUJS = this.isUJS.bind(this);
     this.handleSubmit = this.handleSubmit.bind(this);
@@ -18,38 +16,29 @@ var HandlerBuilder = /*#__PURE__*/function () {
     this.remote = remote;
     this.visitOrRemote = this.visitOrRemote.bind(this);
   }
-
   var _proto = HandlerBuilder.prototype;
-
   _proto.retrieveLink = function retrieveLink(target) {
     var link = target;
-
     while (!!link.parentNode && link.nodeName.toLowerCase() !== 'a') {
       link = link.parentNode;
     }
-
     if (link.nodeName.toLowerCase() === 'a' && link.href.length !== 0) {
       return link;
     }
   };
-
   _proto.isNonStandardClick = function isNonStandardClick(event) {
     return event.which > 1 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey;
   };
-
   _proto.isUJS = function isUJS(node) {
     var hasVisit = !!node.getAttribute(this.attributePrefix + '-visit');
     var hasRemote = !!node.getAttribute(this.attributePrefix + '-remote');
     return hasVisit || hasRemote;
   };
-
   _proto.handleSubmit = function handleSubmit(event) {
     var form = event.target;
-
     if (form.nodeName.toLowerCase() !== 'form' || !this.isUJS(form)) {
       return;
     }
-
     event.preventDefault();
     var url = form.getAttribute('action');
     var method = (form.getAttribute('method') || 'POST').toUpperCase();
@@ -62,15 +51,12 @@ var HandlerBuilder = /*#__PURE__*/function () {
       body: new FormData(event.target)
     });
   };
-
   _proto.handleClick = function handleClick(event) {
     var link = this.retrieveLink(event.target);
     var isNonStandard = this.isNonStandardClick(event);
-
     if (!link || isNonStandard || !this.isUJS(link)) {
       return;
     }
-
     event.preventDefault();
     var url = link.getAttribute('href');
     url = (0, _url.withoutBusters)(url);
@@ -78,52 +64,41 @@ var HandlerBuilder = /*#__PURE__*/function () {
       method: 'GET'
     });
   };
-
   _proto.visitOrRemote = function visitOrRemote(linkOrForm, url, opts) {
     if (opts === void 0) {
       opts = {};
     }
-
     var target;
-
     if (linkOrForm.getAttribute(this.attributePrefix + '-visit')) {
       target = this.visit;
       var placeholderKey = linkOrForm.getAttribute(this.attributePrefix + '-placeholder');
-
       if (placeholderKey) {
         opts.placeholderKey = (0, _url.urlToPageKey)(placeholderKey);
       }
     }
-
     if (linkOrForm.getAttribute(this.attributePrefix + '-remote')) {
       target = this.remote;
     }
-
     if (!target) {
       return;
     } else {
       return target(url, opts);
     }
   };
-
   _proto.handlers = function handlers() {
     return {
       onClick: this.handleClick,
       onSubmit: this.handleSubmit
     };
   };
-
   return HandlerBuilder;
 }();
-
-exports.HandlerBuilder = HandlerBuilder;
-
-var ujsHandlers = function ujsHandlers(_ref2) {
+var ujsHandlers = exports.ujsHandlers = function ujsHandlers(_ref2) {
   var navigatorRef = _ref2.navigatorRef,
-      store = _ref2.store,
-      ujsAttributePrefix = _ref2.ujsAttributePrefix,
-      visit = _ref2.visit,
-      remote = _ref2.remote;
+    store = _ref2.store,
+    ujsAttributePrefix = _ref2.ujsAttributePrefix,
+    visit = _ref2.visit,
+    remote = _ref2.remote;
   var builder = new HandlerBuilder({
     navigatorRef: navigatorRef,
     store: store,
@@ -132,6 +107,4 @@ var ujsHandlers = function ujsHandlers(_ref2) {
     ujsAttributePrefix: ujsAttributePrefix
   });
   return builder.handlers();
-};
-
-exports.ujsHandlers = ujsHandlers;
+};

package/utils/url.js

@@ -11,40 +11,31 @@ exports.urlToPageKey = urlToPageKey;
 exports.withFormatJson = withFormatJson;
 exports.withoutBusters = withoutBusters;
 exports.withoutHash = withoutHash;
-
 var _urlParse = _interopRequireDefault(require("url-parse"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function pathQuery(url) {
   var _parse = new _urlParse["default"](url, {}),
-      pathname = _parse.pathname,
-      query = _parse.query;
-
+    pathname = _parse.pathname,
+    query = _parse.query;
   return pathname + query;
 }
-
 function pathQueryHash(url) {
   var _parse2 = new _urlParse["default"](url, {}),
-      pathname = _parse2.pathname,
-      query = _parse2.query,
-      hash = _parse2.hash;
-
+    pathname = _parse2.pathname,
+    query = _parse2.query,
+    hash = _parse2.hash;
   return pathname + query + hash;
 }
-
 function hasPropsAt(url) {
   url = new _urlParse["default"](url, {}, true);
   var query = url.query;
   return !!query['props_at'];
 }
-
 function withFormatJson(url) {
   url = new _urlParse["default"](url, {}, true);
   url.query['format'] = 'json';
   return url.toString();
 }
-
 function pathWithoutBZParams(url) {
   url = new _urlParse["default"](url, {}, true);
   var query = url.query;
@@ -53,7 +44,6 @@ function pathWithoutBZParams(url) {
   url.query = query;
   return pathQueryHash(url.toString());
 }
-
 function removePropsAt(url) {
   url = new _urlParse["default"](url, {}, true);
   var query = url.query;
@@ -61,7 +51,6 @@ function removePropsAt(url) {
   url.query = query;
   return url.toString();
 }
-
 function urlToPageKey(url) {
   url = new _urlParse["default"](url, {}, true);
   var query = url.query;
@@ -70,13 +59,11 @@ function urlToPageKey(url) {
   url.query = query;
   return pathQuery(url.toString());
 }
-
 function withoutHash(url) {
   url = new _urlParse["default"](url, {}, true);
   url.hash = '';
   return url.toString();
 }
-
 function withoutBusters(url) {
   url = new _urlParse["default"](url, {}, true);
   var query = url.query;
@@ -84,7 +71,6 @@ function withoutBusters(url) {
   url.query = query;
   return pathQuery(url.toString());
 }
-
 function formatForXHR(url) {
   var formats = [withoutHash, withFormatJson];
   return formats.reduce(function (memo, f) {

package/utils/window.js

@@ -2,7 +2,6 @@
 
 exports.__esModule = true;
 exports.needsRefresh = needsRefresh;
-
 function needsRefresh(prevAssets, newAssets) {
   if (prevAssets && newAssets) {
     var hasNewAssets = !newAssets.every(function (asset) {