From bd87e4666c2c53c1ffb86c2d7964b0acc0f7fa9f Mon Sep 17 00:00:00 2001
From: Medvedev Aleksandr <medvedev.aleksandr1@huawei.com>
Date: Fri, 18 Jul 2025 10:40:40 +0300
Subject: [PATCH 1/2] Removed npm install from gn files

---
 arkoala-arkts/BUILD.gn   |  8 --------
 incremental/BUILD.gn     |  8 --------
 interop/BUILD.gn         |  9 ---------
 ui2abc/BUILD.gn          |  8 --------
 ui2abc/libarkts/BUILD.gn | 11 -----------
 5 files changed, 44 deletions(-)

diff --git a/arkoala-arkts/BUILD.gn b/arkoala-arkts/BUILD.gn
index da82f70ac..93f176679 100644
--- a/arkoala-arkts/BUILD.gn
+++ b/arkoala-arkts/BUILD.gn
@@ -141,14 +141,6 @@ ohos_shared_library("vmloader") {
     external_deps = [ "hilog:hilog_ndk" ]
 }
 
-npm_cmd("arkoala_install") {
-    outputs = [
-        "$target_out_dir/arkoala_install"
-    ]
-    project_path = rebase_path(".")
-    install = true
-}
-
 npm_cmd("arkui.abc") {
     outputs = [
         "$target_out_dir/arkui.abc"
diff --git a/incremental/BUILD.gn b/incremental/BUILD.gn
index 098de2a8e..416534c81 100644
--- a/incremental/BUILD.gn
+++ b/incremental/BUILD.gn
@@ -21,14 +21,6 @@ koala_root = ".."
 node_version = "v16.20.2"
 host_arch = "${host_os}-${host_cpu}"
 
-npm_cmd("incremental_install") {
-    outputs = [
-        "$target_out_dir/incremental_install"
-    ]
-    project_path = rebase_path(".")
-    install = true
-}
-
 npm_cmd("incremental.abc") {
     outputs = [
         "$target_out_dir/incremental.abc"
diff --git a/interop/BUILD.gn b/interop/BUILD.gn
index aecbf5cde..036205f6b 100644
--- a/interop/BUILD.gn
+++ b/interop/BUILD.gn
@@ -21,14 +21,6 @@ interop_root = ""
 node_version = "v16.20.2"
 host_arch = "${host_os}-${host_cpu}"
 
-npm_cmd("interop_install") {
-    outputs = [
-        "$target_out_dir/interop_install"
-    ]
-    project_path = rebase_path(".")
-    install = true
-}
-
 npm_cmd("interop.abc") {
     outputs = [
         "$target_out_dir/interop.abc"
@@ -37,7 +29,6 @@ npm_cmd("interop.abc") {
     run_tasks = [ "build:interop" ]
 
     deps = [
-        ":interop_install",
         "../ui2abc:fast_arktsc_build"
     ]
 
diff --git a/ui2abc/BUILD.gn b/ui2abc/BUILD.gn
index 7b7c5449d..d98b2e3e4 100644
--- a/ui2abc/BUILD.gn
+++ b/ui2abc/BUILD.gn
@@ -30,14 +30,6 @@ npm_cmd("fast_arktsc_build") {
     run_tasks = [ "compile" ]
 }
 
-npm_cmd("ui2abc_install") {
-    outputs = [
-        "$target_out_dir/ui2abc_install"
-    ]
-    project_path = rebase_path(".")
-    install = true
-}
-
 npm_cmd("ui2abc_build") {
     outputs = [
         "$target_out_dir/MemoTransformer.js"
diff --git a/ui2abc/libarkts/BUILD.gn b/ui2abc/libarkts/BUILD.gn
index 16529d37f..f7de04600 100644
--- a/ui2abc/libarkts/BUILD.gn
+++ b/ui2abc/libarkts/BUILD.gn
@@ -210,17 +210,6 @@ npm_cmd("regenerate") {
     run_tasks = [ "regenerate:ohos" ]
 }
 
-npm_cmd("libarkts_install") {
-    outputs = [
-        "$target_out_dir/libarkts_install"
-    ]
-    deps = [
-        "$ui2abc_root:ui2abc_install"
-    ]
-    project_path = rebase_path(".")
-    install = true
-}
-
 npm_cmd("es2panda.js") {
     outputs = [
         "$target_out_dir/es2panda.js"
-- 
Gitee


From 18dcf6ccd29dbe672a361e9c645d8f6d0493bd6a Mon Sep 17 00:00:00 2001
From: Medvedev Aleksandr <medvedev.aleksandr1@huawei.com>
Date: Tue, 29 Jul 2025 10:58:47 +0300
Subject: [PATCH 2/2] npm i workaround

---
 tools/mirror.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mirror.mjs b/tools/mirror.mjs
index d5aabd87b..393c5159d 100644
--- a/tools/mirror.mjs
+++ b/tools/mirror.mjs
@@ -37,7 +37,7 @@ function generatePackageJson(configPath) {
         "private": true,
         "//": "DO NOT ADD dependencies or devDependencies clauses to this level! Keep subfolders autonomous.",
         "scripts": {
-          "prepare": `${ projects.map(name => { return `cd ${name} && npm i && cd ..`}).join(" && ") }`,
+          "prepare": `${ projects.map(name => { return `cd ${name} && (npm i || npm i) && cd ..`}).join(" && ") }`,
         }
     }
       
-- 
Gitee