fix(h5): trans webpackMode weak 2 lazy

NervJS · Jun 5, 2023 · 05a5207 · 05a5207
1 parent 1efca7c
commit 05a5207
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 25 deletions.
diff --git a/packages/taro-components/src/components/image/image.tsx b/packages/taro-components/src/components/image/image.tsx
@@ -1,10 +1,7 @@
 import { Component, Prop, h, ComponentInterface, Host, State, Event, EventEmitter } from '@stencil/core'
 import classNames from 'classnames'
 
-import(
-  /* webpackMode: "weak" */
-  'intersection-observer'
-)
+import('intersection-observer')
 
 export type Mode =
   'scaleToFill'

diff --git a/packages/taro-components/src/components/video/video.tsx b/packages/taro-components/src/components/video/video.tsx
@@ -335,7 +335,7 @@ export class Video implements ComponentInterface {
 
     if (isHls(src)) {
       import(
-        /* webpackMode: "weak" */
+        /* webpackExports: ["default"] */
         'hls.js'
       ).then(e => {
         const Hls = e.default

diff --git a/packages/taro-h5/src/api/media/image/chooseImage.ts b/packages/taro-h5/src/api/media/image/chooseImage.ts
@@ -1,7 +1,7 @@
 import Taro from '@tarojs/api'
 
 import { shouldBeObject } from '../../../utils'
-import { chooseMedia } from '../video'
+import { chooseMedia } from '../video/chooseMedia'
 
 /**
  * 从本地相册选择图片或使用相机拍照。
@@ -11,7 +11,7 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
   // options must be an Object
   const isObject = shouldBeObject(options)
   if (!isObject.flag) {
-    const res = { errMsg: `${chooseImage.name}:fail ${isObject.msg}` }
+    const res = { errMsg: `chooseImage:fail ${isObject.msg}` }
     console.error(res.errMsg)
     return Promise.reject(res)
   }
@@ -57,5 +57,5 @@ export const chooseImage: typeof Taro.chooseImage = function (options) {
       fail?.(err)
       complete?.(err)
     },
-  }, chooseImage.name).then(parseRes)
+  }, 'chooseImage').then(parseRes)
 }
diff --git a/packages/taro-h5/src/api/media/video/chooseMedia.ts b/packages/taro-h5/src/api/media/video/chooseMedia.ts
@@ -10,7 +10,7 @@ import { MethodHandler } from '../../../utils/handler'
  */
 export const chooseMedia = async function (
   options: Taro.chooseMedia.Option,
-  methodName = chooseMedia.name,
+  methodName = 'chooseMedia',
 ): Promise<Taro.chooseMedia.SuccessCallbackResult> {
   // options must be an Object
   const isObject = shouldBeObject(options)

diff --git a/packages/taro-h5/src/api/media/video/chooseVideo.ts b/packages/taro-h5/src/api/media/video/chooseVideo.ts
@@ -11,7 +11,7 @@ export const chooseVideo: typeof Taro.chooseVideo = (options) => {
   // options must be an Object
   const isObject = shouldBeObject(options)
   if (!isObject.flag) {
-    const res = { errMsg: `${chooseVideo.name}:fail ${isObject.msg}` }
+    const res = { errMsg: `chooseVideo:fail ${isObject.msg}` }
     console.error(res.errMsg)
     return Promise.reject(res)
   }
@@ -48,5 +48,5 @@ export const chooseVideo: typeof Taro.chooseVideo = (options) => {
       fail?.(err)
       complete?.(err)
     },
-  }, chooseVideo.name).then(parseRes)
+  }, 'chooseVideo').then(parseRes)
 }
diff --git a/packages/taro-h5/src/api/media/video/getVideoInfo.ts b/packages/taro-h5/src/api/media/video/getVideoInfo.ts
@@ -9,7 +9,7 @@ export const getVideoInfo: typeof Taro.getVideoInfo = async function (options) {
   // options must be an Object
   const isObject = shouldBeObject(options)
   if (!isObject.flag) {
-    const res = { errMsg: `${getVideoInfo.name}:fail ${isObject.msg}` }
+    const res = { errMsg: `getVideoInfo:fail ${isObject.msg}` }
     console.error(res.errMsg)
     return Promise.reject(res)
   }
@@ -29,7 +29,7 @@ export const getVideoInfo: typeof Taro.getVideoInfo = async function (options) {
     fail,
     complete,
   } = options
-  const handle = new MethodHandler({ name: getVideoInfo.name, success, fail, complete })
+  const handle = new MethodHandler({ name: 'getVideoInfo', success, fail, complete })
 
   if (typeof src !== 'string') {
     res.errMsg = getParameterError({
@@ -50,14 +50,14 @@ export const getVideoInfo: typeof Taro.getVideoInfo = async function (options) {
       res.duration = video.duration
       res.height = video.videoHeight
       res.width = video.videoWidth
-  
+
       fetch(src)
         .then(async e => {
           const blob = await e.blob()
           res.type = blob.type
           res.size = blob.size
           res.bitrate = blob.size / video.duration
-    
+
           handle.success(res, { resolve, reject })
         })
         .catch(e => {

diff --git a/packages/taro-h5/src/api/ui/interaction/index.ts b/packages/taro-h5/src/api/ui/interaction/index.ts
@@ -36,7 +36,7 @@ const showToast: typeof Taro.showToast = (options = { title: '' }) => {
     mask: false
   }, options)
   const { success, fail, complete } = options
-  const handle = new MethodHandler({ name: showToast.name, success, fail, complete })
+  const handle = new MethodHandler({ name: 'showToast', success, fail, complete })
 
   if (typeof options.title !== 'string') {
     return handle.fail({
@@ -72,7 +72,7 @@ const showToast: typeof Taro.showToast = (options = { title: '' }) => {
 }
 
 const hideToast: typeof Taro.hideToast = ({ noConflict = false, success, fail, complete } = {}) => {
-  const handle = new MethodHandler({ name: hideToast.name, success, fail, complete })
+  const handle = new MethodHandler({ name: 'hideToast', success, fail, complete })
   if (!toast.el) return handle.success()
   toast.hide(0, noConflict ? 'toast' : '')
   return handle.success()
@@ -85,7 +85,7 @@ const showLoading: typeof Taro.showLoading = (options = { title: '' }) => {
     mask: false
   }, options)
   const { success, fail, complete } = options
-  const handle = new MethodHandler({ name: showLoading.name, success, fail, complete })
+  const handle = new MethodHandler({ name: 'showLoading', success, fail, complete })
 
   const config = {
     icon: 'loading',
@@ -117,7 +117,7 @@ const showLoading: typeof Taro.showLoading = (options = { title: '' }) => {
 }
 
 const hideLoading: typeof Taro.hideLoading = ({ noConflict = false, success, fail, complete } = {}) => {
-  const handle = new MethodHandler({ name: hideLoading.name, success, fail, complete })
+  const handle = new MethodHandler({ name: 'hideLoading', success, fail, complete })
   if (!toast.el) return handle.success()
   toast.hide(0, noConflict ? 'loading' : '')
   return handle.success()
@@ -135,7 +135,7 @@ const showModal: typeof Taro.showModal = async (options = {}) => {
     confirmColor: '#3CC51F'
   }, options)
   const { success, fail, complete } = options
-  const handle = new MethodHandler({ name: showModal.name, success, fail, complete })
+  const handle = new MethodHandler({ name: 'showModal', success, fail, complete })
 
   if (typeof options.title !== 'string') {
     return handle.fail({
@@ -229,7 +229,7 @@ function hideModal () {
 
 const showActionSheet = async (
   options: Taro.showActionSheet.Option = { itemList: [] },
-  methodName = showActionSheet.name
+  methodName = 'showActionSheet'
 ): Promise<Taro.showActionSheet.SuccessCallbackResult> => {
   init(document)
   options = Object.assign({

diff --git a/packages/taro-h5/src/api/wxml/IntersectionObserver.ts b/packages/taro-h5/src/api/wxml/IntersectionObserver.ts
@@ -2,10 +2,7 @@ import Taro from '@tarojs/api'
 
 import { findDOM } from '../../utils'
 
-import(
-  /* webpackMode: "weak" */
-  'intersection-observer'
-)
+import('intersection-observer')
 
 type TElement = Document | HTMLElement | Element