Merge pull request #157 from mitsuharu/develop

Develop
mitsuharu · Nov 24, 2023 · 673b12e · 673b12e
2 parents 5bb98b4 + 5e1f81d
commit 673b12e
Show file tree

Hide file tree

Showing 4 changed files with 1,621 additions and 1,523 deletions.
diff --git a/package.json b/package.json
@@ -18,76 +18,76 @@
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@bam.tech/react-native-image-resizer": "^3.0.5",
-    "@baronha/react-native-multiple-image-picker": "^0.4.13",
-    "@heasy/react-native-sunmi-printer": "^1.7.0",
-    "@react-native-async-storage/async-storage": "^1.17.10",
-    "@react-navigation/native": "^6.1.6",
-    "@react-navigation/native-stack": "^6.9.12",
-    "@reduxjs/toolkit": "^1.8.6",
-    "dayjs": "^1.11.5",
-    "patch-package": "^6.4.7",
+    "@bam.tech/react-native-image-resizer": "^3.0.7",
+    "@baronha/react-native-multiple-image-picker": "^1.1.6",
+    "@heasy/react-native-sunmi-printer": "^1.8.1",
+    "@react-native-async-storage/async-storage": "^1.19.8",
+    "@react-navigation/native": "^6.1.9",
+    "@react-navigation/native-stack": "^6.9.17",
+    "@reduxjs/toolkit": "^1.9.7",
+    "dayjs": "^1.11.10",
+    "patch-package": "^8.0.0",
     "postinstall-postinstall": "^2.1.0",
     "react": "18.2.0",
     "react-hook-form": "^7.48.2",
     "react-native": "0.72.7",
     "react-native-alert-async": "^1.0.5",
-    "react-native-device-info": "^10.4.0",
+    "react-native-device-info": "^10.11.0",
     "react-native-fs": "^2.20.0",
     "react-native-inappbrowser-reborn": "^3.7.0",
-    "react-native-paper": "^5.3.1",
-    "react-native-safe-area-context": "^4.5.0",
-    "react-native-screens": "^3.20.0",
+    "react-native-paper": "^5.11.2",
+    "react-native-safe-area-context": "^4.7.4",
+    "react-native-screens": "^3.27.0",
     "react-native-swag-styles": "^0.2.2",
     "react-native-uuid": "^2.0.1",
-    "react-native-vector-icons": "^9.2.0",
-    "react-redux": "^8.0.4",
+    "react-native-vector-icons": "^10.0.2",
+    "react-redux": "^8.1.3",
     "redux": "^4.2.0",
     "redux-persist": "^6.0.0",
-    "redux-saga": "^1.2.1",
-    "reselect": "^4.1.7"
+    "redux-saga": "^1.2.3",
+    "reselect": "^4.1.8"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.0",
-    "@babel/plugin-proposal-decorators": "^7.19.3",
-    "@babel/preset-env": "^7.20.0",
-    "@babel/runtime": "^7.12.5",
+    "@babel/core": "^7.23.3",
+    "@babel/plugin-proposal-decorators": "^7.23.3",
+    "@babel/preset-env": "^7.23.3",
+    "@babel/runtime": "^7.23.4",
     "@react-native/eslint-config": "^0.74.0",
     "@react-native/metro-config": "^0.73.2",
     "@tsconfig/react-native": "^3.0.2",
-    "@types/react": "^18.0.24",
-    "@types/react-native-vector-icons": "^6.4.12",
-    "@types/react-redux": "^7.1.24",
-    "@types/react-test-renderer": "^18.0.0",
-    "@types/redux-mock-store": "^1.0.3",
-    "@typescript-eslint/eslint-plugin": "^5.40.0",
-    "@typescript-eslint/parser": "^5.40.0",
-    "babel-jest": "^29.2.1",
+    "@types/react": "^18.2.38",
+    "@types/react-native-vector-icons": "^6.4.18",
+    "@types/react-redux": "^7.1.31",
+    "@types/react-test-renderer": "^18.0.7",
+    "@types/redux-mock-store": "^1.0.6",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "babel-jest": "^29.7.0",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-module-resolver": "^5.0.0",
     "babel-plugin-optional-require": "^0.3.1",
     "babel-plugin-transform-remove-console": "^6.9.4",
-    "eslint": "^8.33.0",
+    "eslint": "^8.54.0",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-import-resolver-typescript": "^3.5.1",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.6.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^29.2.1",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "jest": "^29.7.0",
     "jest-date-mock": "^1.0.8",
     "jest-fetch-mock": "^3.0.3",
-    "jest-junit": "^15.0.0",
-    "jest-mock-extended": "^3.0.1",
-    "metro-react-native-babel-preset": "0.76.8",
+    "jest-junit": "^16.0.0",
+    "jest-mock-extended": "^3.0.5",
+    "metro-react-native-babel-preset": "0.77.0",
     "mockdate": "^3.0.5",
-    "prettier": "^2.8.3",
+    "prettier": "^3.1.0",
     "react-test-renderer": "18.2.0",
     "redux-mock-store": "^1.5.4",
     "redux-saga-test-plan": "^4.0.6",
-    "ts-jest": "^29.0.3",
+    "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
-    "typescript": "4.9.5"
+    "typescript": "5.3.2"
   },
   "engines": {
     "node": ">=16"

diff --git a/...sy+react-native-sunmi-printer+1.7.0.patch → ...sy+react-native-sunmi-printer+1.8.1.patch b/...sy+react-native-sunmi-printer+1.7.0.patch → ...sy+react-native-sunmi-printer+1.8.1.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@heasy/react-native-sunmi-printer/android/build.gradle b/node_modules/@heasy/react-native-sunmi-printer/android/build.gradle
-index 2dee92e..e9e2193 100644
+index f76ee37..ac0b327 100644
 --- a/node_modules/@heasy/react-native-sunmi-printer/android/build.gradle
 +++ b/node_modules/@heasy/react-native-sunmi-printer/android/build.gradle
 @@ -13,16 +13,16 @@ buildscript {
@@ -13,13 +13,13 @@ index 2dee92e..e9e2193 100644
  }
 
  android {
--  compileSdkVersion safeExtGet('SunmiPrinter_compileSdkVersion', 29)
--  buildToolsVersion safeExtGet('SunmiPrinter_buildToolsVersion', '29.0.2')
+-  compileSdkVersion safeExtGet('compileSdkVersion', 29)
+-  buildToolsVersion safeExtGet('buildToolsVersion', '29.0.2')
 +  compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
 +  buildToolsVersion getExtOrIntegerDefault('buildToolsVersion')
    defaultConfig {
--    minSdkVersion safeExtGet('SunmiPrinter_minSdkVersion', 19)
--    targetSdkVersion safeExtGet('SunmiPrinter_targetSdkVersion', 29)
+-    minSdkVersion safeExtGet('minSdkVersion', 21)
+-    targetSdkVersion safeExtGet('targetSdkVersion', 29)
 +    minSdkVersion getExtOrIntegerDefault('minSdkVersion')
 +    targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
      versionCode 1
@@ -30,5 +30,5 @@ index 2dee92e..e9e2193 100644
    //noinspection GradleDynamicVersion
    implementation "com.facebook.react:react-native:+"  // From node_modules
 -  implementation "com.sunmi:printerlibrary:1.0.13"
-+  implementation "com.sunmi:printerlibrary:1.0.20"
++  implementation "com.sunmi:printerlibrary:1.0.22"
  }
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
@@ -31,7 +31,6 @@ export { Routes }
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace ReactNavigation {
-    // eslint-disable-next-line @typescript-eslint/no-empty-interface
     interface RootParamList extends MainParams {}
   }
 }