[pull] master from xtermjs:master

.gitignore

@@ -19,6 +19,7 @@ npm-debug.log
 build/
 .DS_Store
 yarn.lock
+test-results/
 
 # Keep bundled code out of Git
 dist/

addons/addon-serialize/src/SerializeAddon.ts

@@ -490,6 +490,7 @@ export class SerializeAddon implements ITerminalAddon , ISerializeApi {
     if (modes.originMode) content += '\x1b[?6h';
     if (modes.reverseWraparoundMode) content += '\x1b[?45h';
     if (modes.sendFocusMode) content += '\x1b[?1004h';
+    // synchronizedOutputMode doesn't need to be serialized as it's a temporary mode
 
     // Default: true
     if (modes.wraparoundMode === false) content += '\x1b[?7l';

addons/addon-unicode-graphemes/package.json

@@ -6,7 +6,7 @@
     "url": "https://xtermjs.org/"
   },
   "main": "lib/addon-unicode-graphemes.js",
-  "module": "lib/.addon-unicode-graphemes.mjs",
+  "module": "lib/addon-unicode-graphemes.mjs",
   "types": "typings/addon-unicode-graphemes.d.ts",
   "repository": "https://github.com/xtermjs/xterm.js/tree/master/addons/addon-unicode-graphemes",
   "license": "MIT",

demo/client.ts

@@ -1310,23 +1310,25 @@ function addVtButtons(): void {
   }
   const vtFragment = document.createDocumentFragment();
   const buttonSpecs: { [key: string]: { label: string, description: string, paramCount?: number }} = {
-    A:     { label: 'CUU ↑',    description: 'Cursor Up Ps Times' },
-    B:     { label: 'CUD ↓',    description: 'Cursor Down Ps Times' },
-    C:     { label: 'CUF →',    description: 'Cursor Forward Ps Times' },
-    D:     { label: 'CUB ←',    description: 'Cursor Backward Ps Times' },
-    E:     { label: 'CNL',      description: 'Cursor Next Line Ps Times' },
-    F:     { label: 'CPL',      description: 'Cursor Preceding Line Ps Times' },
-    G:     { label: 'CHA',      description: 'Cursor Character Absolute' },
-    H:     { label: 'CUP',      description: 'Cursor Position [row;column]', paramCount: 2 },
-    I:     { label: 'CHT',      description: 'Cursor Forward Tabulation Ps tab stops' },
-    J:     { label: 'ED',       description: 'Erase in Display' },
-    '?|J': { label: 'DECSED',   description: 'Erase in Display' },
-    K:     { label: 'EL',       description: 'Erase in Line' },
-    '?|K': { label: 'DECSEL',   description: 'Erase in Line' },
-    L:     { label: 'IL',       description: 'Insert Ps Line(s)' },
-    M:     { label: 'DL',       description: 'Delete Ps Line(s)' },
-    P:     { label: 'DCH',      description: 'Delete Ps Character(s)' },
-    ' q':  { label: 'DECSCUSR', description: 'Set Cursor Style', paramCount: 1 }
+    A:         { label: 'CUU ↑',    description: 'Cursor Up Ps Times' },
+    B:         { label: 'CUD ↓',    description: 'Cursor Down Ps Times' },
+    C:         { label: 'CUF →',    description: 'Cursor Forward Ps Times' },
+    D:         { label: 'CUB ←',    description: 'Cursor Backward Ps Times' },
+    E:         { label: 'CNL',      description: 'Cursor Next Line Ps Times' },
+    F:         { label: 'CPL',      description: 'Cursor Preceding Line Ps Times' },
+    G:         { label: 'CHA',      description: 'Cursor Character Absolute' },
+    H:         { label: 'CUP',      description: 'Cursor Position [row;column]', paramCount: 2 },
+    I:         { label: 'CHT',      description: 'Cursor Forward Tabulation Ps tab stops' },
+    J:         { label: 'ED',       description: 'Erase in Display' },
+    '?|J':     { label: 'DECSED',   description: 'Erase in Display' },
+    K:         { label: 'EL',       description: 'Erase in Line' },
+    '?|K':     { label: 'DECSEL',   description: 'Erase in Line' },
+    L:         { label: 'IL',       description: 'Insert Ps Line(s)' },
+    M:         { label: 'DL',       description: 'Delete Ps Line(s)' },
+    P:         { label: 'DCH',      description: 'Delete Ps Character(s)' },
+    ' q':      { label: 'DECSCUSR', description: 'Set Cursor Style' },
+    '?2026h':  { label: 'BSU',      description: 'Begin synchronized update', paramCount: 0 },
+    '?2026l':  { label: 'ESU',      description: 'End synchronized update', paramCount: 0 }
   };
   for (const s of Object.keys(buttonSpecs)) {
     const spec = buttonSpecs[s];

headless/package.json

@@ -5,6 +5,11 @@
  "main": "lib-headless/xterm-headless.js",
  "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",
  "keywords": [

package.json

@@ -75,7 +75,6 @@
     "@types/deep-equal": "^1.0.1",
     "@types/express": "4",
     "@types/express-ws": "^3.0.1",
-    "@types/glob": "^7.2.0",
     "@types/jsdom": "^16.2.13",
     "@types/mocha": "^9.0.0",
     "@types/node": "^18.16.0",
@@ -93,7 +92,6 @@
     "eslint-plugin-jsdoc": "^46.9.1",
     "express": "^4.19.2",
     "express-ws": "^5.0.2",
-    "glob": "^7.2.0",
     "jsdom": "^18.0.1",
     "mocha": "^10.1.0",
     "mustache": "^4.2.0",

src/browser/Terminal2.test.ts

@@ -3,7 +3,6 @@
  * @license MIT
  */
 
-import * as glob from 'glob';
 import * as path from 'path';
 import * as os from 'os';
 import * as fs from 'fs';
@@ -15,7 +14,10 @@ import { IDisposable } from '@xterm/xterm';
 const COLS = 80;
 const ROWS = 25;
 
-const TESTFILES = glob.sync('**/escape_sequence_files/*.in', { cwd: path.join(__dirname, '../..')});
+const escapeSequenceFilesDir = path.join(__dirname, '../../fixtures/escape_sequence_files');
+const TESTFILES = fs.readdirSync(escapeSequenceFilesDir)
+  .filter(f => f.endsWith('.in'))
+  .map(f => path.join(escapeSequenceFilesDir, f));
 const SKIP_FILES = [
   't0055-EL.in',            // EL/ED handle cursor at cols differently (see #3362)
   't0084-CBT.in',
@@ -33,7 +35,7 @@ if (os.platform() === 'darwin') {
   );
 }
 // filter skipFilenames
-const FILES = TESTFILES.filter(value => !SKIP_FILES.includes(value.split('/').slice(-1)[0]));
+const FILES = TESTFILES.filter(value => !SKIP_FILES.includes(path.basename(value)));
 
 describe('Escape Sequence Files', function(): void {
   this.timeout(1000);
@@ -62,7 +64,7 @@ describe('Escape Sequence Files', function(): void {
   });
 
   for (const filename of FILES) {
-    (process.platform === 'win32' ? it.skip : it)(filename.split('/').slice(-1)[0], async () => {
+    (process.platform === 'win32' ? it.skip : it)(path.basename(filename), async () => {
       // reset terminal and handler
       if (customHandler) {
         customHandler.dispose();
@@ -88,7 +90,7 @@ describe('Escape Sequence Files', function(): void {
       });
 
       // compare with expected output (right trimmed)
-      const expected = fs.readFileSync(filename.split('.')[0] + '.text', 'utf8');
+      const expected = fs.readFileSync(filename.replace(/\.in$/, '.text'), 'utf8');
       const expectedRightTrimmed = expected.split('\n').map(l => l.replace(/\s+$/, '')).join('\n');
       if (content !== expectedRightTrimmed) {
         throw new Error(formatError(fs.readFileSync(filename, 'utf8'), content, expected));

src/browser/public/Terminal.ts

@@ -123,6 +123,7 @@ export class Terminal extends Disposable implements ITerminalApi {
       originMode: m.origin,
       reverseWraparoundMode: m.reverseWraparound,
       sendFocusMode: m.sendFocus,
+      synchronizedOutputMode: m.synchronizedOutput,
       wraparoundMode: m.wraparound
     };
   }