@tarojs/plugin-platform-harmony-ets 4.0.0-beta.10 → 4.0.0-beta.11

package/dist/components-harmony-ets/scrollView.ets

@@ -77,51 +77,55 @@ function columnAttrs (style: TaroStyleType) {
   })
 }
 
-@Builder
-export default function TaroScrollView (node: TaroScrollViewElement) {
-    Scroll(node.scroller) {
-      if (node._attrs.scrollX) {
+@Component
+export default struct TaroScrollView {
+  @ObjectLink node: TaroScrollViewElement
+
+  build () {
+    Scroll(this.node.scroller) {
+      if (this.node._attrs.scrollX) {
         Row() {
-          createLazyChildren(node)
+          createLazyChildren(this.node)
         }
-        .attributeModifier(commonStyleModify.setNode(node))
-        .rowAttrs(getNormalAttributes(node))
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .rowAttrs(getNormalAttributes(this.node))
         .width(null)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
-          node._scroll = areaResult
-        }, node, ['scroll', 'scrollstart', 'scrollend']))
-        .alignItems(FlexManager.flexOptions(node).alignItems as VerticalAlign)
-        .justifyContent(FlexManager.flexOptions(node).justifyContent)
+          this.node._scroll = areaResult
+        }, this.node, ['scroll', 'scrollstart', 'scrollend']))
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
         .flexGrow(0).flexShrink(0)
       } else {
         Column() {
-          createLazyChildren(node)
+          createLazyChildren(this.node)
         }
-        .attributeModifier(commonStyleModify.setNode(node))
-        .columnAttrs(getNormalAttributes(node))
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .columnAttrs(getNormalAttributes(this.node))
         .height(null)
         .alignItems(HorizontalAlign.Start)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
-          node._scroll = areaResult
-        }, node, ['scroll', 'scrollstart', 'scrollend']))
-        .alignItems(FlexManager.flexOptions(node).alignItems as HorizontalAlign)
-        .justifyContent(FlexManager.flexOptions(node).justifyContent)
+          this.node._scroll = areaResult
+        }, this.node, ['scroll', 'scrollstart', 'scrollend']))
+        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
+        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
         .flexGrow(0).flexShrink(0)
       }
     }
-    .width(getNormalAttributes(node).width)
-    .height(getNormalAttributes(node).height)
-    .flexGrow(getNormalAttributes(node).flexGrow)
-    .flexShrink(getNormalAttributes(node).flexShrink)
-    .scrollable(getScrollable(node))
-    .scrollBar(getAttributes(node).scrollBar)
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
+    .width(getNormalAttributes(this.node).width)
+    .height(getNormalAttributes(this.node).height)
+    .flexGrow(getNormalAttributes(this.node).flexGrow)
+    .flexShrink(getNormalAttributes(this.node).flexShrink)
+    .scrollable(getScrollable(this.node))
+    .scrollBar(getAttributes(this.node).scrollBar)
+    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+      this.node._nodeInfo.areaInfo = res[1]
     }))
-    .onScroll(shouldBindEvent(() => { handleScrollEvent(node, 'scroll') }, node, ['scroll']))
-    .onScrollStart(shouldBindEvent(() => { handleScrollEvent(node, 'scrollstart') }, node, ['scrollstart']))
-    .onScrollStop(shouldBindEvent(() => { handleScrollEvent(node, 'scrollend') }, node, ['scrollend']))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+    .onScroll(shouldBindEvent(() => { handleScrollEvent(this.node, 'scroll') }, this.node, ['scroll']))
+    .onScrollStart(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrollstart') }, this.node, ['scrollstart']))
+    .onScrollStop(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrollend') }, this.node, ['scrollend']))
+    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+  }
 }

package/dist/components-harmony-ets/slider.ets

@@ -37,7 +37,7 @@ function themeStyles(isDisabled: boolean) {
 
 @Component
 export default struct TaroSlider {
-  node: TaroSliderElement | null = null
+  @ObjectLink node: TaroSliderElement
 
   @State value: number = 0
 

package/dist/components-harmony-ets/swiper.ets

@@ -40,24 +40,28 @@ function getSwiperAttributes (node: TaroSwiperElement): SwiperAttrs {
   return swiperAttrs
 }
 
-@Builder
-export default function TaroSwiper (node: TaroSwiperElement) {
-  Swiper(node.controller) {
-    createLazyChildren(node)
+@Component
+export default struct TaroSwiper {
+  @ObjectLink node: TaroSwiperElement
+
+  build () {
+    Swiper(this.node.controller) {
+      createLazyChildren(this.node)
+    }
+      .attributeModifier(commonStyleModify.setNode(this.node))
+      .swiperAttr(getSwiperAttributes(this.node))
+      .indicatorStyle({
+        color: this.node.getAttribute('indicatorColor'),
+        selectedColor:  this.node.getAttribute('indicatorActiveColor')
+      })
+      .onChange((index: number) => {
+        const event: TaroEvent = createTaroEvent('change', { detail: { current: index } }, this.node)
+        eventHandler(event, 'change', this.node)
+      })
+      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
   }
-  .attributeModifier(commonStyleModify.setNode(node))
-  .swiperAttr(getSwiperAttributes(node))
-  .indicatorStyle({
-    color: node.getAttribute('indicatorColor'),
-    selectedColor:  node.getAttribute('indicatorActiveColor')
-  })
-  .onChange((index: number) => {
-    const event: TaroEvent = createTaroEvent('change', { detail: { current: index } }, node)
-    eventHandler(event, 'change', node)
-  })
-  .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-  .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-    node._nodeInfo.areaInfo = res[1]
-  }))
-  .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
 }

package/dist/components-harmony-ets/switch.ets

@@ -28,7 +28,7 @@ function themeStyles(isDisabled: boolean) {
 
 @Component
 export default struct TaroSwitch {
-  node: TaroSwitchElement | null = null
+  @ObjectLink node: TaroSwitchElement
 
   aboutToAppear () {
     if (this.node && !this.node._isInit) {

package/dist/components-harmony-ets/text.ets

@@ -38,29 +38,35 @@ function getButtonFontSize (node: TaroButtonElement) {
   return isMini ? convertNumber2VP(26) : convertNumber2VP(36)
 }
 
-@Builder
-export default function TaroText (node: TaroTextElement) {
-  if (node.nodeType === NodeType.TEXT_NODE && node.parentNode) {
-    if ((node.parentNode as TaroElement).tagName === 'BUTTON') {
-      Text(node.textContent)
-        .textNormalFontStyle(getNormalAttributes(node.parentNode as TaroElement))
-        .textSpecialFontStyle(getFontAttributes(node.parentNode as TaroElement))
-        .fontSize((node.parentNode as TaroButtonElement).hmStyle.fontSize || getButtonFontSize((node.parentNode as TaroButtonElement)))
-        .fontColor((node.parentNode as TaroButtonElement).hmStyle.color || getButtonColor(node.parentNode as TaroButtonElement, BUTTON_THEME_COLOR.get((node.parentNode as TaroButtonElement)._attrs.type).text))
+@Component
+export default struct TaroText {
+  @ObjectLink node: TaroTextElement
+
+  build () {
+    if (this.node.nodeType === NodeType.TEXT_NODE && this.node.parentNode) {
+      if ((this.node.parentNode as TaroElement).tagName === 'BUTTON') {
+        Text(this.node.textContent)
+          .textNormalFontStyle(getNormalAttributes(this.node.parentNode as TaroElement))
+          .textSpecialFontStyle(getFontAttributes(this.node.parentNode as TaroElement))
+          .fontSize((this.node.parentNode as TaroButtonElement).hmStyle.fontSize || getButtonFontSize(this.node.parentNode as TaroButtonElement))
+          .fontColor((this.node.parentNode as TaroButtonElement).hmStyle.color || getButtonColor(this.node.parentNode as TaroButtonElement, BUTTON_THEME_COLOR.get((this.node.parentNode as TaroButtonElement)._attrs.type).text))
+      } else {
+        Text(this.node.textContent)
+          .textNormalFontStyle(getNormalAttributes(this.node.parentNode as TaroElement))
+          .textSpecialFontStyle(getFontAttributes(this.node.parentNode as TaroElement))
+          .width(getNormalAttributes(this.node.parentNode as TaroElement).width)
+          .height(getNormalAttributes(this.node.parentNode as TaroElement).height)
+      }
     } else {
-      Text(node.textContent)
-        .textNormalFontStyle(getNormalAttributes(node.parentNode as TaroElement))
-        .textSpecialFontStyle(getFontAttributes(node.parentNode as TaroElement))
+      Text(this.node.textContent)
+      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .attributeModifier(commonStyleModify.setNode(this.node))
+      .textNormalFontStyle(getNormalAttributes(this.node))
+      .textSpecialFontStyle(getFontAttributes(this.node))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
     }
-  } else {
-    Text(node.textContent)
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .attributeModifier(commonStyleModify.setNode(node))
-    .textNormalFontStyle(getNormalAttributes(node))
-    .textSpecialFontStyle(getFontAttributes(node))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
   }
 }

package/dist/components-harmony-ets/textArea.ets

@@ -30,7 +30,7 @@ function getPlaceholderColor (node: TaroTextAreaElement): string {
 export default struct TaroTextArea {
   @State value: string = ''
 
-  node: TaroTextAreaElement | null = null
+  @ObjectLink node: TaroTextAreaElement
 
   aboutToAppear () {
     if (this.node) {

package/dist/components-harmony-ets/video.ets

@@ -78,25 +78,30 @@ function handleUpdate (node: TaroVideoElement, e: VideoUpdateEvent) {
   emitEvent(node, 'timeUpdate', { currentTime: e.time})
 }
 
-@Builder
-export default function TaroVideo (node: TaroVideoElement) {
-  Video(getVideoData(node))
-    .attributeModifier(commonStyleModify.setNode(node))
-    .props(getVideoProps(node))
-    .aspectRatio(4 / 3)
-    .onStart(shouldBindEvent(() => { emitEvent(node, 'play') }, node, ['play']))
-    .onPause(shouldBindEvent(() => { emitEvent(node, 'pause') }, node, ['pause']))
-    .onFinish(shouldBindEvent(() => { emitEvent(node, 'ended') }, node, ['ended']))
-    .onError(shouldBindEvent(() => { emitEvent(node, 'error') }, node, ['error']))
-    .onUpdate((e) => { handleUpdate(node, e) })
-    .onPrepared(shouldBindEvent((e: TaroAny) => { emitEvent(node, 'loadedMetaData', { duration: e.duration }) }, node, ['loadedmetadata']))
-    .onSeeking(shouldBindEvent((e: TaroAny) => { emitEvent(node, 'seeking', { duration: e.time }) }, node, ['seeking']))
-    .onSeeked(shouldBindEvent(() => { emitEvent(node, 'seeked') }, node, ['seeked']))
-    .onFullscreenChange(shouldBindEvent((e: TaroAny) => { emitEvent(node, 'fullScreenChange', { fullScreen: e.fullscreen}) }, node, ['fullscreenchange']))
-    .onClick((e: ClickEvent) => { eventHandler(e, 'click', node) })
-    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+@Component
+export default struct TaroVideo {
+  @ObjectLink node: TaroVideoElement
+
+  build () {
+    Video(getVideoData(this.node))
+      .attributeModifier(commonStyleModify.setNode(this.node))
+      .props(getVideoProps(this.node))
+      .aspectRatio(4 / 3)
+      .onStart(shouldBindEvent(() => { emitEvent(this.node, 'play') }, this.node, ['play']))
+      .onPause(shouldBindEvent(() => { emitEvent(this.node, 'pause') }, this.node, ['pause']))
+      .onFinish(shouldBindEvent(() => { emitEvent(this.node, 'ended') }, this.node, ['ended']))
+      .onError(shouldBindEvent(() => { emitEvent(this.node, 'error') }, this.node, ['error']))
+      .onUpdate((e) => { handleUpdate(this.node, e) })
+      .onPrepared(shouldBindEvent((e: TaroAny) => { emitEvent(this.node, 'loadedMetaData', { duration: e.duration }) }, this.node, ['loadedmetadata']))
+      .onSeeking(shouldBindEvent((e: TaroAny) => { emitEvent(this.node, 'seeking', { duration: e.time }) }, this.node, ['seeking']))
+      .onSeeked(shouldBindEvent(() => { emitEvent(this.node, 'seeked') }, this.node, ['seeked']))
+      .onFullscreenChange(shouldBindEvent((e: TaroAny) => { emitEvent(this.node, 'fullScreenChange', { fullScreen: e.fullscreen}) }, this.node, ['fullscreenchange']))
+      .onClick((e: ClickEvent) => { eventHandler(e, 'click', this.node) })
+      .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+  }
+
 }

package/dist/components-harmony-ets/view.ets

@@ -28,35 +28,39 @@ function columnAttrs (style: TaroStyleType) {
   })
 }
 
-@Builder
-export default function TaroView (node: TaroViewElement) {
-  if (FlexManager.isFlexNode(node) && FlexManager.flexOptions(node).direction !== FlexDirection.Column) {
-    Row() {
-      createLazyChildren(node)
-    }
-    .attributeModifier(commonStyleModify.setNode(node))
-    .rowAttrs(getNormalAttributes(node))
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
-    .alignItems(FlexManager.flexOptions(node).alignItems as VerticalAlign)
-    .justifyContent(FlexManager.flexOptions(node).justifyContent)
-  } else {
-    Column() {
-      createLazyChildren(node)
+@Component
+export default struct TaroView {
+  @ObjectLink node: TaroViewElement
+
+  build () {
+    if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
+      Row() {
+        createLazyChildren(this.node)
+      }
+      .attributeModifier(commonStyleModify.setNode(this.node))
+      .rowAttrs(getNormalAttributes(this.node))
+      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+      .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+      .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+    } else {
+      Column() {
+        createLazyChildren(this.node)
+      }
+      .attributeModifier(commonStyleModify.setNode(this.node))
+      .columnAttrs(getNormalAttributes(this.node))
+      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+      .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
+      .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
     }
-    .attributeModifier(commonStyleModify.setNode(node))
-    .columnAttrs(getNormalAttributes(node))
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
-    .alignItems(FlexManager.flexOptions(node).alignItems as HorizontalAlign)
-    .justifyContent(FlexManager.flexOptions(node).justifyContent)
   }
 }

package/dist/components-harmony-ets/webView.ets

@@ -14,37 +14,42 @@ interface IError {
   error: WebResourceError
 }
 
-@Builder
-export default function TaroWebView (node: TaroWebViewElement) {
-  Web({ src: node._attrs.src, controller: node.controller })
-    .attributeModifier(commonStyleModify.setNode(node))
-    .onPageEnd((e: IPageLoad) => {
-      // 1. 创建消息端口
-      node.ports = node.controller.createWebMessagePorts(true)
-      // 2. 发送端口1到HTML5
-      node.controller.postMessage('init_web_messageport', [node.ports[1]], '*');
-      // 3. 保存端口0到本地
-      node.nativePort = node.ports[0]
-      // 4. 设置回调函数
-      node.nativePort.onMessageEventExt((result) => {
-        const message = node.handleMessageFromWeb(result)
-        const messageEvent: TaroEvent = createTaroEvent('message', { detail: { data: message } }, node)
-
-        eventHandler(messageEvent, 'message', node)
+@Component
+export default struct TaroWebView {
+  @ObjectLink node: TaroWebViewElement
+
+  build () {
+    Web({ src: this.node._attrs.src, controller: this.node.controller })
+      .attributeModifier(commonStyleModify.setNode(this.node))
+      .onPageEnd((e: IPageLoad) => {
+        // 1. 创建消息端口
+        this.node.ports = this.node.controller.createWebMessagePorts(true)
+        // 2. 发送端口1到HTML5
+        this.node.controller.postMessage('init_web_messageport', [this.node.ports[1]], '*');
+        // 3. 保存端口0到本地
+        this.node.nativePort = this.node.ports[0]
+        // 4. 设置回调函数
+        this.node.nativePort.onMessageEventExt((result) => {
+          const message = this.node.handleMessageFromWeb(result)
+          const messageEvent: TaroEvent = createTaroEvent('message', { detail: { data: message } }, this.node)
+
+          eventHandler(messageEvent, 'message', this.node)
+        })
+
+        const onLoadEvent: TaroEvent = createTaroEvent('load', { detail: { src: this.node._attrs.src } }, this.node)
+
+        eventHandler(onLoadEvent, 'load', this.node)
       })
-
-      const onLoadEvent: TaroEvent = createTaroEvent('load', { detail: { src: node._attrs.src } }, node)
-
-      eventHandler(onLoadEvent, 'load', node)
-    })
-    .onErrorReceive(shouldBindEvent((e: IError) => {
-      const event: TaroEvent = createTaroEvent('error', { detail: { url: node._attrs.src, fullUrl: e.request.getRequestUrl() } }, node)
-      
-      eventHandler(event, 'error', node)
-    }, node, ['error']))
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+      .onErrorReceive(shouldBindEvent((e: IError) => {
+        const event: TaroEvent = createTaroEvent('error', { detail: { url: this.node._attrs.src, fullUrl: e.request.getRequestUrl() } }, this.node)
+        
+        eventHandler(event, 'error', this.node)
+      }, this.node, ['error']))
+      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+  
+  }
 }

package/dist/index.js

@@ -372,8 +372,8 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
             return;
         if (this.excludeLibraries.some(e => typeof e === 'string' ? e === lib : e.test(lib)))
             return;
+        const { outputRoot, chorePackagePrefix } = this.ctx.runOpts.config;
         if (sync) {
-            const { outputRoot } = this.ctx.runOpts.config;
             const targetPath = path__namespace.join(outputRoot, helper.NODE_MODULES);
             // FIXME 不支持 alias 配置
             const libName = lib;
@@ -479,6 +479,7 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                 code = apiLoader(code);
             }
             if (this.extensions.includes(path__namespace.extname(lib))) {
+                // Note: 查询 externals 内的依赖，并将它们添加到 externalDeps 中
                 code = code.replace(/(?:import\s|from\s|require\()['"]([^.][^'"\s]+)['"]\)?/g, (src, p1) => {
                     const { outputRoot } = this.ctx.runOpts.config;
                     const targetPath = path__namespace.join(outputRoot, helper.NODE_MODULES, p1);
@@ -502,8 +503,10 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                     code = '// @ts-nocheck\n' + code;
                 }
             }
-            if (/tarojs[\\/]taro[\\/]types[\\/]index.d.ts/.test(target)) {
-                code = `/// <reference path="global.d.ts" />
+            // Note: 传入 chorePackagePrefix 时，不生成核心依赖库
+            if (!chorePackagePrefix) {
+                if (/tarojs[\\/]taro[\\/]types[\\/]index.d.ts/.test(target)) {
+                    code = `/// <reference path="global.d.ts" />
 
 /// <reference path="taro.api.d.ts" />
 /// <reference path="taro.component.d.ts" />
@@ -523,14 +526,15 @@ declare global {
   const defineAppConfig: (config: Taro.Config) => Taro.Config
   const definePageConfig: (config: Taro.Config) => Taro.Config
 }`;
-            }
-            try {
-                const targetPath = target.replace(new RegExp(`\\b${helper.NODE_MODULES}\\b`), 'npm');
-                helper.fs.ensureDirSync(path__namespace.dirname(targetPath));
-                helper.fs.writeFileSync(targetPath, code);
-            }
-            catch (e) {
-                console.error(`[taro-arkts] inject ${lib} to ${target} failed`, e);
+                }
+                try {
+                    const targetPath = target.replace(new RegExp(`\\b${helper.NODE_MODULES}\\b`), 'npm');
+                    helper.fs.ensureDirSync(path__namespace.dirname(targetPath));
+                    helper.fs.writeFileSync(targetPath, code);
+                }
+                catch (e) {
+                    console.error(`[taro-arkts] inject ${lib} to ${target} failed`, e);
+                }
             }
         }
         else if (stat.isSymbolicLink()) {
@@ -552,7 +556,7 @@ declare global {
         const that = this;
         const { appPath } = that.ctx.paths;
         const { config } = that.ctx.runOpts;
-        const { outputRoot } = config;
+        const { outputRoot, ohPackage = {}, chorePackagePrefix } = config;
         if (!that.framework.includes('vue')) {
             that.excludeLibraries.push(/\bvue\b/);
         }
@@ -568,7 +572,22 @@ declare global {
                 /^solid-js\/universal$/,
             ]);
         }
+        const externals = Object.keys(ohPackage.dependencies || []).concat(Object.keys(ohPackage.devDependencies || []));
         function modifyResolveId({ source = '', importer = '', options = {}, name = 'modifyResolveId', resolve }) {
+            if (externals.includes(source)) {
+                return {
+                    external: true,
+                    id: source,
+                    resolvedBy: name,
+                };
+            }
+            if (chorePackagePrefix && that.indexOfLibraries(source) > -1) {
+                return {
+                    external: true,
+                    id: path__namespace.join(chorePackagePrefix, source),
+                    resolvedBy: name,
+                };
+            }
             if (shared.isFunction(resolve)) {
                 if (source === that.runtimePath || that.runtimePath.includes(source)) {
                     return resolve('@tarojs/runtime', importer, options);
@@ -1151,7 +1170,7 @@ class Harmony extends service.TaroPlatformBase {
                 const outDir = path.join(compsOutDir, name);
                 helper.fs.copy(src, outDir);
             });
-            this.modifyHostPackageDep(outDir);
+            this.modifyHostPackage(config.harmony);
         });
     }
     modifyWebpackConfig() {
@@ -1214,13 +1233,13 @@ class Harmony extends service.TaroPlatformBase {
             console.warn(helper.chalk.red('设置鸿蒙 Hap 配置失败：', err));
         });
     }
-    modifyHostPackageDep(dest) {
+    modifyHostPackage({ projectPath, hapName = 'entry' }) {
         return __awaiter(this, void 0, void 0, function* () {
+            const packageJsonFile = path.join(projectPath, hapName, 'package.json');
             const hmsDeps = {
                 '@hmscore/hms-js-base': '^6.1.0-300',
                 '@hmscore/hms-jsb-account': '^1.0.300'
             };
-            const packageJsonFile = path.resolve(dest, '../../../../../package.json');
             const isExists = yield helper.fs.pathExists(packageJsonFile);
             if (!isExists)
                 return;
@@ -1237,6 +1256,7 @@ class Harmony extends service.TaroPlatformBase {
             }
             packageJson = JSON.stringify(packageJson);
             yield helper.fs.writeFile(packageJsonFile, packageJson);
+            return packageJson;
         });
     }
     getChunkEntryModule(compilation, chunk, compiler = 'webpack4') {