fix(dependencies): Update dependencies including upgrading peer depen…

…dency to redux 5.x
jkeam · Dec 29, 2023 · 45674b8 · 45674b8
1 parent 520502a
commit 45674b8
Show file tree

Hide file tree

Showing 7 changed files with 15,527 additions and 12,895 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,16 @@
 language: node_js
 node_js:
-  - 10
-  - 11
-  - 12
-  - 13
-  - 14
-  - 15
   - 16
+  - 17
+  - 18
+  - 19
+  - 20
 after_success: npm run coveralls
 jobs:
   include:
     # Define the release stage that runs semantic-release
     - stage: release
-      node_js: 14
+      node_js: 20
       script: skip
       deploy:
         provider: script

diff --git a/README.md b/README.md
@@ -271,7 +271,12 @@ export default combineReducers({
 # Changes
 Note: `Latest` means the latest release.  This is also the latest version in [npmjs.com](https://www.npmjs.com/package/reduxsauce).
 
-### Jun 22, 2021 - Latest
+### Dec 29, 2023 - Latest
+
+* `FIX` Update dependencies including upgrading peer dependency to redux 5.x @jkeam
+
+### Jun 22, 2021 - 1.2.1
+
 * `FIX` Update dependencies @jkeam
 * `DOCS` Update readme @jkeam
 
@@ -296,6 +301,7 @@ Note: `Latest` means the latest release.  This is also the latest version in [np
 * `DOCS` Add badges @jkeam
 
 ### Apr 15, 2019 - 1.1.0
+
 * `NEW` Generalize typedef @jkeam
 
 ### May 10, 2018 - 1.0.0 - 💃

diff --git a/lib/createActions.js b/lib/createActions.js
@@ -1,5 +1,5 @@
 import createTypes from './createTypes'
-import { is, isNil, isEmpty, join, keys, map, mapObjIndexed, merge, pick, pipe, replace, toUpper, zipObj } from 'ramda'
+import { is, isNil, isEmpty, join, keys, map, mapObjIndexed, mergeRight, pick, pipe, replace, toUpper, zipObj } from 'ramda'
 
 const defaultOptions = {
   prefix: ''
@@ -17,7 +17,7 @@ const camelToScreamingSnake = pipe(
 
 // build Action Types out of an object
 const convertToTypes = (config, options) => {
-  const opts = merge(defaultOptions, options)
+  const opts = mergeRight(defaultOptions, options)
   return pipe(
     keys, // just the keys
     map(camelToScreamingSnake), // CONVERT_THEM
@@ -28,7 +28,7 @@ const convertToTypes = (config, options) => {
 
 // an action creator with additional properties
 const createActionCreator = (name, extraPropNames, options) => {
-  const { prefix } = merge(defaultOptions, options)
+  const { prefix } = mergeRight(defaultOptions, options)
   // types are upcase and snakey
   const type = `${prefix}${camelToScreamingSnake(name)}`
 

diff --git a/lib/createTypes.js b/lib/createTypes.js
@@ -1,4 +1,4 @@
-import { pipe, trim, merge, split, reject, map, fromPairs, anyPass, isNil, isEmpty } from 'ramda'
+import { pipe, trim, mergeRight, split, reject, map, fromPairs, anyPass, isNil, isEmpty } from 'ramda'
 
 const isNilOrEmpty = anyPass([isNil, isEmpty])
 
@@ -9,7 +9,7 @@ const defaultOptions = {
 export default (types, options = {}) => {
   if (isNilOrEmpty(types)) throw new Error('valid types are required')
 
-  const { prefix } = merge(defaultOptions, options)
+  const { prefix } = mergeRight(defaultOptions, options)
 
   return pipe(
     trim,