@sequencemedia/react-router-redux-render 2.0.429 → 2.1.0

package/lib/index.js

@@ -1 +1 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.renderToString=exports.renderToStaticMarkup=exports.render=void 0;var _react=_interopRequireDefault(require("react"));var _server=_interopRequireDefault(require("react-dom/server"));var _reactRedux=require("react-redux");var _reactRouterDom=require("react-router-dom");var _boom=_interopRequireDefault(require("@hapi/boom"));var _debug=_interopRequireDefault(require("debug"));const log=(0,_debug.default)('@sequencemedia/react-router-redux-render');log('`react-router-redux-render` is awake');const badImplementation=(e,data)=>_boom.default.boomify(e,{statusCode:500,message:'Rendering exception',data});const notFound=data=>_boom.default.notFound('Routing exception',data);const getReactDOMServerRenderToString=(store,routerProps,routes)=>{try{return _server.default.renderToString(_react.default.createElement(_reactRedux.Provider,{store:store},_react.default.createElement(_reactRouterDom.StaticRouter,routerProps,routes)));}catch(e){log(e);throw badImplementation(e,routerProps);}};const getReactDOMServerRenderToStaticMarkup=(store,routerProps,routes)=>{try{return _server.default.renderToStaticMarkup(_react.default.createElement(_reactRedux.Provider,{store:store},_react.default.createElement(_reactRouterDom.StaticRouter,routerProps,routes)));}catch(e){log(e);throw badImplementation(e,routerProps);}};const renderToString=(store,{location,context={},...router}={},routes={})=>getReactDOMServerRenderToString(store,{...router,location,context},routes)||function(e){throw e;}(notFound({...router,location,context}));exports.renderToString=renderToString;const renderToStaticMarkup=(store,{location,context={},...router}={},routes={})=>getReactDOMServerRenderToStaticMarkup(store,{...router,location,context},routes)||function(e){throw e;}(notFound({...router,location,context}));exports.renderToStaticMarkup=renderToStaticMarkup;const render=async(store,{location,context={},...router}={},routes={})=>getReactDOMServerRenderToString(store,{...router,location,context},routes)||function(e){throw e;}(notFound({...router,location,context}));exports.render=render;
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.render=render;exports.renderToStaticMarkup=renderToStaticMarkup;exports.renderToString=renderToString;var _react=_interopRequireDefault(require("react"));var _server=_interopRequireDefault(require("react-dom/server"));var _reactRedux=require("react-redux");var _server2=require("react-router-dom/server");var _boom=_interopRequireDefault(require("@hapi/boom"));var _debug=_interopRequireDefault(require("debug"));const log=(0,_debug.default)('@sequencemedia/react-router-redux-render');log('`react-router-redux-render` is awake');const badImplementation=(e,data)=>_boom.default.boomify(e,{statusCode:500,message:'Rendering exception',data});const notFound=data=>_boom.default.notFound('Routing exception',data);function getReactDOMServerRenderToString(store,routerProps,routes){try{return _server.default.renderToString(_react.default.createElement(_reactRedux.Provider,{store:store},_react.default.createElement(_server2.StaticRouter,routerProps,routes)));}catch(e){log(e);throw badImplementation(e,routerProps);}}function getReactDOMServerRenderToStaticMarkup(store,routerProps,routes){try{return _server.default.renderToStaticMarkup(_react.default.createElement(_reactRedux.Provider,{store:store},_react.default.createElement(_server2.StaticRouter,routerProps,routes)));}catch(e){log(e);throw badImplementation(e,routerProps);}}function renderToString(store,{location,context={},...router}={},routes={}){const routerProps={...router,location,context};const string=getReactDOMServerRenderToString(store,routerProps,routes);if(string)return string;throw notFound(routerProps);}function renderToStaticMarkup(store,{location,context={},...router}={},routes={}){const routerProps={...router,location,context};const string=getReactDOMServerRenderToStaticMarkup(store,routerProps,routes);if(string)return string;throw notFound(routerProps);}async function render(store,{location,context={},...router}={},routes={}){const routerProps={...router,location,context};const string=getReactDOMServerRenderToString(store,routerProps,routes);if(string)return string;throw notFound({...router,location,context});}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequencemedia/react-router-redux-render",
-  "version": "2.0.429",
+  "version": "2.1.0",
   "description": "Sync/async isomorphic render of React apps with React Router + Redux",
   "keywords": [
     "React",
@@ -63,11 +63,11 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-react": "^7.32.2",
     "husky": "^8.0.3",
-    "react": "17.0.1",
-    "react-dom": "17.0.1",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "react-redux": "^8.0.5",
-    "react-router": "5.2.0",
-    "react-router-dom": "5.2.0",
+    "react-router": "6.11.2",
+    "react-router-dom": "6.11.2",
     "redux": "^4.2.1",
     "rimraf": "^5.0.1"
   }

package/src/index.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import { Provider } from 'react-redux'
-import { StaticRouter as Router } from 'react-router-dom'
+import { StaticRouter as Router } from 'react-router-dom/server'
 import Boom from '@hapi/boom'
 import debug from 'debug'
 
@@ -12,7 +12,7 @@ log('`react-router-redux-render` is awake')
 const badImplementation = (e, data) => Boom.boomify(e, { statusCode: 500, message: 'Rendering exception', data })
 const notFound = (data) => Boom.notFound('Routing exception', data)
 
-const getReactDOMServerRenderToString = (store, routerProps, routes) => {
+function getReactDOMServerRenderToString (store, routerProps, routes) {
   try {
     return ReactDOMServer.renderToString(
       <Provider store={store}>
@@ -28,7 +28,7 @@ const getReactDOMServerRenderToString = (store, routerProps, routes) => {
   }
 }
 
-const getReactDOMServerRenderToStaticMarkup = (store, routerProps, routes) => {
+function getReactDOMServerRenderToStaticMarkup (store, routerProps, routes) {
   try {
     return ReactDOMServer.renderToStaticMarkup(
       <Provider store={store}>
@@ -45,22 +45,31 @@ const getReactDOMServerRenderToStaticMarkup = (store, routerProps, routes) => {
 }
 
 /**
- * @return {String}
+ * @return {string}
  */
-export const renderToString = (store, { location, context = {}, ...router } = {}, routes = {}) => (
-  getReactDOMServerRenderToString(store, { ...router, location, context }, routes) || throw notFound({ ...router, location, context })
-)
+export function renderToString (store, { location, context = {}, ...router } = {}, routes = {}) {
+  const routerProps = { ...router, location, context }
+  const string = getReactDOMServerRenderToString(store, routerProps, routes)
+  if (string) return string
+  throw notFound(routerProps)
+}
 
 /**
- * @return {String}
+ * @return {string}
  */
-export const renderToStaticMarkup = (store, { location, context = {}, ...router } = {}, routes = {}) => (
-  getReactDOMServerRenderToStaticMarkup(store, { ...router, location, context }, routes) || throw notFound({ ...router, location, context })
-)
+export function renderToStaticMarkup (store, { location, context = {}, ...router } = {}, routes = {}) {
+  const routerProps = { ...router, location, context }
+  const string = getReactDOMServerRenderToStaticMarkup(store, routerProps, routes)
+  if (string) return string
+  throw notFound(routerProps)
+}
 
 /**
- * @return {Promise}
+ * @return {Promise<string>}
  */
-export const render = async (store, { location, context = {}, ...router } = {}, routes = {}) => (
-  getReactDOMServerRenderToString(store, { ...router, location, context }, routes) || throw notFound({ ...router, location, context })
-)
+export async function render (store, { location, context = {}, ...router } = {}, routes = {}) {
+  const routerProps = { ...router, location, context }
+  const string = getReactDOMServerRenderToString(store, routerProps, routes)
+  if (string) return string
+  throw notFound({ ...router, location, context })
+}