merge: 合并鸿蒙分支

.github/workflows/build-rust-binding.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/[email protected]
         with:
-          version: 8
+          version: 9
       - name: Setup Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         if: ${{ !matrix.settings.docker }}

.github/workflows/nodejs.yml

@@ -64,7 +64,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/[email protected]
         with:
-          version: 8
+          version: 9
       - name: Setup Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:

.github/workflows/publish.yml

@@ -88,7 +88,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/[email protected]
         with:
-          version: 8
+          version: 9
       - name: Setup Node 18
         uses: actions/setup-node@v4
         with:

.github/workflows/sync-components-types.yml

@@ -36,7 +36,7 @@ jobs:
       - name: install
         uses: pnpm/[email protected]
         with:
-          version: 8
+          version: 9
           run_install: |
             - recursive: true
               args: [--frozen-lockfile, --strict-peer-dependencies]

packages/taro-helper/src/utils.ts

@@ -631,8 +631,8 @@ export function readPageConfig(configPath: string) {
 }
 
 interface IReadConfigOptions {
-  defineConstants?: Record<string, any>
   alias?: Record<string, any>
+  defineConstants?: Record<string, any>
 }
 
 export function readConfig<T extends IReadConfigOptions> (configPath: string, options: T = {} as T) {

packages/taro-platform-harmony/src/components/components-harmony-ets/scrollView.ets

@@ -36,6 +36,9 @@ function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs {
 
 function getScrollable (node: TaroScrollViewElement) {
   const _attrs = node._attrs
+  if (node?.hmStyle?.overflow === "scroll" || node?.hmStyle?.overflow === "auto") {
+    return ScrollDirection.Vertical
+  }
   if (_attrs.scrollX) {
     return ScrollDirection.Horizontal
   } else if (_attrs.scrollY) {
@@ -47,11 +50,11 @@ function getScrollable (node: TaroScrollViewElement) {
 
 function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', xOffset?: number, yOffset?: number) {
   if (!node || !node.scroller) return
-  
+
   const currentOffset = node.scroller.currentOffset() as ScrollViewCurrentOffset
-  
+
   if (!currentOffset) return
-  
+
   const currentXOffset = currentOffset.xOffset
   const currentYOffset = currentOffset.yOffset
   const value: ScrollViewEvent = {

packages/taro-platform-harmony/src/runtime-ets/dom/node.ts

@@ -190,6 +190,11 @@ export class TaroNode extends TaroDataSourceElement {
     this.childNodes.push(child)
     this.notifyDataAdd(this.childNodes.length - 1)
 
+    if (this.nodeName === 'TEXT') {
+      // 修复beta2版本文字从undefined -> 有值时的 不更新问题
+      this.updateComponent()
+    }
+
     // @ts-ignore
     child.toggleLayer?.(true)
 

packages/taro-vite-runner/src/harmony/config.ts

@@ -20,6 +20,7 @@ import type { RollupInjectOptions } from '@rollup/plugin-inject'
 import type { ViteHarmonyCompilerContext } from '@tarojs/taro/types/compile/viteCompilerContext'
 import type { InputPluginOption, OutputOptions } from 'rollup'
 import type { Plugin, PluginOption } from 'vite'
+import type { TaroHarmonyPageMeta } from './template/page'
 
 export default function (viteCompilerContext: ViteHarmonyCompilerContext): PluginOption {
   const { taroConfig, cwd: appPath } = viteCompilerContext
@@ -200,7 +201,9 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
           name = name.replace(/[\\/]+/g, '/')
 
           const appId = viteCompilerContext.app.config.appId || 'app'
-          const isTaroComp = appId === name || viteCompilerContext.pages.some(page => page.name === name) || viteCompilerContext.components?.some(comp => comp.name === name)
+          const isTaroComp = appId === name ||
+            viteCompilerContext.pages.some((page: TaroHarmonyPageMeta) => [page.name, page.originName].includes(name)) ||
+            viteCompilerContext.components?.some((comp: TaroHarmonyPageMeta) => [comp.name, comp.originName].includes(name))
           // 如果同时存在app.ets和app.js，因为鸿蒙IDE编译会把app.ets编译成app.ts，会跟app.js冲突，识别都是/app，导致app.js被app.ts覆盖了，所以需要名字
           const suffix = isTaroComp ? virtualModulePrefixREG.test(chunkInfo.facadeModuleId || '') ? TARO_COMP_SUFFIX : '_comp' : ''
           name = stripMultiPlatformExt(`${name}${suffix}`) + taroConfig.fileType.script

packages/taro-vite-runner/src/harmony/emit.ts

@@ -9,6 +9,7 @@ import { componentConfig } from '../utils/component'
 
 import type { ViteHarmonyCompilerContext } from '@tarojs/taro/types/compile/viteCompilerContext'
 import type { PluginOption } from 'vite'
+import type { TaroHarmonyPageMeta } from './template/page'
 
 export default function (viteCompilerContext: ViteHarmonyCompilerContext): PluginOption {
   const { taroConfig } = viteCompilerContext
@@ -104,18 +105,21 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
         const comps = viteCompilerContext.getComponents() || []
 
         const lines: string[] = []
-        comps.forEach(comp => {
-          const key = Object.keys(taroConfig.router?.customRoutes || {}).find(e => [comp.name, addLeadingSlash(comp.name)].includes(e))
+        comps.forEach((comp: TaroHarmonyPageMeta) => {
+          const key = Object.keys(taroConfig.router?.customRoutes || {}).find(e => {
+            const name = comp.originName || comp.name
+            return [name, addLeadingSlash(name)].includes(e)
+          })
 
           if (key) {
             const alias = taroConfig.router?.customRoutes![key]
             if (alias instanceof Array) {
-              alias.forEach(item => lines.push(`export * from './${path.join('src/main', 'ets', item)}'`))
+              alias.forEach(item => lines.push(`export * from './${path.posix.join('src/main', 'ets', item)}'`))
             } else if (typeof alias === 'string') {
-              lines.push(`export * from './${path.join('src/main', 'ets', alias)}'`)
+              lines.push(`export * from './${path.posix.join('src/main', 'ets', alias)}'`)
             }
           } else {
-            lines.push(`export * from './${path.join('src/main', 'ets', comp.name)}'`)
+            lines.push(`export * from './${path.posix.join('src/main', 'ets', comp.name)}'`)
           }
         })
         lines.push('')

packages/taro-vite-runner/src/harmony/page.ts

@@ -94,15 +94,15 @@ export default function (viteCompilerContext: ViteHarmonyCompilerContext): Plugi
               pageName = 'index'
             }
 
+            const page_ = page as TaroHarmonyPageMeta
+            page_.id = id
+            page_.originName = page.name
+            page_.name = pageName
+
             this.emitFile({
               type: 'prebuilt-chunk',
               fileName: viteCompilerContext.getTargetFilePath(pageName, '.ets'),
-              code: parse.parse(path.resolve(appRoot, pageName), {
-                ...page,
-                originName: page.name,
-                name: pageName,
-                id,
-              } as TaroHarmonyPageMeta, name, this.resolve),
+              code: parse.parse(path.resolve(appRoot, pageName), page_, name, this.resolve),
               exports: ['default'],
             })
           })

packages/taro-vite-runner/src/harmony/template/app.ts

@@ -1,5 +1,7 @@
 import path from 'node:path'
 
+import { isFunction } from '@tarojs/shared'
+
 import { escapePath, resolveAbsoluteRequire } from '../../utils'
 import { TARO_COMP_SUFFIX } from '../entry'
 import { TARO_TABBAR_PAGE_PATH } from '../page'
@@ -116,8 +118,8 @@ export default class Parser extends BaseParser {
 }
 `
 
-    if (typeof modifyInstantiate === 'function') {
-      instantiateApp = modifyInstantiate(instantiateApp, 'app')
+    if (isFunction(modifyInstantiate)) {
+      instantiateApp = modifyInstantiate.call(this, instantiateApp, 'app')
     }
 
     return instantiateApp
@@ -156,10 +158,9 @@ export default class Parser extends BaseParser {
   }
 
   parseEntry (rawId: string, config = {}) {
-    const { creator, creatorLocation, frameworkArgs, importFrameworkStatement } = this.loaderMeta
+    const { creator, creatorLocation, frameworkArgs, importFrameworkStatement, modifyEntryFile } = this.loaderMeta
     const createApp = `${creator}(component, ${frameworkArgs})`
-
-    return this.transArr2Str([
+    const rawCode = this.transArr2Str([
       'import { initPxTransform } from "@tarojs/taro"',
       `import { ${creator} } from "${creatorLocation}"`,
       `import component from "${escapePath(rawId)}"`,
@@ -168,5 +169,7 @@ export default class Parser extends BaseParser {
       this.getInitPxTransform(),
       `export default () => ${createApp}`,
     ])
+
+    return isFunction(modifyEntryFile) ? modifyEntryFile.call(this, 'app', rawId, rawCode, config) : rawCode
   }
 }

packages/taro-vite-runner/src/harmony/template/page.ts

@@ -34,7 +34,7 @@ export interface TaroHarmonyPageMeta extends VitePageMeta {
 
   modifyPageAppear?: (this: Parser, appearStr: string, page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) => string
 
-  modifyPageDisAppear?: (this: Parser, appearStr: string, page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) => string
+  modifyPageDisappear?: (this: Parser, appearStr: string, page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) => string
 
   modifyPageBuild?: (this: Parser, buildStr: string, page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) => string
 
@@ -705,7 +705,7 @@ for (let i = 0; i < taskQueen.length; i++) {
 
     let instantiatePage = this.transArr2Str(structCodeArray)
     if (isFunction(modifyInstantiate)) {
-      instantiatePage = modifyInstantiate(instantiatePage, 'page')
+      instantiatePage = modifyInstantiate.call(this, instantiatePage, 'page', page)
     }
 
     return instantiatePage
@@ -944,20 +944,20 @@ ${this.transArr2Str(pageStr.split('\n'), 6)}
   }
 
   generatePageAboutToDisAppear (page: TaroHarmonyPageMeta | TaroHarmonyPageMeta[]) {
-    const modifyPageDisAppear = page instanceof Array ? page[0].modifyPageDisAppear : page.modifyPageDisAppear
+    const modifyPageDisappear = page instanceof Array ? page[0].modifyPageDisappear : page.modifyPageDisappear
 
-    // 生成 aboutToDisAppear 函数内容
-    let disAppearStr = this.transArr2Str([
+    // 生成 aboutToDisappear 函数内容
+    let disappearStr = this.transArr2Str([
       this.isTabbarPage ? `this.pageList?.forEach(item => {
 callFn(item?.onUnload, this)
 })
 this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)'])
 
-    if (isFunction(modifyPageDisAppear)) {
-      disAppearStr = modifyPageDisAppear.call(this, disAppearStr, page)
+    if (isFunction(modifyPageDisappear)) {
+      disappearStr = modifyPageDisappear.call(this, disappearStr, page)
     }
 
-    return disAppearStr
+    return disappearStr
   }
 
   generatePageShown () {
@@ -1078,21 +1078,21 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)'])
   }
 
   parseEntry (rawId: string, page: TaroHarmonyPageMeta) {
-    const { creatorLocation, importFrameworkStatement } = this.loaderMeta
+    const { creatorLocation, frameworkArgs, importFrameworkStatement, modifyEntryFile } = this.loaderMeta
     const entryOption = page instanceof Array ? page[0].entryOption : page.entryOption
     const isBlended = this.buildConfig.blended || this.buildConfig.isBuildNativeComp
-    let createFn = isBlended ? 'createNativePageConfig' : 'createPageConfig'
+    // FIXME: pure 参数应该使用 page.entryOption 替代
+    const createFn = this.isPure
+      ? 'createNativeComponentConfig'
+      : isBlended
+        ? 'createNativePageConfig' : 'createPageConfig'
     const pageName = entryOption?.routeName || page.name
-    const nativeCreatePage = `createNativePageConfig(component, '${pageName}', React, ReactDOM, config)`
-    let createPageOrComponent = isBlended ? nativeCreatePage : `createPageConfig(component, '${pageName}', config)`
+    const createPageOrComponent = `${createFn}(component, ${this.isPure
+      ? `${frameworkArgs}`
+      : isBlended
+        ? `'${pageName}', ${frameworkArgs}` : `'${pageName}', config`})`
 
-    // 如果是pure，说明不是一个页面，而是一个组件，这个时候修改import和createPage
-    if (this.isPure) {
-      createFn = 'createNativeComponentConfig'
-      createPageOrComponent = `createNativeComponentConfig(component, React, ReactDOM, config)`
-    }
-
-    return this.transArr2Str([
+    const rawCode = this.transArr2Str([
       `import { ${createFn} } from '${creatorLocation}'`,
       `import component from "${escapePath(rawId)}"`,
       isBlended ? 'import { initPxTransform } from "@tarojs/taro"' : null,
@@ -1103,5 +1103,7 @@ this.removeTabBarEvent()` : 'callFn(this.page?.onUnload, this)'])
       page?.config.enableShareAppMessage ? 'component.enableShareAppMessage = true' : null,
       `export default () => ${createPageOrComponent}`,
     ])
+
+    return isFunction(modifyEntryFile) ? modifyEntryFile.call(this, 'page', rawId, rawCode, page) : rawCode
   }
 }

packages/taro-vite-runner/src/harmony/template/render.ts

@@ -116,7 +116,8 @@ export default class RenderParser extends BaseParser {
       if (meta.isPackage) {
         importList.push(`import ${meta.name} from '${meta.scriptPath}'`)
       } else {
-        const nativePath = path.relative(this.context.sourceDir, meta.scriptPath).replace(/\.ets$/, '')
+        const nativePath = path.posix.relative(this.context.sourceDir, meta.scriptPath)
+          .replace(/[\\/]+/g, '/').replace(/\.ets$/, '')
         importList.push(`import ${meta.name} from './${nativePath}'`)
       }
     })