diff --git a/web/src/app/browser/tsconfig.json b/web/src/app/browser/tsconfig.json index 849055cc97..2d4a1a481c 100644 --- a/web/src/app/browser/tsconfig.json +++ b/web/src/app/browser/tsconfig.json @@ -18,7 +18,7 @@ "include": [ "**/*.ts" ], "references": [ - { "path": "../../../../common/web/keyman-version" }, - { "path": "../../../../common/web/utils" } + { "path": "../../engine/attachment" }, + { "path": "../../engine/main" } ] } diff --git a/web/src/app/webview/tsconfig.json b/web/src/app/webview/tsconfig.json index 043cb3649b..2a35140eb7 100644 --- a/web/src/app/webview/tsconfig.json +++ b/web/src/app/webview/tsconfig.json @@ -18,7 +18,6 @@ "include": [ "**/*.ts" ], "references": [ - { "path": "../../../../common/web/keyman-version" }, - { "path": "../../../../common/web/utils" } + { "path": "../../engine/main" } ] } diff --git a/web/src/engine/dom-utils/tsconfig.json b/web/src/engine/dom-utils/tsconfig.json index 52fe9ef829..e73aa1f76f 100644 --- a/web/src/engine/dom-utils/tsconfig.json +++ b/web/src/engine/dom-utils/tsconfig.json @@ -16,4 +16,9 @@ }, "include": [ "src/**/*.ts" ], + + "references": [ + { "path": "../../../../common/web/keyboard-processor" }, + { "path": "../../../../common/web/utils" } + ] } diff --git a/web/src/engine/element-wrappers/tsconfig.json b/web/src/engine/element-wrappers/tsconfig.json index ba9b8fda94..3dea240aed 100644 --- a/web/src/engine/element-wrappers/tsconfig.json +++ b/web/src/engine/element-wrappers/tsconfig.json @@ -18,8 +18,6 @@ "include": [ "src/**/*.ts" ], "references": [ - // { "path": "../../../../common/web/keyman-version" }, - // { "path": "../../../../common/web/utils" }, { "path": "../../../../common/web/keyboard-processor" } ] } diff --git a/web/src/engine/events/tsconfig.json b/web/src/engine/events/tsconfig.json index 4b0fad269b..83a3238008 100644 --- a/web/src/engine/events/tsconfig.json +++ b/web/src/engine/events/tsconfig.json @@ -16,4 +16,8 @@ }, "include": [ "src/**/*.ts" ], + + "references": [ + { "path": "../../../../common/web/utils" } + ] } diff --git a/web/src/engine/main/tsconfig.json b/web/src/engine/main/tsconfig.json index 09b75894d8..29446647d7 100644 --- a/web/src/engine/main/tsconfig.json +++ b/web/src/engine/main/tsconfig.json @@ -18,8 +18,10 @@ "include": [ "src/**/*.ts" ], "references": [ - // { "path": "../../../../common/web/keyman-version" }, - // { "path": "../../../../common/web/utils" }, - { "path": "../../../../common/web/keyboard-processor" } + { "path": "../../../../common/web/input-processor" }, + { "path": "../device-detect" }, + { "path": "../osk" }, + { "path": "../package-cache" }, + { "path": "../paths" }, ] } diff --git a/web/src/engine/osk/tsconfig.json b/web/src/engine/osk/tsconfig.json index 91f0cf0e29..fe6a12bdce 100644 --- a/web/src/engine/osk/tsconfig.json +++ b/web/src/engine/osk/tsconfig.json @@ -18,7 +18,8 @@ "include": [ "src/**/*.ts" ], "references": [ - { "path": "../../../../common/web/keyboard-processor" }, - { "path": "../dom-utils" } + { "path": "../../../../common/web/input-processor" }, + { "path": "../dom-utils" }, + { "path": "../events" } ] } diff --git a/web/src/engine/package-cache/tsconfig.json b/web/src/engine/package-cache/tsconfig.json index e592b01fc5..84dc705d64 100644 --- a/web/src/engine/package-cache/tsconfig.json +++ b/web/src/engine/package-cache/tsconfig.json @@ -18,7 +18,7 @@ "include": [ "src/**/*.ts" ], "references": [ - { "path": "../../../../common/web/keyboard-processor" }, - { "path": "../dom-utils" } + { "path": "../../../../common/web/input-processor" }, + { "path": "../paths" } ] } diff --git a/web/src/engine/paths/tsconfig.json b/web/src/engine/paths/tsconfig.json index 0ec649ff28..272527be3e 100644 --- a/web/src/engine/paths/tsconfig.json +++ b/web/src/engine/paths/tsconfig.json @@ -18,7 +18,8 @@ "include": [ "**/*.ts" ], "references": [ - { "path": "../../../../common/web/keyman-version" }, - { "path": "../../../../common/web/utils" } + // We want OSK to be free from the need to reference this child project for its paths definitions. + // There are a number of extra components here the OSK doesn't need. + { "path": "../osk" } ] } diff --git a/web/src/tsconfig.all.json b/web/src/tsconfig.all.json index 727a2843ea..93d6ca34c9 100644 --- a/web/src/tsconfig.all.json +++ b/web/src/tsconfig.all.json @@ -23,8 +23,8 @@ }, "files": [], "references": [ - { "path": "app/embed" }, - { "path": "app/web" }, + { "path": "app/browser" }, + { "path": "app/webview" }, { "path": "app/ui" } ], } \ No newline at end of file