@xterm/xterm 6.1.0-beta.26 → 6.1.0-beta.260

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xterm/xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "6.1.0-beta.26",
+  "version": "6.1.0-beta.260",
   "main": "lib/xterm.js",
   "module": "lib/xterm.mjs",
   "style": "css/xterm.css",
@@ -27,37 +27,45 @@
     "xterm"
   ],
   "scripts": {
-    "setup": "npm run build",
+    "presetup": "npm run build",
+    "setup": "npm run esbuild",
+    "setup-full": "node bin/setup-full.mjs",
+    "postsetup": "npm run esbuild-demo-server",
     "start": "node demo/start",
+    "dev": "concurrently -k -p [{name}] -n tsc,esbuild,esbuild-demo-client,esbuild-demo-server,server -c blue,yellow,cyan,green,magenta \"npm:tsc-watch\" \"npm:esbuild-watch\" \"npm:esbuild-demo-client-watch\" \"npm:esbuild-demo-server-watch\" \"npm:start\"",
     "build": "npm run tsc",
     "watch": "npm run tsc-watch",
-    "tsc": "tsc -b ./tsconfig.all.json",
-    "tsc-watch": "tsc -b -w ./tsconfig.all.json --preserveWatchOutput",
+    "tsc": "tsgo -b ./tsconfig.all.json",
+    "tsc-watch": "tsgo -b -w ./tsconfig.all.json --preserveWatchOutput",
     "esbuild": "node bin/esbuild_all.mjs",
     "esbuild-watch": "node bin/esbuild_all.mjs --watch",
     "esbuild-package": "node bin/esbuild_all.mjs --prod",
     "esbuild-package-watch": "node bin/esbuild_all.mjs --prod --watch",
     "esbuild-package-headless-only": "node bin/esbuild.mjs --prod --headless",
-    "esbuild-demo": "node bin/esbuild.mjs --demo-client",
-    "esbuild-demo-watch": "node bin/esbuild.mjs --demo-client --watch",
+    "esbuild-demo-client": "node bin/esbuild.mjs --demo-client",
+    "esbuild-demo-client-watch": "node bin/esbuild.mjs --demo-client --watch",
+    "esbuild-demo-server": "node bin/esbuild.mjs --demo-server",
+    "esbuild-demo-server-watch": "node bin/esbuild.mjs --demo-server --watch",
     "test": "npm run test-unit",
     "posttest": "npm run lint",
-    "lint": "eslint --max-warnings 0 src/ addons/",
-    "lint-fix": "eslint --fix src/ addons/",
-    "lint-api": "eslint --config eslint.config.typings.mjs --max-warnings 0 typings/",
+    "lint": "oxlint --type-aware --max-warnings 0 src addons demo test && eslint --config eslint.config.naming.mjs --max-warnings 0 src addons demo test",
+    "lint-changes": "node ./bin/lint_changes.js",
+    "lint-changes-fix": "node ./bin/lint_changes.js --fix",
+    "lint-fix": "oxlint --type-aware --fix --max-warnings 0 src addons demo test",
+    "lint-api": "oxlint --max-warnings 0 -c .oxlintrc.typings.json typings && eslint --config eslint.config.naming.mjs --max-warnings 0 typings",
     "test-unit": "node ./bin/test_unit.js",
+    "test-unit-slow-tests": "npm run test-unit | grep \"ms)\"",
     "test-unit-coverage": "node ./bin/test_unit.js --coverage",
-    "test-unit-dev": "cross-env NODE_PATH='./out' mocha",
     "test-integration": "node ./bin/test_integration.js --workers=75%",
-    "test-integration-chromium": "node ./bin/test_integration.js --workers=75% \"--project=ChromeStable\"",
+    "test-integration-chromium": "node ./bin/test_integration.js --workers=75% \"--project=Chromium\"",
     "test-integration-firefox": "node ./bin/test_integration.js --workers=75% \"--project=FirefoxStable\"",
     "test-integration-webkit": "node ./bin/test_integration.js --workers=75% \"--project=WebKit\"",
     "test-integration-debug": "node ./bin/test_integration.js  --workers=1 --headed --timeout=30000",
-    "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json",
-    "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/*benchmark.js",
-    "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/*benchmark.js",
+    "benchmark": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json",
+    "benchmark-baseline": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/*benchmark.js",
+    "benchmark-eval": "xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/*benchmark.js",
     "clean": "rm -rf lib out addons/*/lib addons/*/out",
-    "vtfeatures": "node bin/extract_vtfeatures.js src/**/*.ts src/*.ts",
+    "vtfeatures": "node bin/extract_vtfeatures.js src/*/*.ts src/*/*/*.ts src/*.ts addons/**/src/*.ts",
     "prepackage": "npm run build",
     "package": "webpack",
     "postpackage": "npm run esbuild-package",
@@ -67,46 +75,46 @@
     "prepublishOnly": "npm run package"
   },
   "devDependencies": {
+    "@eslint/js": "^10.0.1",
     "@lunapaint/png-codec": "^0.2.0",
-    "@playwright/test": "^1.37.1",
-    "@stylistic/eslint-plugin": "^4.4.1",
-    "@types/chai": "^4.2.22",
-    "@types/debug": "^4.1.7",
-    "@types/deep-equal": "^1.0.1",
-    "@types/express": "4",
+    "@playwright/test": "^1.59.1",
+    "@stylistic/eslint-plugin": "^5.10.0",
+    "@types/chai": "^5.2.3",
+    "@types/express": "^5.0.6",
     "@types/express-ws": "^3.0.1",
-    "@types/jsdom": "^27.0.0",
-    "@types/mocha": "^9.0.0",
+    "@types/jsdom": "^28.0.1",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^22.19.3",
-    "@types/trusted-types": "^1.0.6",
-    "@types/utf8": "^3.0.0",
     "@types/webpack": "^5.28.0",
     "@types/ws": "^8.2.0",
-    "@typescript-eslint/eslint-plugin": "^8.50.1",
-    "@typescript-eslint/parser": "^8.50.1",
-    "chai": "^4.3.4",
-    "cross-env": "^7.0.3",
-    "deep-equal": "^2.0.5",
-    "esbuild": "~0.25.2",
-    "eslint": "^9.39.2",
-    "eslint-plugin-jsdoc": "^50.8.0",
-    "express": "^4.19.2",
+    "@typescript-eslint/eslint-plugin": "^8.59.2",
+    "@typescript-eslint/parser": "^8.59.2",
+    "@typescript/native-preview": "^7.0.0-dev.20260509.2",
+    "chai": "^6.2.2",
+    "concurrently": "^9.1.2",
+    "esbuild": "^0.28.0",
+    "eslint": "^10.3.0",
+    "eslint-plugin-jsdoc": "^62.9.0",
+    "eslint-plugin-oxlint": "^1.67.0",
+    "express": "^5.2.1",
     "express-ws": "^5.0.2",
-    "jsdom": "^27.3.0",
-    "mocha": "^10.1.0",
+    "jsdom": "^29.1.1",
+    "mocha": "^11.7.5",
     "mustache": "^4.2.0",
-    "node-pty": "1.1.0-beta19",
-    "nyc": "^17.1.0",
-    "source-map-loader": "^3.0.0",
+    "node-pty": "^1.2.0-beta.9",
+    "nyc": "^18.0.0",
+    "oxlint": "^1.67.0",
+    "oxlint-plugin-eslint": "^1.67.0",
+    "oxlint-tsgolint": "^0.23.0",
+    "source-map-loader": "^5.0.0",
     "source-map-support": "^0.5.20",
-    "ts-loader": "^9.3.1",
-    "typescript": "5.5",
-    "typescript-eslint": "^8.50.1",
-    "utf8": "^3.0.0",
-    "webpack": "^5.61.0",
-    "webpack-cli": "^4.9.1",
-    "ws": "^8.2.3",
-    "xterm-benchmark": "^0.3.1"
+    "ts-loader": "^9.5.7",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.59.2",
+    "webpack": "^5.106.2",
+    "webpack-cli": "^7.0.2",
+    "ws": "^8.20.0",
+    "xterm-benchmark": "^0.3.2"
   },
-  "commit": "79621a4e3fec1e2a5311d351e2eeec7a4e91785d"
+  "commit": "936442c813eb497af957409c224ed0e250600640"
 }

package/src/browser/AccessibilityManager.ts

@@ -3,16 +3,18 @@
  * @license MIT
  */
 
-import * as Strings from 'browser/LocalizableStrings';
-import { ITerminal, IRenderDebouncer } from 'browser/Types';
-import { TimeBasedDebouncer } from 'browser/TimeBasedDebouncer';
-import { Disposable, toDisposable } from 'vs/base/common/lifecycle';
-import { ICoreBrowserService, IRenderService } from 'browser/services/Services';
-import { IBuffer } from 'common/buffer/Types';
-import { IInstantiationService } from 'common/services/Services';
-import { addDisposableListener } from 'vs/base/browser/dom';
-
-const MAX_ROWS_TO_READ = 20;
+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';
+
+const enum Constants {
+  MAX_ROWS_TO_READ = 20
+}
 
 const enum BoundaryPosition {
   TOP,
@@ -137,7 +139,7 @@ export class AccessibilityManager extends Disposable {
   }
 
   private _handleChar(char: string): void {
-    if (this._liveRegionLineCount < MAX_ROWS_TO_READ + 1) {
+    if (this._liveRegionLineCount < Constants.MAX_ROWS_TO_READ + 1) {
       if (this._charsToConsume.length > 0) {
         // Have the screen reader ignore the char if it was just input
         const shiftedChar = this._charsToConsume.shift();
@@ -150,8 +152,8 @@ export class AccessibilityManager extends Disposable {
 
       if (char === '\n') {
         this._liveRegionLineCount++;
-        if (this._liveRegionLineCount === MAX_ROWS_TO_READ + 1) {
-          this._liveRegion.textContent += Strings.tooMuchOutput.get();
+        if (this._liveRegionLineCount === Constants.MAX_ROWS_TO_READ + 1) {
+          this._liveRegion.textContent = Strings.tooMuchOutput.get();
         }
       }
     }
@@ -203,6 +205,9 @@ export class AccessibilityManager extends Disposable {
     if (this._charsToAnnounce.length === 0) {
       return;
     }
+    if (this._liveRegion.textContent === Strings.tooMuchOutput.get()) {
+      this._clearLiveRegion();
+    }
     this._liveRegion.textContent += this._charsToAnnounce;
     this._charsToAnnounce = '';
   }

package/src/browser/Clipboard.ts

@@ -3,8 +3,8 @@
  * @license MIT
  */
 
-import { ISelectionService } from 'browser/services/Services';
-import { ICoreService, IOptionsService } from 'common/services/Services';
+import { ISelectionService } from './services/Services';
+import { ICoreService, IOptionsService } from '../common/services/Services';
 
 /**
  * Prepares text to be pasted into the terminal by normalizing the line endings
@@ -19,10 +19,13 @@ export function prepareTextForTerminal(text: string): string {
  * @param text The pasted text to bracket
  */
 export function bracketTextForPaste(text: string, bracketedPasteMode: boolean): string {
-  if (bracketedPasteMode) {
-    return '\x1b[200~' + text + '\x1b[201~';
+  if (!bracketedPasteMode) {
+    return text;
   }
-  return text;
+  // Sanitize pasted text to prevent injected escape sequences (e.g. exiting bracketed paste)
+  // by replacing ESC (\x1b) with its visible representation U+241B (␛).
+  const sanitizedText = text.replace(/\x1b/g, '\u241b');
+  return `\x1b[200~${sanitizedText}\x1b[201~`;
 }
 
 /**

package/src/browser/ColorContrastCache.ts

@@ -3,9 +3,9 @@
  * @license MIT
  */
 
-import { IColorContrastCache } from 'browser/Types';
-import { IColor } from 'common/Types';
-import { TwoKeyMap } from 'common/MultiKeyMap';
+import { IColorContrastCache } from './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();