From b7d45bfefa8e360bffd06495b225f0f3ed38b7ac Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sat, 6 Jun 2026 18:24:02 +0000 Subject: [PATCH] Revert tsconfig path mapping changes for primitives folder Primitives remain under src/common/, so common/* aliases do not need a separate primitives entry. Restore original tsconfig paths. Co-authored-by: Daniel Imms --- addons/addon-attach/test/tsconfig.json | 3 +-- addons/addon-clipboard/test/tsconfig.json | 3 +-- addons/addon-fit/test/tsconfig.json | 3 +-- addons/addon-image/src/tsconfig.json | 3 +-- addons/addon-image/test/tsconfig.json | 3 +-- addons/addon-progress/src/tsconfig.json | 3 +-- addons/addon-progress/test/tsconfig.json | 3 +-- addons/addon-search/src/tsconfig.json | 3 +-- addons/addon-search/test/tsconfig.json | 3 +-- addons/addon-serialize/benchmark/tsconfig.json | 3 +-- addons/addon-serialize/src/tsconfig.json | 3 +-- addons/addon-serialize/test/tsconfig.json | 3 +-- .../addon-unicode-graphemes/benchmark/tsconfig.json | 3 +-- addons/addon-unicode-graphemes/src/tsconfig.json | 3 +-- addons/addon-unicode-graphemes/test/tsconfig.json | 3 +-- addons/addon-unicode11/src/tsconfig.json | 3 +-- addons/addon-unicode11/test/tsconfig.json | 3 +-- addons/addon-web-fonts/test/tsconfig.json | 3 +-- addons/addon-web-links/test/tsconfig.json | 3 +-- addons/addon-webgl/src/tsconfig.json | 3 +-- addons/addon-webgl/test/tsconfig.json | 3 +-- src/common/tsconfig.json | 13 ++----------- test/benchmark/tsconfig.json | 3 +-- 23 files changed, 24 insertions(+), 55 deletions(-) diff --git a/addons/addon-attach/test/tsconfig.json b/addons/addon-attach/test/tsconfig.json index ed2744ad1..ded3933bd 100644 --- a/addons/addon-attach/test/tsconfig.json +++ b/addons/addon-attach/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -41,4 +40,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-clipboard/test/tsconfig.json b/addons/addon-clipboard/test/tsconfig.json index ed2744ad1..ded3933bd 100644 --- a/addons/addon-clipboard/test/tsconfig.json +++ b/addons/addon-clipboard/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -41,4 +40,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-fit/test/tsconfig.json b/addons/addon-fit/test/tsconfig.json index ed2744ad1..ded3933bd 100644 --- a/addons/addon-fit/test/tsconfig.json +++ b/addons/addon-fit/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -41,4 +40,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-image/src/tsconfig.json b/addons/addon-image/src/tsconfig.json index f3b414cf5..9a5d24c1f 100644 --- a/addons/addon-image/src/tsconfig.json +++ b/addons/addon-image/src/tsconfig.json @@ -13,8 +13,7 @@ ], "paths": { "browser/*": [ "../../../src/browser/*" ], - "common/*": [ "../../../src/common/primitives/*", - "../../../src/common/*" ], + "common/*": [ "../../../src/common/*" ], "@xterm/addon-image": [ "../typings/addon-image.d.ts" ], "*": [ "./*" ] } diff --git a/addons/addon-image/test/tsconfig.json b/addons/addon-image/test/tsconfig.json index ed2744ad1..ded3933bd 100644 --- a/addons/addon-image/test/tsconfig.json +++ b/addons/addon-image/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -41,4 +40,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-progress/src/tsconfig.json b/addons/addon-progress/src/tsconfig.json index c51825197..953888e27 100644 --- a/addons/addon-progress/src/tsconfig.json +++ b/addons/addon-progress/src/tsconfig.json @@ -16,7 +16,6 @@ ], "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -39,4 +38,4 @@ "path": "../../../src/common" } ] -} +} \ No newline at end of file diff --git a/addons/addon-progress/test/tsconfig.json b/addons/addon-progress/test/tsconfig.json index ed2744ad1..ded3933bd 100644 --- a/addons/addon-progress/test/tsconfig.json +++ b/addons/addon-progress/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -41,4 +40,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-search/src/tsconfig.json b/addons/addon-search/src/tsconfig.json index ec2092ab2..e23ef0d3e 100644 --- a/addons/addon-search/src/tsconfig.json +++ b/addons/addon-search/src/tsconfig.json @@ -16,7 +16,6 @@ ], "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -39,4 +38,4 @@ "path": "../../../src/browser" } ] -} +} \ No newline at end of file diff --git a/addons/addon-search/test/tsconfig.json b/addons/addon-search/test/tsconfig.json index ed2744ad1..ded3933bd 100644 --- a/addons/addon-search/test/tsconfig.json +++ b/addons/addon-search/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -41,4 +40,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-serialize/benchmark/tsconfig.json b/addons/addon-serialize/benchmark/tsconfig.json index aaf7d2b89..ad7ee6d04 100644 --- a/addons/addon-serialize/benchmark/tsconfig.json +++ b/addons/addon-serialize/benchmark/tsconfig.json @@ -12,8 +12,7 @@ "target": "es2021", "module": "nodenext", "paths": { - "common/*": ["../../../src/common/primitives/*", - "../../../src/common/*"], + "common/*": ["../../../src/common/*"], "browser/*": ["../../../src/browser/*"], "SerializeAddon": ["../src/SerializeAddon"], "@xterm/addon-serialize": [ diff --git a/addons/addon-serialize/src/tsconfig.json b/addons/addon-serialize/src/tsconfig.json index 3c12df8b1..7cbb5c235 100644 --- a/addons/addon-serialize/src/tsconfig.json +++ b/addons/addon-serialize/src/tsconfig.json @@ -12,7 +12,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -40,4 +39,4 @@ "path": "../../../src/browser" } ] -} +} \ No newline at end of file diff --git a/addons/addon-serialize/test/tsconfig.json b/addons/addon-serialize/test/tsconfig.json index 7eea71005..d381887de 100644 --- a/addons/addon-serialize/test/tsconfig.json +++ b/addons/addon-serialize/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -38,4 +37,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-unicode-graphemes/benchmark/tsconfig.json b/addons/addon-unicode-graphemes/benchmark/tsconfig.json index c6c9cbc2a..1781ca318 100644 --- a/addons/addon-unicode-graphemes/benchmark/tsconfig.json +++ b/addons/addon-unicode-graphemes/benchmark/tsconfig.json @@ -9,8 +9,7 @@ "target": "es2015", "module": "nodenext", "paths": { - "common/*": ["../../../src/common/primitives/*", - "../../../src/common/*"], + "common/*": ["../../../src/common/*"], "browser/*": ["../../../src/browser/*"], "UnicodeGraphemeProvider": ["../src/UnicodeGraphemeProvider"], "@xterm/addon-unicode-graphemes": [ diff --git a/addons/addon-unicode-graphemes/src/tsconfig.json b/addons/addon-unicode-graphemes/src/tsconfig.json index 3fb909b60..6f654e4e1 100644 --- a/addons/addon-unicode-graphemes/src/tsconfig.json +++ b/addons/addon-unicode-graphemes/src/tsconfig.json @@ -13,7 +13,6 @@ "strict": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "@xterm/addon-unicode-graphemes": [ @@ -33,4 +32,4 @@ "path": "../../../src/common" } ] -} +} \ No newline at end of file diff --git a/addons/addon-unicode-graphemes/test/tsconfig.json b/addons/addon-unicode-graphemes/test/tsconfig.json index 7eea71005..d381887de 100644 --- a/addons/addon-unicode-graphemes/test/tsconfig.json +++ b/addons/addon-unicode-graphemes/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -38,4 +37,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-unicode11/src/tsconfig.json b/addons/addon-unicode11/src/tsconfig.json index 995fcabcf..f95158058 100644 --- a/addons/addon-unicode11/src/tsconfig.json +++ b/addons/addon-unicode11/src/tsconfig.json @@ -13,7 +13,6 @@ "strict": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "@xterm/addon-unicode11": [ @@ -36,4 +35,4 @@ "path": "../../../src/common" } ] -} +} \ No newline at end of file diff --git a/addons/addon-unicode11/test/tsconfig.json b/addons/addon-unicode11/test/tsconfig.json index ed2744ad1..ded3933bd 100644 --- a/addons/addon-unicode11/test/tsconfig.json +++ b/addons/addon-unicode11/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -41,4 +40,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-web-fonts/test/tsconfig.json b/addons/addon-web-fonts/test/tsconfig.json index a64ff9263..36380f47f 100644 --- a/addons/addon-web-fonts/test/tsconfig.json +++ b/addons/addon-web-fonts/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -41,4 +40,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-web-links/test/tsconfig.json b/addons/addon-web-links/test/tsconfig.json index a64ff9263..36380f47f 100644 --- a/addons/addon-web-links/test/tsconfig.json +++ b/addons/addon-web-links/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -41,4 +40,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/addons/addon-webgl/src/tsconfig.json b/addons/addon-webgl/src/tsconfig.json index 429cc75c3..61aa336ab 100644 --- a/addons/addon-webgl/src/tsconfig.json +++ b/addons/addon-webgl/src/tsconfig.json @@ -12,7 +12,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -43,4 +42,4 @@ "path": "../../../src/browser" } ] -} +} \ No newline at end of file diff --git a/addons/addon-webgl/test/tsconfig.json b/addons/addon-webgl/test/tsconfig.json index eb1085d1d..53f85af62 100644 --- a/addons/addon-webgl/test/tsconfig.json +++ b/addons/addon-webgl/test/tsconfig.json @@ -11,7 +11,6 @@ "removeComments": true, "paths": { "common/*": [ - "../../../src/common/primitives/*", "../../../src/common/*" ], "browser/*": [ @@ -42,4 +41,4 @@ "path": "../../../test/playwright" } ] -} +} \ No newline at end of file diff --git a/src/common/tsconfig.json b/src/common/tsconfig.json index 0debb2efc..c7488a89e 100644 --- a/src/common/tsconfig.json +++ b/src/common/tsconfig.json @@ -10,19 +10,10 @@ "outDir": "../../out", "types": [ "../../node_modules/@types/mocha" - ], - "paths": { - "common/*": [ - "./primitives/*", - "./*" - ] - } + ] }, "include": [ - "./primitives/**/*", - "./services/**/*", - "./public/**/*", - "./*.ts", + "./**/*", "../../typings/xterm.d.ts" ] } diff --git a/test/benchmark/tsconfig.json b/test/benchmark/tsconfig.json index c8025f6eb..a45db910e 100644 --- a/test/benchmark/tsconfig.json +++ b/test/benchmark/tsconfig.json @@ -14,7 +14,6 @@ "module": "nodenext", "paths": { "common/*": [ - "../../src/common/primitives/*", "../../src/common/*" ], "browser/*": ["../../src/browser/*"] @@ -31,4 +30,4 @@ { "path": "../../src/common" }, { "path": "../../src/browser" }, ] -} +} \ No newline at end of file