@tarojs/taro-rn 3.5.0-alpha.13 → 3.5.0-alpha.16

package/dist/setup.js

@@ -39,7 +39,6 @@ jest.doMock('react-native', () => {
 });
 jest.doMock('expo-modules-core', () => {
     const unimodules = jest.requireActual('expo-modules-core');
-    const permisson = jest.requireActual('./__tests__/__mock__/mockExpoPermissions');
     const { NativeModulesProxy } = unimodules;
     NativeModulesProxy.ExpoLocation = {
         getCurrentPositionAsync: jest.fn(() => Promise.resolve({
@@ -52,7 +51,24 @@ jest.doMock('expo-modules-core', () => {
             }
         }))
     };
-    NativeModulesProxy.ExpoPermissions = permisson;
     return unimodules;
 });
+const grantedPromise = jest.fn(() => Promise.resolve({
+    granted: true
+}));
+jest.doMock('expo-image-picker', () => {
+    const expoImagePicker = jest.requireActual('expo-image-picker');
+    expoImagePicker.requestMediaLibraryPermissionsAsync = grantedPromise;
+    return expoImagePicker;
+});
+jest.doMock('expo-location', () => {
+    const expoLocation = jest.requireActual('expo-location');
+    expoLocation.requestForegroundPermissionsAsync = grantedPromise;
+    return expoLocation;
+});
+jest.doMock('expo-barcode-scanner', () => {
+    const expoBarcodeSacnner = jest.requireActual('expo-barcode-scanner');
+    expoBarcodeSacnner.requestPermissionsAsync = grantedPromise;
+    return expoBarcodeSacnner;
+});
 //# sourceMappingURL=setup.js.map

package/dist/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-rn",
-  "version": "3.5.0-alpha.13",
+  "version": "3.5.0-alpha.16",
   "description": "Taro RN framework",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
@@ -11,17 +11,6 @@
     "apiList.js",
     "libList.js"
   ],
-  "scripts": {
-    "assets": "cpy 'src/**/*.png' '!src/__tests__/*' dist",
-    "build": "rimraf ./dist && tsc && yarn assets && yarn script",
-    "dev": "yarn assets && tsc --watch",
-    "lint": "eslint .",
-    "test": "jest --silent",
-    "test:dev": "jest --watch",
-    "test:ci": "jest -i --silent --coverage false",
-    "test:coverage": "jest --coverage",
-    "script": "node ./script"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/NervJS/taro.git"
@@ -32,62 +21,74 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@react-native-async-storage/async-storage": "~1.15.11",
+    "@react-native-async-storage/async-storage": "~1.17.7",
     "@react-native-community/cameraroll": "~4.1.2",
     "@react-native-community/clipboard": "~1.5.1",
-    "@react-native-community/geolocation": "~2.0.2",
-    "@react-native-community/netinfo": "~7.1.2",
-    "@tarojs/runtime-rn": "3.5.0-alpha.13",
+    "@react-native-community/geolocation": "~2.1.0",
+    "@react-native-community/netinfo": "~9.3.0",
+    "@tarojs/runtime-rn": "3.5.0-alpha.16",
     "babel-preset-expo": "~9.0.2",
     "base64-js": "^1.3.0",
-    "expo-av": "~11.2.3",
-    "expo-barcode-scanner": "~11.3.0",
-    "expo-brightness": "~10.2.0",
-    "expo-camera": "~12.2.0",
-    "expo-file-system": "~14.0.0",
+    "deprecated-react-native-prop-types": "^2.3.0",
+    "expo-av": "~12.0.2",
+    "expo-barcode-scanner": "~11.4.0",
+    "expo-brightness": "~10.3.0",
+    "expo-camera": "~12.3.0",
+    "expo-file-system": "~14.1.0",
     "expo-image-picker": "~13.1.1",
-    "expo-keep-awake": "~10.1.1",
-    "expo-location": "~14.0.2",
-    "expo-modules-core": "~0.9.1",
-    "expo-permissions": "~13.2.0",
-    "expo-sensors": "~11.1.1",
+    "expo-keep-awake": "~10.2.0",
+    "expo-location": "~14.3.0",
+    "expo-modules-core": "~0.11.3",
+    "expo-sensors": "~11.4.0",
     "nullthrows": "^1.1.1",
-    "react-native-device-info": "~8.4.8",
+    "prop-types": "^15.8.1",
+    "react-native-device-info": "~10.0.2",
     "react-native-image-resizer": "~1.4.5",
     "react-native-image-zoom-viewer": "^3.0.1",
     "react-native-root-siblings": "^4.1.1",
     "react-native-root-toast": "^3.0.1",
-    "react-native-safe-area-context": "~3.4.1",
+    "react-native-safe-area-context": "~4.3.1",
     "react-native-stylekit": "^1.0.0",
     "react-native-syan-image-picker": "0.5.3"
   },
   "devDependencies": {
-    "@tarojs/taro": "3.5.0-alpha.13",
+    "@types/jest": "^27.4.1",
     "@types/react": "^17.0.0",
-    "@types/react-native": "0.67.0",
+    "@types/react-native": "^0.67.7",
     "fbjs-scripts": "^3.0.1",
-    "react-native": "^0.67.3"
+    "metro-react-native-babel-preset": "^0.67.0",
+    "react-native": "^0.68.2"
   },
   "peerDependencies": {
-    "@react-native-async-storage/async-storage": "~1.15.11",
+    "@react-native-async-storage/async-storage": "~1.17.7",
     "@react-native-community/cameraroll": "~4.1.2",
     "@react-native-community/clipboard": "~1.5.1",
-    "@react-native-community/geolocation": "~2.0.2",
-    "@react-native-community/netinfo": "~7.1.2",
-    "expo-av": "~11.2.3",
-    "expo-barcode-scanner": "~11.3.0",
-    "expo-brightness": "~10.2.0",
-    "expo-camera": "~12.2.0",
-    "expo-file-system": "~14.0.0",
+    "@react-native-community/geolocation": "~2.1.0",
+    "@react-native-community/netinfo": "~9.3.0",
+    "expo-av": "~12.0.2",
+    "expo-barcode-scanner": "~11.4.0",
+    "expo-brightness": "~10.3.0",
+    "expo-camera": "~12.3.0",
+    "expo-file-system": "~14.1.0",
     "expo-image-picker": "~13.1.1",
-    "expo-keep-awake": "~10.1.1",
-    "expo-modules-core": "~0.9.1",
-    "expo-permissions": "~13.2.0",
-    "expo-sensors": "~11.1.1",
-    "react-native-device-info": "~8.4.8",
+    "expo-keep-awake": "~10.2.0",
+    "expo-location": "~14.3.0",
+    "expo-modules-core": "~0.11.3",
+    "expo-sensors": "~11.4.0",
+    "react-native-device-info": "~10.0.2",
     "react-native-image-resizer": "~1.4.5",
-    "react-native-safe-area-context": "~3.4.1",
+    "react-native-safe-area-context": "~4.3.1",
     "react-native-syan-image-picker": "0.5.3"
   },
-  "gitHead": "1e201315913fbeb3a71f14c93a5e7a2fa490e4c4"
-}
+  "scripts": {
+    "assets": "cpy 'src/**/*.png' '!src/__tests__/*' dist",
+    "build": "rimraf ./dist && tsc && pnpm run assets && pnpm run script",
+    "dev": "pnpm run assets && tsc --watch",
+    "lint": "eslint .",
+    "test": "jest --silent",
+    "test:dev": "jest --watch",
+    "test:ci": "jest -i --silent --coverage false",
+    "test:coverage": "jest --coverage",
+    "script": "node ./script"
+  }
+}

package/src/__tests__/__snapshots__/{scanCode.test.js.snap → scanCode.test.tsx.snap}

@@ -64,7 +64,16 @@ exports[`scanCode should render scanCode success 1`] = `
       }
     }
   >
-    <RNCSafeAreaView>
+    <RNCSafeAreaView
+      edges={
+        Array [
+          "bottom",
+          "left",
+          "right",
+          "top",
+        ]
+      }
+    >
       <Image
         source={1}
         style={
@@ -97,7 +106,16 @@ exports[`scanCode should render scanCode success 1`] = `
       }
     }
   >
-    <RNCSafeAreaView>
+    <RNCSafeAreaView
+      edges={
+        Array [
+          "bottom",
+          "left",
+          "right",
+          "top",
+        ]
+      }
+    >
       <Image
         source={1}
         style={

package/src/__tests__/{clipboard.test.js → clipboard.test.ts}

@@ -44,6 +44,7 @@ describe('clipboard', () => {
 
       // expect.assertions(6)
       return Taro.setClipboardData({
+        // @ts-ignore
         data,
         success,
         fail,

package/src/__tests__/{geolocation.test.js → geolocation.test.ts}

@@ -38,22 +38,21 @@ describe('location', () => {
       const fail = jest.fn()
       const complete = jest.fn()
 
-      const expectData = {
-        latitude: expect.any(Number),
-        longitude: expect.any(Number),
-        speed: expect.any(Number),
-        accuracy: expect.any(Number),
-        altitude: expect.any(Number),
-        verticalAccuracy: expect.any(Number),
-        horizontalAccuracy: expect.any(Number),
-      }
+      // const expectData = {
+      //   latitude: expect.any(Number),
+      //   longitude: expect.any(Number),
+      //   speed: expect.any(Number),
+      //   accuracy: expect.any(Number),
+      //   altitude: expect.any(Number),
+      //   verticalAccuracy: expect.any(Number),
+      //   horizontalAccuracy: expect.any(Number),
+      // }
 
       Taro.getLocation({
         success,
         fail,
         complete
-      })
-      setTimeout(() => {
+      }).then(() => {
         expect(mockGetCurrentPosition.mock.calls.length).toBe(1)
       })
     })

package/src/__tests__/{media.test.js → media.test.ts}

@@ -68,6 +68,7 @@ describe('media', () => {
         expect(fail.mock.calls.length).toBe(0)
         expect(complete.mock.calls.length).toBe(1)
         expect(complete.mock.calls[0][0]).toEqual({ errMsg: expectMsg, path })
+        // @ts-ignore
         expect(res.path).toEqual(path)
       })
     })
@@ -95,6 +96,7 @@ describe('media', () => {
         expect(fail.mock.calls.length).toBe(0)
         expect(complete.mock.calls.length).toBe(1)
         expect(complete.mock.calls[0][0]).toEqual({ errMsg: expectMsg, path })
+        // @ts-ignore
         expect(res.path).toEqual(path)
       })
     })

package/src/__tests__/{network.test.js → network.test.ts}

@@ -1,6 +1,4 @@
 import * as network from '../lib/network'
-
-// react_native_1.NativeModules.RNCNetInfo setup mock
 const Taro = Object.assign({}, network)
 
 describe('network', () => {

package/src/__tests__/{request.test.js → request.test.ts}

@@ -19,6 +19,7 @@ describe('request', () => {
         })
       })
     })
+    // @ts-ignore
     global.fetch = fetch
   })
 
@@ -54,6 +55,7 @@ describe('request', () => {
         url,
         responseType: 'text'
       }
+      // @ts-ignore
       const res = await Taro.request(options)
       expect(res.data).toEqual(expectData)
     })
@@ -89,7 +91,7 @@ describe('request', () => {
           })
         })
       })
-
+      // @ts-ignore
       global.fetch = fetch
 
       const url = 'https://test.taro.com/v1'
@@ -102,6 +104,7 @@ describe('request', () => {
       }
 
       const expectUrl = `https://test.taro.com/v1?${encodeURIComponent('a')}=${encodeURIComponent(1)}`
+      // @ts-ignore
       const res = await Taro.request(optionsOne)
       expect(res.data.url).toMatch(expectUrl)
 
@@ -118,6 +121,7 @@ describe('request', () => {
       }
 
       const expectBodyOne = JSON.stringify({ a: 1 })
+      // @ts-ignore
       const resTwo = await Taro.request(optionsTwo)
       expect(resTwo.data.params.body).toMatch(expectBodyOne)
 
@@ -134,6 +138,7 @@ describe('request', () => {
       }
 
       const expectBodyTwo = `${encodeURIComponent('a')}=${encodeURIComponent(1)}`
+      // @ts-ignore
       const resThree = await Taro.request(optionsThree)
       expect(resThree.data.params.body).toMatch(expectBodyTwo)
     })

package/src/__tests__/{scanCode.test.js → scanCode.test.tsx}

@@ -5,6 +5,7 @@ import { scanCode } from '../lib/scanCode'
 
 describe('scanCode', () => {
   it('should render scanCode success', async () => {
+    // @ts-ignore
     const { toJSON, getByLabelText } = render(<RootSiblingParent />)
     scanCode()
     await waitFor(() => getByLabelText('Close'));

package/src/__tests__/{storage.test.js → storage.test.ts}

@@ -42,7 +42,7 @@ describe('storage', () => {
       expect(complete.mock.calls[0][0]).toEqual({ errMsg: expectMsg })
       expect(res.errMsg).toMatch(expectMsg)
 
-      const getData = await AsyncStorage.getItem(key)
+      const getData = await AsyncStorage.getItem(key) || ''
       expect(JSON.parse(getData)).toBe(data)
     })
 
@@ -56,7 +56,7 @@ describe('storage', () => {
       const complete = jest.fn()
 
       expect.assertions(4)
-
+      // @ts-ignore
       return Taro.setStorage({
         data,
         success,
@@ -112,7 +112,7 @@ describe('storage', () => {
       const complete = jest.fn()
 
       await AsyncStorage.setItem(key, JSON.stringify(data))
-      const getData = await AsyncStorage.getItem(key)
+      const getData = await AsyncStorage.getItem(key) || ''
 
       expect(JSON.parse(getData)).toBe(data)
 
@@ -132,6 +132,7 @@ describe('storage', () => {
       expect(complete.mock.calls.length).toBe(1)
       expect(complete.mock.calls[0][0]).toEqual(res)
       expect(res.errMsg).toMatch(expectMsg)
+      // @ts-ignore
       expect(res.data).toBeUndefined()
     })
   })
@@ -164,8 +165,11 @@ describe('storage', () => {
       expect(complete.mock.calls.length).toBe(1)
       expect(complete.mock.calls[0][0]).toEqual(res)
       expect(res.errMsg).toMatch(expectMsg)
+      // @ts-ignore
       expect(res.keys).toEqual([key1, key2])
+      // @ts-ignore
       expect(res.currentSize).toBe(+(12 / 1024).toFixed(2))
+      // @ts-ignore
       expect(res.limitSize).toBe(Infinity)
     })
   })
@@ -180,8 +184,8 @@ describe('storage', () => {
       await AsyncStorage.setItem(key1, JSON.stringify(data))
       await AsyncStorage.setItem(key2, JSON.stringify(data))
 
-      const getData1 = await AsyncStorage.getItem(key1)
-      const getData2 = await AsyncStorage.getItem(key2)
+      const getData1 = await AsyncStorage.getItem(key1) || ''
+      const getData2 = await AsyncStorage.getItem(key2) || ''
 
       expect(JSON.parse(getData1)).toBe(data)
       expect(JSON.parse(getData2)).toBe(data)

package/src/__tests__/{websocket.test.js → websocket.test.ts}

@@ -5,6 +5,7 @@ const Taro = Object.assign({}, connectSocket)
 
 describe('websocket', () => {
   beforeEach(() => {
+    // @ts-ignore
     global.WebSocket = WebSocket
   })
 
@@ -16,6 +17,7 @@ describe('websocket', () => {
     expect.assertions(6)
 
     return Taro.connectSocket({
+      // @ts-ignore
       url: {},
       success,
       fail,
@@ -61,8 +63,8 @@ describe('websocket', () => {
       expect(err.errMsg).toMatch(expectErrMsg)
     })
 
-    socketTaskOne.close()
-    socketTaskTwo.close()
+    socketTaskOne.close({})
+    socketTaskTwo.close({})
   })
 
   test('connection关闭的时候会重置总的socketTask数量', async () => {
@@ -74,7 +76,7 @@ describe('websocket', () => {
 
     const socketTaskOne = await Taro.connectSocket({ url: 'wss://localhost:8080', success })
     expect(success.mock.calls.length).toBe(1)
-    socketTaskOne.close()
+    socketTaskOne.close({})
 
     const socketTaskTwo = await Taro.connectSocket({ url: 'wss://localhost:8090', success })
     expect(success.mock.calls.length).toBe(2)
@@ -99,10 +101,10 @@ describe('websocket', () => {
         errMsg: 'connectSocket:ok'
       }))
 
-    socketTaskTwo.close()
-    socketTaskThree.close()
+    socketTaskTwo.close({})
+    socketTaskThree.close({})
   })
-  // eslint-disable-next-line
+  // @ts-ignore
   test('should work basically', async (done) => {
     const fakeURL = 'wss://localhost:8080'
     const mockServer = new Server(fakeURL)

package/src/lib/Mask.tsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { StyleSheet, TouchableWithoutFeedback, View, ViewPropTypes } from 'react-native'
+import { StyleSheet, TouchableWithoutFeedback, View } from 'react-native'
+import { ViewPropTypes } from 'deprecated-react-native-prop-types'
 
 const styles = StyleSheet.create({
   mask: {

package/src/lib/Popup.tsx

@@ -1,7 +1,8 @@
 import React, { Component } from 'react'
 
 import PropTypes from 'prop-types'
-import { Modal, View, StyleSheet, Dimensions, Animated, Easing, ViewPropTypes } from 'react-native'
+import { Modal, View, StyleSheet, Dimensions, Animated, Easing } from 'react-native'
+import { ViewPropTypes } from 'deprecated-react-native-prop-types'
 import { Mask } from './Mask'
 
 const { width, height } = Dimensions.get('window')

package/src/lib/createCameraContext/index.ts

@@ -1,5 +1,5 @@
-import * as Permissions from 'expo-permissions'
 import { errorHandler, successHandler } from '../../utils'
+import { requestCameraPermissionsAsync, requestMicrophonePermissionsAsync } from 'expo-camera'
 const globalAny: any = global
 
 class CameraContext {
@@ -14,30 +14,39 @@ class CameraContext {
    * 开始录像
    */
   startRecord = (option: Taro.CameraContext.StartRecordOption) => {
-    Permissions.askAsync(Permissions.CAMERA, Permissions.AUDIO_RECORDING).then(() => {
-      this.cameraRef?.recordAsync().then((res) => {
-        const { uri } = res
-        const result = {
-          tempVideoPath: uri,
-          tempThumbPath: '',
-          errMsg: 'stopRecord: ok'
+    Promise.all([requestCameraPermissionsAsync(), requestMicrophonePermissionsAsync()]).then(([cameraPermission, microphonePermission]) => {
+      if(cameraPermission.granted && microphonePermission.granted) {
+        this.cameraRef?.recordAsync().then((res) => {
+          const { uri } = res
+          const result = {
+            tempVideoPath: uri,
+            tempThumbPath: '',
+            errMsg: 'stopRecord: ok'
+          }
+          this.recordCallback?.success?.(result)
+        }).catch((e) => {
+          const res = {
+            errMsg: e.message
+          }
+          option?.fail?.(res)
+          option?.complete?.(res)
+          this.recordCallback?.fail?.({ errMsg: e })
+        }).finally(() => {
+          this.recordCallback?.complete?.({ errMsg: '' })
+        })
+        const res = {
+          errMsg: 'startRecord: ok'
         }
-        this.recordCallback?.success?.(result)
-      }).catch((e) => {
+        option?.success?.(res)
+        option?.complete?.(res)
+      } else {
         const res = {
-          errMsg: e.message
+          errMsg: 'startRecord: fail',
+          err: Error('You have not enabled camera or microphone permissions')
         }
         option?.fail?.(res)
         option?.complete?.(res)
-        this.recordCallback?.fail?.({ errMsg: e })
-      }).finally(() => {
-        this.recordCallback?.complete?.({ errMsg: '' })
-      })
-      const res = {
-        errMsg: 'startRecord: ok'
       }
-      option?.success?.(res)
-      option?.complete?.(res)
     })
   }
 
@@ -67,8 +76,8 @@ class CameraContext {
         break
     }
     try {
-      const { status } = await Permissions.askAsync(Permissions.CAMERA, Permissions.AUDIO_RECORDING)
-      if (status === 'granted') {
+      const { granted } = await requestCameraPermissionsAsync()
+      if (granted) {
         if (this.cameraRef?.takePictureAsync) {
           const { uri } = await this.cameraRef.takePictureAsync({ quality: _quality })
           const res = {

package/src/lib/getLocation/index.ts

@@ -1,14 +1,13 @@
 import Geolocation from '@react-native-community/geolocation'
-import * as Permissions from 'expo-permissions'
-import { askAsyncPermissions } from '../../utils/premissions'
+import { requestForegroundPermissionsAsync } from 'expo-location'
 import { errorHandler } from '../../utils'
 
 export async function getLocation(opts: Taro.getLocation.Option = {}): Promise<Taro.getLocation.SuccessCallbackResult> {
   const { isHighAccuracy = false, highAccuracyExpireTime = 3000, success, fail, complete } = opts
 
   try {
-    const status = await askAsyncPermissions(Permissions.LOCATION)
-    if (status !== 'granted') {
+    const { granted } = await requestForegroundPermissionsAsync()
+    if (!granted) {
       const res = { errMsg: 'Permissions denied!' }
       return errorHandler(fail, complete)(res)
     }

package/src/lib/getRecorderManager/index.ts

@@ -1,5 +1,4 @@
 import { Audio } from 'expo-av'
-import * as Permissions from 'expo-permissions'
 import * as FileSystem from 'expo-file-system'
 
 class RecorderManager {
@@ -15,15 +14,15 @@ class RecorderManager {
   private static RecordingOptions = {
     android: {
       extension: '.m4a',
-      outputFormat: Audio.RECORDING_OPTION_ANDROID_OUTPUT_FORMAT_MPEG_4,
-      audioEncoder: Audio.RECORDING_OPTION_ANDROID_AUDIO_ENCODER_AAC,
+      outputFormat: Audio.AndroidOutputFormat.MPEG_4,
+      audioEncoder: Audio.AndroidAudioEncoder.AAC,
       sampleRate: 8000,
       numberOfChannels: 2,
       bitRate: 48000
     },
     ios: {
       extension: '.caf',
-      audioQuality: Audio.RECORDING_OPTION_IOS_AUDIO_QUALITY_MAX,
+      audioQuality: Audio.IOSAudioQuality.MAX,
       sampleRate: 8000,
       numberOfChannels: 2,
       bitRate: 48000,
@@ -52,13 +51,10 @@ class RecorderManager {
    * @param {string} [opts.audioSource='auto'] - 指定录音的音频输入源，可通过 wx.getAvailableAudioSources() 获取当前可用的音频源 ❌
    */
   async start (opts = {}) {
-    const { status } = await Permissions.getAsync(Permissions.AUDIO_RECORDING)
-    if (status !== 'granted') {
-      const { status } = await Permissions.askAsync(Permissions.AUDIO_RECORDING)
-      if (status !== 'granted') {
-        const res = { errMsg: 'Permissions denied!' }
-        return Promise.reject(res)
-      }
+    const { granted } = await Audio.requestPermissionsAsync()
+    if (!granted) {
+      const res = { errMsg: 'Permissions denied!' }
+      return Promise.reject(res)
     }
 
     const {