@tarojs/taro-h5 3.5.0-alpha.9 → 3.5.0-beta.2

package/dist/utils/index.js

@@ -1,5 +1,5 @@
 /* eslint-disable prefer-promise-reject-errors */
-import { Current, container, SERVICE_IDENTIFIER } from '@tarojs/runtime';
+import { Current, hooks } from '@tarojs/runtime';
 export function shouldBeObject(target) {
     if (target && typeof target === 'object')
         return { flag: true };
@@ -12,12 +12,8 @@ export function shouldBeObject(target) {
     };
 }
 export function findDOM(inst) {
-    const runtimeHooks = container.get(SERVICE_IDENTIFIER.Hooks);
-    if (inst) {
-        const find = runtimeHooks.getDOMNode;
-        if (typeof find === 'function') {
-            return find(inst);
-        }
+    if (inst && hooks.isExist('getDOMNode')) {
+        return hooks.call('getDOMNode', inst);
     }
     const page = Current.page;
     const path = page === null || page === void 0 ? void 0 : page.path;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.5.0-alpha.9",
+  "version": "3.5.0-beta.2",
   "description": "Taro h5 framework",
   "browser": "dist/index.esm.js",
   "main:h5": "dist/index.js",
@@ -33,14 +33,14 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/api": "3.5.0-alpha.9",
-    "@tarojs/router": "3.5.0-alpha.9",
-    "@tarojs/runtime": "3.5.0-alpha.9",
+    "@tarojs/api": "3.5.0-beta.2",
+    "@tarojs/router": "3.5.0-beta.2",
+    "@tarojs/runtime": "3.5.0-beta.2",
     "base64-js": "^1.3.0",
     "jsonp-retry": "^1.0.3",
     "mobile-detect": "^1.4.2",
     "query-string": "^7.1.1",
     "whatwg-fetch": "^3.4.0"
   },
-  "gitHead": "bce3db2d4d9459fe0175f3d0d4b97c2df44015be"
+  "gitHead": "c85adaa45959e6cafc15e6531f4735a7dfa2aab0"
 }

package/src/api/base/index.ts

@@ -14,10 +14,10 @@ export function base64ToArrayBuffer (base64) {
   return toByteArray(base64)
 }
 
+export * from './crypto'
+export * from './debug'
+export * from './performance'
 export * from './system'
 export * from './update'
-export * from './weapp/life-cycle'
 export * from './weapp/app-event'
-export * from './debug'
-export * from './performance'
-export * from './crypto'
+export * from './weapp/life-cycle'

package/src/api/canvas/canvasGetImageData.ts

@@ -1,6 +1,7 @@
 import Taro from '@tarojs/api'
-import { MethodHandler } from '../../utils/handler'
+
 import { findDOM } from '../../utils'
+import { MethodHandler } from '../../utils/handler'
 
 /**
  * 获取 canvas 区域隐含的像素数据。

package/src/api/canvas/canvasPutImageData.ts

@@ -1,6 +1,7 @@
 import Taro from '@tarojs/api'
-import { MethodHandler } from '../../utils/handler'
+
 import { findDOM } from '../../utils'
+import { MethodHandler } from '../../utils/handler'
 
 /**
  * 将像素数据绘制到画布。在自定义组件下，第二个参数传入自定义组件实例 this，以操作组件内 <canvas> 组件

package/src/api/canvas/canvasToTempFilePath.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { findDOM } from '../../utils'
 import { MethodHandler } from '../../utils/handler'
 

package/src/api/canvas/createCanvasContext.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { findDOM } from '../../utils'
 import { CanvasContext } from './CanvasContext'
 

package/src/api/cloud/index.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { temporarilyNotSupport } from '../../utils'
 
 export class cloud implements Taro.cloud {

package/src/api/device/accelerometer.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { throttle } from '../../utils'
 import { CallbackManager, MethodHandler } from '../../utils/handler'
 

package/src/api/device/battery.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { temporarilyNotSupport } from '../../utils'
 import { MethodHandler } from '../../utils/handler'
 

package/src/api/device/clipboard.ts

@@ -6,8 +6,9 @@
  */
 
 import Taro from '@tarojs/api'
-import { setStorage, setStorageSync, getStorageSync } from '../storage/index'
+
 import { MethodHandler } from '../../utils/handler'
+import { getStorageSync, setStorage, setStorageSync } from '../storage/index'
 
 const CLIPBOARD_STORAGE_NAME = 'taro_clipboard'
 

package/src/api/device/compass.ts

@@ -1,8 +1,8 @@
 import Taro from '@tarojs/api'
 
-import { getDeviceInfo } from '../base/system'
 import { throttle } from '../../utils'
 import { CallbackManager, MethodHandler } from '../../utils/handler'
+import { getDeviceInfo } from '../base/system'
 
 const callbackManager = new CallbackManager()
 let compassListener

package/src/api/device/network.ts

@@ -1,7 +1,7 @@
 import Taro from '@tarojs/api'
 
-import { CallbackManager, MethodHandler } from '../../utils/handler'
 import { temporarilyNotSupport } from '../../utils'
+import { CallbackManager, MethodHandler } from '../../utils/handler'
 
 function getConnection () {
   // @ts-ignore

package/src/api/device/phone.ts

@@ -1,5 +1,6 @@
 import Taro from '@tarojs/api'
-import { shouldBeObject, getParameterError } from '../../utils'
+
+import { getParameterError, shouldBeObject } from '../../utils'
 import { MethodHandler } from '../../utils/handler'
 
 export const makePhoneCall: typeof Taro.makePhoneCall = (options) => {

package/src/api/device/vibrate.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { MethodHandler } from '../../utils/handler'
 
 const vibrator = function vibrator (mm) {

package/src/api/index.ts

@@ -1,5 +1,6 @@
 export * from './ad'
 export * from './ai'
+export * from './alipay'
 export * from './base'
 export * from './canvas'
 export * from './cloud'
@@ -17,9 +18,7 @@ export * from './payment'
 export * from './route'
 export * from './share'
 export * from './storage'
+export * from './swan'
 export * from './ui'
 export * from './worker'
 export * from './wxml'
-
-export * from './alipay'
-export * from './swan'

package/src/api/location/chooseLocation.ts

@@ -1,8 +1,9 @@
+import './style.css'
+
 import Taro from '@tarojs/api'
 import { stringify } from 'query-string'
 
 import { MethodHandler } from '../../utils/handler'
-import './style.css'
 
 function createLocationChooser (handler, key = LOCATION_APIKEY, mapOpt: Taro.chooseLocation.Option['mapOpts'] = {}) {
   const { latitude, longitude, ...opts } = mapOpt

package/src/api/location/getLocation.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { processOpenApi, shouldBeObject } from '../../utils'
 import { MethodHandler } from '../../utils/handler'
 

package/src/api/media/EditorContext.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { temporarilyNotSupport } from '../../utils'
 
 // 富文本

package/src/api/media/audio/InnerAudioContext.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { permanentlyNotSupport } from '../../../utils'
 import { CallbackManager } from '../../../utils/handler'
 

package/src/api/media/audio/index.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { temporarilyNotSupport } from '../../../utils'
 import { InnerAudioContext } from './InnerAudioContext'
 

package/src/api/media/background-audio/BackgroundAudioManager.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { permanentlyNotSupport } from '../../../utils'
 import { CallbackManager } from '../../../utils/handler'
 

package/src/api/media/image/chooseImage.ts

@@ -1,7 +1,7 @@
 import Taro from '@tarojs/api'
 
+import { getParameterError, shouldBeObject } from '../../../utils'
 import { MethodHandler } from '../../../utils/handler'
-import { shouldBeObject, getParameterError } from '../../../utils'
 
 /**
  * 从本地相册选择图片或使用相机拍照。

package/src/api/media/image/index.ts

@@ -4,8 +4,8 @@ import { temporarilyNotSupport } from '../../../utils'
 export const saveImageToPhotosAlbum = temporarilyNotSupport('saveImageToPhotosAlbum')
 export const previewMedia = temporarilyNotSupport('previewMedia')
 
-export * from './previewImage'
 export * from './getImageInfo'
+export * from './previewImage'
 
 export const compressImage = temporarilyNotSupport('compressImage')
 export const chooseMessageFile = temporarilyNotSupport('chooseMessageFile')

package/src/api/media/video/index.ts

@@ -1,7 +1,7 @@
 import Taro from '@tarojs/api'
 
-import { MethodHandler } from '../../../utils/handler'
 import { findDOM, shouldBeObject, temporarilyNotSupport } from '../../../utils'
+import { MethodHandler } from '../../../utils/handler'
 
 // 视频
 export const saveVideoToPhotosAlbum = temporarilyNotSupport('saveVideoToPhotosAlbum')

package/src/api/network/download.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { CallbackManager } from '../../utils/handler'
 import { NETWORK_TIMEOUT, setHeader, XHR_STATS } from './utils'
 
@@ -12,6 +13,7 @@ const createDownloadTask = ({ url, header, success, error }): Taro.DownloadTask
   }
 
   xhr.open('GET', url, true)
+  xhr.withCredentials = true
   xhr.responseType = 'blob'
   setHeader(xhr, header)
 

package/src/api/network/request/index.ts

@@ -1,5 +1,6 @@
-import Taro from '@tarojs/api'
 import 'whatwg-fetch'
+
+import Taro from '@tarojs/api'
 import jsonpRetry from 'jsonp-retry'
 
 import { serializeParams } from '../../../utils'

package/src/api/network/upload.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { CallbackManager } from '../../utils/handler'
 import {
   convertObjectUrlToBlob,
@@ -19,6 +20,7 @@ const createUploadTask = ({ url, filePath, formData = {}, name, header, timeout,
   }
 
   xhr.open('POST', url)
+  xhr.withCredentials = true
   setHeader(xhr, header)
 
   for (formKey in formData) {
@@ -30,7 +32,7 @@ const createUploadTask = ({ url, filePath, formData = {}, name, header, timeout,
     callbackManager.progressUpdate.trigger({
       progress: Math.round(loaded / total * 100),
       totalBytesSent: loaded,
-      totalBytesExpectedToSent: total
+      totalBytesExpectedToSend: total
     })
   }
 

package/src/api/network/utils.ts

@@ -58,6 +58,7 @@ export const convertObjectUrlToBlob = url => {
     const xhr = new XMLHttpRequest()
     xhr.open('GET', url, true)
     xhr.responseType = 'blob'
+    xhr.withCredentials = true
     xhr.onload = function () {
       if (this.status === 200) {
         resolve(this.response)

package/src/api/network/websocket/index.ts

@@ -1,6 +1,6 @@
-import { SocketTask } from './socketTask'
-import { shouldBeObject, getParameterError } from '../../../utils'
+import { getParameterError, shouldBeObject } from '../../../utils'
 import { MethodHandler } from '../../../utils/handler'
+import { SocketTask } from './socketTask'
 
 let socketTasks: SocketTask[] = []
 let socketsCounter = 1

package/src/api/route/index.ts

@@ -1,10 +1,10 @@
 // 路由
 export {
-  switchTab,
-  reLaunch,
-  redirectTo,
+  navigateBack,
   navigateTo,
-  navigateBack
+  redirectTo,
+  reLaunch,
+  switchTab
 } from '@tarojs/router'
 
 // FIXME 方法导出类型未对齐，后续修复

package/src/api/storage/index.ts

@@ -1,5 +1,6 @@
 import Taro from '@tarojs/api'
-import { shouldBeObject, getParameterError, temporarilyNotSupport } from '../../utils'
+
+import { getParameterError, shouldBeObject, temporarilyNotSupport } from '../../utils'
 import { MethodHandler } from '../../utils/handler'
 
 function getItem (key) {

package/src/api/taro.ts

@@ -1,7 +1,7 @@
 import Taro from '@tarojs/api'
 import { history } from '@tarojs/router'
 
-import { getApp, getCurrentInstance, getCurrentPages, nextTick, navigateBack, navigateTo, reLaunch, redirectTo, switchTab } from '../api'
+import { getApp, getCurrentInstance, getCurrentPages, navigateBack, navigateTo, nextTick, redirectTo, reLaunch, switchTab } from '../api'
 import { permanentlyNotSupport } from '../utils'
 
 const {
@@ -67,18 +67,18 @@ export default taro
 
 export {
   Behavior,
-  getEnv,
-  ENV_TYPE,
-  Link,
-  interceptors,
-  initPxTransform,
+  canIUseWebp,
   Current,
-  options,
+  ENV_TYPE,
   eventCenter,
   Events,
+  getEnv,
+  history,
+  initPxTransform,
+  interceptors,
+  Link,
+  options,
   preload,
-  requirePlugin,
   pxTransform,
-  canIUseWebp,
-  history
+  requirePlugin
 }

package/src/api/ui/fonts.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { MethodHandler } from '../../utils/handler'
 
 // 字体

package/src/api/ui/index.ts

@@ -2,6 +2,7 @@ export * from './animation'
 export * from './background'
 export * from './custom-component'
 export * from './fonts'
+export * from './interaction'
 export * from './menu'
 export * from './navigation-bar'
 export * from './pull-down-refresh'
@@ -9,4 +10,3 @@ export * from './scroll'
 export * from './sticky'
 export * from './tab-bar'
 export * from './window'
-export * from './interaction'

package/src/api/ui/interaction/index.ts

@@ -1,9 +1,10 @@
 import Taro from '@tarojs/api'
+
 import { getParameterError, temporarilyNotSupport } from '../../../utils'
 import { MethodHandler } from '../../../utils/handler'
-import Toast from './toast'
-import Modal from './modal'
 import ActionSheet from './actionSheet'
+import Modal from './modal'
+import Toast from './toast'
 
 // 交互
 
@@ -298,4 +299,4 @@ Taro.eventCenter.on('__taroRouterChange', () => {
 const enableAlertBeforeUnload = temporarilyNotSupport('enableAlertBeforeUnload')
 const disableAlertBeforeUnload = temporarilyNotSupport('disableAlertBeforeUnload')
 
-export { showToast, showModal, showLoading, showActionSheet, hideToast, hideLoading, enableAlertBeforeUnload, disableAlertBeforeUnload }
+export { disableAlertBeforeUnload, enableAlertBeforeUnload, hideLoading, hideToast, showActionSheet, showLoading, showModal, showToast }

package/src/api/ui/navigation-bar/index.ts

@@ -1,7 +1,7 @@
 import Taro from '@tarojs/api'
 
-import { MethodHandler } from '../../../utils/handler'
 import { getParameterError, shouldBeObject, temporarilyNotSupport } from '../../../utils'
+import { MethodHandler } from '../../../utils/handler'
 
 // 导航栏
 export const showNavigationBarLoading = temporarilyNotSupport('showNavigationBarLoading')

package/src/api/ui/pull-down-refresh.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { MethodHandler } from '../../utils/handler'
 /**
  * 开始下拉刷新。调用后触发下拉刷新动画，效果与用户手动下拉刷新一致。

package/src/api/ui/scroll/index.ts

@@ -1,8 +1,8 @@
 import Taro from '@tarojs/api'
 import { Current } from '@tarojs/runtime'
 
+import { easeInOut, getTimingFunc } from '../../../utils'
 import { MethodHandler } from '../../../utils/handler'
-import { getTimingFunc, easeInOut } from '../../../utils'
 
 let timer: ReturnType<typeof setTimeout>
 const FRAME_DURATION = 17

package/src/api/ui/tab-bar.ts

@@ -1,5 +1,6 @@
 import Taro, { AppConfig } from '@tarojs/api'
-import { shouldBeObject, getParameterError, isValidColor } from '../../utils'
+
+import { getParameterError, isValidColor, shouldBeObject } from '../../utils'
 import { MethodHandler } from '../../utils/handler'
 
 let tabConf

package/src/api/ui/window.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { temporarilyNotSupport } from '../../utils'
 import { CallbackManager } from '../../utils/handler'
 

package/src/api/wxml/index.ts

@@ -1,4 +1,5 @@
 import Taro from '@tarojs/api'
+
 import { temporarilyNotSupport } from '../../utils'
 import { SelectorQuery } from './selectorQuery'
 

package/src/api/wxml/selectorQuery.ts

@@ -1,6 +1,7 @@
 import Taro from '@tarojs/api'
-import { CanvasContext } from '../canvas/CanvasContext'
+
 import { findDOM } from '../../utils'
+import { CanvasContext } from '../canvas/CanvasContext'
 import { NodesRef } from './nodesRef'
 
 type TElement = Document | HTMLElement | Element

package/src/utils/index.ts

@@ -1,5 +1,5 @@
 /* eslint-disable prefer-promise-reject-errors */
-import { Current, container, SERVICE_IDENTIFIER, IHooks, TaroElement } from '@tarojs/runtime'
+import { Current, hooks, TaroElement } from '@tarojs/runtime'
 
 export function shouldBeObject (target: unknown) {
   if (target && typeof target === 'object') return { flag: true }
@@ -13,13 +13,8 @@ export function shouldBeObject (target: unknown) {
 }
 
 export function findDOM (inst?): TaroElement | HTMLElement | undefined {
-  const runtimeHooks = container.get<IHooks>(SERVICE_IDENTIFIER.Hooks)
-
-  if (inst) {
-    const find = runtimeHooks.getDOMNode
-    if (typeof find === 'function') {
-      return find(inst)
-    }
+  if (inst && hooks.isExist('getDOMNode')) {
+    return hooks.call('getDOMNode', inst)
   }
 
   const page = Current.page