tsrntemp 1.0.7 → 1.1.0

package/template/ios/template.xcodeproj/xcshareddata/xcschemes/template.xcscheme

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1210"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+               BuildableName = "template.app"
+               BlueprintName = "template"
+               ReferencedContainer = "container:template.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
+               BuildableName = "templateTests.xctest"
+               BlueprintName = "templateTests"
+               ReferencedContainer = "container:template.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "template.app"
+            BlueprintName = "template"
+            ReferencedContainer = "container:template.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "template.app"
+            BlueprintName = "template"
+            ReferencedContainer = "container:template.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

package/template/ios/templateTests/templateTests.m

@@ -0,0 +1,66 @@
+#import <UIKit/UIKit.h>
+#import <XCTest/XCTest.h>
+
+#import <React/RCTLog.h>
+#import <React/RCTRootView.h>
+
+#define TIMEOUT_SECONDS 600
+#define TEXT_TO_LOOK_FOR @"Welcome to React"
+
+@interface templateTests : XCTestCase
+
+@end
+
+@implementation templateTests
+
+- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL (^)(UIView *view))test
+{
+  if (test(view)) {
+    return YES;
+  }
+  for (UIView *subview in [view subviews]) {
+    if ([self findSubviewInView:subview matching:test]) {
+      return YES;
+    }
+  }
+  return NO;
+}
+
+- (void)testRendersWelcomeScreen
+{
+  UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController];
+  NSDate *date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
+  BOOL foundElement = NO;
+
+  __block NSString *redboxError = nil;
+#ifdef DEBUG
+  RCTSetLogFunction(
+      ^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
+        if (level >= RCTLogLevelError) {
+          redboxError = message;
+        }
+      });
+#endif
+
+  while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) {
+    [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
+    [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
+
+    foundElement = [self findSubviewInView:vc.view
+                                  matching:^BOOL(UIView *view) {
+                                    if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) {
+                                      return YES;
+                                    }
+                                    return NO;
+                                  }];
+  }
+
+#ifdef DEBUG
+  RCTSetLogFunction(RCTDefaultLogFunction);
+#endif
+
+  XCTAssertNil(redboxError, @"RedBox error: %@", redboxError);
+  XCTAssertTrue(foundElement, @"Couldn't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS);
+}
+
+@end

package/template/package.json

@@ -1,62 +1,49 @@
 {
-  "name": "tsrntemp",
+  "name": "template",
   "version": "0.0.1",
-  "private": false,
+  "private": true,
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios",
+    "lint": "eslint .",
     "start": "react-native start",
-    "test": "jest",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
+    "test": "jest"
   },
-  "keywords": ["react-native","template"],
-  "homepage": "https://github.com/wanngzelin/RNTemplate",
-  
   "dependencies": {
-    "@react-native-masked-view/masked-view": "^0.2.6",
-    "@react-navigation/bottom-tabs": "^6.3.1",
-    "@react-navigation/native": "^6.0.10",
-    "@react-navigation/stack": "^6.2.1",
-    "react": "17.0.2",
-    "react-native": "0.67.4",
-    "react-native-gesture-handler": "^2.4.0",
-    "react-native-safe-area-context": "^4.2.4",
-    "react-native-screens": "^3.13.1",
+    "@react-native-async-storage/async-storage": "^1.17.11",
+    "@react-navigation/bottom-tabs": "^6.5.4",
+    "@react-navigation/native": "^6.1.3",
+    "@react-navigation/native-stack": "^6.9.9",
+    "react": "18.2.0",
+    "react-native": "0.71.1",
+    "react-native-safe-area-context": "^4.5.0",
+    "react-native-screens": "^3.19.0",
     "react-native-size-matters": "^0.4.0",
-    "react-native-svg": "^12.3.0",
+    "react-native-svg": "^13.7.0",
     "umi-request": "^1.4.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.9",
-    "@babel/runtime": "^7.12.5",
-    "@react-native-community/eslint-config": "^2.0.0",
-    "@types/jest": "^26.0.23",
-    "@types/react-native": "^0.66.15",
-    "@types/react-test-renderer": "^17.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.7.0",
-    "@typescript-eslint/parser": "^5.7.0",
-    "babel-jest": "^26.6.3",
-    "babel-plugin-module-resolver": "^4.1.0",
+    "@babel/core": "^7.20.0",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
+    "@babel/preset-env": "^7.20.0",
+    "@babel/runtime": "^7.20.0",
+    "@react-native-community/eslint-config": "^3.0.0",
+    "@tsconfig/react-native": "^2.0.2",
+    "@types/jest": "^29.2.1",
+    "@types/react": "^18.0.24",
+    "@types/react-test-renderer": "^18.0.0",
+    "babel-jest": "^29.2.1",
+    "babel-plugin-module-resolver": "^5.0.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
-    "eslint": "^7.14.0",
-    "jest": "^26.6.3",
-    "metro-react-native-babel-preset": "^0.66.2",
+    "eslint": "^8.19.0",
+    "jest": "^29.2.1",
+    "metro-react-native-babel-preset": "0.73.7",
+    "prettier": "^2.4.1",
     "react-native-iconfont-cli": "^2.2.4",
-    "react-test-renderer": "17.0.2",
-    "typescript": "^4.4.4"
-  },
-  "resolutions": {
-    "@types/react": "^17"
+    "react-test-renderer": "18.2.0",
+    "typescript": "4.8.4"
   },
   "jest": {
-    "preset": "react-native",
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js",
-      "jsx",
-      "json",
-      "node"
-    ]
+    "preset": "react-native"
   }
 }

package/template/src/config/routeConfig.ts

@@ -1,15 +1,11 @@
-import { RouteType } from "types/routeTypes"
+import { RouteConfig } from "types/RoteConfig"
 import BottomTab from "route/BottomTab"
 
-
-const RouteArr: Array<RouteType> = [
+const RouteArr: Array<RouteConfig> = [
   {
     name: 'BottomTab',
     component: BottomTab,
     options: { headerShown: false }
   }
 ]
-
-
-export default RouteArr
-
+export default RouteArr

package/template/src/pages/Home/index.tsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import { View, Text } from 'react-native';
+
+export default class Home extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+  }
+
+  public render() {
+    return (
+      <View>
+         <Text>Home Component</Text>
+      </View>
+    );
+  }
+}
+

package/template/src/pages/Mine/index.tsx

@@ -0,0 +1,19 @@
+import React from 'react';
+import { View, Text } from 'react-native';
+
+
+
+export default class Mine extends React.Component<any, any> {
+  constructor(props: any) {
+    super(props);
+  }
+
+  public render() {
+    return (
+      <View>
+        <Text>Mine Component</Text>
+      </View>
+    );
+  }
+}
+

package/template/src/route/BottomTab.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
-import { BottomTabParamList } from 'types/routeTypes';
-import Home from 'pages/Home/Container';
-import Mine from 'pages/Mine/Container';
-import { IconIndex, IconMine } from 'iconfont';
+import { BottomTabParamList } from 'types/RouteParamList';
+import Home from 'pages/Home';
+import Mine from 'pages/Mine';
+import IconFont from 'iconfont';
 import color from 'config/color';
 
 const Tab = createBottomTabNavigator<BottomTabParamList>();
@@ -17,12 +17,12 @@ const BottomTab: React.FC = () => {
       <Tab.Screen
         name={'Home'}
         component={Home}
-        options={{ tabBarIcon: ({ focused, color, size }) => <IconIndex size={size} color={color} /> }}
+        options={{ tabBarIcon: ({ color, size }) => <IconFont name='index' size={size} color={color} /> }}
       />
       <Tab.Screen
         name={'Mine'}
         component={Mine}
-        options={{ tabBarIcon: ({ focused, color, size }) => <IconMine size={size} color={color} /> }}
+        options={{ tabBarIcon: ({ color, size }) => <IconFont name='mine' size={size} color={color} /> }}
       />
     </Tab.Navigator>
   )

package/template/src/route/RouteContainer.tsx

@@ -1,36 +1,28 @@
 import React from 'react';
 import { NavigationContainer } from '@react-navigation/native';
-import { CardStyleInterpolators, createStackNavigator, HeaderStyleInterpolators } from '@react-navigation/stack';
-import { RootStackParamList } from 'types/routeTypes';
-import RouteArr from 'config/routeConfig';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
+import RouteArr from 'config/routeConfig';
+import { StackParamList } from 'types/RouteParamList';
 
-const Stack = createStackNavigator<RootStackParamList>();
+const Stack = createNativeStackNavigator<StackParamList>()
 
-const RouteContainer: React.FC = () => {
+const RouterContainer: React.FC = () => {
   return (
     <SafeAreaProvider>
       <NavigationContainer>
         <Stack.Navigator
           screenOptions={{
-            gestureEnabled: true,
-            gestureDirection: 'horizontal',
-            headerTitleAlign: 'center',
-            headerMode: 'screen',
-            cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
-            headerStyleInterpolator: HeaderStyleInterpolators.forUIKit,
+            headerBackTitleVisible: false,
+            headerTitleAlign: 'center'
           }}
         >
           {
-            RouteArr.map(item => <Stack.Screen key={item.name} name={item.name} component={item.component} options={item.options} />)
+            RouteArr.map(v => <Stack.Screen key={v.name} name={v.name} component={v.component} options={v.options} />)
           }
         </Stack.Navigator>
       </NavigationContainer>
     </SafeAreaProvider>
-
   )
 }
-
-export default RouteContainer
-
-
+export default RouterContainer

package/template/src/types/RoteConfig.ts

@@ -0,0 +1,9 @@
+import React from "react"
+import { NativeStackNavigationOptions } from '@react-navigation/native-stack';
+import { StackParamList } from "./RouteParamList";
+
+export type RouteConfig = {
+  name: keyof StackParamList,
+  component: React.ComponentType
+  options?: NativeStackNavigationOptions
+}

package/template/src/types/RouteParamList.ts

@@ -0,0 +1,9 @@
+//底部导航类型申明
+export type BottomTabParamList = {
+  Home: undefined;
+  Mine: undefined;
+}
+
+export type StackParamList = {
+  BottomTab: undefined
+}

package/template/src/utils/request.ts

@@ -1,3 +1,7 @@
+//请求工具库
+/**
+ * 使用可参照https://www.npmjs.com/package/umi-request
+ */
 import { extend, ResponseError } from 'umi-request';
 
 //错误处理

package/template/src/utils/storage.ts

@@ -0,0 +1,69 @@
+// 缓存工具库
+/**
+ * 使用可以参照
+ * https://react-native-async-storage.github.io/async-storage/docs/usage
+ */
+import AsyncStorage from '@react-native-async-storage/async-storage';
+
+export default class Storage {
+
+  //读取数据
+  static async getItem(key: string) {
+    try {
+      return AsyncStorage.getItem(key)
+    } catch (error) {
+      console.log(error)
+    }
+  }
+
+  //保存数据
+  static async setItem(key: string, val: string) {
+    return AsyncStorage.setItem(key, val)
+  }
+
+  //更新保存数据
+  static async updateItem(key: string, val: string) {
+    try {
+      return AsyncStorage.mergeItem(key, val)
+    } catch (error) {
+      console.log(error)
+    }
+  }
+
+  //清除指缓存
+  static async clearItem(key: string) {
+    return AsyncStorage.removeItem(key)
+  }
+
+  // 获取所有已存储的键
+  static async getAllKeys() {
+    return AsyncStorage.getAllKeys()
+  }
+
+  // 批量获取数据
+  static async getMultiple(key: readonly string[]) {
+    return AsyncStorage.multiGet(key)
+  }
+
+  // 批量设置数据
+  static async multiSet(keyValuePairs: [string, string][]) {
+    return AsyncStorage.multiSet(keyValuePairs)
+  }
+
+  // 批量更新数据
+  static async updateMultiple(keyValuePairs: [string, string][]) {
+    return AsyncStorage.multiMerge(keyValuePairs)
+  }
+
+  //批量移除
+  static async multiClear(key: string[]) {
+    return AsyncStorage.multiRemove(key)
+  }
+
+  // 清除所有缓存
+  static async clearAll() {
+    return AsyncStorage.clear()
+  }
+
+}
+

package/template/tsconfig.json

@@ -56,7 +56,7 @@
     "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
     "skipLibCheck": true,                     /* Skip type checking of declaration files. */
-    "resolveJsonModule": true                 /* Allows importing modules with a ‘.json’ extension, which is a common practice in node projects. */
+    "resolveJsonModule": true,                 /* Allows importing modules with a ‘.json’ extension, which is a common practice in node projects. */
 
     /* Source Map Options */
     // "sourceRoot": "./",                    /* Specify the location where debugger should locate TypeScript files instead of source locations. */
@@ -65,7 +65,7 @@
     // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
 
     /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
   },
   "exclude": [