From c5134c1eb2411a64abf0bd513fd8f38853dc4dba Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Thu, 30 Jul 2026 09:01:25 +0800 Subject: [PATCH] =?UTF-8?q?chore(mp-harmony):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=B8=BF=E8=92=99=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E4=B8=8E?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 新增忽略node_modules目录到gitignore 2. 升级modelVersion到6.0.0并更新相关配置 3. 更新ascf-toolkit插件与ascfapi依赖版本 4. 新增业务模块构建配置 5. 优化hvigor配置与插件参数 --- .gitignore | 3 +- .../mp-harmony/build-profile.json5 | 60 +++++++++++++++++++ .../mp-harmony/entry/hvigorfile.ts | 3 +- .../mp-harmony/entry/oh-package-lock.json5 | 10 ++-- .../mp-harmony/entry/oh-package.json5 | 1 + .../mp-harmony/hvigor/hvigor-config.json5 | 19 +++--- stub-app-projects/mp-harmony/hvigorfile.ts | 9 +-- stub-app-projects/mp-harmony/oh-package.json5 | 4 +- 8 files changed, 86 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 5876682..083dab9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ # 鸿蒙元服务构建产物 stub-app-projects/mp-harmony/ascf/ascf_src stub-app-projects/mp-harmony/ascf/ascf_build -stub-app-projects/mp-harmony/entry/src/main/resources/rawfile \ No newline at end of file +stub-app-projects/mp-harmony/entry/src/main/resources/rawfile +stub-app-projects/mp-harmony/**/node_modules \ No newline at end of file diff --git a/stub-app-projects/mp-harmony/build-profile.json5 b/stub-app-projects/mp-harmony/build-profile.json5 index 8b7bd60..50dbd91 100644 --- a/stub-app-projects/mp-harmony/build-profile.json5 +++ b/stub-app-projects/mp-harmony/build-profile.json5 @@ -64,6 +64,66 @@ ] } ] + }, + { + "name": "components_diy", + "srcPath": "./ascf/ascf_build/components_diy", + "targets": [ + { + "name": "default", + "applyToProducts": [ + "default" + ] + } + ] + }, + { + "name": "pages_goods", + "srcPath": "./ascf/ascf_build/pages_goods", + "targets": [ + { + "name": "default", + "applyToProducts": [ + "default" + ] + } + ] + }, + { + "name": "pages_order", + "srcPath": "./ascf/ascf_build/pages_order", + "targets": [ + { + "name": "default", + "applyToProducts": [ + "default" + ] + } + ] + }, + { + "name": "pages_promotion", + "srcPath": "./ascf/ascf_build/pages_promotion", + "targets": [ + { + "name": "default", + "applyToProducts": [ + "default" + ] + } + ] + }, + { + "name": "pages_tool", + "srcPath": "./ascf/ascf_build/pages_tool", + "targets": [ + { + "name": "default", + "applyToProducts": [ + "default" + ] + } + ] } ] } \ No newline at end of file diff --git a/stub-app-projects/mp-harmony/entry/hvigorfile.ts b/stub-app-projects/mp-harmony/entry/hvigorfile.ts index c6edcd9..90462c3 100644 --- a/stub-app-projects/mp-harmony/entry/hvigorfile.ts +++ b/stub-app-projects/mp-harmony/entry/hvigorfile.ts @@ -2,5 +2,6 @@ import { hapTasks } from '@ohos/hvigor-ohos-plugin'; export default { system: hapTasks, /* Built-in plugin of Hvigor. It cannot be modified. */ - plugins:[] /* Custom plugin to extend the functionality of Hvigor. */ + plugins:[], /* Custom plugin to extend the functionality of Hvigor. */ + modelVersion: '6.0.0' } diff --git a/stub-app-projects/mp-harmony/entry/oh-package-lock.json5 b/stub-app-projects/mp-harmony/entry/oh-package-lock.json5 index 09bc7c0..a3a1f8b 100644 --- a/stub-app-projects/mp-harmony/entry/oh-package-lock.json5 +++ b/stub-app-projects/mp-harmony/entry/oh-package-lock.json5 @@ -6,14 +6,14 @@ "lockfileVersion": 3, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { - "@atomicservice/ascfapi@^1.0.6": "@atomicservice/ascfapi@1.0.12" + "@atomicservice/ascfapi@^1.0.6": "@atomicservice/ascfapi@1.0.23" }, "packages": { - "@atomicservice/ascfapi@1.0.12": { + "@atomicservice/ascfapi@1.0.23": { "name": "@atomicservice/ascfapi", - "version": "1.0.12", - "integrity": "sha512-PGBTjY0x/fSgFyuxJBA54JCxEdKzWPHD+c4+azOn84o/n7uMFjKjBeDQ+5UnPgl0ejze8+MrlxD1GWaV1VNtGQ==", - "resolved": "https://ohpm.openharmony.cn/ohpm/@atomicservice/ascfapi/-/ascfapi-1.0.12.har", + "version": "1.0.23", + "integrity": "sha512-gZz56dpnA1Jm8u9+RjYpQL9/JaC8Jk/lnVd3Yy99a+zYw7x/8kroiFuOW/TjcZFYfNU+Z9UboTuPUOzWzJ0NLA==", + "resolved": "https://ohpm.openharmony.cn/ohpm/@atomicservice/ascfapi/-/ascfapi-1.0.23.har", "registryType": "ohpm", "packageType": "InterfaceHar" } diff --git a/stub-app-projects/mp-harmony/entry/oh-package.json5 b/stub-app-projects/mp-harmony/entry/oh-package.json5 index cfb723f..74ed887 100644 --- a/stub-app-projects/mp-harmony/entry/oh-package.json5 +++ b/stub-app-projects/mp-harmony/entry/oh-package.json5 @@ -2,6 +2,7 @@ "name": "entry", "version": "1.0.0", "description": "Please describe the basic information.", + "modelVersion": "6.0.0", "main": "", "author": "", "license": "", diff --git a/stub-app-projects/mp-harmony/hvigor/hvigor-config.json5 b/stub-app-projects/mp-harmony/hvigor/hvigor-config.json5 index f15f54e..b4351af 100644 --- a/stub-app-projects/mp-harmony/hvigor/hvigor-config.json5 +++ b/stub-app-projects/mp-harmony/hvigor/hvigor-config.json5 @@ -1,10 +1,9 @@ -{ - "modelVersion": "5.0.0", - "dependencies": { - "@atomicservice/ascf-toolkit-hvigor-plugin": "~1.0.3-beta || ~1.0.3" - }, - "execution": {}, - "logging": {}, - "debugging": {}, - "nodeOptions": {} -} +{ + "modelVersion": "6.0.0", + "dependencies": { + "@atomicservice/ascf-toolkit-hvigor-plugin": "^1.0.17" + }, + "properties": { + "hvigor.dependency.useNpm": true + } +} \ No newline at end of file diff --git a/stub-app-projects/mp-harmony/hvigorfile.ts b/stub-app-projects/mp-harmony/hvigorfile.ts index e11c598..7ee8158 100644 --- a/stub-app-projects/mp-harmony/hvigorfile.ts +++ b/stub-app-projects/mp-harmony/hvigorfile.ts @@ -3,8 +3,9 @@ import ascfPlugin, { signByBuildModePlugin } from '@atomicservice/ascf-toolkit-h export default { system: appTasks, /* Built-in plugin of Hvigor. It cannot be modified. */ - plugins:[ - ascfPlugin(), + plugins: [ + ascfPlugin({ disableSubpackages: false }), signByBuildModePlugin('default', 'release') // 需要 build-profile.json5 配置 signingConfigs 调试和发布的签名 - ] -} \ No newline at end of file + ], + modelVersion: '6.0.0' +} diff --git a/stub-app-projects/mp-harmony/oh-package.json5 b/stub-app-projects/mp-harmony/oh-package.json5 index e349f5d..58e620d 100644 --- a/stub-app-projects/mp-harmony/oh-package.json5 +++ b/stub-app-projects/mp-harmony/oh-package.json5 @@ -1,9 +1,9 @@ { - "modelVersion": "5.0.0", + "modelVersion": "6.0.0", "description": "Please describe the basic information.", "dependencies": {}, "devDependencies": { "@ohos/hypium": "1.0.21", "@ohos/hamock": "1.0.0" } -} +} \ No newline at end of file