@thoughtbot/superglue 0.53.2 → 0.53.3

package/README.md

@@ -7,7 +7,8 @@
 Use classic Rails to build rich React Redux applications with **NO APIs** and
 **NO client-side routing**.
 
-[![Build Status](https://circleci.com/gh/thoughtbot/superglue.svg?style=shield)](https://circleci.com/gh/thoughtbot/superglue)
+[![Test superglue_js](https://github.com/thoughtbot/superglue/actions/workflows/build_js.yml/badge.svg)](https://github.com/thoughtbot/superglue/actions/workflows/build_js.yml)
+[![Test superglue_rails](https://github.com/thoughtbot/superglue/actions/workflows/build_rails.yml/badge.svg)](https://github.com/thoughtbot/superglue/actions/workflows/build_rails.yml)
 
 Superglue makes React and Redux as productive as Hotwire, Turbo and Stimulus.
 Its inspired by Turbolinks and designed to feel like a natural extension of

package/actions.js

@@ -2,29 +2,16 @@
 
 exports.__esModule = true;
 exports.UPDATE_FRAGMENTS = exports.SUPERGLUE_ERROR = exports.SET_CSRF_TOKEN = exports.SAVE_RESPONSE = exports.REMOVE_PAGE = exports.HISTORY_CHANGE = exports.HANDLE_GRAFT = exports.GRAFTING_SUCCESS = exports.GRAFTING_ERROR = exports.COPY_PAGE = exports.BEFORE_VISIT = exports.BEFORE_REMOTE = exports.BEFORE_FETCH = void 0;
-var BEFORE_FETCH = '@@superglue/BEFORE_FETCH';
-exports.BEFORE_FETCH = BEFORE_FETCH;
-var BEFORE_VISIT = '@@superglue/BEFORE_VISIT';
-exports.BEFORE_VISIT = BEFORE_VISIT;
-var BEFORE_REMOTE = '@@superglue/BEFORE_REMOTE';
-exports.BEFORE_REMOTE = BEFORE_REMOTE;
-var SAVE_RESPONSE = '@@superglue/SAVE_RESPONSE';
-exports.SAVE_RESPONSE = SAVE_RESPONSE;
-var HANDLE_GRAFT = '@@superglue/HANDLE_GRAFT';
-exports.HANDLE_GRAFT = HANDLE_GRAFT;
-var SUPERGLUE_ERROR = '@@superglue/ERROR';
-exports.SUPERGLUE_ERROR = SUPERGLUE_ERROR;
-var GRAFTING_ERROR = '@@superglue/GRAFTING_ERROR';
-exports.GRAFTING_ERROR = GRAFTING_ERROR;
-var GRAFTING_SUCCESS = '@@superglue/GRAFTING_SUCCESS';
-exports.GRAFTING_SUCCESS = GRAFTING_SUCCESS;
-var HISTORY_CHANGE = '@@superglue/HISTORY_CHANGE';
-exports.HISTORY_CHANGE = HISTORY_CHANGE;
-var SET_CSRF_TOKEN = '@@superglue/SET_CSRF_TOKEN';
-exports.SET_CSRF_TOKEN = SET_CSRF_TOKEN;
-var REMOVE_PAGE = '@@superglue/REMOVE_PAGE';
-exports.REMOVE_PAGE = REMOVE_PAGE;
-var COPY_PAGE = '@@superglue/COPY_PAGE';
-exports.COPY_PAGE = COPY_PAGE;
-var UPDATE_FRAGMENTS = '@@superglue/UPDATE_FRAGMENTS';
-exports.UPDATE_FRAGMENTS = UPDATE_FRAGMENTS;
+var BEFORE_FETCH = exports.BEFORE_FETCH = '@@superglue/BEFORE_FETCH';
+var BEFORE_VISIT = exports.BEFORE_VISIT = '@@superglue/BEFORE_VISIT';
+var BEFORE_REMOTE = exports.BEFORE_REMOTE = '@@superglue/BEFORE_REMOTE';
+var SAVE_RESPONSE = exports.SAVE_RESPONSE = '@@superglue/SAVE_RESPONSE';
+var HANDLE_GRAFT = exports.HANDLE_GRAFT = '@@superglue/HANDLE_GRAFT';
+var SUPERGLUE_ERROR = exports.SUPERGLUE_ERROR = '@@superglue/ERROR';
+var GRAFTING_ERROR = exports.GRAFTING_ERROR = '@@superglue/GRAFTING_ERROR';
+var GRAFTING_SUCCESS = exports.GRAFTING_SUCCESS = '@@superglue/GRAFTING_SUCCESS';
+var HISTORY_CHANGE = exports.HISTORY_CHANGE = '@@superglue/HISTORY_CHANGE';
+var SET_CSRF_TOKEN = exports.SET_CSRF_TOKEN = '@@superglue/SET_CSRF_TOKEN';
+var REMOVE_PAGE = exports.REMOVE_PAGE = '@@superglue/REMOVE_PAGE';
+var COPY_PAGE = exports.COPY_PAGE = '@@superglue/COPY_PAGE';
+var UPDATE_FRAGMENTS = exports.UPDATE_FRAGMENTS = '@@superglue/UPDATE_FRAGMENTS';

package/components/Nav.js

@@ -255,5 +255,4 @@ var Nav = /*#__PURE__*/function (_React$Component) {
   return Nav;
 }(_react["default"].Component);
 
-var _default = Nav;
-exports["default"] = _default;
+var _default = exports["default"] = Nav;

package/config.js

@@ -2,8 +2,7 @@
 
 exports.__esModule = true;
 exports.config = void 0;
-var config = {
+var config = exports.config = {
   baseUrl: '',
   maxPages: 20
-};
-exports.config = config;
+};

package/index.js

@@ -134,7 +134,7 @@ var NotImplementedError = /*#__PURE__*/function (_Error) {
   return NotImplementedError;
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
-var ApplicationBase = /*#__PURE__*/function (_React$Component) {
+var ApplicationBase = exports.ApplicationBase = /*#__PURE__*/function (_React$Component) {
   _inheritsLoose(ApplicationBase, _React$Component);
 
   function ApplicationBase(props) {
@@ -262,6 +262,4 @@ var ApplicationBase = /*#__PURE__*/function (_React$Component) {
   };
 
   return ApplicationBase;
-}(_react["default"].Component);
-
-exports.ApplicationBase = ApplicationBase;
+}(_react["default"].Component);

package/middleware.js

@@ -13,7 +13,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 var actionValues = Object.values(actions);
 
-var fragmentMiddleware = function fragmentMiddleware(store) {
+var fragmentMiddleware = exports.fragmentMiddleware = function fragmentMiddleware(store) {
   return function (next) {
     return function (action) {
       var prevState = store.getState();
@@ -75,6 +75,4 @@ var fragmentMiddleware = function fragmentMiddleware(store) {
       return nextAction;
     };
   };
-};
-
-exports.fragmentMiddleware = fragmentMiddleware;
+};

package/package.json

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

package/reducers/index.js

@@ -257,8 +257,7 @@ function superglueReducer(state, action) {
   return Object.assign({}, meta);
 }
 
-var rootReducer = {
+var rootReducer = exports.rootReducer = {
   superglue: superglueReducer,
   pages: pageReducer
-};
-exports.rootReducer = rootReducer;
+};

package/utils/immutability.js

@@ -23,7 +23,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 // Then, modified to respect the id=0 keypath
 var isSearchable = /^[\da-zA-Z\-_=.]+$/;
 
-var KeyPathError = /*#__PURE__*/function (_Error) {
+var KeyPathError = exports.KeyPathError = /*#__PURE__*/function (_Error) {
   _inheritsLoose(KeyPathError, _Error);
 
   function KeyPathError(message) {
@@ -37,8 +37,6 @@ var KeyPathError = /*#__PURE__*/function (_Error) {
   return KeyPathError;
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
-exports.KeyPathError = KeyPathError;
-
 function getIn(obj, path) {
   var keyPath = normalizeKeyPath(path);
   var result = obj;

package/utils/react.js

@@ -35,15 +35,13 @@ function mapStateToProps(state, ownProps) {
   });
 }
 
-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

@@ -73,21 +73,25 @@ function argsForFetch(getState, pathQuery, _temp) {
     accept: jsAccept,
     'x-requested-with': 'XMLHttpRequest',
     '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')) {
@@ -109,10 +113,16 @@ function argsForFetch(getState, pathQuery, _temp) {
   }
 
   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) {

package/utils/ujs.js

@@ -5,7 +5,7 @@ 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,
@@ -116,9 +116,7 @@ var HandlerBuilder = /*#__PURE__*/function () {
   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,
@@ -132,6 +130,4 @@ var ujsHandlers = function ujsHandlers(_ref2) {
     ujsAttributePrefix: ujsAttributePrefix
   });
   return builder.handlers();
-};
-
-exports.ujsHandlers = ujsHandlers;
+};