From fd70dcc47e767387009111bf76c0cd96ec8aeb86 Mon Sep 17 00:00:00 2001 From: grebelnik Date: Wed, 4 Dec 2024 21:51:42 +0500 Subject: [PATCH 1/2] Fix compilation --- arkoala/arkui/src/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/arkoala/arkui/src/index.ts b/arkoala/arkui/src/index.ts index adf7fbaca..1af02e32a 100644 --- a/arkoala/arkui/src/index.ts +++ b/arkoala/arkui/src/index.ts @@ -65,7 +65,6 @@ export * from "./shared/ohos.matrix4" export * from "./ArkNavDestination" export * from "./ArkGesture" export * from "./ArkCanvas" -export * from "./ArkNavigation" export * from "./ArkGauge" export * from "./ArkBadge" export * from "./ArkHyperlink" -- Gitee From 182e605852796ccb1d2e4dc6ea272f33a7092d4a Mon Sep 17 00:00:00 2001 From: grebelnik Date: Fri, 6 Dec 2024 16:12:44 +0500 Subject: [PATCH 2/2] Clean arkui files before generation --- arkoala/tools/peer-generator/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arkoala/tools/peer-generator/package.json b/arkoala/tools/peer-generator/package.json index 0868e1354..f1286fd45 100644 --- a/arkoala/tools/peer-generator/package.json +++ b/arkoala/tools/peer-generator/package.json @@ -12,11 +12,12 @@ "generate:ts": "npx @azanat/idlize@$npm_package_config_idlize_version --dts2peer --input-dir $npm_package_config_input_dir --arkoala-destination ../../.. --api-version $npm_package_config_api_version --generator-target arkoala --language=ts --only-integrated", "generate:arkts": "npx @azanat/idlize@$npm_package_config_idlize_version --dts2peer --only-integrated --input-dir $npm_package_config_input_dir --arkoala-destination ../../.. --api-version $npm_package_config_api_version --generator-target arkoala --language=arkts --need-interfaces", "generate:all": "npm run generate:ts && npm run generate:arkts", - "install:current": "npm install idlize-current && npm run compile --prefix node_modules/idlize-current", + "install:current": "npm run clean:arkui && npm install idlize-current && npm run compile --prefix node_modules/idlize-current", "generate:ts:current": "npm run install:current && node node_modules/idlize-current --dts2peer --input-dir $npm_package_config_input_dir --arkoala-destination ../../.. --api-version $npm_package_config_api_version --generator-target arkoala --language=ts --only-integrated", "generate:arkts:current": "npm run install:current && node node_modules/idlize-current --dts2peer --input-dir $npm_package_config_input_dir --arkoala-destination ../../.. --api-version $npm_package_config_api_version --generator-target arkoala --language=arkts --only-integrated --need-interfaces", "generate:arkts:subset:current": "npm run install:current && node node_modules/idlize-current --dts2peer --input-dir $npm_package_config_input_dir_subset --arkoala-destination ../../.. --api-version $npm_package_config_api_version --generator-target arkoala --language=arkts --only-integrated --need-interfaces", - "generate:all:current": "npm run generate:arkts:subset:current && npm run generate:ts:current" + "generate:all:current": "npm run generate:arkts:subset:current && npm run generate:ts:current", + "clean:arkui": "ls -d $PWD/../../arkui/src/peers/* | grep -e '.*Ark.*Peer\\.ts' -e '.*ArkIndicatorComponentPeer.ts' -e '.*ArkNavigationPeer.ts' | xargs rm && ls -d $PWD/../../arkui/src/* | grep -e '.*Ark.*Materialized\\.ts' -e '.*ArkIndicatorcomponent.ts' -e '.*ArkNavigation.ts' -e 'ContentModifier.ts' -e 'Optional.ts' | xargs rm" }, "dependencies": { "idlize-current": "file:../../../.." -- Gitee