From 60f315776e79ff5915b7a7e2dc5c4b141cbd8cea Mon Sep 17 00:00:00 2001 From: Anton Tarasov Date: Wed, 4 Dec 2024 18:16:20 +0300 Subject: [PATCH 1/2] Move index-full.d.ts to arkui-common --- arkoala/arkui-common/config/tsconfig.base.json | 2 +- arkoala/arkui-common/package.json | 2 +- arkoala/arkui-common/tsconfig-unmemoize-ts.json | 2 +- arkoala/arkui-common/tsconfig-unmemoize.json | 2 +- arkoala/arkui-common/tsconfig.json | 2 +- arkoala/{arkui => arkui-common}/types/index-full.d.ts | 0 arkoala/arkui/package.json | 1 - arkoala/arkui/src/index.ts | 2 +- arkoala/extension-component/tsconfig.json | 2 +- arkoala/framework/tsconfig-run-unmemoized.json | 2 +- arkoala/framework/tsconfig-unmemoize.json | 2 +- arkoala/framework/tsconfig.json | 2 +- arkoala/har/arkoala-har-bundle/tsconfig.json | 4 ++-- arkoala/loader/tsconfig-run-unmemoized.json | 2 +- arkoala/loader/tsconfig-unmemoize.json | 2 +- arkoala/loader/tsconfig.json | 2 +- 16 files changed, 15 insertions(+), 16 deletions(-) rename arkoala/{arkui => arkui-common}/types/index-full.d.ts (100%) diff --git a/arkoala/arkui-common/config/tsconfig.base.json b/arkoala/arkui-common/config/tsconfig.base.json index 8d6abcb47..5a5d7d573 100644 --- a/arkoala/arkui-common/config/tsconfig.base.json +++ b/arkoala/arkui-common/config/tsconfig.base.json @@ -1,6 +1,6 @@ { "files": [ - "../../arkui/types/index-full.d.ts" + "../types/index-full.d.ts" ], "compilerOptions": { "target": "es2020", diff --git a/arkoala/arkui-common/package.json b/arkoala/arkui-common/package.json index 3f44d5b0c..1a27c419e 100644 --- a/arkoala/arkui-common/package.json +++ b/arkoala/arkui-common/package.json @@ -24,7 +24,7 @@ "build/lib/**/*.js", "build/lib/**/*.d.ts", "!/build/lib/test/**", - "../arkui/types/index-full.d.ts", + "../arkui-common/types/index-full.d.ts", "config/**", "oh-package.json5" ], diff --git a/arkoala/arkui-common/tsconfig-unmemoize-ts.json b/arkoala/arkui-common/tsconfig-unmemoize-ts.json index 39029b667..3acf248d6 100644 --- a/arkoala/arkui-common/tsconfig-unmemoize-ts.json +++ b/arkoala/arkui-common/tsconfig-unmemoize-ts.json @@ -26,7 +26,7 @@ "src/arkts/**/*", ], "files": [ - "../arkui/types/index-full.d.ts" + "./types/index-full.d.ts" ], "references": [ { "path": "../../incremental/compiler-plugin" }, diff --git a/arkoala/arkui-common/tsconfig-unmemoize.json b/arkoala/arkui-common/tsconfig-unmemoize.json index 234de57ac..b8e21c78f 100644 --- a/arkoala/arkui-common/tsconfig-unmemoize.json +++ b/arkoala/arkui-common/tsconfig-unmemoize.json @@ -1,7 +1,7 @@ { "extends": "@koalaui/build-common/tsconfig.json", "files": [ - "../arkui/types/index-full.d.ts" + "./types/index-full.d.ts" ], "compilerOptions": { "outDir": "build/junk", diff --git a/arkoala/arkui-common/tsconfig.json b/arkoala/arkui-common/tsconfig.json index f7061b9e0..5a4fdb628 100644 --- a/arkoala/arkui-common/tsconfig.json +++ b/arkoala/arkui-common/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "@koalaui/build-common/tsconfig.json", "files": [ - "../arkui/types/index-full.d.ts" + "./types/index-full.d.ts" ], "compilerOptions": { "outDir": "build/lib", diff --git a/arkoala/arkui/types/index-full.d.ts b/arkoala/arkui-common/types/index-full.d.ts similarity index 100% rename from arkoala/arkui/types/index-full.d.ts rename to arkoala/arkui-common/types/index-full.d.ts diff --git a/arkoala/arkui/package.json b/arkoala/arkui/package.json index 588288627..943f18d3f 100644 --- a/arkoala/arkui/package.json +++ b/arkoala/arkui/package.json @@ -14,7 +14,6 @@ "*": { "ohos.*": ["./build/lib/src/shared/ohos.*"], "system.*": ["./build/lib/src/shared/system.*"], - "types/*": ["./types/*"], "*": ["./build/lib/src/*"] } }, diff --git a/arkoala/arkui/src/index.ts b/arkoala/arkui/src/index.ts index 792db4ae4..d0274865e 100644 --- a/arkoala/arkui/src/index.ts +++ b/arkoala/arkui/src/index.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -/// +/// import "@koalaui/arkui-common/enumImpl" export * from "./peer_events_checker" diff --git a/arkoala/extension-component/tsconfig.json b/arkoala/extension-component/tsconfig.json index c7ac0e938..351167ee0 100644 --- a/arkoala/extension-component/tsconfig.json +++ b/arkoala/extension-component/tsconfig.json @@ -20,7 +20,7 @@ ] }, "files": [ - "../arkui/types/index-full.d.ts" + "../arkui-common/types/index-full.d.ts" ], "exclude": [ "node_modules", "build", "dist", "lib", "src/ets/**/*.ts" diff --git a/arkoala/framework/tsconfig-run-unmemoized.json b/arkoala/framework/tsconfig-run-unmemoized.json index b3e8fc918..d3f9b17c5 100644 --- a/arkoala/framework/tsconfig-run-unmemoized.json +++ b/arkoala/framework/tsconfig-run-unmemoized.json @@ -1,7 +1,7 @@ { "extends": "@koalaui/build-common/tsconfig.json", "files": [ - "../arkui/types/index-full.d.ts" + "../arkui-common/types/index-full.d.ts" ], "compilerOptions": { "outDir": "build/unmemoized", diff --git a/arkoala/framework/tsconfig-unmemoize.json b/arkoala/framework/tsconfig-unmemoize.json index f97ef3a2c..f12b833f8 100644 --- a/arkoala/framework/tsconfig-unmemoize.json +++ b/arkoala/framework/tsconfig-unmemoize.json @@ -1,7 +1,7 @@ { "extends": "@koalaui/build-common/tsconfig.json", "files": [ - "../arkui/types/index-full.d.ts" + "../arkui-common/types/index-full.d.ts" ], "compilerOptions": { "plugins": [ diff --git a/arkoala/framework/tsconfig.json b/arkoala/framework/tsconfig.json index 06e8cb5d3..9c5109c7e 100644 --- a/arkoala/framework/tsconfig.json +++ b/arkoala/framework/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "@koalaui/build-common/tsconfig.json", "files": [ - "../arkui/types/index-full.d.ts" + "../arkui-common/types/index-full.d.ts" ], "compilerOptions": { "plugins": [ diff --git a/arkoala/har/arkoala-har-bundle/tsconfig.json b/arkoala/har/arkoala-har-bundle/tsconfig.json index bf23c2ed2..1609f1ec2 100644 --- a/arkoala/har/arkoala-har-bundle/tsconfig.json +++ b/arkoala/har/arkoala-har-bundle/tsconfig.json @@ -13,10 +13,10 @@ } }, "files": [ - "../../arkui/types/index-full.d.ts" + "../../arkui-common/types/index-full.d.ts" ], "include": [ "bundle.d.ts", - "../../arkui/types/index-full.d.ts" + "../../arkui-common/types/index-full.d.ts" ] } \ No newline at end of file diff --git a/arkoala/loader/tsconfig-run-unmemoized.json b/arkoala/loader/tsconfig-run-unmemoized.json index 7c01a6622..f9bb72539 100644 --- a/arkoala/loader/tsconfig-run-unmemoized.json +++ b/arkoala/loader/tsconfig-run-unmemoized.json @@ -32,7 +32,7 @@ }, "files": [ - "../arkui/types/index-full.d.ts" + "../arkui-common/types/index-full.d.ts" ], "exclude": [ "node_modules", "build", "dist", "lib", "src/**/*.ts" diff --git a/arkoala/loader/tsconfig-unmemoize.json b/arkoala/loader/tsconfig-unmemoize.json index 94c478f6b..34df8cdeb 100644 --- a/arkoala/loader/tsconfig-unmemoize.json +++ b/arkoala/loader/tsconfig-unmemoize.json @@ -31,7 +31,7 @@ } }, "files": [ - "../arkui/types/index-full.d.ts" + "../arkui-common/types/index-full.d.ts" ], "exclude": [ "node_modules", "build", "dist", "lib", "src/ets/**/*.ts" diff --git a/arkoala/loader/tsconfig.json b/arkoala/loader/tsconfig.json index d1eef4c8d..dd795262e 100644 --- a/arkoala/loader/tsconfig.json +++ b/arkoala/loader/tsconfig.json @@ -25,7 +25,7 @@ } }, "files": [ - "../arkui/types/index-full.d.ts" + "../arkui-common/types/index-full.d.ts" ], "exclude": [ "node_modules", "build", "dist", "lib", "src/ets/**/*.ts" -- Gitee From 2ad228b64d933a310bd1ef0d9c8e4c7a9dd70474 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Thu, 5 Dec 2024 12:35:32 +0300 Subject: [PATCH 2/2] fix index-full.d.ts packing Signed-off-by: Sergey Malenkov --- arkoala/arkui-common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkoala/arkui-common/package.json b/arkoala/arkui-common/package.json index 1a27c419e..bffff56b9 100644 --- a/arkoala/arkui-common/package.json +++ b/arkoala/arkui-common/package.json @@ -24,7 +24,7 @@ "build/lib/**/*.js", "build/lib/**/*.d.ts", "!/build/lib/test/**", - "../arkui-common/types/index-full.d.ts", + "types/index-full.d.ts", "config/**", "oh-package.json5" ], -- Gitee