feat(harmony): update page tpl

Author: ZakaryCode

packages/taro-platform-harmony-cpp/package.json

@@ -47,6 +47,7 @@
     "@tarojs/service": "workspace:*",
     "@types/react": "^18.3.3",
     "@types/react-reconciler": "^0.28.8",
+    "fast-glob": "^3.3.2",
     "json5": "^2.2.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -69,7 +70,6 @@
     "@tarojs/taro": "workspace:*",
     "@tarojs/vite-runner": "workspace:*",
     "@types/node": "^18.19.34",
-    "fast-glob": "^3.3.2",
     "postcss": "^8.4.38",
     "prettier": "^2.8.8",
     "rollup-plugin-copy": "workspace:*",

packages/taro-platform-harmony-cpp/src/index.ts

@@ -1,12 +1,12 @@
 /* eslint-disable no-console */
 import path from 'node:path'
 
-import { chalk, NODE_MODULES } from '@tarojs/helper'
+import { chalk, fs, NODE_MODULES, NPM_DIR } from '@tarojs/helper'
 import { DEFAULT_TERSER_OPTIONS } from '@tarojs/vite-runner/dist/utils/constants'
 
 import initCommands from './commands'
 import HarmonyCPP from './program'
-import { CPP_LIBRARY_NAME, CPP_LIBRARY_PATH, getProcessArg, PLATFORM_NAME } from './utils'
+import { CPP_LIBRARY_NAME, CPP_LIBRARY_PATH, getProcessArg, PLATFORM_NAME, SEP_RGX } from './utils'
 import { PKG_DEPENDENCIES, PKG_NAME, PKG_VERSION, PROJECT_DEPENDENCIES_NAME } from './utils/constant'
 
 import type { IPluginContext } from '@tarojs/service'
@@ -29,7 +29,7 @@ export default (ctx: IPluginContext, options: IOptions = {}) => {
     opts.ohPackage.dependencies ||= {}
 
     if (options.useChoreLibrary) {
-      opts.chorePackagePrefix ||= `${PKG_NAME}/src/main/ets/npm`
+      opts.chorePackagePrefix ||= `${PKG_NAME}/src/main/ets/${NPM_DIR}`
       opts.ohPackage.dependencies[PKG_NAME] ||= `^${PKG_VERSION}`
       PROJECT_DEPENDENCIES_NAME.forEach(key => {
         opts.ohPackage.dependencies[key] ||= PKG_DEPENDENCIES[key]
@@ -72,12 +72,17 @@ export default (ctx: IPluginContext, options: IOptions = {}) => {
 
       if (options.useChoreLibrary === false) {
         const { appPath } = ctx.paths
-        const { outputRoot } = ctx.runOpts.config
+        const { outputRoot } = config
         const npmDir = path.join(outputRoot, NODE_MODULES)
         // Note: 注入 C-API 库
         program.externalDeps.forEach(([libName, _, target]) => {
           program.moveLibraries(target || libName, path.resolve(npmDir, libName), appPath, !target)
         })
+        program.handleResourceEmit(outputRoot, appPath)
+        program.generateInitialEntry()
+        if (config.hapName !== 'entry') { // Note: 如果是 entry 不需要重写 BuildProfile 路径
+          fixBuildProfile(outputRoot, path.join(outputRoot, '../../..'))
+        }
       }
     }
   })
@@ -102,3 +107,20 @@ function assertHarmonyConfig (ctx: IPluginContext, config): asserts config is IH
     throwError('请设置 harmony.projectPath')
   }
 }
+
+export function fixBuildProfile(lib = '', outputRoot = '') {
+  const stats = fs.statSync(lib)
+  if (stats.isDirectory()) {
+    fs.readdirSync(lib).forEach((item) => fixBuildProfile(path.join(lib, item), outputRoot))
+  } else if (stats.isFile() && lib.endsWith('.ets')) {
+    let data = fs.readFileSync(lib, 'utf-8')
+    const buildProfilePath = path.resolve(outputRoot, 'BuildProfile')
+    const rgx = /import\s+(\S+)\s+from\s*['"]BuildProfile['"]/
+    if (rgx.test(data)) {
+      data = data.replace(rgx, (_, p1) => {
+        return `import ${p1} from '${path.relative(path.dirname(lib), buildProfilePath).replace(SEP_RGX, '/')}'`
+      })
+      fs.writeFileSync(lib, data, 'utf-8')
+    }
+  }
+}

packages/taro-platform-harmony-cpp/src/program/babel/global.ts

@@ -1,4 +1,4 @@
-import { isLocalPath, parseLocalPath } from '../../utils'
+import { isLocalPath, NPM_DIR, parseLocalPath } from '../../utils'
 import { PKG_NAME } from '../../utils/constant'
 import { globalVarName, loadLibraryFunctionName, setLibraryFunctionName } from '../template/entry'
 
@@ -24,7 +24,7 @@ export default function transformGlobalModePlugin ({
   const importFunc = isGlobal ? `${globalVarName}.${loadLibraryFunctionName}` : loadLibraryFunctionName
   const exportFunc = isGlobal ? `${globalVarName}.${setLibraryFunctionName}` : setLibraryFunctionName
   const exportPaths: [boolean, ...string[]] = [isGlobal, projectId, fileName]
-  chorePackagePrefix = chorePackagePrefix || `${PKG_NAME}/src/main/ets/npm`
+  chorePackagePrefix = chorePackagePrefix || `${PKG_NAME}/src/main/ets/${NPM_DIR}`
 
   return ({ types: t }: typeof BabelCore): BabelCore.PluginObj<BabelCore.PluginPass> => ({
     visitor: {

packages/taro-platform-harmony-cpp/src/program/index.ts

@@ -37,7 +37,7 @@ export default class Harmony extends HarmonyOS {
     // @ts-ignore
     super(ctx, config) // Note: link 时，ctx 类型可能无法对齐，此处忽略类型检查
     const that = this
-    this.externalDeps.push([this.runtimePath, new RegExp(`^${this.runtimePath.replace(/([-\\/$])/g, '\\$1')}$`)])
+    this.externalDeps.push([this.runtimePath, new RegExp(`^${this.runtimePath.replace(/([-\\/$])/g, '\\$1')}`)])
     this.externalDeps.forEach(e => {
       if (e[0] === '@tarojs/react') {
         e[2] = this.runtimeFrameworkReconciler
@@ -208,9 +208,10 @@ export default class Harmony extends HarmonyOS {
     const outputFile = isFile ? outputPath + '.js' : path.join(outputPath, 'index.js')
     const needDeclaration = /@tarojs[\\/](runtime|taro)/.test(outputPath)
     if (!fs.existsSync(inputPath)) {
-      await sleep(100)
+      await sleep(150)
     }
     try {
+      fs.ensureDirSync(path.dirname(outputFile))
       await generatePackage.call(this, {
         input: inputPath,
         output: outputFile,
@@ -229,6 +230,9 @@ export default class Harmony extends HarmonyOS {
     } catch (error) {
       console.error(`移动 ${chalk.yellow(inputPath)} 到 ${outputPath} 失败：${error.message}\n`, error.stack) // eslint-disable-line no-console
     }
+    if (!fs.existsSync(outputFile)) {
+      await sleep(150)
+    }
     // Note: 非 ETS 依赖需要能注入到 JSVM 中
     const resourcesFile = outputFile.replace(/[\\/]ets[\\/]/g, '/resources/rawfile/')
     fs.moveSync(outputFile, resourcesFile, { overwrite: true })

packages/taro-platform-harmony-cpp/src/program/rollup/global-plugin.ts

@@ -4,7 +4,7 @@ import { transformSync } from '@babel/core'
 import { isFunction } from '@tarojs/shared'
 import { TARO_COMP_SUFFIX } from '@tarojs/vite-runner/dist/harmony/entry'
 
-import { getProjectId, isLocalPath, parseLocalPath, PKG_NAME, PKG_VERSION, SEP_RGX } from '../../utils'
+import { getProjectId, isLocalPath, NPM_DIR, PACKAGE_NAME, parseLocalPath, PKG_VERSION, SEP_RGX } from '../../utils'
 import transformGlobalModePlugin from '../babel/global'
 import { babelPresets } from '../babel/presets'
 import { entryFileName, loadLibraryFunctionName, setLibraryFunctionName } from '../template/entry'
@@ -47,7 +47,7 @@ export function fixImportCode(
         if (source.endsWith('.json')) return true
         if (source.endsWith(TARO_COMP_SUFFIX)) return true
       } else {
-        if (sourceValue.includes(`${PKG_NAME}/dist/runtime/runtime-harmony`)) return true
+        if (sourceValue.includes(`${PACKAGE_NAME}/dist/runtime/runtime-harmony`)) return true
       }
     }
   })
@@ -99,16 +99,15 @@ export default function (this: Harmony | void, opt: IPluginOption = {}): PluginO
       const { taroConfig, cwd: appPath } = compiler
       const { sourceRoot = 'src' } = taroConfig
       const projectId = moduleId || getProjectId(taroConfig?.projectName)
-      const chorePackagePrefix = runOpts?.config.chorePackagePrefix
       const sourcePath = path.posix.join(appPath, sourceRoot)
 
       if (compiler) {
         compiler.loaderMeta ||= {}
         compiler.loaderMeta.enableParseJSXStyle = true
       }
 
-      if (!isPureComp && compiler?.components instanceof Array) {
-        compiler.components.forEach((config: TaroHarmonyPageMeta) => {
+      if (!isPureComp) {
+        const modifyPageOrComp = (config: TaroHarmonyPageMeta) => {
           const oddModifyPageImport = config.modifyPageImport
           config.modifyPageImport = function (this: PageParser, importStr: string[], page: TaroHarmonyPageMeta) {
             if (isFunction(oddModifyPageImport)) {
@@ -120,13 +119,15 @@ export default function (this: Harmony | void, opt: IPluginOption = {}): PluginO
             }
 
             fixImportCode(importStr, {
-              chorePackagePrefix,
+              chorePackagePrefix: runOpts?.config.chorePackagePrefix ?? path.relative(path.dirname(page.name), NPM_DIR),
               projectId,
               sourcePath,
               fileName: page.name,
             })
           }
-        })
+        }
+        compiler?.pages?.forEach?.(modifyPageOrComp)
+        compiler?.components?.forEach?.(modifyPageOrComp)
       }
     },
     renderChunk (code, chunk) {

packages/taro-platform-harmony-cpp/src/program/template/entry.ts

@@ -337,7 +337,7 @@ export default class Parser extends BaseParser {
       `  nativeUIManager.initSystemInfo({`,
       `    deviceInfo: globalThis.loadLibrary('@tarojs/taro', 'getDeviceInfo')(),`,
       `  })`,
-      `})();\`, 'npm/${entryFileName}?generated'),`,
+      `})();\`, '${NPM_DIR}/${entryFileName}?generated'),`,
       `      ),`,
       `      new StandardTaroLogger((error: TaroAny) => hilog.error(0xBEEF, "TaroJS ERROR", error.getDetails())),`,
       `    )).catch((err: Error) => {`,

packages/taro-platform-harmony-cpp/src/program/vite/page-resource.ts

@@ -2,6 +2,7 @@ import path from 'node:path'
 
 import { chalk, fs, NODE_MODULES } from '@tarojs/helper'
 import { isObject } from '@tarojs/shared'
+import fg from 'fast-glob'
 
 import { genRawFileName, getProjectId, RAWFILE_FOLDER, RAWFILE_NAME_PREFIX } from '../../utils'
 
@@ -48,18 +49,20 @@ export default function (this: Harmony): PluginOption {
       }
 
       if (needCleanResources) {
-        fs.copySync(finalOutDir, tmpDir, {
-          filter: (src) => {
-            const copyPath = path.relative(finalOutDir, src)
-            return (
-              !copyPath ||
-              (!copyPath.startsWith('.') &&
-                !copyPath.startsWith('ets') &&
-                !copyPath.includes(`${RAWFILE_FOLDER}/${RAWFILE_NAME_PREFIX}`))
-            )
-          },
+        const files = fg.sync(['!cpp/**/*', '!ets/**/*', `!${RAWFILE_FOLDER}/${RAWFILE_NAME_PREFIX}/**/*`], {
+          cwd: finalOutDir,
+          dot: true,
+        })
+        files.forEach(file => {
+          const src = path.join(finalOutDir, file)
+          if (!file.startsWith('ets') && !file.startsWith(`${RAWFILE_FOLDER}/${RAWFILE_NAME_PREFIX}`)) {
+            const dest = path.join(tmpDir, file)
+            fs.ensureDirSync(path.dirname(dest))
+            fs.moveSync(src, dest)
+          } else {
+            fs.removeSync(src)
+          }
         })
-        fs.emptyDirSync(finalOutDir)
         ;['uncaughtException', 'unhandledRejection', 'uncaughtExceptionMonitor'].forEach((event) => {
           process.on(event, (reason) => {
             console.error('捕获到未处理的错误:', reason)