@tarojs/taro-h5 3.5.11 → 3.6.0-alpha.1

package/dist/api/base/system.js

@@ -62,6 +62,8 @@ export const getDeviceInfo = () => {
     const info = {
         /** 应用二进制接口类型（仅 Android 支持） */
         abi: '',
+        /** 设备二进制接口类型（仅 Android 支持） */
+        deviceAbi: '',
         /** 设备性能等级（仅Android小游戏）。取值为：-2 或 0（该设备无法运行小游戏），-1（性能未知），>=1（设备性能值，该值越高，设备性能越好，目前最高不到50） */
         benchmarkLevel: -1,
         /** 设备品牌 */
@@ -71,7 +73,9 @@ export const getDeviceInfo = () => {
         /** 操作系统及版本 */
         system: md.os(),
         /** 客户端平台 */
-        platform: navigator.platform
+        platform: navigator.platform,
+        /** 设备二进制接口类型（仅 Android 支持） */
+        CPUType: '',
     };
     return info;
 };

package/dist/api/device/clipboard.js

@@ -13,6 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { isFunction } from '@tarojs/shared';
 import { MethodHandler } from '../../utils/handler';
 import { getStorageSync, setStorage, setStorageSync } from '../storage/index';
 const CLIPBOARD_STORAGE_NAME = 'taro_clipboard';
@@ -37,7 +38,7 @@ export const setClipboardData = ({ data, success, fail, complete }) => __awaiter
          * iOS < 10 的系统可能无法使用编程方式访问剪贴板，参考：
          * https://stackoverflow.com/questions/34045777/copy-to-clipboard-using-javascript-in-ios/34046084
          */
-        if (typeof document.execCommand === 'function') {
+        if (isFunction(document.execCommand)) {
             const textarea = document.createElement('textarea');
             textarea.readOnly = true;
             textarea.value = data;

package/dist/api/location/chooseLocation.js

@@ -70,7 +70,7 @@ export const chooseLocation = ({ success, fail, complete, mapOpts } = {}) => {
             console.warn('chooseLocation api 依赖腾讯地图定位api，需要在 defineConstants 中配置 LOCATION_APIKEY');
             return handle.fail({
                 errMsg: 'LOCATION_APIKEY needed'
-            }, reject);
+            }, { resolve, reject });
         }
         const onMessage = event => {
             // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
@@ -89,14 +89,14 @@ export const chooseLocation = ({ success, fail, complete, mapOpts } = {}) => {
                 chooser.remove();
             }, 300);
             if (res) {
-                return handle.fail(res, reject);
+                return handle.fail(res, { resolve, reject });
             }
             else {
                 if (chooseLocation.latitude && chooseLocation.longitude) {
-                    return handle.success(chooseLocation, resolve);
+                    return handle.success(chooseLocation, { resolve, reject });
                 }
                 else {
-                    return handle.fail({}, reject);
+                    return handle.fail({}, { resolve, reject });
                 }
             }
         }, key, mapOpts);

package/dist/api/location/getLocation.js

@@ -52,9 +52,9 @@ const getLocationByW3CApi = (options) => {
                 /** 调用结果,自动补充 */
                 errMsg: ''
             };
-            handle.success(result, resolve);
+            handle.success(result, { resolve, reject });
         }, (error) => {
-            handle.fail({ errMsg: error.message }, reject);
+            handle.fail({ errMsg: error.message }, { resolve, reject });
         }, positionOptions);
     });
 };

package/dist/api/media/image/chooseImage.js

@@ -57,7 +57,7 @@ export const chooseImage = function (options) {
             el.removeAttribute('capture');
         }
     }
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         const TaroMouseEvents = document.createEvent('MouseEvents');
         TaroMouseEvents.initEvent('click', true, true);
         if (el) {
@@ -76,7 +76,7 @@ export const chooseImage = function (options) {
                         (_a = res.tempFilePaths) === null || _a === void 0 ? void 0 : _a.push(url);
                         (_b = res.tempFiles) === null || _b === void 0 ? void 0 : _b.push({ path: url, size: item.size, type: item.type, originalFileObj: item });
                     });
-                    handle.success(res, resolve);
+                    handle.success(res, { resolve, reject });
                     target.value = '';
                 }
             };

package/dist/api/media/image/getImageInfo.js

@@ -34,12 +34,12 @@ export const getImageInfo = (options) => {
                 width: image.naturalWidth,
                 height: image.naturalHeight,
                 path: getBase64Image(image) || src
-            }, resolve);
+            }, { resolve, reject });
         };
         image.onerror = (e) => {
             handle.fail({
                 errMsg: e.message
-            }, reject);
+            }, { resolve, reject });
         };
         image.src = src;
     });

package/dist/api/media/image/previewImage.js

@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { isFunction } from '@tarojs/shared';
 import { shouldBeObject } from '../../../utils';
 import { MethodHandler } from '../../../utils/handler';
 /**
@@ -30,7 +31,7 @@ export const previewImage = (options) => __awaiter(void 0, void 0, void 0, funct
             item.appendChild(div);
             // Note: 等待图片加载完后返回，会导致轮播被卡住
             resolve(item);
-            if (typeof loadFail === 'function') {
+            if (isFunction(loadFail)) {
                 image.addEventListener('error', (err) => {
                     loadFail({ errMsg: err.message });
                 });

package/dist/api/media/video/index.js

@@ -39,7 +39,7 @@ export const chooseVideo = (options) => {
     inputEl.setAttribute('accept', 'video/*');
     inputEl.setAttribute('style', 'position: fixed; top: -4000px; left: -3000px; z-index: -300;');
     document.body.appendChild(inputEl);
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         const TaroMouseEvents = document.createEvent('MouseEvents');
         TaroMouseEvents.initEvent('click', true, true);
         inputEl.dispatchEvent(TaroMouseEvents);
@@ -60,7 +60,7 @@ export const chooseVideo = (options) => {
                     res.size = event.total;
                     res.height = videoEl.videoHeight;
                     res.width = videoEl.videoHeight;
-                    return handle.success(res, resolve);
+                    return handle.success(res, { resolve, reject });
                 };
             };
             if (file) {

package/dist/api/network/request/index.js

@@ -1,5 +1,6 @@
 import 'whatwg-fetch';
 import Taro from '@tarojs/api';
+import { isFunction } from '@tarojs/shared';
 import jsonpRetry from 'jsonp-retry';
 import { serializeParams } from '../../../utils';
 // @ts-ignore
@@ -36,13 +37,13 @@ function _request(options) {
             .then(data => {
             res.statusCode = 200;
             res.data = data;
-            typeof success === 'function' && success(res);
-            typeof complete === 'function' && complete(res);
+            isFunction(success) && success(res);
+            isFunction(complete) && complete(res);
             return res;
         })
             .catch(err => {
-            typeof fail === 'function' && fail(err);
-            typeof complete === 'function' && complete(res);
+            isFunction(fail) && fail(err);
+            isFunction(complete) && complete(res);
             return Promise.reject(err);
         });
     }
@@ -110,13 +111,13 @@ function _request(options) {
     })
         .then(data => {
         res.data = data;
-        typeof success === 'function' && success(res);
-        typeof complete === 'function' && complete(res);
+        isFunction(success) && success(res);
+        isFunction(complete) && complete(res);
         return res;
     })
         .catch(err => {
-        typeof fail === 'function' && fail(err);
-        typeof complete === 'function' && complete(res);
+        isFunction(fail) && fail(err);
+        isFunction(complete) && complete(res);
         err.statusCode = res.statusCode;
         err.errMsg = err.message;
         return Promise.reject(err);

package/dist/api/network/websocket/index.d.ts

@@ -3,5 +3,5 @@ export declare function onSocketOpen(): void;
 export declare function onSocketMessage(): void;
 export declare function onSocketError(): void;
 export declare function onSocketClose(): void;
-export declare function connectSocket(options: any): Promise<unknown>;
+export declare function connectSocket(options?: Taro.connectSocket.Option): Promise<unknown>;
 export declare function closeSocket(): void;

package/dist/api/network/websocket/index.js

@@ -38,13 +38,13 @@ export function connectSocket(options) {
                     correct: 'String',
                     wrong: url
                 })
-            }, reject);
+            }, { resolve, reject });
         }
         // options.url must be invalid
         if (!url.startsWith('ws://') && !url.startsWith('wss://')) {
             return handle.fail({
                 errMsg: `request:fail invalid url "${url}"`
-            }, reject);
+            }, { resolve, reject });
         }
         // protocols must be array
         const _protocols = Array.isArray(protocols) ? protocols : null;
@@ -52,7 +52,7 @@ export function connectSocket(options) {
         if (socketTasks.length > 1) {
             return handle.fail({
                 errMsg: '同时最多发起 2 个 socket 请求，更多请参考文档。'
-            }, reject);
+            }, { resolve, reject });
         }
         const task = new SocketTask(url, _protocols);
         task._destroyWhenClose = function () {

package/dist/api/network/websocket/socketTask.js

@@ -1,3 +1,4 @@
+import { isFunction } from '@tarojs/shared';
 export class SocketTask {
     constructor(url, protocols) {
         if (protocols && protocols.length) {
@@ -21,14 +22,14 @@ export class SocketTask {
         if (this.readyState !== 1) {
             const res = { errMsg: 'SocketTask.send:fail SocketTask.readState is not OPEN' };
             console.error(res.errMsg);
-            typeof fail === 'function' && fail(res);
-            typeof complete === 'function' && complete(res);
+            isFunction(fail) && fail(res);
+            isFunction(complete) && complete(res);
             return Promise.reject(res);
         }
         this.ws.send(data);
         const res = { errMsg: 'sendSocketMessage:ok' };
-        typeof success === 'function' && success(res);
-        typeof complete === 'function' && complete(res);
+        isFunction(success) && success(res);
+        isFunction(complete) && complete(res);
         return Promise.resolve(res);
     }
     close(opts = {}) {
@@ -40,8 +41,8 @@ export class SocketTask {
         this._destroyWhenClose && this._destroyWhenClose();
         this.ws.close();
         const res = { errMsg: 'closeSocket:ok' };
-        typeof success === 'function' && success(res);
-        typeof complete === 'function' && complete(res);
+        isFunction(success) && success(res);
+        isFunction(complete) && complete(res);
         return Promise.resolve(res);
     }
     onOpen(func) {

package/dist/api/taro.js

@@ -1,5 +1,6 @@
 import Taro from '@tarojs/api';
 import { history } from '@tarojs/router';
+import { isFunction } from '@tarojs/shared';
 import { getApp, getCurrentInstance, getCurrentPages, navigateBack, navigateTo, nextTick, redirectTo, reLaunch, switchTab } from '../api';
 import { permanentlyNotSupport } from '../utils';
 const { Behavior, getEnv, ENV_TYPE, Link, interceptors, getInitPxTransform, Current, options, eventCenter, Events, preload } = Taro;
@@ -30,7 +31,7 @@ const requirePlugin = permanentlyNotSupport('requirePlugin');
 const pxTransform = function (size) {
     const options = taro.config;
     const baseFontSize = options.baseFontSize || 20;
-    const designWidth = ((input = 0) => typeof options.designWidth === 'function'
+    const designWidth = ((input = 0) => isFunction(options.designWidth)
         ? options.designWidth(input)
         : options.designWidth);
     const rootValue = (input = 0) => baseFontSize / options.deviceRatio[designWidth(input)] * 2;

package/dist/api/ui/navigation-bar/index.d.ts

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/api';
 export declare const showNavigationBarLoading: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
-export declare function setNavigationBarTitle(options: any): Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
+export declare function setNavigationBarTitle(options?: Taro.setNavigationBarTitle.Option): Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
 /**
  * 设置页面导航条颜色
  */

package/dist/api/ui/pull-down-refresh.js

@@ -7,8 +7,8 @@ export const startPullDownRefresh = function ({ success, fail, complete } = {})
     const handle = new MethodHandler({ name: 'startPullDownRefresh', success, fail, complete });
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroStartPullDownRefresh', {
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -19,8 +19,8 @@ export const stopPullDownRefresh = function ({ success, fail, complete } = {}) {
     const handle = new MethodHandler({ name: 'stopPullDownRefresh', success, fail, complete });
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroStopPullDownRefresh', {
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };

package/dist/api/ui/scroll/index.js

@@ -15,7 +15,7 @@ export const pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration
             if (scrollTop === undefined && !selector) {
                 return handle.fail({
                     errMsg: 'scrollTop" 或 "selector" 需要其之一'
-                }, reject);
+                }, { resolve, reject });
             }
             const id = (_b = (_a = Current.page) === null || _a === void 0 ? void 0 : _a.path) === null || _b === void 0 ? void 0 : _b.replace(/([^a-z0-9\u00a0-\uffff_-])/ig, '\\$1');
             const el = (id
@@ -69,7 +69,7 @@ export const pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration
                     }, FRAME_DURATION);
                 }
                 else {
-                    return handle.success({}, resolve);
+                    return handle.success({}, { resolve, reject });
                 }
             };
             scroll();
@@ -77,7 +77,7 @@ export const pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration
         catch (e) {
             return handle.fail({
                 errMsg: e.message
-            }, reject);
+            }, { resolve, reject });
         }
     });
 };

package/dist/api/ui/tab-bar.js

@@ -30,8 +30,8 @@ export const showTabBarRedDot = (options) => {
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroShowTabBarRedDotHandler', {
             index,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -60,8 +60,8 @@ export const showTabBar = (options = {}) => {
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroShowTabBar', {
             animation,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -112,8 +112,8 @@ export const setTabBarStyle = (options = {}) => {
             selectedColor,
             backgroundColor,
             borderStyle,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -145,8 +145,8 @@ export const setTabBarItem = (options) => {
             text,
             iconPath,
             selectedIconPath,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -185,8 +185,8 @@ export const setTabBarBadge = (options) => {
         Taro.eventCenter.trigger('__taroSetTabBarBadge', {
             index,
             text,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -215,8 +215,8 @@ export const removeTabBarBadge = (options) => {
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroRemoveTabBarBadge', {
             index,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -245,8 +245,8 @@ export const hideTabBarRedDot = (options) => {
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroHideTabBarRedDotHandler', {
             index,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -275,8 +275,8 @@ export const hideTabBar = (options = {}) => {
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroHideTabBar', {
             animation,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };

package/dist/api/wxml/MediaQueryObserver.js

@@ -1,4 +1,5 @@
-import { isFunction, toKebabCase } from '../../utils';
+import { isFunction } from '@tarojs/shared';
+import { toKebabCase } from '../../utils';
 function generateMediaQueryStr(descriptor) {
     const mediaQueryArr = [];
     const descriptorMenu = ['width', 'minWidth', 'maxWidth', 'height', 'minHeight', 'maxHeight', 'orientation'];
@@ -25,7 +26,7 @@ export class MediaQueryObserver {
                 callback({ matches: ev.matches });
             };
             callback({ matches: this._mediaQueryObserver.matches });
-            // 兼容旧浏览器中MediaQueryList尚未继承于EventTarget导致不存在'addEventListener'
+            // 兼容旧浏览器中 MediaQueryList 尚未继承于 EventTarget 导致不存在 'addEventListener'
             if ('addEventListener' in this._mediaQueryObserver) {
                 this._mediaQueryObserver.addEventListener('change', this._listener);
             }
@@ -37,7 +38,7 @@ export class MediaQueryObserver {
     // 停止监听，销毁媒体查询对象
     disconnect() {
         if (this._mediaQueryObserver && this._listener) {
-            // 兼容旧浏览器中MediaQueryList尚未继承于EventTarget导致不存在'removeEventListener'
+            // 兼容旧浏览器中 MediaQueryList 尚未继承于 EventTarget 导致不存在 'removeEventListener'
             if ('removeEventListener' in this._mediaQueryObserver) {
                 this._mediaQueryObserver.removeEventListener('change', this._listener);
             }

package/dist/api/wxml/nodesRef.d.ts

@@ -1,3 +1,4 @@
+import Taro from '@tarojs/api';
 import { SelectorQuery } from './selectorQuery';
 export declare class NodesRef implements Taro.NodesRef {
     _component?: TaroGeneral.IAnyObject;

package/dist/api/wxml/selectorQuery.js

@@ -1,3 +1,4 @@
+import { isFunction } from '@tarojs/shared';
 import { findDOM } from '../../utils';
 import { CanvasContext } from '../canvas/CanvasContext';
 import { NodesRef } from './nodesRef';
@@ -183,9 +184,9 @@ export class SelectorQuery {
             const _queueCb = this._queueCb;
             res.forEach((item, index) => {
                 const cb = _queueCb[index];
-                typeof cb === 'function' && cb.call(this, item);
+                isFunction(cb) && cb.call(this, item);
             });
-            typeof cb === 'function' && cb.call(this, res);
+            isFunction(cb) && cb.call(this, res);
         });
         return this;
     }

package/dist/index.cjs.d.ts

@@ -551,7 +551,7 @@ declare function onSocketOpen(): void;
 declare function onSocketMessage(): void;
 declare function onSocketError(): void;
 declare function onSocketClose(): void;
-declare function connectSocket(options: any): Promise<unknown>;
+declare function connectSocket(options?: Taro.connectSocket.Option): Promise<unknown>;
 declare function closeSocket(): void;
 // 帐号信息
 declare const getAccountInfoSync: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
@@ -686,7 +686,7 @@ declare const disableAlertBeforeUnload: (option?: {}, ...args: any[]) => Promise
 declare const getMenuButtonBoundingClientRect: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
 // 导航栏
 declare const showNavigationBarLoading: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
-declare function setNavigationBarTitle(options: any): Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
+declare function setNavigationBarTitle(options?: Taro.setNavigationBarTitle.Option): Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
 /**
  * 设置页面导航条颜色
  */