Skip to content

Commit 46e7ac3

Browse files
authored
Merge pull request #296 from saigontechnology/develop
Release 0.1.8
2 parents 7d24797 + 89388d2 commit 46e7ac3

File tree

6 files changed

+139
-97
lines changed

6 files changed

+139
-97
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rn-base-project-ts",
3-
"version": "0.1.5",
3+
"version": "0.1.8",
44
"main": "index.js",
55
"repository": "https://github.com/saigontechnology/rn-base-project-typescript.git",
66
"author": "React Native Team <SaiGon Technology Solutions>",

template/ios/Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,11 +1461,11 @@ SPEC CHECKSUMS:
14611461
CodePush: eaa66fc8dd9ff611304ecc48397ce8831ba79ac9
14621462
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
14631463
FBLazyVector: ac12dc084d1c8ec4cc4d7b3cf1b0ebda6dab85af
1464-
fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
1465-
glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
1466-
hermes-engine: 8c1577f3fdb849cbe7729c2e7b5abc4b845e88f8
1464+
fmt: 8083860262b879fc92bca720969c91bdb88ada93
1465+
glog: 77f46f3d5c779b34a09b51a92fa9e0fcab64df1c
1466+
hermes-engine: e52d9706e7fd6078e529d8ada1af7b95946c4ce6
14671467
JWT: ef71dfb03e1f842081e64dc42eef0e164f35d251
1468-
RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
1468+
RCT-Folly: 36944e180e3143948e1c8b0c5eade65a3dd45142
14691469
RCTDeprecation: 3afceddffa65aee666dafd6f0116f1d975db1584
14701470
RCTRequired: ec1239bc9d8bf63e10fb92bd8b26171a9258e0c1
14711471
RCTTypeSafety: f5ecbc86c5c5fa163c05acb7a1c5012e15b5f994

template/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@react-navigation/native": "^6.1.17",
2626
"@react-navigation/native-stack": "^6.9.26",
2727
"@react-navigation/stack": "^6.3.20",
28-
"@reduxjs/toolkit": "^1.9.5",
28+
"@reduxjs/toolkit": "^2.2.7",
2929
"axios": "^1.6.8",
3030
"i18next": "^22.4.15",
3131
"intl-pluralrules": "^2.0.1",
@@ -49,25 +49,24 @@
4949
"@babel/core": "^7.25.2",
5050
"@babel/preset-env": "^7.20.0",
5151
"@babel/runtime": "^7.20.0",
52-
"@react-native-community/eslint-config": "^3.2.0",
5352
"@react-native/babel-preset": "0.74.87",
54-
"@react-native/eslint-config": "0.74.87",
53+
"@react-native/eslint-config": "0.76.1",
5554
"@react-native/metro-config": "0.74.87",
5655
"@react-native/typescript-config": "0.74.87",
5756
"@tsconfig/react-native": "^3.0.5",
5857
"@types/jest": "^29.5.2",
5958
"@types/react": "^18.2.6",
6059
"@types/react-native": "^0.71.8",
6160
"@types/react-test-renderer": "^18.0.0",
62-
"@typescript-eslint/eslint-plugin": "^5.62.0",
63-
"@typescript-eslint/parser": "^5.62.0",
61+
"@typescript-eslint/eslint-plugin": "^7.18.0",
62+
"@typescript-eslint/parser": "^7.18.0",
6463
"babel-jest": "^29.6.3",
6564
"eslint": "^8.53.0",
6665
"eslint-plugin-import": "^2.29.1",
6766
"eslint-plugin-jest": "^28.5.0",
6867
"eslint-plugin-react": "^7.32.2",
6968
"eslint-plugin-react-hooks": "^4.6.0",
70-
"eslint-plugin-unused-imports": "^2.0.0",
69+
"eslint-plugin-unused-imports": "^3.2.0",
7170
"husky": "^9.1.4",
7271
"jest": "^29.6.3",
7372
"metro-react-native-babel-preset": "0.77.0",

template/src/store/reducers/loading.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {PayloadAction} from '@reduxjs/toolkit'
1+
import {PayloadAction, Reducer} from '@reduxjs/toolkit'
22
import {ILoading} from '../types'
33

44
const loadingReducer = (state: ILoading = {}, action: PayloadAction<any>): ILoading => {
@@ -20,4 +20,4 @@ const loadingReducer = (state: ILoading = {}, action: PayloadAction<any>): ILoad
2020
}
2121
}
2222

23-
export default loadingReducer
23+
export default loadingReducer as Reducer

template/src/store/store.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {applyMiddleware, configureStore} from '@reduxjs/toolkit'
1+
import {applyMiddleware, configureStore, Reducer} from '@reduxjs/toolkit'
22
import {useDispatch, useSelector as useReduxSelector} from 'react-redux'
33
import type {TypedUseSelectorHook} from 'react-redux'
44
import {persistReducer, persistStore} from 'redux-persist'
@@ -15,7 +15,9 @@ const persistedReducer = persistReducer(persistConfig, reducers)
1515
const store = configureStore({
1616
reducer: persistedReducer,
1717
middleware: getDefaultMiddleware => getDefaultMiddleware({serializableCheck: false, thunk: false}),
18-
enhancers: [middlewareEnhancer],
18+
enhancers: (getDefaultEnhancers) => {
19+
return getDefaultEnhancers().concat(middlewareEnhancer)
20+
},
1921
})
2022

2123
sagaMiddleware.run(rootSaga)

0 commit comments

Comments
 (0)