From f5a4d9ca97fce92f76b6975246a94f94ef0cbe2b Mon Sep 17 00:00:00 2001 From: lWX1337837 Date: Mon, 9 Dec 2024 14:33:24 +0300 Subject: [PATCH 1/2] remove deprecated/unused code --- arkoala/ets-plugin/src/ApiUtils.ts | 2 -- arkoala/ets-plugin/src/Importer.ts | 1 - arkoala/framework/native/src/generated/bridge_custom.cc | 2 -- 3 files changed, 5 deletions(-) diff --git a/arkoala/ets-plugin/src/ApiUtils.ts b/arkoala/ets-plugin/src/ApiUtils.ts index 3b0a91280..0f231ea7f 100644 --- a/arkoala/ets-plugin/src/ApiUtils.ts +++ b/arkoala/ets-plugin/src/ApiUtils.ts @@ -22,7 +22,6 @@ export function parameter( initializer?: ts.Expression ) { return ts.factory.createParameterDeclaration( - undefined, undefined, undefined, name, @@ -38,7 +37,6 @@ export function optionalParameter( initializer?: ts.Expression ) { return ts.factory.createParameterDeclaration( - undefined, undefined, undefined, name, diff --git a/arkoala/ets-plugin/src/Importer.ts b/arkoala/ets-plugin/src/Importer.ts index 69de0a7b1..480a9192c 100644 --- a/arkoala/ets-plugin/src/Importer.ts +++ b/arkoala/ets-plugin/src/Importer.ts @@ -319,7 +319,6 @@ export class Importer { )) return ts.factory.createImportDeclaration( - undefined, undefined, ts.factory.createImportClause( false, diff --git a/arkoala/framework/native/src/generated/bridge_custom.cc b/arkoala/framework/native/src/generated/bridge_custom.cc index 3bcbbba6a..37147acda 100644 --- a/arkoala/framework/native/src/generated/bridge_custom.cc +++ b/arkoala/framework/native/src/generated/bridge_custom.cc @@ -461,8 +461,6 @@ KVMObjectHandle impl_LoadUserView(KVMContext vm, const KStringPtr& viewClass, co #elif KOALA_USE_PANDA_VM EtsEnv* env = reinterpret_cast(vm); std:: string className(viewClass.c_str()); - // TODO: hack, fix it! - if (className == "ViewLoaderApp") className = "Page.App"; std::replace(className.begin(), className.end(), '.', '/'); ets_class viewClassClass = env->FindClass(className.c_str()); if (!viewClassClass) { -- Gitee From 49dc2bf9569f8c863ffc117c14f5c063da2403f7 Mon Sep 17 00:00:00 2001 From: Igor Loginov Date: Tue, 17 Dec 2024 11:25:17 +0300 Subject: [PATCH 2/2] fix ci --- arkoala-arkts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index 6ec9f31d3..40671402e 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -58,7 +58,7 @@ "build:shopping": "npm run build:shopping --prefix shopping && mkdir -p ./build && cp -r shopping/build/shopping.abc ./build/", "run:node:user": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:TrivialApp", "run:node:shopping": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:ShoppingApp", - "run:node:ci": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda 10", + "run:node:ci": "ACE_LIBRARY_PATH=build PANDA_HOME=../incremental/tools/panda/node_modules/@panda/sdk node build/index.js panda:TrivialApp 10", "trivial:all:node": "npm run compile:native:node-host && npm run build:arkoala && npm run build:user && npm run build:loader:node && npm run run:node:user", "trivial:node": "npm run build:user && npm run build:loader:node && npm run run:node:user", "shopping:all:node": "npm run compile:native:node-host && npm run build:arkoala && npm run build:shopping && npm run build:loader:node && npm run run:node:shopping", -- Gitee