@sequencemedia/react-router-redux-render 2.4.56 → 2.5.0

package/babel.config.cjs

@@ -12,5 +12,7 @@ module.exports = {
     ],
     '@babel/react'
   ],
-  ignore: [/node_modules\/(?!@sequencemedia\/react-router-redux-render)/]
+  ignore: [
+    /node_modules\/(?!@sequencemedia\/react-router-redux-render)/
+  ]
 }

package/eslint.config.mjs

@@ -0,0 +1,147 @@
+import globals from 'globals'
+import standard from '@sequencemedia/eslint-config-standard/configs/recommended/merge'
+import typescript from '@sequencemedia/eslint-config-typescript/configs/recommended/merge'
+import babelParser from '@babel/eslint-parser'
+import typescriptParser from '@typescript-eslint/parser'
+import reactPlugin from 'eslint-plugin-react'
+
+const reactParserOptions = {
+  ecmaFeatures: {
+    jsx: true
+  }
+}
+
+const reactPlugins = {
+  react: reactPlugin
+}
+
+const reactRules = {
+  'no-unused-vars': [
+    'error',
+    {
+      varsIgnorePattern: 'React'
+    }
+  ],
+  quotes: [
+    'error',
+    'single'
+  ],
+  'jsx-quotes': [
+    'error',
+    'prefer-single'
+  ],
+  'react/jsx-indent': [
+    'error',
+    2,
+    {
+      checkAttributes: true,
+      indentLogicalExpressions: true
+    }
+  ]
+}
+
+const reactSettings = {
+  react: {
+    version: 'detect'
+  }
+}
+
+export default [
+  {
+    ignores: [
+      'coverage'
+    ]
+  },
+  /**
+   *  React config for all `jsx` files
+   */
+  {
+    ...reactPlugin.configs.flat.recommended,
+    settings: {
+      ...reactSettings
+    }
+  },
+  /**
+   *  Standard config
+   */
+  standard({
+    files: [
+      '**/*.{mjs,cjs,mts,cts}'
+    ],
+    ignores: [
+      'src',
+      'test'
+    ],
+    languageOptions: {
+      globals: {
+        ...globals.node
+      }
+    }
+  }),
+  standard({
+    files: [
+      'src/**/*.{mjs,cjs,mts,cts}'
+    ],
+    languageOptions: {
+      globals: {
+        ...globals.node
+      }
+    }
+  }),
+  standard({
+    files: [
+      'test/**/*.{mjs,cjs,mts,cts}'
+    ],
+    languageOptions: {
+      globals: {
+        ...globals.mocha
+      }
+    }
+  }),
+  /**
+   *  Standard config for all `jsx` files
+   */
+  standard({
+    files: [
+      'src/**/*.jsx'
+    ],
+    languageOptions: {
+      parser: babelParser,
+      parserOptions: {
+        ...reactParserOptions,
+        project: null
+      },
+      globals: {
+        ...globals.browser
+      }
+    },
+    plugins: {
+      ...reactPlugins
+    }, // @ts-expect-error Storybook
+    rules: {
+      ...reactRules
+    },
+    settings: {
+      ...reactSettings
+    }
+  }),
+  /**
+   *  TypeScript config
+   */
+  typescript({
+    files: [
+      '**/*.{mts,cts}'
+    ],
+    languageOptions: {
+      parser: typescriptParser,
+      parserOptions: {
+        projectService: true,
+        project: 'tsconfig.json'
+      },
+      globals: {
+        ...globals.node,
+        ReactRouterReduxRenderTypes: 'readonly'
+      }
+    }
+  })
+]

package/index.d.mts

@@ -0,0 +1,13 @@
+import type React from 'react'
+import type {
+  StaticRouterProps
+} from 'react-router'
+
+declare global {
+  namespace ReactRouterReduxRenderTypes {
+    export type RouterPropsType = StaticRouterProps
+    export type RoutesType = React.ReactNode
+  }
+}
+
+export {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequencemedia/react-router-redux-render",
-  "version": "2.4.56",
+  "version": "2.5.0",
   "description": "Sync/async isomorphic render of React apps with React Router + Redux",
   "keywords": [
     "React",
@@ -14,6 +14,7 @@
   ],
   "main": "./src/index.mjs",
   "type": "module",
+  "types": "./index.d.mts",
   "author": {
     "name": "Jonathan Perry for Sequence Media Limited",
     "email": "jonathanperry@sequencemedia.net",
@@ -28,7 +29,7 @@
     "url": "git://github.com/sequencemedia/react-router-redux-render.git"
   },
   "scripts": {
-    "lint": "eslint . --ext .mjs,.cjs,.jsx",
+    "lint": "eslint",
     "lint:fix": "npm run lint -- --fix",
     "prepare": "husky",
     "test": "NODE_ENV=test mocha test --recursive --verbose"
@@ -39,16 +40,28 @@
   },
   "devDependencies": {
     "@babel/core": "^7.26.9",
-    "@babel/eslint-parser": "^7.26.8",
+    "@babel/eslint-parser": "^7.26.10",
     "@babel/preset-env": "^7.26.9",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@sequencemedia/sinon-chai": "^0.0.130",
+    "@sequencemedia/eslint-config-standard": "^0.2.42",
+    "@sequencemedia/eslint-config-typescript": "^0.1.60",
+    "@sequencemedia/sinon-chai": "^0.0.131",
+    "@types/babel__register": "^7.17.3",
+    "@types/debug": "^4.1.12",
+    "@types/prop-types": "^15.7.14",
+    "@types/react": "^19.0.10",
+    "@types/react-dom": "^19.0.4",
+    "@types/react-redux": "^7.1.34",
+    "@types/react-router": "^5.1.20",
+    "@types/redux": "^3.6.31",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "chai": "^5.2.0",
     "core-js": "^3.41.0",
-    "eslint": "8.57.1",
-    "eslint-config-standard": "^17.1.0",
+    "eslint": "^9.22.0",
     "eslint-plugin-react": "^7.37.4",
+    "globals": "^16.0.0",
     "husky": "^9.1.7",
     "mocha": "^11.1.0",
     "prop-types": "^15.8.1",

package/src/index.d.cts

@@ -0,0 +1,5 @@
+export {
+  renderToString,
+  renderToStaticMarkup,
+  render
+} from '#react-router-redux-render'

package/src/index.d.mts

@@ -0,0 +1,5 @@
+export {
+  renderToString,
+  renderToStaticMarkup,
+  render
+} from '#react-router-redux-render'

package/src/index.mjs

@@ -1,5 +1,7 @@
 /**
- * @typedef {import('redux').Store} Store
+ *  @typedef {import('redux').Store} Store
+ *  @typedef {ReactRouterReduxRenderTypes.RouterPropsType} RouterPropsType
+ *  @typedef {ReactRouterReduxRenderTypes.RoutesType} RoutesType
  */
 
 import debug from 'debug'
@@ -16,18 +18,22 @@ const log = debug('@sequencemedia/react-router-redux-render')
 log('`react-router-redux-render` is awake')
 
 /**
- * @param {Object.<string, any>} data
- * @returns A boom object
+ *  @param {RouterPropsType} data
+ *  @returns A boom object
  */
-const notFound = (data) => Boom.notFound('Routing exception', data)
+function notFound (data) {
+  return (
+    Boom.notFound('Routing exception', data)
+  )
+}
 
 /**
- * @param {Store} store
- * @param {Object.<string, any>} routerProps
- * @param {Object.<string, any>} routes
- * @returns {string}
+ *  @param {Store} store
+ *  @param {RouterPropsType & { context?: Record<PropertyKey, unknown> }} routerProps
+ *  @param {RoutesType} routes
+ *  @returns {string}
  */
-export function renderToString (store, { location, context = {}, ...router } = {}, routes = {}) {
+export function renderToString (store, { location, context = {}, ...router }, routes) {
   const routerProps = { ...router, location, context }
   const string = getReactDOMServerRenderToString(store, routerProps, routes)
   if (string) return string
@@ -35,12 +41,12 @@ export function renderToString (store, { location, context = {}, ...router } = {
 }
 
 /**
- * @param {Store} store
- * @param {Object.<string, any>} routerProps
- * @param {Object.<string, any>} routes
- * @returns {string}
+ *  @param {Store} store
+ *  @param {RouterPropsType & { context?: Record<PropertyKey, unknown> }} routerProps
+ *  @param {RoutesType} routes
+ *  @returns {string}
  */
-export function renderToStaticMarkup (store, { location, context = {}, ...router } = {}, routes = {}) {
+export function renderToStaticMarkup (store, { location, context = {}, ...router }, routes) {
   const routerProps = { ...router, location, context }
   const string = getReactDOMServerRenderToStaticMarkup(store, routerProps, routes)
   if (string) return string
@@ -48,12 +54,12 @@ export function renderToStaticMarkup (store, { location, context = {}, ...router
 }
 
 /**
- * @param {Store} store
- * @param {Object.<string, any>} routerProps
- * @param {Object.<string, any>} routes
- * @returns {Promise<string>}
+ *  @param {Store} store
+ *  @param {RouterPropsType & { context?: Record<PropertyKey, unknown> }} routerProps
+ *  @param {RoutesType} routes
+ *  @returns {string}
  */
-export async function render (store, { location, context = {}, ...router } = {}, routes = {}) {
+export function render (store, { location, context = {}, ...router }, routes) {
   const routerProps = { ...router, location, context }
   const string = getReactDOMServerRenderToString(store, routerProps, routes)
   if (string) return string

package/src/react-dom-server.cjs

@@ -1,5 +1,7 @@
 require('@babel/register')({
-  ignore: [/node_modules\/(?!@sequencemedia\/react-router-redux-render)/]
+  ignore: [
+    /node_modules\/(?!@sequencemedia\/react-router-redux-render)/
+  ]
 })
 
 const {

package/src/react-dom-server.d.cts

@@ -0,0 +1,4 @@
+export {
+  getReactDOMServerRenderToString,
+  getReactDOMServerRenderToStaticMarkup
+} from '#react-router-redux-render/react-dom-server'

package/src/react-dom-server.d.mts

@@ -0,0 +1,10 @@
+import type { Store } from 'redux'
+
+declare module '#react-router-redux-render/react-dom-server' {
+  type RouterPropsType = ReactRouterReduxRenderTypes.RouterPropsType
+  type RoutesType = ReactRouterReduxRenderTypes.RoutesType
+
+  export function getReactDOMServerRenderToString (store: Store, routerProps: RouterPropsType, routes: RoutesType): string
+
+  export function getReactDOMServerRenderToStaticMarkup (store: Store, routerProps: RouterPropsType, routes: RoutesType): string
+}

package/src/react-dom-server.jsx

@@ -1,5 +1,15 @@
 /**
- * @typedef {import('redux').Store} Store
+ *  @typedef {import('redux').Store} Store
+ *  @typedef {ReactRouterReduxRenderTypes.RouterPropsType} RouterPropsType
+ *  @typedef {ReactRouterReduxRenderTypes.RoutesType} RoutesType
+ *
+ *  @typedef {{
+ *    props: RouterPropsType
+ *  }} RouterPropsException
+ *
+ *  @typedef {{
+ *    e: unknown
+ *  }} Exception
  */
 
 import debug from 'debug'
@@ -18,17 +28,21 @@ const log = debug('@sequencemedia/react-redux-render')
 log('`react-redux-render` is awake')
 
 /**
- * @param {Error} e
- * @param {{props: Object.<string, any>}} data
- * @returns A boom object
+ *  @param {Error} e
+ *  @param {RouterPropsException | Exception} data
+ *  @returns A boom object
  */
-const badImplementation = (e, data) => Boom.boomify(e, { statusCode: 500, message: 'Rendering exception', data })
+function badImplementation (e, data) {
+  return (
+    Boom.boomify(e, { statusCode: 500, message: 'Rendering exception', data })
+  )
+}
 
 /**
- * @param {Store} store
- * @param {Object.<string, any>} routerProps
- * @param {Object.<string, any>} routes
- * @returns {string}
+ *  @param {Store} store
+ *  @param {RouterPropsType} routerProps
+ *  @param {RoutesType} routes
+ *  @returns {string}
  */
 export function getReactDOMServerRenderToString (store, routerProps, routes) {
   try {
@@ -40,17 +54,16 @@ export function getReactDOMServerRenderToString (store, routerProps, routes) {
       </Provider>
     )
   } catch (e) {
-    log(e)
-
-    throw badImplementation(e, routerProps)
+    if (e instanceof Error) throw badImplementation(e, { props: routerProps })
+    throw badImplementation(new Error('Exception'), { e })
   }
 }
 
 /**
- * @param {Store} store
- * @param {Object.<string, any>} routerProps
- * @param {Object.<string, any>} routes
- * @returns {string}
+ *  @param {Store} store
+ *  @param {RouterPropsType} routerProps
+ *  @param {RoutesType} routes
+ *  @returns {string}
  */
 export function getReactDOMServerRenderToStaticMarkup (store, routerProps, routes) {
   try {
@@ -62,8 +75,7 @@ export function getReactDOMServerRenderToStaticMarkup (store, routerProps, route
       </Provider>
     )
   } catch (e) {
-    log(e)
-
-    throw badImplementation(e, routerProps)
+    if (e instanceof Error) throw badImplementation(e, { props: routerProps })
+    throw badImplementation(new Error('Exception'), { e })
   }
 }

package/tsconfig.json

@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "module": "NodeNext",
+    "target": "ESNext",
+    "allowJs": true,
+    "checkJs": true,
+    "noEmit": true,
+    "strict": true,
+    "jsx": "react",
+    "paths": {
+      "#react-router-redux-render": [
+        "./src/index.mjs"
+      ],
+      "#react-router-redux-render/react-dom-server": [
+        "./src/react-dom-server.cjs"
+      ]
+    }
+  },
+  "include": [
+    "."
+  ],
+  "exclude": [
+    "test"
+  ]
+}