@tarojs/taro-rn 3.5.0-theta.1 → 3.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-rn",
-  "version": "3.5.0-theta.1",
+  "version": "3.5.0",
   "description": "Taro RN framework",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
@@ -26,7 +26,7 @@
     "@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-theta.1",
+    "@tarojs/runtime-rn": "3.5.0",
     "babel-preset-expo": "~9.0.2",
     "base64-js": "^1.3.0",
     "deprecated-react-native-prop-types": "^2.3.0",
@@ -41,6 +41,7 @@
     "expo-modules-core": "~0.9.2",
     "expo-sensors": "~11.2.0",
     "nullthrows": "^1.1.1",
+    "prop-types": "^15.8.1",
     "react-native-device-info": "~8.4.8",
     "react-native-image-resizer": "~1.4.5",
     "react-native-image-zoom-viewer": "^3.0.1",
@@ -51,9 +52,11 @@
     "react-native-syan-image-picker": "0.5.3"
   },
   "devDependencies": {
+    "@types/jest": "^27.4.1",
     "@types/react": "^17.0.0",
     "@types/react-native": "^0.67.7",
     "fbjs-scripts": "^3.0.1",
+    "metro-react-native-babel-preset": "^0.67.0",
     "react-native": "^0.68.2"
   },
   "peerDependencies": {

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/types/overlay.d.ts

@@ -0,0 +1,9 @@
+import Taro from '@tarojs/taro'
+
+declare module '@tarojs/taro' {
+  namespace vibrateShort {
+    interface Option {
+      type?: 'heavy' | 'medium' | 'light'
+    }
+  }
+}