完善编译链，mpharmony编译时将taro-components组件库替换为components-mpharmony

examples/mini-program-example/src/pages/index/index.tsx

@@ -1,7 +1,6 @@
-import {View, Text,Image} from '@tarojs/components'
+import {View, Text,Image,GridView,ListView} from '@tarojs/components'
 import {useLoad} from '@tarojs/taro'
 import './index.scss'
-import {TestBlock, GridView,ListView} from "@tarojs/components-mpharmony";
 
 const grid_data = [
   {
@@ -39,7 +38,6 @@ export default function Index() {
   return (
     <View className='index'>
       <Text>Hello world!</Text>
-      <TestBlock><Text>Hello world!</Text></TestBlock>
 
       <GridView columnNum={3} data={grid_data} columnItem={(childItem, i,index) => (
 
@@ -59,7 +57,7 @@ export default function Index() {
 
       <ListView orientation={'vertical'} data={grid_data} columnItem={(childItem, i) => (
 
-        <View key={`list-group-item-${i}`} onClick={() => ( console.log("childItem "+childItem.value+" i "+i+" index "+index) )}>
+        <View key={`list-group-item-${i}`} onClick={() => ( console.log("childItem "+childItem.value+" i "+i) )}>
           {childItem.image && (
             <Image
               src={childItem.image}

packages/taro-components-mpharmony/package.json

@@ -20,6 +20,7 @@
     "loader-utils": "^3.2.1",
     "memoize-one": "^6.0.0",
     "@tarojs/components": "~3.3.20",
+    "@tarojs/components-react": "3.6.8",
     "@tarojs/taro": "~3.3.20",
     "@tarojs/plugin-framework-react": "3.6.8",
     "@tarojs/react": "3.6.8",
@@ -34,6 +35,7 @@
     "@babel/core": "^7.21.0",
     "@babel/parser": "^7.14.5",
     "@tarojs/components": "~3.3.20",
+    "@tarojs/components-react": "3.6.8",
     "@tarojs/react": "~3.3.20",
     "@tarojs/taro": "~3.3.20",
     "@babel/plugin-proposal-decorators": "^7.14.5",

packages/taro-components-mpharmony/src/index.ts

@@ -23,7 +23,7 @@ export { FollowSwan } from '@tarojs/components/lib/react'
 export { Form } from '@tarojs/components/lib/react'
 export { FunctionalPageNavigator } from '@tarojs/components/lib/react'
 export { Icon } from '@tarojs/components/lib/react'
-// export { default as Image } from './components/image'
+export { default as Image } from '@tarojs/components-react/dist/components/image'
 export { InlinePaymentPanel } from '@tarojs/components/lib/react'
 export { Input } from '@tarojs/components/lib/react'
 export { KeyboardAccessory } from '@tarojs/components/lib/react'
@@ -46,24 +46,24 @@ export { PageMeta } from '@tarojs/components/lib/react'
 export { Picker, PickerGroup } from '@tarojs/components/lib/react'
 export { PickerView, PickerViewColumn } from '@tarojs/components/lib/react'
 export { Progress } from '@tarojs/components/lib/react'
-// export { default as PullDownRefresh } from './components/pull-down-refresh'
-// export { PullToRefresh } from '@tarojs/components/lib/react'
+export { default as PullDownRefresh } from '@tarojs/components-react/dist/components/pull-down-refresh'
+export { PullToRefresh } from '@tarojs/components/lib/react'
 export { Radio, RadioGroup } from '@tarojs/components/lib/react'
 export { RichText } from '@tarojs/components/lib/react'
 export { RootPortal } from '@tarojs/components/lib/react'
 export { RtcRoom, RtcRoomItem } from '@tarojs/components/lib/react'
-// export { default as ScrollView } from './components/scroll-view'
+export { default as ScrollView } from '@tarojs/components-react/dist/components/scroll-view'
 export { ShareElement } from '@tarojs/components/lib/react'
 export { Slider } from '@tarojs/components/lib/react'
 export { NativeSlot, Slot } from '@tarojs/components/lib/react'
-// export { Swiper, SwiperItem } from './components/swiper'
+export { Swiper, SwiperItem } from '@tarojs/components-react/dist/components/swiper'
 export { Switch } from '@tarojs/components/lib/react'
 export { Tabbar, TabItem } from '@tarojs/components/lib/react'
 export { Tabs } from '@tarojs/components/lib/react'
-// export { default as Text } from './components/text'
+export { default as Text } from '@tarojs/components-react/dist/components/text'
 export { Textarea } from '@tarojs/components/lib/react'
 export { Video, VideoControl, VideoDanmu } from '@tarojs/components/lib/react'
-// export { default as View } from './components/view'
+export { default as View } from '@tarojs/components-react/dist/components/view'
 export { VoipRoom } from '@tarojs/components/lib/react'
 export { WebView } from '@tarojs/components/lib/react'
 export * from './components/block/block'

packages/taro-platform-mpharmony/src/program.ts

@@ -28,16 +28,12 @@ export default class H5 extends TaroPlatformWeb {
     return this.ctx.initialConfig.framework || 'react'
   }
 
-  get useHtmlComponents () {
-    return !!this.ctx.initialConfig.h5?.useHtmlComponents
-  }
-
   get useDeprecatedAdapterComponent () {
     return !!this.ctx.initialConfig.h5?.useDeprecatedAdapterComponent
   }
 
   get componentLibrary () {
-    if (this.useHtmlComponents && this.framework === 'react') {
+    if (this.framework === 'react') {
       return './runtime/components'
     } else if (this.useDeprecatedAdapterComponent) {
       return `@tarojs/components/lib/component-lib/${compLibraryAlias[this.framework] || 'react'}`
@@ -87,11 +83,6 @@ export default class H5 extends TaroPlatformWeb {
             args[0].loaderMeta.execBeforeCreateWebApp += `applyPolyfills().then(() => defineCustomElements(window))\n`
           }
 
-          if (!this.useHtmlComponents) {
-            args[0].loaderMeta.extraImportForWeb += `import { defineCustomElementTaroPullToRefresh } from '@tarojs/components/dist/components'\n`
-            args[0].loaderMeta.execBeforeCreateWebApp += `defineCustomElementTaroPullToRefresh()\n`
-          }
-
           switch (this.framework) {
             case 'vue':
               args[0].loaderMeta.extraImportForWeb += `import { initVue2Components } from '@tarojs/components/lib/vue2/components-loader'\nimport * as list from '@tarojs/components'\n`
@@ -102,10 +93,8 @@ export default class H5 extends TaroPlatformWeb {
               args[0].loaderMeta.execBeforeCreateWebApp += `initVue3Components(component, list)\n`
               break
             default:
-              if (this.useHtmlComponents) {
-                args[0].loaderMeta.extraImportForWeb += `import { PullDownRefresh } from '@tarojs/components'\n`
-                args[0].loaderMeta.execBeforeCreateWebApp += `config.PullDownRefresh = PullDownRefresh\n`
-              }
+              args[0].loaderMeta.extraImportForWeb += `import { PullDownRefresh } from '@tarojs/components'\n`
+              args[0].loaderMeta.execBeforeCreateWebApp += `config.PullDownRefresh = PullDownRefresh\n`
           }
           return args
         })