docs: correct CSI t @vt support flags for Ps 14/16 and DECSLPP

Co-authored-by: Daniel Imms <Tyriar@users.noreply.github.com>

.gitignore

@@ -24,7 +24,6 @@ test-results/
 
 # Tracing/debug files
 .cursor/nal-trace/
-.cursor/*.log
 
 # Keep bundled code out of Git
 dist/

addons/addon-attach/src/tsconfig.json

@@ -13,11 +13,15 @@
     "strict": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "@xterm/addon-attach": [
+        "../typings/addon-attach.d.ts"
+      ]
+    }
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-attach.d.ts"
+    "../../../typings/xterm.d.ts"
   ]
 }

addons/addon-attach/test/tsconfig.json

@@ -3,12 +3,23 @@
     "module": "commonjs",
     "target": "ESNext",
     "lib": [
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-attach/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

addons/addon-clipboard/src/tsconfig.json

@@ -13,12 +13,19 @@
     "strict": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "@xterm/addon-clipboard": [
+        "../typings/addon-clipboard.d.ts"
+      ]
+    }
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-clipboard.d.ts"
+    "../../../typings/xterm.d.ts"
   ],
   "references": [
     {

addons/addon-clipboard/test/tsconfig.json

@@ -3,12 +3,23 @@
     "module": "commonjs",
     "target": "ESNext",
     "lib": [
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-clipboard/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

addons/addon-fit/src/FitAddon.ts

@@ -5,7 +5,7 @@
 
 import type { Terminal, ITerminalAddon, IRenderDimensions } from '@xterm/xterm';
 import type { FitAddon as IFitApi } from '@xterm/addon-fit';
-import { ViewportConstants } from '../../../src/browser/shared/Constants';
+import { ViewportConstants } from 'browser/shared/Constants';
 
 interface ITerminalDimensions {
   /**

addons/addon-fit/src/tsconfig.json

@@ -13,12 +13,19 @@
     "strict": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "@xterm/addon-fit": [
+        "../typings/addon-fit.d.ts"
+      ]
+    }
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-fit.d.ts"
+    "../../../typings/xterm.d.ts"
   ],
   "references": [
     {

addons/addon-fit/test/tsconfig.json

@@ -3,12 +3,23 @@
     "module": "commonjs",
     "target": "ESNext",
     "lib": [
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-fit/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

addons/addon-image/src/ImageAddon.ts

@@ -5,7 +5,7 @@
 
 import type { ITerminalAddon, IDisposable } from '@xterm/xterm';
 import type { ImageAddon as IImageApi } from '@xterm/addon-image';
-import { Emitter, type IEvent } from '../../../src/common/Event';
+import { Emitter, type IEvent } from 'common/Event';
 import { IIPHandler } from './IIPHandler';
 import { ImageRenderer } from './ImageRenderer';
 import { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';

addons/addon-image/src/ImageRenderer.ts

@@ -6,7 +6,7 @@
 import { toRGBA8888 } from 'sixel/lib/Colors';
 import { IDisposable } from '@xterm/xterm';
 import { ICellSize, ImageLayer, ITerminalExt, IImageSpec, IRenderDimensions, IRenderService } from './Types';
-import { Disposable, MutableDisposable, toDisposable } from '../../../src/common/Lifecycle';
+import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
 
 const enum Constants {
   PLACEHOLDER_LENGTH = 4096,

addons/addon-image/src/Types.ts

@@ -6,13 +6,13 @@
 import { IDisposable, IMarker, Terminal } from '@xterm/xterm';
 
 // private imports from base repo we build against
-import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from '../../../src/common/buffer/Constants';
-import type { AttributeData } from '../../../src/common/buffer/AttributeData';
-import type { IParams, IDcsHandler, IOscHandler, IApcHandler, IEscapeSequenceParser } from '../../../src/common/parser/Types';
-import type { IBufferLine, IExtendedAttrs, IInputHandler } from '../../../src/common/Types';
-import type { ITerminal, ReadonlyColorSet } from '../../../src/browser/Types';
-import type { IRenderDimensions } from '../../../src/browser/renderer/shared/Types';
-import type { ICoreBrowserService, IRenderService, IThemeService } from '../../../src/browser/services/Services';
+import { Attributes, BgFlags, Content, ExtFlags, UnderlineStyle } from 'common/buffer/Constants';
+import type { AttributeData } from 'common/buffer/AttributeData';
+import type { IParams, IDcsHandler, IOscHandler, IApcHandler, IEscapeSequenceParser } from 'common/parser/Types';
+import type { IBufferLine, IExtendedAttrs, IInputHandler } from 'common/Types';
+import type { ITerminal, ReadonlyColorSet } from 'browser/Types';
+import type { IRenderDimensions } from 'browser/renderer/shared/Types';
+import type { ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services';
 
 export const enum Cell {
   CONTENT = 0,  // codepoint and wcwidth information (enum Content)

addons/addon-image/src/tsconfig.json

@@ -10,19 +10,20 @@
     "preserveWatchOutput": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "browser/*": [ "../../../src/browser/*" ],
+      "common/*": [ "../../../src/common/*" ],
+      "@xterm/addon-image": [ "../typings/addon-image.d.ts" ],
+      "*": [ "./*" ]
+    }
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-image.d.ts"
+    "../../../typings/xterm.d.ts"
   ],
   "references": [
-    {
-      "path": "../../../src/browser"
-    },
-    {
-      "path": "../../../src/common"
-    }
+    { "path": "../../../src/browser" },
+    { "path": "../../../src/common" }
   ]
 }

addons/addon-image/test/tsconfig.json

@@ -3,12 +3,23 @@
     "module": "commonjs",
     "target": "ESNext",
     "lib": [
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-image/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

addons/addon-ligatures/src/tsconfig.json

@@ -10,12 +10,17 @@
     "preserveWatchOutput": true,
     "types": [
       "../../../node_modules/@types/mocha",
+      // HACK: src shouldn't use node types but it's needed for index.test.ts
       "../../../node_modules/@types/node"
-    ]
+    ],
+    "paths": {
+      "@xterm/addon-ligatures" : [
+        "../typings/addon-ligatures.d.ts"
+      ]
+    }
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-ligatures.d.ts"
+    "../../../typings/xterm.d.ts"
   ]
 }

addons/addon-ligatures/test/tsconfig.json

@@ -10,6 +10,11 @@
     "sourceMap": true,
     "removeComments": true,
     "strict": true,
+    "paths": {
+      "*": [
+        "./*"
+      ]
+    },
     "types": [
       "../../../node_modules/@types/mocha",
       "../../../node_modules/@types/node"

addons/addon-ligatures/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

addons/addon-progress/src/ProgressAddon.ts

@@ -5,7 +5,7 @@
 
 import type { Terminal, ITerminalAddon, IDisposable } from '@xterm/xterm';
 import type { ProgressAddon as IProgressApi, IProgressState } from '@xterm/addon-progress';
-import type { Emitter, IEvent } from '../../../src/common/Event';
+import type { Emitter, IEvent } from 'common/Event';
 
 
 const enum ProgressType {

addons/addon-progress/src/tsconfig.json

@@ -13,12 +13,22 @@
     "strict": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "@xterm/addon-progress": [
+        "../typings/addon-progress.d.ts"
+      ]
+    }
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-progress.d.ts"
+    "../../../typings/xterm.d.ts"
   ],
   "references": [
     {

addons/addon-progress/test/tsconfig.json

@@ -3,12 +3,23 @@
     "module": "commonjs",
     "target": "ESNext",
     "lib": [
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-progress/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

addons/addon-search/src/DecorationManager.ts

@@ -5,7 +5,7 @@
 
 import type { Terminal, IDisposable, IDecoration } from '@xterm/xterm';
 import type { ISearchDecorationOptions } from '@xterm/addon-search';
-import { dispose, Disposable, toDisposable } from '../../../src/common/Lifecycle';
+import { dispose, Disposable, toDisposable } from 'common/Lifecycle';
 import type { ISearchResult } from './SearchEngine';
 
 /**

addons/addon-search/src/SearchAddon.ts

@@ -5,9 +5,9 @@
 
 import type { Terminal, IDisposable, ITerminalAddon } from '@xterm/xterm';
 import type { SearchAddon as ISearchApi, ISearchOptions, ISearchAddonOptions, ISearchResultChangeEvent, ISearchDecorationOptions } from '@xterm/addon-search';
-import { Emitter, type IEvent } from '../../../src/common/Event';
-import { Disposable, MutableDisposable, toDisposable } from '../../../src/common/Lifecycle';
-import { disposableTimeout } from '../../../src/common/Async';
+import { Emitter, type IEvent } from 'common/Event';
+import { Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
+import { disposableTimeout } from 'common/Async';
 import { SearchLineCache } from './SearchLineCache';
 import { SearchState } from './SearchState';
 import { SearchEngine, type ISearchResult } from './SearchEngine';

addons/addon-search/src/SearchEngine.test.ts

@@ -5,9 +5,9 @@
 import { assert } from 'chai';
 import { SearchEngine } from './SearchEngine';
 import { SearchLineCache } from './SearchLineCache';
-import { Terminal } from '../../../src/browser/public/Terminal';
+import { Terminal } from 'browser/public/Terminal';
 import type { ISearchOptions } from '@xterm/addon-search';
-import { DisposableStore } from '../../../src/common/Lifecycle';
+import { DisposableStore } from 'common/Lifecycle';
 
 function writeP(terminal: Terminal, data: string): Promise<void> {
   return new Promise(r => terminal.write(data, r));

addons/addon-search/src/SearchLineCache.test.ts

@@ -4,8 +4,8 @@
  */
 import { assert } from 'chai';
 import { SearchLineCache, LineCacheEntry } from './SearchLineCache';
-import { Terminal } from '../../../src/browser/public/Terminal';
-import { timeout } from '../../../src/common/Async';
+import { Terminal } from 'browser/public/Terminal';
+import { timeout } from 'common/Async';
 
 function writeP(terminal: Terminal, data: string): Promise<void> {
   return new Promise(r => terminal.write(data, r));

addons/addon-search/src/SearchLineCache.ts

@@ -4,8 +4,8 @@
  */
 
 import type { Terminal } from '@xterm/xterm';
-import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from '../../../src/common/Lifecycle';
-import { disposableTimeout } from '../../../src/common/Async';
+import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
+import { disposableTimeout } from 'common/Async';
 
 export type LineCacheEntry = [
   /**

addons/addon-search/src/SearchResultTracker.ts

@@ -5,8 +5,8 @@
 
 import type { ISearchResultChangeEvent } from '@xterm/addon-search';
 import type { IDisposable } from '@xterm/xterm';
-import { Emitter, type IEvent } from '../../../src/common/Event';
-import { Disposable } from '../../../src/common/Lifecycle';
+import { Emitter, type IEvent } from 'common/Event';
+import { Disposable } from 'common/Lifecycle';
 import type { ISearchResult } from './SearchEngine';
 
 /**

addons/addon-search/src/tsconfig.json

@@ -4,7 +4,7 @@
     "target": "es2021",
     "lib": [
       "dom",
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out",
@@ -13,12 +13,22 @@
     "strict": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "@xterm/addon-search" : [
+        "../typings/addon-search.d.ts"
+      ]
+    }
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-search.d.ts"
+    "../../../typings/xterm.d.ts"
   ],
   "references": [
     {

addons/addon-search/test/tsconfig.json

@@ -3,12 +3,23 @@
     "module": "commonjs",
     "target": "ESNext",
     "lib": [
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-search/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

addons/addon-serialize/benchmark/SerializeAddon.benchmark.ts

@@ -6,9 +6,9 @@
 import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark';
 
 import { spawn } from 'node-pty';
-import { Utf8ToUtf32, stringFromCodePoint } from '../../../src/common/input/TextDecoder';
-import { Terminal } from '../../../src/browser/public/Terminal';
-import { SerializeAddon } from '../src/SerializeAddon';
+import { Utf8ToUtf32, stringFromCodePoint } from 'common/input/TextDecoder';
+import { Terminal } from 'browser/public/Terminal';
+import { SerializeAddon } from 'SerializeAddon';
 
 class TestTerminal extends Terminal {
   public writeSync(data: string): void {

addons/addon-serialize/benchmark/tsconfig.json

@@ -6,28 +6,24 @@
     ],
     "rootDir": "..",
     "outDir": "../out-benchmark",
-    "types": [
-      "../../../node_modules/@types/node"
-    ],
+    "types": ["../../../node_modules/@types/node"],
     "moduleResolution": "node",
     "strict": false,
     "target": "es2021",
-    "module": "commonjs"
-  },
-  "include": [
-    "../**/*",
-    "../../../typings/xterm.d.ts"
-  ],
-  "exclude": [
-    "../../../**/*test.ts",
-    "../../**/*api.ts"
-  ],
-  "references": [
-    {
-      "path": "../../../src/common"
-    },
-    {
-      "path": "../../../src/browser"
+    "module": "commonjs",
+    "paths": {
+      "common/*": ["../../../src/common/*"],
+      "browser/*": ["../../../src/browser/*"],
+      "SerializeAddon": ["../src/SerializeAddon"],
+      "@xterm/addon-serialize": [
+        "../typings/addon-serialize.d.ts"
+      ]
     }
+  },
+  "include": ["../**/*", "../../../typings/xterm.d.ts"],
+  "exclude": ["../../../**/*test.ts", "../../**/*api.ts"],
+  "references": [
+    { "path": "../../../src/common" },
+    { "path": "../../../src/browser" }
   ]
 }

addons/addon-serialize/src/SerializeAddon.test.ts

@@ -6,10 +6,10 @@
 import jsdom = require('jsdom');
 import { assert } from 'chai';
 import { SerializeAddon } from './SerializeAddon';
-import { Terminal } from '../../../src/browser/public/Terminal';
-import { SelectionModel } from '../../../src/browser/selection/SelectionModel';
-import { IBufferService } from '../../../src/common/services/Services';
-import { ThemeService } from '../../../src/browser/services/ThemeService';
+import { Terminal } from 'browser/public/Terminal';
+import { SelectionModel } from 'browser/selection/SelectionModel';
+import { IBufferService } from 'common/services/Services';
+import { ThemeService } from 'browser/services/ThemeService';
 
 function sgr(...seq: string[]): string {
   return `\x1b[${seq.join(';')}m`;

addons/addon-serialize/src/SerializeAddon.ts

@@ -7,9 +7,9 @@
 
 import type { IBuffer, IBufferCell, IBufferRange, ITerminalAddon, Terminal } from '@xterm/xterm';
 import type { IHTMLSerializeOptions, SerializeAddon as ISerializeApi, ISerializeOptions, ISerializeRange } from '@xterm/addon-serialize';
-import { IAttributeData, IColor } from '../../../src/common/Types';
-import { DEFAULT_ANSI_COLORS } from '../../../src/browser/Types';
-import { UnderlineStyle } from '../../../src/common/buffer/Constants';
+import { IAttributeData, IColor } from 'common/Types';
+import { DEFAULT_ANSI_COLORS } from 'browser/Types';
+import { UnderlineStyle } from 'common/buffer/Constants';
 
 function constrain(value: number, low: number, high: number): number {
   return Math.max(low, Math.min(value, high));

addons/addon-serialize/src/tsconfig.json

@@ -10,6 +10,17 @@
     "outDir": "../out",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "@xterm/addon-serialize": [
+        "../typings/addon-serialize.d.ts"
+      ]
+    },
     "strict": true,
     "skipLibCheck": true,
     "types": [
@@ -18,8 +29,7 @@
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-serialize.d.ts"
+    "../../../typings/xterm.d.ts"
   ],
   "references": [
     {

addons/addon-serialize/test/tsconfig.json

@@ -3,12 +3,20 @@
     "module": "commonjs",
     "target": "ESNext",
     "lib": [
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-serialize/tsconfig.json

@@ -2,14 +2,8 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    },
-    {
-      "path": "./benchmark"
-    }
+    { "path": "./src" },
+    { "path": "./test" },
+    { "path": "./benchmark" }
   ]
 }

addons/addon-unicode-graphemes/benchmark/UnicodeGraphemeAddon.benchmark.ts

@@ -6,9 +6,9 @@
 import { perfContext, before, ThroughputRuntimeCase } from 'xterm-benchmark';
 
 import { spawn } from 'node-pty';
-import { Utf8ToUtf32, stringFromCodePoint } from '../../../src/common/input/TextDecoder';
-import { CoreBrowserTerminal } from '../../../src/browser/CoreBrowserTerminal';
-import { UnicodeGraphemeProvider } from '../src/UnicodeGraphemeProvider';
+import { Utf8ToUtf32, stringFromCodePoint } from 'common/input/TextDecoder';
+import { CoreBrowserTerminal } from 'browser/CoreBrowserTerminal';
+import { UnicodeGraphemeProvider } from 'UnicodeGraphemeProvider';
 
 
 function fakedAddonLoad(terminal: any): void {

addons/addon-unicode-graphemes/benchmark/tsconfig.json

@@ -1,33 +1,26 @@
 {
   "compilerOptions": {
-    "lib": [
-      "dom",
-      "es6"
-    ],
+    "lib": ["dom", "es6"],
     "rootDir": "..",
     "outDir": "../out-benchmark",
-    "types": [
-      "../../../node_modules/@types/node"
-    ],
+    "types": ["../../../node_modules/@types/node"],
     "moduleResolution": "node",
     "strict": false,
     "target": "es2015",
-    "module": "commonjs"
-  },
-  "include": [
-    "../**/*",
-    "../../../typings/xterm.d.ts"
-  ],
-  "exclude": [
-    "../../../**/*test.ts",
-    "../../**/*api.ts"
-  ],
-  "references": [
-    {
-      "path": "../../../src/common"
-    },
-    {
-      "path": "../../../src/browser"
+    "module": "commonjs",
+    "paths": {
+      "common/*": ["../../../src/common/*"],
+      "browser/*": ["../../../src/browser/*"],
+      "UnicodeGraphemeProvider": ["../src/UnicodeGraphemeProvider"],
+      "@xterm/addon-unicode-graphemes": [
+        "../typings/addon-unicode-graphemes.d.ts"
+      ]
     }
+  },
+  "include": ["../**/*", "../../../typings/xterm.d.ts"],
+  "exclude": ["../../../**/*test.ts", "../../**/*api.ts"],
+  "references": [
+    { "path": "../../../src/common" },
+    { "path": "../../../src/browser" }
   ]
 }

addons/addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts

@@ -4,8 +4,8 @@
  */
 
 import { IUnicodeVersionProvider } from '@xterm/xterm';
-import { UnicodeCharProperties, UnicodeCharWidth } from '../../../src/common/services/Services';
-import { UnicodeService } from '../../../src/common/services/UnicodeService';
+import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services';
+import { UnicodeService } from 'common/services/UnicodeService';
 import * as UC from './third-party/UnicodeProperties';
 
 export class UnicodeGraphemeProvider implements IUnicodeVersionProvider {

addons/addon-unicode-graphemes/src/tsconfig.json

@@ -11,14 +11,21 @@
     "sourceMap": true,
     "removeComments": true,
     "strict": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "@xterm/addon-unicode-graphemes": [
+        "../typings/addon-unicode-graphemes.d.ts"
+      ]
+    },
     "types": [
       "../../../node_modules/@types/mocha"
     ]
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-unicode-graphemes.d.ts"
+    "../../../typings/xterm.d.ts"
   ],
   "references": [
     {

addons/addon-unicode-graphemes/test/tsconfig.json

@@ -3,12 +3,20 @@
     "module": "commonjs",
     "target": "ESNext",
     "lib": [
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-unicode-graphemes/tsconfig.json

@@ -2,14 +2,8 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    },
-    {
-      "path": "./benchmark"
-    }
+    { "path": "./src" },
+    { "path": "./test" },
+    { "path": "./benchmark" }
   ]
 }

addons/addon-unicode11/src/UnicodeV11.ts

@@ -4,8 +4,8 @@
  */
 
 import { IUnicodeVersionProvider } from '@xterm/xterm';
-import { UnicodeCharProperties, UnicodeCharWidth } from '../../../src/common/services/Services';
-import { UnicodeService } from '../../../src/common/services/UnicodeService';
+import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services';
+import { UnicodeService } from 'common/services/UnicodeService';
 
 const BMP_COMBINING = [
   [0x0300, 0x036F], [0x0483, 0x0489], [0x0591, 0x05BD],

addons/addon-unicode11/src/tsconfig.json

@@ -11,14 +11,24 @@
     "sourceMap": true,
     "removeComments": true,
     "strict": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "@xterm/addon-unicode11": [
+        "../typings/addon-unicode11.d.ts"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "types": [
       "../../../node_modules/@types/mocha"
     ]
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-unicode11.d.ts"
+    "../../../typings/xterm.d.ts"
   ],
   "references": [
     {

addons/addon-unicode11/test/tsconfig.json

@@ -3,12 +3,23 @@
     "module": "commonjs",
     "target": "ESNext",
     "lib": [
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-unicode11/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

addons/addon-web-fonts/src/tsconfig.json

@@ -14,11 +14,15 @@
     "strict": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "@xterm/addon-web-fonts": [
+        "../typings/addon-web-fonts.d.ts"
+      ]
+    }
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-web-fonts.d.ts"
+    "../../../typings/xterm.d.ts"
   ]
 }

addons/addon-web-fonts/test/tsconfig.json

@@ -3,12 +3,24 @@
     "module": "commonjs",
     "target": "es2021",
     "lib": [
-      "es2021"
+      "es2021",
     ],
+    // "downlevelIteration": true,
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-web-fonts/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

addons/addon-web-links/src/tsconfig.json

@@ -13,11 +13,15 @@
     "strict": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "@xterm/addon-web-links": [
+        "../typings/addon-web-links.d.ts"
+      ]
+    }
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-web-links.d.ts"
+    "../../../typings/xterm.d.ts"
   ]
 }

addons/addon-web-links/test/tsconfig.json

@@ -3,12 +3,24 @@
     "module": "commonjs",
     "target": "es2021",
     "lib": [
-      "es2021"
+      "es2021",
     ],
+    // "downlevelIteration": true,
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node"

addons/addon-web-links/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

addons/addon-webgl/src/CellColorResolver.ts

@@ -1,12 +1,12 @@
-import { ISelectionRenderModel } from '../../../src/browser/renderer/shared/Types';
-import { ICoreBrowserService, IThemeService } from '../../../src/browser/services/Services';
-import { ReadonlyColorSet } from '../../../src/browser/Types';
-import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from '../../../src/common/buffer/Constants';
-import { IDecorationService, IOptionsService } from '../../../src/common/services/Services';
-import { ICellData } from '../../../src/common/Types';
+import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
+import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
+import { ReadonlyColorSet } from 'browser/Types';
+import { Attributes, BgFlags, ExtFlags, FgFlags, NULL_CELL_CODE, UnderlineStyle } from 'common/buffer/Constants';
+import { IDecorationService, IOptionsService } from 'common/services/Services';
+import { ICellData } from 'common/Types';
 import { Terminal } from '@xterm/xterm';
-import { rgba } from '../../../src/common/Color';
-import { treatGlyphAsBackgroundColor } from '../../../src/browser/renderer/shared/RendererUtils';
+import { rgba } from 'common/Color';
+import { treatGlyphAsBackgroundColor } from 'browser/renderer/shared/RendererUtils';
 import { blockPatternCodepoints } from './customGlyphs/CustomGlyphDefinitions';
 
 // Work variables to avoid garbage collection

addons/addon-webgl/src/CharAtlasCache.ts

@@ -5,10 +5,10 @@
 
 import { TextureAtlas } from './TextureAtlas';
 import { ITerminalOptions, Terminal } from '@xterm/xterm';
-import { ITerminal, ReadonlyColorSet } from '../../../src/browser/Types';
+import { ITerminal, ReadonlyColorSet } from 'browser/Types';
 import { ICharAtlasConfig, ITextureAtlas } from './Types';
 import { generateConfig, configEquals } from './CharAtlasUtils';
-import type { ILogService } from '../../../src/common/services/Services';
+import type { ILogService } from 'common/services/Services';
 
 interface ITextureAtlasCacheEntry {
   atlas: ITextureAtlas;

addons/addon-webgl/src/CharAtlasUtils.test.ts

@@ -1,87 +0,0 @@
-/**
- * Copyright (c) 2026 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
-import { assert } from 'chai';
-import { configEquals } from './CharAtlasUtils';
-import { ICharAtlasConfig } from './Types';
-import { NULL_COLOR } from '../../../src/common/Color';
-import { IColor } from '../../../src/common/Types';
-
-function createTestConfig(overrides: Partial<ICharAtlasConfig> = {}): ICharAtlasConfig {
-  const color: IColor = { css: '#ffffff', rgba: 0xffffffff };
-  const contrastCache = {
-    clear: () => {},
-    setCss: () => {},
-    getCss: () => undefined,
-    setColor: () => {},
-    getColor: () => undefined
-  };
-  const colors = {
-    foreground: color,
-    background: color,
-    cursor: NULL_COLOR,
-    cursorAccent: NULL_COLOR,
-    selectionForeground: undefined,
-    selectionBackgroundTransparent: NULL_COLOR,
-    selectionBackgroundOpaque: NULL_COLOR,
-    selectionInactiveBackgroundTransparent: NULL_COLOR,
-    selectionInactiveBackgroundOpaque: NULL_COLOR,
-    overviewRulerBorder: NULL_COLOR,
-    scrollbarSliderBackground: NULL_COLOR,
-    scrollbarSliderHoverBackground: NULL_COLOR,
-    scrollbarSliderActiveBackground: NULL_COLOR,
-    ansi: new Array(256).fill(color),
-    contrastCache,
-    halfContrastCache: contrastCache
-  };
-  return {
-    customGlyphs: true,
-    devicePixelRatio: 1,
-    deviceMaxTextureSize: 4096,
-    letterSpacing: 0,
-    lineHeight: 1,
-    fontSize: 15,
-    fontFamily: 'monospace',
-    fontWeight: 'normal',
-    fontWeightBold: 'bold',
-    deviceCellWidth: 10,
-    deviceCellHeight: 20,
-    deviceCharWidth: 8,
-    deviceCharHeight: 16,
-    allowTransparency: false,
-    drawBoldTextInBrightColors: true,
-    minimumContrastRatio: 1,
-    colors,
-    ...overrides
-  };
-}
-
-describe('CharAtlasUtils', () => {
-  describe('configEquals', () => {
-    it('should return true for identical configs', () => {
-      const a = createTestConfig();
-      const b = createTestConfig();
-      assert.ok(configEquals(a, b));
-    });
-
-    it('should return false when deviceMaxTextureSize differs', () => {
-      const a = createTestConfig();
-      const b = createTestConfig({ deviceMaxTextureSize: 8192 });
-      assert.ok(!configEquals(a, b));
-    });
-
-    it('should return false when deviceCellWidth differs', () => {
-      const a = createTestConfig();
-      const b = createTestConfig({ deviceCellWidth: 11 });
-      assert.ok(!configEquals(a, b));
-    });
-
-    it('should return false when deviceCellHeight differs', () => {
-      const a = createTestConfig();
-      const b = createTestConfig({ deviceCellHeight: 21 });
-      assert.ok(!configEquals(a, b));
-    });
-  });
-});

addons/addon-webgl/src/CharAtlasUtils.ts

@@ -4,10 +4,10 @@
  */
 
 import { ICharAtlasConfig } from './Types';
-import { Attributes } from '../../../src/common/buffer/Constants';
+import { Attributes } from 'common/buffer/Constants';
 import { ITerminalOptions } from '@xterm/xterm';
-import { IColorSet, ReadonlyColorSet } from '../../../src/browser/Types';
-import { NULL_COLOR } from '../../../src/common/Color';
+import { IColorSet, ReadonlyColorSet } from 'browser/Types';
+import { NULL_COLOR } from 'common/Color';
 
 export function generateConfig(deviceCellWidth: number, deviceCellHeight: number, deviceCharWidth: number, deviceCharHeight: number, options: Required<ITerminalOptions>, colors: ReadonlyColorSet, devicePixelRatio: number, deviceMaxTextureSize: number, customGlyphs: boolean = true): ICharAtlasConfig {
   // null out some fields that don't matter
@@ -59,7 +59,6 @@ export function configEquals(a: ICharAtlasConfig, b: ICharAtlasConfig): boolean
     }
   }
   return a.devicePixelRatio === b.devicePixelRatio &&
-      a.deviceMaxTextureSize === b.deviceMaxTextureSize &&
       a.customGlyphs === b.customGlyphs &&
       a.lineHeight === b.lineHeight &&
       a.letterSpacing === b.letterSpacing &&
@@ -68,8 +67,6 @@ export function configEquals(a: ICharAtlasConfig, b: ICharAtlasConfig): boolean
       a.fontWeight === b.fontWeight &&
       a.fontWeightBold === b.fontWeightBold &&
       a.allowTransparency === b.allowTransparency &&
-      a.deviceCellWidth === b.deviceCellWidth &&
-      a.deviceCellHeight === b.deviceCellHeight &&
       a.deviceCharWidth === b.deviceCharWidth &&
       a.deviceCharHeight === b.deviceCharHeight &&
       a.drawBoldTextInBrightColors === b.drawBoldTextInBrightColors &&

addons/addon-webgl/src/Constants.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { isFirefox, isLegacyEdge } from '../../../src/common/Platform';
+import { isFirefox, isLegacyEdge } from 'common/Platform';
 
 export const DIM_OPACITY = 0.5;
 // The text baseline is set conditionally by browser. Using 'ideographic' for Firefox or Legacy Edge

addons/addon-webgl/src/CursorBlinkStateManager.ts

@@ -3,8 +3,8 @@
  * @license MIT
  */
 
-import { RendererConstants } from '../../../src/browser/renderer/shared/Constants';
-import { ICoreBrowserService } from '../../../src/browser/services/Services';
+import { RendererConstants } from 'browser/renderer/shared/Constants';
+import { ICoreBrowserService } from 'browser/services/Services';
 
 const enum Constants {
   /**

addons/addon-webgl/src/DevicePixelObserver.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { toDisposable, IDisposable } from '../../../src/common/Lifecycle';
+import { toDisposable, IDisposable } from 'common/Lifecycle';
 
 export function observeDevicePixelDimensions(element: HTMLElement, parentWindow: Window & typeof globalThis, callback: (deviceWidth: number, deviceHeight: number) => void): IDisposable {
   // Observe any resizes to the element and extract the actual pixel size of the element if the

addons/addon-webgl/src/GlyphRenderer.ts

@@ -3,14 +3,14 @@
  * @license MIT
  */
 import { TextureAtlas } from './TextureAtlas';
-import { IRenderDimensions } from '../../../src/browser/renderer/shared/Types';
-import { NULL_CELL_CODE } from '../../../src/common/buffer/Constants';
-import { Disposable, toDisposable } from '../../../src/common/Lifecycle';
+import { IRenderDimensions } from 'browser/renderer/shared/Types';
+import { NULL_CELL_CODE } from 'common/buffer/Constants';
+import { Disposable, toDisposable } from 'common/Lifecycle';
 import { Terminal } from '@xterm/xterm';
 import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject, type IRasterizedGlyph, type ITextureAtlas } from './Types';
 import { createProgram, GLTexture, PROJECTION_MATRIX } from './WebglUtils';
-import type { ILogService, IOptionsService } from '../../../src/common/services/Services';
-import { allowRescaling, throwIfFalsy } from '../../../src/browser/renderer/shared/RendererUtils';
+import type { IOptionsService } from 'common/services/Services';
+import { allowRescaling, throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 
 interface IVertices {
   attributes: Float32Array;
@@ -114,8 +114,7 @@ export class GlyphRenderer extends Disposable {
     private readonly _terminal: Terminal,
     private readonly _gl: IWebGL2RenderingContext,
     private _dimensions: IRenderDimensions,
-    private readonly _optionsService: IOptionsService,
-    private readonly _logService: ILogService
+    private readonly _optionsService: IOptionsService
   ) {
     super();
 
@@ -128,7 +127,7 @@ export class GlyphRenderer extends Disposable {
       TextureAtlas.maxTextureSize = throwIfFalsy(gl.getParameter(gl.MAX_TEXTURE_SIZE) as number | null);
     }
 
-    this._program = throwIfFalsy(createProgram(gl, vertexShaderSource, createFragmentShaderSource(TextureAtlas.maxAtlasPages), this._logService));
+    this._program = throwIfFalsy(createProgram(gl, vertexShaderSource, createFragmentShaderSource(TextureAtlas.maxAtlasPages)));
     this._register(toDisposable(() => gl.deleteProgram(this._program)));
 
     // Uniform locations
@@ -137,9 +136,8 @@ export class GlyphRenderer extends Disposable {
     this._textureLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_texture'));
 
     // Create and set the vertex array object
-    const vertexArrayObject = this._vertexArrayObject = gl.createVertexArray();
-    this._register(toDisposable(() => gl.deleteVertexArray(vertexArrayObject)));
-    gl.bindVertexArray(vertexArrayObject);
+    this._vertexArrayObject = gl.createVertexArray();
+    gl.bindVertexArray(this._vertexArrayObject);
 
     // Setup a_unitquad, this defines the 4 vertices of a rectangle
     const unitQuadVertices = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]);

addons/addon-webgl/src/RectangleRenderer.ts

@@ -3,18 +3,17 @@
  * @license MIT
  */
 
-import { IRenderDimensions } from '../../../src/browser/renderer/shared/Types';
-import { IThemeService } from '../../../src/browser/services/Services';
-import { ReadonlyColorSet } from '../../../src/browser/Types';
-import { Attributes, FgFlags } from '../../../src/common/buffer/Constants';
-import { Disposable, toDisposable } from '../../../src/common/Lifecycle';
-import { IColor } from '../../../src/common/Types';
+import { IRenderDimensions } from 'browser/renderer/shared/Types';
+import { IThemeService } from 'browser/services/Services';
+import { ReadonlyColorSet } from 'browser/Types';
+import { Attributes, FgFlags } from 'common/buffer/Constants';
+import { Disposable, toDisposable } from 'common/Lifecycle';
+import { IColor } from 'common/Types';
 import { Terminal } from '@xterm/xterm';
 import { RenderModelConstants } from './RenderModel';
 import { IRenderModel, IWebGL2RenderingContext, IWebGLVertexArrayObject } from './Types';
 import { createProgram, expandFloat32Array, PROJECTION_MATRIX } from './WebglUtils';
-import { throwIfFalsy } from '../../../src/browser/renderer/shared/RendererUtils';
-import type { ILogService } from '../../../src/common/services/Services';
+import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 
 const enum VertexAttribLocations {
   POSITION = 0,
@@ -90,23 +89,21 @@ export class RectangleRenderer extends Disposable {
     private _terminal: Terminal,
     private _gl: IWebGL2RenderingContext,
     private _dimensions: IRenderDimensions,
-    private readonly _themeService: IThemeService,
-    private readonly _logService: ILogService
+    private readonly _themeService: IThemeService
   ) {
     super();
 
     const gl = this._gl;
 
-    this._program = throwIfFalsy(createProgram(gl, vertexShaderSource, fragmentShaderSource, this._logService));
+    this._program = throwIfFalsy(createProgram(gl, vertexShaderSource, fragmentShaderSource));
     this._register(toDisposable(() => gl.deleteProgram(this._program)));
 
     // Uniform locations
     this._projectionLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_projection'));
 
     // Create and set the vertex array object
-    const vertexArrayObject = this._vertexArrayObject = gl.createVertexArray();
-    this._register(toDisposable(() => gl.deleteVertexArray(vertexArrayObject)));
-    gl.bindVertexArray(vertexArrayObject);
+    this._vertexArrayObject = gl.createVertexArray();
+    gl.bindVertexArray(this._vertexArrayObject);
 
     // Setup a_unitquad, this defines the 4 vertices of a rectangle
     const unitQuadVertices = new Float32Array([0, 0, 1, 0, 0, 1, 1, 1]);

addons/addon-webgl/src/RenderModel.ts

@@ -4,8 +4,8 @@
  */
 
 import { ICursorRenderModel, IRenderModel } from './Types';
-import { ISelectionRenderModel } from '../../../src/browser/renderer/shared/Types';
-import { createSelectionRenderModel } from '../../../src/browser/renderer/shared/SelectionRenderModel';
+import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
+import { createSelectionRenderModel } from 'browser/renderer/shared/SelectionRenderModel';
 
 export const enum RenderModelConstants {
   INDICIES_PER_CELL = 4,

addons/addon-webgl/src/TextureAtlas.ts

@@ -3,19 +3,19 @@
  * @license MIT
  */
 
-import { IColorContrastCache } from '../../../src/browser/Types';
+import { IColorContrastCache } from 'browser/Types';
 import { DIM_OPACITY, TEXT_BASELINE } from './Constants';
 import { tryDrawCustomGlyph } from './customGlyphs/CustomGlyphRasterizer';
-import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from '../../../src/browser/renderer/shared/RendererUtils';
+import { computeNextVariantOffset, treatGlyphAsBackgroundColor, isPowerlineGlyph, isRestrictedPowerlineGlyph, throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 import { IBoundingBox, ICharAtlasConfig, IRasterizedGlyph, ITextureAtlas } from './Types';
-import { NULL_COLOR, channels, color, rgba } from '../../../src/common/Color';
-import { FourKeyMap } from '../../../src/common/MultiKeyMap';
-import { IdleTaskQueue } from '../../../src/common/TaskQueue';
-import { IColor } from '../../../src/common/Types';
-import { AttributeData } from '../../../src/common/buffer/AttributeData';
-import { Attributes, DEFAULT_COLOR, DEFAULT_EXT, UnderlineStyle } from '../../../src/common/buffer/Constants';
-import { ILogService, IUnicodeService } from '../../../src/common/services/Services';
-import { Emitter } from '../../../src/common/Event';
+import { NULL_COLOR, channels, color, rgba } from 'common/Color';
+import { FourKeyMap } from 'common/MultiKeyMap';
+import { IdleTaskQueue } from 'common/TaskQueue';
+import { IColor } from 'common/Types';
+import { AttributeData } from 'common/buffer/AttributeData';
+import { Attributes, DEFAULT_COLOR, DEFAULT_EXT, UnderlineStyle } from 'common/buffer/Constants';
+import { ILogService, IUnicodeService } from 'common/services/Services';
+import { Emitter } from 'common/Event';
 
 /**
  * A shared object which is used to draw nothing for a particular cell.
@@ -109,7 +109,6 @@ export class TextureAtlas implements ITextureAtlas {
       page.canvas.remove();
     }
     this._onAddTextureAtlasCanvas.dispose();
-    this._onRemoveTextureAtlasCanvas.dispose();
   }
 
   public warmUp(): void {
@@ -530,7 +529,7 @@ export class TextureAtlas implements ITextureAtlas {
     let customGlyph = false;
     if (this._config.customGlyphs !== false) {
       const variantOffset = this._workAttributeData.getUnderlineVariantOffset();
-      customGlyph = tryDrawCustomGlyph(this._tmpCtx, chars, padding, padding, this._config.deviceCellWidth, this._config.deviceCellHeight, this._config.deviceCharWidth, this._config.deviceCharHeight, this._config.fontSize, this._config.devicePixelRatio, this._logService, backgroundColor.css, variantOffset);
+      customGlyph = tryDrawCustomGlyph(this._tmpCtx, chars, padding, padding, this._config.deviceCellWidth, this._config.deviceCellHeight, this._config.deviceCharWidth, this._config.deviceCharHeight, this._config.fontSize, this._config.devicePixelRatio, backgroundColor.css, variantOffset);
     }
 
     // Whether to clear pixels based on a threshold difference between the glyph color and the

addons/addon-webgl/src/Types.ts

@@ -4,10 +4,10 @@
  */
 
 import { FontWeight } from '@xterm/xterm';
-import { IColorSet } from '../../../src/browser/Types';
-import { ISelectionRenderModel } from '../../../src/browser/renderer/shared/Types';
-import { CursorInactiveStyle, CursorStyle, type IDisposable } from '../../../src/common/Types';
-import type { IEvent } from '../../../src/common/Event';
+import { IColorSet } from 'browser/Types';
+import { ISelectionRenderModel } from 'browser/renderer/shared/Types';
+import { CursorInactiveStyle, CursorStyle, type IDisposable } from 'common/Types';
+import type { IEvent } from 'common/Event';
 
 export interface IRenderModel {
   cells: Uint32Array;
@@ -28,7 +28,6 @@ export interface ICursorRenderModel {
 export interface IWebGL2RenderingContext extends WebGLRenderingContext {
   vertexAttribDivisor(index: number, divisor: number): void;
   createVertexArray(): IWebGLVertexArrayObject;
-  deleteVertexArray(vao: IWebGLVertexArrayObject): void;
   bindVertexArray(vao: IWebGLVertexArrayObject): void;
   drawElementsInstanced(mode: number, count: number, type: number, offset: number, instanceCount: number): void;
 }

addons/addon-webgl/src/WebglAddon.ts

@@ -5,14 +5,14 @@
 
 import type { ITerminalAddon, Terminal } from '@xterm/xterm';
 import type { IWebglAddonOptions, WebglAddon as IWebglApi } from '@xterm/addon-webgl';
-import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from '../../../src/browser/services/Services';
-import { ITerminal } from '../../../src/browser/Types';
-import { Disposable, toDisposable } from '../../../src/common/Lifecycle';
-import { getSafariVersion, isSafari } from '../../../src/common/Platform';
-import { ICoreService, IDecorationService, ILogService, IOptionsService } from '../../../src/common/services/Services';
+import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services';
+import { ITerminal } from 'browser/Types';
+import { Disposable, toDisposable } from 'common/Lifecycle';
+import { getSafariVersion, isSafari } from 'common/Platform';
+import { ICoreService, IDecorationService, IOptionsService } from 'common/services/Services';
 import { IWebGL2RenderingContext } from './Types';
 import { WebglRenderer } from './WebglRenderer';
-import { Emitter, EventUtils } from '../../../src/common/Event';
+import { Emitter, EventUtils } from 'common/Event';
 
 export class WebglAddon extends Disposable implements ITerminalAddon, IWebglApi {
   private _terminal?: Terminal;
@@ -65,7 +65,6 @@ export class WebglAddon extends Disposable implements ITerminalAddon, IWebglApi
     const charSizeService: ICharSizeService = unsafeCore._charSizeService;
     const coreBrowserService: ICoreBrowserService = unsafeCore._coreBrowserService;
     const decorationService: IDecorationService = unsafeCore._decorationService;
-    const logService: ILogService = unsafeCore._logService;
     const themeService: IThemeService = unsafeCore._themeService;
 
     this._renderer = this._register(new WebglRenderer(
@@ -75,7 +74,6 @@ export class WebglAddon extends Disposable implements ITerminalAddon, IWebglApi
       coreBrowserService,
       coreService,
       decorationService,
-      logService,
       optionsService,
       themeService,
       this._customGlyphs,

addons/addon-webgl/src/WebglRenderer.ts

@@ -3,19 +3,19 @@
  * @license MIT
  */
 
-import { ITerminal } from '../../../src/browser/Types';
+import { ITerminal } from 'browser/Types';
 import { CellColorResolver } from './CellColorResolver';
 import { acquireTextureAtlas, removeTerminalFromCache } from './CharAtlasCache';
 import { CursorBlinkStateManager } from './CursorBlinkStateManager';
 import { observeDevicePixelDimensions } from './DevicePixelObserver';
-import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from '../../../src/browser/renderer/shared/Types';
-import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from '../../../src/browser/services/Services';
-import { CharData, IBufferLine, ICellData } from '../../../src/common/Types';
-import { AttributeData } from '../../../src/common/buffer/AttributeData';
-import { CellData } from '../../../src/common/buffer/CellData';
-import { Attributes, Content, FgFlags, NULL_CELL_CHAR, NULL_CELL_CODE } from '../../../src/common/buffer/Constants';
-import { TextBlinkStateManager } from '../../../src/browser/renderer/shared/TextBlinkStateManager';
-import { ICoreService, IDecorationService, ILogService, IOptionsService } from '../../../src/common/services/Services';
+import { IRenderDimensions, IRenderer, IRequestRedrawEvent } from 'browser/renderer/shared/Types';
+import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IThemeService } from 'browser/services/Services';
+import { CharData, IBufferLine, ICellData } from 'common/Types';
+import { AttributeData } from 'common/buffer/AttributeData';
+import { CellData } from 'common/buffer/CellData';
+import { Attributes, Content, FgFlags, NULL_CELL_CHAR, NULL_CELL_CODE } from 'common/buffer/Constants';
+import { TextBlinkStateManager } from 'browser/renderer/shared/TextBlinkStateManager';
+import { ICoreService, IDecorationService, IOptionsService } from 'common/services/Services';
 import { Terminal } from '@xterm/xterm';
 import { GlyphRenderer } from './GlyphRenderer';
 import { RectangleRenderer } from './RectangleRenderer';
@@ -23,10 +23,10 @@ import { COMBINED_CHAR_BIT_MASK, RenderModel, RenderModelConstants } from './Ren
 import { IWebGL2RenderingContext, type ITextureAtlas } from './Types';
 import { LinkRenderLayer } from './renderLayer/LinkRenderLayer';
 import { IRenderLayer } from './renderLayer/Types';
-import { Emitter, EventUtils } from '../../../src/common/Event';
-import { addDisposableListener } from '../../../src/browser/Dom';
-import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from '../../../src/common/Lifecycle';
-import { createRenderDimensions } from '../../../src/browser/renderer/shared/RendererUtils';
+import { Emitter, EventUtils } from 'common/Event';
+import { addDisposableListener } from 'browser/Dom';
+import { combinedDisposable, Disposable, MutableDisposable, toDisposable } from 'common/Lifecycle';
+import { createRenderDimensions } from 'browser/renderer/shared/RendererUtils';
 
 const enum Constants {
   MERGE_RETRY_LIMIT = 32
@@ -77,7 +77,6 @@ export class WebglRenderer extends Disposable implements IRenderer {
     private readonly _coreBrowserService: ICoreBrowserService,
     private readonly _coreService: ICoreService,
     private readonly _decorationService: IDecorationService,
-    private readonly _logService: ILogService,
     private readonly _optionsService: IOptionsService,
     private readonly _themeService: IThemeService,
     private readonly _customGlyphs: boolean = true,
@@ -123,19 +122,19 @@ export class WebglRenderer extends Disposable implements IRenderer {
     this._deviceMaxTextureSize = this._gl.getParameter(this._gl.MAX_TEXTURE_SIZE);
 
     this._register(addDisposableListener(this._canvas, 'webglcontextlost', (e) => {
-      this._logService.debug('webglcontextlost event received');
+      console.log('webglcontextlost event received');
       // Prevent the default behavior in order to enable WebGL context restoration.
       e.preventDefault();
       // Wait a few seconds to see if the 'webglcontextrestored' event is fired.
       // If not, dispatch the onContextLoss notification to observers.
       this._contextRestorationTimeout = setTimeout(() => {
         this._contextRestorationTimeout = undefined;
-        this._logService.warn('webgl context not restored; firing onContextLoss');
+        console.warn('webgl context not restored; firing onContextLoss');
         this._onContextLoss.fire(e);
       }, 3000 /* ms */);
     }));
     this._register(addDisposableListener(this._canvas, 'webglcontextrestored', (e) => {
-      this._logService.warn('webglcontextrestored event received');
+      console.warn('webglcontextrestored event received');
       clearTimeout(this._contextRestorationTimeout);
       this._contextRestorationTimeout = undefined;
       // The texture atlas and glyph renderer must be fully reinitialized
@@ -159,8 +158,6 @@ export class WebglRenderer extends Disposable implements IRenderer {
     this._isAttached = this._core.screenElement!.isConnected;
 
     this._register(toDisposable(() => {
-      clearTimeout(this._contextRestorationTimeout);
-      this._contextRestorationTimeout = undefined;
       for (const l of this._renderLayers) {
         l.dispose();
       }
@@ -277,8 +274,8 @@ export class WebglRenderer extends Disposable implements IRenderer {
    * Initializes members dependent on WebGL context state.
    */
   private _initializeWebGLState(): [RectangleRenderer, GlyphRenderer] {
-    this._rectangleRenderer.value = new RectangleRenderer(this._terminal, this._gl, this.dimensions, this._themeService, this._logService);
-    this._glyphRenderer.value = new GlyphRenderer(this._terminal, this._gl, this.dimensions, this._optionsService, this._logService);
+    this._rectangleRenderer.value = new RectangleRenderer(this._terminal, this._gl, this.dimensions, this._themeService);
+    this._glyphRenderer.value = new GlyphRenderer(this._terminal, this._gl, this.dimensions, this._optionsService);
 
     // Update dimensions and acquire char atlas
     this.handleCharSizeChanged();

addons/addon-webgl/src/WebglUtils.ts

@@ -3,8 +3,7 @@
  * @license MIT
  */
 
-import { throwIfFalsy } from '../../../src/browser/renderer/shared/RendererUtils';
-import type { ILogService } from '../../../src/common/services/Services';
+import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 
 /**
  * A matrix that when multiplies will translate 0-1 coordinates (left to right,
@@ -17,21 +16,21 @@ export const PROJECTION_MATRIX = new Float32Array([
   -1, 1, 0, 1
 ]);
 
-export function createProgram(gl: WebGLRenderingContext, vertexSource: string, fragmentSource: string, logService: ILogService): WebGLProgram | undefined {
+export function createProgram(gl: WebGLRenderingContext, vertexSource: string, fragmentSource: string): WebGLProgram | undefined {
   const program = throwIfFalsy(gl.createProgram());
-  gl.attachShader(program, throwIfFalsy(createShader(gl, gl.VERTEX_SHADER, vertexSource, logService)));
-  gl.attachShader(program, throwIfFalsy(createShader(gl, gl.FRAGMENT_SHADER, fragmentSource, logService)));
+  gl.attachShader(program, throwIfFalsy(createShader(gl, gl.VERTEX_SHADER, vertexSource)));
+  gl.attachShader(program, throwIfFalsy(createShader(gl, gl.FRAGMENT_SHADER, fragmentSource)));
   gl.linkProgram(program);
   const success = gl.getProgramParameter(program, gl.LINK_STATUS);
   if (success) {
     return program;
   }
 
-  logService.error(gl.getProgramInfoLog(program));
+  console.error(gl.getProgramInfoLog(program));
   gl.deleteProgram(program);
 }
 
-export function createShader(gl: WebGLRenderingContext, type: number, source: string, logService: ILogService): WebGLShader | undefined {
+export function createShader(gl: WebGLRenderingContext, type: number, source: string): WebGLShader | undefined {
   const shader = throwIfFalsy(gl.createShader(type));
   gl.shaderSource(shader, source);
   gl.compileShader(shader);
@@ -40,7 +39,7 @@ export function createShader(gl: WebGLRenderingContext, type: number, source: st
     return shader;
   }
 
-  logService.error(gl.getShaderInfoLog(shader));
+  console.error(gl.getShaderInfoLog(shader));
   gl.deleteShader(shader);
 }
 

addons/addon-webgl/src/customGlyphs/CustomGlyphRasterizer.ts

@@ -3,8 +3,7 @@
  * @license MIT
  */
 
-import { throwIfFalsy } from '../../../../src/browser/renderer/shared/RendererUtils';
-import type { ILogService } from '../../../../src/common/services/Services';
+import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 import { customGlyphDefinitions } from './CustomGlyphDefinitions';
 import { CustomGlyphDefinitionType, CustomGlyphScaleType, CustomGlyphVectorType, type CustomGlyphDefinitionPart, type CustomGlyphPathDrawFunctionDefinition, type CustomGlyphPatternDefinition, type ICustomGlyphSolidOctantBlockVector, type ICustomGlyphVectorShape } from './Types';
 
@@ -23,7 +22,6 @@ export function tryDrawCustomGlyph(
   deviceCharHeight: number,
   fontSize: number,
   devicePixelRatio: number,
-  logService: ILogService,
   backgroundColor?: string,
   variantOffset: number = 0
 ): boolean {
@@ -32,7 +30,7 @@ export function tryDrawCustomGlyph(
     // Normalize to array for uniform handling
     const parts = Array.isArray(unifiedCharDefinition) ? unifiedCharDefinition : [unifiedCharDefinition];
     for (const part of parts) {
-      drawDefinitionPart(ctx, part, xOffset, yOffset, deviceCellWidth, deviceCellHeight, deviceCharWidth, deviceCharHeight, fontSize, devicePixelRatio, logService, backgroundColor, variantOffset);
+      drawDefinitionPart(ctx, part, xOffset, yOffset, deviceCellWidth, deviceCellHeight, deviceCharWidth, deviceCharHeight, fontSize, devicePixelRatio, backgroundColor, variantOffset);
     }
     return true;
   }
@@ -51,7 +49,6 @@ function drawDefinitionPart(
   deviceCharHeight: number,
   fontSize: number,
   devicePixelRatio: number,
-  logService: ILogService,
   backgroundColor?: string,
   variantOffset: number = 0
 ): void {
@@ -82,7 +79,7 @@ function drawDefinitionPart(
       drawPatternChar(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, variantOffset);
       break;
     case CustomGlyphDefinitionType.PATH_FUNCTION:
-      drawPathFunctionCharacter(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, devicePixelRatio, logService, part.strokeWidth);
+      drawPathFunctionCharacter(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, devicePixelRatio, part.strokeWidth);
       break;
     case CustomGlyphDefinitionType.PATH:
       drawPathDefinitionCharacter(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, devicePixelRatio, part.strokeWidth);
@@ -91,7 +88,7 @@ function drawDefinitionPart(
       drawPathNegativeDefinitionCharacter(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, devicePixelRatio, backgroundColor);
       break;
     case CustomGlyphDefinitionType.VECTOR_SHAPE:
-      drawVectorShape(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, fontSize, devicePixelRatio, logService);
+      drawVectorShape(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight, fontSize, devicePixelRatio);
       break;
     case CustomGlyphDefinitionType.BRAILLE:
       drawBrailleCharacter(ctx, part.data, drawXOffset, drawYOffset, drawWidth, drawHeight);
@@ -513,7 +510,6 @@ function drawPathFunctionCharacter(
   deviceCellWidth: number,
   deviceCellHeight: number,
   devicePixelRatio: number,
-  logService: ILogService,
   strokeWidth?: number
 ): void {
   ctx.save();
@@ -540,7 +536,7 @@ function drawPathFunctionCharacter(
     }
     const f = svgToCanvasInstructionMap[type];
     if (!f) {
-      logService.error(`Could not find drawing instructions for "${type}"`);
+      console.error(`Could not find drawing instructions for "${type}"`);
       continue;
     }
     const args: string[] = instruction.substring(1).split(',');
@@ -602,8 +598,7 @@ function drawVectorShape(
   deviceCellWidth: number,
   deviceCellHeight: number,
   fontSize: number,
-  devicePixelRatio: number,
-  logService: ILogService
+  devicePixelRatio: number
 ): void {
   // Clip the cell to make sure drawing doesn't occur beyond bounds
   const clipRegion = new Path2D();
@@ -624,7 +619,7 @@ function drawVectorShape(
     }
     const f = svgToCanvasInstructionMap[type];
     if (!f) {
-      logService.error(`Could not find drawing instructions for "${type}"`);
+      console.error(`Could not find drawing instructions for "${type}"`);
       continue;
     }
     const args: string[] = instruction.substring(1).split(',');

addons/addon-webgl/src/renderLayer/BaseRenderLayer.ts

@@ -3,16 +3,16 @@
  * @license MIT
  */
 
-import { ReadonlyColorSet } from '../../../../src/browser/Types';
+import { ReadonlyColorSet } from 'browser/Types';
 import { acquireTextureAtlas } from '../CharAtlasCache';
-import { IRenderDimensions } from '../../../../src/browser/renderer/shared/Types';
-import { ICoreBrowserService, IThemeService } from '../../../../src/browser/services/Services';
-import { Disposable, toDisposable } from '../../../../src/common/Lifecycle';
-import { CellData } from '../../../../src/common/buffer/CellData';
-import { IOptionsService } from '../../../../src/common/services/Services';
+import { IRenderDimensions } from 'browser/renderer/shared/Types';
+import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
+import { Disposable, toDisposable } from 'common/Lifecycle';
+import { CellData } from 'common/buffer/CellData';
+import { IOptionsService } from 'common/services/Services';
 import { Terminal } from '@xterm/xterm';
 import { IRenderLayer } from './Types';
-import { throwIfFalsy } from '../../../../src/browser/renderer/shared/RendererUtils';
+import { throwIfFalsy } from 'browser/renderer/shared/RendererUtils';
 import { TEXT_BASELINE } from '../Constants';
 import type { ITextureAtlas } from '../Types';
 

addons/addon-webgl/src/renderLayer/LinkRenderLayer.ts

@@ -4,11 +4,11 @@
  */
 
 import { is256Color } from '../CharAtlasUtils';
-import { INVERTED_DEFAULT_COLOR } from '../../../../src/browser/renderer/shared/Constants';
-import { IRenderDimensions } from '../../../../src/browser/renderer/shared/Types';
-import { ICoreBrowserService, IThemeService } from '../../../../src/browser/services/Services';
-import { ILinkifier2, ILinkifierEvent } from '../../../../src/browser/Types';
-import { IOptionsService } from '../../../../src/common/services/Services';
+import { INVERTED_DEFAULT_COLOR } from 'browser/renderer/shared/Constants';
+import { IRenderDimensions } from 'browser/renderer/shared/Types';
+import { ICoreBrowserService, IThemeService } from 'browser/services/Services';
+import { ILinkifier2, ILinkifierEvent } from 'browser/Types';
+import { IOptionsService } from 'common/services/Services';
 import { Terminal } from '@xterm/xterm';
 import { BaseRenderLayer } from './BaseRenderLayer';
 

addons/addon-webgl/src/renderLayer/Types.ts

@@ -4,7 +4,7 @@
  */
 
 import { IDisposable, Terminal } from '@xterm/xterm';
-import { IRenderDimensions } from '../../../../src/browser/renderer/shared/Types';
+import { IRenderDimensions } from 'browser/renderer/shared/Types';
 
 export interface IRenderLayer extends IDisposable {
   /**

addons/addon-webgl/src/tsconfig.json

@@ -10,6 +10,20 @@
     "outDir": "../out",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "@xterm/addon-webgl": [
+        "../typings/addon-webgl.d.ts"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "downlevelIteration": true,
     "experimentalDecorators": true,
@@ -19,8 +33,7 @@
   },
   "include": [
     "./**/*",
-    "../../../typings/xterm.d.ts",
-    "../typings/addon-webgl.d.ts"
+    "../../../typings/xterm.d.ts"
   ],
   "references": [
     {

addons/addon-webgl/test/tsconfig.json

@@ -3,12 +3,23 @@
     "module": "commonjs",
     "target": "ESNext",
     "lib": [
-      "es2021"
+      "es2021",
     ],
     "rootDir": ".",
     "outDir": "../out-test",
     "sourceMap": true,
     "removeComments": true,
+    "paths": {
+      "common/*": [
+        "../../../src/common/*"
+      ],
+      "browser/*": [
+        "../../../src/browser/*"
+      ],
+      "*": [
+        "./*"
+      ]
+    },
     "strict": true,
     "types": [
       "../../../node_modules/@types/node",

addons/addon-webgl/tsconfig.json

@@ -2,11 +2,7 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "./src"
-    },
-    {
-      "path": "./test"
-    }
+    { "path": "./src" },
+    { "path": "./test" }
   ]
 }

bin/esbuild.mjs

@@ -107,20 +107,13 @@ if (config.addon) {
   };
   outConfig = {
     ...outConfig,
-    bundle: true,
-    platform: 'node',
-    packages: 'external',
     entryPoints: [`addons/addon-${config.addon}/src/**/*.ts`],
-    outdir: `addons/addon-${config.addon}/out-esbuild/`,
-    // Public API stays external; src/common|browser are bundled from source.
-    external: ['@xterm/xterm', '@xterm/headless', '@xterm/addon-*'],
+    outdir: `addons/addon-${config.addon}/out-esbuild/`
   };
-  // Playwright suites only (not run by unit tests); keep unbundled.
   outTestConfig = {
-    format: 'cjs',
-    sourcemap: true,
+    ...outConfig,
     entryPoints: [`addons/addon-${config.addon}/test/**/*.ts`],
-    outdir: `addons/addon-${config.addon}/out-esbuild-test/`,
+    outdir: `addons/addon-${config.addon}/out-esbuild-test/`
   };
 
   if (config.addon === 'ligatures') {

bin/esbuild_all.mjs

@@ -7,30 +7,19 @@ import { argv } from "process";
 /** @type {{cp: import("child_process").ChildProcessByStdio<any, any, any>, name: string}[]} */
 const jobs = [];
 
-// Core job must finish before addons (addon tests resolve src/* via out-esbuild).
-const xtermJob = createJob('xterm', []);
-const xtermCode = await new Promise(r => {
-  xtermJob.cp.on('exit', code => {
-    log(`Finished \x1b[32m${xtermJob.name}\x1b[0m${code ? ' \x1b[31mwith errors\x1b[0m' : ''}`);
-    r(code ?? 1);
-  });
-});
-if (xtermCode !== 0) {
-  process.exit(xtermCode);
-}
+// Core job
+jobs.push(createJob('xterm', []));
 
 // Addon jobs
 const addons = (await readdir('addons')).filter(e => e.startsWith('addon-')).map(e => e.replace('addon-', ''));
-/** @type {{cp: import("child_process").ChildProcessByStdio<any, any, any>, name: string}[]} */
-const addonJobs = [];
 for (const addon of addons) {
-  addonJobs.push(createJob(`xterm-addon-${addon}`, [`--addon=${addon}`]));
+  jobs.push(createJob(`xterm-addon-${addon}`, [`--addon=${addon}`]));
 }
 
 // Demo job - This requires the others to be built so it's not included when building all
 // jobs.push(createJob('demo-client', [`--demo-client`]));
 
-await Promise.all(addonJobs.map(job => {
+await Promise.all(jobs.map((job, i) => {
   return new Promise(r => {
     job.cp.on('exit', code => {
       log(`Finished \x1b[32m${job.name}\x1b[0m${code ? ' \x1b[31mwith errors\x1b[0m' : ''}`);

bin/test_unit.js

@@ -8,7 +8,7 @@ const path = require('path');
 
 const COVERAGE_LINES_THRESHOLD = 40;
 
-// Add `out-esbuild` to NODE_PATH for any remaining non-relative requires in test bundles.
+// Add `out` to the NODE_PATH so absolute paths can be resolved.
 const env = { ...process.env };
 env.NODE_PATH = path.resolve(__dirname, '../out-esbuild');
 

demo/client/components/window/optionsWindow.ts

@@ -6,7 +6,7 @@
 import { BaseWindow } from './baseWindow';
 import type { Terminal, ITheme } from '@xterm/xterm';
 import type { IControlWindow } from '../controlBar';
-import type { AddonCollection } from '../../types';
+import type { AddonCollection } from 'types';
 
 const xtermjsTheme: ITheme = Object.freeze({
   foreground: '#F8F8F8',

demo/client/components/window/testWindow.ts

@@ -7,7 +7,7 @@ import { writeUnicodeTable } from '../../unicodeTable';
 import type { IControlWindow } from '../controlBar';
 import { BaseWindow } from './baseWindow';
 import type { IDisposable, Terminal } from '@xterm/xterm';
-import type { AddonCollection } from '../../types';
+import type { AddonCollection } from 'types';
 
 export class TestWindow extends BaseWindow implements IControlWindow {
   public readonly id = 'test';

demo/client/tsconfig.json

@@ -6,7 +6,23 @@
     "rootDir": ".",
     "sourceMap": true,
     "strict": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "paths": {
+      "@xterm/addon-attach": ["../../addons/addon-attach"],
+      "@xterm/addon-clipboard": ["../../addons/addon-clipboard"],
+      "@xterm/addon-fit": ["../../addons/addon-fit"],
+      "@xterm/addon-image": ["../../addons/addon-image"],
+      "@xterm/addon-progress": ["../../addons/addon-progress"],
+      "@xterm/addon-search": ["../../addons/addon-search"],
+      "@xterm/addon-serialize": ["../../addons/addon-serialize"],
+      "@xterm/addon-web-fonts": ["../../addons/addon-web-fonts"],
+      "@xterm/addon-web-links": ["../../addons/addon-web-links"],
+      "@xterm/addon-webgl": ["../../addons/addon-webgl"],
+      "@xterm/addon-unicode11": ["../../addons/addon-unicode11"],
+      "@xterm/addon-unicode-graphemes": ["../../addons/addon-unicode-graphemes"],
+      "@xterm/addon-ligatures": ["../../addons/addon-ligatures"],
+      "*": ["./*"]
+    }
   },
   "include": [
     "./**/*",

demo/server/tsconfig.json

@@ -9,6 +9,6 @@
     "skipLibCheck": true
   },
   "include": [
-    "./**/*"
+    "./**/*",
   ]
 }

demo/tsconfig.json

@@ -1,11 +1,7 @@
 {
   "references": [
-    {
-      "path": "./client"
-    },
-    {
-      "path": "./server"
-    }
+    { "path": "./client" },
+    { "path": "./server" }
   ],
   "files": []
 }

eslint.config.mjs

@@ -86,7 +86,6 @@ export default tseslint.config(
       'eqeqeq': ['warn', 'always'],
       'jsdoc/check-alignment': 'warn',
       'jsdoc/check-param-names': 'warn',
-      'jsdoc/multiline-blocks': 'warn',
       'jsdoc/no-multi-asterisks': 'warn',
       'keyword-spacing': 'warn',
       'max-len': ['warn', {

headless/package.json

@@ -3,13 +3,15 @@
  "description": "A headless terminal component that runs in Node.js",
  "version": "6.0.0",
  "main": "lib-headless/xterm-headless.js",
- "module": "lib/xterm.mjs",
+ "module": "lib-headless/xterm-headless.mjs",
  "types": "typings/xterm-headless.d.ts",
+ "exports": {
+  "types": "./typings/xterm-headless.d.ts",
+  "import": "./lib-headless/xterm-headless.mjs",
+  "require": "./lib-headless/xterm-headless.js"
+ },
  "repository": "https://github.com/xtermjs/xterm.js",
  "license": "MIT",
- "workspaces": [
-  "addons/*"
- ],
  "keywords": [
   "cli",
   "command-line",
@@ -25,4 +27,4 @@
   "webgl",
   "xterm"
  ]
-}
+}

headless/test-node-load.cjs

@@ -1,39 +0,0 @@
-/**
- * Smoke test: @xterm/headless loads and runs in Node.js (require).
- */
-const { strictEqual } = require('node:assert');
-const { Terminal } = require('./lib-headless/xterm-headless.js');
-
-function writeSync(term, data) {
-  return new Promise(resolve => term.write(data, resolve));
-}
-
-function lineEquals(term, index, text) {
-  strictEqual(term.buffer.active.getLine(index).translateToString(true), text);
-}
-
-(async () => {
-  const term = new Terminal({ cols: 80, rows: 24, allowProposedApi: true });
-  strictEqual(term.cols, 80);
-  strictEqual(term.rows, 24);
-
-  await writeSync(term, 'hello from node');
-  lineEquals(term, 0, 'hello from node');
-
-  await writeSync(term, 'foo');
-  await writeSync(term, 'bar');
-  await writeSync(term, '文');
-  lineEquals(term, 0, 'hello from nodefoobar文');
-
-  term.resize(60, 15);
-  strictEqual(term.cols, 60);
-  strictEqual(term.rows, 15);
-
-  term.dispose();
-  strictEqual(term._core._store.isDisposed, true);
-
-  console.log('headless package (CJS): load, write, buffer, resize, dispose OK');
-})().catch(err => {
-  console.error(err);
-  process.exit(1);
-});

headless/test-node-load.mjs

@@ -1,29 +0,0 @@
-/**
- * Smoke test: @xterm/headless loads and runs in Node.js (ESM + CJS).
- */
-import { createRequire } from 'node:module';
-import { strictEqual } from 'node:assert';
-
-const require = createRequire(import.meta.url);
-
-function writeSync(term, data) {
-  return new Promise(resolve => term.write(data, resolve));
-}
-
-function lineEquals(term, index, text) {
-  strictEqual(term.buffer.active.getLine(index).translateToString(true), text);
-}
-
-const { Terminal: TerminalEsm } = await import('./lib-headless/xterm-headless.mjs');
-const termEsm = new TerminalEsm({ cols: 80, rows: 24 });
-await writeSync(termEsm, 'esm ok');
-lineEquals(termEsm, 0, 'esm ok');
-termEsm.dispose();
-
-const { Terminal: TerminalCjs } = require('./lib-headless/xterm-headless.js');
-const termCjs = new TerminalCjs({ cols: 40, rows: 10 });
-await writeSync(termCjs, 'cjs ok');
-lineEquals(termCjs, 0, 'cjs ok');
-termCjs.dispose();
-
-console.log('headless package: ESM and CJS load, write, and buffer read OK');

package.json

@@ -72,8 +72,6 @@
     "prepackage-headless": "npm run esbuild-package-headless-only",
     "package-headless": "webpack --config ./webpack.config.headless.js",
     "postpackage-headless": "node ./bin/package_headless.js",
-    "test-headless-node": "node headless/test-node-load.cjs && node headless/test-node-load.mjs",
-    "pretest-headless-node": "npm run build && npm run esbuild-package-headless-only && webpack --config ./webpack.config.headless.js",
     "prepublishOnly": "npm run package"
   },
   "devDependencies": {

src/browser/AccessibilityManager.ts

@@ -3,14 +3,14 @@
  * @license MIT
  */
 
-import * as Strings from './LocalizableStrings';
-import { ITerminal, IRenderDebouncer } from './Types';
-import { TimeBasedDebouncer } from './TimeBasedDebouncer';
-import { Disposable, toDisposable } from '../common/Lifecycle';
-import { ICoreBrowserService, IRenderService } from './services/Services';
-import { IBuffer } from '../common/buffer/Types';
-import { IInstantiationService } from '../common/services/Services';
-import { addDisposableListener } from './Dom';
+import * as Strings from 'browser/LocalizableStrings';
+import { ITerminal, IRenderDebouncer } from 'browser/Types';
+import { TimeBasedDebouncer } from 'browser/TimeBasedDebouncer';
+import { Disposable, toDisposable } from 'common/Lifecycle';
+import { ICoreBrowserService, IRenderService } from 'browser/services/Services';
+import { IBuffer } from 'common/buffer/Types';
+import { IInstantiationService } from 'common/services/Services';
+import { addDisposableListener } from 'browser/Dom';
 
 const enum Constants {
   MAX_ROWS_TO_READ = 20

src/browser/Clipboard.test.ts

@@ -4,7 +4,7 @@
  */
 
 import { assert } from 'chai';
-import * as Clipboard from './Clipboard';
+import * as Clipboard from 'browser/Clipboard';
 
 describe('evaluatePastedTextProcessing', () => {
   it('should replace carriage return and/or line feed with carriage return', () => {

src/browser/Clipboard.ts

@@ -3,8 +3,8 @@
  * @license MIT
  */
 
-import { ISelectionService } from './services/Services';
-import { ICoreService, IOptionsService } from '../common/services/Services';
+import { ISelectionService } from 'browser/services/Services';
+import { ICoreService, IOptionsService } from 'common/services/Services';
 
 /**
  * Prepares text to be pasted into the terminal by normalizing the line endings

src/browser/ColorContrastCache.test.ts

@@ -4,7 +4,7 @@
  */
 
 import { assert } from 'chai';
-import { ColorContrastCache } from './ColorContrastCache';
+import { ColorContrastCache } from 'browser/ColorContrastCache';
 
 describe('ColorContrastCache', () => {
   let cache: ColorContrastCache;

src/browser/ColorContrastCache.ts

@@ -3,9 +3,9 @@
  * @license MIT
  */
 
-import { IColorContrastCache } from './Types';
-import { IColor } from '../common/Types';
-import { TwoKeyMap } from '../common/MultiKeyMap';
+import { IColorContrastCache } from 'browser/Types';
+import { IColor } from 'common/Types';
+import { TwoKeyMap } from 'common/MultiKeyMap';
 
 export class ColorContrastCache implements IColorContrastCache {
   private _color: TwoKeyMap</* bg */number, /* fg */number, IColor | null> = new TwoKeyMap();

src/browser/CoreBrowserTerminal.ts

@@ -22,43 +22,43 @@
  */
 
 import { IDecoration, IDecorationOptions, IDisposable, ILinkProvider, IMarker, IRenderDimensions as IRenderDimensionsApi } from '@xterm/xterm';
-import { copyHandler, handlePasteEvent, moveTextAreaUnderMouseCursor, paste, rightClickHandler } from './Clipboard';
-import * as Strings from './LocalizableStrings';
-import { OscLinkProvider } from './OscLinkProvider';
-import { CharacterJoinerHandler, CustomKeyEventHandler, CustomWheelEventHandler, IBrowser, IBufferRange, ICompositionHelper, ILinkifier2, ITerminal } from './Types';
-import { Viewport } from './Viewport';
-import { BufferDecorationRenderer } from './decorations/BufferDecorationRenderer';
-import { OverviewRulerRenderer } from './decorations/OverviewRulerRenderer';
-import { CompositionHelper } from './input/CompositionHelper';
-import { DomRenderer } from './renderer/dom/DomRenderer';
-import { IRenderer } from './renderer/shared/Types';
-import { CharSizeService } from './services/CharSizeService';
-import { CharacterJoinerService } from './services/CharacterJoinerService';
-import { CoreBrowserService } from './services/CoreBrowserService';
-import { LinkProviderService } from './services/LinkProviderService';
-import { MouseCoordsService } from './services/MouseCoordsService';
-import { MouseService } from './services/MouseService';
-import { RenderService } from './services/RenderService';
-import { SelectionService } from './services/SelectionService';
-import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IKeyboardService, ILinkProviderService, IMouseCoordsService, IMouseService, IRenderService, ISelectionService, IThemeService } from './services/Services';
-import { ThemeService } from './services/ThemeService';
-import { KeyboardService } from './services/KeyboardService';
-import { channels, color, rgb } from '../common/Color';
-import { CoreTerminal } from '../common/CoreTerminal';
-import * as Browser from '../common/Platform';
-import { ColorRequestType, IColorEvent, ITerminalOptions, KeyboardResultType, SpecialColorIndex } from '../common/Types';
-import { DEFAULT_ATTR_DATA } from '../common/buffer/BufferLine';
-import { IBuffer } from '../common/buffer/Types';
-import { C0, C1ESCAPED } from '../common/data/EscapeSequences';
-import { toRgbString } from '../common/input/XParseColor';
-import { DecorationService } from '../common/services/DecorationService';
-import { IDecorationService } from '../common/services/Services';
+import { copyHandler, handlePasteEvent, moveTextAreaUnderMouseCursor, paste, rightClickHandler } from 'browser/Clipboard';
+import * as Strings from 'browser/LocalizableStrings';
+import { OscLinkProvider } from 'browser/OscLinkProvider';
+import { CharacterJoinerHandler, CustomKeyEventHandler, CustomWheelEventHandler, IBrowser, IBufferRange, ICompositionHelper, ILinkifier2, ITerminal } from 'browser/Types';
+import { Viewport } from 'browser/Viewport';
+import { BufferDecorationRenderer } from 'browser/decorations/BufferDecorationRenderer';
+import { OverviewRulerRenderer } from 'browser/decorations/OverviewRulerRenderer';
+import { CompositionHelper } from 'browser/input/CompositionHelper';
+import { DomRenderer } from 'browser/renderer/dom/DomRenderer';
+import { IRenderer } from 'browser/renderer/shared/Types';
+import { CharSizeService } from 'browser/services/CharSizeService';
+import { CharacterJoinerService } from 'browser/services/CharacterJoinerService';
+import { CoreBrowserService } from 'browser/services/CoreBrowserService';
+import { LinkProviderService } from 'browser/services/LinkProviderService';
+import { MouseCoordsService } from 'browser/services/MouseCoordsService';
+import { MouseService } from 'browser/services/MouseService';
+import { RenderService } from 'browser/services/RenderService';
+import { SelectionService } from 'browser/services/SelectionService';
+import { ICharSizeService, ICharacterJoinerService, ICoreBrowserService, IKeyboardService, ILinkProviderService, IMouseCoordsService, IMouseService, IRenderService, ISelectionService, IThemeService } from 'browser/services/Services';
+import { ThemeService } from 'browser/services/ThemeService';
+import { KeyboardService } from 'browser/services/KeyboardService';
+import { channels, color, rgb } from 'common/Color';
+import { CoreTerminal } from 'common/CoreTerminal';
+import * as Browser from 'common/Platform';
+import { ColorRequestType, IColorEvent, ITerminalOptions, KeyboardResultType, SpecialColorIndex } from 'common/Types';
+import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
+import { IBuffer } from 'common/buffer/Types';
+import { C0, C1ESCAPED } from 'common/data/EscapeSequences';
+import { toRgbString } from 'common/input/XParseColor';
+import { DecorationService } from 'common/services/DecorationService';
+import { IDecorationService } from 'common/services/Services';
 import { WindowsOptionsReportType } from '../common/InputHandler';
 import { AccessibilityManager } from './AccessibilityManager';
 import { Linkifier } from './Linkifier';
-import { Emitter, EventUtils, type IEvent } from '../common/Event';
-import { addDisposableListener } from './Dom';
-import { MutableDisposable, toDisposable } from '../common/Lifecycle';
+import { Emitter, EventUtils, type IEvent } from 'common/Event';
+import { addDisposableListener } from 'browser/Dom';
+import { MutableDisposable, toDisposable } from 'common/Lifecycle';
 
 export class CoreBrowserTerminal extends CoreTerminal implements ITerminal {
   public textarea: HTMLTextAreaElement | undefined;
@@ -563,9 +563,8 @@ export class CoreBrowserTerminal extends CoreTerminal implements ITerminal {
 
     try {
       this._onWillOpen.fire(this.element);
-    } catch (e) {
-      this._logService.error('onWillOpen handler threw an exception', e);
     }
+    catch { /* fails to load addon for some reason */ }
     if (!this._renderService.hasRenderer()) {
       this._renderService.setRenderer(this._createRenderer());
     }

src/browser/Dom.ts

@@ -5,8 +5,8 @@
  * Minimal DOM helpers for xterm.js browser code.
  */
 
-import { IntervalTimer } from '../common/Async';
-import { IDisposable } from '../common/Lifecycle';
+import { IntervalTimer } from 'common/Async';
+import { IDisposable } from 'common/Lifecycle';
 
 export function getWindow(e: Node | UIEvent | undefined | null): Window {
   const candidateNode = e as Node | undefined | null;

src/browser/Linkifier.test.ts

@@ -4,11 +4,11 @@
  */
 
 import { assert } from 'chai';
-import { IBufferService } from '../common/services/Services';
+import { IBufferService } from 'common/services/Services';
 import { Linkifier } from './Linkifier';
-import { MockBufferService } from '../common/TestUtils.test';
-import { ILink } from './Types';
-import { LinkProviderService } from './services/LinkProviderService';
+import { MockBufferService } from 'common/TestUtils.test';
+import { ILink } from 'browser/Types';
+import { LinkProviderService } from 'browser/services/LinkProviderService';
 import jsdom = require('jsdom');
 
 class TestLinkifier2 extends Linkifier {
@@ -43,20 +43,6 @@ describe('Linkifier2', () => {
     },
     activate: () => { }
   };
-  const multiLineLink: ILink = {
-    text: 'foo',
-    range: {
-      start: {
-        x: 2,
-        y: 1
-      },
-      end: {
-        x: 4,
-        y: 2
-      }
-    },
-    activate: () => { }
-  };
 
   beforeEach(() => {
     const dom = new jsdom.JSDOM();
@@ -100,30 +86,4 @@ describe('Linkifier2', () => {
     linkifier.linkLeave({ classList: { add: () => { } } } as any, link, {} as any);
   });
 
-  it('onShowLinkUnderline event range is correct for wrapped links', done => {
-    linkifier.onShowLinkUnderline(e => {
-      assert.equal(multiLineLink.range.start.x - 1, e.x1);
-      assert.equal(multiLineLink.range.start.y - 1, e.y1);
-      assert.equal(multiLineLink.range.end.x, e.x2);
-      assert.equal(multiLineLink.range.end.y - 1, e.y2);
-
-      done();
-    });
-
-    linkifier.linkHover({ classList: { add: () => { } } } as any, multiLineLink, {} as any);
-  });
-
-  it('onHideLinkUnderline event range is correct for wrapped links', done => {
-    linkifier.onHideLinkUnderline(e => {
-      assert.equal(multiLineLink.range.start.x - 1, e.x1);
-      assert.equal(multiLineLink.range.start.y - 1, e.y1);
-      assert.equal(multiLineLink.range.end.x, e.x2);
-      assert.equal(multiLineLink.range.end.y - 1, e.y2);
-
-      done();
-    });
-
-    linkifier.linkLeave({ classList: { add: () => { } } } as any, multiLineLink, {} as any);
-  });
-
 });

src/browser/Linkifier.ts

@@ -3,13 +3,13 @@
  * @license MIT
  */
 
-import { IBufferCellPosition, ILink, ILinkDecorations, ILinkWithState, ILinkifier2, ILinkifierEvent } from './Types';
-import { Disposable, dispose, toDisposable } from '../common/Lifecycle';
-import { IDisposable } from '../common/Types';
-import { IBufferService } from '../common/services/Services';
+import { IBufferCellPosition, ILink, ILinkDecorations, ILinkWithState, ILinkifier2, ILinkifierEvent } from 'browser/Types';
+import { Disposable, dispose, toDisposable } from 'common/Lifecycle';
+import { IDisposable } from 'common/Types';
+import { IBufferService } from 'common/services/Services';
 import { ILinkProviderService, IMouseCoordsService, IRenderService } from './services/Services';
-import { Emitter } from '../common/Event';
-import { addDisposableListener } from './Dom';
+import { Emitter } from 'common/Event';
+import { addDisposableListener } from 'browser/Dom';
 
 export class Linkifier extends Disposable implements ILinkifier2 {
   public get currentLink(): ILinkWithState | undefined { return this._currentLink; }