Replace all instances of xterm-addon

.eslintrc.json

@@ -14,27 +14,27 @@
       "test/api/tsconfig.json",
       "test/benchmark/tsconfig.json",
       "test/playwright/tsconfig.json",
-      "addons/xterm-addon-attach/src/tsconfig.json",
-      "addons/xterm-addon-attach/test/tsconfig.json",
-      "addons/xterm-addon-canvas/src/tsconfig.json",
-      "addons/xterm-addon-canvas/test/tsconfig.json",
-      "addons/xterm-addon-fit/src/tsconfig.json",
-      "addons/xterm-addon-fit/test/tsconfig.json",
-      "addons/xterm-addon-image/src/tsconfig.json",
-      "addons/xterm-addon-image/test/tsconfig.json",
-      "addons/xterm-addon-ligatures/src/tsconfig.json",
-      "addons/xterm-addon-search/src/tsconfig.json",
-      "addons/xterm-addon-search/test/tsconfig.json",
-      "addons/xterm-addon-serialize/src/tsconfig.json",
-      "addons/xterm-addon-serialize/test/tsconfig.json",
-      "addons/xterm-addon-serialize/benchmark/tsconfig.json",
-      "addons/xterm-addon-unicode11/src/tsconfig.json",
-      "addons/xterm-addon-unicode11/test/tsconfig.json",
-      "addons/xterm-addon-unicode-graphemes/src/tsconfig.json",
-      "addons/xterm-addon-unicode-graphemes/test/tsconfig.json",
-      "addons/xterm-addon-unicode-graphemes/benchmark/tsconfig.json",
-      "addons/xterm-addon-web-links/src/tsconfig.json",
-      "addons/xterm-addon-web-links/test/tsconfig.json",
+      "addons/addon-attach/src/tsconfig.json",
+      "addons/addon-attach/test/tsconfig.json",
+      "addons/addon-canvas/src/tsconfig.json",
+      "addons/addon-canvas/test/tsconfig.json",
+      "addons/addon-fit/src/tsconfig.json",
+      "addons/addon-fit/test/tsconfig.json",
+      "addons/addon-image/src/tsconfig.json",
+      "addons/addon-image/test/tsconfig.json",
+      "addons/addon-ligatures/src/tsconfig.json",
+      "addons/addon-search/src/tsconfig.json",
+      "addons/addon-search/test/tsconfig.json",
+      "addons/addon-serialize/src/tsconfig.json",
+      "addons/addon-serialize/test/tsconfig.json",
+      "addons/addon-serialize/benchmark/tsconfig.json",
+      "addons/addon-unicode11/src/tsconfig.json",
+      "addons/addon-unicode11/test/tsconfig.json",
+      "addons/addon-unicode-graphemes/src/tsconfig.json",
+      "addons/addon-unicode-graphemes/test/tsconfig.json",
+      "addons/addon-unicode-graphemes/benchmark/tsconfig.json",
+      "addons/addon-web-links/src/tsconfig.json",
+      "addons/addon-web-links/test/tsconfig.json",
       "addons/addon-webgl/src/tsconfig.json",
       "addons/addon-webgl/test/tsconfig.json"
     ],

.github/workflows/ci.yml

@@ -26,26 +26,26 @@ jobs:
         zip -r compressed-build \
           ./out/* \
           ./out-test/* \
-          ./addons/xterm-addon-attach/out/* \
-          ./addons/xterm-addon-attach/out-test/* \
-          ./addons/xterm-addon-canvas/out/* \
-          ./addons/xterm-addon-canvas/out-test/* \
-          ./addons/xterm-addon-fit/out/* \
-          ./addons/xterm-addon-fit/out-test/* \
-          ./addons/xterm-addon-image/out/* \
-          ./addons/xterm-addon-image/out-test/* \
-          ./addons/xterm-addon-ligatures/out/* \
-          ./addons/xterm-addon-ligatures/out-test/* \
-          ./addons/xterm-addon-search/out/* \
-          ./addons/xterm-addon-search/out-test/* \
-          ./addons/xterm-addon-serialize/out/* \
-          ./addons/xterm-addon-serialize/out-test/* \
-          ./addons/xterm-addon-unicode11/out/* \
-          ./addons/xterm-addon-unicode11/out-test/* \
-          ./addons/xterm-addon-unicode-graphemes/out/* \
-          ./addons/xterm-addon-unicode-graphemes/out-test/* \
-          ./addons/xterm-addon-web-links/out/* \
-          ./addons/xterm-addon-web-links/out-test/* \
+          ./addons/addon-attach/out/* \
+          ./addons/addon-attach/out-test/* \
+          ./addons/addon-canvas/out/* \
+          ./addons/addon-canvas/out-test/* \
+          ./addons/addon-fit/out/* \
+          ./addons/addon-fit/out-test/* \
+          ./addons/addon-image/out/* \
+          ./addons/addon-image/out-test/* \
+          ./addons/addon-ligatures/out/* \
+          ./addons/addon-ligatures/out-test/* \
+          ./addons/addon-search/out/* \
+          ./addons/addon-search/out-test/* \
+          ./addons/addon-serialize/out/* \
+          ./addons/addon-serialize/out-test/* \
+          ./addons/addon-unicode11/out/* \
+          ./addons/addon-unicode11/out-test/* \
+          ./addons/addon-unicode-graphemes/out/* \
+          ./addons/addon-unicode-graphemes/out-test/* \
+          ./addons/addon-web-links/out/* \
+          ./addons/addon-web-links/out-test/* \
           ./addons/addon-webgl/out/* \
           ./addons/addon-webgl/out-test/*
     - name: Upload artifacts
@@ -265,8 +265,8 @@ jobs:
       run: yarn build-demo
     - name: Integration tests (core) # Tests use 50% workers to reduce flakiness
       run: yarn test-playwright-${{ matrix.browser }} --workers=50% --forbid-only --suite=core
-    - name: Integration tests (xterm-addon-canvas)
-      run: yarn test-playwright-${{ matrix.browser }} --workers=50% --forbid-only --suite=xterm-addon-canvas
+    - name: Integration tests (addon-canvas)
+      run: yarn test-playwright-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-canvas
     - name: Integration tests (addon-webgl)
       run: yarn test-playwright-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-webgl
 

README.md

@@ -59,14 +59,14 @@ import { Terminal } from '@xterm/xterm';
 Addons are separate modules that extend the `Terminal` by building on the [xterm.js API](https://github.com/xtermjs/xterm.js/blob/master/typings/xterm.d.ts). To use an addon, you first need to install it in your project:
 
 ```bash
-npm i -S xterm-addon-web-links
+npm i -S @xterm/addon-web-links
 ```
 
 Then import the addon, instantiate it and call `Terminal.loadAddon`:
 
 ```ts
 import { Terminal } from '@xterm/xterm';
-import { WebLinksAddon } from 'xterm-addon-web-links';
+import { WebLinksAddon } from '@xterm/addon-web-links';
 
 const terminal = new Terminal();
 // Load WebLinksAddon on terminal, this is all that's needed to get web links
@@ -76,10 +76,10 @@ terminal.loadAddon(new WebLinksAddon());
 
 The xterm.js team maintains the following addons, but anyone can build them:
 
-- [`xterm-addon-attach`](https://github.com/xtermjs/xterm.js/tree/master/addons/xterm-addon-attach): Attaches to a server running a process via a websocket
-- [`xterm-addon-fit`](https://github.com/xtermjs/xterm.js/tree/master/addons/xterm-addon-fit): Fits the terminal to the containing element
-- [`xterm-addon-search`](https://github.com/xtermjs/xterm.js/tree/master/addons/xterm-addon-search): Adds search functionality
-- [`xterm-addon-web-links`](https://github.com/xtermjs/xterm.js/tree/master/addons/xterm-addon-web-links): Adds web link detection and interaction
+- [`@xterm/addon-attach`](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-attach): Attaches to a server running a process via a websocket
+- [`@xterm/addon-fit`](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-fit): Fits the terminal to the containing element
+- [`@xterm/addon-search`](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-search): Adds search functionality
+- [`@xterm/addon-web-links`](https://github.com/xtermjs/xterm.js/tree/master/addons/addon-web-links): Adds web link detection and interaction
 
 ## Browser Support
 

addons/xterm-addon-attach/README.md → addons/addon-attach/README.md

@@ -1,22 +1,22 @@
-## xterm-addon-attach
+## @xterm/addon-attach
 
 An addon for [xterm.js](https://github.com/xtermjs/xterm.js) that enables attaching to a web socket. This addon requires xterm.js v4+.
 
 ### Install
 
 ```bash
-npm install --save xterm-addon-attach
+npm install --save @xterm/addon-attach
 ```
 
 ### Usage
 
 ```ts
 import { Terminal } from '@xterm/xterm';
-import { AttachAddon } from 'xterm-addon-attach';
+import { AttachAddon } from '@xterm/addon-attach';
 
 const terminal = new Terminal();
 const attachAddon = new AttachAddon(webSocket);
 terminal.loadAddon(attachAddon);
 ```
 
-See the full [API](https://github.com/xtermjs/xterm.js/blob/master/addons/xterm-addon-attach/typings/xterm-addon-attach.d.ts) for more advanced usage.
+See the full [API](https://github.com/xtermjs/xterm.js/blob/master/addons/addon-attach/typings/addon-attach.d.ts) for more advanced usage.

addons/xterm-addon-attach/package.json → addons/addon-attach/package.json

@@ -1,13 +1,13 @@
 {
-  "name": "xterm-addon-attach",
+  "name": "@xterm/addon-attach",
   "version": "0.9.0",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
-  "main": "lib/xterm-addon-attach.js",
-  "types": "typings/xterm-addon-attach.d.ts",
-  "repository": "https://github.com/xtermjs/xterm.js/tree/master/addons/xterm-addon-attach",
+  "main": "lib/addon-attach.js",
+  "types": "typings/addon-attach.d.ts",
+  "repository": "https://github.com/xtermjs/xterm.js/tree/master/addons/addon-attach",
   "license": "MIT",
   "keywords": [
     "terminal",

addons/xterm-addon-attach/typings/xterm-addon-attach.d.ts → addons/addon-attach/typings/addon-attach.d.ts

@@ -5,7 +5,7 @@
 
 import { Terminal, ITerminalAddon } from '@xterm/xterm';
 
-declare module 'xterm-addon-attach' {
+declare module '@xterm/addon-attach' {
   export interface IAttachOptions {
     /**
      * Whether input should be written to the backend. Defaults to `true`.

addons/xterm-addon-attach/webpack.config.js → addons/addon-attach/webpack.config.js

@@ -6,7 +6,7 @@
 const path = require('path');
 
 const addonName = 'AttachAddon';
-const mainFile = 'xterm-addon-attach.js';
+const mainFile = 'addon-attach.js';
 
 module.exports = {
   entry: `./out/${addonName}.js`,

addons/addon-canvas/README.md

@@ -0,0 +1,28 @@
+## @xterm/addon-canvas
+
+An addon for [xterm.js](https://github.com/xtermjs/xterm.js) that enables a canvas-based renderer using a 2d context to draw. This addon requires xterm.js v5+.
+
+The purpose of this addon is to be used as a fallback for the [webgl addon](https://www.npmjs.com/package/@xterm/addon-webgl) when better performance is desired over the default DOM renderer, but WebGL2 isn't supported or performant for some reason.
+
+### Install
+
+```bash
+npm install --save @xterm/addon-canvas
+```
+
+### Usage
+
+```ts
+import { Terminal } from '@xterm/xterm';
+import { CanvasAddon } from '@xterm/addon-canvas';
+
+const terminal = new Terminal();
+terminal.open(element);
+terminal.loadAddon(new CanvasAddon());
+```
+
+See the full [API](https://github.com/xtermjs/xterm.js/blob/master/addons/addon-canvas/typings/addon-canvas.d.ts) for more advanced usage.
+
+### See also
+
+- [@xterm/addon-webgl](https://www.npmjs.com/package/@xterm/addon-webgl) A renderer for xterm.js that uses WebGL

addons/xterm-addon-canvas/package.json → addons/addon-canvas/package.json

@@ -1,13 +1,13 @@
 {
-  "name": "xterm-addon-canvas",
+  "name": "@xterm/addon-canvas",
   "version": "0.5.0",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
-  "main": "lib/xterm-addon-canvas.js",
-  "types": "typings/xterm-addon-canvas.d.ts",
-  "repository": "https://github.com/xtermjs/xterm.js/tree/master/addons/xterm-addon-canvas",
+  "main": "lib/addon-canvas.js",
+  "types": "typings/addon-canvas.d.ts",
+  "repository": "https://github.com/xtermjs/xterm.js/tree/master/addons/addon-canvas",
   "license": "MIT",
   "keywords": [
     "terminal",

addons/xterm-addon-canvas/typings/xterm-addon-canvas.d.ts → addons/addon-canvas/typings/addon-canvas.d.ts

@@ -5,7 +5,7 @@
 
 import { Terminal, ITerminalAddon, IEvent } from '@xterm/xterm';
 
-declare module 'xterm-addon-canvas' {
+declare module '@xterm/addon-canvas' {
   /**
    * An xterm.js addon that provides search functionality.
    */

addons/xterm-addon-canvas/webpack.config.js → addons/addon-canvas/webpack.config.js

@@ -6,7 +6,7 @@
 const path = require('path');
 
 const addonName = 'CanvasAddon';
-const mainFile = 'xterm-addon-canvas.js';
+const mainFile = 'addon-canvas.js';
 
 module.exports = {
   entry: `./out/${addonName}.js`,

addons/xterm-addon-fit/README.md → addons/addon-fit/README.md

@@ -1,18 +1,18 @@
-## xterm-addon-fit
+## @xterm/addon-fit
 
 An addon for [xterm.js](https://github.com/xtermjs/xterm.js) that enables fitting the terminal's dimensions to a containing element. This addon requires xterm.js v4+.
 
 ### Install
 
 ```bash
-npm install --save xterm-addon-fit
+npm install --save @xterm/addon-fit
 ```
 
 ### Usage
 
 ```ts
 import { Terminal } from '@xterm/xterm';
-import { FitAddon } from 'xterm-addon-fit';
+import { FitAddon } from '@xterm/addon-fit';
 
 const terminal = new Terminal();
 const fitAddon = new FitAddon();
@@ -21,4 +21,4 @@ terminal.open(containerElement);
 fitAddon.fit();
 ```
 
-See the full [API](https://github.com/xtermjs/xterm.js/blob/master/addons/xterm-addon-fit/typings/xterm-addon-fit.d.ts) for more advanced usage.
+See the full [API](https://github.com/xtermjs/xterm.js/blob/master/addons/addon-fit/typings/addon-fit.d.ts) for more advanced usage.

addons/xterm-addon-fit/package.json → addons/addon-fit/package.json

@@ -1,13 +1,13 @@
 {
-  "name": "xterm-addon-fit",
+  "name": "@xterm/addon-fit",
   "version": "0.8.0",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
-  "main": "lib/xterm-addon-fit.js",
-  "types": "typings/xterm-addon-fit.d.ts",
-  "repository": "https://github.com/xtermjs/xterm.js/tree/master/addons/xterm-addon-fit",
+  "main": "lib/addon-fit.js",
+  "types": "typings/addon-fit.d.ts",
+  "repository": "https://github.com/xtermjs/xterm.js/tree/master/addons/addon-fit",
   "license": "MIT",
   "keywords": [
     "terminal",

addons/xterm-addon-fit/typings/xterm-addon-fit.d.ts → addons/addon-fit/typings/addon-fit.d.ts

@@ -5,7 +5,7 @@
 
 import { Terminal, ITerminalAddon } from '@xterm/xterm';
 
-declare module 'xterm-addon-fit' {
+declare module '@xterm/addon-fit' {
   /**
    * An xterm.js addon that enables resizing the terminal to the dimensions of
    * its containing element.

addons/xterm-addon-fit/webpack.config.js → addons/addon-fit/webpack.config.js

@@ -6,7 +6,7 @@
 const path = require('path');
 
 const addonName = 'FitAddon';
-const mainFile = 'xterm-addon-fit.js';
+const mainFile = 'addon-fit.js';
 
 module.exports = {
   entry: `./out/${addonName}.js`,

addons/xterm-addon-image/README.md → addons/addon-image/README.md

@@ -1,4 +1,4 @@
-## xterm-addon-image
+## @xterm/addon-image
 
 Inline image output in xterm.js. Supports SIXEL and iTerm's inline image protocol (IIP).
 
@@ -9,15 +9,15 @@ Inline image output in xterm.js. Supports SIXEL and iTerm's inline image protoco
 ### Install from npm
 
 ```bash
-npm install --save xterm-addon-image
+npm install --save @xterm/addon-image
 ```
 
 
 ### Usage
 
 ```ts
 import { Terminal } from '@xterm/xterm';
-import { ImageAddon, IImageAddonOptions } from 'xterm-addon-image';
+import { ImageAddon, IImageAddonOptions } from '@xterm/addon-image';
 
 // customize as needed (showing addon defaults)
 const customSettings: IImageAddonOptions = {
@@ -227,5 +227,5 @@ _How can I adjust the memory usage?_
 - 0.1.2 bugfix: reset clear flag
 - 0.1.1 bugfixes:
   - clear sticky image tiles on render
-  - create xterm-addon-image folder from bootstrap.sh
+  - create folder from bootstrap.sh
   - fix peer dependency in package.json

addons/xterm-addon-image/package.json → addons/addon-image/package.json

@@ -1,13 +1,13 @@
 {
-  "name": "xterm-addon-image",
+  "name": "@xterm/addon-image",
   "version": "0.6.0",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"
   },
-  "main": "lib/xterm-addon-image.js",
-  "types": "typings/xterm-addon-image.d.ts",
-  "repository": "https://github.com/xtermjs/xterm.js/tree/master/addons/xterm-addon-image",
+  "main": "lib/addon-image.js",
+  "types": "typings/addon-image.d.ts",
+  "repository": "https://github.com/xtermjs/xterm.js/tree/master/addons/addon-image",
   "license": "MIT",
   "keywords": [
     "terminal",

addons/xterm-addon-image/src/IIPMetrics.test.ts → addons/addon-image/src/IIPMetrics.test.ts

@@ -36,7 +36,7 @@ const TEST_IMAGES: [string, IMetrics][] = [
 describe('IIPMetrics', () => {
   it('bunch of testimages', () => {
     for (let i = 0; i < TEST_IMAGES.length; ++i) {
-      const imageData = fs.readFileSync('./addons/xterm-addon-image/fixture/testimages/' + TEST_IMAGES[i][0]);
+      const imageData = fs.readFileSync('./addons/addon-image/fixture/testimages/' + TEST_IMAGES[i][0]);
       assert.deepStrictEqual(imageType(imageData), TEST_IMAGES[i][1]);
     }
   });