diff --git a/arkoala/arkui-common/config/tsconfig.base.json b/arkoala/arkui-common/config/tsconfig.base.json index 8d6abcb47df4abcaec79a1b0749f0894be2103c0..5a5d7d5737c32bf5c142d2dfd15f5df02816d8f3 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 3f44d5b0c954854e3f3ccdf75f542171bf1e3546..bffff56b90e8b0659be2aa5a85388948608b3e8a 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", + "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 39029b6671dabe471ed2f70a0916a8e3a43d65fc..3acf248d6e0e6de7b052eccd88f758fe52056531 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 234de57acae3abc1745dcdd2f0ea5823fabd7d19..b8e21c78f4da9112e05130ffa64985130f90d880 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 f7061b9e00e0f03e81ce3f80b4c24133a6e2727c..5a4fdb62855e171e662d4587885ef15c2c2afae3 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 5882886274e283b9c042afddff05e7950dcd92fc..943f18d3f148be9ac5aec7225503844d1998fc4a 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 792db4ae438c66b4345387bd1266b2fc477383a7..d0274865efbc57cb8446948c2a872c8b48b8a7b9 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 c7ac0e93879ff107b04297ff8967f63b5701bd1a..351167ee0219bb8e4f5eededd226dc18220c74e5 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 b3e8fc918e123e801d45e463520699779f48652f..d3f9b17c54fcaad80bb5102c568ddf7185107a38 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 f97ef3a2cbf8cf09c078ca48a8191cb3d7512703..f12b833f8bc5b81be34236836309bb1f0e083a2e 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 06e8cb5d37e0f02c2de911d6be3d69f5b5b68ecc..9c5109c7e829d6a017454b0523eec2751e8b000d 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 bf23c2ed2e8fa376bb2897401fc530f34ae338ba..1609f1ec2c9111633274d7190cd9dd7f9581ddc3 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 7c01a6622cd3ad92fafd2d69b609dbdfd7b2ac60..f9bb725394a4755600bf2bd177d1a30b93fe4cbe 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 94c478f6ba1cfd2917fc144670822ee4174b0797..34df8cdeb8bf67e42c07b3e4b9f42f093d5c9ba9 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 d1eef4c8d05b0b82254eaf3a0621813b2fa80be5..dd795262ed1a0639f28aa5d2af61476c0c38d4f2 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"