@tarojs/taro-h5 4.0.0-beta.1 → 4.0.0-beta.2

package/dist/index.cjs.js

@@ -5,15 +5,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var Taro = require('@tarojs/api');
 var router = require('@tarojs/router');
 var shared = require('@tarojs/shared');
-var utils = require('@tarojs/router/dist/utils');
 var runtime = require('@tarojs/runtime');
 var base64Js = require('base64-js');
-var navigate = require('@tarojs/router/dist/utils/navigate');
+var tslib = require('tslib');
+var platform = require('platform');
 var isNil = require('lodash-es/isNil');
 var queryString = require('query-string');
 var throttle = require('lodash-es/throttle');
 var ics = require('ics');
 var components = require('@tarojs/components/dist/components');
+var isMobile = require('is-mobile');
 require('whatwg-fetch');
 require('abortcontroller-polyfill/dist/abortcontroller-polyfill-only');
 var jsonpRetry = require('jsonp-retry');
@@ -302,8 +303,8 @@ function processOpenApi({ name, defaultOptions, standardMethod, formatOptions =
 function getCurrentPath() {
     var _a, _b, _c, _d, _e, _f;
     const appConfig = window.__taroAppConfig || {};
-    const routePath = utils.getCurrentPage((_a = appConfig.router) === null || _a === void 0 ? void 0 : _a.mode, (_b = appConfig.router) === null || _b === void 0 ? void 0 : _b.basename);
-    const homePath = utils.getHomePage((_d = (_c = appConfig.routes) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.path, (_e = appConfig.router) === null || _e === void 0 ? void 0 : _e.basename, (_f = appConfig.router) === null || _f === void 0 ? void 0 : _f.customRoutes, appConfig.entryPagePath);
+    const routePath = runtime.getCurrentPage((_a = appConfig.router) === null || _a === void 0 ? void 0 : _a.mode, (_b = appConfig.router) === null || _b === void 0 ? void 0 : _b.basename);
+    const homePath = runtime.getHomePage((_d = (_c = appConfig.routes) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.path, (_e = appConfig.router) === null || _e === void 0 ? void 0 : _e.basename, (_f = appConfig.router) === null || _f === void 0 ? void 0 : _f.customRoutes, appConfig.entryPagePath);
     /**
      * createPageConfig 时根据 stack 的长度来设置 stamp 以保证页面 path 的唯一，此函数是在 createPageConfig 之前调用，预先设置 stamp=1
      * url 上没有指定应用的启动页面时使用 homePath
@@ -347,377 +348,6 @@ const preloadWebview = /* @__PURE__ */ temporarilyNotSupport('preloadWebview');
 const preloadSkylineView = /* @__PURE__ */ temporarilyNotSupport('preloadSkylineView');
 const preloadAssets = /* @__PURE__ */ temporarilyNotSupport('preloadAssets');
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    if (typeof b !== "function" && b !== null)
-        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-
-function __rest(s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-}
-
-function __decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-
-function __param(paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-}
-
-function __esDecorate(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
-    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
-    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _, done = false;
-    for (var i = decorators.length - 1; i >= 0; i--) {
-        var context = {};
-        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
-        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
-        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
-        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
-        if (kind === "accessor") {
-            if (result === void 0) continue;
-            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-            if (_ = accept(result.get)) descriptor.get = _;
-            if (_ = accept(result.set)) descriptor.set = _;
-            if (_ = accept(result.init)) initializers.unshift(_);
-        }
-        else if (_ = accept(result)) {
-            if (kind === "field") initializers.unshift(_);
-            else descriptor[key] = _;
-        }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-};
-
-function __runInitializers(thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
-
-function __propKey(x) {
-    return typeof x === "symbol" ? x : "".concat(x);
-};
-
-function __setFunctionName(f, name, prefix) {
-    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
-    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
-};
-
-function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-}
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-}
-
-var __createBinding = Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-});
-
-function __exportStar(m, o) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(o, p)) __createBinding(o, m, p);
-}
-
-function __values(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-}
-
-function __read(o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-}
-
-/** @deprecated */
-function __spread() {
-    for (var ar = [], i = 0; i < arguments.length; i++)
-        ar = ar.concat(__read(arguments[i]));
-    return ar;
-}
-
-/** @deprecated */
-function __spreadArrays() {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
-}
-
-function __spreadArray(to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-}
-
-function __await(v) {
-    return this instanceof __await ? (this.v = v, this) : new __await(v);
-}
-
-function __asyncGenerator(thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-}
-
-function __asyncDelegator(o) {
-    var i, p;
-    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v; } : f; }
-}
-
-function __asyncValues(o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-}
-
-function __makeTemplateObject(cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
-
-var __setModuleDefault = Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-};
-
-function __importStar(mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-}
-
-function __importDefault(mod) {
-    return (mod && mod.__esModule) ? mod : { default: mod };
-}
-
-function __classPrivateFieldGet(receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-}
-
-function __classPrivateFieldSet(receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-}
-
-function __classPrivateFieldIn(state, receiver) {
-    if (receiver === null || (typeof receiver !== "object" && typeof receiver !== "function")) throw new TypeError("Cannot use 'in' operator on non-object");
-    return typeof state === "function" ? receiver === state : state.has(receiver);
-}
-
-function __addDisposableResource(env, value, async) {
-    if (value !== null && value !== void 0) {
-        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
-        var dispose;
-        if (async) {
-            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
-            dispose = value[Symbol.asyncDispose];
-        }
-        if (dispose === void 0) {
-            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
-            dispose = value[Symbol.dispose];
-        }
-        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
-        env.stack.push({ value: value, dispose: dispose, async: async });
-    }
-    else if (async) {
-        env.stack.push({ async: true });
-    }
-    return value;
-}
-
-var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
-function __disposeResources(env) {
-    function fail(e) {
-        env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
-        env.hasError = true;
-    }
-    function next() {
-        while (env.stack.length) {
-            var rec = env.stack.pop();
-            try {
-                var result = rec.dispose && rec.dispose.call(rec.value);
-                if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
-            }
-            catch (e) {
-                fail(e);
-            }
-        }
-        if (env.hasError) throw env.error;
-    }
-    return next();
-}
-
-var tslib_es6 = {
-    __extends: __extends,
-    __assign: __assign,
-    __rest: __rest,
-    __decorate: __decorate,
-    __param: __param,
-    __metadata: __metadata,
-    __awaiter: __awaiter,
-    __generator: __generator,
-    __createBinding: __createBinding,
-    __exportStar: __exportStar,
-    __values: __values,
-    __read: __read,
-    __spread: __spread,
-    __spreadArrays: __spreadArrays,
-    __spreadArray: __spreadArray,
-    __await: __await,
-    __asyncGenerator: __asyncGenerator,
-    __asyncDelegator: __asyncDelegator,
-    __asyncValues: __asyncValues,
-    __makeTemplateObject: __makeTemplateObject,
-    __importStar: __importStar,
-    __importDefault: __importDefault,
-    __classPrivateFieldGet: __classPrivateFieldGet,
-    __classPrivateFieldSet: __classPrivateFieldSet,
-    __classPrivateFieldIn: __classPrivateFieldIn,
-    __addDisposableResource: __addDisposableResource,
-    __disposeResources: __disposeResources,
-};
-
 /** 跳转系统蓝牙设置页 */
 const openSystemBluetoothSetting = /* @__PURE__ */ temporarilyNotSupport('openSystemBluetoothSetting');
 /** 跳转系统微信授权管理页 */
@@ -766,7 +396,7 @@ const getSystemSetting = () => {
 };
 /** 获取设备设置 */
 const getDeviceInfo = () => {
-    const md = navigate.getMobileDetect();
+    var _a, _b;
     const info = {
         /** 应用二进制接口类型（仅 Android 支持） */
         abi: '',
@@ -775,13 +405,13 @@ const getDeviceInfo = () => {
         /** 设备性能等级（仅Android小游戏）。取值为：-2 或 0（该设备无法运行小游戏），-1（性能未知），>=1（设备性能值，该值越高，设备性能越好，目前最高不到50） */
         benchmarkLevel: -1,
         /** 设备品牌 */
-        brand: md.mobile() || '',
+        brand: platform.manufacturer || 'unknown',
         /** 设备型号 */
-        model: md.mobile() || '',
+        model: platform.product || 'unknown',
         /** 操作系统及版本 */
-        system: md.os(),
+        system: ((_a = platform.os) === null || _a === void 0 ? void 0 : _a.toString()) || 'unknown',
         /** 客户端平台 */
-        platform: navigator.platform,
+        platform: ((_b = platform.os) === null || _b === void 0 ? void 0 : _b.family) || 'unknown',
         /** 设备二进制接口类型（仅 Android 支持） */
         CPUType: '',
     };
@@ -874,7 +504,7 @@ const getSystemInfoSync = () => {
     return info;
 };
 /** 获取系统信息 */
-const getSystemInfoAsync = (options = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const getSystemInfoAsync = (options = {}) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     const { success, fail, complete } = options;
     const handle = new MethodHandler({ name: 'getSystemInfoAsync', success, fail, complete });
     try {
@@ -888,7 +518,7 @@ const getSystemInfoAsync = (options = {}) => __awaiter(void 0, void 0, void 0, f
     }
 });
 /** 获取系统信息 */
-const getSystemInfo = (options = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const getSystemInfo = (options = {}) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     const { success, fail, complete } = options;
     const handle = new MethodHandler({ name: 'getSystemInfo', success, fail, complete });
     try {
@@ -1066,7 +696,7 @@ const env = {
     TARO_VERSION: process.env.TARO_VERSION,
 };
 // Note: 该方法由 taro-plugin-platform-h5 实现
-// export const canIUse = /* @__PURE__ */ temporarilyNotSupport('canIUse')
+
 function arrayBufferToBase64(arrayBuffer) {
     return base64Js.fromByteArray(arrayBuffer);
 }
@@ -1078,7 +708,10 @@ const TextBaseLineMap = {
     top: 'top',
     bottom: 'bottom',
     middle: 'middle',
-    normal: 'alphabetic'
+    normal: 'alphabetic',
+    hanging: 'hanging',
+    alphabetic: 'alphabetic',
+    ideographic: 'ideographic'
 };
 class CanvasContext {
     constructor(canvas, ctx) {
@@ -1169,7 +802,7 @@ class CanvasContext {
      * @todo 每次 draw 都会读取 width 和 height
      */
     draw(reserve, callback) {
-        return __awaiter(this, void 0, void 0, function* () {
+        return tslib.__awaiter(this, void 0, void 0, function* () {
             try {
                 if (!reserve) {
                     this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
@@ -1477,7 +1110,7 @@ const checkIsOpenAccessibility = /* @__PURE__ */ temporarilyNotSupport('checkIsO
 // 电量
 // Note: 浏览器标准下不支持，其他实现方案不准确，不建议开发者使用
 const getBatteryInfoSync = /* @__PURE__ */ permanentlyNotSupport('getBatteryInfoSync');
-const getBatteryInfo = ({ success, fail, complete } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const getBatteryInfo = ({ success, fail, complete } = {}) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const handle = new MethodHandler({ name: 'getBatteryInfo', success, fail, complete });
     try {
@@ -1860,7 +1493,7 @@ document.addEventListener('copy', () => {
 /**
  * 设置系统剪贴板的内容
  */
-const setClipboardData = ({ data, success, fail, complete }) => __awaiter(void 0, void 0, void 0, function* () {
+const setClipboardData = ({ data, success, fail, complete }) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     const handle = new MethodHandler({ name: 'setClipboardData', success, fail, complete });
     try {
         setStorageSync(CLIPBOARD_STORAGE_NAME, data);
@@ -1894,7 +1527,7 @@ const setClipboardData = ({ data, success, fail, complete }) => __awaiter(void 0
 /**
  * 获取系统剪贴板的内容
  */
-const getClipboardData = ({ success, fail, complete } = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const getClipboardData = ({ success, fail, complete } = {}) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     const handle = new MethodHandler({ name: 'getClipboardData', success, fail, complete });
     try {
         const data = getStorageSync(CLIPBOARD_STORAGE_NAME);
@@ -2130,7 +1763,7 @@ const getNetworkType = (options = {}) => {
     return handle.success({ networkType });
 };
 const networkStatusManager = new CallbackManager();
-const networkStatusListener = () => __awaiter(void 0, void 0, void 0, function* () {
+const networkStatusListener = () => tslib.__awaiter(void 0, void 0, void 0, function* () {
     const { networkType } = yield getNetworkType();
     const isConnected = networkType !== 'none';
     const obj = { isConnected, networkType };
@@ -2374,14 +2007,14 @@ function styleInject(css, ref) {
   }
 }
 
-var css_248z = ".taro_choose_location {\n  display: flex;\n  position: fixed;\n  top: 100%;\n  z-index: 1;\n  flex-direction: column;\n  width: 100%;\n  height: 100%;\n  background-color: #fff;\n  transition: ease top 0.3s;\n}\n.taro_choose_location_bar {\n  display: flex;\n  flex: 0 95px;\n  height: 95px;\n  background-color: #ededed;\n  color: #090909;\n}\n.taro_choose_location_back {\n  position: relative;\n  flex: 0 45px;\n  margin-top: 30px;\n  width: 33px;\n  height: 30px;\n}\n.taro_choose_location_back::before {\n  display: block;\n  position: absolute;\n  left: 0;\n  top: 0;\n  border: solid 15px;\n  border-color: transparent #090909 transparent transparent;\n  width: 0;\n  height: 0;\n  content: \"\";\n}\n.taro_choose_location_back::after {\n  display: block;\n  position: absolute;\n  left: 3px;\n  top: 0;\n  border: solid 15px;\n  border-color: transparent #ededed transparent transparent;\n  width: 0;\n  height: 0;\n  content: \"\";\n}\n.taro_choose_location_title {\n  flex: 1;\n  padding-left: 30px;\n  line-height: 95px;\n}\n.taro_choose_location_submit {\n  margin: 18px 30px 0 0;\n  padding: 0;\n  border: none;\n  width: 110px;\n  height: 60px;\n  background-color: #08bf62;\n  line-height: 60px;\n  font-size: 28px;\n  color: #fff;\n}\n.taro_choose_location_frame {\n  flex: 1;\n}";
-var stylesheet=".taro_choose_location {\n  display: flex;\n  position: fixed;\n  top: 100%;\n  z-index: 1;\n  flex-direction: column;\n  width: 100%;\n  height: 100%;\n  background-color: #fff;\n  transition: ease top 0.3s;\n}\n.taro_choose_location_bar {\n  display: flex;\n  flex: 0 95px;\n  height: 95px;\n  background-color: #ededed;\n  color: #090909;\n}\n.taro_choose_location_back {\n  position: relative;\n  flex: 0 45px;\n  margin-top: 30px;\n  width: 33px;\n  height: 30px;\n}\n.taro_choose_location_back::before {\n  display: block;\n  position: absolute;\n  left: 0;\n  top: 0;\n  border: solid 15px;\n  border-color: transparent #090909 transparent transparent;\n  width: 0;\n  height: 0;\n  content: \"\";\n}\n.taro_choose_location_back::after {\n  display: block;\n  position: absolute;\n  left: 3px;\n  top: 0;\n  border: solid 15px;\n  border-color: transparent #ededed transparent transparent;\n  width: 0;\n  height: 0;\n  content: \"\";\n}\n.taro_choose_location_title {\n  flex: 1;\n  padding-left: 30px;\n  line-height: 95px;\n}\n.taro_choose_location_submit {\n  margin: 18px 30px 0 0;\n  padding: 0;\n  border: none;\n  width: 110px;\n  height: 60px;\n  background-color: #08bf62;\n  line-height: 60px;\n  font-size: 28px;\n  color: #fff;\n}\n.taro_choose_location_frame {\n  flex: 1;\n}";
+var css_248z = ".taro_choose_location{background-color:#fff;display:flex;flex-direction:column;height:100%;position:fixed;top:100%;transition:top .3s ease;width:100%;z-index:1}.taro_choose_location_bar{background-color:#ededed;color:#090909;display:flex;flex:0 95px;height:95px}.taro_choose_location_back{flex:0 45px;height:30px;margin-top:30px;position:relative;width:33px}.taro_choose_location_back:before{border:15px solid transparent;border-right-color:#090909;content:\"\";display:block;height:0;left:0;position:absolute;top:0;width:0}.taro_choose_location_back:after{border:15px solid transparent;border-right-color:#ededed;content:\"\";display:block;height:0;left:3px;position:absolute;top:0;width:0}.taro_choose_location_title{flex:1;line-height:95px;padding-left:30px}.taro_choose_location_submit{background-color:#08bf62;border:none;color:#fff;font-size:28px;height:60px;line-height:60px;margin:18px 30px 0 0;padding:0;width:110px}.taro_choose_location_frame{flex:1}";
+var stylesheet=".taro_choose_location{background-color:#fff;display:flex;flex-direction:column;height:100%;position:fixed;top:100%;transition:top .3s ease;width:100%;z-index:1}.taro_choose_location_bar{background-color:#ededed;color:#090909;display:flex;flex:0 95px;height:95px}.taro_choose_location_back{flex:0 45px;height:30px;margin-top:30px;position:relative;width:33px}.taro_choose_location_back:before{border:15px solid transparent;border-right-color:#090909;content:\"\";display:block;height:0;left:0;position:absolute;top:0;width:0}.taro_choose_location_back:after{border:15px solid transparent;border-right-color:#ededed;content:\"\";display:block;height:0;left:3px;position:absolute;top:0;width:0}.taro_choose_location_title{flex:1;line-height:95px;padding-left:30px}.taro_choose_location_submit{background-color:#08bf62;border:none;color:#fff;font-size:28px;height:60px;line-height:60px;margin:18px 30px 0 0;padding:0;width:110px}.taro_choose_location_frame{flex:1}";
 styleInject(css_248z,{"insertAt":"top"});
 
 let container = null;
 function createLocationChooser(handler, key = LOCATION_APIKEY, mapOpt = {}) {
     var _a, _b, _c;
-    const { latitude, longitude } = mapOpt, opts = __rest(mapOpt, ["latitude", "longitude"]);
+    const { latitude, longitude } = mapOpt, opts = tslib.__rest(mapOpt, ["latitude", "longitude"]);
     const query = Object.assign({ key, type: 1, coord: ((_a = mapOpt.coord) !== null && _a !== void 0 ? _a : [latitude, longitude].every(e => Number(e) >= 0)) ? `${latitude},${longitude}` : undefined, referer: 'myapp' }, opts);
     if (!container) {
         const html = `
@@ -2788,7 +2421,7 @@ const getImageInfo = (options) => {
 /**
  * 在新页面中全屏预览图片。预览的过程中用户可以进行保存图片、发送给朋友等操作。
  */
-const previewImage = (options) => __awaiter(void 0, void 0, void 0, function* () {
+const previewImage = (options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     // TODO 改为通过 window.__taroAppConfig 获取配置的 Swiper 插件创建节点
     components.defineCustomElementTaroSwiperCore();
     components.defineCustomElementTaroSwiperItemCore();
@@ -3155,7 +2788,7 @@ const setBackgroundColor = /* @__PURE__ */ temporarilyNotSupport('setBackgroundC
 const nextTick = Taro.nextTick;
 
 // 字体
-const loadFontFace = (options) => __awaiter(void 0, void 0, void 0, function* () {
+const loadFontFace = (options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     options = Object.assign({ global: false }, options);
     const { success, fail, complete, family, source, desc = {} } = options;
     const handle = new MethodHandler({ name: 'loadFontFace', success, fail, complete });
@@ -3874,7 +3507,7 @@ const hideLoading = ({ noConflict = false, success, fail, complete } = {}) => {
     toast.hide(0, noConflict ? 'loading' : '');
     return handle.success();
 };
-const showModal = (options = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const showModal = (options = {}) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     init(document);
     options = Object.assign({
         title: '',
@@ -3968,7 +3601,7 @@ function hideModal() {
         return;
     modal.hide();
 }
-const showActionSheet = (options = { itemList: [] }, methodName = 'showActionSheet') => __awaiter(void 0, void 0, void 0, function* () {
+const showActionSheet = (options = { itemList: [] }, methodName = 'showActionSheet') => tslib.__awaiter(void 0, void 0, void 0, function* () {
     init(document);
     options = Object.assign({
         itemColor: '#000000',
@@ -4063,7 +3696,7 @@ function setNavigationBarTitle(options) {
             })
         });
     }
-    navigate.setTitle(title);
+    router.setTitle(title);
     return handle.success();
 }
 /**
@@ -4507,7 +4140,7 @@ const checkIsPictureInPictureActive = /* @__PURE__ */ temporarilyNotSupport('che
  */
 const chooseMedia = function (options, methodName = 'chooseMedia') {
     var _a;
-    return __awaiter(this, void 0, void 0, function* () {
+    return tslib.__awaiter(this, void 0, void 0, function* () {
         // options must be an Object
         const isObject = shouldBeObject(options);
         if (!isObject.flag) {
@@ -4548,8 +4181,7 @@ const chooseMedia = function (options, methodName = 'chooseMedia') {
             el.removeAttribute('multiple');
         }
         // Note: Input 仅在移动端支持 capture 属性，可以使用 getUserMedia 替代（暂不考虑）
-        const md = navigate.getMobileDetect();
-        if (md.mobile()) {
+        if (isMobile.isMobile()) {
             if (sourceType.length > 1 || sourceType.length < 1) {
                 try {
                     const { tapIndex } = yield showActionSheet({
@@ -4584,12 +4216,12 @@ const chooseMedia = function (options, methodName = 'chooseMedia') {
                 return;
             document.body.appendChild(el);
             el.onchange = function (e) {
-                return __awaiter(this, void 0, void 0, function* () {
+                return tslib.__awaiter(this, void 0, void 0, function* () {
                     const target = e.target;
                     if (target) {
                         const files = target.files || [];
                         const arr = [...files];
-                        yield Promise.all(arr.map((item) => __awaiter(this, void 0, void 0, function* () {
+                        yield Promise.all(arr.map((item) => tslib.__awaiter(this, void 0, void 0, function* () {
                             var _a;
                             try {
                                 (_a = res.tempFiles) === null || _a === void 0 ? void 0 : _a.push(yield loadMedia(item));
@@ -4714,7 +4346,7 @@ const chooseImage = function (options) {
         return Promise.reject(res);
     }
     let camera = 'back';
-    const { sourceType = ['album', 'camera'], success, complete, fail } = options, args = __rest(options, ["sourceType", "success", "complete", "fail"]);
+    const { sourceType = ['album', 'camera'], success, complete, fail } = options, args = tslib.__rest(options, ["sourceType", "success", "complete", "fail"]);
     if (sourceType.includes('camera') && sourceType.indexOf('user') > -1) {
         camera = 'front';
     }
@@ -4787,7 +4419,7 @@ const saveVideoToPhotosAlbum = (options) => {
 };
 
 const getVideoInfo = function (options) {
-    return __awaiter(this, void 0, void 0, function* () {
+    return tslib.__awaiter(this, void 0, void 0, function* () {
         // options must be an Object
         const isObject = shouldBeObject(options);
         if (!isObject.flag) {
@@ -4825,7 +4457,7 @@ const getVideoInfo = function (options) {
                 res.height = video.videoHeight;
                 res.width = video.videoWidth;
                 fetch(src)
-                    .then((e) => __awaiter(this, void 0, void 0, function* () {
+                    .then((e) => tslib.__awaiter(this, void 0, void 0, function* () {
                     const blob = yield e.blob();
                     res.type = blob.type;
                     res.size = blob.size;
@@ -5149,7 +4781,7 @@ function _request(options = {}) {
     const { success, complete, fail } = options;
     const params = {};
     const res = {};
-    let { cache = 'default', credentials, data, dataType, header = {}, jsonp, method = 'GET', mode, responseType, signal, timeout = 60000, url = '' } = options, opts = __rest(options, ["cache", "credentials", "data", "dataType", "header", "jsonp", "method", "mode", "responseType", "signal", "timeout", "url"]);
+    let { cache = 'default', credentials, data, dataType, header = {}, jsonp, method = 'GET', mode, responseType, signal, timeout = 60000, url = '' } = options, opts = tslib.__rest(options, ["cache", "credentials", "data", "dataType", "header", "jsonp", "method", "mode", "responseType", "signal", "timeout", "url"]);
     Object.assign(params, opts);
     if (jsonp) {
         // @ts-ignore
@@ -5208,23 +4840,30 @@ function _request(options = {}) {
         params.mode = mode;
     }
     let timeoutTimer = null;
+    let controller = null;
     if (signal) {
         params.signal = signal;
     }
-    else if (typeof timeout === 'number') {
-        const controller = new window.AbortController();
+    else {
+        controller = new window.AbortController();
         params.signal = controller.signal;
-        timeoutTimer = setTimeout(function () {
-            controller.abort();
-        }, timeout);
+        if (typeof timeout === 'number') {
+            timeoutTimer = setTimeout(function () {
+                if (controller)
+                    controller.abort();
+            }, timeout);
+        }
     }
     params.credentials = credentials;
-    return fetch(url, params)
+    const p = fetch(url, params)
         .then(response => {
         if (timeoutTimer) {
             clearTimeout(timeoutTimer);
             timeoutTimer = null;
         }
+        if (controller) {
+            controller = null;
+        }
         if (!response) {
             const errorResponse = { ok: false };
             throw errorResponse;
@@ -5260,12 +4899,28 @@ function _request(options = {}) {
             clearTimeout(timeoutTimer);
             timeoutTimer = null;
         }
+        if (controller) {
+            controller = null;
+        }
         shared.isFunction(fail) && fail(err);
         shared.isFunction(complete) && complete(res);
         err.statusCode = res.statusCode;
         err.errMsg = err.message;
         return Promise.reject(err);
     });
+    if (!p.abort && controller) {
+        p.abort = cb => {
+            if (controller) {
+                cb && cb();
+                controller.abort();
+                if (timeoutTimer) {
+                    clearTimeout(timeoutTimer);
+                    timeoutTimer = null;
+                }
+            }
+        };
+    }
+    return p;
 }
 function taroInterceptor(chain) {
     return _request(chain.requestParams);
@@ -5673,6 +5328,14 @@ const requestOrderPayment = /* @__PURE__ */ temporarilyNotSupport('requestOrderP
 
 // 打开手Q说说发表界面
 const openQzonePublish = /* @__PURE__ */ temporarilyNotSupport('openQzonePublish');
+const getQQRunData = /* @__PURE__ */ temporarilyNotSupport('getQQRunData');
+const setOfficialDress = /* @__PURE__ */ temporarilyNotSupport('setOfficialDress');
+const setCustomDress = /* @__PURE__ */ temporarilyNotSupport('setCustomDress');
+const updateQQApp = /* @__PURE__ */ temporarilyNotSupport('updateQQApp');
+const addRecentColorSign = /* @__PURE__ */ temporarilyNotSupport('addRecentColorSign');
+const getGuildInfo = /* @__PURE__ */ temporarilyNotSupport('getGuildInfo');
+const applyAddToMyApps = /* @__PURE__ */ temporarilyNotSupport('applyAddToMyApps');
+const isAddedToMyApps = /* @__PURE__ */ temporarilyNotSupport('isAddedToMyApps');
 
 // 路由
 // FIXME 方法导出类型未对齐，后续修复
@@ -5728,7 +5391,6 @@ const preloadSubPackage = /* @__PURE__ */ temporarilyNotSupport('preloadSubPacka
 // Worker
 const createWorker = /* @__PURE__ */ temporarilyNotSupport('createWorker');
 
-import('intersection-observer');
 class TaroH5IntersectionObserver {
     // selector 的容器节点
     get container() {
@@ -6275,15 +5937,18 @@ exports.Current = Current;
 exports.ENV_TYPE = ENV_TYPE;
 exports.Events = Events;
 exports.Link = Link;
+exports.NodesRef = NodesRef;
 exports.addCard = addCard;
 exports.addFileToFavorites = addFileToFavorites;
 exports.addInterceptor = addInterceptor;
 exports.addPhoneCalendar = addPhoneCalendar;
 exports.addPhoneContact = addPhoneContact;
 exports.addPhoneRepeatCalendar = addPhoneRepeatCalendar;
+exports.addRecentColorSign = addRecentColorSign;
 exports.addVideoToFavorites = addVideoToFavorites;
 exports.advancedGeneralIdentify = advancedGeneralIdentify;
 exports.animalClassify = animalClassify;
+exports.applyAddToMyApps = applyAddToMyApps;
 exports.arrayBufferToBase64 = arrayBufferToBase64;
 exports.authPrivateMessage = authPrivateMessage;
 exports.authorize = authorize;
@@ -6406,6 +6071,7 @@ exports.getFileInfo = getFileInfo;
 exports.getFileSystemManager = getFileSystemManager;
 exports.getFuzzyLocation = getFuzzyLocation;
 exports.getGroupEnterInfo = getGroupEnterInfo;
+exports.getGuildInfo = getGuildInfo;
 exports.getHCEState = getHCEState;
 exports.getImageInfo = getImageInfo;
 exports.getInferenceEnvInfo = getInferenceEnvInfo;
@@ -6419,6 +6085,7 @@ exports.getNetworkType = getNetworkType;
 exports.getOpenUserInfo = getOpenUserInfo;
 exports.getPerformance = getPerformance;
 exports.getPrivacySetting = getPrivacySetting;
+exports.getQQRunData = getQQRunData;
 exports.getRandomValues = getRandomValues;
 exports.getRealtimeLogManager = getRealtimeLogManager;
 exports.getRecorderManager = getRecorderManager;
@@ -6463,6 +6130,7 @@ exports.initPxTransform = initPxTransform;
 exports.initTabBarApis = initTabBarApis;
 exports.interceptorify = interceptorify;
 exports.interceptors = interceptors;
+exports.isAddedToMyApps = isAddedToMyApps;
 exports.isBluetoothDevicePaired = isBluetoothDevicePaired;
 exports.isVKSupport = isVKSupport;
 exports.join1v1Chat = join1v1Chat;
@@ -6649,12 +6317,14 @@ exports.setBackgroundColor = setBackgroundColor;
 exports.setBackgroundFetchToken = setBackgroundFetchToken;
 exports.setBackgroundTextStyle = setBackgroundTextStyle;
 exports.setClipboardData = setClipboardData;
+exports.setCustomDress = setCustomDress;
 exports.setEnable1v1Chat = setEnable1v1Chat;
 exports.setEnableDebug = setEnableDebug;
 exports.setInnerAudioOption = setInnerAudioOption;
 exports.setKeepScreenOn = setKeepScreenOn;
 exports.setNavigationBarColor = setNavigationBarColor;
 exports.setNavigationBarTitle = setNavigationBarTitle;
+exports.setOfficialDress = setOfficialDress;
 exports.setPageInfo = setPageInfo;
 exports.setScreenBrightness = setScreenBrightness;
 exports.setStorage = setStorage;
@@ -6714,6 +6384,7 @@ exports.subscribeVoIPVideoMembers = subscribeVoIPVideoMembers;
 exports.textReview = textReview;
 exports.textToAudio = textToAudio;
 exports.tradePay = tradePay;
+exports.updateQQApp = updateQQApp;
 exports.updateShareMenu = updateShareMenu;
 exports.updateVoIPChatMuteConfig = updateVoIPChatMuteConfig;
 exports.updateWeChatApp = updateWeChatApp;