From ed2436c040d236af93fb2c0bc94e78147a2650b6 Mon Sep 17 00:00:00 2001 From: Korobeinikov Evgeny Date: Thu, 17 Jul 2025 16:45:59 +0300 Subject: [PATCH] fix deps Signed-off-by: Korobeinikov Evgeny --- arkoala-arkts/package.json | 1 - incremental/package.json | 3 +-- interop/package.json | 10 +++++----- ui2abc/libarkts/package.json | 2 +- ui2abc/memo-plugin/demo/package.json | 4 ++-- ui2abc/package.json | 2 +- ui2abc/tests-memo/package.json | 4 ++-- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/arkoala-arkts/package.json b/arkoala-arkts/package.json index fc681569f..9d337a028 100644 --- a/arkoala-arkts/package.json +++ b/arkoala-arkts/package.json @@ -21,7 +21,6 @@ "../interop" ], "devDependencies": { - "@koalaui/ets-tsc": "4.9.5-r5", "@types/mocha": "^9.1.0", "bin-links": "^4.0.4", "chalk": "^4.1.2", diff --git a/incremental/package.json b/incremental/package.json index e87254b57..89ca7170a 100644 --- a/incremental/package.json +++ b/incremental/package.json @@ -26,8 +26,7 @@ "build": "npm run build --prefix compat && npm run build --prefix common && npm run build --prefix runtime && npm run link" }, "dependencies": { - "@koalaui/fast-arktsc": "1.5.15", - "@koalaui/ets-tsc": "4.9.5-r5", + "@koalaui/fast-arktsc": "file:../ui2abc/fast-arktsc", "circular-dependency-plugin": "^5.2.2", "copy-webpack-plugin": "^12.0.2", "source-map-loader": "^5.0.0", diff --git a/interop/package.json b/interop/package.json index bcdd74284..be8ac3619 100644 --- a/interop/package.json +++ b/interop/package.json @@ -40,8 +40,8 @@ }, "scripts": { "clean": "rimraf dist build types", - "compile": "ets-tsc -b .", - "compile:release": "ets-tsc -b .", + "compile": "tsc -b .", + "compile:release": "tsc -b .", "build:interop": "npm run build:interop:inc", "build:interop:inc": "fast-arktsc --config ./ui2abcconfig.json --compiler ../incremental/tools/panda/arkts/arktsc --link-name ./build/interop.abc && ninja ${NINJA_OPTIONS} -f build/abc/build.ninja", "build": "node ../ui2abc/fast-arktsc --config ./ui2abcconfig.json --compiler ../incremental/tools/panda/arkts/ui2abc --link-name ./build/interop.abc --simultaneous && ninja ${NINJA_OPTIONS} -f build/abc/build.ninja", @@ -53,7 +53,7 @@ "test:node": "mocha", "test:coverage": "npm run test:node:coverage", "test": "npm run test:node", - "watch": "ets-tsc -b . --watch", + "watch": "tsc -b . --watch", "prepare:compiler": "test $(node -e \"console.log(process.platform)\") != \"linux\" && npm run --prefix ../arkoala-arkts/ohos-sdk download || npm run install:toolchain --prefix ../arkoala-arkts/tools/compiler", "prepare:arm64": "npm run prepare:compiler && npm run install:sysroot:arm64 --prefix ../arkoala-arkts/tools/compiler", "prepare:arm32": "npm run prepare:compiler && npm run install:sysroot:arm32 --prefix ../arkoala-arkts/tools/compiler", @@ -110,7 +110,7 @@ "eslint": "^8.13.0", "eslint-plugin-unused-imports": "^2.0.0", "source-map-support": "^0.5.21", - "@koalaui/ets-tsc": "4.9.5-r5", - "@koalaui/fast-arktsc": "1.5.15" + "typescript": "4.9.5", + "@koalaui/fast-arktsc": "file:../ui2abc/fast-arktsc" } } \ No newline at end of file diff --git a/ui2abc/libarkts/package.json b/ui2abc/libarkts/package.json index 0918bd09e..bf6fe7fa3 100644 --- a/ui2abc/libarkts/package.json +++ b/ui2abc/libarkts/package.json @@ -29,7 +29,7 @@ "panda_sdk_version": "next" }, "dependencies": { - "@koalaui/ets-tsc": "4.9.5-r5", + "@koalaui/ets-tsc": "4.9.5-r6", "@koalaui/build-common": "1.7.6+devel", "@koalaui/compat": "1.7.6+devel", "@koalaui/common": "1.7.6+devel", diff --git a/ui2abc/memo-plugin/demo/package.json b/ui2abc/memo-plugin/demo/package.json index 35a9480be..00ec59fa0 100644 --- a/ui2abc/memo-plugin/demo/package.json +++ b/ui2abc/memo-plugin/demo/package.json @@ -6,7 +6,7 @@ "disasm": "$(find build -name '*.abc' -exec ../../../incremental/tools/panda/arkts/arkdisasm {} \\;)" }, "devDependencies": { - "@koalaui/ets-tsc": "4.9.5-r5", - "@koalaui/fast-arktsc": "1.5.15" + "@koalaui/ets-tsc": "4.9.5-r6", + "@koalaui/fast-arktsc": "file:../../fast-arktsc" } } diff --git a/ui2abc/package.json b/ui2abc/package.json index 1b58c66a8..4883745d1 100644 --- a/ui2abc/package.json +++ b/ui2abc/package.json @@ -16,7 +16,7 @@ "../incremental/compat" ], "devDependencies": { - "@koalaui/ets-tsc": "4.9.5-r5", + "@koalaui/ets-tsc": "4.9.5-r6", "@koalaui/harness": "1.7.6+devel", "@types/mocha": "^9.1.0", "bin-links": "^4.0.4", diff --git a/ui2abc/tests-memo/package.json b/ui2abc/tests-memo/package.json index 021000e10..65bf94bae 100644 --- a/ui2abc/tests-memo/package.json +++ b/ui2abc/tests-memo/package.json @@ -27,9 +27,9 @@ "@koalaui/build-common": "1.7.6+devel", "@koalaui/runtime": "1.7.6+devel", "@koalaui/annotate": "file:../annotate", - "@koalaui/ets-tsc": "4.9.5-r5", + "@koalaui/ets-tsc": "4.9.5-r6", "@koalaui/compiler-plugin": "1.7.6+devel", - "@koalaui/fast-arktsc": "1.7.6+devel" + "@koalaui/fast-arktsc": "file:../fast-arktsc" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.20.0", -- Gitee